homebridge-zwave-usb 2.3.0 → 2.4.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,17 @@ 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);
+            }
+        }
+    }
     getServices() {
         return this.managedServices;
     }

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/homebridge-ui/public/index.html

@@ -68,6 +68,29 @@
     }
     
     .btn-group .btn { margin-right: 2px; }
+
+    /* Custom Modal styles to replace native prompt/confirm */
+    .custom-modal-backdrop {
+      display: none;
+      position: fixed;
+      top: 0; left: 0; width: 100%; height: 100%;
+      background: rgba(0,0,0,0.5);
+      z-index: 1050;
+    }
+    .custom-modal {
+      display: none;
+      position: fixed;
+      top: 50%; left: 50%;
+      transform: translate(-50%, -50%);
+      background: var(--hb-background-color, #fff);
+      color: var(--hb-text-color, #212529);
+      padding: 20px;
+      border-radius: 8px;
+      box-shadow: 0 5px 15px rgba(0,0,0,0.3);
+      z-index: 1051;
+      width: 90%;
+      max-width: 400px;
+    }
   </style>
 </head>
 <body>
@@ -184,10 +207,35 @@
     </div>
   </div>
 
+  <!-- Custom Modals -->
+  <div id="modalBackdrop" class="custom-modal-backdrop"></div>
+  
+  <div id="renameModal" class="custom-modal">
+    <h6>Rename Node</h6>
+    <div class="form-group">
+      <input type="text" class="form-control" id="newLabelInput" />
+    </div>
+    <div class="text-right">
+      <button class="btn btn-sm btn-secondary" id="cancelRename">Cancel</button>
+      <button class="btn btn-sm btn-primary" id="confirmRename">Save</button>
+    </div>
+  </div>
+
+  <div id="confirmModal" class="custom-modal">
+    <h6>Confirm Action</h6>
+    <p id="confirmMessage" class="small"></p>
+    <div class="text-right">
+      <button class="btn btn-sm btn-secondary" id="cancelConfirm">Cancel</button>
+      <button class="btn btn-sm btn-primary" id="executeConfirm">OK</button>
+    </div>
+  </div>
+
   <script>
     (async () => {
       let currentConfig = {};
       let isPromptOpen = false;
+      let activeNodeId = null;
+      let activeUpdateData = null;
 
       const getInt = (id, def) => {
         const el = document.getElementById(id);
@@ -289,6 +337,22 @@
         }
       };
 
+      // Modal helpers
+      const showModal = (modalId) => {
+        document.getElementById('modalBackdrop').style.display = 'block';
+        document.getElementById(modalId).style.display = 'block';
+        isPromptOpen = true;
+      };
+
+      const hideModals = () => {
+        document.getElementById('modalBackdrop').style.display = 'none';
+        document.getElementById('renameModal').style.display = 'none';
+        document.getElementById('confirmModal').style.display = 'none';
+        isPromptOpen = false;
+        activeNodeId = null;
+        activeUpdateData = null;
+      };
+
       // Event Delegation for Table Actions (Rename & Firmware)
       document.getElementById('nodeTableBody').addEventListener('click', async (e) => {
         const target = e.target.closest('button');
@@ -300,21 +364,9 @@
         // 1. Rename Logic
         if (target.classList.contains('rename-node')) {
           const nameCell = document.getElementById(`node-name-${nodeId}`);
-          const currentName = nameCell ? nameCell.textContent : '';
-          
-          isPromptOpen = true;
-          const newName = prompt(`Enter new name for Node ${nodeId}:`, currentName);
-          isPromptOpen = false;
-
-          if (newName !== null && newName !== currentName && newName.trim() !== '') {
-            try {
-              await window.homebridge.request('rename-node', { nodeId, name: newName.trim() });
-              window.homebridge.toast.success(`Node ${nodeId} renamed to ${newName}`);
-              loadNodes();
-            } catch (err) {
-              window.homebridge.toast.error(err.message);
-            }
-          }
+          activeNodeId = nodeId;
+          document.getElementById('newLabelInput').value = nameCell ? nameCell.textContent : '';
+          showModal('renameModal');
           return;
         }
 
@@ -349,29 +401,47 @@
 
         // 3. Start Update Logic
         if (target.classList.contains('start-update')) {
-          const updateData = JSON.parse(target.getAttribute('data-update'));
-          const warning = 'WARNING: Firmware updates carry risk. Do not unplug the bridge or device during the process. Proceed?';
-
-          isPromptOpen = true;
-          const confirmed = confirm(warning);
-          isPromptOpen = false;
-          
-          if (!confirmed) return;
+          activeUpdateData = JSON.parse(target.getAttribute('data-update'));
+          activeNodeId = nodeId;
+          document.getElementById('confirmMessage').textContent = 'WARNING: Firmware updates carry risk. Do not unplug the bridge or device during the process. Proceed?';
+          showModal('confirmModal');
+        }
+      });
 
-          target.disabled = true;
-          target.innerHTML = 'Starting...';
+      // Modal Button Handlers
+      document.getElementById('cancelRename').addEventListener('click', hideModals);
+      document.getElementById('confirmRename').addEventListener('click', async () => {
+        const newName = document.getElementById('newLabelInput').value.trim();
+        const nodeId = activeNodeId;
+        hideModals();
 
+        if (newName !== '') {
           try {
-            await window.homebridge.request('start-update', { nodeId, update: updateData });
-            window.homebridge.toast.success('Firmware update started!');
+            await window.homebridge.request('rename-node', { nodeId, name: newName });
+            window.homebridge.toast.success(`Node ${nodeId} renamed to ${newName}`);
             loadNodes();
           } catch (err) {
             window.homebridge.toast.error(err.message);
-            loadNodes();
           }
         }
       });
 
+      document.getElementById('cancelConfirm').addEventListener('click', hideModals);
+      document.getElementById('executeConfirm').addEventListener('click', async () => {
+        const nodeId = activeNodeId;
+        const updateData = activeUpdateData;
+        hideModals();
+
+        try {
+          await window.homebridge.request('start-update', { nodeId, update: updateData });
+          window.homebridge.toast.success('Firmware update started!');
+          loadNodes();
+        } catch (err) {
+          window.homebridge.toast.error(err.message);
+          loadNodes();
+        }
+      });
+
       const init = async () => {
         if (!window.homebridge) return;
 

package/package.json

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