@iobroker/js-controller-adapter 6.0.6 → 6.0.7

package/build/cjs/lib/adapter/adapter.d.ts

@@ -350,7 +350,7 @@ export declare class AdapterClass extends EventEmitter {
     /** contents of package.json */
     pack?: Record<string, any>;
     /** contents of io-package.json */
-    ioPack: Record<string, any>;
+    ioPack: ioBroker.InstanceObject;
     private _initializeTimeout?;
     private inited?;
     /** contents of iobroker.json if required via AdapterOptions */
@@ -782,6 +782,13 @@ export declare class AdapterClass extends EventEmitter {
      * @param options information about version to remove feature and the log message
      */
     private reportDeprecation;
+    /**
+     * Initialize the plugin handler for this adapter
+     */
+    private _initPluginHandler;
+    /**
+     * Initializes the adapter
+     */
     private _init;
 }
 /**

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

@@ -5828,8 +5828,8 @@ class AdapterClass extends import_node_events.EventEmitter {
           }
           if (this.pluginHandler.isPluginActive(pluginName) !== state.val) {
             if (state.val) {
-              if (!this.pluginHandler.isPluginInstanciated(pluginName)) {
-                this.pluginHandler.instanciatePlugin(pluginName, this.pluginHandler.getPluginConfig(pluginName) || {}, thisDir);
+              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 || {});
               }
@@ -6129,206 +6129,208 @@ class AdapterClass extends import_node_events.EventEmitter {
       return;
     }
     this.pluginHandler.setDatabaseForPlugins(this.#objects, this.#states);
-    this.pluginHandler.initPlugins(adapterConfig || {}, async () => {
-      if (!this.#states || !this.#objects || this.terminated) {
-        return;
-      }
-      this.#states.subscribe(`system.adapter.${this.namespace}.plugins.*`);
-      if (this._options.instance === void 0) {
-        if (!adapterConfig || !("common" in adapterConfig) || !adapterConfig.common.enabled) {
-          if (adapterConfig && "common" in adapterConfig && adapterConfig.common.enabled !== void 0) {
-            !this._config.isInstall && this._logger.error(`${this.namespaceLog} adapter disabled`);
-          } else {
-            !this._config.isInstall && this._logger.error(`${this.namespaceLog} no config found for adapter`);
-          }
-          if (!this._config.isInstall && (!process.argv || !this._config.forceIfDisabled)) {
-            const id = `system.adapter.${this.namespace}`;
-            this.outputCount += 2;
-            this.#states.setState(`${id}.alive`, { val: true, ack: true, expire: 30, from: id });
-            let done = false;
-            this.#states.setState(`${id}.connected`, {
-              val: true,
-              ack: true,
-              expire: 30,
-              from: id
-            }, () => {
-              if (!done) {
-                done = true;
-                this.terminate(import_js_controller_common.EXIT_CODES.NO_ADAPTER_CONFIG_FOUND);
-              }
-            });
-            setTimeout(() => {
-              if (!done) {
-                done = true;
-                this.terminate(import_js_controller_common.EXIT_CODES.NO_ADAPTER_CONFIG_FOUND);
-              }
-            }, 1e3);
-            return;
-          }
-        }
-        if (!this._config.isInstall && (!adapterConfig || !("_id" in adapterConfig))) {
-          this._logger.error(`${this.namespaceLog} invalid config: no _id found`);
-          this.terminate(import_js_controller_common.EXIT_CODES.INVALID_ADAPTER_ID);
-          return;
-        }
-        let name;
-        let instance;
-        if (!this._config.isInstall) {
-          const tmp = adapterConfig._id.match(/^system\.adapter\.([a-zA-Z0-9-_]+)\.([0-9]+)$/);
-          if (!tmp) {
-            this._logger.error(`${this.namespaceLog} invalid config`);
-            this.terminate(import_js_controller_common.EXIT_CODES.INVALID_ADAPTER_ID);
-            return;
-          }
-          name = tmp[1];
-          instance = parseInt(tmp[2]) || 0;
+    await this.pluginHandler.initPlugins(adapterConfig || {});
+    if (!this.#states || !this.#objects || this.terminated) {
+      return;
+    }
+    this.#states.subscribe(`system.adapter.${this.namespace}.plugins.*`);
+    if (this._options.instance === void 0) {
+      if (!adapterConfig || !("common" in adapterConfig) || !adapterConfig.common.enabled) {
+        if (adapterConfig && "common" in adapterConfig && adapterConfig.common.enabled !== void 0) {
+          !this._config.isInstall && this._logger.error(`${this.namespaceLog} adapter disabled`);
         } else {
-          name = this.name;
-          instance = 0;
-          adapterConfig = adapterConfig || {
-            common: { mode: "once", name, protectedNative: [] },
-            native: {}
-          };
+          !this._config.isInstall && this._logger.error(`${this.namespaceLog} no config found for adapter`);
         }
-        if (adapterConfig.common.loglevel && !this.overwriteLogLevel) {
-          for (const trans of Object.values(this._logger.transports)) {
-            if (!trans._defaultConfigLoglevel) {
-              trans.level = adapterConfig.common.loglevel;
+        if (!this._config.isInstall && (!process.argv || !this._config.forceIfDisabled)) {
+          const id = `system.adapter.${this.namespace}`;
+          this.outputCount += 2;
+          this.#states.setState(`${id}.alive`, { val: true, ack: true, expire: 30, from: id });
+          let done = false;
+          this.#states.setState(`${id}.connected`, {
+            val: true,
+            ack: true,
+            expire: 30,
+            from: id
+          }, () => {
+            if (!done) {
+              done = true;
+              this.terminate(import_js_controller_common.EXIT_CODES.NO_ADAPTER_CONFIG_FOUND);
             }
-          }
-          this._config.log.level = adapterConfig.common.loglevel;
-        }
-        this.name = adapterConfig.common.name;
-        this.instance = instance;
-        this.namespace = `${name}.${instance}`;
-        this.namespaceLog = this.namespace + (this.startedInCompactMode ? " (COMPACT)" : ` (${process.pid})`);
-        if (!this.startedInCompactMode) {
-          process.title = `io.${this.namespace}`;
-        }
-        this.config = adapterConfig.native;
-        this.host = adapterConfig.common.host;
-        this.common = adapterConfig.common;
-        if (adapterConfig.common.mode === "schedule" || adapterConfig.common.mode === "once") {
-          this.stop = (params) => this._stop({ ...params, isPause: true });
-        } else if (this.startedInCompactMode) {
-          this.stop = (params) => this._stop({ ...params, isPause: false });
-          this.kill = this.stop;
-        } else {
-          this.stop = (params) => this._stop({ ...params, isPause: false });
+          });
+          setTimeout(() => {
+            if (!done) {
+              done = true;
+              this.terminate(import_js_controller_common.EXIT_CODES.NO_ADAPTER_CONFIG_FOUND);
+            }
+          }, 1e3);
+          return;
         }
-        this.#states.subscribe(`${import_constants2.SYSTEM_ADAPTER_PREFIX}*.logging`);
-        if (typeof this._options.message === "function" && !(0, import_utils.isMessageboxSupported)(adapterConfig.common)) {
-          this._logger.error(`${this.namespaceLog} : message handler implemented, but messagebox not enabled. Define common.messagebox in io-package.json for adapter or delete message handler.`);
-        } else if ((0, import_utils.isMessageboxSupported)(adapterConfig.common)) {
-          this.mboxSubscribed = true;
-          this.#states.subscribeMessage(`system.adapter.${this.namespace}`);
+      }
+      if (!this._config.isInstall && (!adapterConfig || !("_id" in adapterConfig))) {
+        this._logger.error(`${this.namespaceLog} invalid config: no _id found`);
+        this.terminate(import_js_controller_common.EXIT_CODES.INVALID_ADAPTER_ID);
+        return;
+      }
+      let name;
+      let instance;
+      if (!this._config.isInstall) {
+        const tmp = adapterConfig._id.match(/^system\.adapter\.([a-zA-Z0-9-_]+)\.([0-9]+)$/);
+        if (!tmp) {
+          this._logger.error(`${this.namespaceLog} invalid config`);
+          this.terminate(import_js_controller_common.EXIT_CODES.INVALID_ADAPTER_ID);
+          return;
         }
+        name = tmp[1];
+        instance = parseInt(tmp[2]) || 0;
       } else {
-        this.name = adapterConfig.name || this.name;
-        this.instance = adapterConfig.instance || 0;
-        this.namespace = `${this.name}.${this.instance}`;
-        this.namespaceLog = this.namespace + (this.startedInCompactMode ? " (COMPACT)" : ` (${process.pid})`);
-        this.config = adapterConfig.native || {};
-        this.common = adapterConfig.common || {};
-        this.host = this.common?.host || import_js_controller_common.tools.getHostName() || import_node_os.default.hostname();
-      }
-      this.adapterConfig = adapterConfig;
-      this._utils = new import_validator.Validator(this.#objects, this.#states, this.namespaceLog, this._logger, this.namespace, this._namespaceRegExp);
-      this.log = new import_log.Log(this.namespaceLog, this._config.log.level, this._logger);
-      await this._createInstancesObjects(adapterConfig);
-      if (this._options.objects) {
-        this.oObjects = await this.getAdapterObjectsAsync();
-        await this.subscribeObjectsAsync("*");
-      }
-      await this.getSystemSecret();
-      const promises = [];
-      if (Array.isArray(adapterConfig.encryptedNative)) {
-        for (const attr of adapterConfig.encryptedNative) {
-          if (typeof this.config[attr] === "string") {
-            promises.push(this.getEncryptedConfig(attr).then((decryptedValue) => this.config[attr] = decryptedValue).catch((e) => this._logger.error(`${this.namespaceLog} Can not decrypt attribute ${attr}: ${e.message}`)));
-          }
-        }
+        name = this.name;
+        instance = 0;
+        adapterConfig = adapterConfig || {
+          common: { mode: "once", name, protectedNative: [] },
+          native: {}
+        };
+      }
+      if (adapterConfig.common.loglevel && !this.overwriteLogLevel) {
+        for (const trans of Object.values(this._logger.transports)) {
+          if (!trans._defaultConfigLoglevel) {
+            trans.level = adapterConfig.common.loglevel;
+          }
+        }
+        this._config.log.level = adapterConfig.common.loglevel;
+      }
+      this.name = adapterConfig.common.name;
+      this.instance = instance;
+      this.namespace = `${name}.${instance}`;
+      this.namespaceLog = this.namespace + (this.startedInCompactMode ? " (COMPACT)" : ` (${process.pid})`);
+      if (!this.startedInCompactMode) {
+        process.title = `io.${this.namespace}`;
+      }
+      this.config = adapterConfig.native;
+      this.host = adapterConfig.common.host;
+      this.common = adapterConfig.common;
+      if (adapterConfig.common.mode === "schedule" || adapterConfig.common.mode === "once") {
+        this.stop = (params) => this._stop({ ...params, isPause: true });
+      } else if (this.startedInCompactMode) {
+        this.stop = (params) => this._stop({ ...params, isPause: false });
+        this.kill = this.stop;
       } else {
-        const idx = this.SUPPORTED_FEATURES.indexOf("ADAPTER_AUTO_DECRYPT_NATIVE");
-        if (idx !== -1) {
-          this.SUPPORTED_FEATURES.splice(idx, 1);
+        this.stop = (params) => this._stop({ ...params, isPause: false });
+      }
+      this.#states.subscribe(`${import_constants2.SYSTEM_ADAPTER_PREFIX}*.logging`);
+      if (typeof this._options.message === "function" && !(0, import_utils.isMessageboxSupported)(adapterConfig.common)) {
+        this._logger.error(`${this.namespaceLog} : message handler implemented, but messagebox not enabled. Define common.messagebox in io-package.json for adapter or delete message handler.`);
+      } else if ((0, import_utils.isMessageboxSupported)(adapterConfig.common)) {
+        this.mboxSubscribed = true;
+        this.#states.subscribeMessage(`system.adapter.${this.namespace}`);
+      }
+    } else {
+      this.name = adapterConfig.name || this.name;
+      this.instance = adapterConfig.instance || 0;
+      this.namespace = `${this.name}.${this.instance}`;
+      this.namespaceLog = this.namespace + (this.startedInCompactMode ? " (COMPACT)" : ` (${process.pid})`);
+      this.config = adapterConfig.native || {};
+      this.common = adapterConfig.common || {};
+      this.host = this.common?.host || import_js_controller_common.tools.getHostName() || import_node_os.default.hostname();
+    }
+    this.adapterConfig = adapterConfig;
+    this._utils = new import_validator.Validator(this.#objects, this.#states, this.namespaceLog, this._logger, this.namespace, this._namespaceRegExp);
+    this.log = new import_log.Log(this.namespaceLog, this._config.log.level, this._logger);
+    await this._createInstancesObjects(adapterConfig);
+    if (this._options.objects) {
+      this.oObjects = await this.getAdapterObjectsAsync();
+      await this.subscribeObjectsAsync("*");
+    }
+    await this.getSystemSecret();
+    const promises = [];
+    if (Array.isArray(adapterConfig.encryptedNative)) {
+      for (const attr of adapterConfig.encryptedNative) {
+        if (typeof this.config[attr] === "string") {
+          promises.push(this.getEncryptedConfig(attr).then((decryptedValue) => this.config[attr] = decryptedValue).catch((e) => this._logger.error(`${this.namespaceLog} Can not decrypt attribute ${attr}: ${e.message}`)));
         }
       }
-      await Promise.all(promises);
-      if (!this.#states) {
-        return;
+    } else {
+      const idx = this.SUPPORTED_FEATURES.indexOf("ADAPTER_AUTO_DECRYPT_NATIVE");
+      if (idx !== -1) {
+        this.SUPPORTED_FEATURES.splice(idx, 1);
       }
-      this.outputCount++;
-      this.#states.setState(`system.adapter.${this.namespace}.logLevel`, {
-        val: this._config.log.level,
-        ack: true,
-        from: `system.adapter.${this.namespace}`
+    }
+    await Promise.all(promises);
+    if (!this.#states) {
+      return;
+    }
+    this.outputCount++;
+    this.#states.setState(`system.adapter.${this.namespace}.logLevel`, {
+      val: this._config.log.level,
+      ack: true,
+      from: `system.adapter.${this.namespace}`
+    });
+    if (this._options.instance === void 0) {
+      this.version = this.pack?.version ? this.pack.version : this.ioPack?.common ? this.ioPack.common.version : "unknown";
+      const isNpmVersion = (0, import_js_controller_common.isInstalledFromNpm)({
+        adapterName: this.name,
+        installedFrom: this.ioPack.common.installedFrom
       });
-      if (this._options.instance === void 0) {
-        this.version = this.pack?.version ? this.pack.version : this.ioPack?.common ? this.ioPack.common.version : "unknown";
-        const isNpmVersion = !this.ioPack || !this.ioPack.common || typeof this.ioPack.common.installedFrom !== "string" || this.ioPack.common.installedFrom.startsWith(`${import_js_controller_common.tools.appName.toLowerCase()}.${this.name}`);
-        this._logger.info(`${this.namespaceLog} starting. Version ${this.version} ${!isNpmVersion ? `(non-npm: ${this.ioPack.common.installedFrom}) ` : ""}in ${this.adapterDir}, node: ${process.version}, js-controller: ${controllerVersion}`);
-        this._config.system = this._config.system || {};
-        this._config.system.statisticsInterval = parseInt(this._config.system.statisticsInterval, 10) || 15e3;
-        if (!this._config.isInstall) {
-          this._reportInterval = setInterval(() => this._reportStatus(), this._config.system.statisticsInterval);
-          this._reportStatus();
-          const id = `system.adapter.${this.namespace}`;
-          this.#states.setState(`${id}.compactMode`, {
-            ack: true,
-            from: id,
-            val: !!this.startedInCompactMode
+      this._logger.info(`${this.namespaceLog} starting. Version ${this.version} ${!isNpmVersion ? `(non-npm: ${this.ioPack.common.installedFrom}) ` : ""}in ${this.adapterDir}, node: ${process.version}, js-controller: ${controllerVersion}`);
+      this._config.system = this._config.system || {};
+      this._config.system.statisticsInterval = parseInt(this._config.system.statisticsInterval, 10) || 15e3;
+      if (!this._config.isInstall) {
+        this._reportInterval = setInterval(() => this._reportStatus(), this._config.system.statisticsInterval);
+        this._reportStatus();
+        const id = `system.adapter.${this.namespace}`;
+        this.#states.setState(`${id}.compactMode`, {
+          ack: true,
+          from: id,
+          val: !!this.startedInCompactMode
+        });
+        this.outputCount++;
+        if (this.startedInCompactMode) {
+          this.#states.setState(`${id}.cpu`, { ack: true, from: id, val: 0 });
+          this.#states.setState(`${id}.cputime`, { ack: true, from: id, val: 0 });
+          this.#states.setState(`${id}.memRss`, { val: 0, ack: true, from: id });
+          this.#states.setState(`${id}.memHeapTotal`, { val: 0, ack: true, from: id });
+          this.#states.setState(`${id}.memHeapUsed`, { val: 0, ack: true, from: id });
+          this.#states.setState(`${id}.eventLoopLag`, { val: 0, ack: true, from: id });
+          this.outputCount += 6;
+        } else {
+          import_js_controller_common.tools.measureEventLoopLag(1e3, (lag) => {
+            if (lag) {
+              this.eventLoopLags.push(lag);
+            }
           });
-          this.outputCount++;
-          if (this.startedInCompactMode) {
-            this.#states.setState(`${id}.cpu`, { ack: true, from: id, val: 0 });
-            this.#states.setState(`${id}.cputime`, { ack: true, from: id, val: 0 });
-            this.#states.setState(`${id}.memRss`, { val: 0, ack: true, from: id });
-            this.#states.setState(`${id}.memHeapTotal`, { val: 0, ack: true, from: id });
-            this.#states.setState(`${id}.memHeapUsed`, { val: 0, ack: true, from: id });
-            this.#states.setState(`${id}.eventLoopLag`, { val: 0, ack: true, from: id });
-            this.outputCount += 6;
-          } else {
-            import_js_controller_common.tools.measureEventLoopLag(1e3, (lag) => {
-              if (lag) {
-                this.eventLoopLags.push(lag);
-              }
-            });
-          }
         }
       }
-      if (adapterConfig && "common" in adapterConfig && adapterConfig.common.restartSchedule) {
-        try {
-          this._schedule = await import("node-schedule");
-        } catch {
-          this._logger.error(`${this.namespaceLog} Cannot load node-schedule. Scheduled restart is disabled`);
-        }
-        if (this._schedule) {
-          this._logger.debug(`${this.namespaceLog} Schedule restart: ${adapterConfig.common.restartSchedule}`);
-          this._restartScheduleJob = this._schedule.scheduleJob(adapterConfig.common.restartSchedule, () => {
-            this._logger.info(`${this.namespaceLog} Scheduled restart.`);
-            this._stop({ isPause: false, isScheduled: true });
-          });
-        }
+    }
+    if (adapterConfig && "common" in adapterConfig && adapterConfig.common.restartSchedule) {
+      try {
+        this._schedule = await import("node-schedule");
+      } catch {
+        this._logger.error(`${this.namespaceLog} Cannot load node-schedule. Scheduled restart is disabled`);
       }
-      if (this._options.states) {
-        this.getStates("*", null, (err, _states) => {
-          if (this._stopInProgress) {
-            return;
-          }
-          this.oStates = _states;
-          this.subscribeStates("*");
-          if (this._firstConnection) {
-            this._firstConnection = false;
-            this._callReadyHandler();
-          }
-          this.adapterReady = true;
+      if (this._schedule) {
+        this._logger.debug(`${this.namespaceLog} Schedule restart: ${adapterConfig.common.restartSchedule}`);
+        this._restartScheduleJob = this._schedule.scheduleJob(adapterConfig.common.restartSchedule, () => {
+          this._logger.info(`${this.namespaceLog} Scheduled restart.`);
+          this._stop({ isPause: false, isScheduled: true });
         });
-      } else if (!this._stopInProgress) {
-        this._callReadyHandler();
-        this.adapterReady = true;
       }
-    });
+    }
+    if (this._options.states) {
+      this.getStates("*", null, (err, _states) => {
+        if (this._stopInProgress) {
+          return;
+        }
+        this.oStates = _states;
+        this.subscribeStates("*");
+        if (this._firstConnection) {
+          this._firstConnection = false;
+          this._callReadyHandler();
+        }
+        this.adapterReady = true;
+      });
+    } else if (!this._stopInProgress) {
+      this._callReadyHandler();
+      this.adapterReady = true;
+    }
   }
   _callReadyHandler() {
     if (this._config.isInstall && (typeof this._options.install === "function" || this.listeners("install").length)) {
@@ -6529,6 +6531,23 @@ class AdapterClass extends import_node_events.EventEmitter {
     };
     await this.#states.pushMessage(`system.host.${this.host}`, obj);
   }
+  _initPluginHandler() {
+    const pluginSettings = {
+      scope: "adapter",
+      namespace: `system.adapter.${this.namespace}`,
+      logNamespace: this.namespaceLog,
+      log: this._logger,
+      iobrokerConfig: this._config,
+      parentPackage: this.pack,
+      controllerVersion
+    };
+    this.pluginHandler = new import_plugin_base.PluginHandler(pluginSettings);
+    try {
+      this.pluginHandler.addPlugins(this.ioPack.common.plugins || {}, [this.adapterDir, thisDir]);
+    } catch (e) {
+      this._logger.error(`Could not add plugins: ${e.message}`);
+    }
+  }
   async _init() {
     const _initDBs = () => {
       this._initObjects(() => {
@@ -6583,21 +6602,7 @@ class AdapterClass extends import_node_events.EventEmitter {
     process.once("exit", () => this._stop());
     process.on("uncaughtException", (err) => this._exceptionHandler(err));
     process.on("unhandledRejection", (err) => this._exceptionHandler(err, true));
-    const pluginSettings = {
-      scope: "adapter",
-      namespace: `system.adapter.${this.namespace}`,
-      logNamespace: this.namespaceLog,
-      log: this._logger,
-      iobrokerConfig: this._config,
-      parentPackage: this.pack,
-      controllerVersion
-    };
-    this.pluginHandler = new import_plugin_base.PluginHandler(pluginSettings);
-    try {
-      this.pluginHandler.addPlugins(this.ioPack.common.plugins, [this.adapterDir, thisDir]);
-    } catch (e) {
-      this._logger.error(`Could not add plugins: ${e.message}`);
-    }
+    this._initPluginHandler();
     _initDBs();
   }
 }