@switchbot/homebridge-switchbot - npm Package Compare versions

Comparing version 3.5.0-beta.64 to 3.5.0-beta.65

dist/device/blindtilt.js

@@ -396,8 +396,13 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const replace = version?.replace(/^V|-.*$/g, '');
+            const match = replace?.match(/.{1,1}/g);
+            const blindTiltVersion = match?.join('.') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, blindTiltVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, blindTiltVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(blindTiltVersion);
+            this.accessory.context.deviceVersion = blindTiltVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -404,0 +409,0 @@ }

dist/device/ceilinglight.js

@@ -251,8 +251,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -259,0 +262,0 @@ }

dist/device/colorbulb.js

@@ -46,3 +46,2 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         accessory.context.LightBulb = this.LightBulb;
-        this.errorLog(`${device.deviceType}: ${accessory.displayName} LightBulb Context: ${JSON.stringify(accessory.context.LightBulb)}`);
         // Adaptive Lighting
@@ -294,8 +293,11 @@ if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -302,0 +304,0 @@ }

dist/device/contact.js

@@ -268,8 +268,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -276,0 +279,0 @@ }

dist/device/curtain.js

@@ -439,8 +439,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -447,0 +450,0 @@ }

dist/device/device.js

@@ -56,6 +56,6 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
             .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
-            .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.context.name)
-            .setCharacteristic(this.hap.Characteristic.Model, accessory.context.model)
-            .setCharacteristic(this.hap.Characteristic.SerialNumber, accessory.context.deviceId);
+            .setCharacteristic(this.hap.Characteristic.Name, device.deviceName)
+            .setCharacteristic(this.hap.Characteristic.ConfiguredName, device.deviceName)
+            .setCharacteristic(this.hap.Characteristic.Model, device.model)
+            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
     }
@@ -525,27 +525,55 @@ async getDeviceLogSettings(device) {
         }
-        accessory.context.name = device.deviceName;
         accessory.context.model = device.model;
-        accessory.context.deviceId = device.deviceId;
-        accessory.context.deviceType = device.deviceType;
+        let deviceFirmwareVersion;
         if (device.firmware) {
-            accessory.context.version = device.firmware;
+            deviceFirmwareVersion = device.firmware;
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 1 FirmwareRevision: ${device.firmware}`);
         }
-        else if (device.firmware === undefined && device.version === undefined && accessory.context.version === undefined) {
-            device.version = this.platform.version;
-            accessory.context.version = this.platform.version;
+        else if (device.version) {
+            deviceFirmwareVersion = device.version;
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 2 FirmwareRevision: ${device.version}`);
         }
-        else if (accessory.context.device.version) {
-            accessory.context.version = accessory.context.device.version.replace(/^V|-.*$/g, '');
+        else if (accessory.context.deviceVersion) {
+            deviceFirmwareVersion = accessory.context.deviceVersion;
+            this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 3 FirmwareRevision: ${accessory.context.deviceVersion}`);
         }
         else {
-            accessory.context.version = device.version?.replace(/^V|-.*$/g, '');
+            deviceFirmwareVersion = this.platform.version ?? '0.0.0';
+            if (this.platform.version) {
+                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 4 FirmwareRevision: ${this.platform.version}`);
+            }
+            else {
+                this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 5 FirmwareRevision: ${deviceFirmwareVersion}`);
+            }
         }
-        this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${accessory.context.device.version}`);
-        this.accessory
-            .getService(this.hap.Service.AccessoryInformation)
-            .setCharacteristic(this.hap.Characteristic.HardwareRevision, accessory.context.version)
-            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.version)
-            .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-            .updateValue(accessory.context.version);
-        this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} Context: ${JSON.stringify(accessory.context.device)}`);
+        if (device.deviceType === 'Blind Tilt') {
+            // Firmware Version
+            const version = deviceFirmwareVersion.toString();
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+            const replace = version?.replace(/^V|-.*$/g, '');
+            const match = replace?.match(/.{1,1}/g);
+            const blindTiltVersion = match?.join('.') ?? '0.0.0';
+            this.accessory
+                .getService(this.hap.Service.AccessoryInformation)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, blindTiltVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, blindTiltVersion)
+                .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+                .updateValue(blindTiltVersion);
+            this.accessory.context.deviceVersion = blindTiltVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
+        }
+        else {
+            // Firmware Version
+            const version = deviceFirmwareVersion.toString();
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
+            this.accessory
+                .getService(this.hap.Service.AccessoryInformation)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
+                .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
+        }
     }
@@ -552,0 +580,0 @@ async statusCode(statusCode) {

dist/device/fan.js

@@ -196,8 +196,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -204,0 +207,0 @@ }

dist/device/hub.js

@@ -179,8 +179,11 @@ import { deviceBase } from './device.js';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -187,0 +190,0 @@ }

dist/device/humidifier.js

@@ -239,8 +239,11 @@ import { request } from 'undici';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -247,0 +250,0 @@ }

dist/device/iosensor.js

@@ -196,8 +196,11 @@ import { deviceBase } from './device.js';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -204,0 +207,0 @@ }

dist/device/lightstrip.js

@@ -278,8 +278,11 @@ import { request } from 'undici';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -286,0 +289,0 @@ }

dist/device/lock.js

@@ -228,8 +228,11 @@ import { request } from 'undici';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -236,0 +239,0 @@ }

dist/device/meter.js

@@ -190,8 +190,11 @@ import { Devices } from '../settings.js';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -198,0 +201,0 @@ }

dist/device/meterplus.js

@@ -192,8 +192,11 @@ import { Devices } from '../settings.js';
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -200,0 +203,0 @@ }

dist/device/motion.js

@@ -202,8 +202,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -210,0 +213,0 @@ }

dist/device/plug.js

@@ -113,8 +113,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -121,0 +124,0 @@ }

dist/device/robotvacuumcleaner.js

@@ -192,8 +192,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -200,0 +203,0 @@ }

dist/device/waterdetector.js

@@ -153,8 +153,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
         if (deviceStatus.body.version) {
-            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
             this.accessory
                 .getService(this.hap.Service.AccessoryInformation)
-                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
                 .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-                .updateValue(this.accessory.context.version);
+                .updateValue(deviceVersion);
+            this.accessory.context.deviceVersion = deviceVersion;
+            this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
         }
@@ -161,0 +164,0 @@ }

package.json

 {
   "displayName": "SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "3.5.0-beta.64",
+  "version": "3.5.0-beta.65",
   "description": "The SwitchBot plugin allows you to access your SwitchBot device(s) from HomeKit.",
@@ -6,0 +6,0 @@ "author": {

src/device/blindtilt.ts

@@ -464,8 +464,13 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const replace = version?.replace(/^V|-.*$/g, '');
+      const match = replace?.match(/.{1,1}/g);
+      const blindTiltVersion = match?.join('.') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, blindTiltVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, blindTiltVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(blindTiltVersion);
+      this.accessory.context.deviceVersion = blindTiltVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -472,0 +477,0 @@ }

src/device/ceilinglight.ts

@@ -298,8 +298,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -306,0 +309,0 @@ }

src/device/colorbulb.ts

@@ -66,3 +66,2 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     accessory.context.LightBulb = this.LightBulb as object;
-    this.errorLog(`${device.deviceType}: ${accessory.displayName} LightBulb Context: ${JSON.stringify(accessory.context.LightBulb)}`);
 
@@ -354,8 +353,11 @@ // Adaptive Lighting
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -362,0 +364,0 @@ }

src/device/contact.ts

@@ -312,8 +312,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -320,0 +323,0 @@ }

src/device/curtain.ts

@@ -425,6 +425,4 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     }
-    this.debugLog(
-      `${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
-      + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`,
-    );
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+      + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
@@ -509,8 +507,11 @@
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -517,0 +518,0 @@ }

src/device/device.ts

@@ -71,6 +71,6 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
       .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
-      .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.context.name)
-      .setCharacteristic(this.hap.Characteristic.Model, accessory.context.model)
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, accessory.context.deviceId);
+      .setCharacteristic(this.hap.Characteristic.Name, device.deviceName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, device.deviceName)
+      .setCharacteristic(this.hap.Characteristic.Model, device.model!)
+      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
   }
@@ -543,25 +543,51 @@
     }
-    accessory.context.name = device.deviceName;
     accessory.context.model = device.model;
-    accessory.context.deviceId = device.deviceId;
-    accessory.context.deviceType = device.deviceType;
 
+    let deviceFirmwareVersion: string;
     if (device.firmware) {
-      accessory.context.version = device.firmware;
-    } else if (device.firmware === undefined && device.version === undefined && accessory.context.version === undefined) {
-      device.version = this.platform.version;
-      accessory.context.version = this.platform.version;
-    } else if (accessory.context.device.version) {
-      accessory.context.version = accessory.context.device.version.replace(/^V|-.*$/g, '');
-    }else {
-      accessory.context.version = device.version?.replace(/^V|-.*$/g, '');
+      deviceFirmwareVersion = device.firmware;
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 1 FirmwareRevision: ${device.firmware}`);
+    } else if (device.version) {
+      deviceFirmwareVersion = device.version;
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 2 FirmwareRevision: ${device.version}`);
+    } else if (accessory.context.deviceVersion) {
+      deviceFirmwareVersion = accessory.context.deviceVersion;
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 3 FirmwareRevision: ${accessory.context.deviceVersion}`);
+    } else {
+      deviceFirmwareVersion = this.platform.version ?? '0.0.0';
+      if (this.platform.version) {
+        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 4 FirmwareRevision: ${this.platform.version}`);
+      } else {
+        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 5 FirmwareRevision: ${deviceFirmwareVersion}`);
+      }
     }
-    this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${accessory.context.device.version}`);
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.HardwareRevision, accessory.context.version)
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.version)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(accessory.context.version);
-    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} Context: ${JSON.stringify(accessory.context.device)}`);
+    if (device.deviceType === 'Blind Tilt') {
+      // Firmware Version
+      const version = deviceFirmwareVersion.toString();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+      const replace = version?.replace(/^V|-.*$/g, '');
+      const match = replace?.match(/.{1,1}/g);
+      const blindTiltVersion = match?.join('.') ?? '0.0.0';
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, blindTiltVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, blindTiltVersion)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(blindTiltVersion);
+      this.accessory.context.deviceVersion = blindTiltVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
+    } else {
+      // Firmware Version
+      const version = deviceFirmwareVersion.toString();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
+    }
   }
@@ -568,0 +594,0 @@

src/device/fan.ts

@@ -248,8 +248,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -256,0 +259,0 @@ }

src/device/hub.ts

@@ -219,8 +219,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -227,0 +230,0 @@ }

src/device/humidifier.ts

@@ -274,8 +274,11 @@ import { request } from 'undici';
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -282,0 +285,0 @@ }

src/device/iosensor.ts

@@ -235,2 +235,3 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     }
+
     // Firmware Version
@@ -240,8 +241,11 @@ const version = deviceStatus.body.version?.toString();
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -248,0 +252,0 @@ }

src/device/lightstrip.ts

@@ -337,8 +337,11 @@ import { request } from 'undici';
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -345,0 +348,0 @@ }

src/device/lock.ts

@@ -277,8 +277,11 @@ import { request } from 'undici';
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -285,0 +288,0 @@ }

src/device/meter.ts

@@ -233,8 +233,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -241,0 +244,0 @@ }

src/device/meterplus.ts

@@ -230,2 +230,3 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     }
+
     // Firmware Version
@@ -235,8 +236,11 @@ const version = deviceStatus.body.version?.toString();
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -243,0 +247,0 @@ }

src/device/motion.ts

@@ -241,8 +241,11 @@
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -249,0 +252,0 @@ }

src/device/plug.ts

@@ -138,8 +138,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -146,0 +149,0 @@ }

src/device/robotvacuumcleaner.ts

@@ -232,8 +232,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -240,0 +243,0 @@ }

src/device/waterdetector.ts

@@ -186,8 +186,11 @@ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
@@ -194,0 +197,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3301095

increased by0.54%

Lines of code

42800

increased by0.38%

No dependency changes