@riddix/hamh 2.1.0-alpha.440 → 2.1.0-alpha.442

package/dist/backend/cli.js

@@ -166145,6 +166145,8 @@ 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;
 function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, Date.now());
 }
@@ -166189,6 +166191,11 @@ 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;
+    }
     applyPatchState(this.state, {
       minLevel,
       maxLevel,
@@ -166256,6 +166263,7 @@ var LevelControlServerBase = class extends FeaturedBase4 {
       };
     }
     this.state.currentLevel = level;
+    optimisticLevelTimestamps.set(entityId, Date.now());
     homeAssistant.callAction(action);
   }
 };
@@ -168633,9 +168641,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       `handleMovement: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}, absolutePosition=${this.features.absolutePosition}`
     );
     if (type === MovementType.Lift) {
-      if (direction === MovementDirection.Open && (targetPercent100ths == null || targetPercent100ths === 0)) {
+      if (targetPercent100ths === 0) {
         this.handleLiftOpen();
-      } else if (direction === MovementDirection.Close && (targetPercent100ths == null || targetPercent100ths === 1e4)) {
+      } else if (targetPercent100ths === 1e4) {
         this.handleLiftClose();
       } else if (targetPercent100ths != null && this.features.absolutePosition) {
         this.handleGoToLiftPosition(targetPercent100ths);
@@ -168645,9 +168653,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         this.handleLiftClose();
       }
     } else if (type === MovementType.Tilt) {
-      if (direction === MovementDirection.Open && (targetPercent100ths == null || targetPercent100ths === 0)) {
+      if (targetPercent100ths === 0) {
         this.handleTiltOpen();
-      } else if (direction === MovementDirection.Close && (targetPercent100ths == null || targetPercent100ths === 1e4)) {
+      } else if (targetPercent100ths === 1e4) {
         this.handleTiltClose();
       } else if (targetPercent100ths != null && this.features.absolutePosition) {
         this.handleGoToTiltPosition(targetPercent100ths);
@@ -169344,6 +169352,8 @@ 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 FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation");
 var ColorControlServerBase = class extends FeaturedBase7 {
   pendingTransitionTime;
@@ -169422,6 +169432,8 @@ 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;
     if (this.features.colorTemperature) {
       const existingMireds = this.state.colorTemperatureMireds;
       if (existingMireds != null) {
@@ -169446,12 +169458,12 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       applyPatchState(this.state, {
         coupleColorTempToLevelMinMireds: minMireds,
         startUpColorTemperatureMireds: startUpMireds,
-        colorTemperatureMireds: effectiveMireds
+        ...inCooldown ? {} : { colorTemperatureMireds: effectiveMireds }
       });
     }
     applyPatchState(this.state, {
-      colorMode: newColorMode,
-      ...this.features.hueSaturation ? {
+      ...inCooldown ? {} : { colorMode: newColorMode },
+      ...this.features.hueSaturation && !inCooldown ? {
         currentHue: hue,
         currentSaturation: saturation
       } : {}
@@ -169478,6 +169490,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       colorTemperatureMireds: targetMireds,
       colorMode: ColorControl3.ColorMode.ColorTemperatureMireds
     });
+    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
     homeAssistant.callAction(action);
   }
   moveToHueLogic(targetHue) {
@@ -169508,6 +169521,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
       currentSaturation: targetSaturation,
       colorMode: ColorControl3.ColorMode.CurrentHueAndCurrentSaturation
     });
+    optimisticColorTimestamps.set(homeAssistant.entityId, Date.now());
     homeAssistant.callAction(action);
   }
   applyTransition(action) {
@@ -170811,6 +170825,8 @@ 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 FeaturedBase9 = LevelControlServer.with("OnOff");
 var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   async initialize() {
@@ -170846,10 +170862,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;
+    }
     applyPatchState(this.state, {
       minLevel,
       maxLevel,
-      currentLevel
+      ...currentLevel != null ? { currentLevel } : {}
     });
   }
   async moveToLevel(request) {
@@ -170892,6 +170913,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
       return;
     }
     this.state.currentLevel = level;
+    optimisticLevelTimestamps2.set(entityId, Date.now());
     homeAssistant.callAction(
       config10.moveToLevelPercent(levelPercent, this.agent)
     );