@riddix/hamh 2.1.0-alpha.435 → 2.1.0-alpha.437

package/README.md

@@ -445,6 +445,7 @@ Thank you to everyone who helps improve this project by reporting issues!
 | [@JRCondat](https://github.com/JRCondat) | 💎 Thank you for your generous support! |
 | Bonjon | 💎 Thank you for your generous support! |
 | TobiR | 💎 Thank you for your generous support! |
+| [@d3rby91](https://github.com/d3rby91) | 💎 Thank you for your generous support! |
 | *Anonymous supporters* | 🙏 Thank you to those who prefer not to be named - your support is equally appreciated! |
 
 ### 🌟 Original Author

package/dist/backend/cli.js

@@ -164463,15 +164463,45 @@ import debounce4 from "debounce";
 // src/matter/endpoints/entity-endpoint.ts
 init_esm7();
 var EntityEndpoint = class extends Endpoint {
-  constructor(type, entityId, customName) {
+  constructor(type, entityId, customName, mappedEntityIds) {
     super(type, { id: createEndpointId(entityId, customName) });
     this.entityId = entityId;
+    this.mappedEntityIds = mappedEntityIds ?? [];
+  }
+  mappedEntityIds;
+  lastMappedStates = {};
+  hasMappedEntityChanged(states) {
+    let changed = false;
+    for (const mappedId of this.mappedEntityIds) {
+      const mappedState = states[mappedId];
+      if (!mappedState) continue;
+      const fp = mappedState.state;
+      if (fp !== this.lastMappedStates[mappedId]) {
+        this.lastMappedStates[mappedId] = fp;
+        changed = true;
+      }
+    }
+    return changed;
   }
 };
 function createEndpointId(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
 }
+function getMappedEntityIds(mapping) {
+  if (!mapping) return [];
+  const ids = [];
+  if (mapping.batteryEntity) ids.push(mapping.batteryEntity);
+  if (mapping.humidityEntity) ids.push(mapping.humidityEntity);
+  if (mapping.pressureEntity) ids.push(mapping.pressureEntity);
+  if (mapping.cleaningModeEntity) ids.push(mapping.cleaningModeEntity);
+  if (mapping.suctionLevelEntity) ids.push(mapping.suctionLevelEntity);
+  if (mapping.mopIntensityEntity) ids.push(mapping.mopIntensityEntity);
+  if (mapping.filterLifeEntity) ids.push(mapping.filterLifeEntity);
+  if (mapping.powerEntity) ids.push(mapping.powerEntity);
+  if (mapping.energyEntity) ids.push(mapping.energyEntity);
+  return ids;
+}
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
 init_dist();
@@ -174790,10 +174820,11 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       return;
     }
     const customName = effectiveMapping?.customName;
-    return new _LegacyEndpoint(type, entityId, customName);
+    const mappedIds = getMappedEntityIds(effectiveMapping);
+    return new _LegacyEndpoint(type, entityId, customName, mappedIds);
   }
-  constructor(type, entityId, customName) {
-    super(type, entityId, customName);
+  constructor(type, entityId, customName, mappedEntityIds) {
+    super(type, entityId, customName, mappedEntityIds);
     this.flushUpdate = debounce4(this.flushPendingUpdate.bind(this), 50);
   }
   lastState;
@@ -174804,9 +174835,15 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   }
   async updateStates(states) {
     const state = states[this.entityId] ?? {};
-    if (state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
+    const mappedChanged = this.hasMappedEntityChanged(states);
+    if (!mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
       return;
     }
+    if (mappedChanged) {
+      logger189.debug(
+        `Mapped entity change detected for ${this.entityId}, forcing update`
+      );
+    }
     logger189.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
@@ -175105,12 +175142,26 @@ var BridgeEndpointManager = class extends Service {
     if (!this.entityIds.length) {
       return;
     }
+    const subscriptionIds = this.collectSubscriptionEntityIds();
     this.unsubscribe = subscribeEntities(
       this.client.connection,
       (e) => this.updateStates(e),
-      this.entityIds
+      subscriptionIds
     );
   }
+  collectSubscriptionEntityIds() {
+    const ids = new Set(this.entityIds);
+    const endpoints = this.root.parts.map((p) => p);
+    for (const endpoint of endpoints) {
+      const mappedIds = endpoint.mappedEntityIds;
+      if (mappedIds) {
+        for (const mappedId of mappedIds) {
+          ids.add(mappedId);
+        }
+      }
+    }
+    return [...ids];
+  }
   stopObserving() {
     this.unsubscribe?.();
     this.unsubscribe = void 0;
@@ -175235,6 +175286,7 @@ var BridgeEndpointManager = class extends Service {
     }
   }
   async updateStates(states) {
+    this.registry.mergeExternalStates(states);
     const endpoints = this.root.parts.map((p) => p);
     const results = await Promise.allSettled(
       endpoints.map((endpoint) => endpoint.updateStates(states))
@@ -175705,6 +175757,12 @@ var BridgeRegistry = class _BridgeRegistry {
   isEnergyEntityUsed(entityId) {
     return this._usedEnergyEntities.has(entityId);
   }
+  mergeExternalStates(states) {
+    const registryStates = this.registry.states;
+    for (const entityId of Object.keys(states)) {
+      registryStates[entityId] = states[entityId];
+    }
+  }
   /**
    * Get the area name for an entity, resolving from HA area registry.
    * Priority: entity area_id > device area_id > undefined
@@ -176401,12 +176459,18 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     if (!endpointType) {
       return void 0;
     }
-    return new _ServerModeVacuumEndpoint(endpointType, entityId, customName);
+    const mappedIds = getMappedEntityIds(effectiveMapping);
+    return new _ServerModeVacuumEndpoint(
+      endpointType,
+      entityId,
+      customName,
+      mappedIds
+    );
   }
   lastState;
   flushUpdate;
-  constructor(type, entityId, customName) {
-    super(type, entityId, customName);
+  constructor(type, entityId, customName, mappedEntityIds) {
+    super(type, entityId, customName, mappedEntityIds);
     this.flushUpdate = debounce5(this.flushPendingUpdate.bind(this), 50);
   }
   async delete() {
@@ -176415,9 +176479,15 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
   }
   async updateStates(states) {
     const state = states[this.entityId] ?? {};
-    if (state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
+    const mappedChanged = this.hasMappedEntityChanged(states);
+    if (!mappedChanged && state.state === this.lastState?.state && JSON.stringify(state.attributes) === JSON.stringify(this.lastState?.attributes)) {
       return;
     }
+    if (mappedChanged) {
+      logger192.debug(
+        `Mapped entity change detected for ${this.entityId}, forcing update`
+      );
+    }
     logger192.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
@@ -176498,12 +176568,25 @@ var ServerModeEndpointManager = class extends Service {
     if (!this.entityIds.length) {
       return;
     }
+    const subscriptionIds = this.collectSubscriptionEntityIds();
     this.unsubscribe = subscribeEntities(
       this.client.connection,
       (e) => this.updateStates(e),
-      this.entityIds
+      subscriptionIds
     );
   }
+  collectSubscriptionEntityIds() {
+    const ids = new Set(this.entityIds);
+    if (this.deviceEndpoint) {
+      const mappedIds = this.deviceEndpoint.mappedEntityIds;
+      if (mappedIds) {
+        for (const mappedId of mappedIds) {
+          ids.add(mappedId);
+        }
+      }
+    }
+    return [...ids];
+  }
   stopObserving() {
     this.unsubscribe?.();
     this.unsubscribe = void 0;
@@ -176616,6 +176699,7 @@ var ServerModeEndpointManager = class extends Service {
     }
   }
   async updateStates(states) {
+    this.registry.mergeExternalStates(states);
     if (this.deviceEndpoint) {
       try {
         await this.deviceEndpoint.updateStates(states);