homebridge-tuya-community 3.3.0 → 3.3.1

package/lib/SimpleFanLightAccessory.js

@@ -10,14 +10,14 @@ class SimpleFanLightAccessory extends BaseAccessory {
     }
 
     _registerPlatformAccessory() {
-        const {Service} = this.hap;
+        const { Service } = this.hap;
         this.accessory.addService(Service.Fan, this.device.context.name);
         this.accessory.addService(Service.Lightbulb, this.device.context.name + ' Light');
         super._registerPlatformAccessory();
     }
 
     _registerCharacteristics(dps) {
-        const {Service, Characteristic} = this.hap;
+        const { Service, Characteristic } = this.hap;
         const serviceFan = this.accessory.getService(Service.Fan);
         const serviceLightbulb = this.accessory.getService(Service.Lightbulb);
         this._checkServiceName(serviceFan, this.device.context.name);
@@ -100,40 +100,37 @@ class SimpleFanLightAccessory extends BaseAccessory {
     }
 
     _getFanOn(dp) {
-        const {Characteristic} = this.hap;
         return dp;
     }
 
     setFanOn(value, callback) {
-        const {Characteristic} = this.hap;
         // This uses the multistatelegacy set command to send the fan on and speed request in one call.
-        if (value == false ) {
-          this.fanCurrentSpeed = 0;
-          // This will turn off the fan speed if it is set to be 0.
-          return this.setState(this.dpFanOn, false, callback);
+        if (value == false) {
+            this.fanCurrentSpeed = 0;
+            // This will turn off the fan speed if it is set to be 0.
+            return this.setState(this.dpFanOn, false, callback);
         } else {
-          if (this.fanCurrentSpeed === 0) {
-            // The current fanDefaultSpeed Variable is there to have the fan set to a sensible default if turned on.
-            if (this.useStrings) {
-                return this.setMultiStateLegacy({[this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanDefaultSpeed.toString()}, callback);
-            } else {
-                return this.setMultiStateLegacy({[this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanDefaultSpeed}, callback);
-            }
-          } else {
-            // The current fanCurrentSpeed Variable is there to ensure the fan speed doesn't change if the fan is already on.
-            if (this.useStrings) {
-                return this.setMultiStateLegacy({[this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanCurrentSpeed.toString()}, callback);
+            if (this.fanCurrentSpeed === 0) {
+                // The current fanDefaultSpeed Variable is there to have the fan set to a sensible default if turned on.
+                if (this.useStrings) {
+                    return this.setMultiStateLegacy({ [this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanDefaultSpeed.toString() }, callback);
+                } else {
+                    return this.setMultiStateLegacy({ [this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanDefaultSpeed }, callback);
+                }
             } else {
-                return this.setMultiStateLegacy({[this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanCurrentSpeed}, callback);
+                // The current fanCurrentSpeed Variable is there to ensure the fan speed doesn't change if the fan is already on.
+                if (this.useStrings) {
+                    return this.setMultiStateLegacy({ [this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanCurrentSpeed.toString() }, callback);
+                } else {
+                    return this.setMultiStateLegacy({ [this.dpFanOn]: value, [this.dpRotationSpeed]: this.fanCurrentSpeed }, callback);
+                }
             }
-          }
         }
-        callback();
     }
 
     // Get the Current Fan Speed
     getSpeed(callback) {
-        this.getState(this.dpRotationSpeed, (err, dp) => {
+        this.getState(this.dpRotationSpeed, (err, _dp) => {
             if (err) return callback(err);
             callback(null, this.convertRotationSpeedFromTuyaToHomeKit(this.device.state[this.dpRotationSpeed]));
         });
@@ -141,25 +138,23 @@ class SimpleFanLightAccessory extends BaseAccessory {
 
     // Set the new fan speed
     setSpeed(value, callback) {
-      const {Characteristic} = this.hap;
-      if (value === 0) {
-        // This is to set the fan speed variable to be 1 when the fan is off.
-        if (this.useStrings) {
-            return this.setMultiStateLegacy({[this.dpFanOn]: false, [this.dpRotationSpeed]: this.fanDefaultSpeed.toString()}, callback);
-        } else {
-            return this.setMultiStateLegacy({[this.dpFanOn]: false, [this.dpRotationSpeed]: this.fanDefaultSpeed}, callback);
-        }
-      } else {
-        // This is to set the fan speed variable to match the current speed.
-        this.fanCurrentSpeed = this.convertRotationSpeedFromHomeKitToTuya(value);
-        // This uses the multistatelegacy set command to send the fan on and speed request in one call.
-        if (this.useStrings) {
-            return this.setMultiStateLegacy({[this.dpFanOn]: true, [this.dpRotationSpeed]: this.convertRotationSpeedFromHomeKitToTuya(value).toString()}, callback);
+        if (value === 0) {
+            // This is to set the fan speed variable to be 1 when the fan is off.
+            if (this.useStrings) {
+                return this.setMultiStateLegacy({ [this.dpFanOn]: false, [this.dpRotationSpeed]: this.fanDefaultSpeed.toString() }, callback);
+            } else {
+                return this.setMultiStateLegacy({ [this.dpFanOn]: false, [this.dpRotationSpeed]: this.fanDefaultSpeed }, callback);
+            }
         } else {
-            return this.setMultiStateLegacy({[this.dpFanOn]: true, [this.dpRotationSpeed]: this.convertRotationSpeedFromHomeKitToTuya(value)}, callback);            
+            // This is to set the fan speed variable to match the current speed.
+            this.fanCurrentSpeed = this.convertRotationSpeedFromHomeKitToTuya(value);
+            // This uses the multistatelegacy set command to send the fan on and speed request in one call.
+            if (this.useStrings) {
+                return this.setMultiStateLegacy({ [this.dpFanOn]: true, [this.dpRotationSpeed]: this.convertRotationSpeedFromHomeKitToTuya(value).toString() }, callback);
+            } else {
+                return this.setMultiStateLegacy({ [this.dpFanOn]: true, [this.dpRotationSpeed]: this.convertRotationSpeedFromHomeKitToTuya(value) }, callback);
+            }
         }
-      }
-      callback();
     }
 
     /*************************** LIGHT ***************************/
@@ -172,14 +167,11 @@ class SimpleFanLightAccessory extends BaseAccessory {
     }
 
     _getLightOn(dp) {
-        const {Characteristic} = this.hap;
         return dp;
     }
 
     setLightOn(value, callback) {
-        const {Characteristic} = this.hap;
         return this.setState(this.dpLightOn, value, callback);
-        callback();
     }
 
     //Lightbulb Brightness
@@ -191,14 +183,11 @@ class SimpleFanLightAccessory extends BaseAccessory {
     }
 
     _getBrightness(dp) {
-        const {Characteristic} = this.hap;
         return dp;
     }
 
     setBrightness(value, callback) {
-        const {Characteristic} = this.hap;
         return this.setState(this.dpBrightness, value, callback);
-        callback();
     }
 }
 

package/lib/SwitchAccessory.js

@@ -58,7 +58,7 @@ class SwitchAccessory extends BaseAccessory {
                 .on('set', this.setPower.bind(this, match[1]));
         });
 
-        this.device.on('change', (changes, state) => {
+        this.device.on('change', (changes, _state) => {
             Object.keys(changes).forEach(key => {
                 if (characteristics[key] && characteristics[key].value !== changes[key]) characteristics[key].updateValue(changes[key]);
             });
@@ -91,7 +91,7 @@ class SwitchAccessory extends BaseAccessory {
             async.eachSeries(callbacks, (callback, next) => {
                 try {
                     callback(err);
-                } catch (ex) { }
+                } catch (ex) { /* Intentionally empty */ }
                 next();
             });
         };

package/lib/TWLightAccessory.js

@@ -1,5 +1,5 @@
 const BaseAccessory = require('./BaseAccessory');
-const async = require('async');
+const _async = require('async');
 
 class TWLightAccessory extends BaseAccessory {
     static getCategory(Categories) {
@@ -11,7 +11,7 @@ class TWLightAccessory extends BaseAccessory {
     }
 
     _registerPlatformAccessory() {
-        const {Service} = this.hap;
+        const { Service } = this.hap;
 
         this.accessory.addService(Service.Lightbulb, this.device.context.name);
 
@@ -19,7 +19,7 @@ class TWLightAccessory extends BaseAccessory {
     }
 
     _registerCharacteristics(dps) {
-        const {Service, Characteristic, AdaptiveLightingController} = this.hap;
+        const { Service, Characteristic, AdaptiveLightingController } = this.hap;
         const service = this.accessory.getService(Service.Lightbulb);
         this._checkServiceName(service, this.device.context.name);
 

package/lib/TuyaAccessory.js

@@ -17,7 +17,7 @@ class TuyaAccessory extends EventEmitter {
 
         this.log = props.log;
 
-        this.context = {version: '3.1', port: 6668, ...props};
+        this.context = { version: '3.1', port: 6668, ...props };
 
         this.state = {};
         this._cachedBuffer = Buffer.allocUnsafe(0);
@@ -151,7 +151,7 @@ class TuyaAccessory extends EventEmitter {
 
                 endingIndex += 4;
 
-                this._msgQueue.push({msg: this._cachedBuffer.slice(0, endingIndex)});
+                this._msgQueue.push({ msg: this._cachedBuffer.slice(0, endingIndex) });
 
                 this._cachedBuffer = this._cachedBuffer.slice(endingIndex);
             } while (this._cachedBuffer.length);
@@ -189,7 +189,7 @@ class TuyaAccessory extends EventEmitter {
             }
         });
 
-        this._socket.on('close', err => {
+        this._socket.on('close', _err => {
             this.connected = false;
             this.session_key = null;
             //this.log.info('Closed connection with', this.context.name);
@@ -246,7 +246,7 @@ class TuyaAccessory extends EventEmitter {
                     const decipher = crypto.createDecipheriv('aes-128-ecb', this.context.key, '');
                     decryptedMsg = decipher.update(data.substr(19), 'base64', 'utf8');
                     decryptedMsg += decipher.final('utf8');
-                } catch(ex) {
+                } catch (ex) {
                     decryptedMsg = data.substr(19).toString('utf8');
                 }
 
@@ -339,7 +339,7 @@ class TuyaAccessory extends EventEmitter {
         let data;
         try {
             data = JSON.parse(decryptedMsg);
-        } catch(ex) {
+        } catch (ex) {
             this.log.info(`Odd message from ${this.context.name} with command ${cmd}:`, decryptedMsg);
             this.log.info(`Raw message from ${this.context.name} (${this.context.version}) with command ${cmd}:`, task.msg.toString('hex'));
             return callback();
@@ -372,8 +372,8 @@ class TuyaAccessory extends EventEmitter {
 
         const len = task.msg.length;
         if (len < 16 ||
-          task.msg.readUInt32BE(0) !== 0x000055aa ||
-          task.msg.readUInt32BE(len - 4) !== 0x0000aa55
+            task.msg.readUInt32BE(0) !== 0x000055aa ||
+            task.msg.readUInt32BE(len - 4) !== 0x0000aa55
         ) return callback();
 
         const size = task.msg.readUInt32BE(12);
@@ -407,15 +407,15 @@ class TuyaAccessory extends EventEmitter {
         decryptedMsg = decipher.update(cleanMsg);
         decipher.final();
         //remove padding
-        decryptedMsg = decryptedMsg.slice(0, (decryptedMsg.length - decryptedMsg[decryptedMsg.length-1]) );
+        decryptedMsg = decryptedMsg.slice(0, (decryptedMsg.length - decryptedMsg[decryptedMsg.length - 1]));
 
         let parsedPayload;
         try {
             if (decryptedMsg.indexOf(this.context.version) === 0) {
                 decryptedMsg = decryptedMsg.slice(15);
             }
-            let res =  JSON.parse(decryptedMsg);
-            if('data' in res) {
+            let res = JSON.parse(decryptedMsg);
+            if ('data' in res) {
                 let resdata = res.data;
                 resdata.t = res.t;
                 parsedPayload = resdata;//res.data //for compatibility with tuya-mqtt
@@ -428,7 +428,7 @@ class TuyaAccessory extends EventEmitter {
 
         if (cmd === 4) { // CommandType.RENAME_GW
             this._tmpRemoteKey = parsedPayload.subarray(0, 16);
-            const calcLocalHmac =  hmac(this._tmpLocalKey, this.session_key ?? this.context.key).toString('hex');
+            const calcLocalHmac = hmac(this._tmpLocalKey, this.session_key ?? this.context.key).toString('hex');
             const expLocalHmac = parsedPayload.slice(16, 16 + 32).toString('hex');
             if (expLocalHmac !== calcLocalHmac) {
                 throw new Error(`HMAC mismatch(keys): expected ${expLocalHmac}, was ${calcLocalHmac}. ${parsedPayload.toString('hex')}`);
@@ -442,7 +442,7 @@ class TuyaAccessory extends EventEmitter {
             clearTimeout(this._socket._connTimeout);
 
             this.session_key = Buffer.from(this._tmpLocalKey);
-            for( let i=0; i<this._tmpLocalKey.length; i++) {
+            for (let i = 0; i < this._tmpLocalKey.length; i++) {
                 this.session_key[i] = this._tmpLocalKey[i] ^ this._tmpRemoteKey[i];
             }
 
@@ -514,16 +514,16 @@ class TuyaAccessory extends EventEmitter {
                 dps
             };
             const data = this.context.version === '3.4'
-              ? {
-                  data: {
-                      ...payload,
-                      ctype: 0,
-                      t: undefined
-                  },
-                  protocol:5,
-                  t
-              }
-              : payload;
+                ? {
+                    data: {
+                        ...payload,
+                        ctype: 0,
+                        t: undefined
+                    },
+                    protocol: 5,
+                    t
+                }
+                : payload;
             result = this._send({
                 data,
                 cmd: this.context.version === '3.4' ? 13 : 7
@@ -531,7 +531,7 @@ class TuyaAccessory extends EventEmitter {
             if (result !== true) this.log.info(' Result', result);
             if (this.context.sendEmptyUpdate) {
                 //this.log.info(" Sending", this.context.name, 'empty signature');
-                this._send({cmd: this.context.version === '3.4' ? 13 : 7});
+                this._send({ cmd: this.context.version === '3.4' ? 13 : 7 });
             }
         } else {
             //this.log.info(`Sending first query to ${this.context.name} (${this.context.version})`);
@@ -558,7 +558,7 @@ class TuyaAccessory extends EventEmitter {
         });
 
         if (isNonEmptyPlainObject(changes)) {
-            this.state = {...this.state, ...data};
+            this.state = { ...this.state, ...data };
             this.emit('change', changes, this.state);
         }
     }
@@ -573,7 +573,7 @@ class TuyaAccessory extends EventEmitter {
     }
 
     _send_3_1(o) {
-        const {cmd, data} = {...o};
+        const { cmd, data } = { ...o };
 
         let msg = '';
 
@@ -608,7 +608,7 @@ class TuyaAccessory extends EventEmitter {
     }
 
     _send_3_3(o) {
-        const {cmd, data} = {...o};
+        const { cmd, data } = { ...o };
 
         // If sending empty dp-update command, we should not increment the sequence
         if (cmd !== 7 || data) this._sendCounter++;
@@ -654,7 +654,7 @@ class TuyaAccessory extends EventEmitter {
     }
 
     _send_3_4(o) {
-        let {cmd, data} = {...o};
+        let { cmd, data } = { ...o };
 
         //data
         if (!data) {
@@ -669,11 +669,11 @@ class TuyaAccessory extends EventEmitter {
         }
 
         if (cmd !== 10 &&
-          cmd !== 9 &&
-          cmd !== 16 &&
-          cmd !== 3 &&
-          cmd !== 5 &&
-          cmd !== 18) {
+            cmd !== 9 &&
+            cmd !== 16 &&
+            cmd !== 3 &&
+            cmd !== 5 &&
+            cmd !== 18) {
             // Add 3.4 header
             // check this: mqc_very_pcmcd_mcd(int a1, unsigned int a2)
             const buffer = Buffer.alloc(data.length + 15);
@@ -682,7 +682,7 @@ class TuyaAccessory extends EventEmitter {
             data = buffer;
         }
 
-        const padding=0x10 - (data.length & 0xf);
+        const padding = 0x10 - (data.length & 0xf);
         let buf34 = Buffer.alloc((data.length + padding), padding);
         data.copy(buf34);
         data = buf34;
@@ -722,7 +722,7 @@ const encrypt34 = (data, encryptKey) => {
 };
 
 const hmac = (data, hmacKey) => {
-    return crypto.createHmac('sha256',hmacKey).update(data, 'utf8').digest();
+    return crypto.createHmac('sha256', hmacKey).update(data, 'utf8').digest();
 };
 
 const crc32LookupTable = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-community",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "A Homebridge plugin to control Tuya devices locally. Community maintained version of homebridge-tuya that supports new device types.",
   "main": "index.js",
   "scripts": {
@@ -46,4 +46,4 @@
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
     "node": "^18.20.4 || ^20.15.1 || ^22"
   }
-}
+}