@riddix/hamh 2.1.0-alpha.841 → 2.1.0-alpha.842

package/dist/backend/cli.js

@@ -163276,6 +163276,15 @@ function clearPendingTilt(st) {
   st.pendingTilt = null;
 }
 var coverOptimistic = /* @__PURE__ */ new WeakMap();
+function haRestEnd(action) {
+  if (action.action.includes("open_cover")) {
+    return "open";
+  }
+  if (action.action.includes("close_cover")) {
+    return "close";
+  }
+  return null;
+}
 function getCoverOptimistic(endpoint) {
   let st = coverOptimistic.get(endpoint);
   if (!st) {
@@ -163390,7 +163399,10 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       if (!entry) {
         return MovementStatus.Stopped;
       }
-      const reachedTarget = positionAware && current100ths != null && existingTarget != null && Math.abs(current100ths - existingTarget) < 100;
+      const getExpected = config11.getExpectedRestPosition;
+      const expectedPercent = entry.expectedRestEnd != null && getExpected != null ? getExpected(entry.expectedRestEnd, this.agent) : null;
+      const goal = expectedPercent != null ? expectedPercent * 100 : existingTarget;
+      const reachedTarget = positionAware && current100ths != null && goal != null && Math.abs(current100ths - goal) < 100;
       const expired = Date.now() - entry.startedAt >= optimisticMovementTimeoutMs;
       if (reachedTarget || expired) {
         clearOptimisticAxis(optimistic, axis);
@@ -163495,7 +163507,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   }
   // Record the optimistic direction and emit it now so a controller gets the
   // moving->stopped edge even when HA never reports a transitional state (#429).
-  startOptimisticMovement(axis, status3) {
+  startOptimisticMovement(axis, status3, expectedRestEnd) {
     const optimistic = getCoverOptimistic(this.endpoint);
     clearOptimisticAxis(optimistic, axis);
     const endpoint = this.endpoint;
@@ -163540,7 +163552,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       })();
     }, optimisticMovementTimeoutMs);
     timer.unref?.();
-    optimistic[axis] = { status: status3, startedAt, timer };
+    optimistic[axis] = { status: status3, startedAt, timer, expectedRestEnd };
     this.writeOperationalStatus({ [axis]: status3 });
   }
   async handleMovement(type, _, direction, targetPercent100ths) {
@@ -163599,17 +163611,25 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   }
   handleLiftOpen() {
     clearPendingLift(getCoverDebounce(this.endpoint));
-    this.startOptimisticMovement("lift", MovementStatus.Opening);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.openCoverLift(void 0, this.agent);
+    this.startOptimisticMovement(
+      "lift",
+      MovementStatus.Opening,
+      haRestEnd(action)
+    );
     logger218.info(`handleLiftOpen: calling action=${action.action}`);
     homeAssistant.callAction(action);
   }
   handleLiftClose() {
     clearPendingLift(getCoverDebounce(this.endpoint));
-    this.startOptimisticMovement("lift", MovementStatus.Closing);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.closeCoverLift(void 0, this.agent);
+    this.startOptimisticMovement(
+      "lift",
+      MovementStatus.Closing,
+      haRestEnd(action)
+    );
     logger218.info(`handleLiftClose: calling action=${action.action}`);
     homeAssistant.callAction(action);
   }
@@ -163620,14 +163640,15 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       return;
     }
     this.state.targetPositionLiftPercent100ths = targetPercent100ths;
-    this.startOptimisticMovement(
-      "lift",
-      currentPositionMatter != null && targetPercent100ths < currentPositionMatter ? MovementStatus.Opening : MovementStatus.Closing
-    );
     const targetPosition = targetPercent100ths / 100;
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = config11.setLiftPosition(targetPosition, this.agent);
     const entityId = homeAssistant.entityId;
+    this.startOptimisticMovement(
+      "lift",
+      currentPositionMatter != null && targetPercent100ths < currentPositionMatter ? MovementStatus.Opening : MovementStatus.Closing,
+      haRestEnd(action)
+    );
     const actions = this.env.get(HomeAssistantActions);
     const st = getCoverDebounce(this.endpoint);
     st.pendingLift = { action, entityId, actions };
@@ -163660,21 +163681,27 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const st = getCoverDebounce(this.endpoint);
     clearPendingTilt(st);
     if (st.pendingLift?.action.action.includes("tilt")) clearPendingLift(st);
-    this.startOptimisticMovement("tilt", MovementStatus.Opening);
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    homeAssistant.callAction(
-      this.state.config.openCoverTilt(void 0, this.agent)
+    const action = this.state.config.openCoverTilt(void 0, this.agent);
+    this.startOptimisticMovement(
+      "tilt",
+      MovementStatus.Opening,
+      haRestEnd(action)
     );
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    homeAssistant.callAction(action);
   }
   handleTiltClose() {
     const st = getCoverDebounce(this.endpoint);
     clearPendingTilt(st);
     if (st.pendingLift?.action.action.includes("tilt")) clearPendingLift(st);
-    this.startOptimisticMovement("tilt", MovementStatus.Closing);
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    homeAssistant.callAction(
-      this.state.config.closeCoverTilt(void 0, this.agent)
+    const action = this.state.config.closeCoverTilt(void 0, this.agent);
+    this.startOptimisticMovement(
+      "tilt",
+      MovementStatus.Closing,
+      haRestEnd(action)
     );
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    homeAssistant.callAction(action);
   }
   handleGoToTiltPosition(targetPercent100ths) {
     const config11 = this.state.config;
@@ -163683,14 +163710,15 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       return;
     }
     this.state.targetPositionTiltPercent100ths = targetPercent100ths;
-    this.startOptimisticMovement(
-      "tilt",
-      currentPositionMatter != null && targetPercent100ths < currentPositionMatter ? MovementStatus.Opening : MovementStatus.Closing
-    );
     const targetPosition = targetPercent100ths / 100;
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = config11.setTiltPosition(targetPosition, this.agent);
     const entityId = homeAssistant.entityId;
+    this.startOptimisticMovement(
+      "tilt",
+      currentPositionMatter != null && targetPercent100ths < currentPositionMatter ? MovementStatus.Opening : MovementStatus.Closing,
+      haRestEnd(action)
+    );
     const actions = this.env.get(HomeAssistantActions);
     const st = getCoverDebounce(this.endpoint);
     st.pendingTilt = { action, entityId, actions };
@@ -163832,6 +163860,7 @@ var adjustPositionForWriting2 = (position, agent) => {
   const matterSem = usesMatterSemantics(agent);
   return adjustPositionForWriting(position, featureFlags, matterSem);
 };
+var expectedRestPosition = (end, agent) => adjustPositionForReading2(end === "open" ? 100 : 0, agent);
 var shouldSwapOpenClose = (agent) => {
   const homeAssistant = agent.get(HomeAssistantEntityBehavior);
   const entitySwap = homeAssistant.state.mapping?.coverSwapOpenClose;
@@ -163919,11 +163948,11 @@ var config6 = {
     }
     return position == null ? null : adjustPositionForReading2(position, agent);
   },
+  getExpectedRestPosition: expectedRestPosition,
   getCoverType: (entity) => deviceClassMapping(entity)?.type,
   getEndProductType: (entity) => deviceClassMapping(entity)?.endProductType,
   getMovementStatus: (entity, agent) => {
-    const { featureFlags } = agent.env.get(BridgeDataProvider);
-    const swapped = featureFlags?.coverSwapOpenClose === true;
+    const swapped = shouldSwapOpenClose(agent);
     const coverState = entity.state;
     if (coverState === CoverDeviceState.opening) {
       return swapped ? WindowCovering3.MovementStatus.Closing : WindowCovering3.MovementStatus.Opening;