@riddix/hamh 2.1.0-alpha.519 → 2.1.0-alpha.521

package/dist/backend/cli.js

@@ -167128,9 +167128,11 @@ ${e?.toString()}`);
       for (const s of [...sessionManager.sessions]) {
         if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
-            `Force-closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
           );
-          s.initiateForceClose().catch(() => {
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
           });
           break;
         }
@@ -167145,9 +167147,11 @@ ${e?.toString()}`);
       for (const s of sessions) {
         if (!s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
-            `Force-closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
           );
-          s.initiateForceClose().catch(() => {
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
           });
         }
       }
@@ -171008,6 +171012,22 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     );
     const currentTilt100ths = currentTilt != null ? currentTilt * 100 : null;
     const isStopped = movementStatus === MovementStatus.Stopped;
+    const inferTarget = (current100ths, existing100ths) => {
+      if (isStopped) return current100ths;
+      if (movementStatus === MovementStatus.Opening) {
+        if (existing100ths != null && current100ths != null && existing100ths < current100ths) {
+          return existing100ths;
+        }
+        return 0;
+      }
+      if (movementStatus === MovementStatus.Closing) {
+        if (existing100ths != null && current100ths != null && existing100ths > current100ths) {
+          return existing100ths;
+        }
+        return 1e4;
+      }
+      return existing100ths ?? current100ths;
+    };
     logger175.debug(
       `Cover update for ${entity.entity_id}: state=${state.state}, lift=${currentLift}%, tilt=${currentTilt}%, movement=${MovementStatus[movementStatus]}`
     );
@@ -171034,14 +171054,18 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         ...this.features.positionAwareLift ? {
           currentPositionLiftPercentage: currentLift,
           currentPositionLiftPercent100ths: currentLift100ths,
-          // When stopped, target MUST equal current for controllers to show correct state
-          targetPositionLiftPercent100ths: isStopped ? currentLift100ths : this.state.targetPositionLiftPercent100ths ?? currentLift100ths
+          targetPositionLiftPercent100ths: inferTarget(
+            currentLift100ths,
+            this.state.targetPositionLiftPercent100ths
+          )
         } : {},
         ...this.features.positionAwareTilt ? {
           currentPositionTiltPercentage: currentTilt,
           currentPositionTiltPercent100ths: currentTilt100ths,
-          // When stopped, target MUST equal current for controllers to show correct state
-          targetPositionTiltPercent100ths: isStopped ? currentTilt100ths : this.state.targetPositionTiltPercent100ths ?? currentTilt100ths
+          targetPositionTiltPercent100ths: inferTarget(
+            currentTilt100ths,
+            this.state.targetPositionTiltPercent100ths
+          )
         } : {}
       }
     );
@@ -179839,9 +179863,11 @@ ${e?.toString()}`);
       for (const s of [...sessionManager.sessions]) {
         if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
-            `Force-closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
           );
-          s.initiateForceClose().catch(() => {
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
           });
           break;
         }
@@ -179856,9 +179882,11 @@ ${e?.toString()}`);
       for (const s of sessions) {
         if (!s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
-            `Force-closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
           );
-          s.initiateForceClose().catch(() => {
+          s.initiateClose().catch(() => {
+            s.initiateForceClose().catch(() => {
+            });
           });
         }
       }