mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-04-22 05:49:32 +00:00
## Release Notes Thanks to: @angeldeejay, @in-voker, @JHWelch, @khassel, @KristjanESPERANTO, @rejas, @sdetweil > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.34.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.34.0...v2.25.0) > ⚠️ We introduced some internal changes with this release, please read [this forum post](https://forum.magicmirror.builders/topic/20138/upcoming-release-april-1-2026-breaking-changes-some-operational-changes) before upgrading! ### [core] - Prepare Release 2.35.0 (#4071) - docs: add security policy and vulnerability reporting guidelines (#4069) - refactor: simplify internal `require()` calls (#4056) - allow environment variables in cors urls (#4033) - fix cors proxy getting binary data (e.g. png, webp) (#4030) - fix: correct secret redaction and optimize loadConfig (#4031) - change loading config.js, allow variables in config.js and try to protect sensitive data (#4029) - remove kioskmode (#4027) - Add dark theme logo (#4026) - move custom.css from css to config (#4020) - move default modules from /modules/default to /defaultmodules (#4019) - update node versions in workflows (#4018) - [core] refactor: extract and centralize HTTP fetcher (#4016) - fix systeminformation not displaying electron version (#4012) - Update node-ical and support it's rrule-temporal changes (#4010) - Change default start scripts from X11 to Wayland (#4011) - refactor: unify favicon for index.html and Electron (#4006) - [core] run systeminformation in subprocess so the info is always displayed (#4002) - set next release dev number (#4000) ### [dependencies] - update dependencies (#4068) - update dependencies incl. electron to v41 (#4058) - chore: upgrade ESLint to v10 and fix newly surfaced issues (#4057) - chore: update ESLint and plugins, simplify config, apply new rules (#4052) - chore: update dependencies + add exports, files, and sideEffects fields to package.json (#4040) - [core] refactor: enable ESLint rule require-await and handle detected issues (#4038) - Update node-ical and other deps (#4025) - chore: update dependencies (#4021) - chore(eslint): migrate from eslint-plugin-vitest to @vitest/eslint-plugin and run rules only on test files (#4014) - Update deps as requested by dependabot (#4008) - update Collaboration.md and dependencies (#4001) ### [logging] - refactor: further logger clean-up (#4050) - Fix Node.js v25 logging prefix and modernize logger (#4049) ### [modules/calendar] - fix(calendar): make showEnd behavior more consistent across time formats (#4059) - test(calendar): fix hardcoded date in event shape test (#4055) - [calendar] refactor: delegate event expansion to node-ical's expandRecurringEvent (#4047) - calendar.js: remove useless hasCalendarURL function (#4028) - fix(calendar): update to node-ical 0.23.1 and fix full-day recurrence lookup (#4013) - fix(calendar): correct day-of-week for full-day recurring events across all timezones (#4004) ### [modules/newsfeed] - fix(newsfeed): fix full article view and add framing check (#4039) - [newsfeed] refactor: migrate to centralized HTTPFetcher (#4023) ### [modules/weather] - fix(weather): fix openmeteo forecast stuck in the past (#4064) - fix(weather): fix weathergov forecast day labels off by one (#4065) - weather: fixes for templates (#4054) - weather: add possibility to override njk's and css (#4051) - Use getDateString in openmeteo (#4046) - [weather] refactor: migrate to server-side providers with centralized HTTPFetcher (#4032) - [weather] feat: add Weather API Provider (#4036) ### [testing] - chore: remove obsolete Jest config and unit test global setup (#4044) - replace template_spec test with config_variables test (#4034) - refactor(clientonly): modernize code structure and add comprehensive tests (#4022) - Switch to undici Agent for HTTPS requests (#4015) - chore: migrate CI workflows to ubuntu-slim for faster startup times (#4007) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Veeck <github@veeck.de> 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> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: Marcel <m-idler@users.noreply.github.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>
294 lines
9.6 KiB
JavaScript
294 lines
9.6 KiB
JavaScript
const fs = require("node:fs");
|
|
const { loadEnvFile } = require("node:process");
|
|
|
|
const modulePositions = []; // will get list from index.html
|
|
const regionRegEx = /"region ([^"]*)/i;
|
|
const indexFileName = "index.html";
|
|
const discoveredPositionsJSFilename = "js/positions.js";
|
|
|
|
const { styleText } = require("node:util");
|
|
const Log = require("logger");
|
|
const Ajv = require("ajv");
|
|
const globals = require("globals");
|
|
const { Linter } = require("eslint");
|
|
const { getConfigFilePath } = require("#server_functions");
|
|
|
|
const linter = new Linter({ configType: "flat" });
|
|
const ajv = new Ajv();
|
|
|
|
const requireFromString = (src) => {
|
|
const m = new module.constructor();
|
|
m._compile(src, "");
|
|
return m.exports;
|
|
};
|
|
|
|
// return all available module positions
|
|
const getAvailableModulePositions = () => {
|
|
return modulePositions;
|
|
};
|
|
|
|
// return if position is on modulePositions Array (true/false)
|
|
const moduleHasValidPosition = (position) => {
|
|
if (getAvailableModulePositions().indexOf(position) === -1) return false;
|
|
return true;
|
|
};
|
|
|
|
const getModulePositions = () => {
|
|
// if not already discovered
|
|
if (modulePositions.length === 0) {
|
|
// get the lines of the index.html
|
|
const lines = fs.readFileSync(indexFileName).toString().split("\n");
|
|
// loop thru the lines
|
|
lines.forEach((line) => {
|
|
// run the regex on each line
|
|
const results = regionRegEx.exec(line);
|
|
// if the regex returned something
|
|
if (results && results.length > 0) {
|
|
// get the position parts and replace space with underscore
|
|
const positionName = results[1].replace(" ", "_");
|
|
// add it to the list only if not already present (avoid duplicates)
|
|
if (!modulePositions.includes(positionName)) {
|
|
modulePositions.push(positionName);
|
|
}
|
|
}
|
|
});
|
|
try {
|
|
fs.writeFileSync(discoveredPositionsJSFilename, `const modulePositions=${JSON.stringify(modulePositions)}`);
|
|
}
|
|
catch (error) {
|
|
Log.error("unable to write js/positions.js with the discovered module positions\nmake the MagicMirror/js folder writeable by the user starting MagicMirror");
|
|
}
|
|
}
|
|
// return the list to the caller
|
|
return modulePositions;
|
|
};
|
|
|
|
/**
|
|
* Checks the config for deprecated options and throws a warning in the logs
|
|
* if it encounters one option from the deprecated.js list
|
|
* @param {object} userConfig The user config
|
|
*/
|
|
const checkDeprecatedOptions = (userConfig) => {
|
|
const deprecated = require(`${global.root_path}/js/deprecated`);
|
|
|
|
// check for deprecated core options
|
|
const deprecatedOptions = deprecated.configs;
|
|
const usedDeprecated = deprecatedOptions.filter((option) => userConfig.hasOwnProperty(option));
|
|
if (usedDeprecated.length > 0) {
|
|
Log.warn(`WARNING! Your config is using deprecated option(s): ${usedDeprecated.join(", ")}. Check README and Documentation for more up-to-date ways of getting the same functionality.`);
|
|
}
|
|
|
|
// check for deprecated module options
|
|
for (const element of userConfig.modules) {
|
|
if (deprecated[element.module] !== undefined && element.config !== undefined) {
|
|
const deprecatedModuleOptions = deprecated[element.module];
|
|
const usedDeprecatedModuleOptions = deprecatedModuleOptions.filter((option) => element.config.hasOwnProperty(option));
|
|
if (usedDeprecatedModuleOptions.length > 0) {
|
|
Log.warn(`WARNING! Your config for module ${element.module} is using deprecated option(s): ${usedDeprecatedModuleOptions.join(", ")}. Check README and Documentation for more up-to-date ways of getting the same functionality.`);
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Loads the config file. Combines it with the defaults and returns the config
|
|
* @returns {object} an object holding full and redacted config
|
|
*/
|
|
const loadConfig = () => {
|
|
Log.log("Loading config ...");
|
|
const defaults = require("./defaults");
|
|
if (global.mmTestMode) {
|
|
// if we are running in test mode
|
|
defaults.address = "0.0.0.0";
|
|
}
|
|
|
|
// For this check proposed to TestSuite
|
|
// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
|
|
const configFilename = getConfigFilePath();
|
|
let templateFile = `${configFilename}.template`;
|
|
|
|
// check if templateFile exists
|
|
try {
|
|
fs.accessSync(templateFile, fs.constants.F_OK);
|
|
Log.warn("config.js.template files are deprecated and not used anymore. You can use variables inside config.js so copy the template file content into config.js if needed.");
|
|
} catch (error) {
|
|
// no action
|
|
}
|
|
|
|
// check if config.env exists
|
|
const configEnvFile = `${configFilename.substr(0, configFilename.lastIndexOf("."))}.env`;
|
|
try {
|
|
if (fs.existsSync(configEnvFile)) {
|
|
// load content into process.env
|
|
loadEnvFile(configEnvFile);
|
|
}
|
|
} catch (error) {
|
|
Log.log(`${configEnvFile} does not exist. ${error.message}`);
|
|
}
|
|
|
|
// Load config.js and catch errors if not accessible
|
|
try {
|
|
let configContent = fs.readFileSync(configFilename, "utf-8");
|
|
const hideConfigSecrets = configContent.match(/^\s*hideConfigSecrets: true.*$/m);
|
|
let configContentFull = configContent;
|
|
let configContentRedacted = hideConfigSecrets ? configContent : undefined;
|
|
Object.keys(process.env).forEach((env) => {
|
|
configContentFull = configContentFull.replaceAll(`\${${env}}`, process.env[env]);
|
|
if (hideConfigSecrets) {
|
|
if (env.startsWith("SECRET_")) {
|
|
configContentRedacted = configContentRedacted.replaceAll(`"\${${env}}"`, `"**${env}**"`);
|
|
configContentRedacted = configContentRedacted.replaceAll(`\${${env}}`, `**${env}**`);
|
|
} else {
|
|
configContentRedacted = configContentRedacted.replaceAll(`\${${env}}`, process.env[env]);
|
|
}
|
|
}
|
|
});
|
|
configContentRedacted = configContentRedacted ? configContentRedacted : configContentFull;
|
|
const configObj = {
|
|
configFilename: configFilename,
|
|
configContentFull: configContentFull,
|
|
configContentRedacted: configContentRedacted,
|
|
redactedConf: Object.assign({}, defaults, requireFromString(configContentRedacted)),
|
|
fullConf: Object.assign({}, defaults, requireFromString(configContentFull))
|
|
};
|
|
|
|
if (Object.keys(configObj.fullConf).length === 0) {
|
|
Log.error("WARNING! Config file appears empty, maybe missing module.exports last line?");
|
|
}
|
|
checkDeprecatedOptions(configObj.fullConf);
|
|
|
|
try {
|
|
const cfg = `let config = { basePath: "${configObj.fullConf.basePath}"};`;
|
|
fs.writeFileSync(`${global.root_path}/config/basepath.js`, cfg, "utf-8");
|
|
} catch (error) {
|
|
Log.error(`Could not write config/basepath.js file: ${error.message}`);
|
|
}
|
|
|
|
return configObj;
|
|
|
|
} catch (error) {
|
|
if (error.code === "ENOENT") {
|
|
Log.error(`Could not find config file: ${configFilename}`);
|
|
} else if (error.code === "EACCES") {
|
|
Log.error(`No permission to read config file: ${configFilename}`);
|
|
} else {
|
|
Log.error(`Cannot access config file: ${configFilename}\n${error.message}`);
|
|
}
|
|
process.exit(1);
|
|
}
|
|
return {};
|
|
};
|
|
|
|
/**
|
|
* Checks the config file using eslint.
|
|
* @param {object} configObject the configuration object
|
|
*/
|
|
const checkConfigFile = (configObject) => {
|
|
let configObj = configObject;
|
|
if (!configObj) configObj = loadConfig();
|
|
const configFileName = configObj.configFilename;
|
|
|
|
// Validate syntax of the configuration file.
|
|
Log.info(`Checking config file ${configFileName} ...`);
|
|
|
|
// I'm not sure if all ever is utf-8
|
|
const configFile = configObj.configContentFull;
|
|
|
|
const errors = linter.verify(
|
|
configFile,
|
|
{
|
|
languageOptions: {
|
|
ecmaVersion: "latest",
|
|
globals: {
|
|
...globals.browser,
|
|
...globals.node
|
|
}
|
|
},
|
|
rules: {
|
|
"no-sparse-arrays": "error",
|
|
"no-undef": "error"
|
|
}
|
|
},
|
|
configFileName
|
|
);
|
|
|
|
if (errors.length === 0) {
|
|
Log.info(styleText("green", "Your configuration file doesn't contain syntax errors :)"));
|
|
validateModulePositions(configObj.fullConf);
|
|
} else {
|
|
let errorMessage = "Your configuration file contains syntax errors :(";
|
|
|
|
for (const error of errors) {
|
|
errorMessage += `\nLine ${error.line} column ${error.column}: ${error.message}`;
|
|
}
|
|
Log.error(errorMessage);
|
|
process.exit(1);
|
|
}
|
|
};
|
|
|
|
/**
|
|
*
|
|
* @param {string} data - The content of the configuration file to validate.
|
|
*/
|
|
const validateModulePositions = (data) => {
|
|
Log.info("Checking modules structure configuration ...");
|
|
|
|
const positionList = getModulePositions();
|
|
|
|
// Make Ajv schema configuration of modules config
|
|
// Only scan "module" and "position"
|
|
const schema = {
|
|
type: "object",
|
|
properties: {
|
|
modules: {
|
|
type: "array",
|
|
items: {
|
|
type: "object",
|
|
properties: {
|
|
module: {
|
|
type: "string"
|
|
},
|
|
position: {
|
|
type: "string"
|
|
}
|
|
},
|
|
required: ["module"]
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
// Scan all modules
|
|
const validate = ajv.compile(schema);
|
|
|
|
const valid = validate(data);
|
|
if (valid) {
|
|
Log.info(styleText("green", "Your modules structure configuration doesn't contain errors :)"));
|
|
|
|
// Check for unknown positions (warning only, not an error)
|
|
if (data.modules) {
|
|
for (const [index, module] of data.modules.entries()) {
|
|
if (module.position && !positionList.includes(module.position)) {
|
|
Log.warn(`Module ${index} ("${module.module}") uses unknown position: "${module.position}"`);
|
|
Log.warn(`Known positions are: ${positionList.join(", ")}`);
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
const module = validate.errors[0].instancePath.split("/")[2];
|
|
const position = validate.errors[0].instancePath.split("/")[3];
|
|
let errorMessage = "This module configuration contains errors:";
|
|
errorMessage += `\n${JSON.stringify(data.modules[module], null, 2)}`;
|
|
if (position) {
|
|
errorMessage += `\n${position}: ${validate.errors[0].message}`;
|
|
errorMessage += `\n${JSON.stringify(validate.errors[0].params.allowedValues, null, 2).slice(1, -1)}`;
|
|
} else {
|
|
errorMessage += validate.errors[0].message;
|
|
}
|
|
Log.error(errorMessage);
|
|
process.exit(1);
|
|
}
|
|
};
|
|
|
|
module.exports = { loadConfig, getModulePositions, moduleHasValidPosition, getAvailableModulePositions, checkConfigFile };
|