homebridge-zwave-usb 1.2.2 → 1.2.5

package/dist/accessories/ControllerAccessory.js

@@ -14,7 +14,7 @@ class ControllerAccessory {
         this.platform = platform;
         this.controller = controller;
         const homeId = this.controller.homeId;
-        const uuid = this.platform.api.hap.uuid.generate(`ZWaveController-${homeId}`);
+        const uuid = this.platform.api.hap.uuid.generate(`homebridge-zwave-usb-controller-${homeId}`);
         const existingAccessory = this.platform.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             this.platformAccessory = existingAccessory;
@@ -25,6 +25,11 @@ class ControllerAccessory {
             this.platform.api.registerPlatformAccessories('homebridge-zwave-usb', 'ZWaveUSB', [this.platformAccessory]);
             this.platform.accessories.push(this.platformAccessory);
         }
+        // Set accessory information
+        this.platformAccessory.getService(this.platform.Service.AccessoryInformation)
+            .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Aeotec / Z-Wave JS')
+            .setCharacteristic(this.platform.Characteristic.Model, 'Z-Wave USB Controller')
+            .setCharacteristic(this.platform.Characteristic.SerialNumber, homeId?.toString() || 'Unknown');
         this.inclusionService =
             this.platformAccessory.getService('Inclusion Mode') ||
                 this.platformAccessory.addService(this.platform.Service.Switch, 'Inclusion Mode', 'Inclusion');

package/dist/accessories/ZWaveAccessory.js

@@ -24,6 +24,13 @@ class ZWaveAccessory {
             this.platform.api.registerPlatformAccessories('homebridge-zwave-usb', 'ZWaveUSB', [this.platformAccessory]);
             this.platform.accessories.push(this.platformAccessory);
         }
+        // Set accessory information
+        const manufacturer = this.node.deviceConfig?.manufacturer || 'Unknown';
+        const model = this.node.deviceConfig?.label || `Node ${this.node.nodeId}`;
+        this.platformAccessory.getService(this.platform.Service.AccessoryInformation)
+            .setCharacteristic(this.platform.Characteristic.Manufacturer, manufacturer)
+            .setCharacteristic(this.platform.Characteristic.Model, model)
+            .setCharacteristic(this.platform.Characteristic.SerialNumber, `Node ${this.node.nodeId}`);
     }
     addFeature(feature) {
         this.features.push(feature);

package/dist/features/BatteryFeature.js

@@ -26,7 +26,7 @@ class BatteryFeature extends ZWaveFeature_1.BaseFeature {
             property: 'level',
             endpoint: this.endpoint.index,
         });
-        return typeof value === 'number' ? value : 0;
+        return typeof value === 'number' ? Math.max(0, Math.min(value, 100)) : -1;
     }
     getStatusLowBattery() {
         const value = this.node.getValue({

package/dist/features/MultilevelSwitchFeature.d.ts

@@ -1,6 +1,7 @@
 import { BaseFeature } from './ZWaveFeature';
 export declare class MultilevelSwitchFeature extends BaseFeature {
     private service;
+    private lastKnownBrightness;
     init(): void;
     update(): void;
     private handleGetOn;

package/dist/features/MultilevelSwitchFeature.js

@@ -4,6 +4,7 @@ exports.MultilevelSwitchFeature = void 0;
 const ZWaveFeature_1 = require("./ZWaveFeature");
 class MultilevelSwitchFeature extends ZWaveFeature_1.BaseFeature {
     service;
+    lastKnownBrightness = 0;
     init() {
         const subType = this.endpoint.index.toString();
         this.service = this.getService(this.platform.Service.Lightbulb, undefined, subType);
@@ -25,13 +26,15 @@ class MultilevelSwitchFeature extends ZWaveFeature_1.BaseFeature {
         if (typeof value === 'number') {
             const isOn = value > 0;
             this.service.updateCharacteristic(this.platform.Characteristic.On, isOn);
-            if (isOn && value <= 99) {
-                // Brightness in Z-Wave is 0-99, in HomeKit 0-100
+            if (value <= 99) {
+                this.lastKnownBrightness = value;
                 this.service.updateCharacteristic(this.platform.Characteristic.Brightness, value);
             }
-            else if (isOn && value === 255) {
+            else if (value === 255 && isOn) {
                 // 255 = restore previous level
-                // We don't necessarily know the previous level, so we leave it as is or default to 100
+                // Use our tracked brightness, default to 100 if unknown
+                const brightness = this.lastKnownBrightness > 0 ? this.lastKnownBrightness : 100;
+                this.service.updateCharacteristic(this.platform.Characteristic.Brightness, brightness);
             }
         }
     }

package/dist/platform/ZWaveUsbPlatform.js

@@ -68,18 +68,31 @@ class ZWaveUsbPlatform {
                 for (const acc of this.zwaveAccessories.values()) {
                     managedUuids.add(acc.platformAccessory.UUID);
                 }
-                const orphaned = this.accessories.filter(acc => !managedUuids.has(acc.UUID));
+                this.log.debug(`Reconciliation: ${managedUuids.size} managed accessories, ${this.accessories.length} in cache.`);
+                const orphaned = this.accessories.filter(acc => {
+                    const isOrphaned = !managedUuids.has(acc.UUID);
+                    if (isOrphaned) {
+                        this.log.info(`Found orphaned accessory in cache: ${acc.displayName} (${acc.UUID})`);
+                    }
+                    return isOrphaned;
+                });
                 if (orphaned.length > 0) {
                     this.log.info(`Removing ${orphaned.length} orphaned accessories from cache...`);
-                    this.api.unregisterPlatformAccessories('homebridge-zwave-usb', 'ZWaveUSB', orphaned);
-                    for (const orphan of orphaned) {
-                        const index = this.accessories.indexOf(orphan);
-                        if (index !== -1) {
-                            this.accessories.splice(index, 1);
+                    try {
+                        this.api.unregisterPlatformAccessories('homebridge-zwave-usb', 'ZWaveUSB', orphaned);
+                        for (const orphan of orphaned) {
+                            const index = this.accessories.indexOf(orphan);
+                            if (index !== -1) {
+                                this.accessories.splice(index, 1);
+                            }
                         }
+                        this.log.info('Successfully removed orphaned accessories.');
+                    }
+                    catch (err) {
+                        this.log.error('Failed to unregister orphaned accessories:', err);
                     }
                 }
-            }, 5000);
+            }, 10000);
         }
         catch (err) {
             this.log.error('Failed to connect to Z-Wave controller:', err);
@@ -90,6 +103,10 @@ class ZWaveUsbPlatform {
     }
     handleNodeReady(node) {
         this.log.info(`Node ${node.nodeId} ready`);
+        if (!node.ready) {
+            this.log.warn(`Node ${node.nodeId} reported ready but node.ready is false, skipping...`);
+            return;
+        }
         const homeId = this.zwaveController?.homeId;
         if (!homeId) {
             this.log.error(`Cannot create accessory for Node ${node.nodeId} - Home ID not available`);

package/dist/zwave/ZWaveController.js

@@ -34,7 +34,7 @@ class ZWaveController extends events_1.EventEmitter {
         }
         // Redirect Z-Wave JS logs to Homebridge
         const customLogTransport = {
-            write: (info) => {
+            log: (info, next) => {
                 const message = info.message || info;
                 const label = info.label ? `[${info.label}] ` : '';
                 const output = `${label}${message}`;
@@ -44,6 +44,9 @@ class ZWaveController extends events_1.EventEmitter {
                 else {
                     this.log.debug(`[Z-Wave JS] ${output}`);
                 }
+                if (next) {
+                    next();
+                }
             }
         };
         const logConfig = {
@@ -62,6 +65,7 @@ class ZWaveController extends events_1.EventEmitter {
             features: {
                 softReset: false,
             },
+            emitValueUpdateAfterSetValue: true,
         });
         this.driver.on('error', (err) => {
             this.log.error('Z-Wave driver error:', err);
@@ -186,6 +190,12 @@ class ZWaveController extends events_1.EventEmitter {
             if (listeners) {
                 node.off('ready', listeners.ready);
                 node.off('value updated', listeners.value);
+                if (listeners.interviewStageCompleted) {
+                    node.off('interview stage completed', listeners.interviewStageCompleted);
+                }
+                if (listeners.interviewFailed) {
+                    node.off('interview failed', listeners.interviewFailed);
+                }
             }
         }
         this.nodeListeners.clear();

package/dist/zwave/interfaces.d.ts

@@ -1,7 +1,8 @@
 import { EventEmitter } from 'events';
+import { ValueID, SetValueResult } from 'zwave-js';
 export interface IZWaveController extends EventEmitter {
     homeId: number | undefined;
-    nodes: Map<number, any>;
+    nodes: Map<number, IZWaveNode>;
     start(): Promise<void>;
     stop(): Promise<void>;
     startInclusion(): Promise<boolean>;
@@ -16,15 +17,16 @@ export interface IZWaveNode {
     name?: string;
     deviceConfig?: {
         label?: string;
+        manufacturer?: string;
     };
     ready: boolean;
-    interviewStage: any;
-    getValue(valueId: any): any;
-    setValue(valueId: any, value: any): Promise<boolean | undefined>;
+    interviewStage: unknown;
+    getValue(valueId: ValueID): unknown;
+    setValue(valueId: ValueID, value: unknown): Promise<SetValueResult>;
     supportsCC(cc: number): boolean;
-    getDefinedValueIDs(): any[];
-    getAllEndpoints(): any[];
-    getValueMetadata(valueId: any): any;
-    on(event: string, listener: (...args: any[]) => void): this;
-    off(event: string, listener: (...args: any[]) => void): this;
+    getDefinedValueIDs(): ValueID[];
+    getAllEndpoints(): unknown[];
+    getValueMetadata(valueId: ValueID): unknown;
+    on(event: string, listener: (...args: unknown[]) => void): this;
+    off(event: string, listener: (...args: unknown[]) => void): this;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-zwave-usb",
   "displayName": "Z-Wave USB",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "description": "A Homebridge dynamic platform plugin for Z-Wave USB controllers using zwave-js.",
   "repository": {
     "type": "git",