mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 03:39:55 +00:00
## [2.25.0] - 2023-10-01 Thanks to: @bugsounet, @dgoth, @dependabot, @kenzal, @Knapoc, @KristjanESPERANTO, @martingron, @NolanKingdon, @Paranoid93, @TeddyStarinvest and @Ybbet. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you guys! You are awesome! > ⚠️ This release needs nodejs version >= `v18`, older releases have reached end of life and will not work! ### Added - Added UV Index support to OpenWeatherMap - Added 'hideDuplicates' flag to the calendar module - Added `allowOverrideNotification` to weather module to enable sending current weather objects with the `CURRENT_WEATHER_OVERRIDE` notification to supplement/replace the current weather displayed - Added optional AnimateCSS animate for `hide()`, `show()`, `updateDom()` - Added AnimateIn and animateOut in module config definition - Apply AnimateIn rules on the first start - Added automatic client page reload when server was restarted by setting `reloadAfterServerRestart: true` in `config.js`, per default `false` (#3105) - Added eventClass option for customEvents on the default calendar - Added AnimateCSS integration in tests suite (#3206) - Added npm dependabot [Reserved to developer] (#3210) - Added improved logging for calendar (#3110) ### Removed - **Breaking Change**: Removed `digest` authentication method from calendar module (which was already broken since release `2.15.0`) ### Updated - Update roboto fonts to version v5 - Update issue template - Update dev/dependencies incl. electron to v26 - Replace pretty-quick by lint-staged (<https://github.com/azz/pretty-quick/issues/164>) - Update engine node >=18. v16 reached it's end of life. (#3170) - Update typescript definition for modules - Cleaned up nunjuck templates - Replace `node-fetch` with internal fetch (#2649) and remove `digest-fetch` - Update the French translation according to the English file. - Update dependabot incl. vendor/fonts (monthly check) - Renew `package-lock.json` for release ### Fixed - Fix engine check on npm install (#3135) - Fix undefined formatTime method in clock module (#3143) - Fix clientonly startup fails after async added (#3151) - Fix electron width/heigth when using xrandr under bullseye - Fix time issue with certain recurring events in calendar module - Fix ipWhiteList test (#3179) - Fix newsfeed: Convert HTML entities, codes and tag in description (#3191) - Respect width/height (no fullscreen) if set in electronOptions (together with `fullscreen: false`) in `config.js` (#3174) - Fix: AnimateCSS merge hide() and show() animated css class when we do multiple call - Fix `Uncaught SyntaxError: Identifier 'getCorsUrl' has already been declared (at utils.js:1:1)` when using `clock` and `weather` module (#3204) - Fix overriding `config.js` when running tests (#3201) - Fix issue in weathergov provider with probability of precipitation not showing up on hourly or daily forecast --------- Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com> Co-authored-by: Dave Child <dave@addedbytes.com> Co-authored-by: grenagit <46225780+grenagit@users.noreply.github.com> Co-authored-by: Grena <grena@grenabox.fr> Co-authored-by: Magnus Marthinsen <magmar@online.no> Co-authored-by: Patrick <psieg@users.noreply.github.com> Co-authored-by: Piotr Rajnisz <56397164+rajniszp@users.noreply.github.com> Co-authored-by: Suthep Yonphimai <tomzt@users.noreply.github.com> Co-authored-by: CarJem Generations (Carter Wallace) <cwallacecs@gmail.com> Co-authored-by: Nicholas Fogal <nfogal.misc@gmail.com> Co-authored-by: JakeBinney <126349119+JakeBinney@users.noreply.github.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: Oscar Björkman <17575446+oscarb@users.noreply.github.com> Co-authored-by: Ismar Slomic <ismar@slomic.no> Co-authored-by: Jørgen Veum-Wahlberg <jorgen.wahlberg@amedia.no> Co-authored-by: Eddie Hung <6740044+eddiehung@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: bugsounet <bugsounet@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Knapoc <Knapoc@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: NolanKingdon <27908974+NolanKingdon@users.noreply.github.com> Co-authored-by: J. Kenzal Hunter <kenzal.hunter@gmail.com> Co-authored-by: Teddy <teddy.payet@gmail.com> Co-authored-by: TeddyStarinvest <teddy.payet@starinvest.com> Co-authored-by: martingron <61826403+martingron@users.noreply.github.com> Co-authored-by: dgoth <132394363+dgoth@users.noreply.github.com>
125 lines
3.9 KiB
JavaScript
125 lines
3.9 KiB
JavaScript
"use strict";
|
|
|
|
// Use separate scope to prevent global scope pollution
|
|
(function () {
|
|
const config = {};
|
|
|
|
/**
|
|
* Helper function to get server address/hostname from either the commandline or env
|
|
*/
|
|
function getServerAddress() {
|
|
/**
|
|
* Get command line parameters
|
|
* Assumes that a cmdline parameter is defined with `--key [value]`
|
|
* @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;
|
|
}
|
|
|
|
// Prefer command line arguments over environment variables
|
|
["address", "port"].forEach((key) => {
|
|
config[key] = getCommandLineParameter(key, process.env[key.toUpperCase()]);
|
|
});
|
|
|
|
// determine if "--use-tls"-flag was provided
|
|
config["tls"] = process.argv.indexOf("--use-tls") > 0;
|
|
}
|
|
|
|
/**
|
|
* 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") ? require("https") : require("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 () {
|
|
resolve(JSON.parse(configData));
|
|
});
|
|
});
|
|
|
|
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.log(message);
|
|
} else {
|
|
console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080 [--use-tls]'");
|
|
}
|
|
process.exit(code);
|
|
}
|
|
|
|
getServerAddress();
|
|
|
|
(config.address && config.port) || fail();
|
|
const prefix = config.tls ? "https://" : "http://";
|
|
|
|
// Only start the client if a non-local server was provided
|
|
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
|
|
getServerConfig(`${prefix}${config.address}:${config.port}/config/`)
|
|
.then(function (configReturn) {
|
|
// Pass along the server config via an environment variable
|
|
const env = Object.create(process.env);
|
|
env.clientonly = true; // set to pass to electron.js
|
|
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("child_process").spawn(electron, ["js/electron.js"], 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.stdout.write(`Client: ${err}`);
|
|
});
|
|
|
|
child.on("close", (code) => {
|
|
if (code !== 0) {
|
|
console.log(`There something wrong. The clientonly is not running code ${code}`);
|
|
}
|
|
});
|
|
})
|
|
.catch(function (reason) {
|
|
fail(`Unable to connect to server: (${reason})`);
|
|
});
|
|
} else {
|
|
fail();
|
|
}
|
|
})();
|