@iobroker/js-controller-adapter 7.2.3-alpha.13-20260807-e528bb438 → 7.2.3-alpha.14-20260808-bfc2bfaa4

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

@@ -573,8 +573,6 @@ export declare class AdapterClass extends EventEmitter {
     private readonly startedInCompactMode;
     /** List of instances which want our logs */
     private readonly logList;
-    private readonly aliases;
-    private readonly aliasPatterns;
     private enums;
     private eventLoopLags;
     private overwriteLogLevel;
@@ -648,7 +646,6 @@ export declare class AdapterClass extends EventEmitter {
     /** latitude configured in system.config, only available if requested via AdapterOptions `useFormatDate`*/
     latitude?: number;
     private _defaultObjs?;
-    private _aliasObjectsSubscribed?;
     config: ioBroker.AdapterConfig;
     host?: string;
     common?: ioBroker.InstanceCommon;
@@ -2351,20 +2348,6 @@ export declare class AdapterClass extends EventEmitter {
         user?: ioBroker.ObjectIDs.User;
     } | null | undefined, callback: ioBroker.GetStatesCallback): void;
     private _getForeignStates;
-    /**
-     * Add a subscription for a given alias, if it is not a state, it will be ignored
-     *
-     * @param aliasObj the alias object
-     * @param pattern pattern to subscribe for
-     */
-    private _addAliasSubscribe;
-    /**
-     * Remove an alias subscribe
-     *
-     * @param sourceId id of the source object
-     * @param aliasObjOrIdx the alias target or the index of the targets array
-     */
-    private _removeAliasSubscribe;
     /**
      * Subscribe for changes on all states of all adapters (and system states), that pass the pattern
      *

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

@@ -56,6 +56,7 @@ var import_plugin_base = require("@iobroker/plugin-base");
 var import_userInterfaceMessagingController = require("../../lib/adapter/userInterfaceMessagingController.js");
 var import_asyncAdapter = require("../../lib/adapter/asyncAdapter.js");
 var import_CertificateManager = require("../../lib/adapter/managers/CertificateManager.js");
+var import_AliasManager = require("../../lib/adapter/managers/AliasManager.js");
 var import_constants2 = require("@iobroker/js-controller-common-db/constants");
 var import_tools = require("@iobroker/js-controller-common-db/tools");
 const controllerVersion = import_package.default.version;
@@ -82,8 +83,6 @@ class AdapterClass extends import_node_events.EventEmitter {
   startedInCompactMode;
   /** List of instances which want our logs */
   logList = /* @__PURE__ */ new Set();
-  aliases = /* @__PURE__ */ new Map();
-  aliasPatterns = /* @__PURE__ */ new Set();
   enums = {};
   eventLoopLags = [];
   overwriteLogLevel = false;
@@ -159,7 +158,6 @@ class AdapterClass extends import_node_events.EventEmitter {
   /** latitude configured in system.config, only available if requested via AdapterOptions `useFormatDate`*/
   latitude;
   _defaultObjs;
-  _aliasObjectsSubscribed;
   config = {};
   host;
   common;
@@ -194,6 +192,11 @@ class AdapterClass extends import_node_events.EventEmitter {
   #context;
   #async;
   #certWatchers = /* @__PURE__ */ new Map();
+  #aliasInstance;
+  /** Lazily-constructed alias subscription manager. */
+  get #alias() {
+    return this.#aliasInstance ??= new import_AliasManager.AliasManager(this.#context, (id, allowSystem, options) => this._utils.validateId(id, allowSystem, options));
+  }
   /** True once `system.certificates` is subscribed, i.e. certificates have been requested */
   #certObjectSubscribed = false;
   /** True once a certificate change scheduled a restart, so concurrent changes schedule only one */
@@ -6420,76 +6423,6 @@ class AdapterClass extends import_node_events.EventEmitter {
       }
     }
   }
-  /**
-   * Add a subscription for a given alias, if it is not a state, it will be ignored
-   *
-   * @param aliasObj the alias object
-   * @param pattern pattern to subscribe for
-   */
-  async _addAliasSubscribe(aliasObj, pattern) {
-    if (aliasObj.type !== "state") {
-      return;
-    }
-    if (!aliasObj.common?.alias?.id) {
-      this._logger.warn(`${this.namespaceLog} Alias ${aliasObj._id} has no target 5`);
-      throw new Error(`Alias ${aliasObj._id} has no target`);
-    }
-    const sourceId = import_js_controller_common.tools.isObject(aliasObj.common.alias.id) ? aliasObj.common.alias.id.read : aliasObj.common.alias.id;
-    try {
-      this._utils.validateId(sourceId, true, null);
-    } catch (e) {
-      throw new Error(`Error validating alias id of ${aliasObj._id}: ${e.message}`);
-    }
-    const targetEntry = {
-      alias: (0, import_deep_clone.default)(aliasObj.common.alias),
-      id: aliasObj._id,
-      pattern,
-      type: aliasObj.common.type,
-      max: aliasObj.common.max,
-      min: aliasObj.common.min,
-      unit: aliasObj.common.unit
-    };
-    let aliasDetails;
-    if (!this.aliases.has(sourceId)) {
-      aliasDetails = { targets: [] };
-      this.aliases.set(sourceId, aliasDetails);
-    } else {
-      aliasDetails = this.aliases.get(sourceId);
-    }
-    if (!aliasDetails.source) {
-      await this.#states.subscribe(sourceId);
-      const sourceObj = await this.#objects.getObject(sourceId, { user: import_constants.SYSTEM_ADMIN_USER });
-      if (sourceObj?.common && this.aliases.has(sourceObj._id)) {
-        aliasDetails.source = {
-          min: sourceObj.common.min,
-          max: sourceObj.common.max,
-          type: sourceObj.common.type,
-          unit: sourceObj.common.unit
-        };
-      }
-    }
-    aliasDetails.targets.push(targetEntry);
-  }
-  /**
-   * Remove an alias subscribe
-   *
-   * @param sourceId id of the source object
-   * @param aliasObjOrIdx the alias target or the index of the targets array
-   */
-  async _removeAliasSubscribe(sourceId, aliasObjOrIdx) {
-    if (!this.aliases.has(sourceId)) {
-      return;
-    }
-    const alias = this.aliases.get(sourceId);
-    const pos = typeof aliasObjOrIdx === "number" ? aliasObjOrIdx : alias.targets.indexOf(aliasObjOrIdx);
-    if (pos !== -1) {
-      alias.targets.splice(pos, 1);
-      if (!alias.targets.length) {
-        this.aliases.delete(sourceId);
-        await this.#states.unsubscribe(sourceId);
-      }
-    }
-  }
   /**
    * Subscribe for changes on all states of all adapters (and system states), that pass the pattern
    *
@@ -6562,20 +6495,17 @@ class AdapterClass extends import_node_events.EventEmitter {
       const aliasesIds = pattern.map((id) => id.startsWith(import_constants.ALIAS_STARTS_WITH) ? id : null).filter((id) => id);
       const nonAliasesIds = pattern.map((id) => !id.startsWith(import_constants.ALIAS_STARTS_WITH) ? id : null).filter((id) => id);
       for (const aliasPattern of pattern) {
-        if ((aliasPattern.startsWith(import_constants.ALIAS_STARTS_WITH) || aliasPattern.includes("*")) && !this.aliasPatterns.has(aliasPattern)) {
-          this.aliasPatterns.add(aliasPattern);
+        if ((aliasPattern.startsWith(import_constants.ALIAS_STARTS_WITH) || aliasPattern.includes("*")) && !this.#alias.hasPattern(aliasPattern)) {
+          this.#alias.addPattern(aliasPattern);
         }
       }
       const promises = [];
       if (aliasesIds.length) {
-        if (!this._aliasObjectsSubscribed) {
-          this._aliasObjectsSubscribed = true;
-          this.#objects.subscribe(`${import_constants.ALIAS_STARTS_WITH}*`);
-        }
+        this.#alias.ensureAliasObjectSubscription();
         const aliasObjs = await this._getObjectsByArray(aliasesIds, options);
         for (const aliasObj of aliasObjs) {
           if (aliasObj) {
-            promises.push(this._addAliasSubscribe(aliasObj, aliasObj._id));
+            promises.push(this.#alias.addAliasSubscribe(aliasObj, aliasObj._id));
           }
         }
       }
@@ -6592,20 +6522,17 @@ class AdapterClass extends import_node_events.EventEmitter {
       return import_js_controller_common.tools.maybeCallback(callback);
     } else if (pattern.includes("*")) {
       if (pattern === "*" || pattern.startsWith(import_constants.ALIAS_STARTS_WITH)) {
-        if (!this._aliasObjectsSubscribed) {
-          this._aliasObjectsSubscribed = true;
-          this.#objects.subscribe(`${import_constants.ALIAS_STARTS_WITH}*`);
-        }
+        this.#alias.ensureAliasObjectSubscription();
         try {
           const objs = await this.getForeignObjectsAsync(pattern, null, null, options);
           const promises = [];
-          if (!this.aliasPatterns.has(pattern)) {
-            this.aliasPatterns.add(pattern);
+          if (!this.#alias.hasPattern(pattern)) {
+            this.#alias.addPattern(pattern);
           }
           for (const id of Object.keys(objs)) {
             if (id.startsWith(import_constants.ALIAS_STARTS_WITH)) {
               const aliasObj = objs[id];
-              promises.push(this._addAliasSubscribe(aliasObj, pattern));
+              promises.push(this.#alias.addAliasSubscribe(aliasObj, pattern));
             }
           }
           try {
@@ -6629,14 +6556,11 @@ class AdapterClass extends import_node_events.EventEmitter {
         return callback ? this.#states.subscribeUser(pattern, callback) : this.#states.subscribeUser(pattern);
       }
     } else if (pattern.startsWith(import_constants.ALIAS_STARTS_WITH)) {
-      if (!this._aliasObjectsSubscribed) {
-        this._aliasObjectsSubscribed = true;
-        this.#objects.subscribe(`${import_constants.ALIAS_STARTS_WITH}*`);
-      }
+      this.#alias.ensureAliasObjectSubscription();
       try {
         const aliasObj = await this.#objects.getObject(pattern, options);
         if (aliasObj) {
-          await this._addAliasSubscribe(aliasObj, pattern);
+          await this.#alias.addAliasSubscribe(aliasObj, pattern);
           return import_js_controller_common.tools.maybeCallback(callback);
         }
         return import_js_controller_common.tools.maybeCallback(callback);
@@ -6742,20 +6666,11 @@ class AdapterClass extends import_node_events.EventEmitter {
       promises.push(this.#states.unsubscribeUser(pattern));
     }
     if (aliasPattern) {
-      this.aliasPatterns.delete(aliasPattern);
-      for (const [sourceId, alias] of this.aliases) {
-        for (let i = alias.targets.length - 1; i >= 0; i--) {
-          if (alias.targets[i].pattern === aliasPattern) {
-            promises.push(this._removeAliasSubscribe(sourceId, i));
-          }
-        }
-      }
+      this.#alias.deletePattern(aliasPattern);
+      promises.push(this.#alias.removeTargetsForPattern(aliasPattern));
     }
     await Promise.all(promises);
-    if (!this.aliases.size && this._aliasObjectsSubscribed) {
-      this._aliasObjectsSubscribed = false;
-      this.#objects.unsubscribe(`${import_constants.ALIAS_STARTS_WITH}*`);
-    }
+    this.#alias.maybeDropAliasObjectSubscription();
     return import_js_controller_common.tools.maybeCallback(callback);
   }
   /**
@@ -7390,31 +7305,12 @@ class AdapterClass extends import_node_events.EventEmitter {
               }
             }
           }
-        } else if (!this._stopInProgress && this.adapterReady && this.aliases.has(id)) {
-          const alias = this.aliases.get(id);
-          const uniqueTargets = /* @__PURE__ */ new Set();
-          for (const target of alias.targets) {
-            const targetId = target.id;
-            if (uniqueTargets.has(targetId)) {
-              continue;
-            }
-            uniqueTargets.add(targetId);
-            const source = alias.source;
-            const aState = state ? import_js_controller_common.tools.formatAliasValue({
-              sourceCommon: source,
-              targetCommon: target,
-              state: (0, import_deep_clone.default)(state),
-              logger: this._logger,
-              logNamespace: this.namespaceLog,
-              sourceId: id,
-              targetId
-            }) : null;
-            if (aState || !state) {
-              if (typeof this._options.stateChange === "function") {
-                Promise.resolve(this._options.stateChange(targetId, aState)).catch((e) => this._logger.error(`${this.namespaceLog} Error in stateChange handler: ${e.message}`));
-              } else {
-                setImmediate(() => this.emit("stateChange", targetId, aState));
-              }
+        } else if (!this._stopInProgress && this.adapterReady && this.#alias.hasSource(id)) {
+          for (const { targetId, state: aState } of this.#alias.resolveSourceChange(id, state)) {
+            if (typeof this._options.stateChange === "function") {
+              Promise.resolve(this._options.stateChange(targetId, aState)).catch((e) => this._logger.error(`${this.namespaceLog} Error in stateChange handler: ${e.message}`));
+            } else {
+              setImmediate(() => this.emit("stateChange", targetId, aState));
             }
           }
         }
@@ -7538,44 +7434,7 @@ class AdapterClass extends import_node_events.EventEmitter {
           this.defaultHistory = obj.common.defaultHistory;
         }
         if (id.startsWith(import_constants.ALIAS_STARTS_WITH)) {
-          let isNewAlias = true;
-          for (const [sourceId, alias] of this.aliases) {
-            const targetAlias = alias.targets.find((entry) => entry.id === id);
-            if (targetAlias) {
-              isNewAlias = false;
-              if (obj?.common?.alias?.id) {
-                const newSourceId = typeof obj.common.alias.id.read === "string" ? obj.common.alias.id.read : obj.common.alias.id;
-                if (newSourceId !== sourceId) {
-                  await this._removeAliasSubscribe(sourceId, targetAlias);
-                  try {
-                    await this._addAliasSubscribe(obj, targetAlias.pattern);
-                  } catch (e) {
-                    this._logger.error(`${this.namespaceLog} Could not add alias subscription: ${e.message}`);
-                  }
-                } else {
-                  targetAlias.min = obj.common.min;
-                  targetAlias.max = obj.common.max;
-                  targetAlias.type = obj.common.type;
-                  targetAlias.alias = (0, import_deep_clone.default)(obj.common.alias);
-                }
-              } else {
-                await this._removeAliasSubscribe(sourceId, targetAlias);
-              }
-            }
-          }
-          if (isNewAlias && obj) {
-            for (const aliasPattern of this.aliasPatterns) {
-              const testPattern = aliasPattern.slice(-1) === "*" ? new RegExp(import_js_controller_common.tools.pattern2RegEx(aliasPattern)) : aliasPattern;
-              if (typeof testPattern === "string" && aliasPattern === id || testPattern instanceof RegExp && testPattern.test(id)) {
-                try {
-                  await this._addAliasSubscribe(obj, id);
-                } catch (e) {
-                  this._logger.warn(`${this.namespaceLog} Could not add alias subscription: ${e.message}`);
-                }
-                break;
-              }
-            }
-          }
+          await this.#alias.handleAliasObjectChange(id, obj);
         }
         if (id.startsWith("system.adapter.")) {
           if (obj?.common?.subscribable) {