iobroker.js-controller 4.0.3 → 4.0.4

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "js-controller",
-    "version": "4.0.3",
+    "version": "4.0.4",
     "platform": "Javascript/Node.js",
     "controller": true,
     "mode": "daemon",
@@ -19,6 +19,18 @@
       "zh-cn": "JS控制器"
     },
     "news": {
+      "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",
+        "ru": "Оптимизация инициализации и уничтожения базы данных\nОбновите winston-syslog, чтобы предотвратить ошибки\nРазрешить правильную настройку первого обновления с 3.3.x",
+        "pt": "Otimize a inicialização do banco de dados e destrua\nAtualize o winston-syslog para evitar erros\nPermitir configuração adequada primeiro upgrade de 3.3.x",
+        "nl": "Optimaliseer database-initialisatie en vernietigt\nUpdate winston-syslog om fouten te voorkomen\nSta de juiste installatie toe, upgrade eerst vanaf 3.3.x",
+        "fr": "Optimiser l'initialisation et la destruction de la base de données\nMettre à jour winston-syslog pour éviter les erreurs\nAutoriser la configuration appropriée pour la première mise à niveau à partir de la version 3.3.x",
+        "it": "Ottimizza l'inizializzazione e la distruzione del database\nAggiorna winston-syslog per prevenire errori\nConsenti una corretta configurazione prima dell'aggiornamento da 3.3.x",
+        "es": "Optimizar la inicialización y destrucción de la base de datos.\nActualice winston-syslog para evitar errores\nPermitir la configuración adecuada primera actualización desde 3.3.x",
+        "pl": "Zoptymalizuj inicjowanie i niszczenie bazy danych\nZaktualizuj winston-syslog, aby zapobiec błędom\nZezwól na prawidłową konfigurację przy pierwszej aktualizacji z wersji 3.3.x",
+        "zh-cn": "优化数据库初始化和销毁\n更新 winston-syslog 以防止错误\n允许正确设置首先从 3.3.x 升级"
+      },
       "4.0.3": {
         "en": "see CHANGELOG.md",
         "de": "siehe CHANGELOG.md",
@@ -90,18 +102,6 @@
         "es": "ver CHANGELOG.md",
         "pl": "zobacz CHANGELOG.md",
         "zh-cn": "看到CHANGELOG.md"
-      },
-      "2.1.1": {
-        "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/main.js

@@ -333,7 +333,7 @@ function handleDisconnect() {
     }
 
     connected = false;
-    logger.warn(hostLogPrefix + ' Slave controller detected disconnection. Stop all instances.');
+    logger.warn(`${hostLogPrefix} Slave controller detected disconnection. Stop all instances.`);
     if (compactGroupController) {
         stop(true);
     } else {
@@ -493,7 +493,7 @@ function createStates(onConnect) {
                 }
             }
         },
-        connected: async () => {
+        connected: () => {
             if (statesDisconnectTimeout) {
                 clearTimeout(statesDisconnectTimeout);
                 statesDisconnectTimeout = null;
@@ -502,16 +502,6 @@ function createStates(onConnect) {
             if (!compactGroupController) {
                 states.clearAllLogs && states.clearAllLogs();
                 deleteAllZipPackages();
-                // subscribe to primary host expiration
-                try {
-                    await objects.subscribePrimaryHost();
-                } catch (e) {
-                    logger.error(`${hostLogPrefix} Cannot subscribe to primary host expiration: ${e.message}`);
-                }
-                primaryHostInterval = setInterval(checkPrimaryHost, PRIMARY_HOST_LOCK_TIME / 2);
-
-                // first execution now
-                checkPrimaryHost();
             }
             initMessageQueue();
             startAliveInterval();
@@ -599,13 +589,27 @@ function createObjects(onConnect) {
         controller: true,
         logger: logger,
         hostname: hostname,
-        connected: () => {
+        connected: async () => {
             // stop disconnect timeout
             if (objectsDisconnectTimeout) {
                 clearTimeout(objectsDisconnectTimeout);
                 objectsDisconnectTimeout = null;
             }
 
+            // subscribe to primary host expiration
+            try {
+                await objects.subscribePrimaryHost();
+            } catch (e) {
+                logger.error(`${hostLogPrefix} Cannot subscribe to primary host expiration: ${e.message}`);
+            }
+
+            if (!primaryHostInterval && !compactGroupController) {
+                primaryHostInterval = setInterval(checkPrimaryHost, PRIMARY_HOST_LOCK_TIME / 2);
+            }
+
+            // first execution now
+            checkPrimaryHost();
+
             initializeController();
             onConnect && onConnect();
         },
@@ -613,6 +617,8 @@ function createObjects(onConnect) {
             if (restartTimeout) {
                 return;
             }
+            // on reconnection this will be determiend anew
+            isPrimary = false;
             objectsDisconnectTimeout && clearTimeout(objectsDisconnectTimeout);
             objectsDisconnectTimeout = setTimeout(() => {
                 objectsDisconnectTimeout = null;
@@ -860,6 +866,7 @@ function createObjects(onConnect) {
         },
         primaryHostLost: () => {
             if (!isStopping) {
+                isPrimary = false;
                 logger.info('The primary host is no longer active. Checking responsibilities.');
                 checkPrimaryHost();
             }
@@ -893,6 +900,11 @@ function startAliveInterval() {
  * @return {Promise<void>}
  */
 async function checkPrimaryHost() {
+    // we cannot interact with db now because currently reconnecting
+    if (objectsDisconnectTimeout || compactGroupController) {
+        return;
+    }
+
     // let our host value live PRIMARY_HOST_LOCK_TIME seconds, while it should be renewed lock time / 2
     try {
         if (!isPrimary) {

package/package.json

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