homebridge-zwave-usb 2.7.0 → 2.8.4

package/dist/accessories/ZWaveAccessory.js

@@ -39,13 +39,13 @@ class ZWaveAccessory {
             }
         }
         const existingAccessory = this.platform.accessories.find((accessory) => accessory.UUID === uuid);
+        const nodeName = this.node.name || this.node.deviceConfig?.label || `Node ${this.node.nodeId}`;
         if (existingAccessory) {
             this.platformAccessory = existingAccessory;
         }
         else {
-            const accessoryName = `Node ${this.node.nodeId}`;
-            this.platform.log.info(`Creating new accessory for ${accessoryName} (UUID: ${uuid})`);
-            this.platformAccessory = new this.platform.api.platformAccessory(accessoryName, uuid);
+            this.platform.log.info(`Creating new accessory for ${nodeName} (UUID: ${uuid})`);
+            this.platformAccessory = new this.platform.api.platformAccessory(nodeName, uuid);
             this.platform.api.registerPlatformAccessories('homebridge-zwave-usb', 'ZWaveUSB', [
                 this.platformAccessory,
             ]);
@@ -53,12 +53,16 @@ class ZWaveAccessory {
         }
         // Set accessory information
         const manufacturer = this.node.deviceConfig?.manufacturer || 'Unknown';
-        const model = this.node.deviceConfig?.label || `Node ${this.node.nodeId}`;
-        this.platformAccessory
-            .getService(this.platform.Service.AccessoryInformation)
+        const model = this.node.deviceConfig?.label || nodeName;
+        const infoService = this.platformAccessory.getService(this.platform.Service.AccessoryInformation);
+        infoService
             .setCharacteristic(this.platform.Characteristic.Manufacturer, manufacturer)
             .setCharacteristic(this.platform.Characteristic.Model, model)
             .setCharacteristic(this.platform.Characteristic.SerialNumber, `Node ${this.node.nodeId}`);
+        if (!infoService.testCharacteristic(this.platform.Characteristic.Name)) {
+            infoService.addOptionalCharacteristic(this.platform.Characteristic.Name);
+        }
+        infoService.updateCharacteristic(this.platform.Characteristic.Name, nodeName);
         /**
          * Helper to normalize UUIDs for reliable comparison during metadata pruning.
          */
@@ -96,11 +100,13 @@ class ZWaveAccessory {
         infoService.getCharacteristic(this.platform.Characteristic.Name)
             .setProps({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            format: settings_1.HAPFormat.STRING,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             perms: [settings_1.HAPPerm.PAIRED_READ, settings_1.HAPPerm.NOTIFY],
         });
         infoService.updateCharacteristic(this.platform.Characteristic.Name, newName);
+        // Force metadata invalidation by updating the revision
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const version = require('../../package.json').version;
+        infoService.updateCharacteristic(this.platform.Characteristic.SoftwareRevision, version);
         // Update the Model and Serial if they were using the generic name
         const model = this.node.deviceConfig?.label || newName;
         infoService.setCharacteristic(this.platform.Characteristic.Model, model);

package/dist/features/ZWaveFeature.js

@@ -26,6 +26,7 @@ class BaseFeature {
      */
     rename(newName) {
         const serviceName = this.endpoint.index > 0 ? `${newName} ${this.endpoint.index}` : newName;
+        this.platform.log.debug(`Feature Rename [Node ${this.node.nodeId}]: Updating ${this.managedServices.length} services to "${serviceName}"`);
         for (const service of this.managedServices) {
             if (service.testCharacteristic(this.platform.Characteristic.Name)) {
                 service.updateCharacteristic(this.platform.Characteristic.Name, serviceName);
@@ -80,29 +81,28 @@ class BaseFeature {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this.accessory.addService(new serviceType(serviceName));
         }
-        // Explicitly set the name characteristic to ensure it's displayed correctly
-        const nameChar = service.getCharacteristic(this.platform.Characteristic.Name);
-        nameChar
-            .setProps({
+        // Mark the first functional service as primary to help HomeKit with naming/tiles
+        if (this.managedServices.length === 0) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            format: settings_1.HAPFormat.STRING,
+            service.setPrimaryService(true);
+        }
+        // Explicitly set the name characteristic with NOTIFY to ensure it's displayed correctly
+        service.getCharacteristic(this.platform.Characteristic.Name)
+            .setProps({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             perms: [settings_1.HAPPerm.PAIRED_READ, settings_1.HAPPerm.NOTIFY],
-        })
-            .updateValue(serviceName);
+        });
+        service.updateCharacteristic(this.platform.Characteristic.Name, serviceName);
         // Also set ConfiguredName which many HomeKit versions prioritize for plugin-side renaming
         if (!service.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
             service.addOptionalCharacteristic(this.platform.Characteristic.ConfiguredName);
         }
-        service
-            .getCharacteristic(this.platform.Characteristic.ConfiguredName)
+        service.getCharacteristic(this.platform.Characteristic.ConfiguredName)
             .setProps({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            format: settings_1.HAPFormat.STRING,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             perms: [settings_1.HAPPerm.PAIRED_READ, settings_1.HAPPerm.NOTIFY],
-        })
-            .updateValue(serviceName);
+        });
+        service.updateCharacteristic(this.platform.Characteristic.ConfiguredName, serviceName);
         // Add Service Label Index for multi-endpoint devices to help with ordering/naming
         if (this.endpoint.index > 0) {
             if (!service.testCharacteristic(this.platform.Characteristic.ServiceLabelIndex)) {

package/dist/platform/ZWaveUsbPlatform.js

@@ -344,7 +344,8 @@ class ZWaveUsbPlatform {
         if (existing || this.discoveryInFlight.has(node.nodeId)) {
             if (existing) {
                 existing.updateNode(node);
-                if (existing.platformAccessory.displayName !== nodeName) {
+                // Force sync names on every ready event if we have a friendly name
+                if (node.name) {
                     existing.rename(nodeName);
                 }
                 existing.refresh();
@@ -355,10 +356,9 @@ class ZWaveUsbPlatform {
         try {
             const accessory = AccessoryFactory_1.AccessoryFactory.create(this, node, homeId);
             this.zwaveAccessories.set(node.nodeId, accessory);
-            if (accessory.platformAccessory.displayName !== nodeName) {
-                accessory.rename(nodeName);
-            }
-            accessory.initialize();
+            accessory.initialize(); // Initialize first to create functional services
+            // Force sync names immediately after initialization
+            accessory.rename(nodeName);
         }
         finally {
             this.discoveryInFlight.delete(node.nodeId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-zwave-usb",
   "displayName": "Homebridge Z-Wave USB",
-  "version": "2.7.0",
+  "version": "2.8.4",
   "description": "A Homebridge dynamic platform plugin for Z-Wave USB controllers using zwave-js.",
   "license": "Polyform-Noncommercial-1.0.0",
   "funding": {