homebridge-zwave-usb 2.3.1 → 2.5.0

package/dist/accessories/ZWaveAccessory.d.ts

@@ -11,6 +11,10 @@ export declare class ZWaveAccessory {
     private initialized;
     constructor(platform: ZWaveUsbPlatform, node: IZWaveNode, homeId: number);
     addFeature(feature: ZWaveFeature): void;
+    /**
+     * Syncs the HomeKit name and service names when the node is renamed.
+     */
+    rename(newName: string): void;
     /**
      * HOT-RECOVERY FIX: Update stale node references.
      * When the driver restarts (hot-plug), the IZWaveNode instance changes.

package/dist/accessories/ZWaveAccessory.js

@@ -82,6 +82,24 @@ class ZWaveAccessory {
     addFeature(feature) {
         this.features.push(feature);
     }
+    /**
+     * Syncs the HomeKit name and service names when the node is renamed.
+     */
+    rename(newName) {
+        this.platform.log.info(`Syncing HomeKit name for Node ${this.node.nodeId} -> ${newName}`);
+        this.platformAccessory.displayName = newName;
+        // Update the Model and Serial if they were using the generic name
+        const model = this.node.deviceConfig?.label || newName;
+        this.platformAccessory
+            .getService(this.platform.Service.AccessoryInformation)
+            .setCharacteristic(this.platform.Characteristic.Model, model);
+        // Update all features
+        for (const feature of this.features) {
+            feature.rename(newName);
+        }
+        // Notify Homebridge of changes
+        this.platform.api.updatePlatformAccessories([this.platformAccessory]);
+    }
     /**
      * HOT-RECOVERY FIX: Update stale node references.
      * When the driver restarts (hot-plug), the IZWaveNode instance changes.

package/dist/features/ZWaveFeature.d.ts

@@ -9,6 +9,7 @@ export interface ZWaveFeature {
     getEndpointIndex(): number;
     stop(): void;
     updateNode(node: IZWaveNode, endpoint: Endpoint): void;
+    rename(newName: string): void;
 }
 export declare abstract class BaseFeature implements ZWaveFeature {
     protected readonly platform: ZWaveUsbPlatform;
@@ -21,6 +22,10 @@ export declare abstract class BaseFeature implements ZWaveFeature {
     abstract update(args?: ZWaveValueEvent): void;
     stop(): void;
     updateNode(node: IZWaveNode, endpoint: Endpoint): void;
+    /**
+     * Dynamically updates the Name characteristic of all managed services.
+     */
+    rename(newName: string): void;
     getServices(): Service[];
     getEndpointIndex(): number;
     /**

package/dist/features/ZWaveFeature.js

@@ -21,6 +21,20 @@ class BaseFeature {
         this.node = node;
         this.endpoint = endpoint;
     }
+    /**
+     * Dynamically updates the Name characteristic of all managed services.
+     */
+    rename(newName) {
+        const serviceName = this.endpoint.index > 0 ? `${newName} ${this.endpoint.index}` : newName;
+        for (const service of this.managedServices) {
+            if (service.testCharacteristic(this.platform.Characteristic.Name)) {
+                service.getCharacteristic(this.platform.Characteristic.Name).updateValue(serviceName);
+            }
+            if (service.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+                service.getCharacteristic(this.platform.Characteristic.ConfiguredName).updateValue(serviceName);
+            }
+        }
+    }
     getServices() {
         return this.managedServices;
     }
@@ -76,6 +90,11 @@ class BaseFeature {
             perms: [settings_1.HAPPerm.PAIRED_READ],
         })
             .updateValue(serviceName);
+        // Also set ConfiguredName which HomeKit often prioritizes for display
+        if (!service.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+            service.addOptionalCharacteristic(this.platform.Characteristic.ConfiguredName);
+        }
+        service.getCharacteristic(this.platform.Characteristic.ConfiguredName).updateValue(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

@@ -140,9 +140,7 @@ class ZWaveUsbPlatform {
                             // Update Homebridge Accessory Name
                             const accessory = this.zwaveAccessories.get(nodeId);
                             if (accessory) {
-                                this.log.info(`Renaming HomeKit accessory for Node ${nodeId} to: ${name}`);
-                                accessory.platformAccessory.displayName = name;
-                                this.api.updatePlatformAccessories([accessory.platformAccessory]);
+                                accessory.rename(name);
                             }
                             return sendJson({ success: true });
                         }
@@ -326,7 +324,8 @@ class ZWaveUsbPlatform {
         this.log.info(`Node ${node.nodeId} added to the network. Waiting for interview to complete...`);
     }
     handleNodeReady(node) {
-        this.log.info(`Node ${node.nodeId} ready`);
+        const nodeName = node.name || node.deviceConfig?.label || `Node ${node.nodeId}`;
+        this.log.info(`Node ${node.nodeId} (${nodeName}) ready`);
         // Skip Node 1 (the controller itself) as it's handled by ControllerAccessory
         if (Number(node.nodeId) === 1) {
             this.log.info('System: Controller node (Node 1) identified. Skipping generic accessory creation.');
@@ -345,6 +344,9 @@ class ZWaveUsbPlatform {
         if (existing || this.discoveryInFlight.has(node.nodeId)) {
             if (existing) {
                 existing.updateNode(node);
+                if (existing.platformAccessory.displayName !== nodeName) {
+                    existing.rename(nodeName);
+                }
                 existing.refresh();
             }
             return;
@@ -353,11 +355,8 @@ class ZWaveUsbPlatform {
         try {
             const accessory = AccessoryFactory_1.AccessoryFactory.create(this, node, homeId);
             this.zwaveAccessories.set(node.nodeId, accessory);
-            const nodeName = node.name || node.deviceConfig?.label || `Node ${node.nodeId}`;
             if (accessory.platformAccessory.displayName !== nodeName) {
-                this.log.info(`Renaming accessory ${accessory.platformAccessory.displayName} -> ${nodeName}`);
-                accessory.platformAccessory.displayName = nodeName;
-                this.api.updatePlatformAccessories([accessory.platformAccessory]);
+                accessory.rename(nodeName);
             }
             accessory.initialize();
         }

package/dist/zwave/ZWaveController.js

@@ -154,7 +154,8 @@ class ZWaveController extends events_1.EventEmitter {
          */
         const statusMap = ['Unknown', 'Asleep', 'Awake', 'Dead', 'Alive'];
         const status = statusMap[node.status] || node.status.toString();
-        this.log.info(`Node ${node.nodeId} added to controller (Status: ${status}, Interview Stage: ${node.interviewStage})`);
+        const nodeName = node.name || node.deviceConfig?.label || `Node ${node.nodeId}`;
+        this.log.info(`Node ${node.nodeId} (${nodeName}) added to controller (Status: ${status}, Interview Stage: ${node.interviewStage})`);
         const onReady = () => {
             this.log.info(`Node ${node.nodeId} is ready (Interview Stage: ${node.interviewStage})`);
             this.emit('status updated', `Node ${node.nodeId} Ready`);

package/package.json

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