iobroker.js-controller 4.0.4 → 4.0.5

package/conf/sources-dist.json

@@ -9,7 +9,7 @@
     "meta": "https://raw.githubusercontent.com/om2804/ioBroker.adb/master/io-package.json",
     "icon": "https://raw.githubusercontent.com/om2804/ioBroker.adb/master/admin/adb.png",
     "type": "hardware",
-	"version": "0.0.5"
+    "version": "0.0.5"
   },
   "adguard": {
     "meta": "https://raw.githubusercontent.com/o0shojo0o/ioBroker.adguard/master/io-package.json",
@@ -321,7 +321,7 @@
     "meta": "https://raw.githubusercontent.com/crycode-de/ioBroker.ds18b20/master/io-package.json",
     "icon": "https://raw.githubusercontent.com/crycode-de/ioBroker.ds18b20/master/admin/ds18b20.png",
     "type": "hardware",
-    "version": "1.5.4"
+    "version": "1.6.0"
   },
   "dwd": {
     "meta": "https://raw.githubusercontent.com/ioBroker/ioBroker.dwd/master/io-package.json",
@@ -363,7 +363,7 @@
     "meta": "https://raw.githubusercontent.com/mrbungle64/ioBroker.ecovacs-deebot/master/io-package.json",
     "icon": "https://raw.githubusercontent.com/mrbungle64/ioBroker.ecovacs-deebot/master/admin/ecovacs-deebot.png",
     "type": "household",
-    "version": "1.3.1"
+    "version": "1.3.3"
   },
   "egigeozone": {
     "meta": "https://raw.githubusercontent.com/BasGo/ioBroker.egigeozone/master/io-package.json",
@@ -390,10 +390,10 @@
     "version": "1.0.2"
   },
   "ems-esp": {
-    "meta": "https://raw.githubusercontent.com/tp1de/ioBroker.ems-esp/master/io-package.json",
-    "icon": "https://raw.githubusercontent.com/tp1de/ioBroker.ems-esp/master/admin/ems-esp.png",
+    "meta": "https://raw.githubusercontent.com/tp1de/ioBroker.ems-esp/main/io-package.json",
+    "icon": "https://raw.githubusercontent.com/tp1de/ioBroker.ems-esp/main/admin/ems-esp.png",
     "type": "climate-control",
-    "version": "1.0.5"
+    "version": "1.1.0"
   },
   "energymanager": {
     "meta": "https://raw.githubusercontent.com/unltdnetworx/ioBroker.energymanager/master/io-package.json",
@@ -425,6 +425,12 @@
     "type": "infrastructure",
     "version": "1.0.6"
   },
+  "eusec": {
+    "meta": "https://raw.githubusercontent.com/bropat/ioBroker.eusec/master/io-package.json",
+    "icon": "https://raw.githubusercontent.com/bropat/ioBroker.eusec/master/admin/eusec.png",
+    "type": "alarm",
+    "version": "0.8.4"
+  },
   "exchangerates": {
     "meta": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.exchangerates/master/io-package.json",
     "icon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.exchangerates/master/admin/exchangerates.png",
@@ -2326,4 +2332,4 @@
     "type": "hardware",
     "version": "2.4.1"
   }
-}
+}

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "js-controller",
-    "version": "4.0.4",
+    "version": "4.0.5",
     "platform": "Javascript/Node.js",
     "controller": true,
     "mode": "daemon",
@@ -19,6 +19,18 @@
       "zh-cn": "JS控制器"
     },
     "news": {
+      "4.0.5": {
+        "en": "stop the database before executing upgrade self; WIll be effective for all upgrades >4.0.5\nOptimize Set activation handling to prevent some error logged on upgrade\nFix Linux Capability updating for Docker and check Admin Flag\nDetect another Rebuild case and allo wautomatic rebuilding\nFix adapter installation with dependencies\nFix seq edge case \nPrevent several crash cases seen in Sentry",
+        "de": "stoppen Sie die Datenbank, bevor Sie upgrade self ausführen; Gilt für alle Upgrades >4.0.5\nOptimieren Sie die Handhabung der Set-Aktivierung, um einige beim Upgrade protokollierte Fehler zu vermeiden\nKorrigieren Sie die Aktualisierung der Linux-Funktion für Docker und überprüfen Sie das Admin-Flag\nErkennt einen weiteren Rebuild-Fall und erlaubt einen automatischen Rebuild\nAdapterinstallation mit Abhängigkeiten reparieren\nSeq-Edge-Fall behoben\nVerhindern Sie mehrere Absturzfälle, die in Sentry aufgetreten sind",
+        "ru": "остановить базу данных перед выполнением самообновления; Будет действовать для всех обновлений >4.0.5\nОптимизировать обработку активации Set, чтобы предотвратить некоторые ошибки, регистрируемые при обновлении.\nИсправьте обновление возможностей Linux для Docker и проверьте флаг администратора.\nОбнаружение другого случая Rebuild и разрешение автоматического восстановления\nИсправить установку адаптера с зависимостями\nИсправить пограничный случай seq\nПредотвратите несколько случаев сбоев, наблюдаемых в Sentry.",
+        "pt": "pare o banco de dados antes de executar o upgrade self; Será eficaz para todas as atualizações > 4.0.5\nOtimize o tratamento de ativação do conjunto para evitar alguns erros registrados na atualização\nCorrija a atualização de recursos do Linux para o Docker e verifique o sinalizador de administrador\nDetecte outro caso de reconstrução e permita a reconstrução automática\nCorrigir a instalação do adaptador com dependências\nCorrigir caso de borda seq\nPrevenir vários casos de acidente vistos no Sentinela",
+        "nl": "stop de database voordat u de upgrade zelf uitvoert; Zal effectief zijn voor alle upgrades >4.0.5\nOptimaliseren Activeringsafhandeling instellen om een fout te voorkomen die is aangemeld bij de upgrade\nFix Linux Capability-update voor Docker en controleer Admin Flag\nDetecteer een ander Rebuild-geval en sta automatische reconstructie toe\nInstallatie van adapter met afhankelijkheden repareren\nFix seq edge case\nVoorkom verschillende crashgevallen in Sentry",
+        "fr": "arrêtez la base de données avant d'exécuter la mise à jour automatique ; Sera efficace pour toutes les mises à jour > 4.0.5\nOptimiser Définir la gestion de l'activation pour éviter certaines erreurs enregistrées lors de la mise à niveau\nCorrection de la mise à jour des capacités Linux pour Docker et vérification de l'indicateur d'administration\nDétecter un autre cas de reconstruction et autoriser la reconstruction automatique\nCorrection de l'installation de l'adaptateur avec dépendances\nCorriger le cas de bord suivant\nEmpêcher plusieurs cas de crash vus dans Sentry",
+        "it": "fermare il database prima di eseguire l'aggiornamento automatico; Sarà efficace per tutti gli aggiornamenti >4.0.5\nOttimizza Impostare la gestione dell'attivazione per evitare errori durante l'aggiornamento\nCorreggi l'aggiornamento delle funzionalità Linux per Docker e controlla il flag amministratore\nRileva un altro caso Ricostruisci e consenti la ricostruzione automatica\nCorreggi l'installazione dell'adattatore con le dipendenze\nRisolto il problema con il seq edge case\nImpedisci diversi casi di crash visti in Sentry",
+        "es": "detenga la base de datos antes de ejecutar la actualización automática; Será efectivo para todas las actualizaciones > 4.0.5\nOptimizar Configurar el manejo de la activación para evitar algún error registrado en la actualización\nCorrija la actualización de la capacidad de Linux para Docker y verifique la bandera de administración\nDetectar otro caso de reconstrucción y permitir la reconstrucción automática\nArreglar la instalación del adaptador con dependencias\nArreglar caso de borde de secuencia\nEvitar varios casos de bloqueo vistos en Sentry",
+        "pl": "zatrzymaj bazę danych przed wykonaniem samodzielnej aktualizacji; Będzie obowiązywać dla wszystkich ulepszeń >4,0,5\nOptymalizuj Ustaw obsługę aktywacji, aby zapobiec błędom zalogowania się podczas aktualizacji\nNapraw aktualizację funkcji Linux dla platformy Docker i sprawdź flagę administratora\nWykryj inny przypadek Rebuild i zezwól na automatyczną odbudowę\nNapraw instalację adaptera z zależnościami\nNapraw przypadek krawędzi na sekwencjach\nZapobiegaj kilku przypadkom awarii w Sentry",
+        "zh-cn": "在执行升级自我之前停止数据库；将对>4.0.5的所有升级有效\n优化设置激活处理，防止一些错误登录升级\n修复 Docker 的 Linux 功能更新并检查 Admin Flag\n检测另一个重建案例并允许自动重建\n使用依赖项修复适配器安装\n修复 seq 边缘情况\n防止在 Sentry 中出现的几个崩溃案例"
+      },
       "4.0.4": {
         "en": "Optimize database initialization and destroys\nUpdate winston-syslog to prevent errors\nAllow proper setup first upgrade from 3.3.x",
         "de": "Optimieren Sie die Initialisierung und Zerstörung von Datenbanken\nAktualisieren Sie winston-syslog, um Fehler zu vermeiden\nErst-Upgrade von 3.3.x auf ordnungsgemäße Einrichtung zulassen",
@@ -90,18 +102,6 @@
         "es": "ver CHANGELOG.md",
         "pl": "zobacz CHANGELOG.md",
         "zh-cn": "看到CHANGELOG.md"
-      },
-      "2.2.9": {
-        "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

@@ -629,6 +629,10 @@ class BackupRestore {
     }
 
     _copyBackupedFiles(backupDir) {
+        if (!fs.existsSync(backupDir)) {
+            console.log('No additional files to restore');
+            return;
+        }
         const dirs = fs.readdirSync(backupDir);
 
         dirs.forEach(dir => {

package/lib/setup/setupInstall.js

@@ -90,7 +90,8 @@ function Install(options) {
      *
      * @param {string} repoUrl
      * @param {string} packetName
-     * @param {object?} options
+     * @param {Record<string, any>?} options, { stopDb: true } - will stop the db before upgrade ONLY use it for controller upgrade -
+     * db is gone afterwards, does not work with stoppedList
      * @param {object[]?} stoppedList
      * @return {Promise<void>}
      */
@@ -108,6 +109,11 @@ function Install(options) {
             }
         }
 
+        if (options.stopDb && stoppedList) {
+            console.warn('[downloadPacket] stoppedList cannot be used if stopping of databases is requested');
+            stoppedList = [];
+        }
+
         let debug = false;
         for (const arg of process.argv) {
             if (arg === '--debug') {
@@ -181,15 +187,38 @@ function Install(options) {
             }
 
             if (!url && packetName !== 'example') {
+                if (options.stopDb) {
+                    if (objects && objects.destroy) {
+                        await objects.destroy();
+                        console.log('Stopped Objects DB');
+                    }
+                    if (states && states.destroy) {
+                        await states.destroy();
+                        console.log('Stopped States DB');
+                    }
+                }
+
                 // Install node modules
                 await this._npmInstallWithCheck(
-                    `${tools.appName.toLowerCase()}.${packetName}${version ? '@' + version : ''}`,
+                    `${tools.appName.toLowerCase()}.${packetName}${version ? `@${version}` : ''}`,
                     options,
                     debug
                 );
+
                 await enableAdapters(stoppedList, true);
                 return packetName;
             } else if (url && url.match(tarballRegex)) {
+                if (options.stopDb) {
+                    if (objects && objects.destroy) {
+                        await objects.destroy();
+                        console.log('Stopped Objects DB');
+                    }
+                    if (states && states.destroy) {
+                        await states.destroy();
+                        console.log('Stopped States DB');
+                    }
+                }
+
                 // Install node modules
                 await this._npmInstallWithCheck(url, options, debug);
                 await enableAdapters(stoppedList, true);
@@ -446,9 +475,7 @@ function Install(options) {
 
                 // if required dependency not found => install it
                 if (!isFound) {
-                    const name = await this.createInstance(dName, _options);
-                    await upload.uploadAdapter(name, true, false);
-                    await upload.uploadAdapter(name, false, false);
+                    await this.createInstance(dName, _options);
                 }
             }
         }
@@ -638,7 +665,6 @@ function Install(options) {
      * @return {Promise<void>}
      */
     this.createInstance = async function (adapter, options) {
-        const adapterDir = tools.getAdapterDir(adapter);
         let ignoreIfExists = false;
         options = options || {};
         options.host = options.host || tools.getHostName();
@@ -773,6 +799,8 @@ function Install(options) {
             objs = [];
         }
 
+        const adapterDir = tools.getAdapterDir(adapter);
+
         if (fs.existsSync(path.join(adapterDir, 'www'))) {
             objs.push({
                 _id: `system.adapter.${adapter}.upload`,

package/lib/setup/setupRepo.js

@@ -55,6 +55,7 @@ function Repo(options) {
         }
 
         const urlOrPath = oldRepos.native.repositories[repoName].link;
+        const hashUrl = urlOrPath.replace(/\.json$/, '-hash.json');
         let hash;
 
         if (
@@ -63,7 +64,11 @@ function Repo(options) {
             oldRepos.native.repositories[repoName].json &&
             (urlOrPath.startsWith('http://') || urlOrPath.startsWith('https://'))
         ) {
-            hash = await axios({ url: urlOrPath.replace(/\.json$/, '-hash.json'), timeout: 10000 });
+            try {
+                hash = await axios({ url: hashUrl, timeout: 10000 });
+            } catch (e) {
+                console.error(`Cannot download repository hash file from "${hashUrl}": ${e.message}`);
+            }
             if (hash && hash.data && oldRepos.native.repositories[repoName].hash === hash.data.hash) {
                 return oldRepos.native.repositories[repoName].json;
             }
@@ -73,18 +78,27 @@ function Repo(options) {
 
         if (urlOrPath.startsWith('http://') || urlOrPath.startsWith('https://')) {
             if (!hash) {
-                hash = await axios({ url: urlOrPath.replace(/\.json$/, '-hash.json'), timeout: 10000 });
+                try {
+                    hash = await axios({ url: hashUrl, timeout: 10000 });
+                } catch (e) {
+                    console.error(`Cannot download repository hash file from "${hashUrl}": ${e.message}`);
+                }
             }
 
             const agent = `${tools.appName}, RND: CLI, Node:${process.version}, V:${version}`;
-            data = await axios({
-                url: urlOrPath,
-                timeout: 10000,
-                headers: { 'User-Agent': agent }
-            });
-            if (data.data) {
-                data = data.data;
-            } else {
+            try {
+                data = await axios({
+                    url: urlOrPath,
+                    timeout: 10000,
+                    headers: { 'User-Agent': agent }
+                });
+                if (data.data) {
+                    data = data.data;
+                } else {
+                    data = null;
+                }
+            } catch (e) {
+                console.error(`Cannot download repository file from "${urlOrPath}": ${e.message}`);
                 data = null;
             }
         } else {

package/lib/setup/setupUpgrade.js

@@ -632,7 +632,8 @@ function Upgrade(options) {
                 // Get the controller from web site
                 await install.downloadPacket(
                     repoUrl,
-                    `${installed.common.name}@${repoUrl[installed.common.name].version}`
+                    `${installed.common.name}@${repoUrl[installed.common.name].version}`,
+                    { stopDb: true }
                 );
             }
         } else {
@@ -665,7 +666,7 @@ function Upgrade(options) {
                 const name = ioPack && ioPack.common && ioPack.common.name ? ioPack.common.name : installed.common.name;
                 console.log(`Update ${name} from @${installed.common.version} to ${version}`);
                 // Get the controller from web site
-                await install.downloadPacket(repoUrl, name + version);
+                await install.downloadPacket(repoUrl, name + version, { stopDb: true });
             }
         }
     };

package/lib/setup/setupUpload.js

@@ -387,17 +387,21 @@ function Upload(options) {
                 }
             }
 
-            await new Promise(resolve =>
-                fs.createReadStream(file).pipe(
-                    objects.insert(id, attName, null, mimeType, { rev: rev }, (err, res) => {
-                        err && console.log(err);
-                        if (res) {
-                            rev = res.rev;
-                        }
-                        resolve();
-                    })
-                )
-            );
+            try {
+                await new Promise(resolve =>
+                    fs.createReadStream(file).pipe(
+                        objects.insert(id, attName, null, mimeType, { rev: rev }, (err, res) => {
+                            err && console.log(err);
+                            if (res) {
+                                rev = res.rev;
+                            }
+                            resolve();
+                        })
+                    )
+                );
+            } catch (e) {
+                console.error(`Error: Cannot upload ${file}: ${e.message}`);
+            }
         }
 
         // Set upload progress to 0;

package/lib/setup/setupVisDebug.js

@@ -88,7 +88,8 @@ function VisDebug(options) {
             }
 
             if (!adapterDir) {
-                throw new Error(`Adapter not found. Tried: ${adapterNames2Try.join(', ')}`);
+                console.error(`Adapter not found. Tried: ${adapterNames2Try.join(', ')}`);
+                return processExit(EXIT_CODES.MISSING_ADAPTER_FILES);
             }
         }
 
@@ -96,15 +97,15 @@ function VisDebug(options) {
         // copy edit.html.original to edit.html
         // correct appName.json
         // correct config.js
-        let visDir = __dirname + '/../../node_modules/' + tools.appName + '.vis';
+        let visDir = `${__dirname}/../../node_modules/${tools.appName}.vis`;
         if (!fs.existsSync(visDir)) {
-            visDir = __dirname + '/../../node_modules/' + tools.appName.toLowerCase() + '.vis';
+            visDir = `${__dirname}/../../node_modules/${tools.appName.toLowerCase()}.vis`;
             if (!fs.existsSync(visDir)) {
-                visDir = __dirname + '/../../../' + tools.appName + '.vis';
+                visDir = `${__dirname}/../../../${tools.appName}.vis`;
                 if (!fs.existsSync(visDir)) {
-                    visDir = __dirname + '/../../../' + tools.appName.toLowerCase() + '.vis';
+                    visDir = `${__dirname}/../../../${tools.appName.toLowerCase()}.vis`;
                     if (!fs.existsSync(visDir)) {
-                        console.error('Cannot find ' + tools.appName + '.vis');
+                        console.error(`Cannot find ${tools.appName}.vis`);
                         return processExit(EXIT_CODES.MISSING_ADAPTER_FILES);
                     }
                 }

package/main.js

@@ -95,8 +95,8 @@ let compactGroupController = false;
 let compactGroup = null;
 const compactProcs = {};
 const scheduledInstances = {};
-const VENDOR_BOOTSTRAP_FILE = __dirname + '/iob-vendor-secret.json'; // TODO revert '/opt/iobroker/iob-vendor-secret.json'
-const VENDOR_FILE = __dirname + '/iob-vendor.json'; // TODO revert '/etc/iob-vendor.json'
+const VENDOR_BOOTSTRAP_FILE = '/opt/iobroker/iob-vendor-secret.json';
+const VENDOR_FILE = '/etc/iob-vendor.json';
 let updateIPsTimer = null;
 let lastDiagSend = null;
 
@@ -4458,6 +4458,7 @@ async function startInstance(id, wakeUp) {
                                 text.includes('NODE_MODULE_VERSION') ||
                                 text.includes('npm rebuild') ||
                                 text.includes("Error: The module '") ||
+                                text.includes('Could not locate the bindings file.') ||
                                 text.includes('Cannot find module')
                             ) {
                                 // only try this at second rebuild
@@ -5766,15 +5767,27 @@ function init(compactGroupId) {
  * @private
  */
 function _determineRebuildArgsFromLog(text) {
-    // extract rebuild path - it is always between the only two single quotes
-    const matches = text.match(/'.+'/g);
+    let matches;
+    // Try to get path for this case after a →
+    if (text.includes('Could not locate the bindings file.')) {
+        matches = text.match(/→ (.+)$/gm);
+        if (matches) {
+            matches.shift(); // we need to remove the first element from match
+        }
+    }
+
+    // else, extract rebuild path the standard way - it is always
+    // between the only two single quotes
+    if (!matches) {
+        matches = text.match(/'.+'/g);
+    }
 
     if (matches) {
         // We only check the first path like entry
         // remove the quotes
         let rebuildPath = matches[0].replace(/'/g, '');
         if (path.isAbsolute(rebuildPath)) {
-            // we have found a module which needs rebuild - we need to find deepest pack.json
+            // we have found a module which needs rebuild - we need to find the deepest pack.json
             rebuildPath = path.dirname(rebuildPath);
             const rootDir = path.parse(process.cwd()).root;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.js-controller",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -17,16 +17,16 @@
   },
   "dependencies": {
     "@alcalzone/esbuild-register": "^2.5.1-1",
-    "@iobroker/db-objects-file": "4.0.4",
-    "@iobroker/db-objects-jsonl": "4.0.4",
-    "@iobroker/db-objects-redis": "4.0.4",
-    "@iobroker/db-states-file": "4.0.4",
-    "@iobroker/db-states-jsonl": "4.0.4",
-    "@iobroker/db-states-redis": "4.0.4",
-    "@iobroker/js-controller-adapter": "4.0.4",
-    "@iobroker/js-controller-cli": "4.0.4",
-    "@iobroker/js-controller-common": "4.0.4",
-    "@iobroker/js-controller-common-db": "4.0.4",
+    "@iobroker/db-objects-file": "4.0.5",
+    "@iobroker/db-objects-jsonl": "4.0.5",
+    "@iobroker/db-objects-redis": "4.0.5",
+    "@iobroker/db-states-file": "4.0.5",
+    "@iobroker/db-states-jsonl": "4.0.5",
+    "@iobroker/db-states-redis": "4.0.5",
+    "@iobroker/js-controller-adapter": "4.0.5",
+    "@iobroker/js-controller-cli": "4.0.5",
+    "@iobroker/js-controller-common": "4.0.5",
+    "@iobroker/js-controller-common-db": "4.0.5",
     "@iobroker/plugin-base": "~1.2.1",
     "@iobroker/plugin-sentry": "~1.1.10",
     "axios": "^0.24.0",
@@ -113,5 +113,5 @@
     "iobroker.js",
     "main.js"
   ],
-  "gitHead": "184f8340136fe668fb4d64d572ebeecb7b06b6e7"
+  "gitHead": "ba55e7d15a1e68e18d03254d0fa8030d7f785651"
 }