bro-students/multy-stub
bro-students/multy-stub
26
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

corrected

Browse Source
This commit is contained in:
bogap 2024-10-15 13:36:13 +03:00
parent 02891fe301
commit 637939e9af
3 changed files with 164 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package-lock.json generated
View File

@ -9,6 +9,7 @@
"version": "1.0.1", "version": "1.0.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"axios": "^1.7.7",
"bcrypt": "^5.1.0", "bcrypt": "^5.1.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cookie-parser": "^1.4.5", "cookie-parser": "^1.4.5",
@ -608,12 +609,14 @@
} }
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "0.27.2", "version": "1.7.7",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
"license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.14.9", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0" "form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
} }
}, },
"node_modules/balanced-match": { "node_modules/balanced-match": {
@ -1985,15 +1988,16 @@
"dev": true "dev": true
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.15.2", "version": "1.15.9",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh" "url": "https://github.com/sponsors/RubenVerborgh"
} }
], ],
"license": "MIT",
"engines": { "engines": {
"node": ">=4.0" "node": ">=4.0"
}, },
@ -3788,6 +3792,12 @@
"node": ">= 0.10" "node": ">= 0.10"
} }
}, },
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
"license": "MIT"
},
"node_modules/ps-tree": { "node_modules/ps-tree": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
@ -4878,6 +4888,16 @@
"node": ">=12.0.0" "node": ">=12.0.0"
} }
}, },
"node_modules/wait-on/node_modules/axios": {
"version": "0.27.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.14.9",
"form-data": "^4.0.0"
}
},
"node_modules/webidl-conversions": { "node_modules/webidl-conversions": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",

1
package.json
View File

@ -24,6 +24,7 @@
"license": "MIT", "license": "MIT",
"homepage": "https://bitbucket.org/online-mentor/multi-stub#readme", "homepage": "https://bitbucket.org/online-mentor/multi-stub#readme",
"dependencies": { "dependencies": {
"axios": "^1.7.7",
"bcrypt": "^5.1.0", "bcrypt": "^5.1.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cookie-parser": "^1.4.5", "cookie-parser": "^1.4.5",

77
server/routers/epja-2024-1/ecliptica/plants/getPlants.js
View File

@ -1,30 +1,8 @@
const { exec } = require('child_process');
exec('npm list axios', (err, stdout, stderr) => {
if (stderr.includes('empty')) {
console.log('Installing axios...');
exec('npm install axios', (error, stdout, stderr) => {
if (error) {
console.error('Error installing axios:', error);
} else {
console.log('Axios installed successfully');
startApp();
}
});
} else {
startApp();
}
});
function startApp() {
const express = require ('express'); const express = require ('express');
const axios = require ('axios'); const axios = require ('axios');
const FormData = require('form-data');
const plantsRouter = express.Router (); const plantsRouter = express.Router ();
const cors = require('cors');
const CONFIG = require ('./config'); const CONFIG = require ('./config');
plantsRouter.use(cors());
async function getAccessToken () { async function getAccessToken () {
const formData = new FormData (); const formData = new FormData ();
formData.append ('grant_type', 'client_credentials'); formData.append ('grant_type', 'client_credentials');
@ -32,9 +10,13 @@ function startApp() {
formData.append ('client_secret', CONFIG.CLIENT_SECRET); formData.append ('client_secret', CONFIG.CLIENT_SECRET);
try { try {
const response = await axios.post('https://open.plantbook.io/api/v1/token/', formData, { const response = await axios.post (
headers: {'Content-Type': 'multipart/form-data'} 'https://open.plantbook.io/api/v1/token/',
}); formData,
{
headers: {'Content-Type': 'multipart/form-data'},
}
);
if (response.data && response.data.access_token) { if (response.data && response.data.access_token) {
console.log ('Access token retrieved:', response.data.access_token); console.log ('Access token retrieved:', response.data.access_token);
return response.data.access_token; return response.data.access_token;
@ -42,9 +24,11 @@ function startApp() {
console.error ('Error: access_token not found in response'); console.error ('Error: access_token not found in response');
return null; return null;
} }
} catch (error) { } catch (error) {
console.error('Error fetching access token:', error.response ? error.response.data : error.message); console.error (
'Error fetching access token:',
error.response ? error.response.data : error.message
);
return null; return null;
} }
} }
@ -55,14 +39,20 @@ function startApp() {
return null; return null;
} }
try { try {
const response = await axios.get(`https://open.plantbook.io/api/v1/plant/detail/${encodeURIComponent(plantId)}/`, { const response = await axios.get (
`https://open.plantbook.io/api/v1/plant/detail/${encodeURIComponent (plantId)}/`,
{
headers: { headers: {
'Authorization': `Bearer ${accessToken}` Authorization: `Bearer ${accessToken}`,
},
} }
}); );
return response.data; return response.data;
} catch (error) { } catch (error) {
console.error('Error fetching plant data:', error.response ? error.response.data : error.message); console.error (
'Error fetching plant data:',
error.response ? error.response.data : error.message
);
return null; return null;
} }
} }
@ -75,18 +65,22 @@ function startApp() {
} }
try { try {
const alias = req.query.alias || 'monstera'; const alias = req.query.alias || 'monstera';
const response = await axios.get('https://open.plantbook.io/api/v1/plant/search', { const response = await axios.get (
'https://open.plantbook.io/api/v1/plant/search',
{
headers: { headers: {
'Authorization': `Bearer ${accessToken}` Authorization: `Bearer ${accessToken}`,
}, },
params: { params: {
alias: alias alias: alias,
},
} }
}); );
const plantsList = response.data.results; const plantsList = response.data.results;
const plants = await Promise.all(plantsList.map(async (plant) => { const plants = await Promise.all (
plantsList.map (async plant => {
const plantDetails = await fetchPlantData (plant.pid); const plantDetails = await fetchPlantData (plant.pid);
return { return {
id: plant.pid, id: plant.pid,
@ -104,11 +98,15 @@ function startApp() {
max_soil_ec: plantDetails ? plantDetails.max_soil_ec : null, max_soil_ec: plantDetails ? plantDetails.max_soil_ec : null,
min_soil_ec: plantDetails ? plantDetails.min_soil_ec : null, min_soil_ec: plantDetails ? plantDetails.min_soil_ec : null,
}; };
})); })
);
res.send ({results: plants}); res.send ({results: plants});
} catch (error) { } catch (error) {
console.error('Error fetching plant list:', error.response ? error.response.data : error.message); console.error (
'Error fetching plant list:',
error.response ? error.response.data : error.message
);
res.status (500).send ({message: 'Error fetching plant list'}); res.status (500).send ({message: 'Error fetching plant list'});
} }
}); });
@ -132,7 +130,7 @@ function startApp() {
min_soil_moisture: plantData.min_soil_moist, min_soil_moisture: plantData.min_soil_moist,
max_soil_ec: plantData.max_soil_ec, max_soil_ec: plantData.max_soil_ec,
min_soil_ec: plantData.min_soil_ec, min_soil_ec: plantData.min_soil_ec,
image_url: plantData.image_url image_url: plantData.image_url,
}; };
res.send (detailedPlantData); res.send (detailedPlantData);
@ -142,4 +140,3 @@ function startApp() {
}); });
module.exports = plantsRouter; module.exports = plantsRouter;
}