@iobroker/js-controller-adapter 6.0.7-alpha.0-20240702-5c723a4ac → 6.0.8

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

@@ -6266,7 +6266,10 @@ class AdapterClass extends import_node_events.EventEmitter {
       });
       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}`);
+        const isNpmVersion = (0, import_js_controller_common.isInstalledFromNpm)({
+          adapterName: this.name,
+          installedFrom: this.ioPack.common.installedFrom
+        });
         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;
@@ -6277,7 +6280,7 @@ class AdapterClass extends import_node_events.EventEmitter {
           this.#states.setState(`${id}.compactMode`, {
             ack: true,
             from: id,
-            val: !!this.startedInCompactMode
+            val: this.startedInCompactMode
           });
           this.outputCount++;
           if (this.startedInCompactMode) {
@@ -6529,6 +6532,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 +6603,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();
   }
 }