Merge branch 'develop' into master

.github/workflows/electron-rebuild.yaml

@@ -23,8 +23,8 @@ jobs:
         run: npm install @electron/rebuild
       - name: Install node-libgpiod deps
         run: sudo apt-get install gpiod libgpiod2 libgpiod-dev
-      - name: Install some test library to be rebuilded
-        run: npm install node-libgpiod node-pty drivelist
+      - name: Install test library (node-libgpiod) to be rebuilded
+        run: npm install node-libgpiod
       - name: Run electron-rebuild
         run: npx electron-rebuild
         continue-on-error: false

.github/workflows/stale.yaml

@@ -0,0 +1,22 @@
+name: "Close stale issues and PRs"
+
+on:
+  workflow_dispatch: # needed for manually running this workflow
+  schedule:
+    - cron: "30 1 * * 6" # every Saturday at 1:30
+
+permissions:
+  issues: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+          days-before-issue-stale: 60
+          days-before-issue-close: 7
+          operations-per-run: 100
+          stale-issue-label: "wontfix"
+          exempt-issue-labels: "pinned,security,under investigation,pr welcome"

CHANGELOG.md

@@ -23,7 +23,7 @@ _This release is scheduled to be released on 2025-01-01._
 
 - [updatenotification] Fix pm2 using detection when pm2 script is in MagicMirror root folder (#3576)
 - [core] Fix loading node_helper of modules: avoid black screen, display errors and continue loading with next module (#3578)
-- [weather] changed default value for weatherEndpoint to "/onecall" (#3574)
+- [weather] changed default value for weatherEndpoint of provider openweathermap to "/onecall" (#3574)
 
 ## [2.29.0] - 2024-10-01
 

js/app.js

@@ -197,7 +197,13 @@ function App () {
 
 		// if the helper was found
 		if (loadHelper) {
-			const Module = require(helperPath);
+			let Module;
+			try {
+				Module = require(helperPath);
+			} catch (e) {
+				Log.error(`Error when loading ${moduleName}:`, e.message);
+				return;
+			}
 			let m = new Module();
 
 			if (m.requiresVersion) {

modules/default/updatenotification/update_helper.js

@@ -187,7 +187,7 @@ class Updater {
 						return;
 					}
 					list.forEach((pm) => {
-						if (pm.pm2_env.version === this.version && pm.pm2_env.status === "online" && pm.pm2_env.pm_cwd.includes(`${this.root_path}/`)) {
+						if (pm.pm2_env.version === this.version && pm.pm2_env.status === "online" && pm.pm2_env.pm_cwd.includes(`${this.root_path}`)) {
 							this.PM2 = pm.name;
 							this.usePM2 = true;
 							Log.info("updatenotification: [PM2] You are using pm2 with", this.PM2);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magicmirror",
-	"version": "2.29.0",
+	"version": "2.30.0-develop",
 	"description": "The open source modular smart mirror platform.",
 	"keywords": [
 		"magic mirror",
@@ -63,7 +63,7 @@
 		"express": "^4.21.0",
 		"express-ipfilter": "^1.3.2",
 		"feedme": "^2.0.2",
-		"helmet": "^7.1.0",
+		"helmet": "^8.0.0",
 		"html-to-text": "^9.0.5",
 		"iconv-lite": "^0.6.3",
 		"module-alias": "^2.2.3",
@@ -79,7 +79,7 @@
 		"@stylistic/eslint-plugin": "^2.8.0",
 		"cspell": "^8.14.4",
 		"eslint-plugin-jest": "^28.8.3",
-		"eslint-plugin-jsdoc": "^50.3.0",
+		"eslint-plugin-jsdoc": "^50.3.1",
 		"eslint-plugin-package-json": "^0.15.3",
 		"express-basic-auth": "^1.2.1",
 		"husky": "^9.1.6",