updatenotification: update_helper.js recode with pm2 library

CHANGELOG.md

@@ -41,8 +41,7 @@ _This release is scheduled to be released on 2024-01-01._
 - Fix #3256 filter out bad results from rrule.between
 - Fix calendar events sometimes not respecting deleted events (#3250)
 - Fix electron loadurl locally on Windows when address "0.0.0.0" (#2550)
-- Fix updatanotification (update_helper.js): catch error if reponse is not an JSON format (check PM2)
-- Fix missing typeof in calendar module
+- Fix updatanotification (update_helper.js): Recode with pm2 library
 
 ## [2.25.0] - 2023-10-01
 

modules/default/updatenotification/update_helper.js

@@ -1,6 +1,6 @@
 const Exec = require("child_process").exec;
 const Spawn = require("child_process").spawn;
-const commandExists = require("command-exists");
+const pm2 = require("pm2");
 const Log = require("logger");
 
 /* class Updater
@@ -138,7 +138,7 @@ class Updater {
 	// restart MagicMiror with "pm2"
 	pm2Restart() {
 		Log.info("updatenotification: PM2 will restarting MagicMirror...");
-		Exec(`pm2 restart ${this.PM2}`, (err, std, sde) => {
+		pm2.restart(this.PM2, (err, proc) => {
 			if (err) {
 				Log.error("updatenotification:[PM2] restart Error", err);
 			}
@@ -159,53 +159,35 @@ class Updater {
 	check_PM2_Process() {
 		Log.info("updatenotification: Checking PM2 using...");
 		return new Promise((resolve) => {
-			commandExists("pm2")
-				.then(async () => {
-					var PM2_List = await this.PM2_GetList();
-					if (!PM2_List) {
+			pm2.connect((err) => {
+				if (err) {
+					Log.error("updatenotification: [PM2]", err);
+					this.usePM2 = false;
+					resolve(false);
+					return;
+				}
+				pm2.list((err, list) => {
+					if (err) {
 						Log.error("updatenotification: [PM2] Can't get process List!");
 						this.usePM2 = false;
 						resolve(false);
 						return;
 					}
-					PM2_List.forEach((pm) => {
+					list.forEach((pm) => {
 						if (pm.pm2_env.version === this.version && pm.pm2_env.status === "online" && pm.pm2_env.PWD.includes(this.root_path)) {
 							this.PM2 = pm.name;
 							this.usePM2 = true;
-							Log.info("updatenotification: You are using pm2 with", this.PM2);
+							Log.info("updatenotification: [PM2] You are using pm2 with", this.PM2);
 							resolve(true);
 						}
 					});
+					pm2.disconnect();
 					if (!this.PM2) {
-						Log.info("updatenotification: You are not using pm2");
+						Log.info("updatenotification: [PM2] You are not using pm2");
 						this.usePM2 = false;
 						resolve(false);
 					}
-				})
-				.catch(() => {
-					Log.info("updatenotification: You are not using pm2");
-					this.usePM2 = false;
-					resolve(false);
 				});
-		});
-	}
-
-	// Get the list of pm2 process
-	PM2_GetList() {
-		return new Promise((resolve) => {
-			Exec("pm2 jlist", (err, std, sde) => {
-				if (err) {
-					resolve(null);
-					return;
-				}
-				try {
-					let result = JSON.parse(std);
-					resolve(result);
-				} catch (e) {
-					Log.error("updatenotification: [PM2] can't GetList!");
-					Log.debug("updatenotification: [PM2] GetList is not an JSON format", e);
-					resolve(null);
-				}
 			});
 		});
 	}
@@ -218,7 +200,7 @@ class Updater {
 
 	// search update module command
 	applyCommand(module) {
-		if (this.isMagicMirror(module.module)) return null;
+		if (this.isMagicMirror(module.module) || !this.updates.length) return null;
 		let command = null;
 		this.updates.forEach((updater) => {
 			if (updater[module]) command = updater[module];

modules/default/updatenotification/updatenotification.js

@@ -18,7 +18,7 @@ Module.register("updatenotification", {
 	suspended: false,
 	moduleList: {},
 	needRestart: false,
-	updates: {},
+	updates: [],
 
 	start() {
 		Log.info(`Starting module: ${this.name}`);