homebridge-zwave-usb 3.6.2 → 3.6.3

package/dist/accessories/ZWaveAccessory.d.ts

@@ -32,6 +32,11 @@ export declare class ZWaveAccessory {
     }): void;
     private getDesiredName;
     private getEffectiveName;
+    private formatFingerprintPart;
+    private getFingerprint;
+    private getModel;
+    private getSerialNumber;
+    private getCachedDeviceSerialNumber;
     private applyAccessoryMetadata;
     private ensureAccessoryInformationConfiguredName;
     private pruneUnmanagedServices;

package/dist/accessories/ZWaveAccessory.js

@@ -225,10 +225,59 @@ class ZWaveAccessory {
     getEffectiveName() {
         return this.platformAccessory.displayName || this.getDesiredName();
     }
+    formatFingerprintPart(value) {
+        if (value === undefined) {
+            return undefined;
+        }
+        return `0x${value.toString(16).padStart(4, '0').toUpperCase()}`;
+    }
+    getFingerprint() {
+        const manufacturerId = this.formatFingerprintPart(this.node.manufacturerId);
+        const productType = this.formatFingerprintPart(this.node.productType);
+        const productId = this.formatFingerprintPart(this.node.productId);
+        if (!manufacturerId || !productType || !productId) {
+            return undefined;
+        }
+        return `${manufacturerId}:${productType}:${productId}`;
+    }
+    getModel() {
+        const fingerprint = this.getFingerprint();
+        const label = this.node.label || this.node.deviceConfig?.label;
+        if (label && fingerprint) {
+            return `${label} (${fingerprint})`;
+        }
+        return fingerprint || label || `Node ${this.node.nodeId}`;
+    }
+    getSerialNumber() {
+        const cachedSerialNumber = this.getCachedDeviceSerialNumber();
+        if (cachedSerialNumber) {
+            return cachedSerialNumber;
+        }
+        const fingerprint = this.getFingerprint();
+        if (fingerprint) {
+            return `zwave-${fingerprint}-node-${this.node.nodeId}`;
+        }
+        return `node-${this.node.nodeId}`;
+    }
+    getCachedDeviceSerialNumber() {
+        if (this.node.deviceSerialNumber) {
+            return this.node.deviceSerialNumber;
+        }
+        if (typeof this.node.getValue !== 'function') {
+            return undefined;
+        }
+        const cachedValue = this.node.getValue({
+            commandClass: core_1.CommandClasses['Manufacturer Specific'],
+            endpoint: 0,
+            property: 'deviceId',
+            propertyKey: 'SerialNumber',
+        });
+        return typeof cachedValue === 'string' && cachedValue.length > 0 ? cachedValue : undefined;
+    }
     applyAccessoryMetadata(options = {}) {
         const manufacturer = this.node.manufacturer || this.node.deviceConfig?.manufacturer || 'Unknown';
-        const model = this.node.label || this.node.deviceConfig?.label || `Node ${this.node.nodeId}`;
-        const serial = `Node ${this.node.nodeId}`;
+        const model = this.getModel();
+        const serial = this.getSerialNumber();
         const name = this.getEffectiveName();
         const firmwareRevision = this.node.firmwareVersion || '1.0.0';
         const metadataSignature = JSON.stringify({

package/dist/zwave/ZWaveController.d.ts

@@ -36,6 +36,7 @@ export declare class ZWaveController extends EventEmitter implements IZWaveContr
     private setupControllerListeners;
     get homeId(): number | undefined;
     private addNode;
+    private refreshNodeDeviceSerialNumber;
     private removeNode;
     /**
      * Parses security keys from options into Buffer format for Z-Wave JS.

package/dist/zwave/ZWaveController.js

@@ -9,6 +9,7 @@ const core_1 = require("@zwave-js/core");
 const events_1 = require("events");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const MANUFACTURER_SPECIFIC_SERIAL_NUMBER_TYPE = 1;
 /**
  * ZWaveController wraps the Z-Wave JS Driver and implements high-level
  * automation logic for inclusion, exclusion, and security PIN management.
@@ -161,6 +162,7 @@ class ZWaveController extends events_1.EventEmitter {
             this.log.info(`Node ${node.nodeId} is ready (Interview Stage: ${node.interviewStage})`);
             this.emit('status updated', `Node ${node.nodeId} Ready`);
             this.emit('node ready', node);
+            void this.refreshNodeDeviceSerialNumber(node);
         };
         const onValueUpdated = (n, args) => {
             this.log.debug(`Node ${n.nodeId} value updated`);
@@ -187,6 +189,7 @@ class ZWaveController extends events_1.EventEmitter {
             this.log.info(`Node ${node.nodeId} has woken up. Interview will resume.`);
             this.emit('status updated', `Node ${node.nodeId} Awake`);
             this.emit('node updated', node);
+            void this.refreshNodeDeviceSerialNumber(node);
         };
         const onSleep = () => {
             this.log.info(`Node ${node.nodeId} has gone to sleep. Interview is paused.`);
@@ -239,6 +242,35 @@ class ZWaveController extends events_1.EventEmitter {
         if (node.ready) {
             this.log.info(`Node ${node.nodeId} is already ready, emitting node ready immediately`);
             this.emit('node ready', node);
+            void this.refreshNodeDeviceSerialNumber(node);
+        }
+    }
+    async refreshNodeDeviceSerialNumber(node) {
+        if (node.deviceSerialNumber) {
+            return;
+        }
+        if (typeof node.supportsCC !== 'function' ||
+            !node.supportsCC(core_1.CommandClasses['Manufacturer Specific'])) {
+            return;
+        }
+        const manufacturerSpecificApi = node.commandClasses?.['Manufacturer Specific'];
+        if (typeof manufacturerSpecificApi?.deviceSpecificGet !== 'function') {
+            return;
+        }
+        try {
+            const deviceSerialNumber = await manufacturerSpecificApi.deviceSpecificGet(MANUFACTURER_SPECIFIC_SERIAL_NUMBER_TYPE);
+            if (typeof deviceSerialNumber !== 'string' || deviceSerialNumber.length === 0) {
+                return;
+            }
+            if (node.deviceSerialNumber === deviceSerialNumber) {
+                return;
+            }
+            node.deviceSerialNumber = deviceSerialNumber;
+            this.log.info(`Node ${node.nodeId} reported device serial number: ${deviceSerialNumber}`);
+            this.emit('node updated', node);
+        }
+        catch (err) {
+            this.log.debug(`Node ${node.nodeId} did not provide a device serial number yet: ${err}`);
         }
     }
     removeNode(node) {

package/dist/zwave/interfaces.d.ts

@@ -50,6 +50,10 @@ export interface IZWaveNode {
     name?: string;
     manufacturer?: string;
     label?: string;
+    deviceSerialNumber?: string;
+    manufacturerId?: number;
+    productType?: number;
+    productId?: number;
     deviceConfig?: {
         label?: string;
         manufacturer?: string;

package/package.json

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