mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
## [2.29.0] - 2024-10-01 Thanks to: @bugsounet, @dkallen78, @jargordon, @khassel, @KristjanESPERANTO, @MarcLandis, @rejas, @ryan-d-williams, @sdetweil, @skpanagiotis. > ⚠️ This release needs nodejs version `v20` or `v22`, minimum version is `v20.9.0` ### Added - [compliments] Added support for cron type date/time format entries mm hh DD MM dow (minutes/hours/days/months and day of week) see https://crontab.cronhub.io for construction (#3481) - [core] Check config at every start of MagicMirror² (#3450) - [core] Add spelling check (cspell): `npm run test:spelling` and handle spelling issues (#3544) - [core] removed `config.paths.vendor` (could not work because `vendor` is hardcoded in `index.html`), renamed `config.paths.modules` to `config.foreignModulesDir`, added variable `MM_CUSTOMCSS_FILE` which - if set - overrides `config.customCss`, added variable `MM_MODULES_DIR` which - if set - overrides `config.foreignModulesDir`, added test for `MM_MODULES_DIR` (#3530) - [core] elements are now removed from `index.html` when loading script or stylesheet files fails - [core] Added `MODULE_DOM_UPDATED` notification each time the DOM is re-rendered via `updateDom` (#3534) - [tests] added minimal needed node version to tests (currently v20.9.0) to avoid releases with wrong node version info - [tests] Added `node-libgpiod` library to electron-rebuild tests (#3563) ### Removed - [core] removed installer only files (#3492) - [core] removed raspberry object from systeminformation (#3505) - [linter] removed `eslint-plugin-import`, because it doesn't support ESLint v9. We will reenter it later when it does. - [tests] removed `onoff` library from electron-rebuild tests (#3563) ### Updated - [weather] Updated `apiVersion` default from 2.5 to 3.0 (#3424) - [core] Updated dependencies including stylistic-eslint - [core] nail down `node-ical` version to `0.18.0` with exception `allow-ghsas: GHSA-8hc4-vh64-cxmj` in `dep-review.yaml` (which should removed after next `node-ical` update) - [core] Updated SocketIO catch all to new API - [core] Allow custom modules positions by scanning index.html for the defined regions, instead of hard coded (PR #3518 fixes issue #3504) - [core] Detail optimizations in `config_check.js` - [core] Updated minimal needed node version in `package.json` (currently v20.9.0) (#3559) and except for v21 (no security updates) (#3561) - [linter] Switch to ESLint v9 and flat config and replace `eslint-plugin-unicorn` by `@eslint/js` - [core] fix discovering module positions twice after #3450 ### Fixed - Fixed `checks` badge in README.md - [weather] Fixed issue with the UK Met Office provider following a change in their API paths and header info. - [core] add check for node_helper loading for multiple instances of same module (#3502) - [weather] Fixed issue for respecting unit config on broadcasted notifications - [tests] Fixes calendar test by moving it from e2e to electron with fixed date (#3532) - [calendar] fixed sliceMultiDayEvents getting wrong count and displaying incorrect entries, Europe/Berlin (#3542) - [tests] ignore `js/positions.js` when linting (this file is created at runtime) - [calendar] fixed sliceMultiDayEvents showing previous day without config enabled --------- 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>
516 lines
14 KiB
JavaScript
516 lines
14 KiB
JavaScript
/* global Class, cloneObject, Loader, MMSocket, nunjucks, Translator */
|
|
|
|
/*
|
|
* Module Blueprint.
|
|
* @typedef {Object} Module
|
|
*/
|
|
const Module = Class.extend({
|
|
|
|
/**
|
|
********************************************************
|
|
* All methods (and properties) below can be subclassed. *
|
|
********************************************************
|
|
*/
|
|
|
|
// Set the minimum MagicMirror² module version for this module.
|
|
requiresVersion: "2.0.0",
|
|
|
|
// Module config defaults.
|
|
defaults: {},
|
|
|
|
// Timer reference used for showHide animation callbacks.
|
|
showHideTimer: null,
|
|
|
|
/*
|
|
* Array to store lockStrings. These strings are used to lock
|
|
* visibility when hiding and showing module.
|
|
*/
|
|
lockStrings: [],
|
|
|
|
/*
|
|
* Storage of the nunjucks Environment,
|
|
* This should not be referenced directly.
|
|
* Use the nunjucksEnvironment() to get it.
|
|
*/
|
|
_nunjucksEnvironment: null,
|
|
|
|
/**
|
|
* Called when the module is instantiated.
|
|
*/
|
|
init () {
|
|
//Log.log(this.defaults);
|
|
},
|
|
|
|
/**
|
|
* Called when the module is started.
|
|
*/
|
|
async start () {
|
|
Log.info(`Starting module: ${this.name}`);
|
|
},
|
|
|
|
/**
|
|
* Returns a list of scripts the module requires to be loaded.
|
|
* @returns {string[]} An array with filenames.
|
|
*/
|
|
getScripts () {
|
|
return [];
|
|
},
|
|
|
|
/**
|
|
* Returns a list of stylesheets the module requires to be loaded.
|
|
* @returns {string[]} An array with filenames.
|
|
*/
|
|
getStyles () {
|
|
return [];
|
|
},
|
|
|
|
/**
|
|
* Returns a map of translation files the module requires to be loaded.
|
|
*
|
|
* return Map<String, String> -
|
|
* @returns {*} A map with langKeys and filenames.
|
|
*/
|
|
getTranslations () {
|
|
return false;
|
|
},
|
|
|
|
/**
|
|
* Generates the dom which needs to be displayed. This method is called by the MagicMirror² core.
|
|
* This method can to be subclassed if the module wants to display info on the mirror.
|
|
* Alternatively, the getTemplate method could be subclassed.
|
|
* @returns {HTMLElement|Promise} The dom or a promise with the dom to display.
|
|
*/
|
|
getDom () {
|
|
return new Promise((resolve) => {
|
|
const div = document.createElement("div");
|
|
const template = this.getTemplate();
|
|
const templateData = this.getTemplateData();
|
|
|
|
// Check to see if we need to render a template string or a file.
|
|
if ((/^.*((\.html)|(\.njk))$/).test(template)) {
|
|
// the template is a filename
|
|
this.nunjucksEnvironment().render(template, templateData, function (err, res) {
|
|
if (err) {
|
|
Log.error(err);
|
|
}
|
|
|
|
div.innerHTML = res;
|
|
|
|
resolve(div);
|
|
});
|
|
} else {
|
|
// the template is a template string.
|
|
div.innerHTML = this.nunjucksEnvironment().renderString(template, templateData);
|
|
|
|
resolve(div);
|
|
}
|
|
});
|
|
},
|
|
|
|
/**
|
|
* Generates the header string which needs to be displayed if a user has a header configured for this module.
|
|
* This method is called by the MagicMirror² core, but only if the user has configured a default header for the module.
|
|
* This method needs to be subclassed if the module wants to display modified headers on the mirror.
|
|
* @returns {string} The header to display above the header.
|
|
*/
|
|
getHeader () {
|
|
return this.data.header;
|
|
},
|
|
|
|
/**
|
|
* Returns the template for the module which is used by the default getDom implementation.
|
|
* This method needs to be subclassed if the module wants to use a template.
|
|
* It can either return a template sting, or a template filename.
|
|
* If the string ends with '.html' it's considered a file from within the module's folder.
|
|
* @returns {string} The template string of filename.
|
|
*/
|
|
getTemplate () {
|
|
return `<div class="normal">${this.name}</div><div class="small dimmed">${this.identifier}</div>`;
|
|
},
|
|
|
|
/**
|
|
* Returns the data to be used in the template.
|
|
* This method needs to be subclassed if the module wants to use a custom data.
|
|
* @returns {object} The data for the template
|
|
*/
|
|
getTemplateData () {
|
|
return {};
|
|
},
|
|
|
|
/**
|
|
* Called by the MagicMirror² core when a notification arrives.
|
|
* @param {string} notification The identifier of the notification.
|
|
* @param {*} payload The payload of the notification.
|
|
* @param {Module} sender The module that sent the notification.
|
|
*/
|
|
notificationReceived (notification, payload, sender) {
|
|
if (sender) {
|
|
// Log.log(this.name + " received a module notification: " + notification + " from sender: " + sender.name);
|
|
} else {
|
|
// Log.log(this.name + " received a system notification: " + notification);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Returns the nunjucks environment for the current module.
|
|
* The environment is checked in the _nunjucksEnvironment instance variable.
|
|
* @returns {object} The Nunjucks Environment
|
|
*/
|
|
nunjucksEnvironment () {
|
|
if (this._nunjucksEnvironment !== null) {
|
|
return this._nunjucksEnvironment;
|
|
}
|
|
|
|
this._nunjucksEnvironment = new nunjucks.Environment(new nunjucks.WebLoader(this.file(""), { async: true }), {
|
|
trimBlocks: true,
|
|
lstripBlocks: true
|
|
});
|
|
|
|
this._nunjucksEnvironment.addFilter("translate", (str, variables) => {
|
|
return nunjucks.runtime.markSafe(this.translate(str, variables));
|
|
});
|
|
|
|
return this._nunjucksEnvironment;
|
|
},
|
|
|
|
/**
|
|
* Called when a socket notification arrives.
|
|
* @param {string} notification The identifier of the notification.
|
|
* @param {*} payload The payload of the notification.
|
|
*/
|
|
socketNotificationReceived (notification, payload) {
|
|
Log.log(`${this.name} received a socket notification: ${notification} - Payload: ${payload}`);
|
|
},
|
|
|
|
/**
|
|
* Called when the module is hidden.
|
|
*/
|
|
suspend () {
|
|
Log.log(`${this.name} is suspended.`);
|
|
},
|
|
|
|
/**
|
|
* Called when the module is shown.
|
|
*/
|
|
resume () {
|
|
Log.log(`${this.name} is resumed.`);
|
|
},
|
|
|
|
/**
|
|
********************************************
|
|
* The methods below don't need subclassing. *
|
|
********************************************
|
|
*/
|
|
|
|
/**
|
|
* Set the module data.
|
|
* @param {object} data The module data
|
|
*/
|
|
setData (data) {
|
|
this.data = data;
|
|
this.name = data.name;
|
|
this.identifier = data.identifier;
|
|
this.hidden = false;
|
|
this.hasAnimateIn = false;
|
|
this.hasAnimateOut = false;
|
|
|
|
this.setConfig(data.config, data.configDeepMerge);
|
|
},
|
|
|
|
/**
|
|
* Set the module config and combine it with the module defaults.
|
|
* @param {object} config The combined module config.
|
|
* @param {boolean} deep Merge module config in deep.
|
|
*/
|
|
setConfig (config, deep) {
|
|
this.config = deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config);
|
|
},
|
|
|
|
/**
|
|
* Returns a socket object. If it doesn't exist, it's created.
|
|
* It also registers the notification callback.
|
|
* @returns {MMSocket} a socket object
|
|
*/
|
|
socket () {
|
|
if (typeof this._socket === "undefined") {
|
|
this._socket = new MMSocket(this.name);
|
|
}
|
|
|
|
this._socket.setNotificationCallback((notification, payload) => {
|
|
this.socketNotificationReceived(notification, payload);
|
|
});
|
|
|
|
return this._socket;
|
|
},
|
|
|
|
/**
|
|
* Retrieve the path to a module file.
|
|
* @param {string} file Filename
|
|
* @returns {string} the file path
|
|
*/
|
|
file (file) {
|
|
return `${this.data.path}/${file}`.replace("//", "/");
|
|
},
|
|
|
|
/**
|
|
* Load all required stylesheets by requesting the MM object to load the files.
|
|
* @returns {Promise<void>}
|
|
*/
|
|
loadStyles () {
|
|
return this.loadDependencies("getStyles");
|
|
},
|
|
|
|
/**
|
|
* Load all required scripts by requesting the MM object to load the files.
|
|
* @returns {Promise<void>}
|
|
*/
|
|
loadScripts () {
|
|
return this.loadDependencies("getScripts");
|
|
},
|
|
|
|
/**
|
|
* Helper method to load all dependencies.
|
|
* @param {string} funcName Function name to call to get scripts or styles.
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async loadDependencies (funcName) {
|
|
let dependencies = this[funcName]();
|
|
|
|
const loadNextDependency = async () => {
|
|
if (dependencies.length > 0) {
|
|
const nextDependency = dependencies[0];
|
|
await Loader.loadFileForModule(nextDependency, this);
|
|
dependencies = dependencies.slice(1);
|
|
await loadNextDependency();
|
|
} else {
|
|
return Promise.resolve();
|
|
}
|
|
};
|
|
|
|
await loadNextDependency();
|
|
},
|
|
|
|
/**
|
|
* Load all translations.
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async loadTranslations () {
|
|
const translations = this.getTranslations() || {};
|
|
const language = config.language.toLowerCase();
|
|
|
|
const languages = Object.keys(translations);
|
|
const fallbackLanguage = languages[0];
|
|
|
|
if (languages.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const translationFile = translations[language];
|
|
const translationsFallbackFile = translations[fallbackLanguage];
|
|
|
|
if (!translationFile) {
|
|
return Translator.load(this, translationsFallbackFile, true);
|
|
}
|
|
|
|
await Translator.load(this, translationFile, false);
|
|
|
|
if (translationFile !== translationsFallbackFile) {
|
|
return Translator.load(this, translationsFallbackFile, true);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Request the translation for a given key with optional variables and default value.
|
|
* @param {string} key The key of the string to translate
|
|
* @param {string|object} [defaultValueOrVariables] The default value or variables for translating.
|
|
* @param {string} [defaultValue] The default value with variables.
|
|
* @returns {string} the translated key
|
|
*/
|
|
translate (key, defaultValueOrVariables, defaultValue) {
|
|
if (typeof defaultValueOrVariables === "object") {
|
|
return Translator.translate(this, key, defaultValueOrVariables) || defaultValue || "";
|
|
}
|
|
return Translator.translate(this, key) || defaultValueOrVariables || "";
|
|
},
|
|
|
|
/**
|
|
* Request an (animated) update of the module.
|
|
* @param {number|object} [updateOptions] The speed of the animation or object with for updateOptions (speed/animates)
|
|
*/
|
|
updateDom (updateOptions) {
|
|
MM.updateDom(this, updateOptions);
|
|
},
|
|
|
|
/**
|
|
* Send a notification to all modules.
|
|
* @param {string} notification The identifier of the notification.
|
|
* @param {*} payload The payload of the notification.
|
|
*/
|
|
sendNotification (notification, payload) {
|
|
MM.sendNotification(notification, payload, this);
|
|
},
|
|
|
|
/**
|
|
* Send a socket notification to the node helper.
|
|
* @param {string} notification The identifier of the notification.
|
|
* @param {*} payload The payload of the notification.
|
|
*/
|
|
sendSocketNotification (notification, payload) {
|
|
this.socket().sendNotification(notification, payload);
|
|
},
|
|
|
|
/**
|
|
* Hide this module.
|
|
* @param {number} speed The speed of the hide animation.
|
|
* @param {Function} callback Called when the animation is done.
|
|
* @param {object} [options] Optional settings for the hide method.
|
|
*/
|
|
hide (speed, callback, options = {}) {
|
|
let usedCallback = callback || function () {};
|
|
let usedOptions = options;
|
|
|
|
if (typeof callback === "object") {
|
|
Log.error("Parameter mismatch in module.hide: callback is not an optional parameter!");
|
|
usedOptions = callback;
|
|
usedCallback = function () {};
|
|
}
|
|
|
|
MM.hideModule(
|
|
this,
|
|
speed,
|
|
() => {
|
|
this.suspend();
|
|
usedCallback();
|
|
},
|
|
usedOptions
|
|
);
|
|
},
|
|
|
|
/**
|
|
* Show this module.
|
|
* @param {number} speed The speed of the show animation.
|
|
* @param {Function} callback Called when the animation is done.
|
|
* @param {object} [options] Optional settings for the show method.
|
|
*/
|
|
show (speed, callback, options) {
|
|
let usedCallback = callback || function () {};
|
|
let usedOptions = options;
|
|
|
|
if (typeof callback === "object") {
|
|
Log.error("Parameter mismatch in module.show: callback is not an optional parameter!");
|
|
usedOptions = callback;
|
|
usedCallback = function () {};
|
|
}
|
|
|
|
MM.showModule(
|
|
this,
|
|
speed,
|
|
() => {
|
|
this.resume();
|
|
usedCallback();
|
|
},
|
|
usedOptions
|
|
);
|
|
}
|
|
});
|
|
|
|
/**
|
|
* Merging MagicMirror² (or other) default/config script by @bugsounet
|
|
* Merge 2 objects or/with array
|
|
*
|
|
* Usage:
|
|
* -------
|
|
* this.config = configMerge({}, this.defaults, this.config)
|
|
* -------
|
|
* arg1: initial object
|
|
* arg2: config model
|
|
* arg3: config to merge
|
|
* -------
|
|
* why using it ?
|
|
* Object.assign() function don't to all job
|
|
* it don't merge all thing in deep
|
|
* -> object in object and array is not merging
|
|
* -------
|
|
*
|
|
* Todo: idea of Mich determinate what do you want to merge or not
|
|
* @param {object} result the initial object
|
|
* @returns {object} the merged config
|
|
*/
|
|
function configMerge (result) {
|
|
const stack = Array.prototype.slice.call(arguments, 1);
|
|
let item, key;
|
|
|
|
while (stack.length) {
|
|
item = stack.shift();
|
|
for (key in item) {
|
|
if (item.hasOwnProperty(key)) {
|
|
if (typeof result[key] === "object" && result[key] && Object.prototype.toString.call(result[key]) !== "[object Array]") {
|
|
if (typeof item[key] === "object" && item[key] !== null) {
|
|
result[key] = configMerge({}, result[key], item[key]);
|
|
} else {
|
|
result[key] = item[key];
|
|
}
|
|
} else {
|
|
result[key] = item[key];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
Module.definitions = {};
|
|
|
|
Module.create = function (name) {
|
|
// Make sure module definition is available.
|
|
if (!Module.definitions[name]) {
|
|
return;
|
|
}
|
|
|
|
const moduleDefinition = Module.definitions[name];
|
|
const clonedDefinition = cloneObject(moduleDefinition);
|
|
|
|
// Note that we clone the definition. Otherwise the objects are shared, which gives problems.
|
|
const ModuleClass = Module.extend(clonedDefinition);
|
|
|
|
return new ModuleClass();
|
|
};
|
|
|
|
Module.register = function (name, moduleDefinition) {
|
|
if (moduleDefinition.requiresVersion) {
|
|
Log.log(`Check MagicMirror² version for module '${name}' - Minimum version: ${moduleDefinition.requiresVersion} - Current version: ${window.mmVersion}`);
|
|
if (cmpVersions(window.mmVersion, moduleDefinition.requiresVersion) >= 0) {
|
|
Log.log("Version is ok!");
|
|
} else {
|
|
Log.warn(`Version is incorrect. Skip module: '${name}'`);
|
|
return;
|
|
}
|
|
}
|
|
Log.log(`Module registered: ${name}`);
|
|
Module.definitions[name] = moduleDefinition;
|
|
};
|
|
|
|
window.Module = Module;
|
|
|
|
/**
|
|
* Compare two semantic version numbers and return the difference.
|
|
* @param {string} a Version number a.
|
|
* @param {string} b Version number b.
|
|
* @returns {number} A positive number if a is larger than b, a negative
|
|
* number if a is smaller and 0 if they are the same
|
|
*/
|
|
function cmpVersions (a, b) {
|
|
const regExStrip0 = /(\.0+)+$/;
|
|
const segmentsA = a.replace(regExStrip0, "").split(".");
|
|
const segmentsB = b.replace(regExStrip0, "").split(".");
|
|
const l = Math.min(segmentsA.length, segmentsB.length);
|
|
|
|
for (let i = 0; i < l; i++) {
|
|
let diff = parseInt(segmentsA[i], 10) - parseInt(segmentsB[i], 10);
|
|
if (diff) {
|
|
return diff;
|
|
}
|
|
}
|
|
return segmentsA.length - segmentsB.length;
|
|
}
|