homebridge-zwave-usb 2.9.6 → 3.0.2

package/dist/accessories/ZWaveAccessory.js

@@ -61,21 +61,11 @@ class ZWaveAccessory {
         const model = this.node.deviceConfig?.label || `Node ${this.node.nodeId}`;
         const serial = `Node ${this.node.nodeId}`;
         const infoService = this.platformAccessory.getService(this.platform.Service.AccessoryInformation);
-        if (infoService.getCharacteristic(this.platform.Characteristic.Manufacturer).value !== manufacturer) {
-            infoService.updateCharacteristic(this.platform.Characteristic.Manufacturer, manufacturer);
-        }
-        if (infoService.getCharacteristic(this.platform.Characteristic.Model).value !== model) {
-            infoService.updateCharacteristic(this.platform.Characteristic.Model, model);
-        }
-        if (infoService.getCharacteristic(this.platform.Characteristic.SerialNumber).value !== serial) {
-            infoService.updateCharacteristic(this.platform.Characteristic.SerialNumber, serial);
-        }
-        // Add ServiceLabelNamespace to help with naming multi-service accessories
-        if (!infoService.testCharacteristic(this.platform.Characteristic.ServiceLabelNamespace)) {
-            infoService.addOptionalCharacteristic(this.platform.Characteristic.ServiceLabelNamespace);
-        }
-        // 1 = Arabic numerals (1, 2, 3...)
-        infoService.updateCharacteristic(this.platform.Characteristic.ServiceLabelNamespace, 1);
+        infoService
+            .setCharacteristic(this.platform.Characteristic.Manufacturer, manufacturer)
+            .setCharacteristic(this.platform.Characteristic.Model, model)
+            .setCharacteristic(this.platform.Characteristic.SerialNumber, serial)
+            .setCharacteristic(this.platform.Characteristic.FirmwareRevision, this.node.firmwareVersion || '1.0.0');
         /**
          * Helper to normalize UUIDs for reliable comparison during metadata pruning.
          */
@@ -105,18 +95,6 @@ class ZWaveAccessory {
     rename(newName) {
         this.platform.log.info(`Syncing HomeKit name for Node ${this.node.nodeId} -> ${newName}`);
         this.platformAccessory.displayName = newName;
-        // Update the Accessory Information Service (Standard Characteristics Only)
-        const infoService = this.platformAccessory.getService(this.platform.Service.AccessoryInformation);
-        // Update Name (NOTIFY removed to respect user overrides)
-        if (!infoService.testCharacteristic(this.platform.Characteristic.Name)) {
-            infoService.addOptionalCharacteristic(this.platform.Characteristic.Name);
-        }
-        const nameChar = infoService.getCharacteristic(this.platform.Characteristic.Name);
-        nameChar.setProps({
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            perms: [settings_1.HAPPerm.PAIRED_READ],
-        });
-        nameChar.updateValue(newName);
         // Update all features
         for (const feature of this.features) {
             feature.rename(newName);

package/dist/features/ZWaveFeature.js

@@ -38,14 +38,6 @@ class BaseFeature {
                 });
                 nameChar.updateValue(serviceName);
             }
-            if (service.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                const configuredNameChar = service.getCharacteristic(this.platform.Characteristic.ConfiguredName);
-                configuredNameChar.setProps({
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    perms: [settings_1.HAPPerm.PAIRED_READ, settings_1.HAPPerm.PAIRED_WRITE, settings_1.HAPPerm.NOTIFY],
-                });
-                configuredNameChar.updateValue(serviceName);
-            }
         }
     }
     getServices() {
@@ -95,25 +87,19 @@ class BaseFeature {
         }
         // Sync internal property
         service.displayName = serviceName;
-        // 1. Standard Name: Notify removed (HAP Docs Compliance: Name is typically static read-only for display)
+        // 1. Standard Name: Notify removed
         if (service.testCharacteristic(this.platform.Characteristic.Name)) {
             const nameChar = service.getCharacteristic(this.platform.Characteristic.Name);
             nameChar.setProps({
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 perms: [settings_1.HAPPerm.PAIRED_READ],
             });
-            nameChar.updateValue(serviceName);
-        }
-        // 2. ConfiguredName: Read/Write/Notify (Critical for Settings/Renaming support)
-        if (!service.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-            service.addOptionalCharacteristic(this.platform.Characteristic.ConfiguredName);
+            // Only update if current value is generic "Node X" to respect user overrides
+            const currentValue = nameChar.value;
+            if (!currentValue || currentValue.startsWith('Node ')) {
+                nameChar.updateValue(serviceName);
+            }
         }
-        const configuredNameChar = service.getCharacteristic(this.platform.Characteristic.ConfiguredName);
-        configuredNameChar.setProps({
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            perms: [settings_1.HAPPerm.PAIRED_READ, settings_1.HAPPerm.PAIRED_WRITE, settings_1.HAPPerm.NOTIFY],
-        });
-        configuredNameChar.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

@@ -344,8 +344,10 @@ class ZWaveUsbPlatform {
         if (existing || this.discoveryInFlight.has(node.nodeId)) {
             if (existing) {
                 existing.updateNode(node);
-                // Force sync names on every ready event if we have a friendly name
-                if (node.name) {
+                // Only sync name if it has actually changed in the Z-Wave network
+                // This prevents overwriting user-defined names in HomeKit on every startup
+                if (existing.platformAccessory.displayName !== nodeName) {
+                    this.log.info(`Node ${node.nodeId} name changed: "${existing.platformAccessory.displayName}" -> "${nodeName}"`);
                     existing.rename(nodeName);
                 }
                 existing.refresh();

package/dist/zwave/interfaces.d.ts

@@ -50,6 +50,7 @@ export interface IZWaveNode {
     ready: boolean;
     interviewStage: InterviewStage;
     status: number;
+    firmwareVersion?: string;
     getValue(valueId: ValueID): unknown;
     setValue(valueId: ValueID, value: unknown): Promise<SetValueResult>;
     supportsCC(cc: number): boolean;

package/package.json

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