@marcel2215/homebridge-supla-plugin 2.1.8 → 2.1.10

package/dist/Accesories/DoorAccessory.js

@@ -29,23 +29,18 @@ class DoorAccessory {
             .onSet(this.handleTargetPositionSet.bind(this));
         this.service.getCharacteristic(this.platform.Characteristic.PositionState)
             .onGet(this.handlePositionStateGet.bind(this));
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/hi`);
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/partial_hi`);
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
-        this.platform.MqttClient.client.on('message', (topic, message) => {
-            if (topic === `${this.context.topic}/state/hi`) {
-                this.hi = message.toString() === 'true';
-                this.updatePositionsFromState();
-            }
-            if (topic === `${this.context.topic}/state/partial_hi`) {
-                this.partialHi = message.toString() === 'true';
-                this.updatePositionsFromState();
-            }
-            if (topic === `${this.context.topic}/state/connected`) {
-                this.connected = message.toString() === 'true';
-                this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
-            }
-        });
+        this.platform.registerMqttHandler(`${this.context.topic}/state/hi`, (message) => {
+            this.hi = this.platform.parseBoolean(message.toString());
+            this.updatePositionsFromState();
+        }, this.accessory.UUID);
+        this.platform.registerMqttHandler(`${this.context.topic}/state/partial_hi`, (message) => {
+            this.partialHi = this.platform.parseBoolean(message.toString());
+            this.updatePositionsFromState();
+        }, this.accessory.UUID);
+        this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
+            this.connected = this.platform.parseBoolean(message.toString());
+            this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
+        }, this.accessory.UUID);
     }
     async handleCurrentPositionGet() {
         return this.currentPosition;
@@ -69,7 +64,7 @@ class DoorAccessory {
         this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
         const action = this.targetPosition <= 10 ? 'close' : 'open';
         this.platform.log.debug(`Publishing ${this.context.topic}/execute_action = ${action}`);
-        this.platform.MqttClient.client.publish(`${this.context.topic}/execute_action`, action);
+        this.platform.publishCommand(`${this.context.topic}/execute_action`, action);
     }
     async handlePositionStateGet() {
         return this.positionState;

package/dist/Accesories/DoorAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"DoorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/DoorAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DoorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/DoorAccessory.ts"],"names":[],"mappings":"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"}

package/dist/Accesories/ElectricityMeterAccessory.js

@@ -28,30 +28,22 @@ class ElectricityMeterAccessory {
         this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
         this.service.getCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel)
             .onGet(this.handleValueGet.bind(this));
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/#`);
-        this.platform.MqttClient.client.on('message', (topic, message) => {
-            if (topic === `${this.context.topic}/state/connected`) {
-                this.connected = message.toString() === 'true';
-                this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
-                return;
-            }
-            if (!topic.startsWith(`${this.context.topic}/state/`)) {
-                return;
-            }
-            const key = topic.substring(`${this.context.topic}/state/`.length);
-            const metricIndex = this.metricPriority.indexOf(key);
-            if (metricIndex === -1) {
-                return;
-            }
-            const value = parseFloat(message.toString());
-            if (Number.isNaN(value)) {
-                return;
-            }
-            if (metricIndex <= this.selectedMetricIndex) {
-                this.selectedMetricIndex = metricIndex;
-                this.value = this.clamp(value, 0.0001, 100000);
-                this.service.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.value);
-            }
+        this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
+            this.connected = this.platform.parseBoolean(message.toString());
+            this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
+        }, this.accessory.UUID);
+        this.metricPriority.forEach((key, metricIndex) => {
+            this.platform.registerMqttHandler(`${this.context.topic}/state/${key}`, (message) => {
+                const value = parseFloat(message.toString());
+                if (Number.isNaN(value)) {
+                    return;
+                }
+                if (metricIndex <= this.selectedMetricIndex) {
+                    this.selectedMetricIndex = metricIndex;
+                    this.value = this.clamp(value, 0.0001, 100000);
+                    this.service.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.value);
+                }
+            }, this.accessory.UUID);
         });
     }
     async handleValueGet() {

package/dist/Accesories/ElectricityMeterAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElectricityMeterAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ElectricityMeterAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ElectricityMeterAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ElectricityMeterAccessory.ts"],"names":[],"mappings":"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"}

package/dist/Accesories/FacadeBlindAccessory.d.ts

@@ -14,19 +14,34 @@ export declare class FacadeBlindAccessory {
     private connected;
     private stopTimer?;
     private hasReceivedPosition;
+    private hasReceivedTilt;
     private pendingTargetPosition?;
     private pendingTargetExpiresAt;
     private pendingTargetTimer?;
+    private motionStopTimer?;
+    private lastRawPosition?;
+    private jammed;
+    private lastTiltCommandAt;
     constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
     handleCurrentPositionGet(): Promise<CharacteristicValue>;
     handleTargetPositionGet(): Promise<CharacteristicValue>;
     handleTargetPositionSet(value: CharacteristicValue): Promise<void>;
+    handleHoldPositionSet(value: CharacteristicValue): Promise<void>;
+    private applyShutUpdate;
     private schedulePendingTimeout;
     private clearPendingTarget;
+    private clearStopTimer;
+    private scheduleMotionStopTimer;
+    private clearMotionStopTimer;
+    private disposeTimers;
+    private setJammed;
+    private updateConnection;
     handlePositionStateGet(): Promise<CharacteristicValue>;
     handleCurrentTiltGet(): Promise<CharacteristicValue>;
     handleTargetTiltGet(): Promise<CharacteristicValue>;
     handleTargetTiltSet(value: CharacteristicValue): Promise<void>;
+    private assertPositionAvailable;
+    private assertTiltAvailable;
     private toPosition;
     private toShut;
     private toTiltAngle;

package/dist/Accesories/FacadeBlindAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FacadeBlindAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/FacadeBlindAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,oBAAoB;IAe7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAsD;IAC3E,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAiB;gBAGzB,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IA2FzC,wBAAwB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIxD,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIvD,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IAiDxD,OAAO,CAAC,sBAAsB;IA4B9B,OAAO,CAAC,kBAAkB;IAapB,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAItD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIpD,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAInD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IAiBpD,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,oBAAoB;CAyB7B"}
+{"version":3,"file":"FacadeBlindAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/FacadeBlindAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,oBAAoB;IAoB7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IArB1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAsD;IAC3E,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAiB;IAC5C,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,iBAAiB,CAAK;gBAGX,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAmFzC,wBAAwB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKxD,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKvD,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IA0DlD,qBAAqB,CAAC,KAAK,EAAE,mBAAmB;IAkCtD,OAAO,CAAC,eAAe;IA0EvB,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,gBAAgB;IAsBlB,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKtD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKpD,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IAkBpD,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,oBAAoB;CAyB7B"}

package/dist/Accesories/FacadeBlindAccessory.js

@@ -13,7 +13,10 @@ class FacadeBlindAccessory {
         this.targetTiltAngle = 0;
         this.connected = true;
         this.hasReceivedPosition = false;
+        this.hasReceivedTilt = false;
         this.pendingTargetExpiresAt = 0;
+        this.jammed = false;
+        this.lastTiltCommandAt = 0;
         this.accessory.getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
             .setCharacteristic(this.platform.Characteristic.Model, 'FacadeBlind');
@@ -23,6 +26,7 @@ class FacadeBlindAccessory {
         this.service.getCharacteristic(this.platform.Characteristic.CurrentPosition)
             .onGet(this.handleCurrentPositionGet.bind(this));
         this.service.getCharacteristic(this.platform.Characteristic.TargetPosition)
+            .setProps({ minValue: 0, maxValue: 100, minStep: 1 })
             .onGet(this.handleTargetPositionGet.bind(this))
             .onSet(this.handleTargetPositionSet.bind(this));
         this.service.getCharacteristic(this.platform.Characteristic.PositionState)
@@ -30,68 +34,59 @@ class FacadeBlindAccessory {
         this.service.getCharacteristic(this.platform.Characteristic.CurrentHorizontalTiltAngle)
             .onGet(this.handleCurrentTiltGet.bind(this));
         this.service.getCharacteristic(this.platform.Characteristic.TargetHorizontalTiltAngle)
+            .setProps({ minValue: -90, maxValue: 90, minStep: 1 })
             .onGet(this.handleTargetTiltGet.bind(this))
             .onSet(this.handleTargetTiltSet.bind(this));
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/shut`);
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/tilt`);
-        this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
-        this.platform.MqttClient.client.on('message', (topic, message) => {
-            if (topic === `${this.context.topic}/state/shut`) {
-                const value = parseFloat(message.toString());
-                if (!Number.isNaN(value)) {
-                    this.currentPosition = this.toPosition(value);
-                    this.positionState = this.platform.Characteristic.PositionState.STOPPED;
-                    const now = Date.now();
-                    if (!this.hasReceivedPosition) {
-                        this.hasReceivedPosition = true;
-                        this.clearPendingTarget(false);
-                        this.targetPosition = this.currentPosition;
-                    }
-                    else if (this.pendingTargetPosition !== undefined) {
-                        const reached = Math.abs(this.pendingTargetPosition - this.currentPosition) <= 1;
-                        const expired = this.pendingTargetExpiresAt > 0 && now > this.pendingTargetExpiresAt;
-                        if (reached || expired) {
-                            this.clearPendingTarget(false);
-                            this.targetPosition = this.currentPosition;
-                        }
-                        else {
-                            this.schedulePendingTimeout(this.pendingTargetPosition, this.currentPosition);
-                        }
-                    }
-                    else {
-                        this.targetPosition = this.currentPosition;
-                    }
-                    this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, this.currentPosition);
-                    this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
-                    this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
-                }
+        this.service.getCharacteristic(this.platform.Characteristic.HoldPosition)
+            .onSet(this.handleHoldPositionSet.bind(this));
+        this.service.setCharacteristic(this.platform.Characteristic.StatusJammed, 0);
+        this.platform.registerOwnerCleanup(this.accessory.UUID, () => {
+            this.disposeTimers();
+        });
+        this.platform.registerMqttHandler(`${this.context.topic}/state/shut`, (message) => {
+            const value = parseFloat(message.toString());
+            if (!Number.isNaN(value)) {
+                this.applyShutUpdate(value);
             }
-            if (topic === `${this.context.topic}/state/tilt`) {
-                const value = parseFloat(message.toString());
-                if (!Number.isNaN(value)) {
-                    this.currentTiltAngle = this.toTiltAngle(value);
-                    if (Math.abs(this.targetTiltAngle - this.currentTiltAngle) <= 2) {
-                        this.targetTiltAngle = this.currentTiltAngle;
-                    }
+        }, this.accessory.UUID);
+        this.platform.registerMqttHandler(`${this.context.topic}/state/tilt`, (message) => {
+            const value = parseFloat(message.toString());
+            if (!Number.isNaN(value)) {
+                const previousTilt = this.currentTiltAngle;
+                const previousTarget = this.targetTiltAngle;
+                this.currentTiltAngle = Math.round(this.toTiltAngle(value));
+                this.hasReceivedTilt = true;
+                const now = Date.now();
+                const targetDelta = Math.abs(this.targetTiltAngle - this.currentTiltAngle);
+                const commandStale = this.lastTiltCommandAt === 0 || (now - this.lastTiltCommandAt) > 3000;
+                if (targetDelta <= 2 || commandStale) {
+                    this.targetTiltAngle = this.currentTiltAngle;
+                }
+                if (this.currentTiltAngle !== previousTilt) {
                     this.service.updateCharacteristic(this.platform.Characteristic.CurrentHorizontalTiltAngle, this.currentTiltAngle);
+                }
+                if (this.targetTiltAngle !== previousTarget) {
                     this.service.updateCharacteristic(this.platform.Characteristic.TargetHorizontalTiltAngle, this.targetTiltAngle);
                 }
             }
-            if (topic === `${this.context.topic}/state/connected`) {
-                this.connected = message.toString() === 'true';
-                this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
-            }
-        });
+        }, this.accessory.UUID);
+        this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
+            this.updateConnection(this.platform.parseBoolean(message.toString()));
+        }, this.accessory.UUID);
     }
     async handleCurrentPositionGet() {
+        this.assertPositionAvailable();
         return this.currentPosition;
     }
     async handleTargetPositionGet() {
+        this.assertPositionAvailable();
         return this.targetPosition;
     }
     async handleTargetPositionSet(value) {
         const target = value;
-        this.targetPosition = this.clamp(target, 0, 100);
+        this.setJammed(false);
+        this.clearMotionStopTimer();
+        this.targetPosition = Math.round(this.clamp(target, 0, 100));
         if (this.targetPosition > this.currentPosition) {
             this.positionState = this.platform.Characteristic.PositionState.INCREASING;
         }
@@ -103,6 +98,11 @@ class FacadeBlindAccessory {
         }
         this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
         this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
+        if (this.hasReceivedPosition && this.targetPosition === this.currentPosition) {
+            this.clearPendingTarget(false);
+            this.clearStopTimer();
+            return;
+        }
         if (this.targetPosition !== this.currentPosition) {
             this.pendingTargetPosition = this.targetPosition;
             this.schedulePendingTimeout(this.targetPosition, this.currentPosition);
@@ -111,11 +111,13 @@ class FacadeBlindAccessory {
             this.clearPendingTarget(false);
         }
         const controlMode = this.platform.getCoveringControlMode();
-        const shutValue = this.toShut(this.targetPosition).toString();
-        if (controlMode === 'set' || controlMode === 'hybrid') {
+        const shutValue = Math.round(this.toShut(this.targetPosition)).toString();
+        const isEndpoint = this.targetPosition === 0 || this.targetPosition === 100;
+        if ((controlMode === 'set' || controlMode === 'hybrid')
+            && !(controlMode === 'hybrid' && isEndpoint)) {
             const topic = `${this.context.topic}/${this.platform.getCoveringSetTopicSuffix()}`;
             this.platform.log.debug(`Publishing ${topic} = ${shutValue}`);
-            this.platform.MqttClient.client.publish(topic, shutValue, (error) => {
+            this.platform.publishCommand(topic, shutValue, (error) => {
                 if (error) {
                     this.platform.log.error(`Publish failed for ${topic}: ${error.message}`);
                 }
@@ -129,7 +131,7 @@ class FacadeBlindAccessory {
             const action = this.resolveAction(this.targetPosition, this.currentPosition);
             if (action) {
                 this.platform.log.debug(`Publishing ${actionTopic} = ${action}`);
-                this.platform.MqttClient.client.publish(actionTopic, action, (error) => {
+                this.platform.publishCommand(actionTopic, action, (error) => {
                     if (error) {
                         this.platform.log.error(`Publish failed for ${actionTopic}: ${error.message}`);
                     }
@@ -140,12 +142,115 @@ class FacadeBlindAccessory {
             }
         }
     }
+    async handleHoldPositionSet(value) {
+        if (!value) {
+            return;
+        }
+        const controlMode = this.platform.getCoveringControlMode();
+        if (controlMode === 'set') {
+            this.platform.log.debug(`HoldPosition ignored (set mode) for ${this.accessory.displayName}`);
+            this.service.updateCharacteristic(this.platform.Characteristic.HoldPosition, 0);
+            return;
+        }
+        const stopAction = this.platform.getCoveringExecuteActionStop();
+        if (!stopAction) {
+            this.platform.log.debug(`HoldPosition ignored (no stop action) for ${this.accessory.displayName}`);
+            this.service.updateCharacteristic(this.platform.Characteristic.HoldPosition, 0);
+            return;
+        }
+        const actionTopic = `${this.context.topic}/execute_action`;
+        this.platform.log.debug(`Publishing ${actionTopic} = ${stopAction} (hold)`);
+        this.platform.publishCommand(actionTopic, stopAction, (error) => {
+            if (error) {
+                this.platform.log.error(`Publish failed for ${actionTopic}: ${error.message}`);
+            }
+        });
+        this.service.updateCharacteristic(this.platform.Characteristic.HoldPosition, 0);
+        this.clearPendingTarget(true);
+        this.clearStopTimer();
+        this.clearMotionStopTimer();
+        this.setJammed(false);
+        if (this.positionState !== this.platform.Characteristic.PositionState.STOPPED) {
+            this.positionState = this.platform.Characteristic.PositionState.STOPPED;
+            this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
+        }
+    }
+    applyShutUpdate(shutValue) {
+        var _a;
+        const previousTarget = this.targetPosition;
+        const previousState = this.positionState;
+        const rawPosition = this.toPosition(shutValue);
+        const previousRaw = (_a = this.lastRawPosition) !== null && _a !== void 0 ? _a : rawPosition;
+        const rawDelta = rawPosition - previousRaw;
+        const rawMovement = Math.abs(rawDelta) >= 0.05;
+        this.lastRawPosition = rawPosition;
+        const previousPosition = this.currentPosition;
+        this.currentPosition = Math.round(rawPosition);
+        let nextPositionState = this.platform.Characteristic.PositionState.STOPPED;
+        const now = Date.now();
+        const firstUpdate = !this.hasReceivedPosition;
+        if (firstUpdate) {
+            this.hasReceivedPosition = true;
+        }
+        if (rawMovement || this.currentPosition !== previousPosition) {
+            this.setJammed(false);
+        }
+        if (this.pendingTargetPosition !== undefined) {
+            this.clearMotionStopTimer();
+            const reached = Math.abs(this.pendingTargetPosition - this.currentPosition) <= 1;
+            const expired = this.pendingTargetExpiresAt > 0 && now > this.pendingTargetExpiresAt;
+            if (reached || expired) {
+                this.clearStopTimer();
+                this.clearPendingTarget(false);
+                this.targetPosition = this.currentPosition;
+                if (expired) {
+                    this.setJammed(true);
+                }
+            }
+            else {
+                if (rawMovement || firstUpdate) {
+                    this.schedulePendingTimeout(this.pendingTargetPosition, this.currentPosition);
+                }
+                if (this.pendingTargetPosition > this.currentPosition) {
+                    nextPositionState = this.platform.Characteristic.PositionState.INCREASING;
+                }
+                else if (this.pendingTargetPosition < this.currentPosition) {
+                    nextPositionState = this.platform.Characteristic.PositionState.DECREASING;
+                }
+            }
+        }
+        else {
+            this.clearPendingTarget(false);
+            this.clearStopTimer();
+            this.targetPosition = this.currentPosition;
+            if (rawMovement) {
+                nextPositionState = rawDelta > 0
+                    ? this.platform.Characteristic.PositionState.INCREASING
+                    : this.platform.Characteristic.PositionState.DECREASING;
+                this.scheduleMotionStopTimer();
+            }
+            else {
+                this.clearMotionStopTimer();
+            }
+        }
+        this.positionState = nextPositionState;
+        if (this.currentPosition !== previousPosition) {
+            this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, this.currentPosition);
+        }
+        if (this.targetPosition !== previousTarget) {
+            this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
+        }
+        if (this.positionState !== previousState) {
+            this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
+        }
+    }
     schedulePendingTimeout(target, current) {
         const travelTimeSeconds = this.platform.getCoveringTravelTimeSeconds();
         const delta = Math.abs(target - current);
         let timeoutMs = 15000;
         if (travelTimeSeconds > 0 && delta > 0) {
-            timeoutMs = Math.round((delta / 100) * travelTimeSeconds * 1000) + 1000;
+            const computed = Math.round((delta / 100) * travelTimeSeconds * 1000) + 1000;
+            timeoutMs = Math.max(5000, computed);
         }
         if (timeoutMs <= 0) {
             return;
@@ -156,12 +261,13 @@ class FacadeBlindAccessory {
         }
         this.pendingTargetTimer = setTimeout(() => {
             this.pendingTargetTimer = undefined;
-            this.pendingTargetPosition = undefined;
-            this.pendingTargetExpiresAt = 0;
+            this.setJammed(true);
+            this.clearPendingTarget(true);
             if (this.positionState !== this.platform.Characteristic.PositionState.STOPPED) {
                 this.positionState = this.platform.Characteristic.PositionState.STOPPED;
                 this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
             }
+            this.clearStopTimer();
             this.platform.log.debug(`No state updates for ${this.accessory.displayName} within ${timeoutMs}ms; marking STOPPED.`);
         }, timeoutMs);
     }
@@ -172,33 +278,105 @@ class FacadeBlindAccessory {
         }
         this.pendingTargetPosition = undefined;
         this.pendingTargetExpiresAt = 0;
-        if (syncTarget) {
+        if (syncTarget && this.targetPosition !== this.currentPosition) {
             this.targetPosition = this.currentPosition;
             this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
         }
     }
+    clearStopTimer() {
+        if (this.stopTimer) {
+            clearTimeout(this.stopTimer);
+            this.stopTimer = undefined;
+        }
+    }
+    scheduleMotionStopTimer() {
+        const quietMs = 2500;
+        if (this.motionStopTimer) {
+            clearTimeout(this.motionStopTimer);
+        }
+        this.motionStopTimer = setTimeout(() => {
+            this.motionStopTimer = undefined;
+            if (this.pendingTargetPosition !== undefined) {
+                return;
+            }
+            if (this.positionState !== this.platform.Characteristic.PositionState.STOPPED) {
+                this.positionState = this.platform.Characteristic.PositionState.STOPPED;
+                this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
+            }
+        }, quietMs);
+    }
+    clearMotionStopTimer() {
+        if (this.motionStopTimer) {
+            clearTimeout(this.motionStopTimer);
+            this.motionStopTimer = undefined;
+        }
+    }
+    disposeTimers() {
+        this.clearPendingTarget(false);
+        this.clearStopTimer();
+        this.clearMotionStopTimer();
+    }
+    setJammed(isJammed) {
+        if (this.jammed === isJammed) {
+            return;
+        }
+        this.jammed = isJammed;
+        this.service.updateCharacteristic(this.platform.Characteristic.StatusJammed, this.jammed ? 1 : 0);
+    }
+    updateConnection(isConnected) {
+        this.connected = isConnected;
+        this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
+        if (!this.connected) {
+            this.setJammed(false);
+            this.hasReceivedPosition = false;
+            this.hasReceivedTilt = false;
+            this.lastRawPosition = undefined;
+            this.lastTiltCommandAt = 0;
+            this.clearPendingTarget(true);
+            this.clearStopTimer();
+            this.clearMotionStopTimer();
+            if (this.positionState !== this.platform.Characteristic.PositionState.STOPPED) {
+                this.positionState = this.platform.Characteristic.PositionState.STOPPED;
+                this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
+            }
+        }
+    }
     async handlePositionStateGet() {
+        this.assertPositionAvailable();
         return this.positionState;
     }
     async handleCurrentTiltGet() {
+        this.assertTiltAvailable();
         return this.currentTiltAngle;
     }
     async handleTargetTiltGet() {
+        this.assertTiltAvailable();
         return this.targetTiltAngle;
     }
     async handleTargetTiltSet(value) {
         const target = value;
-        this.targetTiltAngle = this.clamp(target, -90, 90);
+        this.targetTiltAngle = Math.round(this.clamp(target, -90, 90));
+        this.lastTiltCommandAt = Date.now();
         this.service.updateCharacteristic(this.platform.Characteristic.TargetHorizontalTiltAngle, this.targetTiltAngle);
         const tiltValue = this.toTiltValue(this.targetTiltAngle).toString();
         const tiltTopic = `${this.context.topic}/${this.platform.getCoveringTiltTopicSuffix()}`;
         this.platform.log.debug(`Publishing ${tiltTopic} = ${tiltValue}`);
-        this.platform.MqttClient.client.publish(tiltTopic, tiltValue, (error) => {
+        this.platform.publishCommand(tiltTopic, tiltValue, (error) => {
             if (error) {
                 this.platform.log.error(`Publish failed for ${tiltTopic}: ${error.message}`);
             }
         });
     }
+    assertPositionAvailable() {
+        if (!this.connected || !this.hasReceivedPosition) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+    }
+    assertTiltAvailable() {
+        if (!this.connected || !this.hasReceivedTilt) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+    }
     toPosition(shutValue) {
         return this.clamp(100 - shutValue, 0, 100);
     }
@@ -242,7 +420,7 @@ class FacadeBlindAccessory {
         this.stopTimer = setTimeout(() => {
             const actionTopic = `${this.context.topic}/execute_action`;
             this.platform.log.debug(`Publishing ${actionTopic} = ${stopAction} (auto-stop)`);
-            this.platform.MqttClient.client.publish(actionTopic, stopAction, (error) => {
+            this.platform.publishCommand(actionTopic, stopAction, (error) => {
                 if (error) {
                     this.platform.log.error(`Publish failed for ${actionTopic}: ${error.message}`);
                 }