homebridge-tuya-plus 3.14.0-dev.17 → 3.14.0-dev.19

package/lib/TWLightAccessory.js

@@ -72,7 +72,7 @@ class TWLightAccessory extends BaseAccessory {
     }
 
     getBrightness() {
-        return this.convertBrightnessFromTuyaToHomeKit(this.device.state[this.dpBrightness]);
+        return this.convertBrightnessFromTuyaToHomeKit(this.getStateAsync(this.dpBrightness));
     }
 
     setBrightness(value) {
@@ -80,7 +80,7 @@ class TWLightAccessory extends BaseAccessory {
     }
 
     getColorTemperature() {
-        return this.convertColorTemperatureFromTuyaToHomeKit(this.device.state[this.dpColorTemperature]);
+        return this.convertColorTemperatureFromTuyaToHomeKit(this.getStateAsync(this.dpColorTemperature));
     }
 
     setColorTemperature(value) {

package/lib/TuyaCloudDevice.js

@@ -173,7 +173,15 @@ class TuyaCloudDevice extends EventEmitter {
     // `this.state`: the accessory already reflects the user's intent in HomeKit
     // immediately, and leaving `state` untouched lets the realtime stream
     // confirm the real device state without a spurious "revert" while a sleepy
-    // device catches up. Returns truthy like TuyaAccessory.update().
+    // device catches up.
+    //
+    // Return contract mirrors TuyaAccessory.update() as far as a synchronous
+    // caller is concerned (truthy on a no-op, `false` when not connected) but,
+    // unlike the LAN class, the actual command travels over HTTP and only its
+    // outcome reveals a failure. So when a command IS dispatched we return the
+    // promise that resolves to the boolean result (and never rejects), letting
+    // `BaseAccessory.setMultiStateAsync` await it and surface a rejected cloud
+    // command to HomeKit instead of silently dropping it.
     update(dps) {
         if (!dps || typeof dps !== 'object') return true;
 
@@ -185,13 +193,15 @@ class TuyaCloudDevice extends EventEmitter {
             return false;
         }
 
-        this.api.sendCommands(this.context.id, commands)
+        return this.api.sendCommands(this.context.id, commands)
             .then(ok => {
                 if (!ok) this.log.warn(`${this.context.name}: Tuya Cloud rejected command ${JSON.stringify(commands)}`);
+                return ok;
             })
-            .catch(ex => this.log.error(`${this.context.name}: cloud command failed: ${ex.message}`));
-
-        return true;
+            .catch(ex => {
+                this.log.error(`${this.context.name}: cloud command failed: ${ex.message}`);
+                return false;
+            });
     }
 
     /* ------------------------------------------------------------------ *

package/lib/ValveAccessory.js

@@ -49,13 +49,13 @@ class ValveAccessory extends BaseAccessory {
             .onSet(value => this.setStateAsync(this.dpPower, value));
 
         const characteristicInUse = service.getCharacteristic(Characteristic.InUse)
-            .onGet(() => characteristicActive.value);
+            .onGet(() => { if (!this.device.connected) throw this._commError(); return characteristicActive.value; });
 
         if (!this.noTimer) {
             service.getCharacteristic(Characteristic.SetDuration)
-                .onGet(() => this.setDuration)
+                .onGet(() => { if (!this.device.connected) throw this._commError(); return this.setDuration; })
                 .on('change', (data) => {
-                    this.log.info('Water Valve Time Duration Set to: ' + data.newValue / 60 + ' Minutes');
+                    this.log.debug('Water Valve Time Duration Set to: ' + data.newValue / 60 + ' Minutes');
                     this.setDuration = data.newValue;
 
                     if (service.getCharacteristic(Characteristic.InUse).value) {
@@ -65,8 +65,9 @@ class ValveAccessory extends BaseAccessory {
 
                         clearTimeout(this.timer);
                         this.timer = setTimeout(() => {
-                            this.log.info('Water Valve Timer Expired. Shutting OFF Valve');
-                            service.getCharacteristic(Characteristic.Active).setValue(0);
+                            this.log.debug('Water Valve Timer Expired. Shutting OFF Valve');
+                            this.setStateInBackground(this.dpPower, 0);
+                            service.getCharacteristic(Characteristic.Active).updateValue(0);
                             service.getCharacteristic(Characteristic.InUse).updateValue(0);
                             this.lastActivationTime = null;
                         }, (data.newValue * 1000));
@@ -75,6 +76,7 @@ class ValveAccessory extends BaseAccessory {
 
             service.getCharacteristic(Characteristic.RemainingDuration)
                 .onGet(() => {
+                    if (!this.device.connected) throw this._commError();
                     let remainingTime = this.setDuration - Math.floor(((new Date()).getTime() - this.lastActivationTime) / 1000);
                     return (remainingTime && remainingTime > 0) ? remainingTime : 0;
                 });
@@ -87,17 +89,18 @@ class ValveAccessory extends BaseAccessory {
                             service.getCharacteristic(Characteristic.RemainingDuration).updateValue(0);
                             service.getCharacteristic(Characteristic.Active).updateValue(0);
                             clearTimeout(this.timer);
-                            this.log.info('Water Valve is OFF!');
+                            this.log.debug('Water Valve is OFF!');
                             break;
                         case 1:
                             this.lastActivationTime = (new Date()).getTime();
                             service.getCharacteristic(Characteristic.RemainingDuration).updateValue(this.setDuration);
                             service.getCharacteristic(Characteristic.Active).updateValue(1);
-                            this.log.info('Water Valve Turning ON with Timer Set to: ' + this.setDuration / 60 + ' Minutes');
+                            this.log.debug('Water Valve Turning ON with Timer Set to: ' + this.setDuration / 60 + ' Minutes');
                             clearTimeout(this.timer);
                             this.timer = setTimeout(() => {
-                                this.log.info('Water Valve Timer Expired. Shutting OFF Valve');
-                                service.getCharacteristic(Characteristic.Active).setValue(0);
+                                this.log.debug('Water Valve Timer Expired. Shutting OFF Valve');
+                                this.setStateInBackground(this.dpPower, 0);
+                                service.getCharacteristic(Characteristic.Active).updateValue(0);
                                 service.getCharacteristic(Characteristic.InUse).updateValue(0);
                                 this.lastActivationTime = null;
                             }, (this.setDuration * 1000));
@@ -110,11 +113,12 @@ class ValveAccessory extends BaseAccessory {
                 service.getCharacteristic(Characteristic.RemainingDuration).updateValue(this.setDuration);
                 service.getCharacteristic(Characteristic.Active).updateValue(1);
                 service.getCharacteristic(Characteristic.InUse).updateValue(1);
-                this.log.info('Water Valve is ON After Restart. Setting Timer to: ' + this.setDuration / 60 + ' Minutes');
+                this.log.debug('Water Valve is ON After Restart. Setting Timer to: ' + this.setDuration / 60 + ' Minutes');
                 clearTimeout(this.timer);
                 this.timer = setTimeout(() => {
-                    this.log.info('Water Valve Timer Expired. Shutting OFF Valve');
-                    service.getCharacteristic(Characteristic.Active).setValue(0);
+                    this.log.debug('Water Valve Timer Expired. Shutting OFF Valve');
+                    this.setStateInBackground(this.dpPower, 0);
+                    service.getCharacteristic(Characteristic.Active).updateValue(0);
                     this.lastActivationTime = null;
                 }, (this.setDuration * 1000));
             }

package/lib/VerticalBlindsWithTilt.js

@@ -38,16 +38,16 @@ class VerticalBlindsWithTilt extends BaseAccessory {
 
         const characteristicCurrentPosition = service.getCharacteristic(Characteristic.CurrentPosition)
             .updateValue(this.currentPosition)
-            .onGet(() => this.currentPosition);
+            .onGet(() => { if (!this.device.connected) throw this._commError(); return this.currentPosition; });
 
         const characteristicTargetPosition = service.getCharacteristic(Characteristic.TargetPosition)
             .updateValue(this.currentPosition)
-            .onGet(() => this.currentPosition)
+            .onGet(() => { if (!this.device.connected) throw this._commError(); return this.currentPosition; })
             .onSet(value => this.setPosition(value));
 
         const characteristicPositionState = service.getCharacteristic(Characteristic.PositionState)
             .updateValue(Characteristic.PositionState.STOPPED)
-            .onGet(() => Characteristic.PositionState.STOPPED);
+            .onGet(() => { if (!this.device.connected) throw this._commError(); return Characteristic.PositionState.STOPPED; });
 
         const characteristicCurrentHorizontalTilt = service.getCharacteristic(Characteristic.CurrentHorizontalTiltAngle)
             .updateValue(this._getTiltAngle(dps[this.dpTiltState] || dps[this.dpTilt]))
@@ -76,6 +76,7 @@ class VerticalBlindsWithTilt extends BaseAccessory {
 
     setPosition(value) {
         const {Characteristic} = this.hap;
+        if (!this.device.connected) throw this._commError();
 
         if (value === 0) {
             if (this.currentPosition === 0) {
@@ -205,6 +206,7 @@ class VerticalBlindsWithTilt extends BaseAccessory {
     }
 
     setTiltAngle(value) {
+        if (!this.device.connected) throw this._commError();
         const tuyaValue = Math.round((value / 1.8) + 50);
         const clampedValue = Math.max(0, Math.min(100, tuyaValue));
 

package/lib/WledDimmerAccessory.js

@@ -1,4 +1,4 @@
-const BaseAccessory = require('./BaseAccessory');
+const SimpleDimmerAccessory = require('./SimpleDimmerAccessory');
 const http = require('http');
 const maxWledBrightness = 255;
 
@@ -6,30 +6,14 @@ const maxWledBrightness = 255;
 const wledDebounceMs = 50;
 const wledWarmupMs = 8000;
 
-class WledDimmerAccessory extends BaseAccessory {
-    static getCategory(Categories) {
-        return Categories.LIGHTBULB;
-    }
-
-    constructor(...props) {
-        super(...props);
-    }
-
-    _registerPlatformAccessory() {
-        const {Service} = this.hap;
-
-        this.accessory.addService(Service.Lightbulb, this.device.context.name);
-
-        super._registerPlatformAccessory();
-    }
-
+class WledDimmerAccessory extends SimpleDimmerAccessory {
     _registerCharacteristics(dps) {
-        const {Service, Characteristic} = this.hap;
-        const service = this.accessory.getService(Service.Lightbulb);
-        this._checkServiceName(service, this.device.context.name);
-
-        this.dpPower = this._getCustomDP(this.device.context.dpPower) || '1';
-        this.dpBrightness = this._getCustomDP(this.device.context.dpBrightness) || this._getCustomDP(this.device.context.dp) || '2';
+        // The Lightbulb service, On/Brightness characteristics, default DPs and
+        // the device 'change' listener are all set up by SimpleDimmerAccessory.
+        // WLED only layers optional brightness sync and preset-effect switches
+        // on top, so without syncBrightnessToWled configured this behaves
+        // exactly like a plain SimpleDimmer.
+        super._registerCharacteristics(dps);
 
         // State for debounced / delayed WLED updates
         this._wledPendingBri = null;
@@ -47,32 +31,20 @@ class WledDimmerAccessory extends BaseAccessory {
             null;
         this.syncBrightnessToWled = (syncCfg && ('' + syncCfg).trim()) || null;
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: syncBrightnessToWled=%s',
             this.device.context.name,
             this.syncBrightnessToWled || 'disabled'
         );
 
-        const characteristicOn = service.getCharacteristic(Characteristic.On)
-            .updateValue(dps[this.dpPower])
-            .onGet(() => this.getStateAsync(this.dpPower))
-            .onSet(value => this.setStateAsync(this.dpPower, value));
-
-        const characteristicBrightness = service.getCharacteristic(Characteristic.Brightness);
-        // Keep a reference so we can update brightness from background WLED calls
-        this._characteristicBrightness = characteristicBrightness;
-
         if (this.syncBrightnessToWled) {
             // Start with 100% locally while we fetch the actual WLED brightness
-            characteristicBrightness
-                .updateValue(100)
-                .onGet(() => this.getBrightness())
-                .onSet(value => this.setBrightness(value));
+            this._characteristicBrightness.updateValue(100);
 
             // Force Tuya dimmer brightness to 100% on startup
             const maxTuyaBrightness = this.convertBrightnessFromHomeKitToTuya(100);
             if (dps[this.dpBrightness] !== maxTuyaBrightness) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: setting Tuya brightness DP%s to max (%s)',
                     this.device.context.name,
                     this.dpBrightness,
@@ -80,19 +52,6 @@ class WledDimmerAccessory extends BaseAccessory {
                 );
                 this.setState(this.dpBrightness, maxTuyaBrightness, () => {});
             }
-        } else {
-            const initial = this.convertBrightnessFromTuyaToHomeKit(dps[this.dpBrightness]);
-            this.log.debug(
-                '%s: initial Tuya brightness DP%s=%s -> HomeKit %s%%',
-                this.device.context.name,
-                this.dpBrightness,
-                dps[this.dpBrightness],
-                initial
-            );
-            characteristicBrightness
-                .updateValue(initial)
-                .onGet(() => this.getBrightness())
-                .onSet(value => this.setBrightness(value));
         }
 
         // Optional: create one HomeKit Switch per configured WLED preset effect.
@@ -148,7 +107,7 @@ class WledDimmerAccessory extends BaseAccessory {
                             return callback();
                         }
 
-                        this.log.info(
+                        this.log.debug(
                             '[WLED Sync] %s: setting preset effect "%s" (id=%s, index=%s)',
                             this.device.context.name,
                             effectName,
@@ -196,6 +155,7 @@ class WledDimmerAccessory extends BaseAccessory {
                         });
                     })
                     .on('get', cb => {
+                        if (!this.device.connected) return cb(this._commError());
                         cb(null, this.device.state[this.dpPower] && this._wledCurrentEffectIndex === (index + 1));
                     });
 
@@ -211,15 +171,17 @@ class WledDimmerAccessory extends BaseAccessory {
                 .filter(service => service.UUID === HapService.Switch.UUID && service.subtype && service.subtype.startsWith('wledEffect '))
                 .forEach(service => {
                     if (!validEffectServices.includes(service)) {
-                        this.log.info('Removing', service.displayName);
+                        this.log.debug('Removing', service.displayName);
                         this.accessory.removeService(service);
                     }
                 });
         }
+    }
 
+    _registerChangeListener() {
         this.device.on('change', changes => {
             // Log full DPS changes so we can see exactly what Tuya reported
-            this.log.info(
+            this.log.debug(
                 '%s DPS changes: %s %s was:',
                 this.device.context.name,
                 JSON.stringify(changes),
@@ -228,10 +190,10 @@ class WledDimmerAccessory extends BaseAccessory {
             );
 
             if (changes.hasOwnProperty(this.dpPower)) {
-                const oldPower = !!characteristicOn.value;
+                const oldPower = !!this._characteristicOn.value;
                 const newPower = !!changes[this.dpPower];
 
-                this.log.info(
+                this.log.debug(
                     '%s power change detected on DP%s: %s -> %s',
                     this.device.context.name,
                     this.dpPower,
@@ -240,13 +202,13 @@ class WledDimmerAccessory extends BaseAccessory {
                 );
 
                 if (oldPower !== newPower) {
-                    characteristicOn.updateValue(newPower);
+                    this._characteristicOn.updateValue(newPower);
                 }
 
                 // Track warmup window for WLED after power ON
                 if (this.syncBrightnessToWled && newPower) {
                     this._wledReadyAt = Date.now() + wledWarmupMs;
-                    this.log.info(
+                    this.log.debug(
                         '[WLED Sync] %s: power ON -> delaying WLED API calls for %sms',
                         this.device.context.name,
                         wledWarmupMs
@@ -270,7 +232,7 @@ class WledDimmerAccessory extends BaseAccessory {
 
                 // Ignore the "forced back to 100%" update to avoid feedback loops
                 if (tuyaValue === maxTuyaBrightness) {
-                    this.log.info(
+                    this.log.debug(
                         '[WLED Sync] %s: Tuya DP%s reported max brightness (%s), ignoring',
                         this.device.context.name,
                         this.dpBrightness,
@@ -282,7 +244,7 @@ class WledDimmerAccessory extends BaseAccessory {
                 const percent = this.convertBrightnessFromTuyaToHomeKit(tuyaValue);
                 const bri = Math.max(0, Math.min(maxWledBrightness, Math.round((percent / 100) * maxWledBrightness)));
 
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: Tuya DP%s changed to %s -> %s%% -> WLED bri=%s (debounced)',
                     this.device.context.name,
                     this.dpBrightness,
@@ -303,14 +265,14 @@ class WledDimmerAccessory extends BaseAccessory {
                     }
 
                     // Reflect that brightness back into HomeKit
-                    characteristicBrightness.updateValue(percent);
+                    this._characteristicBrightness.updateValue(percent);
 
                     // After a short delay, force Tuya brightness back to 100% so it stops dimming the strip
                     if (this._wledForceMaxTimeout) {
                         clearTimeout(this._wledForceMaxTimeout);
                     }
                     this._wledForceMaxTimeout = setTimeout(() => {
-                        this.log.info(
+                        this.log.debug(
                             '[WLED Sync] %s: forcing Tuya DP%s back to max (%s) after Tuya app change',
                             this.device.context.name,
                             this.dpBrightness,
@@ -319,17 +281,18 @@ class WledDimmerAccessory extends BaseAccessory {
                         this.setState(this.dpBrightness, maxTuyaBrightness, () => {});
                     }, 5000);
                 });
-            } else if (!this.syncBrightnessToWled && changes.hasOwnProperty(this.dpBrightness) && this.convertBrightnessFromHomeKitToTuya(characteristicBrightness.value) !== changes[this.dpBrightness]) {
-                characteristicBrightness.updateValue(this.convertBrightnessFromTuyaToHomeKit(changes[this.dpBrightness]));
+            } else if (!this.syncBrightnessToWled && changes.hasOwnProperty(this.dpBrightness) && this.convertBrightnessFromHomeKitToTuya(this._characteristicBrightness.value) !== changes[this.dpBrightness]) {
+                this._characteristicBrightness.updateValue(this.convertBrightnessFromTuyaToHomeKit(changes[this.dpBrightness]));
             }
         });
     }
 
     getBrightness() {
+        if (!this.device.connected) throw this._commError();
         if (this.syncBrightnessToWled) {
             // If we already have a cached WLED brightness, return it immediately.
             if (this._lastWledPercent != null) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: getBrightness() -> using cached %s%%',
                     this.device.context.name,
                     this._lastWledPercent
@@ -338,13 +301,14 @@ class WledDimmerAccessory extends BaseAccessory {
             }
             return 50;
         } else {
-            return this.convertBrightnessFromTuyaToHomeKit(this.device.state[this.dpBrightness]);
+            // No WLED sync: behave as a plain SimpleDimmer.
+            return super.getBrightness();
         }
     }
 
     setBrightness(value) {
         if (this.syncBrightnessToWled) {
-            this.log.info(
+            this.log.debug(
                 '[WLED Sync] %s: setBrightness(%s%%)',
                 this.device.context.name,
                 value
@@ -356,19 +320,19 @@ class WledDimmerAccessory extends BaseAccessory {
             // Ensure Tuya stays at 100% so it doesn't interfere with WLED.
             const maxTuyaBrightness = this.convertBrightnessFromHomeKitToTuya(100);
             if (this.device.state[this.dpBrightness] !== maxTuyaBrightness) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: ensuring Tuya DP%s=%s (max)',
                     this.device.context.name,
                     this.dpBrightness,
                     maxTuyaBrightness
                 );
                 // Fire-and-forget; don't tie HomeKit callback to Tuya I/O.
-                this.setStateAsync(this.dpBrightness, maxTuyaBrightness);
+                this.setStateInBackground(this.dpBrightness, maxTuyaBrightness);
             }
 
             // Compute desired WLED brightness once.
             const bri = Math.max(0, Math.min(maxWledBrightness, Math.round((value / 100) * maxWledBrightness)));
-            this.log.info(
+            this.log.debug(
                 '[WLED Sync] %s: mapped HomeKit %s%% -> WLED bri=%s (debounced background)',
                 this.device.context.name,
                 value,
@@ -381,7 +345,8 @@ class WledDimmerAccessory extends BaseAccessory {
             // Return to HomeKit immediately; don't wait for network I/O.
             return null;
         } else {
-            return this.setStateAsync(this.dpBrightness, this.convertBrightnessFromHomeKitToTuya(value));
+            // No WLED sync: behave as a plain SimpleDimmer.
+            return super.setBrightness(value);
         }
     }
 
@@ -390,7 +355,7 @@ class WledDimmerAccessory extends BaseAccessory {
         const parts = String(this.syncBrightnessToWled).split(':');
         const host = parts[0];
         const port = parts[1] ? parseInt(parts[1], 10) || 80 : 80;
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: target host=%s port=%s',
             this.device.context.name,
             host,
@@ -424,7 +389,7 @@ class WledDimmerAccessory extends BaseAccessory {
             timeout: 1000
         };
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: GET http://%s:%s/json/state',
             this.device.context.name,
             target.host,
@@ -447,7 +412,7 @@ class WledDimmerAccessory extends BaseAccessory {
                         );
                         return done(true);
                     }
-                    this.log.info(
+                    this.log.debug(
                         '[WLED Sync] %s: /json/state -> bri=%s',
                         this.device.context.name,
                         bri
@@ -506,7 +471,7 @@ class WledDimmerAccessory extends BaseAccessory {
             timeout: 1000
         };
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: POST http://%s:%s/json/state body=%s',
             this.device.context.name,
             target.host,
@@ -518,7 +483,7 @@ class WledDimmerAccessory extends BaseAccessory {
             // Consume response and ignore body
             res.on('data', () => {});
             res.on('end', () => {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: WLED brightness set, HTTP %s',
                     this.device.context.name,
                     res.statusCode
@@ -581,7 +546,7 @@ class WledDimmerAccessory extends BaseAccessory {
             timeout: 1000
         };
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: POST http://%s:%s/json/state body=%s (preset effect)',
             this.device.context.name,
             target.host,
@@ -593,7 +558,7 @@ class WledDimmerAccessory extends BaseAccessory {
             // Consume response and ignore body
             res.on('data', () => {});
             res.on('end', () => {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: WLED effect set to %s, HTTP %s',
                     this.device.context.name,
                     effectId,
@@ -657,7 +622,7 @@ class WledDimmerAccessory extends BaseAccessory {
         const warmupDelay = this._wledReadyAt && now < this._wledReadyAt ? (this._wledReadyAt - now) : 0;
         const delay = warmupDelay + wledDebounceMs;
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: scheduling WLED bri=%s in %sms (%s)',
             this.device.context.name,
             brightness,
@@ -670,7 +635,7 @@ class WledDimmerAccessory extends BaseAccessory {
 
             // If the light is now off, skip the call.
             if (!this.device.state[this.dpPower]) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: skipping scheduled WLED bri=%s because power is OFF',
                     this.device.context.name,
                     this._wledPendingBri

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.14.0-dev.17",
+  "version": "3.14.0-dev.19",
   "description": "A community-maintained Homebridge plugin for controlling Tuya devices locally over LAN. Includes new features, fixes, and updated device support.",
   "main": "index.js",
   "scripts": {