4b4a59534f
Run Automated Tests / code-style-check (push) Has been cancelled
Run Automated Tests / test (22.x) (push) Has been cancelled
Run Automated Tests / test (24.x) (push) Has been cancelled
Run Automated Tests / test (26.x) (push) Has been cancelled
CodeQL / Analyze (actions) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
## Release Notes Thanks to: @angeldeejay, @egeekial, @khassel, @KristjanESPERANTO, @MikeBishop, @rejas > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.36.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.36.0...develop) ### [core] - Prepare Release 2.37.0 (#4193) - fix(electron): map IPv6 :: wildcard to localhost (#4188) - refactor(main): modernize DOM update flow with async/await (#4186) - refactor(main): simplify _updateDom with async/await (#4185) - fix(security): prevent unauthorized secret expansion in socket payloads (#4184) - refactor(main): simplify updateDomWithContent async flow (#4182) - fix: modules losing data after HTTP 304 responses (#4180) - chore: add missing core defaults (#4181) - fix(server): enforce ipWhitelist for Socket.IO too (#4169) - feat(systeminfo): include Git hash and branch in system information log (#4167) - feat(electron): support object-based electronSwitches (#4161) - systeminformation thread not ending: move error handling from utils to app (#4160) - fix systeminformation thread not ending (#4155) - refactor: use ES module imports in browser core (#4158) - refactor(core): remove old Object.assign polyfill (#4157) - refactor: rewrite Module as an ES6 class (#4151) - refactor: rewrite NodeHelper as an ES6 class (#4147) - update eletron to v42 (#4144) - refactor(utils): drop ajv dependency (#4142) - fix(systeminformation): output right 'used node' version (from parent process) (#4141) - fix: skip postinstall git clean when not in a git repository (#4139) - Remove unnecessary conditionals and fix falsy property check in imperial conversion (#4135) - update version in package.json ### [dependencies] - update dependencies (#4191) - Bump actions/checkout from 6 to 7 (#4190) - chore: update dependencies and adjust import path for SunCalc (#4189) - update dependencies incl. electron and revert yauzl-electron-install-fix (#4183) - update dependencies, add electron fix in package.json (#4175) - chore: update dependencies (#4162) - Bump actions/dependency-review-action from 4 to 5 (#4152) - Unify linting: replace Stylelint and markdownlint with ESLint (#4148) - update dependencies and workflows to node v26 (#4140) ### [modules/alert] - CodeQL cleanup for alerts #18, #19, #20 (#4153) - fix: resolve CodeQL alerts #24 and #26 (#4145) - fix(electron): resolve CodeQL alerts #22 and #25 in electron.js (#4136) ### [modules/calendar] - perf(calendar): pre-filter ICS data before parsing (#4168) - perf(calendar): use async ICS parsing to avoid blocking event loop (#4143) ### [modules/newsfeed] - [newsfeed] add allowBasicHtmlTags option for basic emphasis (#4176) ### [modules/updatenotification] - fix(updatenotification): don't spawn a child process when running under PM2 (#4166) - fix(updatenotification): use process.argv[0] as restart binary (#4163) - fix(updatenotification): preserve start mode on restart (#4156) - fix(updatenotification): fix ref diff parsing for fetch --dry-run (#4138) - refactor(updatenotification): replace pm2 usage with node logic (#4134) ### [modules/weather] - feat(weather): add Buienradar provider (#4164) ### [testing] - remove warning in unit tests (for nodejs >= v25) (#4149) - polish HTTP 304 docs/test/handling (#4129) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@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: Karsten Hassel <hassel@gmx.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcel <m-idler@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Kevin G. <crazylegstoo@gmail.com> Co-authored-by: Jboucly <33218155+jboucly@users.noreply.github.com> Co-authored-by: Jboucly <contact@jboucly.fr> Co-authored-by: Jarno <54169345+jarnoml@users.noreply.github.com> Co-authored-by: Jordan Welch <JordanHWelch@gmail.com> Co-authored-by: Blackspirits <blackspirits@gmail.com> Co-authored-by: Samed Ozdemir <samed@xsor.io> Co-authored-by: in-voker <58696565+in-voker@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com> Co-authored-by: cgillinger <christian.gillinger@gmail.com> Co-authored-by: Sonny B <43247590+sonnyb9@users.noreply.github.com> Co-authored-by: sonnyb9 <sonnyb9@users.noreply.github.com> Co-authored-by: Morgan McBee <egeekial@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: Mike Bishop <mbishop@evequefou.be>
309 lines
8.6 KiB
JavaScript
309 lines
8.6 KiB
JavaScript
/* global defaultModules, vendor */
|
|
|
|
/* Module state */
|
|
|
|
const loadedModuleFiles = [];
|
|
const loadedFiles = [];
|
|
const moduleObjects = [];
|
|
|
|
/**
|
|
* Get environment variables from config.
|
|
* @returns {object} Env vars with modulesDir and customCss paths from config.
|
|
*/
|
|
function getEnvVarsFromConfig () {
|
|
return {
|
|
modulesDir: config.foreignModulesDir || "modules",
|
|
defaultModulesDir: config.defaultModulesDir || "defaultmodules",
|
|
customCss: config.customCss || "config/custom.css"
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Retrieve object of env variables.
|
|
* @returns {object} with key: values as assembled in js/server_functions.js
|
|
*/
|
|
async function getEnvVars () {
|
|
// In test mode, skip server fetch and use config values directly
|
|
if (typeof process !== "undefined" && process.env && process.env.mmTestMode === "true") {
|
|
return getEnvVarsFromConfig();
|
|
}
|
|
|
|
// In production, fetch env vars from server
|
|
try {
|
|
const res = await fetch(new URL("env", `${location.origin}${config.basePath}`));
|
|
return JSON.parse(await res.text());
|
|
} catch (error) {
|
|
// Fallback to config values if server fetch fails
|
|
Log.error("Unable to retrieve env configuration", error);
|
|
return getEnvVarsFromConfig();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Loops through all modules and requests start for every module.
|
|
*/
|
|
async function startModules () {
|
|
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
|
|
*/
|
|
function getAllModules () {
|
|
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.
|
|
*/
|
|
async function getModuleData () {
|
|
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 = `${envVars.defaultModulesDir}/${module}`;
|
|
if (window.name !== "jsdom") {
|
|
moduleFolder = defaultModuleFolder;
|
|
} else {
|
|
// running in test mode, 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,
|
|
order: (typeof moduleData.order === "number" && Number.isInteger(moduleData.order)) ? moduleData.order : 0
|
|
});
|
|
});
|
|
|
|
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
|
|
*/
|
|
async function loadModule (module) {
|
|
const url = module.path + module.file;
|
|
|
|
/**
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async function afterLoad () {
|
|
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.
|
|
*/
|
|
async function bootstrapModule (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
|
|
*/
|
|
function loadFile (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 "mjs":
|
|
return new Promise((resolve) => {
|
|
Log.log(`Load module script: ${fileName}`);
|
|
script = document.createElement("script");
|
|
script.type = "module";
|
|
script.src = fileName;
|
|
script.onload = function () {
|
|
resolve();
|
|
};
|
|
script.onerror = function () {
|
|
Log.error("Error on loading module 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 */
|
|
|
|
export const Loader = {
|
|
|
|
/**
|
|
* Load all modules as defined in the config.
|
|
*/
|
|
async loadModules () {
|
|
const moduleData = await getModuleData();
|
|
const envVars = await getEnvVars();
|
|
const customCss = envVars.customCss;
|
|
|
|
// Load all modules
|
|
for (const module of moduleData) {
|
|
await loadModule(module);
|
|
}
|
|
|
|
// Load custom.css
|
|
// Since this happens after loading the modules,
|
|
// it overwrites the default styles.
|
|
await loadFile(customCss);
|
|
|
|
// Start all modules.
|
|
await startModules();
|
|
},
|
|
|
|
/**
|
|
* Load a file (script or stylesheet).
|
|
* Prevent double loading and search for files defined in js/vendor.js.
|
|
* @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
|
|
*/
|
|
loadFileForModule (fileName, module) {
|
|
if (loadedFiles.indexOf(fileName.toLowerCase()) !== -1) {
|
|
Log.log(`File already loaded: ${fileName}`);
|
|
return Promise.resolve();
|
|
}
|
|
|
|
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 defined in js/vendor.js.
|
|
// Load it from its location.
|
|
loadedFiles.push(fileName.toLowerCase());
|
|
return loadFile(`${vendor[fileName]}`);
|
|
}
|
|
|
|
// File not loaded yet.
|
|
// Load it based on the module path.
|
|
loadedFiles.push(fileName.toLowerCase());
|
|
return loadFile(module.file(fileName));
|
|
}
|
|
};
|