homebridge-tuya-plus 3.4.0 → 3.5.1

package/Readme.MD

@@ -43,7 +43,7 @@ A community-maintained Homebridge plugin for controlling Tuya devices locally ov
   * Color<sup>[12](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#white-and-color-light-bulbs)</sup> (Hue, Saturation, Adaptive Lighting)
 * Oil Diffusers<sup>[13](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
 * Outlets<sup>[14](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#outlets)</sup>
-* Switches<sup>[15](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md)</sup>
+* Switches<sup>[15](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#switch)</sup>
 * Vertical Blinds<sup>[16](https://github.com/adrianjagielak/homebridge-tuya-plus/blob/main/wiki/Supported-Device-Types.md#vertical-blinds-with-tilt)</sup>
 
 Note: Motion, and other sensor types don't behave well with responce requests, so they will not be added. 

package/config.schema.json

@@ -30,6 +30,10 @@
                   "title": "Please select device type...",
                   "enum": ["null"]
                 },
+                {
+                  "title": "Switch Gang / Basic Switch",
+                  "enum": ["Switch"]
+                },                
                 {
                   "title": "Smart Plug / Barely Smart Power Strip",
                   "enum": ["Outlet"]
@@ -147,6 +151,13 @@
                 "functionBody": "return model.devices && model.devices[arrayIndices].type !== 'null';"
               }
             },
+            "switchCount": {
+              "type": "integer",
+              "placeholder": "3",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['Switch'].includes(model.devices[arrayIndices].type);"
+              }
+            },
             "voltsId": {
               "type": "integer",
               "placeholder": "9",

package/index.js

@@ -25,8 +25,12 @@ const OilDiffuserAccessory = require('./lib/OilDiffuserAccessory');
 const DoorbellAccessory = require('./lib/DoorbellAccessory');
 const VerticalBlindsWithTilt = require('./lib/VerticalBlindsWithTilt');
 
-const PLUGIN_NAME = 'homebridge-tuya';
+const PLUGIN_NAME = 'homebridge-tuya-plus';
 const PLATFORM_NAME = 'TuyaLan';
+// Seed used to derive accessory UUIDs. Must remain 'homebridge-tuya' so that
+// devices already paired with HomeKit keep their existing identity (names,
+// rooms, automations).
+const UUID_SEED = 'homebridge-tuya';
 const DEFAULT_DISCOVER_TIMEOUT = 60000;
 
 const CLASS_DEF = {
@@ -55,12 +59,12 @@ const CLASS_DEF = {
     verticalblindswithtilt: VerticalBlindsWithTilt
 };
 
-let Characteristic, PlatformAccessory, Service, Categories, AdaptiveLightingController, UUID;
+let Characteristic, Formats, Perms, Categories, PlatformAccessory, Service, AdaptiveLightingController, UUID;
 
 module.exports = function(homebridge) {
     ({
         platformAccessory: PlatformAccessory,
-        hap: {Characteristic, Service, AdaptiveLightingController, Accessory: {Categories}, uuid: UUID}
+        hap: {Characteristic, Formats, Perms, Categories, Service, AdaptiveLightingController, uuid: UUID}
     } = homebridge);
 
     homebridge.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, TuyaLan, true);
@@ -71,14 +75,14 @@ class TuyaLan {
         [this.log, this.config, this.api] = [...props];
 
         this.cachedAccessories = new Map();
-        this.api.hap.EnergyCharacteristics = require('./lib/EnergyCharacteristics')(this.api.hap.Characteristic);
+        this.api.hap.EnergyCharacteristics = require('./lib/EnergyCharacteristics')(this.api.hap);
 
         if(!this.config || !this.config.devices) {
             this.log("No devices found. Check that you have specified them in your config.json file.");
             return false;
         }
 
-        this._expectedUUIDs = this.config.devices.map(device => UUID.generate(PLUGIN_NAME +(device.fake ? ':fake:' : ':') + device.id));
+        this._expectedUUIDs = this.config.devices.map(device => UUID.generate(UUID_SEED +(device.fake ? ':fake:' : ':') + device.id));
 
         this.api.on('didFinishLaunching', () => {
             this.discoverDevices();
@@ -122,7 +126,7 @@ class TuyaLan {
                 const device = new TuyaAccessory({
                     ...devices[config.id], ...config,
                     log: this.log,
-                    UUID: UUID.generate(PLUGIN_NAME + ':' + config.id),
+                    UUID: UUID.generate(UUID_SEED + ':' + config.id),
                     connect: false
                 });
                 this.addAccessory(device);
@@ -133,7 +137,7 @@ class TuyaLan {
             this.addAccessory(new TuyaAccessory({
                 ...config,
                 log: this.log,
-                UUID: UUID.generate(PLUGIN_NAME + ':fake:' + config.id),
+                UUID: UUID.generate(UUID_SEED + ':fake:' + config.id),
                 connect: false
             }));
         });
@@ -149,7 +153,7 @@ class TuyaLan {
                     const device = new TuyaAccessory({
                         ...devices[deviceId],
                         log: this.log,
-                        UUID: UUID.generate(PLUGIN_NAME + ':' + deviceId),
+                        UUID: UUID.generate(UUID_SEED + ':' + deviceId),
                         connect: false
                     });
                     this.addAccessory(device);
@@ -174,7 +178,7 @@ class TuyaLan {
                     if (!characteristic.props ||
                         !Array.isArray(characteristic.props.perms) ||
                         characteristic.props.perms.length !== 3 ||
-                        !(characteristic.props.perms.includes(Characteristic.Perms.WRITE) && characteristic.props.perms.includes(Characteristic.Perms.NOTIFY))
+                        !(characteristic.props.perms.includes(Perms.WRITE) && characteristic.props.perms.includes(Perms.NOTIFY))
                     ) return;
 
                     this.log.info('Marked %s unreachable by faulting Service.%s.%s', accessory.displayName, service.displayName, characteristic.displayName);
@@ -236,7 +240,7 @@ class TuyaLan {
         this.log.warn('Unregistering', homebridgeAccessory.displayName);
 
         delete this.cachedAccessories[homebridgeAccessory.UUID];
-        this.api.unregisterPlatformAccessories(PLATFORM_NAME, PLATFORM_NAME, [homebridgeAccessory]);
+        this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [homebridgeAccessory]);
     }
 
     removeAccessoryByUUID(uuid) {