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

package/lib/AirPurifierAccessory.js

@@ -80,7 +80,7 @@ class AirPurifierAccessory extends BaseAccessory {
     _addAirQualityService() {
         const {Service} = this.hap;
         const nameAirQuality = this.device.context.nameAirQuality || 'Air Quality';
-        this.log.info('Adding air quality sensor: %s', nameAirQuality);
+        this.log.debug('Adding air quality sensor: %s', nameAirQuality);
         this.accessory.addService(Service.AirQualitySensor, nameAirQuality);
     }
 

package/lib/BaseAccessory.js

@@ -24,7 +24,7 @@ class BaseAccessory {
         });
 
         this.device.once('change', () => {
-            this.log(`Ready to handle ${this.device.context.name} (${this.device.context.type}:${this.device.context.version}) with signature ${JSON.stringify(this.device.state)}`);
+            this.log.debug(`Ready to handle ${this.device.context.name} (${this.device.context.type}:${this.device.context.version}) with signature ${JSON.stringify(this.device.state)}`);
 
             this._registerCharacteristics(this.device.state);
         });
@@ -65,8 +65,18 @@ class BaseAccessory {
         return typeof b === 'boolean' ? b : (typeof b === 'string' ? b.toLowerCase().trim() === 'true' : (typeof b === 'number' ? b !== 0 : df));
     }
 
+    // A HapStatusError to throw from a get/set handler when the value can't be
+    // served (device unreachable, or an unusable reading). HomeKit shows the
+    // accessory as "No Response". Preferred over a plain `throw new Error(...)`,
+    // which newer Homebridge logs a characteristic warning for before falling
+    // back to this same status code (SERVICE_COMMUNICATION_FAILURE, -70402).
+    _commError() {
+        const {HapStatusError, HAPStatus} = this.hap;
+        return new HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
+    }
+
     getState(dp, callback) {
-        if (!this.device.connected) return callback(true);
+        if (!this.device.connected) return callback(this._commError());
         const _callback = () => {
             if (Array.isArray(dp)) {
                 const ret = {};
@@ -91,36 +101,37 @@ class BaseAccessory {
         //For devices like the DETA Smart Fan Controller Switch that by default set the speed as 3 the new code in the setMultiState function causes issues.
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return callback && callback();
+            return callback && callback(this._commError());
         }
         const ret = this.device.update(dps);
-        callback && callback(!ret);
+        callback && callback(ret === false ? this._commError() : null);
     }
 
     setMultiState(dps, callback) {
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return callback && callback();
+            return callback && callback(this._commError());
         }
+        let failed = false;
         for (const dp in dps) {
             if (dps.hasOwnProperty(dp) && dps[dp] !== this.device.state[dp]){
-                this.__ret = this.device.update({[dp.toString()] : dps[dp]});
+                if (this.device.update({[dp.toString()] : dps[dp]}) === false) failed = true;
             }
         }
-        callback && callback(!this.__ret);
+        callback && callback(failed ? this._commError() : null);
     }
 
     getDividedState(dp, divisor, callback) {
         this.getState(dp, (err, data) => {
             if (err) return callback(err);
-            if (!isFinite(data)) return callback(true);
+            if (!isFinite(data)) return callback(this._commError());
 
             callback(null, this._getDividedState(data, divisor));
         });
     }
 
     getStateAsync(dp) {
-        if (!this.device.connected) throw new Error('Not connected');
+        if (!this.device.connected) throw this._commError();
         if (Array.isArray(dp)) {
             const ret = {};
             dp.forEach(p => { ret[p] = this.device.state[p]; });
@@ -133,29 +144,55 @@ class BaseAccessory {
         return this.setMultiStateAsync({[dp.toString()]: value});
     }
 
-    setMultiStateAsync(dps) {
+    // Throws a "No Response" HapStatusError when the device is unreachable or the
+    // write is rejected, so a get/set handler that returns this promise surfaces
+    // the failure to HomeKit instead of silently pretending the write succeeded.
+    // `device.update` returns a boolean for LAN devices and an awaitable boolean
+    // for cloud devices (false == the command did not go through).
+    async setMultiStateAsync(dps) {
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return;
+            throw this._commError();
         }
+        const writes = [];
         for (const dp in dps) {
             if (dps.hasOwnProperty(dp) && dps[dp] !== this.device.state[dp]) {
-                this.device.update({[dp.toString()]: dps[dp]});
+                writes.push(this.device.update({[dp.toString()]: dps[dp]}));
             }
         }
+        const results = await Promise.all(writes);
+        if (results.some(ok => ok === false)) throw this._commError();
     }
 
-    setMultiStateLegacyAsync(dps) {
+    async setMultiStateLegacyAsync(dps) {
         if (!this.device.connected) {
             this.log.debug(`${this.device.context.name}: skipping write, device not connected`);
-            return;
+            throw this._commError();
         }
-        this.device.update(dps);
+        if (await this.device.update(dps) === false) throw this._commError();
+    }
+
+    // Non-throwing write helpers for callers that are NOT inside a HomeKit
+    // get/set handler — setTimeout callbacks, multi-step command sequences, etc.
+    // The async helpers above reject on a disconnected/failed write so HomeKit
+    // can show "No Response"; in a detached/background context there is no
+    // HomeKit request to fail and an unhandled rejection would crash Homebridge,
+    // so these swallow the error (the helper has already logged it).
+    setStateInBackground(dp, value) {
+        this.setStateAsync(dp, value).catch(() => {});
+    }
+
+    setMultiStateInBackground(dps) {
+        this.setMultiStateAsync(dps).catch(() => {});
+    }
+
+    setMultiStateLegacyInBackground(dps) {
+        this.setMultiStateLegacyAsync(dps).catch(() => {});
     }
 
     getDividedStateAsync(dp, divisor) {
         const data = this.getStateAsync(dp);
-        if (!isFinite(data)) throw new Error('Invalid state');
+        if (!isFinite(data)) throw this._commError();
         return this._getDividedState(data, divisor);
     }
 
@@ -167,7 +204,7 @@ class BaseAccessory {
         this.colorFunction = this.device.context.colorFunction && {HSB: 'HSB', HEXHSB: 'HEXHSB'}[this.device.context.colorFunction.toUpperCase()];
         if (!this.colorFunction && value) {
             this.colorFunction = {12: 'HSB', 14: 'HEXHSB'}[value.length] || 'Unknown';
-            if (this.colorFunction) this.log.info(`Color format for ${this.device.context.name} (${this.device.context.version}) identified as ${this.colorFunction} (length: ${value.length}).`);
+            if (this.colorFunction) this.log.debug(`Color format for ${this.device.context.name} (${this.device.context.version}) identified as ${this.colorFunction} (length: ${value.length}).`);
         }
         if (!this.colorFunction) {
             this.colorFunction = 'Unknown';

package/lib/ConvectorAccessory.js

@@ -55,7 +55,7 @@ class ConvectorAccessory extends BaseAccessory {
         service.getCharacteristic(Characteristic.TargetHeaterCoolerState)
             .setProps({ minValue: 1, maxValue: 1, validValues: [Characteristic.TargetHeaterCoolerState.HEAT] })
             .updateValue(this._getTargetHeaterCoolerState())
-            .onGet(() => this._getTargetHeaterCoolerState())
+            .onGet(() => { if (!this.device.connected) throw this._commError(); return this._getTargetHeaterCoolerState(); })
             .onSet(() => this.setStateAsync(this.dpActive, true));
 
         const characteristicCurrentTemperature = service.getCharacteristic(Characteristic.CurrentTemperature)

package/lib/CustomMultiOutletAccessory.js

@@ -74,6 +74,7 @@ class CustomMultiOutletAccessory extends BaseAccessory {
     }
 
     setPower(dp, value) {
+        if (!this.device.connected) throw this._commError();
         if (!this._pendingPower) {
             this._pendingPower = {props: {}, resolvers: []};
         }
@@ -87,7 +88,7 @@ class CustomMultiOutletAccessory extends BaseAccessory {
             this._pendingPower.timer = setTimeout(() => {
                 const {props, resolvers} = this._pendingPower;
                 this._pendingPower = null;
-                this.setMultiStateAsync(props);
+                this.setMultiStateInBackground(props);
                 resolvers.forEach(r => r());
             }, 500);
         });

package/lib/DoorbellAccessory.js

@@ -11,7 +11,8 @@ const LOCK_TIMEOUT = 5000;
 
 class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
 
-    constructor() {
+    constructor(log) {
+        this.log = log || console;
         this.cameraImage = undefined;
     }
 
@@ -27,7 +28,7 @@ class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
                 var body=Buffer.alloc(0);
 
                 if (res.statusCode!==200) {
-                    return console.error('HTTP '+res.statusCode);
+                    return me.log.error('Doorbell image fetch failed: HTTP %s', res.statusCode);
                 }
 
                 res.on('data', function(chunk) {
@@ -36,13 +37,12 @@ class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
 
                 res.on('end', function() {
                     me.setCameraImage(body);
-                    console.log("Image stored");
+                    me.log.debug('Doorbell image stored.');
                     callback();
-                    console.log("Callback after image store complete");
                 });
 
                 res.on('error', function(err) {
-                    console.error(err);
+                    me.log.error('Doorbell image fetch error:', err);
                 });
             }
         );
@@ -96,12 +96,9 @@ class DoorbellAccessory extends BaseAccessory {
 
 
         this.device.on('change', (changes, state) => {
-            //console.log(`Changes: ${JSON.stringify(changes)}, State: ${JSON.stringify(state)}`);
-
             if (changes.hasOwnProperty(DP_DOORBELL)) {
                 const urlBase64 = changes[DP_DOORBELL];
                 const strUrl = Buffer.from(urlBase64, 'base64');
-                //console.log(`Image URL: ${strUrl}`);
 
                 this.streamingDelegate.storeImage(strUrl.toString(), () => {
                   service.updateCharacteristic(Characteristic.ProgrammableSwitchEvent, Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
@@ -109,18 +106,18 @@ class DoorbellAccessory extends BaseAccessory {
             }
 
             if (changes.hasOwnProperty(DP_DOOR)) {
-                console.log("Door button pressed");
+                this.log.debug('Door button pressed');
             }
 
             if (changes.hasOwnProperty(DP_GATE)) {
-                console.log("Gate button pressed");
+                this.log.debug('Gate button pressed');
             }
         });
     }
 
     configureCamera() {
-        this.streamingDelegate = new DoorbellDelegate();
-        console.log("created streaming delegate");
+        this.streamingDelegate = new DoorbellDelegate(this.log);
+        this.log.debug('Created camera streaming delegate.');
         const options = {
           cameraStreamCount: 1, 
           delegate: this.streamingDelegate,
@@ -157,12 +154,8 @@ class DoorbellAccessory extends BaseAccessory {
           },
         };
     
-        //console.log("created options");
         const cameraController = new this.hap.CameraController(options);
-        //console.log("created controller");
-    
         this.accessory.configureController(cameraController);
-        //console.log("configured controller with accessory");
     }
 
     pushDoor(callback) {

package/lib/GarageDoorAccessory.js

@@ -105,7 +105,7 @@ class GarageDoorAccessory extends BaseAccessory {
             .onGet(() => this.getCurrentDoorState());
 
         this.device.on('change', changes => {
-            this._alwaysLog('changed:' + JSON.stringify(changes));
+            this._debugLog('changed:' + JSON.stringify(changes));
 
             if (changes.hasOwnProperty(this.dpStatus)) {
                 const newCurrentDoorState = this._getCurrentDoorState(changes[this.dpStatus]);