mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-04-21 05:26:40 +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>
206 lines
6.1 KiB
JavaScript
206 lines
6.1 KiB
JavaScript
const fs = require("node:fs");
|
|
const path = require("node:path");
|
|
const Log = require("logger");
|
|
|
|
const startUp = new Date();
|
|
|
|
/**
|
|
* Gets the startup time.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getStartup (req, res) {
|
|
res.send(startUp);
|
|
}
|
|
|
|
/**
|
|
* A method that replaces the secret placeholders `**SECRET_ABC**` with the environment variable SECRET_ABC
|
|
* @param {string} input - the input string
|
|
* @returns {string} the input with real variable content
|
|
*/
|
|
function replaceSecretPlaceholder (input) {
|
|
return input.replaceAll(/\*\*(SECRET_[^*]+)\*\*/g, (match, group) => {
|
|
return process.env[group];
|
|
});
|
|
}
|
|
|
|
/**
|
|
* A method that forwards HTTP Get-methods to the internet to avoid CORS-errors.
|
|
*
|
|
* Example input request url: /cors?sendheaders=header1:value1,header2:value2&expectedheaders=header1,header2&url=http://www.test.com/path?param1=value1
|
|
*
|
|
* Only the url-param of the input request url is required. It must be the last parameter.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
* @returns {Promise<void>} A promise that resolves when the response is sent
|
|
*/
|
|
async function cors (req, res) {
|
|
try {
|
|
const urlRegEx = "url=(.+?)$";
|
|
let url;
|
|
|
|
const match = new RegExp(urlRegEx, "g").exec(req.url);
|
|
if (!match) {
|
|
url = `invalid url: ${req.url}`;
|
|
Log.error(url);
|
|
return res.status(400).send(url);
|
|
} else {
|
|
url = match[1];
|
|
if (typeof config !== "undefined") {
|
|
if (config.hideConfigSecrets) {
|
|
url = replaceSecretPlaceholder(url);
|
|
}
|
|
}
|
|
|
|
const headersToSend = getHeadersToSend(req.url);
|
|
const expectedReceivedHeaders = geExpectedReceivedHeaders(req.url);
|
|
Log.log(`cors url: ${url}`);
|
|
|
|
const response = await fetch(url, { headers: headersToSend });
|
|
if (response.ok) {
|
|
for (const header of expectedReceivedHeaders) {
|
|
const headerValue = response.headers.get(header);
|
|
if (header) res.set(header, headerValue);
|
|
}
|
|
const arrayBuffer = await response.arrayBuffer();
|
|
res.send(Buffer.from(arrayBuffer));
|
|
} else {
|
|
throw new Error(`Response status: ${response.status}`);
|
|
}
|
|
}
|
|
} catch (error) {
|
|
// Only log errors in non-test environments to keep test output clean
|
|
if (process.env.mmTestMode !== "true") {
|
|
Log.error(`Error in CORS request: ${error}`);
|
|
}
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Gets headers and values to attach to the web request.
|
|
* @param {string} url - The url containing the headers and values to send.
|
|
* @returns {object} An object specifying name and value of the headers.
|
|
*/
|
|
function getHeadersToSend (url) {
|
|
const headersToSend = { "User-Agent": getUserAgent() };
|
|
const headersToSendMatch = new RegExp("sendheaders=(.+?)(&|$)", "g").exec(url);
|
|
if (headersToSendMatch) {
|
|
const headers = headersToSendMatch[1].split(",");
|
|
for (const header of headers) {
|
|
const keyValue = header.split(":");
|
|
if (keyValue.length !== 2) {
|
|
throw new Error(`Invalid format for header ${header}`);
|
|
}
|
|
headersToSend[keyValue[0]] = decodeURIComponent(keyValue[1]);
|
|
}
|
|
}
|
|
return headersToSend;
|
|
}
|
|
|
|
/**
|
|
* Gets the headers expected from the response.
|
|
* @param {string} url - The url containing the expected headers from the response.
|
|
* @returns {string[]} headers - The name of the expected headers.
|
|
*/
|
|
function geExpectedReceivedHeaders (url) {
|
|
const expectedReceivedHeaders = ["Content-Type"];
|
|
const expectedReceivedHeadersMatch = new RegExp("expectedheaders=(.+?)(&|$)", "g").exec(url);
|
|
if (expectedReceivedHeadersMatch) {
|
|
const headers = expectedReceivedHeadersMatch[1].split(",");
|
|
for (const header of headers) {
|
|
expectedReceivedHeaders.push(header);
|
|
}
|
|
}
|
|
return expectedReceivedHeaders;
|
|
}
|
|
|
|
/**
|
|
* Gets the HTML to display the magic mirror.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getHtml (req, res) {
|
|
let html = fs.readFileSync(path.resolve(`${global.root_path}/index.html`), { encoding: "utf8" });
|
|
html = html.replace("#VERSION#", global.version);
|
|
html = html.replace("#TESTMODE#", global.mmTestMode);
|
|
|
|
res.send(html);
|
|
}
|
|
|
|
/**
|
|
* Gets the MagicMirror version.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getVersion (req, res) {
|
|
res.send(global.version);
|
|
}
|
|
|
|
/**
|
|
* Gets the preferred `User-Agent`
|
|
* @returns {string} `User-Agent` to be used
|
|
*/
|
|
function getUserAgent () {
|
|
const defaultUserAgent = `Mozilla/5.0 (Node.js ${Number(process.version.match(/^v(\d+\.\d+)/)[1])}) MagicMirror/${global.version}`;
|
|
|
|
if (typeof config === "undefined") {
|
|
return defaultUserAgent;
|
|
}
|
|
|
|
switch (typeof config.userAgent) {
|
|
case "function":
|
|
return config.userAgent();
|
|
case "string":
|
|
return config.userAgent;
|
|
default:
|
|
return defaultUserAgent;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Gets environment variables needed in the browser.
|
|
* @returns {object} environment variables key: values
|
|
*/
|
|
function getEnvVarsAsObj () {
|
|
const obj = { modulesDir: `${config.foreignModulesDir}`, defaultModulesDir: `${config.defaultModulesDir}`, customCss: `${config.customCss}` };
|
|
if (process.env.MM_MODULES_DIR) {
|
|
obj.modulesDir = process.env.MM_MODULES_DIR.replace(`${global.root_path}/`, "");
|
|
}
|
|
if (process.env.MM_CUSTOMCSS_FILE) {
|
|
obj.customCss = process.env.MM_CUSTOMCSS_FILE.replace(`${global.root_path}/`, "");
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
/**
|
|
* Gets environment variables needed in the browser.
|
|
* @param {Request} req - the request
|
|
* @param {Response} res - the result
|
|
*/
|
|
function getEnvVars (req, res) {
|
|
const obj = getEnvVarsAsObj();
|
|
res.send(obj);
|
|
}
|
|
|
|
/**
|
|
* Get the config file path from environment or default location
|
|
* @returns {string} The absolute config file path
|
|
*/
|
|
function getConfigFilePath () {
|
|
// Ensure root_path is set (for standalone contexts like watcher)
|
|
if (!global.root_path) {
|
|
global.root_path = path.resolve(`${__dirname}/../`);
|
|
}
|
|
|
|
// Check environment variable if global not set
|
|
if (!global.configuration_file && process.env.MM_CONFIG_FILE) {
|
|
global.configuration_file = process.env.MM_CONFIG_FILE;
|
|
}
|
|
|
|
return path.resolve(global.configuration_file || `${global.root_path}/config/config.js`);
|
|
}
|
|
|
|
module.exports = { cors, getHtml, getVersion, getStartup, getEnvVars, getEnvVarsAsObj, getUserAgent, getConfigFilePath, replaceSecretPlaceholder };
|