mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-04-24 06:47:07 +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>
262 lines
6.7 KiB
JavaScript
262 lines
6.7 KiB
JavaScript
// Load lightweight internal alias resolver to enable require("logger")
|
|
require("../js/alias-resolver");
|
|
|
|
const { spawn } = require("node:child_process");
|
|
const fs = require("node:fs");
|
|
const path = require("node:path");
|
|
const net = require("node:net");
|
|
const http = require("node:http");
|
|
const Log = require("logger");
|
|
const { getConfigFilePath } = require("#server_functions");
|
|
|
|
const RESTART_DELAY_MS = 500;
|
|
const PORT_CHECK_MAX_ATTEMPTS = 20;
|
|
const PORT_CHECK_INTERVAL_MS = 500;
|
|
|
|
let child = null;
|
|
let restartTimer = null;
|
|
let isShuttingDown = false;
|
|
let isRestarting = false;
|
|
let serverConfig = null;
|
|
const rootDir = path.join(__dirname, "..");
|
|
|
|
/**
|
|
* Get the server configuration (port and address)
|
|
* @returns {{port: number, address: string}} The server config
|
|
*/
|
|
function getServerConfig () {
|
|
if (serverConfig) return serverConfig;
|
|
|
|
try {
|
|
const configPath = getConfigFilePath();
|
|
delete require.cache[require.resolve(configPath)];
|
|
const config = require(configPath);
|
|
serverConfig = {
|
|
port: global.mmPort || config.port || 8080,
|
|
address: config.address || "localhost"
|
|
};
|
|
} catch (err) {
|
|
serverConfig = { port: 8080, address: "localhost" };
|
|
}
|
|
|
|
return serverConfig;
|
|
}
|
|
|
|
/**
|
|
* Check if a port is available on the configured address
|
|
* @param {number} port The port to check
|
|
* @returns {Promise<boolean>} True if port is available
|
|
*/
|
|
function isPortAvailable (port) {
|
|
return new Promise((resolve) => {
|
|
const server = net.createServer();
|
|
|
|
server.once("error", () => {
|
|
resolve(false);
|
|
});
|
|
|
|
server.once("listening", () => {
|
|
server.close();
|
|
resolve(true);
|
|
});
|
|
|
|
// Use the same address as the actual server will bind to
|
|
const { address } = getServerConfig();
|
|
server.listen(port, address);
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Wait until port is available
|
|
* @param {number} port The port to wait for
|
|
* @param {number} maxAttempts Maximum number of attempts
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async function waitForPort (port, maxAttempts = PORT_CHECK_MAX_ATTEMPTS) {
|
|
for (let i = 0; i < maxAttempts; i++) {
|
|
if (await isPortAvailable(port)) {
|
|
Log.info(`Port ${port} is now available`);
|
|
return;
|
|
}
|
|
await new Promise((resolve) => setTimeout(resolve, PORT_CHECK_INTERVAL_MS));
|
|
}
|
|
Log.warn(`Port ${port} still not available after ${maxAttempts} attempts`);
|
|
}
|
|
|
|
/**
|
|
* Start the server process
|
|
*/
|
|
function startServer () {
|
|
// Start node directly instead of via npm to avoid process tree issues
|
|
child = spawn("node", ["./serveronly"], {
|
|
stdio: "inherit",
|
|
cwd: path.join(__dirname, "..")
|
|
});
|
|
|
|
child.on("error", (error) => {
|
|
Log.error("Failed to start server process:", error.message);
|
|
child = null;
|
|
});
|
|
|
|
child.on("exit", (code, signal) => {
|
|
child = null;
|
|
|
|
if (isShuttingDown) {
|
|
return;
|
|
}
|
|
|
|
if (isRestarting) {
|
|
// Expected restart - don't log as error
|
|
isRestarting = false;
|
|
} else {
|
|
// Unexpected exit
|
|
Log.error(`Server exited unexpectedly with code ${code} and signal ${signal}`);
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Send reload notification to all connected clients
|
|
*/
|
|
function notifyClientsToReload () {
|
|
const { port, address } = getServerConfig();
|
|
const options = {
|
|
hostname: address,
|
|
port: port,
|
|
path: "/reload",
|
|
method: "GET"
|
|
};
|
|
|
|
const req = http.request(options, (res) => {
|
|
if (res.statusCode === 200) {
|
|
Log.info("Reload notification sent to clients");
|
|
}
|
|
});
|
|
|
|
req.on("error", (err) => {
|
|
// Server might not be running yet, ignore
|
|
Log.debug(`Could not send reload notification: ${err.message}`);
|
|
});
|
|
|
|
req.end();
|
|
}
|
|
|
|
/**
|
|
* Restart the server process
|
|
* @param {string} reason The reason for the restart
|
|
*/
|
|
function restartServer (reason) {
|
|
if (restartTimer) clearTimeout(restartTimer);
|
|
|
|
restartTimer = setTimeout(() => {
|
|
Log.info(reason);
|
|
|
|
if (child) {
|
|
isRestarting = true;
|
|
|
|
// Get the actual port being used
|
|
const { port } = getServerConfig();
|
|
|
|
// Notify clients to reload before restart
|
|
notifyClientsToReload();
|
|
|
|
// Set up one-time listener for the exit event
|
|
child.once("exit", async () => {
|
|
// Wait until port is actually available
|
|
await waitForPort(port);
|
|
// Reset config cache in case it changed
|
|
serverConfig = null;
|
|
startServer();
|
|
});
|
|
|
|
child.kill("SIGTERM");
|
|
} else {
|
|
startServer();
|
|
}
|
|
}, RESTART_DELAY_MS);
|
|
}
|
|
|
|
/**
|
|
* Watch a specific file for changes and restart the server on change
|
|
* Watches the parent directory to handle editors that use atomic writes
|
|
* @param {string} file The file path to watch
|
|
*/
|
|
function watchFile (file) {
|
|
try {
|
|
const fileName = path.basename(file);
|
|
const dirName = path.dirname(file);
|
|
|
|
const watcher = fs.watch(dirName, (_eventType, changedFile) => {
|
|
// Only trigger for the specific file we're interested in
|
|
if (changedFile !== fileName) return;
|
|
|
|
Log.info(`[watchFile] Change detected in: ${file}`);
|
|
if (restartTimer) clearTimeout(restartTimer);
|
|
|
|
restartTimer = setTimeout(() => {
|
|
Log.info(`[watchFile] Triggering restart due to change in: ${file}`);
|
|
restartServer(`File changed: ${path.basename(file)} — restarting...`);
|
|
}, RESTART_DELAY_MS);
|
|
});
|
|
|
|
watcher.on("error", (error) => {
|
|
Log.error(`Watcher error for ${file}:`, error.message);
|
|
});
|
|
|
|
Log.log(`Watching file: ${file}`);
|
|
} catch (error) {
|
|
Log.error(`Failed to watch file ${file}:`, error.message);
|
|
}
|
|
}
|
|
|
|
startServer();
|
|
|
|
// Setup file watching based on config
|
|
try {
|
|
const configPath = getConfigFilePath();
|
|
delete require.cache[require.resolve(configPath)];
|
|
const config = require(configPath);
|
|
|
|
let watchTargets = [];
|
|
if (Array.isArray(config.watchTargets) && config.watchTargets.length > 0) {
|
|
watchTargets = config.watchTargets.filter((target) => typeof target === "string" && target.trim() !== "");
|
|
}
|
|
|
|
if (watchTargets.length === 0) {
|
|
Log.warn("Watch mode is enabled but no watchTargets are configured. No files will be monitored. Set the watchTargets array in your config.js to enable file watching.");
|
|
}
|
|
|
|
Log.log(`Watch mode enabled. Watching ${watchTargets.length} file(s)`);
|
|
|
|
// Watch each target file
|
|
for (const target of watchTargets) {
|
|
const targetPath = path.isAbsolute(target)
|
|
? target
|
|
: path.join(rootDir, target);
|
|
|
|
// Check if file exists
|
|
if (!fs.existsSync(targetPath)) {
|
|
Log.warn(`Watch target does not exist: ${targetPath}`);
|
|
continue;
|
|
}
|
|
|
|
// Check if it's a file (directories are not supported)
|
|
const stats = fs.statSync(targetPath);
|
|
if (stats.isFile()) {
|
|
watchFile(targetPath);
|
|
} else {
|
|
Log.warn(`Watch target is not a file (directories not supported): ${targetPath}`);
|
|
}
|
|
}
|
|
} catch (err) {
|
|
// Config file might not exist or be invalid, use fallback targets
|
|
Log.warn("Could not load watchTargets from config.");
|
|
}
|
|
|
|
process.on("SIGINT", () => {
|
|
isShuttingDown = true;
|
|
if (restartTimer) clearTimeout(restartTimer);
|
|
if (child) child.kill("SIGTERM");
|
|
process.exit(0);
|
|
});
|