@switchbot/homebridge-switchbot 3.5.1-beta.17 → 3.5.1-beta.19

package/dist/platform.js

@@ -40,6 +40,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes';
 import { PLATFORM_NAME, PLUGIN_NAME, Devices, deleteWebhook, queryWebhook, setupWebhook, updateWebhook } from './settings.js';
 import { isBlindTiltDevice, isCurtainDevice, sleep } from './utils.js';
+import { SwitchBotModel } from 'node-switchbot';
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -788,15 +789,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.Humidifier;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -808,22 +808,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.Humidifier;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Humidifier(this, accessory, device);
@@ -833,7 +830,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createBot(device) {
@@ -845,15 +842,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.Bot;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -865,22 +861,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.Bot;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // accessory.context.version = findaccessories.accessoryAttribute.softwareRevision;
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
@@ -891,7 +884,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createMeter(device) {
@@ -903,15 +896,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.model = SwitchBotModel.Meter;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -923,22 +915,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.model = SwitchBotModel.Meter;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Meter(this, accessory, device);
@@ -948,7 +937,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createMeterPlus(device) {
@@ -961,15 +950,14 @@ export class SwitchBotPlatform {
             if (await this.registerDevice(device)) {
                 // console.log("existingAccessory", existingAccessory);
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.model = SwitchBotModel.MeterPlusUS ?? SwitchBotModel.MeterPlusJP;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -981,22 +969,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.model = SwitchBotModel.MeterPlusUS ?? SwitchBotModel.MeterPlusJP;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new MeterPlus(this, accessory, device);
@@ -1006,7 +991,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createHub2(device) {
@@ -1019,15 +1004,14 @@ export class SwitchBotPlatform {
             if (await this.registerDevice(device)) {
                 // console.log("existingAccessory", existingAccessory);
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.model = SwitchBotModel.Hub2;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1039,22 +1023,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.model = SwitchBotModel.Hub2;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Hub(this, accessory, device);
@@ -1064,7 +1045,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createIOSensor(device) {
@@ -1076,15 +1057,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.model = SwitchBotModel.OutdoorMeter;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1096,22 +1076,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.model = SwitchBotModel.OutdoorMeter;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new IOSensor(this, accessory, device);
@@ -1121,7 +1098,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createWaterDetector(device) {
@@ -1133,15 +1110,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.WaterDetector;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1153,22 +1129,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.WaterDetector;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
             accessory.context.connectionType = await this.connectionType(device);
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new WaterDetector(this, accessory, device);
@@ -1178,7 +1151,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createMotion(device) {
@@ -1190,15 +1163,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.MotionSensor;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1210,22 +1182,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.MotionSensor;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Motion(this, accessory, device);
@@ -1235,7 +1204,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createContact(device) {
@@ -1247,15 +1216,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.ContactSensor;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1267,22 +1235,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.ContactSensor;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Contact(this, accessory, device);
@@ -1292,7 +1257,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createBlindTilt(device) {
@@ -1304,15 +1269,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.BlindTilt;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1324,21 +1288,17 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             if (isBlindTiltDevice(device)) {
                 if (device.group && !device.curtain?.disable_group) {
                     this.debugLog('Your Curtains are grouped, ' +
-                        `, Secondary curtain automatically hidden. Main Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                        `, Secondary curtain automatically hidden. Main Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                 }
                 else {
                     if (device.master) {
-                        this.warnLog(`Main Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                        this.warnLog(`Main Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                     }
                     else {
-                        this.errorLog(`Secondary Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                        this.errorLog(`Secondary Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                     }
                 }
             }
@@ -1347,13 +1307,15 @@ export class SwitchBotPlatform {
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            ;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.BlindTilt;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new BlindTilt(this, accessory, device);
@@ -1363,7 +1325,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createCurtain(device) {
@@ -1375,15 +1337,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = device.deviceType === 'Curtain3' ? SwitchBotModel.Curtain3 : SwitchBotModel.Curtain;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1395,21 +1356,17 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             if (isCurtainDevice(device)) {
                 if (device.group && !device.curtain?.disable_group) {
                     this.debugLog('Your Curtains are grouped, ' +
-                        `, Secondary curtain automatically hidden. Main Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                        `, Secondary curtain automatically hidden. Main Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                 }
                 else {
                     if (device.master) {
-                        this.warnLog(`Main Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                        this.warnLog(`Main Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                     }
                     else {
-                        this.errorLog(`Secondary Curtain: ${device.deviceName}, DeviceID: ${device.deviceId}`);
+                        this.errorLog(`Secondary Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                     }
                 }
             }
@@ -1418,13 +1375,14 @@ export class SwitchBotPlatform {
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = device.deviceType === 'Curtain3' ? SwitchBotModel.Curtain3 : SwitchBotModel.Curtain;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Curtain(this, accessory, device);
@@ -1434,7 +1392,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createPlug(device) {
@@ -1446,15 +1404,15 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = device.deviceType === 'Plug Mini (US)' ? SwitchBotModel.PlugMiniUS : device.deviceType === 'Plug Mini (JP)'
+                    ? SwitchBotModel.PlugMiniJP : SwitchBotModel.Plug;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1466,22 +1424,20 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = device.deviceType === 'Plug Mini (US)' ? SwitchBotModel.PlugMiniUS : device.deviceType === 'Plug Mini (JP)'
+                ? SwitchBotModel.PlugMiniJP : SwitchBotModel.Plug;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Plug(this, accessory, device);
@@ -1491,7 +1447,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createLock(device) {
@@ -1503,15 +1459,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = device.deviceType === 'Smart Lock Pro' ? SwitchBotModel.LockPro : SwitchBotModel.Lock;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1523,22 +1478,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = device.deviceType === 'Smart Lock Pro' ? SwitchBotModel.LockPro : SwitchBotModel.Lock;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Lock(this, accessory, device);
@@ -1548,7 +1500,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createColorBulb(device) {
@@ -1560,15 +1512,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.ColorBulb;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1580,22 +1531,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.ColorBulb;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new ColorBulb(this, accessory, device);
@@ -1605,7 +1553,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createCeilingLight(device) {
@@ -1617,15 +1565,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = device.deviceType === 'Ceiling Light Pro' ? SwitchBotModel.CeilingLightPro : SwitchBotModel.CeilingLight;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1637,22 +1584,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = device.deviceType === 'Ceiling Light Pro' ? SwitchBotModel.CeilingLightPro : SwitchBotModel.CeilingLight;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new CeilingLight(this, accessory, device);
@@ -1662,7 +1606,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createStripLight(device) {
@@ -1674,15 +1618,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.StripLight;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1694,22 +1637,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.StripLight;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new StripLight(this, accessory, device);
@@ -1719,7 +1659,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createFan(device) {
@@ -1731,15 +1671,14 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = SwitchBotModel.BatteryCirculatorFan;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1751,22 +1690,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = SwitchBotModel.BatteryCirculatorFan;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Fan(this, accessory, device);
@@ -1776,7 +1712,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createRobotVacuumCleaner(device) {
@@ -1788,15 +1724,18 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (await this.registerDevice(device)) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.deviceType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
-                existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
+                existingAccessory.context.deviceType = device.deviceType;
+                existingAccessory.context.model = device.deviceType === 'Robot Vacuum Cleaner S1' ? SwitchBotModel.RobotVacuumCleanerS1
+                    : device.deviceType === 'Robot Vacuum Cleaner S1 Plus' ? SwitchBotModel.RobotVacuumCleanerS1Plus
+                        : device.deviceType === 'Robot Vacuum Cleaner S10' ? SwitchBotModel.RobotVacuumCleanerS10
+                            : device.deviceType === 'WoSweeper' ? SwitchBotModel.WoSweeper : device.deviceType === 'WoSweeperMini' ? SwitchBotModel.WoSweeperMini
+                                : SwitchBotModel.Unknown;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
                 existingAccessory.context.connectionType = await this.connectionType(device);
+                existingAccessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1808,22 +1747,23 @@ export class SwitchBotPlatform {
             }
         }
         else if (await this.registerDevice(device)) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.deviceType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
-            accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
+            accessory.context.deviceId = device.deviceId;
+            accessory.context.deviceType = device.deviceType;
+            accessory.context.model = device.deviceType === 'Robot Vacuum Cleaner S1' ? SwitchBotModel.RobotVacuumCleanerS1
+                : device.deviceType === 'Robot Vacuum Cleaner S1 Plus' ? SwitchBotModel.RobotVacuumCleanerS1Plus
+                    : device.deviceType === 'Robot Vacuum Cleaner S10' ? SwitchBotModel.RobotVacuumCleanerS10
+                        : device.deviceType === 'WoSweeper' ? SwitchBotModel.WoSweeper : device.deviceType === 'WoSweeperMini' ? SwitchBotModel.WoSweeperMini
+                            : SwitchBotModel.Unknown;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = await this.connectionType(device);
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new RobotVacuumCleaner(this, accessory, device);
@@ -1833,7 +1773,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.deviceType} deviceId: ${device.deviceId}`);
         }
     }
     async createTV(device) {
@@ -1843,11 +1783,12 @@ export class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (!device.hide_device && existingAccessory) {
             // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-            existingAccessory.context.model = device.remoteType;
-            existingAccessory.context.deviceID = device.deviceId;
-            existingAccessory.displayName = device.configDeviceName || device.deviceName;
+            existingAccessory.context.device = device;
+            existingAccessory.context.deviceId = device.deviceId;
             existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-            this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+            existingAccessory.context.model = device.remoteType;
+            existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+            await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
             existingAccessory.context.connectionType = device.connectionType;
             this.api.updatePlatformAccessories([existingAccessory]);
             // create the accessory handler for the restored accessory
@@ -1856,22 +1797,19 @@ export class SwitchBotPlatform {
             await this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${existingAccessory.UUID})`);
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new TV(this, accessory, device);
@@ -1880,7 +1818,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createIRFan(device) {
@@ -1892,14 +1830,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -1912,22 +1848,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new IRFan(this, accessory, device);
@@ -1937,7 +1870,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createLight(device) {
@@ -1949,14 +1882,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -1969,22 +1900,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Light(this, accessory, device);
@@ -1994,7 +1922,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createAirConditioner(device) {
@@ -2006,14 +1934,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -2026,22 +1952,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new AirConditioner(this, accessory, device);
@@ -2051,7 +1974,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createAirPurifier(device) {
@@ -2063,14 +1986,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -2083,22 +2004,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new AirPurifier(this, accessory, device);
@@ -2108,7 +2026,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createWaterHeater(device) {
@@ -2120,14 +2038,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -2140,22 +2056,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new WaterHeater(this, accessory, device);
@@ -2165,7 +2078,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createVacuumCleaner(device) {
@@ -2177,14 +2090,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -2197,22 +2108,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new VacuumCleaner(this, accessory, device);
@@ -2222,7 +2130,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createCamera(device) {
@@ -2234,14 +2142,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -2254,22 +2160,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Camera(this, accessory, device);
@@ -2279,7 +2182,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async createOthers(device) {
@@ -2291,14 +2194,12 @@ export class SwitchBotPlatform {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                existingAccessory.context.model = device.remoteType;
-                existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.configDeviceName || device.deviceName;
-                if (device.firmware) {
-                    existingAccessory.context.version = device.firmware;
-                }
+                existingAccessory.context.device = device;
+                existingAccessory.context.deviceId = device.deviceId;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.model = device.remoteType;
+                existingAccessory.displayName = device.configDeviceName ?? device.deviceName;
+                await this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} deviceId: ${device.deviceId}`);
                 existingAccessory.context.connectionType = device.connectionType;
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
@@ -2311,22 +2212,19 @@ export class SwitchBotPlatform {
             }
         }
         else if (!device.hide_device && device.hubDeviceId) {
-            // the accessory does not yet exist, so we need to create it
-            if (!device.external) {
-                this.infoLog(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
-            }
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
             // the `context` property can be used to store any data about the accessory you may need
             accessory.context.device = device;
-            accessory.context.model = device.remoteType;
-            accessory.context.deviceID = device.deviceId;
-            if (device.firmware) {
-                accessory.context.version = device.firmware;
-            }
+            accessory.context.deviceId = device.deviceId;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
+            accessory.context.model = device.remoteType;
+            accessory.displayName = device.configDeviceName ?? device.deviceName;
             accessory.context.connectionType = device.connectionType;
+            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
+            await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new Others(this, accessory, device);
@@ -2336,7 +2234,7 @@ export class SwitchBotPlatform {
             this.accessories.push(accessory);
         }
         else {
-            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
+            await this.debugLog(`Device not registered: ${device.deviceName} ${device.remoteType} deviceId: ${device.deviceId}`);
         }
     }
     async registerCurtains(device) {