mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-05-09 14:18:33 +00:00
## Release Notes Thanks to: @cgillinger, @khassel, @KristjanESPERANTO, @sonnyb9 > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.35.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.35.0...v2.36.0) This release falls outside the quarterly schedule. We opted for an early release due to: - Security fix for the internal cors proxy - API change of the weather provider smi - Several bug fixes ### Breaking Changes The cors proxy is now disabled by default. If required, it must be explicitly enabled in the `config.js` file. See the [documentation](https://docs.magicmirror.builders/configuration/cors.html). ### ⚠️ Security You can find several publicly accessible MagicMirror² instances. This should never be done. Doing so makes your entire configuration, including secrets and API keys, publicly visible. Furthermore, it allows attackers to target the host; this is only prevented beginning with this release. Public MagicMirror² instances should always run behind a reverse proxy with authentication. ### [core] - Prepare Release 2.36.0 (#4126) - Allow HTTPFetcher to pass through 304 responses (#4120) - fix(http-fetcher): fall back to reloadInterval after retries exhausted (#4113) - config endpoint must handle functions in module configs (#4106) - fix replaceSecretPlaceholder (#4104) - restrict replaceSecretPlaceholder to cors with allowWhitelist (#4102) - fix: prevent crash when config is undefined in socket handler (#4096) - fix cors function for alpine linux (#4091) - fix(cors): prevent SSRF via DNS rebinding (#4090) - add option to disable or restrict cors endpoint (#4087) - fix: prevent SSRF via /cors endpoint by blocking private/reserved IPs (#4084) - chore: add permissions section to enforce pull-request rules workflow (#4079) - update version for develop ### [dependencies] - update dependencies (#4124) - chore: update dependencies (#4088) - refactor: enable ESLint rule "no-unused-vars" and handle related issues (#4080) ### [modules/newsfeed] - fix(newsfeed): prevent duplicate parse error callback when using pipeline (#4083) ### [modules/updatenotification] - fix(updatenotification): harden git command execution + simplify checkUpdates (#4115) - fix(tests): correct import path for git_helper module in updatenotification tests (#4078) ### [modules/weather] - fix(weather): use nearest openmeteo hourly data (#4123) - fix(weather): avoid loading state after reconnect (#4121) - weather: fix UV index display and add WeatherFlow precipitation (#4108) - fix(weather): restore OpenWeatherMap v2.5 support (#4101) - fix(weather): use stable instanceId to prevent duplicate fetchers (#4092) - SMHI: migrate to SNOW1gv1 API (replace deprecated PMP3gv2) (#4082) ### [testing] - ci(actions): set explicit token permissions (#4114) - fix(http_fetcher): use undici.fetch when dispatcher is present (#4097) - ci(codeql): also scan develop branch on push and PR (#4086) - refactor: replace implicit global config with explicit global.config (#4085) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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: Bugsounet - Cédric <github@bugsounet.fr> 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> 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>
115 lines
3.8 KiB
JavaScript
115 lines
3.8 KiB
JavaScript
// Logger for MagicMirror² — works both in Node.js (CommonJS) and the browser (global).
|
|
(function () {
|
|
if (typeof module !== "undefined") {
|
|
if (process.env.mmTestMode !== "true") {
|
|
const { styleText } = require("node:util");
|
|
|
|
const LABEL_COLORS = { error: "red", warn: "yellow", debug: "bgBlue", info: "blue" };
|
|
const MSG_COLORS = { error: "red", warn: "yellow", info: "blue" };
|
|
|
|
const formatTimestamp = () => {
|
|
const d = new Date();
|
|
const pad2 = (n) => String(n).padStart(2, "0");
|
|
const pad3 = (n) => String(n).padStart(3, "0");
|
|
const date = `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`;
|
|
const time = `${pad2(d.getHours())}:${pad2(d.getMinutes())}:${pad2(d.getSeconds())}.${pad3(d.getMilliseconds())}`;
|
|
return `[${date} ${time}]`;
|
|
};
|
|
|
|
const getCallerPrefix = () => {
|
|
try {
|
|
const lines = new Error().stack.split("\n");
|
|
for (const line of lines) {
|
|
if (line.includes("node:") || line.includes("js/logger.js") || line.includes("node_modules")) continue;
|
|
const match = line.match(/\((.+?\.js):\d+:\d+\)/) || line.match(/at\s+(.+?\.js):\d+:\d+/);
|
|
if (match) {
|
|
const file = match[1];
|
|
const baseName = file.replace(/.*\/(.*)\.js/, "$1");
|
|
const parentDir = file.replace(/.*\/(.*)\/.*\.js/, "$1");
|
|
return styleText("gray", parentDir === "js" ? `[${baseName}]` : `[${parentDir}]`);
|
|
}
|
|
}
|
|
} catch { /* ignore */ }
|
|
return styleText("gray", "[unknown]");
|
|
};
|
|
|
|
// Patch console methods to prepend timestamp, level label, and caller prefix.
|
|
for (const method of ["debug", "log", "info", "warn", "error"]) {
|
|
const original = console[method].bind(console);
|
|
const labelRaw = `[${method.toUpperCase()}]`.padEnd(7);
|
|
const label = LABEL_COLORS[method] ? styleText(LABEL_COLORS[method], labelRaw) : labelRaw;
|
|
console[method] = (...args) => {
|
|
const prefix = `${formatTimestamp()} ${label} ${getCallerPrefix()}`;
|
|
const msgColor = MSG_COLORS[method];
|
|
if (msgColor && args.length > 0 && typeof args[0] === "string") {
|
|
original(prefix, styleText(msgColor, args[0]), ...args.slice(1));
|
|
} else {
|
|
original(prefix, ...args);
|
|
}
|
|
};
|
|
}
|
|
}
|
|
// Node, CommonJS
|
|
module.exports = makeLogger();
|
|
} else {
|
|
// Browser globals
|
|
window.Log = makeLogger();
|
|
}
|
|
|
|
/**
|
|
* Creates the logger object. Logging is disabled when running in test mode
|
|
* (Node.js) or inside jsdom (browser).
|
|
* @returns {object} The logger object with log level methods.
|
|
*/
|
|
function makeLogger () {
|
|
const enableLog = typeof module !== "undefined"
|
|
? process.env.mmTestMode !== "true"
|
|
: typeof window === "object" && window.name !== "jsdom";
|
|
|
|
let logLevel;
|
|
|
|
if (enableLog) {
|
|
logLevel = {
|
|
debug: console.debug.bind(console),
|
|
log: console.log.bind(console),
|
|
info: console.info.bind(console),
|
|
warn: console.warn.bind(console),
|
|
error: console.error.bind(console),
|
|
group: console.group.bind(console),
|
|
groupCollapsed: console.groupCollapsed.bind(console),
|
|
groupEnd: console.groupEnd.bind(console),
|
|
time: console.time.bind(console),
|
|
timeEnd: console.timeEnd.bind(console),
|
|
timeStamp: console.timeStamp.bind(console)
|
|
};
|
|
|
|
// Only these methods are affected by setLogLevel.
|
|
// Utility methods (group, time, etc.) are always active.
|
|
logLevel.setLogLevel = function (newLevel) {
|
|
for (const key of ["debug", "log", "info", "warn", "error"]) {
|
|
const disabled = newLevel && !newLevel.includes(key.toUpperCase());
|
|
logLevel[key] = disabled ? function () {} : console[key].bind(console);
|
|
}
|
|
};
|
|
} else {
|
|
logLevel = {
|
|
debug () {},
|
|
log () {},
|
|
info () {},
|
|
warn () {},
|
|
error () {},
|
|
group () {},
|
|
groupCollapsed () {},
|
|
groupEnd () {},
|
|
time () {},
|
|
timeEnd () {},
|
|
timeStamp () {}
|
|
};
|
|
|
|
logLevel.setLogLevel = function () {};
|
|
}
|
|
|
|
return logLevel;
|
|
}
|
|
}());
|