@iobroker/js-controller-adapter 7.0.8-alpha.8-20251127-036be0224 → 7.1.0

package/build/cjs/lib/adapter/adapter.js

@@ -531,56 +531,67 @@ class AdapterClass extends import_node_events.EventEmitter {
       return;
     }
     this.terminated = true;
-    this.pluginHandler && this.pluginHandler.destroyAll();
-    if (this._reportInterval) {
-      clearInterval(this._reportInterval);
-      this._reportInterval = null;
-    }
-    if (this._restartScheduleJob) {
-      this._restartScheduleJob.cancel();
-      this._restartScheduleJob = null;
-    }
-    let _reason = "Without reason";
-    let _exitCode;
-    if (typeof reason === "number") {
-      exitCode = reason;
-      _reason = "Without reason";
-    } else if (reason && typeof reason === "string") {
-      _reason = reason;
-    }
-    if (typeof exitCode !== "number") {
-      _exitCode = !this._config.isInstall ? import_js_controller_common.EXIT_CODES.ADAPTER_REQUESTED_TERMINATION : import_js_controller_common.EXIT_CODES.NO_ERROR;
-    } else {
-      _exitCode = exitCode;
-    }
-    const isNotCritical = _exitCode === import_js_controller_common.EXIT_CODES.ADAPTER_REQUESTED_TERMINATION || _exitCode === import_js_controller_common.EXIT_CODES.START_IMMEDIATELY_AFTER_STOP || _exitCode === import_js_controller_common.EXIT_CODES.NO_ERROR;
-    const text = `${this.namespaceLog} Terminated (${import_validator.Validator.getErrorText(_exitCode)}): ${_reason}`;
-    if (isNotCritical) {
-      this._logger.info(text);
-    } else {
-      this._logger.warn(text);
-    }
-    setTimeout(async () => {
-      if (this.#states) {
-        try {
-          await this.#states.destroy();
-        } catch {
-        }
+    let shutdownStarted = false;
+    const shutdownLogic = () => {
+      if (shutdownStarted) {
+        return;
       }
-      if (this.#objects) {
-        try {
-          await this.#objects.destroy();
-        } catch {
-        }
+      shutdownStarted = true;
+      if (this._reportInterval) {
+        clearInterval(this._reportInterval);
+        this._reportInterval = null;
+      }
+      if (this._restartScheduleJob) {
+        this._restartScheduleJob.cancel();
+        this._restartScheduleJob = null;
+      }
+      let _reason = "Without reason";
+      let _exitCode;
+      if (typeof reason === "number") {
+        exitCode = reason;
+        _reason = "Without reason";
+      } else if (reason && typeof reason === "string") {
+        _reason = reason;
+      }
+      if (typeof exitCode !== "number") {
+        _exitCode = !this._config.isInstall ? import_js_controller_common.EXIT_CODES.ADAPTER_REQUESTED_TERMINATION : import_js_controller_common.EXIT_CODES.NO_ERROR;
+      } else {
+        _exitCode = exitCode;
       }
-      if (this.startedInCompactMode) {
-        this.emit("exit", _exitCode, reason);
-        this.#states = null;
-        this.#objects = null;
+      const isNotCritical = _exitCode === import_js_controller_common.EXIT_CODES.ADAPTER_REQUESTED_TERMINATION || _exitCode === import_js_controller_common.EXIT_CODES.START_IMMEDIATELY_AFTER_STOP || _exitCode === import_js_controller_common.EXIT_CODES.NO_ERROR;
+      const text = `${this.namespaceLog} Terminated (${import_validator.Validator.getErrorText(_exitCode)}): ${_reason}`;
+      if (isNotCritical) {
+        this._logger.info(text);
       } else {
-        process.exit(_exitCode);
+        this._logger.warn(text);
       }
-    }, 500);
+      setTimeout(async () => {
+        if (this.#states) {
+          try {
+            await this.#states.destroy();
+          } catch {
+          }
+        }
+        if (this.#objects) {
+          try {
+            await this.#objects.destroy();
+          } catch {
+          }
+        }
+        if (this.startedInCompactMode) {
+          this.emit("exit", _exitCode, reason);
+          this.#states = null;
+          this.#objects = null;
+        } else {
+          process.exit(_exitCode);
+        }
+      }, 500);
+    };
+    if (this.pluginHandler) {
+      this.pluginHandler.destroyAll().then(() => shutdownLogic()).catch(() => shutdownLogic());
+    } else {
+      shutdownLogic();
+    }
   }
   /**
    * Helper function to find next free port
@@ -1150,22 +1161,25 @@ class AdapterClass extends import_node_events.EventEmitter {
         }
         if (this.#states && updateAliveState) {
           this.outputCount++;
-          await this.#states.setState(`${id}.alive`, { val: false, ack: true, from: id });
-          if (!isPause) {
-            this._logger.info(`${this.namespaceLog} terminating`);
-          }
-          this.terminate(reason, exitCode);
-        } else {
-          if (!isPause) {
-            this._logger.info(`${this.namespaceLog} terminating`);
+          try {
+            await this.#states.setState(`${id}.alive`, { val: false, ack: true, from: id });
+          } catch (e) {
+            this._logger.error(`${this.namespaceLog} Cannot set alive state to false: ${e.message}`);
           }
-          this.terminate(reason, exitCode);
         }
+        if (!isPause) {
+          this._logger.info(`${this.namespaceLog} terminating`);
+        }
+        this.terminate(reason, exitCode);
       };
       if (this.adapterReady) {
         if (typeof this._options.unload === "function") {
           if (this._options.unload.length >= 1) {
-            this._options.unload(finishUnload);
+            try {
+              this._options.unload(finishUnload);
+            } catch {
+              finishUnload();
+            }
           } else {
             const unloadPromise = this._options.unload();
             if (unloadPromise instanceof Promise) {
@@ -1183,20 +1197,16 @@ class AdapterClass extends import_node_events.EventEmitter {
         }
       }
       setTimeout(() => {
-        if (this.#states) {
-          finishUnload();
-          setTimeout(() => {
-            if (!isPause) {
-              this._logger.info(`${this.namespaceLog} terminating with timeout`);
-            }
-            this.terminate(exitCode);
-          }, 1e3);
-        } else {
+        if (!this.#states) {
+          updateAliveState = false;
+        }
+        const terminate = () => {
           if (!isPause) {
             this._logger.info(`${this.namespaceLog} terminating`);
           }
           this.terminate(exitCode);
-        }
+        };
+        finishUnload().then(terminate, terminate);
       }, this.common?.stopTimeout || 500);
     }
   }
@@ -1469,7 +1479,8 @@ class AdapterClass extends import_node_events.EventEmitter {
   }
   /**
    * delays the fulfillment of the promise the amount of time.
-   * it will not fulfill during and after adapter shutdown
+   * It will directly fulfill without any delay during and after adapter shutdown
+   * (e.g. in an unload method)
    *
    * @param timeout - timeout in milliseconds
    * @returns promise when timeout is over
@@ -7215,7 +7226,6 @@ class AdapterClass extends import_node_events.EventEmitter {
                 exitCode: import_js_controller_common.EXIT_CODES.ADAPTER_REQUESTED_TERMINATION,
                 updateAliveState: false
               });
-              setTimeout(() => this.terminate(import_js_controller_common.EXIT_CODES.ADAPTER_REQUESTED_TERMINATION), 4e3);
             }
           }
         }
@@ -7327,10 +7337,10 @@ class AdapterClass extends import_node_events.EventEmitter {
               if (!this.pluginHandler.isPluginInstantiated(pluginName)) {
                 this.pluginHandler.instantiatePlugin(pluginName, this.pluginHandler.getPluginConfig(pluginName) || {}, thisDir);
                 this.pluginHandler.setDatabaseForPlugin(pluginName, this.#objects, this.#states);
-                this.pluginHandler.initPlugin(pluginName, this.adapterConfig || {});
+                await this.pluginHandler.initPlugin(pluginName, this.adapterConfig || {});
               }
             } else {
-              if (!this.pluginHandler.destroy(pluginName)) {
+              if (!await this.pluginHandler.destroy(pluginName)) {
                 this._logger.info(`${this.namespaceLog} Plugin ${pluginName} could not be disabled. Please restart adapter to disable it.`);
               }
             }
@@ -7393,8 +7403,8 @@ class AdapterClass extends import_node_events.EventEmitter {
           if (this.connected) {
             return;
           }
-          this._logger.warn(`${this.namespaceLog} Cannot connect/reconnect to states DB. Terminating`);
-          this.terminate(import_js_controller_common.EXIT_CODES.NO_ERROR);
+          this._logger.warn(`${this.namespaceLog} Cannot connect/reconnect to states DB. Stopping adapter.`);
+          this._stop({ exitCode: import_js_controller_common.EXIT_CODES.NO_ERROR, updateAliveState: false });
         }, 5e3);
       }
     });
@@ -7454,8 +7464,8 @@ class AdapterClass extends import_node_events.EventEmitter {
           if (this.connected) {
             return;
           }
-          this._logger.warn(`${this.namespaceLog} Cannot connect/reconnect to objects DB. Terminating`);
-          this.terminate(import_js_controller_common.EXIT_CODES.NO_ERROR);
+          this._logger.warn(`${this.namespaceLog} Cannot connect/reconnect to objects DB. Stopping adapter.`);
+          this._stop({ exitCode: import_js_controller_common.EXIT_CODES.NO_ERROR, updateAliveState: false });
         }, 4e3);
       },
       change: async (id, obj) => {
@@ -7466,7 +7476,6 @@ class AdapterClass extends import_node_events.EventEmitter {
         if (id === `system.adapter.${this.namespace}` && obj?.common?.enabled === false) {
           this._logger.info(`${this.namespaceLog} Adapter is disabled => stop`);
           this._stop();
-          setTimeout(() => this.terminate(import_js_controller_common.EXIT_CODES.NO_ERROR), 4e3);
           return;
         }
         if (id === "system.config" && obj?.common && (this._options.useFormatDate || this.defaultHistory !== void 0)) {
@@ -7851,21 +7860,23 @@ class AdapterClass extends import_node_events.EventEmitter {
     }
   }
   async _exceptionHandler(err, isUnhandledRejection) {
-    if (typeof this._options.error === "function") {
-      try {
-        const wasHandled = this._options.error(err);
-        if (wasHandled === true) {
-          return;
+    if (!this._stopInProgress) {
+      if (typeof this._options.error === "function") {
+        try {
+          const wasHandled = this._options.error(err);
+          if (wasHandled === true) {
+            return;
+          }
+        } catch (e) {
+          console.error(`Error in adapter error handler: ${e.message}`);
         }
-      } catch (e) {
-        console.error(`Error in adapter error handler: ${e.message}`);
       }
-    }
-    if (this.getPortRunning && err?.message === "listen EADDRINUSE") {
-      const { host, port, callback } = this.getPortRunning;
-      this._logger.warn(`${this.namespaceLog} Port ${port}${host ? ` for host ${host}` : ""} is in use. Get next`);
-      setImmediate(() => this.getPort(port + 1, host, callback));
-      return;
+      if (this.getPortRunning && err?.message === "listen EADDRINUSE") {
+        const { host, port, callback } = this.getPortRunning;
+        this._logger.warn(`${this.namespaceLog} Port ${port}${host ? ` for host ${host}` : ""} is in use. Get next`);
+        setImmediate(() => this.getPort(port + 1, host, callback));
+        return;
+      }
     }
     if (isUnhandledRejection) {
       this._logger.error(`${this.namespaceLog} Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch().`);
@@ -7874,7 +7885,7 @@ class AdapterClass extends import_node_events.EventEmitter {
     if (err?.stack) {
       this._logger.error(`${this.namespaceLog} ${err.stack}`);
     }
-    if (err) {
+    if (err && !this._stopInProgress) {
       const message = err.code ? `Exception-Code: ${err.code}: ${err.message}` : err.message;
       this._logger.error(`${this.namespaceLog} ${message}`);
       try {
@@ -7882,16 +7893,17 @@ class AdapterClass extends import_node_events.EventEmitter {
       } catch {
       }
     }
-    try {
-      this._stop({
-        isPause: false,
-        isScheduled: false,
-        exitCode: import_js_controller_common.EXIT_CODES.UNCAUGHT_EXCEPTION,
-        updateAliveState: false
-      });
-      setTimeout(() => this.terminate(import_js_controller_common.EXIT_CODES.UNCAUGHT_EXCEPTION), 1e3);
-    } catch (e) {
-      this._logger.error(`${this.namespaceLog} exception by stop: ${e ? e.message : e}`);
+    if (!this._stopInProgress) {
+      try {
+        this._stop({
+          isPause: false,
+          isScheduled: false,
+          exitCode: import_js_controller_common.EXIT_CODES.UNCAUGHT_EXCEPTION,
+          updateAliveState: false
+        });
+      } catch (e) {
+        this._logger.error(`${this.namespaceLog} exception by stop: ${e ? e.message : e}`);
+      }
     }
   }
   async _createInstancesObjects(instanceObj) {
@@ -8104,7 +8116,6 @@ class AdapterClass extends import_node_events.EventEmitter {
       // @ts-expect-error
       log: this._logger,
       iobrokerConfig: this._config,
-      // @ts-expect-error
       parentPackage: this.pack,
       controllerVersion
     };