@riddix/hamh 2.1.0-alpha.671 → 2.1.0-alpha.673

package/dist/backend/cli.js

@@ -172325,6 +172325,18 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   static DEBOUNCE_INITIAL_MS = 400;
   static DEBOUNCE_SUBSEQUENT_MS = 150;
   static COMMAND_SEQUENCE_THRESHOLD_MS = 600;
+  // Apple's HomeKit only forwards one attribute per multi-attribute Matter
+  // report — target goes out in its own transaction (#328).
+  deferredTargetTimer = null;
+  deferredTargetLift = void 0;
+  deferredTargetTilt = void 0;
+  deferredTargetEntityId = null;
+  // Must clear matter.js's 50ms subscription send window.
+  static DEFERRED_TARGET_DELAY_MS = 100;
+  // Hold back current updates for a short window after motion starts so
+  // state and target reach Apple Home before any position update (#328).
+  motionStartedAt = 0;
+  static MOTION_START_CURRENT_GUARD_MS = 250;
   // Per-entity override wins over per-bridge flag; both must be > 0 to count.
   resolveDebounceOverride(homeAssistant) {
     const fromEntity = homeAssistant.state.mapping?.coverSliderDebounceMs;
@@ -172346,8 +172358,16 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       clearTimeout(this.tiltDebounceTimer);
       this.tiltDebounceTimer = null;
     }
+    if (this.deferredTargetTimer) {
+      clearTimeout(this.deferredTargetTimer);
+      this.deferredTargetTimer = null;
+    }
     this.pendingLiftAction = null;
     this.pendingTiltAction = null;
+    this.deferredTargetLift = void 0;
+    this.deferredTargetTilt = void 0;
+    this.deferredTargetEntityId = null;
+    this.motionStartedAt = 0;
     await super[Symbol.asyncDispose]();
   }
   async initialize() {
@@ -172421,40 +172441,83 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const overrideEndProduct = config10.getEndProductType?.(state, this.agent);
     const previousStatus = this.state.operationalStatus?.global;
     const startedMoving = !isStopped && previousStatus === MovementStatus.Stopped;
+    if (startedMoving) {
+      this.motionStartedAt = Date.now();
+    } else if (isStopped) {
+      this.motionStartedAt = 0;
+    }
+    const inMotionStartGuard = !isStopped && this.motionStartedAt > 0 && Date.now() - this.motionStartedAt < _WindowCoveringServerBase.MOTION_START_CURRENT_GUARD_MS;
+    const skipCurrent = startedMoving || inMotionStartGuard;
+    const liftTarget100ths = this.features.positionAwareLift ? inferTarget(
+      currentLift100ths,
+      this.state.targetPositionLiftPercent100ths
+    ) : void 0;
+    const tiltTarget100ths = this.features.positionAwareTilt ? inferTarget(
+      currentTilt100ths,
+      this.state.targetPositionTiltPercent100ths
+    ) : void 0;
     const appliedPatch = applyPatchState(
       this.state,
       {
         type: overrideType ?? (this.features.lift && this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindLift : this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindTiltOnly : WindowCovering3.WindowCoveringType.Rollershade),
         endProductType: overrideEndProduct ?? (this.features.lift && this.features.tilt ? WindowCovering3.EndProductType.SheerShade : this.features.tilt ? WindowCovering3.EndProductType.TiltOnlyInteriorBlind : WindowCovering3.EndProductType.RollerShade),
-        // Target before operationalStatus so the wire order matches the
-        // certified Eve MotionBlinds (state, target, current). Patch insertion
-        // order propagates into matter.js's changeList via for-in over values
-        // (Datasource.js:414), then through attrsChanged.emit (#328).
-        ...this.features.positionAwareLift ? {
-          targetPositionLiftPercent100ths: inferTarget(
-            currentLift100ths,
-            this.state.targetPositionLiftPercent100ths
-          )
-        } : {},
-        ...this.features.positionAwareTilt ? {
-          targetPositionTiltPercent100ths: inferTarget(
-            currentTilt100ths,
-            this.state.targetPositionTiltPercent100ths
-          )
-        } : {},
         operationalStatus: {
           global: movementStatus,
           ...this.features.lift ? { lift: movementStatus } : {},
           ...this.features.tilt ? { tilt: movementStatus } : {}
         },
-        ...this.features.positionAwareLift && !startedMoving ? {
+        ...this.features.positionAwareLift && !skipCurrent ? {
           currentPositionLiftPercent100ths: currentLift100ths
         } : {},
-        ...this.features.positionAwareTilt && !startedMoving ? {
+        ...this.features.positionAwareTilt && !skipCurrent ? {
           currentPositionTiltPercent100ths: currentTilt100ths
         } : {}
       }
     );
+    const endpoint = this.endpoint;
+    this.deferredTargetLift = liftTarget100ths;
+    this.deferredTargetTilt = tiltTarget100ths;
+    this.deferredTargetEntityId = entity.entity_id;
+    if (this.deferredTargetTimer) {
+      clearTimeout(this.deferredTargetTimer);
+    }
+    this.deferredTargetTimer = setTimeout(() => {
+      this.deferredTargetTimer = null;
+      const lift = this.deferredTargetLift;
+      const tilt = this.deferredTargetTilt;
+      const eid = this.deferredTargetEntityId;
+      this.deferredTargetLift = void 0;
+      this.deferredTargetTilt = void 0;
+      this.deferredTargetEntityId = null;
+      if (lift === void 0 && tilt === void 0) {
+        return;
+      }
+      Promise.resolve(
+        endpoint.act((agent) => {
+          const beh = agent.get(_WindowCoveringServerBase);
+          const written = {};
+          if (lift !== void 0 && beh.features.positionAwareLift) {
+            beh.state.targetPositionLiftPercent100ths = lift;
+            written.targetPositionLiftPercent100ths = lift;
+          }
+          if (tilt !== void 0 && beh.features.positionAwareTilt) {
+            beh.state.targetPositionTiltPercent100ths = tilt;
+            written.targetPositionTiltPercent100ths = tilt;
+          }
+          if (Object.keys(written).length > 0) {
+            logger179.debug(
+              `Cover ${eid ?? "?"} deferred target: ${JSON.stringify(written)}`
+            );
+          }
+        })
+      ).catch((e) => {
+        const msg = e instanceof Error ? e.message : String(e);
+        if (msg.includes("Endpoint storage inaccessible") || msg.includes("destroyed")) {
+          return;
+        }
+        logger179.debug(`Cover ${eid ?? "?"} deferred target failed: ${msg}`);
+      });
+    }, _WindowCoveringServerBase.DEFERRED_TARGET_DELAY_MS);
     if (Object.keys(appliedPatch).length > 0) {
       const hasOperationalChange = "operationalStatus" in appliedPatch;
       const log = hasOperationalChange ? logger179.info : logger179.debug;