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

Replace valid-url library by standard node method

Browse Source
This commit is contained in:
rejas 2021-03-16 19:25:23 +01:00
parent 90112d1a7d
commit 7635dea3e9
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/default/calendar/node_helper.js
View File

@ -5,7 +5,6 @@
* MIT Licensed. * MIT Licensed.
*/ */
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
const validUrl = require("valid-url");
const CalendarFetcher = require("./calendarfetcher.js"); const CalendarFetcher = require("./calendarfetcher.js");
const Log = require("logger"); const Log = require("logger");
@ -38,7 +37,9 @@ module.exports = NodeHelper.create({
* @param {string} identifier ID of the module * @param {string} identifier ID of the module
*/ */
createFetcher: function (url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, broadcastPastEvents, selfSignedCert, identifier) { createFetcher: function (url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, broadcastPastEvents, selfSignedCert, identifier) {
if (!validUrl.isUri(url)) { try {
new URL(url);
} catch (error) {
this.sendSocketNotification("INCORRECT_URL", { id: identifier, url: url }); this.sendSocketNotification("INCORRECT_URL", { id: identifier, url: url });
return; return;
} }

2
modules/default/newsfeed/newsfeed.js
View File

@ -87,6 +87,8 @@ Module.register("newsfeed", {
} }
this.loaded = true; this.loaded = true;
} else if (notification === "INCORRECT_URL") {
Log.error("Newsfeed Error. Incorrect url: " + payload.url);
} }
}, },

7
modules/default/newsfeed/node_helper.js
View File

@ -6,7 +6,6 @@
*/ */
const NodeHelper = require("node_helper"); const NodeHelper = require("node_helper");
const validUrl = require("valid-url");
const NewsfeedFetcher = require("./newsfeedfetcher.js"); const NewsfeedFetcher = require("./newsfeedfetcher.js");
const Log = require("logger"); const Log = require("logger");
@ -36,8 +35,10 @@ module.exports = NodeHelper.create({
const encoding = feed.encoding || "UTF-8"; const encoding = feed.encoding || "UTF-8";
const reloadInterval = feed.reloadInterval || config.reloadInterval || 5 * 60 * 1000; const reloadInterval = feed.reloadInterval || config.reloadInterval || 5 * 60 * 1000;
if (!validUrl.isUri(url)) { try {
this.sendSocketNotification("INCORRECT_URL", url); new URL(url);
} catch (error) {
this.sendSocketNotification("INCORRECT_URL", { url: url });
return; return;
} }