homebridge-tuya-plus 3.5.0 → 3.5.2

package/index.js

@@ -27,6 +27,10 @@ const VerticalBlindsWithTilt = require('./lib/VerticalBlindsWithTilt');
 
 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 = {
@@ -78,7 +82,7 @@ class TuyaLan {
             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);

package/lib/CustomMultiOutletAccessory.js

@@ -30,7 +30,7 @@ class CustomMultiOutletAccessory extends BaseAccessory {
                 throw new Error('The outlet definition #${i} is missing or is malformed: ' + outlet);
 
             const name = ((outlet.name || '').trim() || 'Unnamed') + ' - ' + this.device.context.name;
-            let service = this.accessory.getServiceById(Service.Outlet.UUID, 'outlet ' + outlet.dp);
+            let service = this.accessory.getServiceById(Service.Outlet, 'outlet ' + outlet.dp);
             if (service) this._checkServiceName(service, name);
             else service = this.accessory.addService(Service.Outlet, name, 'outlet ' + outlet.dp);
 

package/lib/MultiOutletAccessory.js

@@ -24,7 +24,7 @@ class MultiOutletAccessory extends BaseAccessory {
         const outletCount = parseInt(this.device.context.outletCount) || 1;
         const _validServices = [];
         for (let i = 0; i++ < outletCount;) {
-            let service = this.accessory.getServiceById(Service.Outlet.UUID, 'outlet ' + i);
+            let service = this.accessory.getServiceById(Service.Outlet, 'outlet ' + i);
             if (service) this._checkServiceName(service, this.device.context.name + ' ' + i);
             else service = this.accessory.addService(Service.Outlet, this.device.context.name + ' ' + i, 'outlet ' + i);
 

package/lib/OilDiffuserAccessory.js

@@ -34,12 +34,12 @@ class OilDiffuserAccessory extends BaseAccessory {
         const {Service} = this.hap;
 
         const humidifierName = this.device.context.name;
-        let humidifierService = this.accessory.getServiceById(Service.HumidifierDehumidifier.UUID, 'humidifier');
+        let humidifierService = this.accessory.getServiceById(Service.HumidifierDehumidifier, 'humidifier');
         if (humidifierService) this._checkServiceName(humidifierService, humidifierName);
         else humidifierService = this.accessory.addService(Service.HumidifierDehumidifier, humidifierName, 'humidifier');
 
         const lightName = this.device.context.name + ' Light';
-        let lightService = this.accessory.getServiceById(Service.Lightbulb.UUID, 'lightbulb');
+        let lightService = this.accessory.getServiceById(Service.Lightbulb, 'lightbulb');
         if (lightService) this._checkServiceName(lightService, lightName);
         else lightService = this.accessory.addService(Service.Lightbulb, lightName, 'lightbulb');
 
@@ -55,8 +55,8 @@ class OilDiffuserAccessory extends BaseAccessory {
 
         const {Service, AdaptiveLightingController, Characteristic} = this.hap;
 
-        const humidifierService = this.accessory.getServiceById(Service.HumidifierDehumidifier.UUID, 'humidifier');
-        const lightService = this.accessory.getServiceById(Service.Lightbulb.UUID, 'lightbulb');
+        const humidifierService = this.accessory.getServiceById(Service.HumidifierDehumidifier, 'humidifier');
+        const lightService = this.accessory.getServiceById(Service.Lightbulb, 'lightbulb');
 
         this.dpLight = this._getCustomDP(this.device.context.dpLight) || '5';
         this.dpMode = this._getCustomDP(this.device.context.dpMode) || '6';

package/lib/RGBTWOutletAccessory.js

@@ -22,12 +22,12 @@ class RGBTWOutletAccessory extends BaseAccessory {
         const {Service} = this.hap;
 
         const outletName = 'Outlet - ' + this.device.context.name;
-        let outletService = this.accessory.getServiceById(Service.Outlet.UUID, 'outlet');
+        let outletService = this.accessory.getServiceById(Service.Outlet, 'outlet');
         if (outletService) this._checkServiceName(outletService, outletName);
         else outletService = this.accessory.addService(Service.Outlet, outletName, 'outlet');
 
         const lightName = 'RGBTWLight - ' + this.device.context.name;
-        let lightService = this.accessory.getServiceById(Service.Lightbulb.UUID, 'lightbulb');
+        let lightService = this.accessory.getServiceById(Service.Lightbulb, 'lightbulb');
         if (lightService) this._checkServiceName(lightService, lightName);
         else lightService = this.accessory.addService(Service.Lightbulb, lightName, 'lightbulb');
 
@@ -43,8 +43,8 @@ class RGBTWOutletAccessory extends BaseAccessory {
 
         const {Service, Characteristic, EnergyCharacteristics} = this.hap;
 
-        const outletService = this.accessory.getServiceById(Service.Outlet.UUID, 'outlet');
-        const lightService = this.accessory.getServiceById(Service.Lightbulb.UUID, 'lightbulb');
+        const outletService = this.accessory.getServiceById(Service.Outlet, 'outlet');
+        const lightService = this.accessory.getServiceById(Service.Lightbulb, 'lightbulb');
 
         this.dpLight = this._getCustomDP(this.device.context.dpLight) || '1';
         this.dpMode = this._getCustomDP(this.device.context.dpMode) || '2';

package/lib/SwitchAccessory.js

@@ -24,7 +24,7 @@ class SwitchAccessory extends BaseAccessory {
         const switchCount = parseInt(this.device.context.switchCount) || 1;
         const _validServices = [];
         for (let i = 0; i++ < switchCount;) {
-            let service = this.accessory.getServiceById(Service.Switch.UUID, 'switch ' + i);
+            let service = this.accessory.getServiceById(Service.Switch, 'switch ' + i);
             if (service) this._checkServiceName(service, this.device.context.name + ' ' + i);
             else service = this.accessory.addService(Service.Switch, this.device.context.name + ' ' + i, 'switch ' + i);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "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": {