@riddix/hamh 2.1.0-alpha.449 → 2.1.0-alpha.451

package/dist/backend/cli.js

@@ -166407,6 +166407,8 @@ function LevelControlServer2(config10) {
 
 // src/matter/behaviors/on-off-server.ts
 var logger159 = Logger.get("OnOffServer");
+var optimisticOnOffState = /* @__PURE__ */ new Map();
+var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
 var OnOffServerBase = class extends OnOffServer {
   async initialize() {
     await super.initialize();
@@ -166415,9 +166417,19 @@ var OnOffServerBase = class extends OnOffServer {
     this.reactTo(homeAssistant.onChange, this.update);
   }
   update({ state }) {
-    applyPatchState(this.state, {
-      onOff: this.isOn(state)
-    });
+    const onOff = this.isOn(state);
+    const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
+    const optimistic = optimisticOnOffState.get(entityId);
+    if (optimistic != null) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS2) {
+        optimisticOnOffState.delete(entityId);
+      } else if (onOff === optimistic.expectedOnOff) {
+        optimisticOnOffState.delete(entityId);
+      } else {
+        return;
+      }
+    }
+    applyPatchState(this.state, { onOff });
   }
   isOn(entity) {
     return this.state.config?.isOn?.(entity, this.agent) ?? (this.agent.get(HomeAssistantEntityBehavior).isAvailable && entity.state !== "off");
@@ -166435,6 +166447,10 @@ var OnOffServerBase = class extends OnOffServer {
     logger159.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
     notifyLightTurnedOn(homeAssistant.entityId);
     applyPatchState(this.state, { onOff: true });
+    optimisticOnOffState.set(homeAssistant.entityId, {
+      expectedOnOff: true,
+      timestamp: Date.now()
+    });
     homeAssistant.callAction(action);
     if (turnOff === null) {
       setTimeout(this.callback(this.autoReset), 1e3);
@@ -166452,6 +166468,10 @@ var OnOffServerBase = class extends OnOffServer {
     };
     logger159.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
     applyPatchState(this.state, { onOff: false });
+    optimisticOnOffState.set(homeAssistant.entityId, {
+      expectedOnOff: false,
+      timestamp: Date.now()
+    });
     homeAssistant.callAction(action);
   }
   autoReset() {
@@ -166536,6 +166556,7 @@ function buildEntityPayload(registry2, entityId) {
 }
 var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends Endpoint {
   entityId;
+  mappedEntityIds;
   trackedEntityIds;
   lastStates = /* @__PURE__ */ new Map();
   debouncedFlush;
@@ -166619,11 +166640,13 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     if (config10.temperatureEntityId)
       trackedEntityIds.push(config10.temperatureEntityId);
     if (config10.humidityEntityId) trackedEntityIds.push(config10.humidityEntityId);
+    const mappedIds = trackedEntityIds.filter((id) => id !== primaryEntityId);
     const endpoint = new _ComposedAirPurifierEndpoint(
       parentTypeWithState,
       primaryEntityId,
       endpointId,
-      trackedEntityIds
+      trackedEntityIds,
+      mappedIds
     );
     const clusterLabels = [
       "AirPurifier",
@@ -166634,10 +166657,11 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     logger160.info(`Created air purifier ${primaryEntityId}: ${clusterLabels}`);
     return endpoint;
   }
-  constructor(type, entityId, id, trackedEntityIds) {
+  constructor(type, entityId, id, trackedEntityIds, mappedEntityIds) {
     super(type, { id });
     this.entityId = entityId;
     this.trackedEntityIds = trackedEntityIds;
+    this.mappedEntityIds = mappedEntityIds;
   }
   async updateStates(states) {
     let anyChanged = false;
@@ -166847,6 +166871,7 @@ function buildEntityPayload2(registry2, entityId) {
 }
 var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
   entityId;
+  mappedEntityIds;
   subEndpoints = /* @__PURE__ */ new Map();
   lastStates = /* @__PURE__ */ new Map();
   debouncedUpdates = /* @__PURE__ */ new Map();
@@ -166919,11 +166944,15 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
         mapping
       }
     });
+    const mappedIds = [];
+    if (config10.humidityEntityId) mappedIds.push(config10.humidityEntityId);
+    if (config10.pressureEntityId) mappedIds.push(config10.pressureEntityId);
     const endpoint = new _ComposedSensorEndpoint(
       parentTypeWithState,
       primaryEntityId,
       endpointId,
-      parts
+      parts,
+      mappedIds
     );
     endpoint.subEndpoints.set(primaryEntityId, tempSub);
     if (config10.humidityEntityId && humSub) {
@@ -166937,9 +166966,10 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     );
     return endpoint;
   }
-  constructor(type, entityId, id, parts) {
+  constructor(type, entityId, id, parts, mappedEntityIds) {
     super(type, { id, parts });
     this.entityId = entityId;
+    this.mappedEntityIds = mappedEntityIds;
   }
   async updateStates(states) {
     this.scheduleUpdate(this, this.entityId, states);
@@ -169478,7 +169508,7 @@ init_nodejs();
 init_home_assistant_entity_behavior();
 var logger170 = Logger.get("ColorControlServer");
 var optimisticColorState = /* @__PURE__ */ new Map();
-var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
+var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
 var OPTIMISTIC_TOLERANCE2 = 5;
 var pendingColorStaging = /* @__PURE__ */ new Map();
 function consumePendingColorStaging(entityId) {
@@ -169568,7 +169598,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
     let skipColorTemp = false;
     let skipHueSat = false;
     if (optimistic != null) {
-      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS2) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS3) {
         optimisticColorState.delete(entity.entity_id);
       } else {
         if (optimistic.colorTemperatureMireds != null && currentMireds != null) {
@@ -171002,7 +171032,7 @@ init_esm();
 init_home_assistant_entity_behavior();
 var logger175 = Logger.get("SpeakerLevelControlServer");
 var optimisticLevelState2 = /* @__PURE__ */ new Map();
-var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
+var OPTIMISTIC_TIMEOUT_MS4 = 3e3;
 var OPTIMISTIC_TOLERANCE3 = 5;
 var FeaturedBase9 = LevelControlServer.with("OnOff");
 var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
@@ -171041,7 +171071,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     );
     const optimistic = optimisticLevelState2.get(entity.entity_id);
     if (optimistic != null && currentLevel != null) {
-      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS3) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS4) {
         optimisticLevelState2.delete(entity.entity_id);
       } else if (Math.abs(currentLevel - optimistic.expectedLevel) <= OPTIMISTIC_TOLERANCE3) {
         optimisticLevelState2.delete(entity.entity_id);