homebridge-zwave-usb 2.9.7 → 3.0.3

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/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/ZWaveController.d.ts

@@ -56,9 +56,10 @@ export declare class ZWaveController extends EventEmitter implements IZWaveContr
     removeFailedNode(nodeId: number): Promise<void>;
     /**
      * Updates the user-defined name for a node in the Z-Wave network.
-     * This name is persisted by Z-Wave JS in its cache files.
+     * This uses the Node Naming and Location CC to send the name to the device.
+     * If the device doesn't support this CC, falls back to local-only storage.
      */
-    setNodeName(nodeId: number, name: string): void;
+    setNodeName(nodeId: number, name: string): Promise<void>;
     getAvailableFirmwareUpdates(nodeId: number): Promise<unknown[]>;
     beginFirmwareUpdate(nodeId: number, update: unknown): Promise<void>;
     abortFirmwareUpdate(nodeId: number): Promise<void>;

package/dist/zwave/ZWaveController.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZWaveController = void 0;
 const zwave_js_1 = require("zwave-js");
+const core_1 = require("@zwave-js/core");
 const events_1 = require("events");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
@@ -673,15 +674,26 @@ class ZWaveController extends events_1.EventEmitter {
     }
     /**
      * Updates the user-defined name for a node in the Z-Wave network.
-     * This name is persisted by Z-Wave JS in its cache files.
+     * This uses the Node Naming and Location CC to send the name to the device.
+     * If the device doesn't support this CC, falls back to local-only storage.
      */
-    setNodeName(nodeId, name) {
+    async setNodeName(nodeId, name) {
         const node = this.nodes.get(nodeId);
         if (!node) {
             throw new Error(`Node ${nodeId} not found`);
         }
         this.log.info(`Updating name for Node ${nodeId} to: "${name}"`);
-        node.name = name;
+        // Check if the device supports Node Naming and Location CC (0x77)
+        const supportsNamingCC = typeof node.supportsCC === 'function' &&
+            node.supportsCC(core_1.CommandClasses['Node Naming and Location']);
+        if (supportsNamingCC) {
+            await node.commandClasses['Node Naming and Location'].setName(name);
+        }
+        else {
+            // Fall back to local-only storage if CC is not supported
+            this.log.warn(`Node ${nodeId} does not support Node Naming and Location CC, storing name locally only`);
+            node.name = name;
+        }
     }
     async getAvailableFirmwareUpdates(nodeId) {
         if (nodeId === 1) {

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.7",
+  "version": "3.0.3",
   "description": "A Homebridge dynamic platform plugin for Z-Wave USB controllers using zwave-js.",
   "license": "Polyform-Noncommercial-1.0.0",
   "funding": {