mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-07-02 22:08:42 +00:00
## [2.32.0] - 2025-07-01 Thanks to: @bughaver, @bugsounet, @khassel, @KristjanESPERANTO, @plebcity, @rejas, @sdetweil. > ⚠️ This release needs nodejs version `v22.14.0 or higher` ### Added - [config] Allow to change module order for final renderer (or dynamically with CSS): Feature `order` in config (#3762) - [clock] Added option 'disableNextEvent' to hide next sun event (#3769) - [clock] Implement short syntax for clock week (#3775) ### Changed - [refactor] Simplify module loading process (#3766) - Use `node --run` instead of `npm run` (#3764) and adapt `start:dev` script (#3773) - [workflow] Run linter and spellcheck with LTS node version (#3767) - [workflow] Split "Run test" step into two steps for more clarity (#3767) - [linter] Review linter setup (#3783) - Fix command to lint markdown in `CONTRIBUTING.md` - Re-activate JSDoc linting and fix linting issues - Refactor ESLint config to use `defineConfig` and `globalIgnores` - Replace `eslint-plugin-import` with `eslint-plugin-import-x` - Switch Stylelint config to flat format and simplify Stylelint scripts - [workflow] Replace Node.js version v23 with v24 (#3770) - [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789) - [refactor] Replace `ansis` with built-in function `util.styleText` (#3793) - [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795, #3805) - [l10n] Complete translations (with the help of translation tools) (#3794) - [refactor] Refactored `calendarfetcherutils` in Calendar module to handle timezones better (#3806) - Removed as many of the date conversions as possible - Use `moment-timezone` when calculating recurring events, this will fix problems from the past with offsets and DST not being handled properly - Added some tests to test the behavior of the refactored methods to make sure the correct event dates are returned - [linter] Enable ESLint rule `no-console` and replace `console` with `Log` in some files (#3810) - [tests] Review and refactor translation tests (#3792) ### Fixed - [fix] Handle spellcheck issues (#3783) - [calendar] fix fullday event rrule until with timezone offset (#3781) - [feat] Add rule `no-undef` in config file validation to fix #3785 (#3786) - [fonts] Fix `roboto.css` to avoid error message `Unknown descriptor 'var(' in @font-face rule.` in firefox console (#3787) - [tests] Fix and refactor e2e test `Same keys` in `translations_spec.js` (#3809) - [tests] Fix e2e tests newsfeed and calendar to exit without open handles (#3817) ### Updated - [core] Update dependencies including electron to v36 (#3774, #3788, #3811, #3804, #3815, #3823) - [core] Update package type to `commonjs` - [logger] Review factory code part: use `switch/case` instead of `if/else if` (#3812) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michael Teeuw <michael@xonaymedia.nl> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ross Younger <crazyscot@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: jkriegshauser <joshuakr@nvidia.com> Co-authored-by: illimarkangur <116028111+illimarkangur@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: vppencilsharpener <tim.pray@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: Brian O'Connor <btoconnor@users.noreply.github.com> Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com> Co-authored-by: Jason Stieber <jrstieber@gmail.com> Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com> Co-authored-by: Daniel <32464403+dkallen78@users.noreply.github.com> Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com> Co-authored-by: Panagiotis Skias <panagiotis.skias@gmail.com> Co-authored-by: Marc Landis <dirk.rettschlag@gmail.com> Co-authored-by: HeikoGr <20295490+HeikoGr@users.noreply.github.com> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl>
144 lines
3.9 KiB
JavaScript
144 lines
3.9 KiB
JavaScript
const https = require("node:https");
|
|
const ical = require("node-ical");
|
|
const Log = require("logger");
|
|
const NodeHelper = require("node_helper");
|
|
const CalendarFetcherUtils = require("./calendarfetcherutils");
|
|
|
|
/**
|
|
*
|
|
* @param {string} url The url of the calendar to fetch
|
|
* @param {number} reloadInterval Time in ms the calendar is fetched again
|
|
* @param {string[]} excludedEvents An array of words / phrases from event titles that will be excluded from being shown.
|
|
* @param {number} maximumEntries The maximum number of events fetched.
|
|
* @param {number} maximumNumberOfDays The maximum number of days an event should be in the future.
|
|
* @param {object} auth The object containing options for authentication against the calendar.
|
|
* @param {boolean} includePastEvents If true events from the past maximumNumberOfDays will be fetched too
|
|
* @param {boolean} selfSignedCert If true, the server certificate is not verified against the list of supplied CAs.
|
|
* @class
|
|
*/
|
|
const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, includePastEvents, selfSignedCert) {
|
|
let reloadTimer = null;
|
|
let events = [];
|
|
|
|
let fetchFailedCallback = function () {};
|
|
let eventsReceivedCallback = function () {};
|
|
|
|
/**
|
|
* Initiates calendar fetch.
|
|
*/
|
|
const fetchCalendar = () => {
|
|
clearTimeout(reloadTimer);
|
|
reloadTimer = null;
|
|
const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
|
|
let httpsAgent = null;
|
|
let headers = {
|
|
"User-Agent": `Mozilla/5.0 (Node.js ${nodeVersion}) MagicMirror/${global.version}`
|
|
};
|
|
|
|
if (selfSignedCert) {
|
|
httpsAgent = new https.Agent({
|
|
rejectUnauthorized: false
|
|
});
|
|
}
|
|
if (auth) {
|
|
if (auth.method === "bearer") {
|
|
headers.Authorization = `Bearer ${auth.pass}`;
|
|
} else {
|
|
headers.Authorization = `Basic ${Buffer.from(`${auth.user}:${auth.pass}`).toString("base64")}`;
|
|
}
|
|
}
|
|
|
|
fetch(url, { headers: headers, agent: httpsAgent })
|
|
.then(NodeHelper.checkFetchStatus)
|
|
.then((response) => response.text())
|
|
.then((responseData) => {
|
|
let data = [];
|
|
|
|
try {
|
|
data = ical.parseICS(responseData);
|
|
Log.debug(`parsed data=${JSON.stringify(data, null, 2)}`);
|
|
events = CalendarFetcherUtils.filterEvents(data, {
|
|
excludedEvents,
|
|
includePastEvents,
|
|
maximumEntries,
|
|
maximumNumberOfDays
|
|
});
|
|
} catch (error) {
|
|
fetchFailedCallback(this, error);
|
|
scheduleTimer();
|
|
return;
|
|
}
|
|
this.broadcastEvents();
|
|
scheduleTimer();
|
|
})
|
|
.catch((error) => {
|
|
fetchFailedCallback(this, error);
|
|
scheduleTimer();
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Schedule the timer for the next update.
|
|
*/
|
|
const scheduleTimer = function () {
|
|
if (process.env.JEST_WORKER_ID === undefined) {
|
|
// only set timer when not running in jest
|
|
clearTimeout(reloadTimer);
|
|
reloadTimer = setTimeout(function () {
|
|
fetchCalendar();
|
|
}, reloadInterval);
|
|
}
|
|
};
|
|
|
|
/* public methods */
|
|
|
|
/**
|
|
* Initiate fetchCalendar();
|
|
*/
|
|
this.startFetch = function () {
|
|
fetchCalendar();
|
|
};
|
|
|
|
/**
|
|
* Broadcast the existing events.
|
|
*/
|
|
this.broadcastEvents = function () {
|
|
Log.info(`Calendar-Fetcher: Broadcasting ${events.length} events from ${url}.`);
|
|
eventsReceivedCallback(this);
|
|
};
|
|
|
|
/**
|
|
* Sets the on success callback
|
|
* @param {Function} callback The on success callback.
|
|
*/
|
|
this.onReceive = function (callback) {
|
|
eventsReceivedCallback = callback;
|
|
};
|
|
|
|
/**
|
|
* Sets the on error callback
|
|
* @param {Function} callback The on error callback.
|
|
*/
|
|
this.onError = function (callback) {
|
|
fetchFailedCallback = callback;
|
|
};
|
|
|
|
/**
|
|
* Returns the url of this fetcher.
|
|
* @returns {string} The url of this fetcher.
|
|
*/
|
|
this.url = function () {
|
|
return url;
|
|
};
|
|
|
|
/**
|
|
* Returns current available events for this fetcher.
|
|
* @returns {object[]} The current available events for this fetcher.
|
|
*/
|
|
this.events = function () {
|
|
return events;
|
|
};
|
|
};
|
|
|
|
module.exports = CalendarFetcher;
|