iobroker.js-controller 4.0.20 → 4.0.21

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "js-controller",
-    "version": "4.0.20",
+    "version": "4.0.21",
     "platform": "Javascript/Node.js",
     "controller": true,
     "mode": "daemon",
@@ -19,6 +19,18 @@
       "zh-cn": "JS控制器"
     },
     "news": {
+      "4.0.21": {
+        "en": "Fix Backup Restore crash case",
+        "de": "Beheben Sie den Absturzfall der Sicherungswiederherstellung",
+        "ru": "Исправить случай сбоя восстановления резервной копии",
+        "pt": "Corrigir caso de falha de restauração de backup",
+        "nl": "Fix Backup Herstel crashgeval",
+        "fr": "Correction du cas de plantage de restauration de sauvegarde",
+        "it": "Risolto il caso di arresto anomalo del ripristino del backup",
+        "es": "Solucionar caso de bloqueo de restauración de copia de seguridad",
+        "pl": "Napraw przypadek awarii przywracania kopii zapasowej",
+        "zh-cn": "修复备份还原崩溃案例"
+      },
       "4.0.20": {
         "en": "Add missing axios dependency\nOnly log an error if an error is happening when activating/deactivating adapter via .alive states\nFix edge case in redis simulator MULTI/EXEC logic\nPrevent some crash cases reported by Sentry",
         "de": "Fehlende Axios-Abhängigkeit hinzugefügt\nProtokollieren Sie nur dann einen Fehler, wenn beim Aktivieren/Deaktivieren des Adapters über .alive-Zustände ein Fehler auftritt\nGrenzfall in der MULTI/EXEC-Logik des Redis-Simulators behoben\nVerhindern Sie einige von Sentry gemeldete Absturzfälle",

package/lib/setup/setupBackup.js

@@ -14,7 +14,6 @@ const pathLib = require('path');
 const hostname = tools.getHostName();
 const Upload = require('./setupUpload');
 const { EXIT_CODES } = require('@iobroker/js-controller-common');
-const path = require('path');
 const cpPromise = require('promisify-child-process');
 
 // We cannot use relative paths for the backup locations, as they used by both
@@ -607,7 +606,7 @@ class BackupRestore {
         }
         const files = fs.readdirSync(root + path);
         for (const file of files) {
-            const fName = path.join(root, path, file);
+            const fName = pathLib.join(root, path, file);
             if (!fs.existsSync(fName)) {
                 continue;
             }
@@ -734,7 +733,7 @@ class BackupRestore {
             console.log('Forced restore - executing setup ...');
             try {
                 await cpPromise.exec(
-                    `"${process.execPath}" "${path.join(controllerDir, `${tools.appName.toLowerCase()}.js`)}" setup`
+                    `"${process.execPath}" "${pathLib.join(controllerDir, `${tools.appName.toLowerCase()}.js`)}" setup`
                 );
             } catch (e) {
                 console.error(
@@ -757,7 +756,7 @@ class BackupRestore {
      * @private
      */
     async _removeAllAdapters(controllerDir) {
-        const nodeModulePath = path.join(controllerDir, '..');
+        const nodeModulePath = pathLib.join(controllerDir, '..');
         const nodeModuleDirs = fs.readdirSync(nodeModulePath, { withFileTypes: true });
         // we need to uninstall current adapters to get exact the same system as before backup
         for (const dir of nodeModuleDirs) {
@@ -767,7 +766,7 @@ class BackupRestore {
                 dir.name !== `${tools.appName.toLowerCase()}.js-controller`
             ) {
                 try {
-                    const packJson = fs.readJsonSync(path.join(nodeModulePath, dir.name, 'package.json'));
+                    const packJson = fs.readJsonSync(pathLib.join(nodeModulePath, dir.name, 'package.json'));
                     console.log(`Removing current installation of ${packJson.name}`);
                     await tools.uninstallNodeModule(packJson.name);
                 } catch {
@@ -789,7 +788,7 @@ class BackupRestore {
      */
     _ensureCompatibility(controllerDir, backupHostname, backupObjects, force) {
         try {
-            const ioPackJson = fs.readJsonSync(path.join(controllerDir, 'io-package.json'));
+            const ioPackJson = fs.readJsonSync(pathLib.join(controllerDir, 'io-package.json'));
             const hostObj = backupObjects.find(obj => obj.id === `system.host.${backupHostname}`);
             if (hostObj.value.common.installedVersion !== ioPackJson.common.version) {
                 if (!force) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.js-controller",
-  "version": "4.0.20",
+  "version": "4.0.21",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -17,16 +17,16 @@
   },
   "dependencies": {
     "@alcalzone/esbuild-register": "^2.5.1-1",
-    "@iobroker/db-objects-file": "4.0.20",
-    "@iobroker/db-objects-jsonl": "4.0.20",
-    "@iobroker/db-objects-redis": "4.0.20",
-    "@iobroker/db-states-file": "4.0.20",
-    "@iobroker/db-states-jsonl": "4.0.20",
-    "@iobroker/db-states-redis": "4.0.20",
-    "@iobroker/js-controller-adapter": "4.0.20",
-    "@iobroker/js-controller-cli": "4.0.20",
-    "@iobroker/js-controller-common": "4.0.20",
-    "@iobroker/js-controller-common-db": "4.0.20",
+    "@iobroker/db-objects-file": "4.0.21",
+    "@iobroker/db-objects-jsonl": "4.0.21",
+    "@iobroker/db-objects-redis": "4.0.21",
+    "@iobroker/db-states-file": "4.0.21",
+    "@iobroker/db-states-jsonl": "4.0.21",
+    "@iobroker/db-states-redis": "4.0.21",
+    "@iobroker/js-controller-adapter": "4.0.21",
+    "@iobroker/js-controller-cli": "4.0.21",
+    "@iobroker/js-controller-common": "4.0.21",
+    "@iobroker/js-controller-common-db": "4.0.21",
     "@iobroker/plugin-base": "~1.2.1",
     "@iobroker/plugin-sentry": "~1.2.0",
     "axios": "^0.24.0",
@@ -112,5 +112,5 @@
     "iobroker.js",
     "main.js"
   ],
-  "gitHead": "0606f3e50755e0e963678dbeecfa11084538b009"
+  "gitHead": "4749d256d312623ae7621e7ae47d44580b3aa8c1"
 }