kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Move checkFetchStatus into NodelHelper

Browse Source
This commit is contained in:
rejas 2021-04-24 09:14:08 +02:00 committed by veeck
parent 90aa50bb11
commit b212641069
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/fetcher_helper.js
View File

@ -1,12 +0,0 @@
const FetcherHelper = {
checkStatus: function (response) {
// response.status >= 200 && response.status < 300
if (response.ok) {
return response;
} else {
throw Error(response.statusText);
}
}
};
module.exports = FetcherHelper;

9
js/node_helper.js
View File

@ -113,6 +113,15 @@ const NodeHelper = Class.extend({
} }
}); });
NodeHelper.checkFetchStatus = function (response) {
// response.status >= 200 && response.status < 300
if (response.ok) {
return response;
} else {
throw Error(response.statusText);
}
};
NodeHelper.create = function (moduleDefinition) { NodeHelper.create = function (moduleDefinition) {
return NodeHelper.extend(moduleDefinition); return NodeHelper.extend(moduleDefinition);
}; };

4
modules/default/calendar/calendarfetcher.js
View File

@ -5,8 +5,8 @@
* MIT Licensed. * MIT Licensed.
*/ */
const CalendarUtils = require("./calendarutils"); const CalendarUtils = require("./calendarutils");
const FetcherHelper = require("fetcher_helper");
const Log = require("logger"); const Log = require("logger");
const NodeHelper = require("node_helper");
const ical = require("node-ical"); const ical = require("node-ical");
const fetch = require("node-fetch"); const fetch = require("node-fetch");
const digest = require("digest-fetch"); const digest = require("digest-fetch");
@ -63,7 +63,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
} }
fetcher fetcher
.then(FetcherHelper.checkStatus) .then(NodeHelper.checkFetchStatus)
.then((response) => response.text()) .then((response) => response.text())
.then((responseData) => { .then((responseData) => {
let data = []; let data = [];

4
modules/default/newsfeed/newsfeedfetcher.js
View File

@ -5,8 +5,8 @@
* MIT Licensed. * MIT Licensed.
*/ */
const Log = require("logger"); const Log = require("logger");
const FetcherHelper = require("fetcher_helper");
const FeedMe = require("feedme"); const FeedMe = require("feedme");
const NodeHelper = require("node_helper");
const fetch = require("node-fetch"); const fetch = require("node-fetch");
const iconv = require("iconv-lite"); const iconv = require("iconv-lite");
@ -85,7 +85,7 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
}; };
fetch(url, { headers: headers }) fetch(url, { headers: headers })
.then(FetcherHelper.checkStatus) .then(NodeHelper.checkFetchStatus)
.then((response) => { .then((response) => {
response.body.pipe(iconv.decodeStream(encoding)).pipe(parser); response.body.pipe(iconv.decodeStream(encoding)).pipe(parser);
}) })

1
package.json
View File

@ -87,7 +87,6 @@
"socket.io": "^4.1.2" "socket.io": "^4.1.2"
}, },
"_moduleAliases": { "_moduleAliases": {
"fetcher_helper": "js/fetcher_helper.js",
"node_helper": "js/node_helper.js", "node_helper": "js/node_helper.js",
"logger": "js/logger.js" "logger": "js/logger.js"
}, },