homebridge-tydom 0.24.0 → 0.24.1

package/lib/accessories/securitySystem.js

@@ -100,10 +100,10 @@ const setupSecuritySystem = async (accessory, controller) => {
         log.warn(`Setting up legacy zones`);
         // @NOTE could filter "UNUSED" zones from initialData
         zones = [
-            { id: 1, nameCustom: 'Zone 1' },
-            { id: 2, nameCustom: 'Zone 2' },
-            { id: 3, nameCustom: 'Zone 3' },
-            { id: 4, nameCustom: 'Zone 4' }
+            { id: 0, nameCustom: 'Zone 1' },
+            { id: 1, nameCustom: 'Zone 2' },
+            { id: 2, nameCustom: 'Zone 3' },
+            { id: 3, nameCustom: 'Zone 4' }
         ];
     }
     // Pin code check

package/lib/controller.js

@@ -112,6 +112,9 @@ class TydomController extends events_1.EventEmitter {
             if (excludedDevices.length && (0, utils_1.stringIncludes)(excludedDevices, deviceId)) {
                 return;
             }
+            if (categoryFromSettings) {
+                this.log.info(`Using overriden category=${(0, utils_1.chalkNumber)(categoryFromSettings)} from settings for deviceId=${(0, utils_1.chalkNumber)(deviceId)} and endpointId=${(0, utils_1.chalkNumber)(endpointId)}`);
+            }
             const category = categoryFromSettings || (0, tydom_1.resolveEndpointCategory)({ firstUsage, metadata, settings: deviceSettings });
             if (!category) {
                 this.log.warn(`Unsupported firstUsage="${firstUsage}" for endpoint with deviceId="${deviceId}"`);

package/lib/platform.js

@@ -48,16 +48,25 @@ class TydomPlatform {
         this.log.info(`Properly loaded ${this.accessories.size}-accessories`);
     }
     async handleControllerDevice(context) {
+        var _a, _b;
         const { name, deviceId, category, accessoryId } = context;
         const id = this.api.hap.uuid.generate(accessoryId);
         this.log.info(`Found new tydom device named=${(0, utils_1.chalkString)(name)} with deviceId=${(0, utils_1.chalkNumber)(deviceId)} (id=${(0, utils_1.chalkKeyword)(id)})`);
         this.log.debug(`Tydom with deviceId=${(0, utils_1.chalkNumber)(deviceId)} (id=${(0, utils_1.chalkKeyword)(id)}) context="${JSON.stringify(context)}"`);
+        const hasNewCategory = ((_a = this.accessories.get(id)) === null || _a === void 0 ? void 0 : _a.category) !== category;
+        (0, utils_1.debug)(`[${deviceId}] ${(_b = this.accessories.get(id)) === null || _b === void 0 ? void 0 : _b.category} vs ${category}`);
         // Prevent automatic cleanup
         this.cleanupAccessoriesIds.delete(id);
         if (this.accessories.has(id)) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            await this.updateAccessory(this.accessories.get(id), context);
-            return;
+            if (!hasNewCategory) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                await this.updateAccessory(this.accessories.get(id), context);
+                return;
+            }
+            else {
+                this.log.warn(`Deleting accessory with new category with id=${(0, utils_1.chalkNumber)(accessoryId)}`);
+                this.api.unregisterPlatformAccessories(env_1.PLUGIN_NAME, env_1.PLATFORM_NAME, [this.accessories.get(id)]);
+            }
         }
         const accessory = await this.createAccessory(name, id, category, context);
         this.accessories.set(id, accessory);
@@ -94,15 +103,15 @@ class TydomPlatform {
         const { platformAccessory: PlatformAccessory } = this.api;
         const { group } = context;
         const accessoryName = category === 13 /* Categories.WINDOW */ && group ? group.name || name : name;
-        this.log.info(`Creating accessory named="${accessoryName}" with id="${id}", deviceId="${context.deviceId}"`);
+        this.log.info(`Creating accessory named=${(0, utils_1.chalkString)(accessoryName)}, deviceId="${(0, utils_1.chalkNumber)(context.deviceId)} (id=${(0, utils_1.chalkKeyword)(id)})"`);
         const accessory = new PlatformAccessory(accessoryName, id, category);
         Object.assign(accessory.context, context);
         await this.updateAccessory(accessory, context);
         return accessory;
     }
     async updateAccessory(accessory, context) {
-        const { displayName: name, UUID: id } = accessory;
-        this.log.info(`Updating accessory named="${name}" with id="${id}", deviceId="${context.deviceId}"`);
+        const { displayName: accessoryName, UUID: id } = accessory;
+        this.log.info(`Updating accessory named=${(0, utils_1.chalkString)(accessoryName)}, deviceId=${(0, utils_1.chalkNumber)(context.deviceId)} (id=${(0, utils_1.chalkKeyword)(id)})"`);
         Object.assign(accessory.context, context);
         const tydomAccessorySetup = (0, accessory_1.getTydomAccessorySetup)(accessory, context);
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tydom",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Homebridge plugin to manage Tydom devices by Delta Dore",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",