@switchbot/homebridge-switchbot 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/platform.js

@@ -587,7 +587,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -595,7 +595,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -606,7 +606,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -618,7 +618,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new humidifier_1.Humidifier(this, accessory, device);
@@ -638,7 +638,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            if (await this.registerDevice(device)) {
                 this.debugLog((0, super_stringify_1.default)(device.bot?.mode));
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
                 existingAccessory.context.model = device.deviceType;
@@ -647,7 +647,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -658,7 +658,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             this.debugLog((0, super_stringify_1.default)(device.bot?.mode));
@@ -671,7 +671,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // accessory.context.firmwareRevision = findaccessories.accessoryAttribute.softwareRevision;
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
@@ -692,7 +692,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -700,7 +700,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -711,7 +711,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -723,7 +723,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new meter_1.Meter(this, accessory, device);
@@ -743,7 +743,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -751,7 +751,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -762,7 +762,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -774,7 +774,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new meterplus_1.MeterPlus(this, accessory, device);
@@ -794,7 +794,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -802,7 +802,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -813,7 +813,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -825,7 +825,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new motion_1.Motion(this, accessory, device);
@@ -845,7 +845,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -853,7 +853,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -864,7 +864,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -876,7 +876,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new contact_1.Contact(this, accessory, device);
@@ -904,7 +904,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -939,7 +939,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new curtain_1.Curtain(this, accessory, device);
@@ -971,7 +971,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -979,7 +979,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -990,7 +990,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -1002,7 +1002,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new plug_1.Plug(this, accessory, device);
@@ -1022,7 +1022,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -1030,7 +1030,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1041,7 +1041,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -1053,7 +1053,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new lock_1.Lock(this, accessory, device);
@@ -1073,7 +1073,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -1081,7 +1081,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1092,7 +1092,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -1104,7 +1104,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new colorbulb_1.ColorBulb(this, accessory, device);
@@ -1124,7 +1124,7 @@ class SwitchBotPlatform {
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (existingAccessory) {
             // the accessory already exists
-            if (this.registerDevice(device)) {
+            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;
@@ -1132,7 +1132,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1143,7 +1143,7 @@ class SwitchBotPlatform {
                 this.unregisterPlatformAccessories(existingAccessory);
             }
         }
-        else if (this.registerDevice(device)) {
+        else if (await this.registerDevice(device)) {
             // the accessory does not yet exist, so we need to create it
             this.infoLog(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
             // create a new accessory
@@ -1155,7 +1155,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new striplight_1.StripLight(this, accessory, device);
@@ -1181,7 +1181,7 @@ class SwitchBotPlatform {
             existingAccessory.context.firmwareRevision = device.firmware;
             existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
             this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-            existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+            existingAccessory.context.connectionType = await this.connectionType(device);
             this.api.updatePlatformAccessories([existingAccessory]);
             // create the accessory handler for the restored accessory
             // this is imported from `platformAccessory.ts`
@@ -1200,7 +1200,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new tv_1.TV(this, accessory, device);
@@ -1232,7 +1232,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1255,7 +1255,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new fan_1.Fan(this, accessory, device);
@@ -1283,7 +1283,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1306,7 +1306,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new light_1.Light(this, accessory, device);
@@ -1334,7 +1334,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1357,7 +1357,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new airconditioner_1.AirConditioner(this, accessory, device);
@@ -1385,7 +1385,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1408,7 +1408,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new airpurifier_1.AirPurifier(this, accessory, device);
@@ -1436,7 +1436,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1459,7 +1459,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new waterheater_1.WaterHeater(this, accessory, device);
@@ -1487,7 +1487,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1510,7 +1510,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new vacuumcleaner_1.VacuumCleaner(this, accessory, device);
@@ -1538,7 +1538,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1561,7 +1561,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new camera_1.Camera(this, accessory, device);
@@ -1589,7 +1589,7 @@ class SwitchBotPlatform {
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
                 this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
+                existingAccessory.context.connectionType = await this.connectionType(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1612,7 +1612,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            accessory.context.connectionType = await this.connectionTypeNew(device);
+            accessory.context.connectionType = await this.connectionType(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new other_1.Others(this, accessory, device);
@@ -1625,7 +1625,7 @@ class SwitchBotPlatform {
             this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
         }
     }
-    connectionTypeNew(device) {
+    async connectionType(device) {
         let connectionType = '';
         if (!device.connectionType && this.config.credentials?.token && this.config.credentials.secret) {
             connectionType = 'OpenAPI';
@@ -1635,16 +1635,14 @@ class SwitchBotPlatform {
         }
         return connectionType;
     }
-    connectionTypeExisting(device) {
-        return device.connectionType || 'OpenAPI';
-    }
-    registerDevice(device) {
-        if (!device.hide_device && device.enableCloudService && device.connectionType === 'OpenAPI & BLE') {
+    async registerDevice(device) {
+        device.connectionType = await this.connectionType(device);
+        if (!device.hide_device && device.enableCloudService && device.connectionType === 'BLE/OpenAPI') {
             this.registeringDevice = true;
             this.debugLog(`Device: ${device.deviceName} Both OpenAPI and BLE Connections Enabled`);
         }
         else if (!device.hide_device && device.deviceId && device.configDeviceType && device.configDeviceName
-            && !device.enableCloudService && device.connectionType === 'BLE') {
+            && device.connectionType === 'BLE') {
             this.registeringDevice = true;
             this.debugLog(`Device: ${device.deviceName} BLE Connection Enabled`);
         }
@@ -1658,15 +1656,15 @@ class SwitchBotPlatform {
         }
         else if (!device.connectionType) {
             this.registeringDevice = false;
-            this.debugLog(`Device: ${device.deviceName} Connection Type not Set, will not display in HomeKit`);
+            this.errorLog(`Device: ${device.deviceName} Connection Type not Set, will not display in HomeKit`);
         }
         else if (device.hide_device) {
             this.registeringDevice = false;
-            this.debugLog(`Device: ${device.deviceName} Device Set to Hidden, will not display in HomeKit`);
+            this.errorLog(`Device: ${device.deviceName} Device Set to Hidden, will not display in HomeKit`);
         }
         else {
             this.registeringDevice = false;
-            this.debugLog(`Device: ${device.deviceName} OpenAPI and BLE Are Not Enabled`);
+            this.errorLog(`Device: ${device.deviceName} OpenAPI or BLE Are Not Enabled`);
         }
         return this.registeringDevice;
     }