Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove requestjs #37

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Remove requestjs #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ef763d
Update MMM-MyCommute.js
martinkooij Jun 30, 2021
d027302
Update MMM-MyCommute.js
martinkooij Jun 30, 2021
e26cad4
Create node_helper-commute.js
martinkooij Jul 2, 2021
4dbfeb5
Update package.json
martinkooij Jul 2, 2021
31c6f35
Update package.json
martinkooij Jul 2, 2021
8e88ee5
change to node-fetch
martinkooij Jul 2, 2021
93427a2
Update MMM-MyCommute.js
martinkooij Jul 2, 2021
3015548
Update node_helper.js
martinkooij Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 30 additions & 35 deletions node_helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

var NodeHelper = require("node_helper");
var request = require('request');
var fetch = require('node-fetch');
var moment = require('moment');

module.exports = NodeHelper.create({
Expand All @@ -21,36 +21,35 @@ module.exports = NodeHelper.create({
if (notification === 'GOOGLE_TRAFFIC_GET') {

//first data opull after new config
this.getPredictions(payload);

}
(async () => {await this.getPredictions(payload);})();
}
},



getPredictions: function(payload) {
var self = this;

getPredictions: async function(payload) {

var returned = 0;
var predictions = new Array();

payload.destinations.forEach(function(dest, index) {
request({url: dest.url, method: 'GET'}, function(error, response, body) {
// console.log("MM-MyCommute-DEBUG PAYLOAD GET PREDECTIONS: "+ JSON.stringify(payload,undefined,2));

for (let index = 0 ; index < payload.destinations.length ; index++) {
var dest = payload.destinations[index] ;
try {
var body = await fetch(dest.url);
var data = await body.json() ;
await new Promise(resolve => setTimeout(resolve, 200)); // wait 200ms to prevent overlading the interface.

// console.log("MM-MyCommute-DEBUG ("+ index + "): "+ JSON.stringify(data,undefined,2));

var prediction = new Object({
config: dest.config
});

if(!error && response.statusCode == 200){

var data = JSON.parse(body);
var prediction = new Object({
config: dest.config
});


if (data.error_message) {
if (data.error_message) {
console.log("MMM-MyCommute: " + data.error_message);
prediction.error = true;
} else {
} else {

var routeList = new Array();
for (var i = 0; i < data.routes.length; i++) {
var r = data.routes[i];
Expand Down Expand Up @@ -86,21 +85,17 @@ module.exports = NodeHelper.create({

}

} else {
console.log( "Error getting traffic prediction: " + response.statusCode );
} catch(error) {
console.log( "Error getting traffic prediction: " + error );
prediction.error = true;

}

predictions[index] = prediction;
returned++;

if (returned == payload.destinations.length) {
self.sendSocketNotification('GOOGLE_TRAFFIC_RESPONSE' + payload.instanceId, predictions);
};
predictions[index] = prediction;
};

this.sendSocketNotification('GOOGLE_TRAFFIC_RESPONSE' + payload.instanceId, predictions);

});
});
}

}


});
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"homepage": "https://github.com/jclarke0000/MMM-MyCommute#readme",
"dependencies": {
"moment": "^2.18.1",
"moment-duration-format": "^1.3.0",
"request": "^2.81.0"
"moment-duration-format": "^1.3.0"
}
}