@riddix/hamh 2.1.0-alpha.448 → 2.1.0-alpha.450

package/dist/backend/cli.js

@@ -166261,8 +166261,9 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 var lastTurnOnTimestamps = /* @__PURE__ */ new Map();
-var optimisticLevelTimestamps = /* @__PURE__ */ new Map();
-var OPTIMISTIC_LEVEL_COOLDOWN_MS = 2e3;
+var optimisticLevelState = /* @__PURE__ */ new Map();
+var OPTIMISTIC_TIMEOUT_MS = 3e3;
+var OPTIMISTIC_TOLERANCE = 5;
 function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, Date.now());
 }
@@ -166307,10 +166308,15 @@ var LevelControlServerBase = class extends FeaturedBase4 {
     if (currentLevel != null) {
       currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
     }
-    const lastOptimistic = optimisticLevelTimestamps.get(entity.entity_id);
-    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_LEVEL_COOLDOWN_MS;
-    if (inCooldown && currentLevel != null) {
-      currentLevel = null;
+    const optimistic = optimisticLevelState.get(entity.entity_id);
+    if (optimistic != null && currentLevel != null) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS) {
+        optimisticLevelState.delete(entity.entity_id);
+      } else if (Math.abs(currentLevel - optimistic.expectedLevel) <= OPTIMISTIC_TOLERANCE) {
+        optimisticLevelState.delete(entity.entity_id);
+      } else {
+        currentLevel = null;
+      }
     }
     applyPatchState(this.state, {
       minLevel,
@@ -166379,7 +166385,10 @@ var LevelControlServerBase = class extends FeaturedBase4 {
       };
     }
     this.state.currentLevel = level;
-    optimisticLevelTimestamps.set(entityId, Date.now());
+    optimisticLevelState.set(entityId, {
+      expectedLevel: level,
+      timestamp: Date.now()
+    });
     homeAssistant.callAction(action);
   }
 };
@@ -166527,6 +166536,7 @@ function buildEntityPayload(registry2, entityId) {
 }
 var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends Endpoint {
   entityId;
+  mappedEntityIds;
   trackedEntityIds;
   lastStates = /* @__PURE__ */ new Map();
   debouncedFlush;
@@ -166610,11 +166620,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",
@@ -166625,10 +166637,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;
@@ -166838,6 +166851,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();
@@ -166910,11 +166924,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) {
@@ -166928,9 +166946,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);
@@ -169468,8 +169487,9 @@ init_nodejs();
 // src/matter/behaviors/color-control-server.ts
 init_home_assistant_entity_behavior();
 var logger170 = Logger.get("ColorControlServer");
-var optimisticColorTimestamps = /* @__PURE__ */ new Map();
-var OPTIMISTIC_COLOR_COOLDOWN_MS = 2e3;
+var optimisticColorState = /* @__PURE__ */ new Map();
+var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
+var OPTIMISTIC_TOLERANCE2 = 5;
 var pendingColorStaging = /* @__PURE__ */ new Map();
 function consumePendingColorStaging(entityId) {
   const data = pendingColorStaging.get(entityId);
@@ -169554,8 +169574,29 @@ var ColorControlServerBase = class extends FeaturedBase7 {
     const newColorMode = this.getColorModeFromFeatures(
       config10.getCurrentMode(entity.state, this.agent)
     );
-    const lastOptimistic = optimisticColorTimestamps.get(entity.entity_id);
-    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_COLOR_COOLDOWN_MS;
+    const optimistic = optimisticColorState.get(entity.entity_id);
+    let skipColorTemp = false;
+    let skipHueSat = false;
+    if (optimistic != null) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS2) {
+        optimisticColorState.delete(entity.entity_id);
+      } else {
+        if (optimistic.colorTemperatureMireds != null && currentMireds != null) {
+          if (Math.abs(currentMireds - optimistic.colorTemperatureMireds) <= OPTIMISTIC_TOLERANCE2) {
+            optimisticColorState.delete(entity.entity_id);
+          } else {
+            skipColorTemp = true;
+          }
+        }
+        if (optimistic.currentHue != null && optimistic.currentSaturation != null) {
+          if (Math.abs(hue - optimistic.currentHue) <= OPTIMISTIC_TOLERANCE2 && Math.abs(saturation - optimistic.currentSaturation) <= OPTIMISTIC_TOLERANCE2) {
+            optimisticColorState.delete(entity.entity_id);
+          } else {
+            skipHueSat = true;
+          }
+        }
+      }
+    }
     if (this.features.colorTemperature) {
       const existingMireds = this.state.colorTemperatureMireds;
       if (existingMireds != null) {
@@ -169580,12 +169621,12 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       applyPatchState(this.state, {
         coupleColorTempToLevelMinMireds: minMireds,
         startUpColorTemperatureMireds: startUpMireds,
-        ...inCooldown ? {} : { colorTemperatureMireds: effectiveMireds }
+        ...skipColorTemp ? {} : { colorTemperatureMireds: effectiveMireds }
       });
     }
     applyPatchState(this.state, {
-      ...inCooldown ? {} : { colorMode: newColorMode },
-      ...this.features.hueSaturation && !inCooldown ? {
+      ...skipColorTemp && skipHueSat ? {} : { colorMode: newColorMode },
+      ...this.features.hueSaturation && !skipHueSat ? {
         currentHue: hue,
         currentSaturation: saturation
       } : {}
@@ -169612,7 +169653,10 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       colorTemperatureMireds: targetMireds,
       colorMode: ColorControl3.ColorMode.ColorTemperatureMireds
     });
-    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
+    optimisticColorState.set(homeAssistant.entityId, {
+      colorTemperatureMireds: targetMireds,
+      timestamp: Date.now()
+    });
     if (this.isLightOff()) {
       pendingColorStaging.set(homeAssistant.entityId, action.data ?? {});
       return;
@@ -169647,7 +169691,11 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       currentSaturation: targetSaturation,
       colorMode: ColorControl3.ColorMode.CurrentHueAndCurrentSaturation
     });
-    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
+    optimisticColorState.set(homeAssistant.entityId, {
+      currentHue: targetHue,
+      currentSaturation: targetSaturation,
+      timestamp: Date.now()
+    });
     if (this.isLightOff()) {
       pendingColorStaging.set(homeAssistant.entityId, action.data ?? {});
       return;
@@ -170963,8 +171011,9 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 var logger175 = Logger.get("SpeakerLevelControlServer");
-var optimisticLevelTimestamps2 = /* @__PURE__ */ new Map();
-var OPTIMISTIC_LEVEL_COOLDOWN_MS2 = 2e3;
+var optimisticLevelState2 = /* @__PURE__ */ new Map();
+var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
+var OPTIMISTIC_TOLERANCE3 = 5;
 var FeaturedBase9 = LevelControlServer.with("OnOff");
 var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   async initialize() {
@@ -171000,10 +171049,15 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     logger175.debug(
       `[${entityId}] Volume update: HA=${currentLevelPercent != null ? Math.round(currentLevelPercent * 100) : "null"}% -> currentLevel=${currentLevel}`
     );
-    const lastOptimistic = optimisticLevelTimestamps2.get(entity.entity_id);
-    const inCooldown = lastOptimistic != null && Date.now() - lastOptimistic < OPTIMISTIC_LEVEL_COOLDOWN_MS2;
-    if (inCooldown && currentLevel != null) {
-      currentLevel = null;
+    const optimistic = optimisticLevelState2.get(entity.entity_id);
+    if (optimistic != null && currentLevel != null) {
+      if (Date.now() - optimistic.timestamp > OPTIMISTIC_TIMEOUT_MS3) {
+        optimisticLevelState2.delete(entity.entity_id);
+      } else if (Math.abs(currentLevel - optimistic.expectedLevel) <= OPTIMISTIC_TOLERANCE3) {
+        optimisticLevelState2.delete(entity.entity_id);
+      } else {
+        currentLevel = null;
+      }
     }
     applyPatchState(this.state, {
       minLevel,
@@ -171051,7 +171105,10 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
       return;
     }
     this.state.currentLevel = level;
-    optimisticLevelTimestamps2.set(entityId, Date.now());
+    optimisticLevelState2.set(entityId, {
+      expectedLevel: level,
+      timestamp: Date.now()
+    });
     homeAssistant.callAction(
       config10.moveToLevelPercent(levelPercent, this.agent)
     );