homebridge-zwave-usb 1.2.7 → 1.2.9

package/dist/zwave/ZWaveController.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZWaveController = void 0;
 const zwave_js_1 = require("zwave-js");
 const events_1 = require("events");
+const path_1 = __importDefault(require("path"));
 class ZWaveController extends events_1.EventEmitter {
     log;
     serialPort;
@@ -19,39 +23,55 @@ class ZWaveController extends events_1.EventEmitter {
         this.options = options;
         const securityKeys = {};
         if (this.options.securityKeys) {
-            if (this.options.securityKeys.S0_Legacy) {
-                if (this.options.securityKeys.S0_Legacy.length === 32) {
-                    securityKeys.S0_Legacy = Buffer.from(this.options.securityKeys.S0_Legacy, 'hex');
-                }
+            if (this.options.securityKeys.S0_Legacy && this.options.securityKeys.S0_Legacy.length === 32) {
+                securityKeys.S0_Legacy = Buffer.from(this.options.securityKeys.S0_Legacy, 'hex');
             }
-            if (this.options.securityKeys.S2_Unauthenticated) {
-                if (this.options.securityKeys.S2_Unauthenticated.length === 32) {
-                    securityKeys.S2_Unauthenticated = Buffer.from(this.options.securityKeys.S2_Unauthenticated, 'hex');
-                }
+            if (this.options.securityKeys.S2_Unauthenticated && this.options.securityKeys.S2_Unauthenticated.length === 32) {
+                securityKeys.S2_Unauthenticated = Buffer.from(this.options.securityKeys.S2_Unauthenticated, 'hex');
             }
-            if (this.options.securityKeys.S2_Authenticated) {
-                if (this.options.securityKeys.S2_Authenticated.length === 32) {
-                    securityKeys.S2_Authenticated = Buffer.from(this.options.securityKeys.S2_Authenticated, 'hex');
-                }
+            if (this.options.securityKeys.S2_Authenticated && this.options.securityKeys.S2_Authenticated.length === 32) {
+                securityKeys.S2_Authenticated = Buffer.from(this.options.securityKeys.S2_Authenticated, 'hex');
             }
-            if (this.options.securityKeys.S2_AccessControl) {
-                if (this.options.securityKeys.S2_AccessControl.length === 32) {
-                    securityKeys.S2_AccessControl = Buffer.from(this.options.securityKeys.S2_AccessControl, 'hex');
-                }
+            if (this.options.securityKeys.S2_AccessControl && 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
+        // Redirect Z-Wave JS logs to Homebridge with a more complete Winston mock
+        const customLogTransport = {
+            on: () => customLogTransport,
+            once: () => customLogTransport,
+            emit: () => true,
+            removeListener: () => customLogTransport,
+            removeEventListener: () => customLogTransport,
+            addListener: () => customLogTransport,
+            log: (info, next) => {
+                const message = info.message || info;
+                const label = info.label ? `[${info.label}] ` : '';
+                const level = info.level || 'info';
+                const output = `[Z-Wave JS] ${label}${message}`;
+                if (this.options.debug || level === 'error' || level === 'warn') {
+                    this.log.info(output);
+                }
+                else {
+                    this.log.debug(output);
+                }
+                if (next) {
+                    next();
+                }
+            }
+        };
         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',
+                cacheDir: path_1.default.join(storagePath, 'zwave-js-cache'),
+                deviceConfigPriorityDir: path_1.default.join(storagePath, 'zwave-js-config'),
             },
             features: {
                 softReset: false,
@@ -133,7 +153,9 @@ class ZWaveController extends events_1.EventEmitter {
             return;
         }
         this.nodes.set(node.nodeId, node);
-        this.log.info(`Node ${node.nodeId} added to controller (Interview Stage: ${node.interviewStage})`);
+        const statusMap = ['Unknown', 'Alive', 'Awake', 'Asleep', 'Dead'];
+        const status = statusMap[node.status] || node.status.toString();
+        this.log.info(`Node ${node.nodeId} 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('node ready', node);
@@ -148,16 +170,28 @@ class ZWaveController extends events_1.EventEmitter {
         const onInterviewFailed = (args) => {
             this.log.error(`Node ${node.nodeId} interview failed: ${args.errorMessage}`);
         };
+        const onWakeUp = () => {
+            this.log.info(`Node ${node.nodeId} has woken up. Interview will resume.`);
+        };
+        const onSleep = () => {
+            this.log.info(`Node ${node.nodeId} has gone to sleep. Interview is paused.`);
+        };
         this.nodeListeners.set(node.nodeId, {
             ready: onReady,
             value: onValueUpdated,
             interviewStageCompleted: onInterviewStageCompleted,
-            interviewFailed: onInterviewFailed
+            interviewFailed: onInterviewFailed,
+            onWakeUp,
+            onSleep
         });
         node.on('ready', onReady);
         node.on('value updated', onValueUpdated);
+        node.on('value added', onValueUpdated);
+        node.on('metadata updated', onValueUpdated);
         node.on('interview stage completed', onInterviewStageCompleted);
         node.on('interview failed', onInterviewFailed);
+        node.on('wake up', onWakeUp);
+        node.on('sleep', onSleep);
         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`);
@@ -169,12 +203,20 @@ class ZWaveController extends events_1.EventEmitter {
         if (listeners) {
             node.off('ready', listeners.ready);
             node.off('value updated', listeners.value);
+            node.off('value added', listeners.value);
+            node.off('metadata updated', listeners.value);
             if (listeners.interviewStageCompleted) {
                 node.off('interview stage completed', listeners.interviewStageCompleted);
             }
             if (listeners.interviewFailed) {
                 node.off('interview failed', listeners.interviewFailed);
             }
+            if (listeners.onWakeUp) {
+                node.off('wake up', listeners.onWakeUp);
+            }
+            if (listeners.onSleep) {
+                node.off('sleep', listeners.onSleep);
+            }
             this.nodeListeners.delete(node.nodeId);
         }
         this.nodes.delete(node.nodeId);
@@ -202,12 +244,20 @@ class ZWaveController extends events_1.EventEmitter {
             if (listeners) {
                 node.off('ready', listeners.ready);
                 node.off('value updated', listeners.value);
+                node.off('value added', listeners.value);
+                node.off('metadata updated', listeners.value);
                 if (listeners.interviewStageCompleted) {
                     node.off('interview stage completed', listeners.interviewStageCompleted);
                 }
                 if (listeners.interviewFailed) {
                     node.off('interview failed', listeners.interviewFailed);
                 }
+                if (listeners.onWakeUp) {
+                    node.off('wake up', listeners.onWakeUp);
+                }
+                if (listeners.onSleep) {
+                    node.off('sleep', listeners.onSleep);
+                }
             }
         }
         this.nodeListeners.clear();

package/package.json

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