homebridge-zwave-usb 2.0.2 → 2.0.4

package/dist/accessories/ControllerAccessory.js

@@ -304,14 +304,20 @@ class ControllerAccessory {
                 this.exclusionService.updateCharacteristic(this.platform.Characteristic.On, false);
             },
             'heal network progress': (progress) => {
-                const done = Array.from(progress.values()).filter((v) => v !== 0).length;
+                const doneCount = Array.from(progress.values()).filter((v) => v !== 0).length;
                 const total = progress.size;
-                this.statusChar.updateValue(`Heal: ${done}/${total}`);
+                this.statusChar.updateValue(`Heal: ${doneCount}/${total}`);
+                // Safety: If we hit 100%, and the 'done' event hasn't fired yet, we'll wait for it.
+                // But if it stays at 100% and we are still 'active', the 'heal network done' handler will take care of it.
             },
             'heal network done': () => {
-                this.platform.log.info('Controller event: Heal Network Done');
+                this.platform.log.info('Controller event: Heal Network Done. Resetting UI switch.');
                 this.isHealActive = false;
-                this.healService.updateCharacteristic(this.platform.Characteristic.On, false);
+                // Use a slight delay to ensure HomeKit UI catches the state change correctly
+                setTimeout(() => {
+                    this.healService.updateCharacteristic(this.platform.Characteristic.On, false);
+                    this.platform.log.debug('Heal Network switch set to OFF');
+                }, 500);
             },
         };
         for (const [event, handler] of Object.entries(this.handlers)) {
@@ -393,7 +399,6 @@ class ControllerAccessory {
                      */
                     this.platform.log.warn('Inclusion start request returned false (possibly already active). Keeping UI state ON.');
                 }
-                this.isInclusionActive = true;
                 this.inclusionTimer = setTimeout(async () => {
                     this.platform.log.info('Inclusion Mode timed out');
                     await this.controller.stopInclusion();
@@ -444,7 +449,6 @@ class ControllerAccessory {
                 if (!started) {
                     this.platform.log.warn('Exclusion start request returned false (possibly already active). Keeping UI state ON.');
                 }
-                this.isExclusionActive = true;
                 this.exclusionTimer = setTimeout(async () => {
                     this.platform.log.info('Exclusion Mode timed out');
                     await this.controller.stopExclusion();
@@ -490,7 +494,6 @@ class ControllerAccessory {
                 if (!started) {
                     this.platform.log.warn('Heal start request returned false (possibly already active). Keeping UI state ON.');
                 }
-                this.isHealActive = true;
             }
             else {
                 this.platform.log.info('Requesting Heal Network OFF');

package/dist/zwave/ZWaveController.d.ts

@@ -25,6 +25,7 @@ export declare class ZWaveController extends EventEmitter implements IZWaveContr
     private driver;
     readonly nodes: Map<number, ZWaveNode>;
     private pendingS2Pin;
+    private healSafetyTimer;
     private nodeListeners;
     private controllerListeners;
     constructor(log: Logger, serialPort: string, options?: ZWaveControllerOptions);

package/dist/zwave/ZWaveController.js

@@ -19,6 +19,7 @@ class ZWaveController extends events_1.EventEmitter {
     driver;
     nodes = new Map();
     pendingS2Pin;
+    healSafetyTimer;
     nodeListeners = new Map();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     controllerListeners = {};
@@ -75,9 +76,24 @@ class ZWaveController extends events_1.EventEmitter {
                         this.log.info(`Heal Network Progress: ${done}/${total} nodes completed`);
                         this.emit('status updated', `Heal: ${done}/${total}`);
                         this.emit('heal network progress', progress);
+                        // Safety: if we are at 100%, but no 'done' event arrives within 5s, auto-complete
+                        if (done === total && total > 0) {
+                            if (this.healSafetyTimer) {
+                                clearTimeout(this.healSafetyTimer);
+                            }
+                            this.healSafetyTimer = setTimeout(() => {
+                                this.log.info('Heal Network Safety Timeout: Triggering completion.');
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                (this.driver?.controller).emit('rebuild routes done', new Map());
+                            }, 5000);
+                        }
                     },
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     'rebuild routes done': (result) => {
+                        if (this.healSafetyTimer) {
+                            clearTimeout(this.healSafetyTimer);
+                            this.healSafetyTimer = undefined;
+                        }
                         this.log.info('Heal Network Complete');
                         this.emit('status updated', 'Heal Network Done');
                         setTimeout(() => this.emit('status updated', 'Driver Ready'), 5000);
@@ -465,6 +481,10 @@ class ZWaveController extends events_1.EventEmitter {
     }
     async stop() {
         this.log.debug('Stopping Z-Wave controller and cleaning up listeners...');
+        if (this.healSafetyTimer) {
+            clearTimeout(this.healSafetyTimer);
+            this.healSafetyTimer = undefined;
+        }
         for (const [nodeId, node] of this.nodes) {
             const listeners = this.nodeListeners.get(nodeId);
             if (listeners) {

package/package.json

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