mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-05-08 05:38:37 +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>
168 lines
5.3 KiB
JavaScript
168 lines
5.3 KiB
JavaScript
"use strict";
|
|
|
|
const http = require("node:http");
|
|
const https = require("node:https");
|
|
|
|
/**
|
|
* Get command line parameters
|
|
* Assumes that a cmdline parameter is defined with `--key [value]`
|
|
*
|
|
* example: `node clientonly --address localhost --port 8080 --use-tls`
|
|
* @param {string} key key to look for at the command line
|
|
* @param {string} defaultValue value if no key is given at the command line
|
|
* @returns {string} the value of the parameter
|
|
*/
|
|
function getCommandLineParameter (key, defaultValue = undefined) {
|
|
const index = process.argv.indexOf(`--${key}`);
|
|
const value = index > -1 ? process.argv[index + 1] : undefined;
|
|
return value !== undefined ? String(value) : defaultValue;
|
|
}
|
|
|
|
/**
|
|
* Helper function to get server address/hostname from either the commandline or env
|
|
* @returns {object} config object containing address, port, and tls properties
|
|
*/
|
|
function getServerParameters () {
|
|
const config = {};
|
|
|
|
// Prefer command line arguments over environment variables
|
|
config.address = getCommandLineParameter("address", process.env.ADDRESS);
|
|
const portValue = getCommandLineParameter("port", process.env.PORT);
|
|
config.port = portValue ? parseInt(portValue, 10) : undefined;
|
|
|
|
// determine if "--use-tls"-flag was provided
|
|
config.tls = process.argv.includes("--use-tls");
|
|
|
|
return config;
|
|
}
|
|
|
|
/**
|
|
* Gets the config from the specified server url
|
|
* @param {string} url location where the server is running.
|
|
* @returns {Promise} the config
|
|
*/
|
|
function getServerConfig (url) {
|
|
// Return new pending promise
|
|
return new Promise((resolve, reject) => {
|
|
// Select http or https module, depending on requested url
|
|
const lib = url.startsWith("https") ? https : http;
|
|
const request = lib.get(url, (response) => {
|
|
let configData = "";
|
|
|
|
// Gather incoming data
|
|
response.on("data", function (chunk) {
|
|
configData += chunk;
|
|
});
|
|
// Resolve promise at the end of the HTTP/HTTPS stream
|
|
response.on("end", function () {
|
|
try {
|
|
resolve(JSON.parse(configData));
|
|
} catch (parseError) {
|
|
reject(new Error(`Failed to parse server response as JSON: ${parseError.message}`));
|
|
}
|
|
});
|
|
});
|
|
|
|
request.on("error", function (error) {
|
|
reject(new Error(`Unable to read config from server (${url}) (${error.message})`));
|
|
});
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Print a message to the console in case of errors
|
|
* @param {string} message error message to print
|
|
* @param {number} code error code for the exit call
|
|
*/
|
|
function fail (message, code = 1) {
|
|
if (message !== undefined && typeof message === "string") {
|
|
console.error(message);
|
|
} else {
|
|
console.error("Usage: 'node clientonly --address 192.168.1.10 --port 8080 [--use-tls]'");
|
|
}
|
|
process.exit(code);
|
|
}
|
|
|
|
/**
|
|
* Starts the client by connecting to the server and launching the Electron application
|
|
* @param {object} config server configuration
|
|
* @param {string} prefix http or https prefix
|
|
* @async
|
|
*/
|
|
async function startClient (config, prefix) {
|
|
try {
|
|
const serverUrl = `${prefix}${config.address}:${config.port}/config/`;
|
|
console.log(`Client: Connecting to server at ${serverUrl}`);
|
|
const configReturn = await getServerConfig(serverUrl);
|
|
console.log("Client: Successfully retrieved config from server");
|
|
|
|
// check environment for DISPLAY or WAYLAND_DISPLAY
|
|
const elecParams = ["js/electron.js"];
|
|
if (process.env.WAYLAND_DISPLAY) {
|
|
console.log(`Client: Using WAYLAND_DISPLAY=${process.env.WAYLAND_DISPLAY}`);
|
|
elecParams.push("--enable-features=UseOzonePlatform");
|
|
elecParams.push("--ozone-platform=wayland");
|
|
} else if (process.env.DISPLAY) {
|
|
console.log(`Client: Using DISPLAY=${process.env.DISPLAY}`);
|
|
} else {
|
|
fail("Error: Requires environment variable WAYLAND_DISPLAY or DISPLAY, none is provided.");
|
|
}
|
|
|
|
// Pass along the server config via an environment variable
|
|
const env = { ...process.env };
|
|
env.clientonly = true;
|
|
const options = { env: env };
|
|
configReturn.address = config.address;
|
|
configReturn.port = config.port;
|
|
configReturn.tls = config.tls;
|
|
env.config = JSON.stringify(configReturn);
|
|
|
|
// Spawn electron application
|
|
const electron = require("electron");
|
|
const child = require("node:child_process").spawn(electron, elecParams, options);
|
|
|
|
// Pipe all child process output to current stdout
|
|
child.stdout.on("data", function (buf) {
|
|
process.stdout.write(`Client: ${buf}`);
|
|
});
|
|
|
|
// Pipe all child process errors to current stderr
|
|
child.stderr.on("data", function (buf) {
|
|
process.stderr.write(`Client: ${buf}`);
|
|
});
|
|
|
|
child.on("error", function (err) {
|
|
process.stderr.write(`Client: ${err}`);
|
|
});
|
|
|
|
child.on("close", (code) => {
|
|
if (code !== 0) {
|
|
fail(`There is something wrong. The clientonly process exited with code ${code}.`);
|
|
}
|
|
});
|
|
} catch (reason) {
|
|
fail(`Unable to connect to server: (${reason})`);
|
|
}
|
|
}
|
|
|
|
// Main execution
|
|
const config = getServerParameters();
|
|
const prefix = config.tls ? "https://" : "http://";
|
|
|
|
// Validate port
|
|
if (config.port !== undefined && (isNaN(config.port) || config.port < 1 || config.port > 65535)) {
|
|
fail(`Invalid port number: ${config.port}. Port must be between 1 and 65535.`);
|
|
}
|
|
|
|
// Only start the client if a non-local server was provided and address/port are set
|
|
const LOCAL_ADDRESSES = ["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1"];
|
|
if (
|
|
config.address
|
|
&& config.port
|
|
&& !LOCAL_ADDRESSES.includes(config.address)
|
|
) {
|
|
startClient(config, prefix);
|
|
} else {
|
|
fail();
|
|
}
|