homebridge-tuya-plus 3.14.0-dev.44 → 3.14.0-dev.46

package/lib/TuyaCloudDevice.js

@@ -77,6 +77,7 @@ class TuyaCloudDevice extends EventEmitter {
         this._announcedProperties = false;
         this._catchupTimers = null; // post-write state re-reads (see _scheduleStateCatchup)
         this._writeChain = null;    // serializes cloud writes to this device (see update)
+        this._reportsOverMqtt = false; // set once any realtime update arrives; disables the catch-up
 
         // Bidirectional data-point maps, learned from the device's thing-shadow on
         // connect. They let this cloud transport (and the LAN+cloud TuyaDevice that
@@ -226,6 +227,10 @@ class TuyaCloudDevice extends EventEmitter {
     // makes the catch-up self-cancelling: it costs an HTTP read only on devices that
     // actually need it.
     _onRealtime(status) {
+        // This device reports over MQTT, so the catch-up is pure overhead for it —
+        // latch it off for good and drop any pending one. Only devices that never
+        // report here (the stream carries nothing for them) keep the catch-up.
+        this._reportsOverMqtt = true;
         if (this._catchupTimers) {
             this._catchupTimers.forEach(t => clearTimeout(t));
             this._catchupTimers = null;
@@ -305,9 +310,26 @@ class TuyaCloudDevice extends EventEmitter {
     _propsToState(props) {
         const state = {};
         (props || []).forEach(item => {
-            if (item && typeof item.code === 'string') {
+            if (!item || typeof item !== 'object') return;
+            if (typeof item.code === 'string') {
                 this._indexInto(state, item.code, item.value, item.dp_id != null ? item.dp_id : item.dpId);
+                return;
             }
+            // A realtime item with no `code`: Tuya's MQTT stream delivers some
+            // data-points as a bare { "<dpId>": value } pair — no `code`, no `value`
+            // field. Custom / non-standard DPs come through this way (e.g. an
+            // irrigation timer's `charging`, dp 101, which lives only in the
+            // thing-model shadow, not the standard instruction set, so the message
+            // service never attaches a code). Map the numeric id back to its code,
+            // learned from the shadow on connect, so the change is applied instead of
+            // silently dropped; a still-unmapped id is indexed numerically, which a
+            // LAN-style config resolves.
+            Object.keys(item).forEach(key => {
+                if (!/^\d+$/.test(key)) return;
+                const code = this.codeByDpId[key];
+                if (code != null) this._indexInto(state, code, item[key], key);
+                else state[key] = item[key];
+            });
         });
         return state;
     }
@@ -452,10 +474,12 @@ class TuyaCloudDevice extends EventEmitter {
     // 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.
+    // device a couple of times after a command to catch the transition. Strictly
+    // supplemental: a device that has ever reported over MQTT skips this entirely
+    // (realtime is its path), each new command re-arms it, and it only runs on the
+    // cloud path — so a LAN-reachable or MQTT-covered device pays nothing.
     _scheduleStateCatchup() {
+        if (this._reportsOverMqtt) return;
         if (this._catchupTimers) this._catchupTimers.forEach(t => clearTimeout(t));
         this._catchupTimers = [2000, 8000].map(delay => {
             const t = setTimeout(() => this._catchupOnce(), delay);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.14.0-dev.44",
+  "version": "3.14.0-dev.46",
   "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

@@ -279,6 +279,39 @@ describe('TuyaCloudDevice', () => {
         expect(changes[0]).toEqual({switch_1: true, '1': true});
     });
 
+    test('realtime bare numeric-keyed items (no code) are mapped to their code', async () => {
+        // Custom/non-standard DPs (e.g. an irrigation timer's `charging`, dp 101)
+        // arrive over MQTT as a bare { "<dpId>": value } pair with no `code` field.
+        // They must be applied via the learned dp→code map, not dropped.
+        const api = makeApi();
+        api.getShadowProperties = jest.fn().mockResolvedValue([
+            {code: 'switch_1', dp_id: 1, value: false},
+            {code: 'charging', dp_id: 101, value: false}
+        ]);
+        const dev = makeDevice(api);
+        await dev._connect();
+
+        const changes = [];
+        dev.on('change', c => changes.push(c));
+        dev._applyStatus([{'101': true}]); // bare numeric, as the message service delivers `charging`
+        expect(dev.state.charging).toBe(true);
+        expect(dev.state['101']).toBe(true);
+        expect(changes[0]).toEqual({charging: true, '101': true});
+    });
+
+    test('a bare numeric item with no learned code is still indexed numerically', async () => {
+        const api = makeApi();
+        api.getShadowProperties = jest.fn().mockResolvedValue([{code: 'switch_1', dp_id: 1, value: false}]);
+        const dev = makeDevice(api);
+        await dev._connect();
+
+        const changes = [];
+        dev.on('change', c => changes.push(c));
+        dev._applyStatus([{'137': 42}]); // unknown dp, no code mapping
+        expect(dev.state['137']).toBe(42);
+        expect(changes[0]).toEqual({'137': 42});
+    });
+
     test('falls back to /status (code-only) when the shadow is unavailable', async () => {
         const api = makeApi();
         api.getShadowProperties = jest.fn().mockResolvedValue(null);
@@ -355,6 +388,18 @@ describe('TuyaCloudDevice', () => {
             dev.stop();
         });
 
+        test('once a device has reported over MQTT, later writes never arm a 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();
+            dev._onRealtime([{code: 'switch_1', value: true}]); // device reports over MQTT → latch
+
+            await dev.update({'1': false});
+            expect(dev._catchupTimers).toBeNull(); // strictly supplemental: no read for MQTT-covered devices
+            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;