mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-04-24 22:47:08 -04:00
## [2.30.0] - 2025-01-01 Thanks to: @xsorifc28, @HeikoGr, @bugsounet, @khassel, @KristjanESPERANTO, @rejas, @sdetweil. > ⚠️ This release needs nodejs version `v20` or `v22 or higher`, minimum version is `v20.18.1` ### Added - [core] Add wayland and windows start options to `package.json` (#3594) - [docs] Add step for npm publishing in release process (#3595) - [core] Add GitHub workflow to run spellcheck a few days before each release (#3623) - [core] Add test flag to `index.html` to pass to module js for test mode detection (needed by #3630) - [core] Add export on animation names (#3644) - [compliments] Add support for refreshing remote compliments file, and test cases (#3630) - [linter] Re-add `eslint-plugin-import`now that it supports ESLint v9 (#3586) - [linter] Re-activate `eslint-plugin-package-json` to lint `package.json` (#3643) - [linter] Add linting for markdown files (#3646) - [linter] Add some handy ESLint rules. - [calendar] Add ability to display end date for full date events, where end is not same day (showEnd=true) (#3650) - [core] Add text to the config.js.sample file about the locale variable (#3654, #3655) - [core] Add fetch timeout for all node_helpers (thru undici, forces node 20.18.1 minimum) to help on slower systems. (#3660) (3661) ### Changed - [core] Run code style checks in workflow only once (#3648) - [core] Fix animations export #3644 only on server side (#3649) - [core] Use project URL in fallback config (#3656) - [core] Fix Access Denied crash writing js/positions.js (on synology nas) #3651. new message, MM starts, but no modules showing (#3652) - [linter] Switch to 'npx' for lint-staged in pre-commit hook (#3658) ### Removed - [tests] Remove `node-pty` and `drivelist` from rebuilded test (#3575) - [deps] Remove `@eslint/js` dependency. Already installed with `eslint` in deep (#3636) ### Updated - [repo] Reactivate `stale.yaml` as GitHub action to mark issues as stale after 60 days and close them 7 days later (if no activity) (#3577, #3580, #3581) - [core] Update electron dependency to v32 (test electron rebuild) and all other dependencies too (#3657) - [tests] All test configs have been updated to allow full external access, allowing for easier debugging (especially when running as a container) - [core] Run and test with node 23 (#3588) - [workflow] delete exception `allow-ghsas: GHSA-8hc4-vh64-cxmj` in `dep-review.yaml` (#3659) ### Fixed - [updatenotification] Fix pm2 using detection when pm2 script is inside or outside MagicMirror root folder (#3576) (#3605) (#3626) (#3628) - [core] Fix loading node_helper of modules: avoid black screen, display errors and continue loading with next module (#3578) - [weather] Change default value for weatherEndpoint of provider openweathermap to "/onecall" (#3574) - [tests] Fix electron tests with mock dates, the mock on server side was missing (#3597) - [tests] Fix testcases with hard coded Date.now (#3597) - [core] Fix missing `basePath` where `location.host` is used (#3613) - [compliments] croner library changed filenames used in latest version (#3624) - [linter] Fix ESLint ignore pattern which caused that default modules not to be linted (#3632) - [core] Fix module path in case of sub/sub folder is used and use path.resolve for resolve `moduleFolder` and `defaultModuleFolder` in app.js (#3653) - [calendar] Update to resolve issues #3098 #3144 #3351 #3422 #3443 #3467 #3537 related to timezone changes - [calendar] Fix #3267 (styles array), also fixes event with both exdate AND recurrence(and testcase) - [calendar] Fix showEndsOnlyWithDuration not working, #3598, applies ONLY to full day events - [calendar] Fix showEnd for Full Day events (#3602) - [tests] Suppress "module is not defined" in e2e tests (#3647) - [calendar] Fix #3267 (styles array, really this time!) - [core] Fix #3662 js/positions.js created incorrectly --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michael Teeuw <michael@xonaymedia.nl> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Ross Younger <crazyscot@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: jkriegshauser <joshuakr@nvidia.com> Co-authored-by: illimarkangur <116028111+illimarkangur@users.noreply.github.com> Co-authored-by: vppencilsharpener <tim.pray@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: Brian O'Connor <btoconnor@users.noreply.github.com> Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com> Co-authored-by: Jason Stieber <jrstieber@gmail.com> Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com> Co-authored-by: Daniel <32464403+dkallen78@users.noreply.github.com> Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com> Co-authored-by: Panagiotis Skias <panagiotis.skias@gmail.com> Co-authored-by: Marc Landis <dirk.rettschlag@gmail.com> Co-authored-by: HeikoGr <20295490+HeikoGr@users.noreply.github.com> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com> Co-authored-by: veeck <gitkraken@veeck.de>
232 lines
7.1 KiB
JavaScript
232 lines
7.1 KiB
JavaScript
const Exec = require("node:child_process").exec;
|
|
const Spawn = require("node:child_process").spawn;
|
|
const fs = require("node:fs");
|
|
|
|
const Log = require("logger");
|
|
|
|
/*
|
|
* class Updater
|
|
* Allow to self updating 3rd party modules from command defined in config
|
|
*
|
|
* [constructor] read value in config:
|
|
* updates: [ // array of modules update commands
|
|
* {
|
|
* <module name>: <update command>
|
|
* },
|
|
* {
|
|
* ...
|
|
* }
|
|
* ],
|
|
* updateTimeout: 2 * 60 * 1000, // max update duration
|
|
* updateAutorestart: false // autoRestart MM when update done ?
|
|
*
|
|
* [main command]: parse(<Array of modules>):
|
|
* parse if module update is needed
|
|
* --> Apply ONLY one update (first of the module list)
|
|
* --> auto-restart MagicMirror or wait manual restart by user
|
|
* return array with modules update state information for `updatenotification` module displayer information
|
|
* [
|
|
* {
|
|
* name = <module-name>, // name of the module
|
|
* updateCommand = <update command>, // update command (if found)
|
|
* inProgress = <boolean>, // an update if in progress for this module
|
|
* error = <boolean>, // an error if detected when updating
|
|
* updated = <boolean>, // updated successfully
|
|
* needRestart = <boolean> // manual restart of MagicMirror is required by user
|
|
* },
|
|
* {
|
|
* ...
|
|
* }
|
|
* ]
|
|
*/
|
|
|
|
class Updater {
|
|
constructor (config) {
|
|
this.updates = config.updates;
|
|
this.timeout = config.updateTimeout;
|
|
this.autoRestart = config.updateAutorestart;
|
|
this.moduleList = {};
|
|
this.updating = false;
|
|
this.usePM2 = false; // don't use pm2 by default
|
|
this.PM2Id = null; // pm2 process number
|
|
this.version = global.version;
|
|
this.root_path = global.root_path;
|
|
Log.info("updatenotification: Updater Class Loaded!");
|
|
}
|
|
|
|
// [main command] parse if module update is needed
|
|
async parse (modules) {
|
|
var parser = modules.map(async (module) => {
|
|
if (this.moduleList[module.module] === undefined) {
|
|
this.moduleList[module.module] = {};
|
|
this.moduleList[module.module].name = module.module;
|
|
this.moduleList[module.module].updateCommand = await this.applyCommand(module.module);
|
|
this.moduleList[module.module].inProgress = false;
|
|
this.moduleList[module.module].error = null;
|
|
this.moduleList[module.module].updated = false;
|
|
this.moduleList[module.module].needRestart = false;
|
|
}
|
|
if (!this.moduleList[module.module].inProgress) {
|
|
if (!this.updating) {
|
|
if (!this.moduleList[module.module].updateCommand) {
|
|
this.updating = false;
|
|
} else {
|
|
this.updating = true;
|
|
this.moduleList[module.module].inProgress = true;
|
|
Object.assign(this.moduleList[module.module], await this.updateProcess(this.moduleList[module.module]));
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
await Promise.all(parser);
|
|
let updater = Object.values(this.moduleList);
|
|
Log.debug("updatenotification Update Result:", updater);
|
|
return updater;
|
|
}
|
|
|
|
/*
|
|
* module updater with his proper command
|
|
* return object as result
|
|
* {
|
|
* error: <boolean>, // if error detected
|
|
* updated: <boolean>, // if updated successfully
|
|
* needRestart: <boolean> // if magicmirror restart required
|
|
* };
|
|
*/
|
|
updateProcess (module) {
|
|
let Result = {
|
|
error: false,
|
|
updated: false,
|
|
needRestart: false
|
|
};
|
|
let Command = null;
|
|
const Path = `${this.root_path}/modules/`;
|
|
const modulePath = Path + module.name;
|
|
|
|
if (module.updateCommand) {
|
|
Command = module.updateCommand;
|
|
} else {
|
|
Log.warn(`updatenotification: Update of ${module.name} is not supported.`);
|
|
return Result;
|
|
}
|
|
Log.info(`updatenotification: Updating ${module.name}...`);
|
|
|
|
return new Promise((resolve) => {
|
|
Exec(Command, { cwd: modulePath, timeout: this.timeout }, (error, stdout, stderr) => {
|
|
if (error) {
|
|
Log.error(`updatenotification: exec error: ${error}`);
|
|
Result.error = true;
|
|
} else {
|
|
Log.info(`updatenotification: Update logs of ${module.name}: ${stdout}`);
|
|
Result.updated = true;
|
|
if (this.autoRestart) {
|
|
Log.info("updatenotification: Update done");
|
|
setTimeout(() => this.restart(), 3000);
|
|
} else {
|
|
Log.info("updatenotification: Update done, don't forget to restart MagicMirror!");
|
|
Result.needRestart = true;
|
|
}
|
|
}
|
|
resolve(Result);
|
|
});
|
|
});
|
|
}
|
|
|
|
// restart rules (pm2 or npm start)
|
|
restart () {
|
|
if (this.usePM2) this.pm2Restart();
|
|
else this.npmRestart();
|
|
}
|
|
|
|
// restart MagicMiror with "pm2": use PM2Id for restart it
|
|
pm2Restart () {
|
|
Log.info("updatenotification: PM2 will restarting MagicMirror...");
|
|
const pm2 = require("pm2");
|
|
pm2.restart(this.PM2Id, (err, proc) => {
|
|
if (err) {
|
|
Log.error("updatenotification:[PM2] restart Error", err);
|
|
}
|
|
});
|
|
}
|
|
|
|
// restart MagicMiror with "npm start"
|
|
npmRestart () {
|
|
Log.info("updatenotification: Restarting MagicMirror...");
|
|
const out = process.stdout;
|
|
const err = process.stderr;
|
|
const subprocess = Spawn("npm start", { cwd: this.root_path, shell: true, detached: true, stdio: ["ignore", out, err] });
|
|
subprocess.unref(); // detach the newly launched process from the master process
|
|
process.exit();
|
|
}
|
|
|
|
// Check using pm2
|
|
check_PM2_Process () {
|
|
Log.info("updatenotification: Checking PM2 using...");
|
|
return new Promise((resolve) => {
|
|
if (fs.existsSync("/.dockerenv")) {
|
|
Log.info("updatenotification: Running in docker container, not using PM2 ...");
|
|
resolve(false);
|
|
return;
|
|
}
|
|
|
|
if (process.env.unique_id === undefined) {
|
|
Log.info("updatenotification: [PM2] You are not using pm2");
|
|
resolve(false);
|
|
return;
|
|
}
|
|
|
|
Log.debug(`updatenotification: [PM2] Search for pm2 id: ${process.env.pm_id} -- name: ${process.env.name} -- unique_id: ${process.env.unique_id}`);
|
|
|
|
const pm2 = require("pm2");
|
|
pm2.connect((err) => {
|
|
if (err) {
|
|
Log.error("updatenotification: [PM2]", err);
|
|
resolve(false);
|
|
return;
|
|
}
|
|
pm2.list((err, list) => {
|
|
if (err) {
|
|
Log.error("updatenotification: [PM2] Can't get process List!");
|
|
resolve(false);
|
|
return;
|
|
}
|
|
list.forEach((pm) => {
|
|
Log.debug(`updatenotification: [PM2] found pm2 process id: ${pm.pm_id} -- name: ${pm.name} -- unique_id: ${pm.pm2_env.unique_id}`);
|
|
if (pm.pm2_env.status === "online" && process.env.name === pm.name && +process.env.pm_id === +pm.pm_id && process.env.unique_id === pm.pm2_env.unique_id) {
|
|
this.PM2Id = pm.pm_id;
|
|
this.usePM2 = true;
|
|
Log.info(`updatenotification: [PM2] You are using pm2 with id: ${this.PM2Id} (${pm.name})`);
|
|
resolve(true);
|
|
} else {
|
|
Log.debug(`updatenotification: [PM2] pm2 process id: ${pm.pm_id} don't match...`);
|
|
}
|
|
});
|
|
pm2.disconnect();
|
|
if (!this.usePM2) {
|
|
Log.info("updatenotification: [PM2] You are not using pm2");
|
|
resolve(false);
|
|
}
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
// check if module is MagicMirror
|
|
isMagicMirror (module) {
|
|
if (module === "MagicMirror") return true;
|
|
return false;
|
|
}
|
|
|
|
// search update module command
|
|
applyCommand (module) {
|
|
if (this.isMagicMirror(module.module) || !this.updates.length) return null;
|
|
let command = null;
|
|
this.updates.forEach((updater) => {
|
|
if (updater[module]) command = updater[module];
|
|
});
|
|
return command;
|
|
}
|
|
}
|
|
|
|
module.exports = Updater;
|