iobroker.js-controller 4.0.19 → 4.0.23

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "js-controller",
-    "version": "4.0.19",
+    "version": "4.0.23",
     "platform": "Javascript/Node.js",
     "controller": true,
     "mode": "daemon",
@@ -19,31 +19,43 @@
       "zh-cn": "JS控制器"
     },
     "news": {
-      "4.0.19": {
-        "en": "Fix Adapter restarting on install/update\nReally fix invalid backup period warning",
-        "de": "Neustart des Adapters bei Installation/Aktualisierung behoben\nBeheben Sie die Warnung zu einem ungültigen Sicherungszeitraum wirklich",
-        "ru": "Исправлен перезапуск адаптера при установке/обновлении.\nРеально исправить предупреждение о недопустимом периоде резервного копирования",
-        "pt": "Corrigir o adaptador reiniciando na instalação/atualização\nRealmente corrija o aviso de período de backup inválido",
-        "nl": "Fix Adapter opnieuw opstarten bij installatie/update\nWaarschuwing voor ongeldige back-upperiode echt repareren",
-        "fr": "Correction du redémarrage de l'adaptateur lors de l'installation/de la mise à jour\nVraiment corriger l'avertissement de période de sauvegarde invalide",
-        "it": "Risolto il problema con il riavvio dell'adattatore durante l'installazione/aggiornamento\nRisolvi davvero l'avviso di periodo di backup non valido",
-        "es": "Arreglar el reinicio del adaptador en la instalación/actualización\nRealmente solucione la advertencia de período de copia de seguridad no válido",
-        "pl": "Napraw ponowne uruchomienie adaptera podczas instalacji/aktualizacji\nNaprawdę napraw ostrzeżenie o nieprawidłowym okresie tworzenia kopii zapasowej",
-        "zh-cn": "修复适配器在安装/更新时重新启动\n真正修复无效备份周期警告"
+      "4.0.23": {
+        "en": "normalize JSONL options to prevent issues because of admin adding empty setting objects\nPrevent some crash cases reported by Sentry",
+        "de": "Normalisieren Sie JSONL-Optionen, um Probleme zu vermeiden, weil der Administrator leere Einstellungsobjekte hinzufügt\nVerhindern Sie einige von Sentry gemeldete Absturzfälle",
+        "ru": "нормализуйте параметры JSONL, чтобы предотвратить проблемы из-за того, что администратор добавляет пустые объекты настроек\nПредотвращение некоторых случаев сбоев, о которых сообщает Sentry.",
+        "pt": "normalize as opções JSONL para evitar problemas devido ao administrador adicionar objetos de configuração vazios\nPrevenir alguns casos de travamento relatados pelo Sentinela",
+        "nl": "normaliseer JSONL-opties om problemen te voorkomen omdat de beheerder lege instellingsobjecten toevoegt\nVoorkom enkele door Sentry gemelde crashgevallen",
+        "fr": "normaliser les options JSONL pour éviter les problèmes dus à l'ajout par l'administrateur d'objets de réglage vides\nEmpêcher certains cas de plantage signalés par Sentry",
+        "it": "normalizzare le opzioni JSONL per evitare problemi dovuti all'aggiunta di oggetti di impostazione vuoti da parte dell'amministratore\nPrevenire alcuni casi di crash segnalati da Sentry",
+        "es": "normalice las opciones de JSONL para evitar problemas debido a que el administrador agrega objetos de configuración vacíos\nEvitar algunos casos de bloqueo informados por Sentry",
+        "pl": "znormalizować opcje JSONL, aby zapobiec problemom z powodu dodania przez administratora pustych obiektów ustawień\nZapobiegaj niektórym przypadkom awarii zgłaszanych przez Sentry",
+        "zh-cn": "规范化 JSONL 选项以防止由于管理员添加空设置对象而出现问题\n防止 Sentry 报告的一些崩溃案例"
+      },
+      "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.18": {
-        "en": "Also stop instances before GitHub installs\nFix eraseOnUpload logic\nFix invalid backup period warning\nFix maxSize property for logging in dist file\nPrevent some crash cases reported by Sentry",
-        "de": "Stoppen Sie außerdem Instanzen, bevor GitHub installiert wird\nEraseOnUpload-Logik korrigiert\nWarnung zu ungültigem Sicherungszeitraum behoben\nKorrigieren Sie die maxSize-Eigenschaft für die Anmeldung in der Dist-Datei\nVerhindern Sie einige von Sentry gemeldete Absturzfälle",
-        "ru": "Также останавливайте экземпляры перед установкой GitHub.\nИсправление логики EraseOnUpload\nИсправить предупреждение о недопустимом периоде резервного копирования\nИсправлено свойство maxSize для входа в файл dist.\nПредотвращение некоторых случаев сбоев, о которых сообщает Sentry.",
-        "pt": "Também interrompa instâncias antes da instalação do GitHub\nCorrigir a lógica eraseOnUpload\nCorrigir aviso de período de backup inválido\nCorrige a propriedade maxSize para fazer login no arquivo dist\nPrevenir alguns casos de travamento relatados pelo Sentinela",
-        "nl": "Stop ook instanties voordat GitHub wordt geïnstalleerd\nEraseOnUpload-logica repareren\nWaarschuwing voor ongeldige back-upperiode repareren\nFix maxSize-eigenschap voor inloggen in dist-bestand\nVoorkom enkele door Sentry gemelde crashgevallen",
-        "fr": "Arrêtez également les instances avant l'installation de GitHub\nCorrection de la logique eraseOnUpload\nCorrection de l'avertissement de période de sauvegarde non valide\nCorrection de la propriété maxSize pour la connexion au fichier dist\nEmpêcher certains cas de plantage signalés par Sentry",
-        "it": "Arresta anche le istanze prima dell'installazione di GitHub\nRisolto il problema con la logica di cancellazione durante il caricamento\nCorrezione dell'avviso di periodo di backup non valido\nCorrezione della proprietà maxSize per l'accesso al file dist\nPrevenire alcuni casi di crash segnalati da Sentry",
-        "es": "También detenga las instancias antes de que se instale GitHub\nArreglar la lógica eraseOnUpload\nArreglar la advertencia de período de copia de seguridad no válido\nArreglar la propiedad maxSize para iniciar sesión en el archivo dist\nEvitar algunos casos de bloqueo informados por Sentry",
-        "pl": "Zatrzymaj również instancje przed instalacją GitHub\nNapraw logikę eraseOnUpload\nNapraw ostrzeżenie o nieprawidłowym okresie tworzenia kopii zapasowej\nNapraw właściwość maxSize do logowania w pliku dist\nZapobiegaj niektórym przypadkom awarii zgłaszanych przez Sentry",
-        "zh-cn": "在 GitHub 安装之前停止实例\n修复 eraseOnUpload 逻辑\n修复无效备份周期警告\n修复用于登录 dist 文件的 maxSize 属性\n防止 Sentry 报告的一些崩溃案例"
+      "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",
+        "ru": "Добавить отсутствующую зависимость axios\nРегистрировать ошибку только в том случае, если ошибка возникает при активации/деактивации адаптера через состояния .alive.\nИсправить пограничный случай в логике MULTI/EXEC симулятора Redis.\nПредотвращение некоторых случаев сбоев, о которых сообщает Sentry.",
+        "pt": "Adicionar dependência de axios ausente\nApenas registre um erro se ocorrer um erro ao ativar/desativar o adaptador por meio de estados .alive\nCorrigir caso de borda na lógica MULTI/EXEC do simulador redis\nPrevenir alguns casos de travamento relatados pelo Sentinela",
+        "nl": "Ontbrekende axios-afhankelijkheid toevoegen\nLog alleen een fout in als er een fout optreedt bij het activeren/deactiveren van de adapter via .alive states\nRandgeval repareren in redis-simulator MULTI/EXEC-logica\nVoorkom enkele door Sentry gemelde crashgevallen",
+        "fr": "Ajouter la dépendance axios manquante\nEnregistrez une erreur uniquement si une erreur se produit lors de l'activation/de la désactivation de l'adaptateur via les états .alive\nCorrection du cas limite dans la logique MULTI/EXEC du simulateur redis\nEmpêcher certains cas de plantage signalés par Sentry",
+        "it": "Aggiungi la dipendenza assio mancante\nRegistra un errore solo se si verifica un errore durante l'attivazione/disattivazione dell'adattatore tramite stati .alive\nRisolto il problema con il caso limite nella logica MULTI/EXEC del simulatore Redis\nPrevenire alcuni casi di crash segnalati da Sentry",
+        "es": "Agregar la dependencia de axios faltante\nSolo registre un error si ocurre un error al activar/desactivar el adaptador a través de estados .alive\nArreglar el caso de borde en la lógica MULTI / EXEC del simulador redis\nEvitar algunos casos de bloqueo informados por Sentry",
+        "pl": "Dodaj brakującą zależność axios\nZapisuj błąd tylko wtedy, gdy wystąpi błąd podczas aktywacji/dezaktywacji adaptera przez stany .alive\nNapraw obudowę krawędziową w symulatorze redis, logika MULTI/EXEC\nZapobiegaj niektórym przypadkom awarii zgłaszanych przez Sentry",
+        "zh-cn": "添加缺少的 axios 依赖项\n只有在通过 .alive 状态激活/停用适配器时发生错误时才记录错误\n修复 redis 模拟器 MULTI/EXEC 逻辑中的边缘情况\n防止 Sentry 报告的一些崩溃案例"
       },
-      "4.0.15": {
+      "4.0.19": {
         "en": "see CHANGELOG.md",
         "de": "siehe CHANGELOG.md",
         "ru": "см. CHANGELOG.md",
@@ -90,18 +102,6 @@
         "es": "ver CHANGELOG.md",
         "pl": "zobacz CHANGELOG.md",
         "zh-cn": "看到CHANGELOG.md"
-      },
-      "3.0.20": {
-        "en": "see CHANGELOG.md",
-        "de": "Siehe CHANGELOG.md",
-        "ru": "см. CHANGELOG.md",
-        "pt": "veja CHANGELOG.md",
-        "nl": "zie CHANGELOG.md",
-        "fr": "voir CHANGELOG.md",
-        "it": "vedi CHANGELOG.md",
-        "es": "ver CHANGELOG.md",
-        "pl": "zobacz CHANGELOG.md",
-        "zh-cn": "看到CHANGELOG.md"
       }
     },
     "desc": {

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
@@ -125,14 +124,18 @@ class BackupRestore {
     copyFileSync(source, target) {
         let targetFile = target;
 
-        // if target is a directory a new file with the same name will be created
-        if (fs.existsSync(target)) {
-            if (fs.statSync(target).isDirectory()) {
-                targetFile = pathLib.join(target, pathLib.basename(source));
+        try {
+            // if target is a directory a new file with the same name will be created
+            if (fs.existsSync(target)) {
+                if (fs.statSync(target).isDirectory()) {
+                    targetFile = pathLib.join(target, pathLib.basename(source));
+                }
             }
-        }
 
-        fs.writeFileSync(targetFile, fs.readFileSync(source));
+            fs.writeFileSync(targetFile, fs.readFileSync(source));
+        } catch (e) {
+            console.error(`Could not copy ${targetFile} to ${source}: ${e.message}`);
+        }
     }
 
     copyFolderRecursiveSync(source, target) {
@@ -149,10 +152,13 @@ class BackupRestore {
         }
 
         // copy
-        if (fs.statSync(source).isDirectory()) {
+        if (fs.existsSync(source) && fs.statSync(source).isDirectory()) {
             files = fs.readdirSync(source);
             files.forEach(file => {
                 const curSource = pathLib.join(source, file);
+                if (!fs.existsSync(curSource)) {
+                    return;
+                }
                 if (fs.statSync(curSource).isDirectory()) {
                     this.copyFolderRecursiveSync(curSource, targetFolder);
                 } else {
@@ -600,7 +606,11 @@ class BackupRestore {
         }
         const files = fs.readdirSync(root + path);
         for (const file of files) {
-            const stat = fs.statSync(`${root + path}/${file}`);
+            const fName = pathLib.join(root, path, file);
+            if (!fs.existsSync(fName)) {
+                continue;
+            }
+            const stat = fs.statSync(fName);
             if (stat.isDirectory()) {
                 try {
                     await this._uploadUserFiles(root, `${path}/${file}`);
@@ -623,22 +633,35 @@ class BackupRestore {
     }
 
     _copyBackupedFiles(backupDir) {
-        if (!fs.existsSync(backupDir)) {
-            console.log('No additional files to restore');
-            return;
-        }
-        const dirs = fs.readdirSync(backupDir);
-
-        dirs.forEach(dir => {
-            if (dir === 'files') {
+        try {
+            if (!fs.existsSync(backupDir)) {
+                console.log('No additional files to restore');
                 return;
             }
-            const path = pathLib.join(backupDir, dir);
-            const stat = fs.statSync(path);
-            if (stat.isDirectory()) {
-                this.copyFolderRecursiveSync(path, this.configDir);
-            }
-        });
+            const dirs = fs.readdirSync(backupDir);
+
+            dirs.forEach(dir => {
+                if (dir === 'files') {
+                    return;
+                }
+                const path = pathLib.join(backupDir, dir);
+                let stat;
+                try {
+                    if (!fs.existsSync(path)) {
+                        return;
+                    }
+                    stat = fs.statSync(path);
+                } catch (err) {
+                    console.error(`Ignoring ${path} because can not get file type: ${err.message}`);
+                    return;
+                }
+                if (stat.isDirectory()) {
+                    this.copyFolderRecursiveSync(path, this.configDir);
+                }
+            });
+        } catch (err) {
+            console.error(`Ignoring ${backupDir} because can not read directory: ${err.message}`);
+        }
     }
 
     /**
@@ -720,7 +743,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(
@@ -743,7 +766,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) {
@@ -753,7 +776,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 {
@@ -775,7 +798,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) {
@@ -912,7 +935,7 @@ class BackupRestore {
                 },
                 err => {
                     if (err) {
-                        console.error(`host.${hostname} Cannot extract from file "${name}"`);
+                        console.error(`host.${hostname} Cannot extract from file "${name}": ${err.message}`);
                         return void this.processExit(9);
                     }
                     if (!fs.existsSync(`${tmpDir}/backup/backup.json`)) {
@@ -1075,7 +1098,7 @@ class BackupRestore {
             },
             err => {
                 if (err) {
-                    console.error(`host.${hostname} Cannot extract from file "${name}"`);
+                    console.error(`host.${hostname} Cannot extract from file "${name}": ${err.message}`);
                     return void this.processExit(9);
                 }
                 if (!fs.existsSync(`${tmpDir}/backup/backup.json`)) {

package/lib/setup/setupRepo.js

@@ -187,7 +187,7 @@ function Repo(options) {
         } else {
             repoUrl = repoUrl || systemConfig.common.activeRepo;
 
-            if (typeof repoUrl !== 'object') {
+            if (!Array.isArray(repoUrl)) {
                 repoUrl = [repoUrl];
             }
 
@@ -324,9 +324,7 @@ function Repo(options) {
             (obj.common.activeRepo &&
                 typeof obj.common.activeRepo === 'string' &&
                 obj.common.activeRepo === repoName) ||
-            (obj.common.activeRepo &&
-                typeof obj.common.activeRepo === 'object' &&
-                obj.common.activeRepo.includes(repoName))
+            (obj.common.activeRepo && Array.isArray(obj.common.activeRepo) && obj.common.activeRepo.includes(repoName))
         ) {
             throw new Error(`Cannot delete active repository: ${repoName}`);
         } else {
@@ -418,7 +416,7 @@ function Repo(options) {
                     sysConfigObj.common &&
                     ((typeof sysConfigObj.common.activeRepo === 'string' &&
                         sysConfigObj.common.activeRepo === oldName) ||
-                        (typeof sysConfigObj.common.activeRepo === 'object' &&
+                        (Array.isArray(sysConfigObj.common.activeRepo) &&
                             sysConfigObj.common.activeRepo.includes(oldName)))
                 ) {
                     if (typeof sysConfigObj.common.activeRepo === 'string') {

package/main.js

@@ -408,8 +408,10 @@ function createStates(onConnect) {
                                 );
                                 obj.from = hostObjectPrefix;
                                 obj.ts = Date.now();
-                                objects.setObject(obj._id, obj, err =>
-                                    logger.error(`${hostLogPrefix} Cannot set object: ${err}`)
+                                objects.setObject(
+                                    obj._id,
+                                    obj,
+                                    err => err && logger.error(`${hostLogPrefix} Cannot set object: ${err}`)
                                 );
                             }
                         }
@@ -767,7 +769,7 @@ function createObjects(onConnect) {
                             delete hostAdapter[id];
                         }
                     }
-                } else if (obj.type && obj.type === 'host' && obj.common && obj.common.installedVersion) {
+                } else if (obj && obj.type === 'host' && obj.common && obj.common.installedVersion) {
                     // host object changed
                     // TODO: remove this shim if 4.0 is old enough
                     if (controllerVersions[id]) {
@@ -1464,6 +1466,8 @@ function setIPs(ipList) {
                 !err &&
                 oldObj &&
                 oldObj.common &&
+                oldObj.native &&
+                oldObj.native.hardware &&
                 (!isDeepStrictEqual(oldObj.native.hardware.networkInterfaces, networkInterfaces) ||
                     !isDeepStrictEqual(oldObj.common.address, _ipList))
             ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.js-controller",
-  "version": "4.0.19",
+  "version": "4.0.23",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -17,16 +17,16 @@
   },
   "dependencies": {
     "@alcalzone/esbuild-register": "^2.5.1-1",
-    "@iobroker/db-objects-file": "4.0.19",
-    "@iobroker/db-objects-jsonl": "4.0.19",
-    "@iobroker/db-objects-redis": "4.0.19",
-    "@iobroker/db-states-file": "4.0.19",
-    "@iobroker/db-states-jsonl": "4.0.19",
-    "@iobroker/db-states-redis": "4.0.19",
-    "@iobroker/js-controller-adapter": "4.0.19",
-    "@iobroker/js-controller-cli": "4.0.19",
-    "@iobroker/js-controller-common": "4.0.19",
-    "@iobroker/js-controller-common-db": "4.0.19",
+    "@iobroker/db-objects-file": "4.0.23",
+    "@iobroker/db-objects-jsonl": "4.0.23",
+    "@iobroker/db-objects-redis": "4.0.23",
+    "@iobroker/db-states-file": "4.0.23",
+    "@iobroker/db-states-jsonl": "4.0.23",
+    "@iobroker/db-states-redis": "4.0.23",
+    "@iobroker/js-controller-adapter": "4.0.23",
+    "@iobroker/js-controller-cli": "4.0.23",
+    "@iobroker/js-controller-common": "4.0.23",
+    "@iobroker/js-controller-common-db": "4.0.23",
     "@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": "cf2434ce275dfd3a19cdb0bb2b4c7dca609a60ed"
+  "gitHead": "ea1a72ac2d74317ad16234f7aeac90632374614c"
 }