homebridge-tuya-plus 3.14.0-dev.41 → 3.14.0-dev.43

package/lib/TuyaCloudApi.js

@@ -87,6 +87,10 @@ class TuyaCloudApi {
         this.uid = null;           // linked app-account uid (needed for realtime MQTT)
         this._tokenExpiry = 0;     // ms epoch when the token must be refreshed
         this._tokenPromise = null; // in-flight token request (de-dupes concurrent callers)
+
+        // Reuse TLS connections across requests instead of a fresh handshake each
+        // time — noticeably cuts per-command latency and the startup read burst.
+        this._agent = new https.Agent({keepAlive: true, maxSockets: 8});
     }
 
     isConfigured() {
@@ -365,7 +369,8 @@ class TuyaCloudApi {
                 port: url.port || 443,
                 path: url.pathname + url.search,
                 method,
-                headers
+                headers,
+                agent: this._agent
             }, resp => {
                 let data = '';
                 resp.setEncoding('utf8');

package/lib/TuyaCloudDevice.js

@@ -75,6 +75,8 @@ class TuyaCloudDevice extends EventEmitter {
         this._codeMethod = {};
         this._propertiesTried = new Set();
         this._announcedProperties = false;
+        this._catchupTimers = null; // post-write state re-reads (see _scheduleStateCatchup)
+        this._writeChain = null;    // serializes cloud writes to this device (see update)
 
         // Bidirectional data-point maps, learned from the device's thing-shadow on
         // connect. They let this cloud transport (and the LAN+cloud TuyaDevice that
@@ -224,8 +226,11 @@ class TuyaCloudDevice extends EventEmitter {
                 this.connected = online;
                 this.log.info(`${this.context.name}: Tuya now reports the device ${online ? 'online' : 'offline'}.`);
             }
-            const status = await this.api.getStatus(this.context.id);
-            this._applyStatus(status);
+            // Read via the same shadow-preferred path as the initial connect, not
+            // the plain /status endpoint: a thing-model-only device (e.g. a custom
+            // gate controller) returns an EMPTY /status result, so /status would
+            // silently wipe nothing in and never reflect a state change.
+            this._applyStatus(await this._readInitialProperties());
         } catch (ex) {
             this.log.debug(`${this.context.name}: cloud state refresh failed: ${ex.message}`);
         }
@@ -362,7 +367,16 @@ class TuyaCloudDevice extends EventEmitter {
         if (undeliverable.length) this._reportUndeliverableWrite(undeliverable);
         if (!sendable.length) return false;
 
-        return this._dispatch(sendable);
+        // Serialize writes to this device. HomeKit frequently double-sends a
+        // characteristic write, and rapid changes (dragging a thermostat) fire a
+        // burst; running them concurrently both races the per-code endpoint
+        // learning (a duplicate could see a code "tried" but not yet learned and
+        // fail spuriously) and bursts the cloud's QPS limit (uneven latency). One
+        // at a time keeps learning coherent and the request rate smooth. _dispatch
+        // never rejects, so the chain can't break.
+        const run = () => this._dispatch(sendable);
+        this._writeChain = this._writeChain ? this._writeChain.then(run, run) : run();
+        return this._writeChain;
     }
 
     // Send a write, routing each data-point to the cloud endpoint it accepts. Codes
@@ -382,6 +396,7 @@ class TuyaCloudDevice extends EventEmitter {
 
         if (byCommands.ok && byProperties.ok) {
             this._lastWriteError = null;
+            this._scheduleStateCatchup();
             return true;
         }
         this._reportWriteFailure(byCommands.error || byProperties.error);
@@ -413,11 +428,36 @@ class TuyaCloudDevice extends EventEmitter {
         }
         if (!this._announcedProperties) {
             this._announcedProperties = true;
-            this.log.info(`${this.context.name}: controlling some of this device's data-points over the Tuya thing-model property endpoint (they aren't in its standard instruction set).`);
+            this.log.debug(`${this.context.name}: controlling some of this device's data-points over the Tuya thing-model property endpoint (they aren't in its standard instruction set).`);
         }
         return this._learn(fresh, 'properties');
     }
 
+    // After a cloud write the resulting state (e.g. a gate's return_state flipping
+    // to "opening") shows up in the cloud within ~a second, but the realtime stream
+    // doesn't always carry it — and an accessory that mirrors a status DP (the
+    // garage door) would otherwise sit on the old value forever. So re-read the
+    // device a couple of times after a command to catch the transition. Each new
+    // command re-arms it, so a burst of writes only triggers one catch-up; it only
+    // runs on the cloud path, so a LAN-reachable device pays nothing.
+    _scheduleStateCatchup() {
+        if (this._catchupTimers) this._catchupTimers.forEach(t => clearTimeout(t));
+        this._catchupTimers = [2000, 8000].map(delay => {
+            const t = setTimeout(() => this._catchupOnce(), delay);
+            if (t && t.unref) t.unref();
+            return t;
+        });
+    }
+
+    async _catchupOnce() {
+        if (this._stopped) return;
+        try {
+            this._applyStatus(await this._readInitialProperties());
+        } catch (ex) {
+            this.log.debug(`${this.context.name}: post-write state catch-up failed: ${ex.message}`);
+        }
+    }
+
     // Invoke one control endpoint; resolves to {ok, error} and never rejects, so a
     // missing-method mock or a network error can't escape the dispatch.
     _send(method, commands) {
@@ -505,6 +545,7 @@ class TuyaCloudDevice extends EventEmitter {
     stop() {
         this._stopped = true;
         if (this._retryTimer) { clearTimeout(this._retryTimer); this._retryTimer = null; }
+        if (this._catchupTimers) { this._catchupTimers.forEach(t => clearTimeout(t)); this._catchupTimers = null; }
     }
 }
 

package/lib/TuyaCloudMessaging.js

@@ -152,6 +152,12 @@ class TuyaCloudMessaging extends EventEmitter {
         if (!devId || !Array.isArray(status)) return;
 
         const handlers = this._handlers.get('' + devId);
+        // Trace what the realtime stream actually delivers (debug only). A device
+        // whose status never arrives here — while it clearly changed in the cloud —
+        // is the signature of the message service not pushing that device's reports.
+        try {
+            this.log.debug(`Tuya Cloud realtime update for ${devId}${handlers && handlers.length ? '' : ' (no subscriber)'}: ${JSON.stringify(status)}`);
+        } catch (_) { /* logging must never throw */ }
         if (!handlers || !handlers.length) return;
         handlers.forEach(fn => {
             try { fn(status); } catch (ex) { this.log.debug(`Tuya Cloud realtime handler error: ${ex.message}`); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.14.0-dev.41",
+  "version": "3.14.0-dev.43",
   "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/TuyaCloudDevice.test.js

@@ -240,6 +240,29 @@ describe('TuyaCloudDevice', () => {
             expect(api.sendCommands).toHaveBeenCalledWith('dev1', [{code: 'switch_1', value: false}]);
             expect(api.sendProperties).toHaveBeenCalledWith('dev1', [{code: 'wfh_open', value: true}]);
         });
+
+        // HomeKit often double-sends a write; running the two concurrently used to
+        // race the learning (the 2nd saw the code "tried" but not yet learned and
+        // failed). Serializing writes per device fixes it.
+        test('concurrent duplicate writes of an unknown code are serialized, not raced', async () => {
+            const api = makeApi();
+            api.getShadowProperties = jest.fn().mockResolvedValue([{code: 'Power', dp_id: 1, value: false}]);
+            api.sendCommands.mockImplementation((id, cmds) =>
+                cmds.some(c => c.code === 'Power')
+                    ? Promise.reject(new Error('command or value not support (code 2008)'))
+                    : Promise.resolve(true));
+            const dev = makeDevice(api, null, {key: 'abc'});
+            await dev._connect();
+            const warn = jest.spyOn(log, 'warn');
+
+            const [a, b] = await Promise.all([dev.update({'1': true}), dev.update({'1': true})]);
+
+            expect(a).toBe(true);
+            expect(b).toBe(true);
+            expect(warn).not.toHaveBeenCalled();               // the 2nd write didn't spuriously fail
+            expect(api.sendCommands).toHaveBeenCalledTimes(1);  // only the 1st probed commands
+            jest.restoreAllMocks();
+        });
     });
 
     test('realtime code-only deltas are mirrored to numeric ids via the learned map', async () => {
@@ -293,6 +316,51 @@ describe('TuyaCloudDevice', () => {
         expect(api.getStatus).toHaveBeenCalledWith('dev1');
     });
 
+    describe('cloud state sync', () => {
+        test('the post-write catch-up re-reads the shadow and emits the resulting change', async () => {
+            const api = makeApi();
+            let rs = 13;
+            api.getShadowProperties = jest.fn(async () => [{code: 'return_state', dp_id: 105, value: rs}]);
+            const dev = makeDevice(api, null, {key: 'abc'});
+            await dev._connect(); // state: return_state=13, '105'=13
+
+            const changes = [];
+            dev.on('change', c => changes.push(c));
+            rs = 12; // the gate is now "opening" in the cloud
+            await dev._catchupOnce();
+            expect(changes[0]).toEqual({return_state: 12, '105': 12});
+        });
+
+        test('a successful cloud write arms a state catch-up', async () => {
+            const api = makeApi();
+            api.getShadowProperties = jest.fn().mockResolvedValue([{code: 'switch_1', dp_id: 1, value: false}]);
+            const dev = makeDevice(api, null, {key: 'abc'});
+            await dev._connect();
+            expect(dev._catchupTimers).toBeNull();
+            await dev.update({'1': true});
+            expect(Array.isArray(dev._catchupTimers)).toBe(true);
+            dev.stop();
+        });
+
+        test('a refresh reads via the shadow, so a thing-model device whose /status is empty still updates', async () => {
+            const api = makeApi();
+            let rs = 13;
+            api.getStatus = jest.fn().mockResolvedValue([]); // thing-model-only device: /status comes back empty
+            api.getShadowProperties = jest.fn(async () => [{code: 'return_state', dp_id: 105, value: rs}]);
+            const dev = makeDevice(api, null, {key: 'abc'});
+            await dev._connect();
+
+            const changes = [];
+            dev.on('change', c => changes.push(c));
+            rs = 12;
+            await dev._refreshState();
+
+            expect(api.getShadowProperties).toHaveBeenCalled();
+            expect(changes.some(c => c['105'] === 12)).toBe(true);
+            expect(dev.state['105']).toBe(12); // not wiped by the empty /status
+        });
+    });
+
     describe('connect-failure handling (no log spam)', () => {
         afterEach(() => jest.restoreAllMocks());