homebridge-zwave-usb 1.2.5 → 1.2.7

package/config.schema.json

@@ -75,6 +75,25 @@
         "type": "boolean",
         "default": false,
         "description": "If true, redirects all Z-Wave JS driver logs to Homebridge."
+      },
+      "enableServer": {
+        "title": "Enable Z-Wave Server (Host Mode)",
+        "type": "boolean",
+        "default": false,
+        "description": "Expose the Z-Wave Driver via WebSocket. Allows Z-Wave JS UI to connect to this plugin."
+      },
+      "serverPort": {
+        "title": "Server Port",
+        "type": "integer",
+        "default": 3000,
+        "minimum": 1024,
+        "maximum": 65535,
+        "description": "Port for the Z-Wave WebSocket Server (only if enabled).",
+        "condition": {
+          "function": {
+            "enableServer": true
+          }
+        }
       }
     }
   },
@@ -102,7 +121,9 @@
       "expandable": true,
       "items": [
         "inclusionTimeoutSeconds",
-        "debug"
+        "debug",
+        "enableServer",
+        "serverPort"
       ]
     }
   ]

package/dist/accessories/ControllerAccessory.js

@@ -14,6 +14,9 @@ class ControllerAccessory {
         this.platform = platform;
         this.controller = controller;
         const homeId = this.controller.homeId;
+        if (!homeId) {
+            throw new Error('Cannot create ControllerAccessory: homeId is not available');
+        }
         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) {

package/dist/features/BatteryFeature.js

@@ -38,6 +38,10 @@ class BatteryFeature extends ZWaveFeature_1.BaseFeature {
             return value ? this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
         const level = this.getBatteryLevel();
+        // -1 means unknown/unavailable, don't show low battery warning for unknown
+        if (level < 0) {
+            return this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+        }
         return level <= 15 ? this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     }
     handleGetBatteryLevel() {

package/dist/features/BinarySwitchFeature.js

@@ -30,7 +30,11 @@ class BinarySwitchFeature extends ZWaveFeature_1.BaseFeature {
     }
     async handleSetOn(value) {
         try {
-            await this.node.setValue({ commandClass: 37, property: 'targetValue', endpoint: this.endpoint.index }, value);
+            const result = await this.node.setValue({ commandClass: 37, property: 'targetValue', endpoint: this.endpoint.index }, value);
+            // Check if the command was accepted
+            if (result.status !== 255) { // 255 = Success
+                this.platform.log.warn(`Switch setValue returned status ${result.status} for node ${this.node.nodeId}`);
+            }
         }
         catch (err) {
             this.platform.log.error(`Failed to set switch value for node ${this.node.nodeId} endpoint ${this.endpoint.index}:`, err);

package/dist/features/CentralSceneFeature.js

@@ -10,6 +10,8 @@ class CentralSceneFeature extends ZWaveFeature_1.BaseFeature {
         if (sceneValue) {
             const subType = this.endpoint.index.toString();
             this.service = this.getService(this.platform.Service.StatelessProgrammableSwitch, 'Buttons', subType);
+            // Initialize the characteristic binding
+            this.service.getCharacteristic(this.platform.Characteristic.ProgrammableSwitchEvent);
         }
     }
     update() {

package/dist/features/LockFeature.js

@@ -64,7 +64,10 @@ class LockFeature extends ZWaveFeature_1.BaseFeature {
     async handleSetLockTargetState(value) {
         const targetMode = value === this.platform.Characteristic.LockTargetState.SECURED ? 255 : 0;
         try {
-            await this.node.setValue({ commandClass: 98, property: 'targetMode', endpoint: this.endpoint.index }, targetMode);
+            const result = await this.node.setValue({ commandClass: 98, property: 'targetMode', endpoint: this.endpoint.index }, targetMode);
+            if (result.status !== 255) {
+                this.platform.log.warn(`Lock setValue returned status ${result.status} for node ${this.node.nodeId}`);
+            }
         }
         catch (err) {
             this.platform.log.error(`Failed to set Lock Target for node ${this.node.nodeId} endpoint ${this.endpoint.index}:`, err);

package/dist/features/MultilevelSwitchFeature.js

@@ -49,7 +49,10 @@ class MultilevelSwitchFeature extends ZWaveFeature_1.BaseFeature {
     async handleSetOn(value) {
         const targetValue = value ? 255 : 0;
         try {
-            await this.node.setValue({ commandClass: 38, property: 'targetValue', endpoint: this.endpoint.index }, targetValue);
+            const result = await this.node.setValue({ commandClass: 38, property: 'targetValue', endpoint: this.endpoint.index }, targetValue);
+            if (result.status !== 255) {
+                this.platform.log.warn(`Multilevel switch setValue returned status ${result.status} for node ${this.node.nodeId}`);
+            }
         }
         catch (err) {
             this.platform.log.error(`Failed to set ON/OFF for node ${this.node.nodeId} endpoint ${this.endpoint.index}:`, err);
@@ -69,7 +72,10 @@ class MultilevelSwitchFeature extends ZWaveFeature_1.BaseFeature {
     async handleSetBrightness(value) {
         const targetValue = Math.min(Math.max(value, 0), 99);
         try {
-            await this.node.setValue({ commandClass: 38, property: 'targetValue', endpoint: this.endpoint.index }, targetValue);
+            const result = await this.node.setValue({ commandClass: 38, property: 'targetValue', endpoint: this.endpoint.index }, targetValue);
+            if (result.status !== 255) {
+                this.platform.log.warn(`Brightness setValue returned status ${result.status} for node ${this.node.nodeId}`);
+            }
         }
         catch (err) {
             this.platform.log.error(`Failed to set Brightness for node ${this.node.nodeId} endpoint ${this.endpoint.index}:`, err);

package/dist/zwave/ZWaveController.js

@@ -20,44 +20,35 @@ class ZWaveController extends events_1.EventEmitter {
         const securityKeys = {};
         if (this.options.securityKeys) {
             if (this.options.securityKeys.S0_Legacy) {
-                securityKeys.S0_Legacy = Buffer.from(this.options.securityKeys.S0_Legacy, 'hex');
+                if (this.options.securityKeys.S0_Legacy.length === 32) {
+                    securityKeys.S0_Legacy = Buffer.from(this.options.securityKeys.S0_Legacy, 'hex');
+                }
             }
             if (this.options.securityKeys.S2_Unauthenticated) {
-                securityKeys.S2_Unauthenticated = Buffer.from(this.options.securityKeys.S2_Unauthenticated, 'hex');
+                if (this.options.securityKeys.S2_Unauthenticated.length === 32) {
+                    securityKeys.S2_Unauthenticated = Buffer.from(this.options.securityKeys.S2_Unauthenticated, 'hex');
+                }
             }
             if (this.options.securityKeys.S2_Authenticated) {
-                securityKeys.S2_Authenticated = Buffer.from(this.options.securityKeys.S2_Authenticated, 'hex');
+                if (this.options.securityKeys.S2_Authenticated.length === 32) {
+                    securityKeys.S2_Authenticated = Buffer.from(this.options.securityKeys.S2_Authenticated, 'hex');
+                }
             }
             if (this.options.securityKeys.S2_AccessControl) {
-                securityKeys.S2_AccessControl = Buffer.from(this.options.securityKeys.S2_AccessControl, 'hex');
-            }
-        }
-        // Redirect Z-Wave JS logs to Homebridge
-        const customLogTransport = {
-            log: (info, next) => {
-                const message = info.message || info;
-                const label = info.label ? `[${info.label}] ` : '';
-                const output = `${label}${message}`;
-                if (this.options.debug || info.level === 'error' || info.level === 'warn') {
-                    this.log.info(`[Z-Wave JS] ${output}`);
-                }
-                else {
-                    this.log.debug(`[Z-Wave JS] ${output}`);
-                }
-                if (next) {
-                    next();
+                if (this.options.securityKeys.S2_AccessControl.length === 32) {
+                    securityKeys.S2_AccessControl = Buffer.from(this.options.securityKeys.S2_AccessControl, 'hex');
                 }
             }
-        };
+        }
+        // Z-Wave JS logging - use simple config to avoid type issues
         const logConfig = {
             enabled: true,
             level: this.options.debug ? 'debug' : 'info',
-            transports: [customLogTransport] // eslint-disable-line @typescript-eslint/no-explicit-any
         };
         const storagePath = this.options.storagePath || process.cwd();
         this.driver = new zwave_js_1.Driver(this.serialPort, {
             securityKeys: Object.keys(securityKeys).length > 0 ? securityKeys : undefined,
-            logConfig,
+            logConfig: logConfig,
             storage: {
                 cacheDir: storagePath + '/zwave-js-cache',
                 deviceConfigPriorityDir: storagePath + '/zwave-js-config',
@@ -78,17 +69,34 @@ class ZWaveController extends events_1.EventEmitter {
             try {
                 this.log.info(`Controller Home ID: ${this.driver.controller.homeId}`);
                 this.controllerListeners = {
-                    'inclusion started': (secure) => this.emit('inclusion started', secure), // eslint-disable-line @typescript-eslint/no-explicit-any
-                    'inclusion stopped': () => this.emit('inclusion stopped'),
-                    'exclusion started': () => this.emit('exclusion started'),
-                    'exclusion stopped': () => this.emit('exclusion stopped'),
-                    'rebuild routes progress': (progress) => this.emit('heal network progress', progress), // eslint-disable-line @typescript-eslint/no-explicit-any
-                    'rebuild routes done': (result) => this.emit('heal network done', result), // eslint-disable-line @typescript-eslint/no-explicit-any
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    'inclusion started': (secure) => {
+                        this.log.info(`Inclusion started (secure: ${secure})`);
+                        this.emit('inclusion started', secure);
+                    },
+                    'inclusion stopped': () => {
+                        this.log.info('Inclusion stopped');
+                        this.emit('inclusion stopped');
+                    },
+                    'exclusion started': () => {
+                        this.log.info('Exclusion started');
+                        this.emit('exclusion started');
+                    },
+                    'exclusion stopped': () => {
+                        this.log.info('Exclusion stopped');
+                        this.emit('exclusion stopped');
+                    },
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    'rebuild routes progress': (progress) => this.emit('heal network progress', progress),
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    'rebuild routes done': (result) => this.emit('heal network done', result),
                     'node added': (node) => {
+                        this.log.info(`Node ${node.nodeId} added to controller`);
                         this.addNode(node);
                         this.emit('node added', node);
                     },
                     'node removed': (node) => {
+                        this.log.info(`Node ${node.nodeId} removed from controller`);
                         this.removeNode(node);
                     },
                 };
@@ -121,14 +129,17 @@ class ZWaveController extends events_1.EventEmitter {
     }
     addNode(node) {
         if (this.nodes.has(node.nodeId)) {
+            this.log.warn(`Node ${node.nodeId} already exists in nodes map, skipping`);
             return;
         }
         this.nodes.set(node.nodeId, node);
+        this.log.info(`Node ${node.nodeId} added to controller (Interview Stage: ${node.interviewStage})`);
         const onReady = () => {
             this.log.info(`Node ${node.nodeId} is ready (Interview Stage: ${node.interviewStage})`);
             this.emit('node ready', node);
         };
         const onValueUpdated = (_args) => {
+            this.log.debug(`Node ${node.nodeId} value updated`);
             this.emit('value updated', node);
         };
         const onInterviewStageCompleted = (stage) => {
@@ -147,8 +158,9 @@ class ZWaveController extends events_1.EventEmitter {
         node.on('value updated', onValueUpdated);
         node.on('interview stage completed', onInterviewStageCompleted);
         node.on('interview failed', onInterviewFailed);
-        this.log.info(`Node ${node.nodeId} added (Interview Stage: ${node.interviewStage})`);
+        this.log.info(`Node ${node.nodeId} registered with event listeners (ready: ${node.ready})`);
         if (node.ready) {
+            this.log.info(`Node ${node.nodeId} is already ready, emitting node ready immediately`);
             this.emit('node ready', node);
         }
     }

package/homebridge-ui/public/index.html

@@ -50,6 +50,16 @@
                 <input type="checkbox" class="form-check-input" id="debug">
                 <label class="form-check-label" for="debug">Enable Verbose Driver Logging</label>
             </div>
+
+            <div class="form-check mt-3">
+                <input type="checkbox" class="form-check-input" id="enableServer">
+                <label class="form-check-label" for="enableServer">Enable Z-Wave Server (Debugging)</label>
+            </div>
+            
+            <div class="form-group mt-2" id="serverPortGroup" style="display:none;">
+                <label for="serverPort">Server Port</label>
+                <input type="number" class="form-control" id="serverPort" placeholder="3000">
+            </div>
         </fieldset>
     </form>
 </div>
@@ -76,7 +86,9 @@
                 platform: 'ZWaveUSB',
                 serialPort: document.getElementById('serialPort').value,
                 inclusionTimeoutSeconds: getInt('inclusionTimeoutSeconds', 60),
-                debug: document.getElementById('debug').checked
+                debug: document.getElementById('debug').checked,
+                enableServer: document.getElementById('enableServer').checked,
+                serverPort: getInt('serverPort', 3000)
             };
 
             if (Object.values(securityKeys).some(k => k && k.length > 0)) {
@@ -114,6 +126,16 @@
             // Advanced
             document.getElementById('inclusionTimeoutSeconds').value = config.inclusionTimeoutSeconds || 60;
             document.getElementById('debug').checked = config.debug || false;
+            document.getElementById('enableServer').checked = config.enableServer || false;
+            document.getElementById('serverPort').value = config.serverPort || 3000;
+
+            // UI Logic
+            function toggleServerPort() {
+                const enabled = document.getElementById('enableServer').checked;
+                document.getElementById('serverPortGroup').style.display = enabled ? 'block' : 'none';
+            }
+            document.getElementById('enableServer').addEventListener('change', toggleServerPort);
+            toggleServerPort();
 
             // Auto-save on change
             document.getElementById('configForm').addEventListener('input', updateConfig);

package/package.json

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