homebridge-tuya-plus 3.14.0-dev.51 → 3.14.0-dev.52

package/lib/SimpleGarageDoorAccessory.js

@@ -271,10 +271,6 @@ class SimpleGarageDoorAccessory extends BaseAccessory {
         // silently dropping the command (the write helpers would otherwise just
         // log and skip, leaving HomeKit to believe the open/close succeeded).
         if (!this.device.connected) throw this._commError();
-        // A direct open/close (the GarageDoorOpener target, a Force switch, or
-        // the partial switch tapped OFF) is manual control: cancel any pending
-        // partial-open auto-stop so it can't halt this movement part-way.
-        this._cancelPartialStop();
 
         // The opener is level-triggered: act only when the requested target
         // differs from the one we've already committed to. HomeKit re-sends the
@@ -291,6 +287,17 @@ class SimpleGarageDoorAccessory extends BaseAccessory {
             this.log.debug(`[SimpleGarageDoor] ${this.device.context.name}: target unchanged — ignoring repeat request`);
             return;
         }
+
+        // A direct open/close (the GarageDoorOpener target, a Force switch, or
+        // the partial switch tapped OFF) is manual control: cancel any pending
+        // partial-open auto-stop so it can't halt this movement part-way. This
+        // must run only for a genuine target change, AFTER the repeat check
+        // above: a partial open drives the committed target to OPEN itself, so
+        // HomeKit's repeat of that OPEN re-enters here, and cancelling on that
+        // swallowed repeat would tear down the auto-stop the partial just armed —
+        // letting the gate run all the way open instead of parking part-way.
+        this._cancelPartialStop();
+
         this._applyTarget(value);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.14.0-dev.51",
+  "version": "3.14.0-dev.52",
   "description": "A community-maintained Homebridge plugin for controlling Tuya devices in HomeKit. LAN-first, with an optional Tuya Cloud fallback for any device the LAN can't reach.",
   "main": "index.js",
   "scripts": {

package/test/SimpleGarageDoorAccessory.test.js

@@ -602,6 +602,53 @@ describe('SimpleGarageDoorAccessory._handlePartialOpen', () => {
         expect(device.update).toHaveBeenCalledTimes(3);
     });
 
+    test('A repeat of the partial open\'s own OPEN target does not cancel the pending auto-stop', () => {
+        // The partial open drives TargetDoorState to OPEN itself, then waits for
+        // the gate to report it's moving before arming the auto-stop. HomeKit
+        // re-sends that same OPEN in the meantime (a second controller echoing
+        // it, or its own retry). That swallowed repeat must NOT tear down the
+        // pending partial, or the gate runs all the way open instead of parking
+        // part-way — the reported bug.
+        const { instance, device } = makeSimpleGarage();
+        instance.partialOpenMs = 2000;
+        device.state['105'] = STATE_CLOSING_OR_CLOSED; // starts closed → stop waits for movement
+
+        instance._handlePartialOpen();
+        expect(device.update).toHaveBeenCalledTimes(1);
+        expect(device.update).toHaveBeenNthCalledWith(1, { '101': true }); // open
+        expect(instance.partialPending).toBe(true);
+
+        // HomeKit's repeat of the same OPEN lands before the gate reports moving.
+        instance.setTargetDoorState(TDS.OPEN);
+        expect(instance.partialPending).toBe(true); // still pending — not cancelled
+        expect(device.update).toHaveBeenCalledTimes(1); // and no second open
+
+        // The gate now reports it's moving: the countdown arms and the stop fires.
+        emitState(device, STATE_OPENING_OR_OPEN);
+        expect(instance.partialStopTimer).not.toBeNull();
+        jest.advanceTimersByTime(2000);
+        expect(device.update).toHaveBeenNthCalledWith(2, { '103': true }); // partial stop
+    });
+
+    test('A repeat of OPEN after the auto-stop is armed leaves the timer intact', () => {
+        const { instance, device } = makeSimpleGarage();
+        instance.partialOpenMs = 2000;
+        device.state['105'] = STATE_OPENING_OR_OPEN; // arms immediately
+
+        instance._handlePartialOpen();
+        expect(instance.partialStopTimer).not.toBeNull();
+
+        // A repeat OPEN partway through must not cancel or push out the timer.
+        jest.advanceTimersByTime(500);
+        instance.setTargetDoorState(TDS.OPEN);
+        expect(instance.partialStopTimer).not.toBeNull();
+        expect(device.update).toHaveBeenCalledTimes(1); // no second open
+
+        // The original 2000ms deadline still fires the stop.
+        jest.advanceTimersByTime(1500);
+        expect(device.update).toHaveBeenNthCalledWith(2, { '103': true });
+    });
+
     test('Does nothing when partialOpenMs is not configured', () => {
         const { instance, device } = makeSimpleGarage();
         instance.partialOpenMs = 0;