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>
279 lines
7.9 KiB
JavaScript
279 lines
7.9 KiB
JavaScript
/* global defaultModules, vendor */
|
|
|
|
const Loader = (function () {
|
|
|
|
/* Create helper variables */
|
|
|
|
const loadedModuleFiles = [];
|
|
const loadedFiles = [];
|
|
const moduleObjects = [];
|
|
|
|
/* Private Methods */
|
|
|
|
/**
|
|
* Retrieve object of env variables.
|
|
* @returns {object} with key: values as assembled in js/server_functions.js
|
|
*/
|
|
const getEnvVars = async function () {
|
|
const res = await fetch(`${location.protocol}//${location.host}/env`);
|
|
return JSON.parse(await res.text());
|
|
};
|
|
|
|
/**
|
|
* Loops through all modules and requests start for every module.
|
|
*/
|
|
const startModules = async function () {
|
|
const modulePromises = [];
|
|
for (const module of moduleObjects) {
|
|
try {
|
|
modulePromises.push(module.start());
|
|
} catch (error) {
|
|
Log.error(`Error when starting node_helper for module ${module.name}:`);
|
|
Log.error(error);
|
|
}
|
|
}
|
|
|
|
const results = await Promise.allSettled(modulePromises);
|
|
|
|
// Log errors that happened during async node_helper startup
|
|
results.forEach((result) => {
|
|
if (result.status === "rejected") {
|
|
Log.error(result.reason);
|
|
}
|
|
});
|
|
|
|
// Notify core of loaded modules.
|
|
MM.modulesStarted(moduleObjects);
|
|
|
|
// Starting modules also hides any modules that have requested to be initially hidden
|
|
for (const thisModule of moduleObjects) {
|
|
if (thisModule.data.hiddenOnStartup) {
|
|
Log.info(`Initially hiding ${thisModule.name}`);
|
|
thisModule.hide();
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Retrieve list of all modules.
|
|
* @returns {object[]} module data as configured in config
|
|
*/
|
|
const getAllModules = function () {
|
|
const AllModules = config.modules.filter((module) => (module.module !== undefined) && (MM.getAvailableModulePositions.indexOf(module.position) > -1 || typeof (module.position) === "undefined"));
|
|
return AllModules;
|
|
};
|
|
|
|
/**
|
|
* Generate array with module information including module paths.
|
|
* @returns {object[]} Module information.
|
|
*/
|
|
const getModuleData = async function () {
|
|
const modules = getAllModules();
|
|
const moduleFiles = [];
|
|
const envVars = await getEnvVars();
|
|
|
|
modules.forEach(function (moduleData, index) {
|
|
const module = moduleData.module;
|
|
|
|
const elements = module.split("/");
|
|
const moduleName = elements[elements.length - 1];
|
|
let moduleFolder = `${envVars.modulesDir}/${module}`;
|
|
|
|
if (defaultModules.indexOf(moduleName) !== -1) {
|
|
const defaultModuleFolder = `modules/default/${module}`;
|
|
if (window.name !== "jsdom") {
|
|
moduleFolder = defaultModuleFolder;
|
|
} else {
|
|
// running in Jest, allow defaultModules placed under moduleDir for testing
|
|
if (envVars.modulesDir === "modules") {
|
|
moduleFolder = defaultModuleFolder;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (moduleData.disabled === true) {
|
|
return;
|
|
}
|
|
|
|
moduleFiles.push({
|
|
index: index,
|
|
identifier: `module_${index}_${module}`,
|
|
name: moduleName,
|
|
path: `${moduleFolder}/`,
|
|
file: `${moduleName}.js`,
|
|
position: moduleData.position,
|
|
animateIn: moduleData.animateIn,
|
|
animateOut: moduleData.animateOut,
|
|
hiddenOnStartup: moduleData.hiddenOnStartup,
|
|
header: moduleData.header,
|
|
configDeepMerge: typeof moduleData.configDeepMerge === "boolean" ? moduleData.configDeepMerge : false,
|
|
config: moduleData.config,
|
|
classes: typeof moduleData.classes !== "undefined" ? `${moduleData.classes} ${module}` : module
|
|
});
|
|
});
|
|
|
|
return moduleFiles;
|
|
};
|
|
|
|
/**
|
|
* Load modules via ajax request and create module objects.
|
|
* @param {object} module Information about the module we want to load.
|
|
* @returns {Promise<void>} resolved when module is loaded
|
|
*/
|
|
const loadModule = async function (module) {
|
|
const url = module.path + module.file;
|
|
|
|
/**
|
|
* @returns {Promise<void>}
|
|
*/
|
|
const afterLoad = async function () {
|
|
const moduleObject = Module.create(module.name);
|
|
if (moduleObject) {
|
|
await bootstrapModule(module, moduleObject);
|
|
}
|
|
};
|
|
|
|
if (loadedModuleFiles.indexOf(url) !== -1) {
|
|
await afterLoad();
|
|
} else {
|
|
await loadFile(url);
|
|
loadedModuleFiles.push(url);
|
|
await afterLoad();
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Bootstrap modules by setting the module data and loading the scripts & styles.
|
|
* @param {object} module Information about the module we want to load.
|
|
* @param {Module} mObj Modules instance.
|
|
*/
|
|
const bootstrapModule = async function (module, mObj) {
|
|
Log.info(`Bootstrapping module: ${module.name}`);
|
|
mObj.setData(module);
|
|
|
|
await mObj.loadScripts();
|
|
Log.log(`Scripts loaded for: ${module.name}`);
|
|
|
|
await mObj.loadStyles();
|
|
Log.log(`Styles loaded for: ${module.name}`);
|
|
|
|
await mObj.loadTranslations();
|
|
Log.log(`Translations loaded for: ${module.name}`);
|
|
|
|
moduleObjects.push(mObj);
|
|
};
|
|
|
|
/**
|
|
* Load a script or stylesheet by adding it to the dom.
|
|
* @param {string} fileName Path of the file we want to load.
|
|
* @returns {Promise} resolved when the file is loaded
|
|
*/
|
|
const loadFile = async function (fileName) {
|
|
const extension = fileName.slice((Math.max(0, fileName.lastIndexOf(".")) || Infinity) + 1);
|
|
let script, stylesheet;
|
|
|
|
switch (extension.toLowerCase()) {
|
|
case "js":
|
|
return new Promise((resolve) => {
|
|
Log.log(`Load script: ${fileName}`);
|
|
script = document.createElement("script");
|
|
script.type = "text/javascript";
|
|
script.src = fileName;
|
|
script.onload = function () {
|
|
resolve();
|
|
};
|
|
script.onerror = function () {
|
|
Log.error("Error on loading script:", fileName);
|
|
script.remove();
|
|
resolve();
|
|
};
|
|
document.getElementsByTagName("body")[0].appendChild(script);
|
|
});
|
|
case "css":
|
|
return new Promise((resolve) => {
|
|
Log.log(`Load stylesheet: ${fileName}`);
|
|
|
|
stylesheet = document.createElement("link");
|
|
stylesheet.rel = "stylesheet";
|
|
stylesheet.type = "text/css";
|
|
stylesheet.href = fileName;
|
|
stylesheet.onload = function () {
|
|
resolve();
|
|
};
|
|
stylesheet.onerror = function () {
|
|
Log.error("Error on loading stylesheet:", fileName);
|
|
stylesheet.remove();
|
|
resolve();
|
|
};
|
|
document.getElementsByTagName("head")[0].appendChild(stylesheet);
|
|
});
|
|
}
|
|
};
|
|
|
|
/* Public Methods */
|
|
return {
|
|
|
|
/**
|
|
* Load all modules as defined in the config.
|
|
*/
|
|
async loadModules () {
|
|
let moduleData = await getModuleData();
|
|
const envVars = await getEnvVars();
|
|
const customCss = envVars.customCss;
|
|
|
|
/**
|
|
* @returns {Promise<void>} when all modules are loaded
|
|
*/
|
|
const loadNextModule = async function () {
|
|
if (moduleData.length > 0) {
|
|
const nextModule = moduleData[0];
|
|
await loadModule(nextModule);
|
|
moduleData = moduleData.slice(1);
|
|
await loadNextModule();
|
|
} else {
|
|
// All modules loaded. Load custom.css
|
|
// This is done after all the modules so we can
|
|
// overwrite all the defined styles.
|
|
await loadFile(customCss);
|
|
// custom.css loaded. Start all modules.
|
|
await startModules();
|
|
}
|
|
};
|
|
await loadNextModule();
|
|
},
|
|
|
|
/**
|
|
* Load a file (script or stylesheet).
|
|
* Prevent double loading and search for files in the vendor folder.
|
|
* @param {string} fileName Path of the file we want to load.
|
|
* @param {Module} module The module that calls the loadFile function.
|
|
* @returns {Promise} resolved when the file is loaded
|
|
*/
|
|
async loadFileForModule (fileName, module) {
|
|
if (loadedFiles.indexOf(fileName.toLowerCase()) !== -1) {
|
|
Log.log(`File already loaded: ${fileName}`);
|
|
return;
|
|
}
|
|
|
|
if (fileName.indexOf("http://") === 0 || fileName.indexOf("https://") === 0 || fileName.indexOf("/") !== -1) {
|
|
// This is an absolute or relative path.
|
|
// Load it and then return.
|
|
loadedFiles.push(fileName.toLowerCase());
|
|
return loadFile(fileName);
|
|
}
|
|
|
|
if (vendor[fileName] !== undefined) {
|
|
// This file is available in the vendor folder.
|
|
// Load it from this vendor folder.
|
|
loadedFiles.push(fileName.toLowerCase());
|
|
return loadFile(`vendor/${vendor[fileName]}`);
|
|
}
|
|
|
|
// File not loaded yet.
|
|
// Load it based on the module path.
|
|
loadedFiles.push(fileName.toLowerCase());
|
|
return loadFile(module.file(fileName));
|
|
}
|
|
};
|
|
}());
|