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

package/dist/platform.js

@@ -28,6 +28,7 @@ const https_1 = __importDefault(require("https"));
 const crypto_1 = __importDefault(require("crypto"));
 const buffer_1 = require("buffer");
 const fakegato_history_1 = __importDefault(require("fakegato-history"));
+const super_stringify_1 = __importDefault(require("super-stringify"));
 const fs_1 = require("fs");
 const settings_1 = require("./settings");
 /**
@@ -61,9 +62,9 @@ class SwitchBotPlatform {
             this.debugLog('Config OK');
         }
         catch (e) {
-            this.errorLog(JSON.stringify(e.message));
+            this.errorLog((0, super_stringify_1.default)(e.message));
             if (this.platformLogging?.includes('debug')) {
-                this.errorLog(JSON.stringify(e));
+                this.errorLog((0, super_stringify_1.default)(e));
             }
             return;
         }
@@ -80,14 +81,18 @@ class SwitchBotPlatform {
                 if (this.config.credentials?.openToken && !this.config.credentials.token) {
                     await this.updateToken();
                 }
+                else if (!this.config.credentials?.secret) {
+                    // eslint-disable-next-line no-useless-escape
+                    this.errorLog('\"secret\" config is not populated, you must populate then please restart Homebridge.');
+                }
                 else {
                     this.discoverDevices();
                 }
             }
             catch (e) {
-                this.errorLog('Failed to Discover Devices.', JSON.stringify(e.message));
+                this.errorLog('Failed to Discover Devices.', (0, super_stringify_1.default)(e.message));
                 if (this.platformLogging?.includes('debug')) {
-                    this.errorLog(JSON.stringify(e));
+                    this.errorLog((0, super_stringify_1.default)(e));
                 }
             }
         });
@@ -131,14 +136,14 @@ class SwitchBotPlatform {
         if (this.config.options.logging) {
             platformConfig['logging'] = this.config.options.logging;
         }
-        if (this.config.options.logging) {
+        if (this.config.options.logging && this.config.options.refreshRate) {
             platformConfig['refreshRate'] = this.config.options.refreshRate;
         }
-        if (this.config.options.logging) {
+        if (this.config.options.logging && this.config.options.pushRate) {
             platformConfig['pushRate'] = this.config.options.pushRate;
         }
         if (Object.entries(platformConfig).length !== 0) {
-            this.infoLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
+            this.infoLog(`Platform Config: ${(0, super_stringify_1.default)(platformConfig)}`);
         }
         if (this.config.options) {
             // Device Config
@@ -148,7 +153,7 @@ class SwitchBotPlatform {
                         if (!deviceConfig.deviceId) {
                             throw new Error('The devices config section is missing the *Device ID* in the config. Please check your config.');
                         }
-                        if (!deviceConfig.configDeviceType && deviceConfig.ble) {
+                        if (!deviceConfig.configDeviceType && deviceConfig.connectionType) {
                             throw new Error('The devices config section is missing the *Device Type* in the config. Please check your config.');
                         }
                     }
@@ -177,33 +182,32 @@ class SwitchBotPlatform {
             if (this.platformLogging?.includes('debug')) {
                 this.debugLog('Using Default Refresh Rate (2 minutes).');
             }
-            if (!this.config.options.pushRate) {
-                // default 100 milliseconds
-                this.config.options.pushRate = 0.1;
-                if (this.platformLogging?.includes('debug')) {
-                    this.warnLog('Using Default Push Rate.');
-                }
+        }
+        if (!this.config.options.pushRate) {
+            // default 100 milliseconds
+            this.config.options.pushRate = 0.1;
+            if (this.platformLogging?.includes('debug')) {
+                this.warnLog('Using Default Push Rate.');
             }
-            if (!this.config.credentials) {
-                if (this.platformLogging?.includes('debug')) {
-                    this.debugLog('Missing Credentials');
-                }
+        }
+        if (!this.config.credentials) {
+            if (this.platformLogging?.includes('debug')) {
+                this.debugLog('Missing Credentials');
             }
-            if (!this.config.credentials?.token) {
+        }
+        if (!this.config.credentials?.token) {
+            if (this.platformLogging?.includes('debug')) {
+                this.errorLog('Missing token');
+                this.warnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
+            }
+        }
+        if (this.config.credentials?.token) {
+            if (!this.config.credentials?.secret) {
                 if (this.platformLogging?.includes('debug')) {
-                    this.errorLog('Missing token');
+                    this.errorLog('Missing secret');
                     this.warnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
                 }
             }
-            if (this.config.credentials?.token) {
-                if (!this.config.credentials?.secret) {
-                    if (this.platformLogging?.includes('debug')) {
-                        this.errorLog('Missing secret');
-                        this.warnLog('Cloud Enabled SwitchBot Devices & IR Devices will not work');
-                    }
-                    throw Error('Missing secret');
-                }
-            }
         }
     }
     /**
@@ -233,8 +237,16 @@ class SwitchBotPlatform {
                 throw new Error('pluginConfig.credentials is not an object');
             }
             // Move openToken to token
-            this.warnLog('This plugin has been updated to use OpenAPI v1.1, config is set with openToken.');
-            this.warnLog('`openToken` config has been moved to the `token` config, Please restart Homebridge.');
+            if (!this.config.credentials.secret) {
+                // eslint-disable-next-line no-useless-escape, max-len
+                this.warnLog('This plugin has been updated to use OpenAPI v1.1, config is set with openToken, \"openToken\" cconfig has been moved to the \"token\" config');
+                // eslint-disable-next-line no-useless-escape
+                this.errorLog('\"secret\" config is not populated, you must populate then please restart Homebridge.');
+            }
+            else {
+                // eslint-disable-next-line no-useless-escape, max-len
+                this.warnLog('This plugin has been updated to use OpenAPI v1.1, config is set with openToken, \"openToken\" config has been moved to the \"token\" config, please restart Homebridge.');
+            }
             // set the refresh token
             pluginConfig.credentials.token = this.config.credentials?.openToken;
             pluginConfig.credentials.openToken = 'Delete';
@@ -276,7 +288,7 @@ class SwitchBotPlatform {
                 };
                 const req = https_1.default.request(options, (res) => {
                     this.debugLog(`statusCode: ${res.statusCode}`);
-                    this.debugLog(`headers: ${JSON.stringify(res.headers)}`);
+                    this.debugLog(`headers: ${(0, super_stringify_1.default)(res.headers)}`);
                     let rawData = '';
                     res.on('data', (d) => {
                         rawData += d;
@@ -285,7 +297,7 @@ class SwitchBotPlatform {
                     res.on('end', () => {
                         try {
                             const devicesAPI = JSON.parse(rawData);
-                            this.debugLog(`devicesAPI: ${JSON.stringify(devicesAPI.body)}`);
+                            this.debugLog(`devicesAPI: ${(0, super_stringify_1.default)(devicesAPI.body)}`);
                             // SwitchBot Devices
                             if (devicesAPI.body.deviceList.length !== 0) {
                                 this.infoLog(`Total SwitchBot Devices Found: ${devicesAPI.body.deviceList.length}`);
@@ -295,7 +307,7 @@ class SwitchBotPlatform {
                             }
                             const deviceLists = devicesAPI.body.deviceList;
                             if (!this.config.options?.devices) {
-                                this.debugLog(`SwitchBot Device Config Not Set: ${JSON.stringify(this.config.options?.devices)}`);
+                                this.debugLog(`SwitchBot Device Config Not Set: ${(0, super_stringify_1.default)(this.config.options?.devices)}`);
                                 const devices = deviceLists.map((v) => v);
                                 for (const device of devices) {
                                     if (device.deviceType) {
@@ -307,14 +319,14 @@ class SwitchBotPlatform {
                                 }
                             }
                             else if (this.config.credentials?.token && this.config.options.devices) {
-                                this.debugLog(`SwitchBot Device Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+                                this.debugLog(`SwitchBot Device Config Set: ${(0, super_stringify_1.default)(this.config.options?.devices)}`);
                                 const deviceConfigs = this.config.options?.devices;
                                 const mergeBydeviceId = (a1, a2) => a1.map((itm) => ({
                                     ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
                                     ...itm,
                                 }));
                                 const devices = mergeBydeviceId(deviceLists, deviceConfigs);
-                                this.debugLog(`SwitchBot Devices: ${JSON.stringify(devices)}`);
+                                this.debugLog(`SwitchBot Devices: ${(0, super_stringify_1.default)(devices)}`);
                                 for (const device of devices) {
                                     if (device.deviceType) {
                                         if (device.configDeviceName) {
@@ -336,7 +348,7 @@ class SwitchBotPlatform {
                             }
                             const irDeviceLists = devicesAPI.body.infraredRemoteList;
                             if (!this.config.options?.irdevices) {
-                                this.debugLog(`IR Device Config Not Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                                this.debugLog(`IR Device Config Not Set: ${(0, super_stringify_1.default)(this.config.options?.irdevices)}`);
                                 const devices = irDeviceLists.map((v) => v);
                                 for (const device of devices) {
                                     if (device.remoteType) {
@@ -345,14 +357,14 @@ class SwitchBotPlatform {
                                 }
                             }
                             else {
-                                this.debugLog(`IR Device Config Set: ${JSON.stringify(this.config.options?.irdevices)}`);
+                                this.debugLog(`IR Device Config Set: ${(0, super_stringify_1.default)(this.config.options?.irdevices)}`);
                                 const irDeviceConfig = this.config.options?.irdevices;
                                 const mergeIRBydeviceId = (a1, a2) => a1.map((itm) => ({
                                     ...a2.find((item) => item.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') === itm.deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '') && item),
                                     ...itm,
                                 }));
                                 const devices = mergeIRBydeviceId(irDeviceLists, irDeviceConfig);
-                                this.debugLog(`IR Devices: ${JSON.stringify(devices)}`);
+                                this.debugLog(`IR Devices: ${(0, super_stringify_1.default)(devices)}`);
                                 for (const device of devices) {
                                     if (device.remoteType) {
                                         this.createIRDevice(device);
@@ -371,7 +383,7 @@ class SwitchBotPlatform {
                 req.end();
             }
             else if (!this.config.credentials?.token && this.config.options?.devices) {
-                this.debugLog(`SwitchBot Device Manual Config Set: ${JSON.stringify(this.config.options?.devices)}`);
+                this.debugLog(`SwitchBot Device Manual Config Set: ${(0, super_stringify_1.default)(this.config.options?.devices)}`);
                 const deviceConfigs = this.config.options?.devices;
                 const devices = deviceConfigs.map((v) => v);
                 for (const device of devices) {
@@ -432,10 +444,10 @@ class SwitchBotPlatform {
             this.errorLog('Failed to Discover Devices');
         }
         if (this.platformLogging === 'debug') {
-            this.errorLog(`Failed to Discover Devices, Error Message: ${JSON.stringify(e.message)}`);
+            this.errorLog(`Failed to Discover Devices, Error Message: ${(0, super_stringify_1.default)(e.message)}`);
         }
         if (this.platformLogging === 'debugMode') {
-            this.errorLog(`Failed to Discover Devices, Error: ${JSON.stringify(e)}`);
+            this.errorLog(`Failed to Discover Devices, Error: ${(0, super_stringify_1.default)(e)}`);
         }
     }
     createDevice(device) {
@@ -568,25 +580,6 @@ class SwitchBotPlatform {
                 this.warnLog('Submit Feature Requests Here: https://git.io/JL14Z');
         }
     }
-    registerDevice(device) {
-        if (!device.hide_device && device.enableCloudService && device.ble) {
-            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) {
-            this.registeringDevice = true;
-            this.debugLog(`Device: ${device.deviceName} BLE Connection Enabled`);
-        }
-        else if (!device.hide_device && device.enableCloudService && !device.ble) {
-            this.registeringDevice = true;
-            this.debugLog(`Device: ${device.deviceName} OpenAPI Connection Enabled`);
-        }
-        else {
-            this.registeringDevice = false;
-            this.debugLog(`Device: ${device.deviceName} OpenAPI and BLE Are Not Enabled`);
-        }
-        return this.registeringDevice;
-    }
     async createHumidifier(device) {
         const uuid = this.api.hap.uuid.generate(`${device.deviceId}-${device.deviceType}`);
         // see if an accessory with the same uuid has already been registered and restored from
@@ -595,15 +588,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
-                //existingAccessory.context.firmwareRevision = firmware;
                 existingAccessory.context.model = device.deviceType;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -626,13 +618,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new humidifier_1.Humidifier(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -647,15 +639,15 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
-                this.debugLog(JSON.stringify(device.bot?.mode));
+                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;
                 existingAccessory.context.deviceID = device.deviceId;
-                existingAccessory.displayName = device.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -669,7 +661,7 @@ class SwitchBotPlatform {
         else if (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(JSON.stringify(device.bot?.mode));
+            this.debugLog((0, super_stringify_1.default)(device.bot?.mode));
             // create a new accessory
             const accessory = new this.api.platformAccessory(device.deviceName, uuid);
             // store a copy of the device object in the `accessory.context`
@@ -679,14 +671,14 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // accessory.context.firmwareRevision = findaccessories.accessoryAttribute.softwareRevision;
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new bot_1.Bot(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -701,14 +693,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -731,13 +723,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new meter_1.Meter(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -752,14 +744,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -782,13 +774,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new meterplus_1.MeterPlus(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -803,14 +795,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -833,13 +825,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new motion_1.Motion(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -854,14 +846,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -884,13 +876,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new contact_1.Contact(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -905,14 +897,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.isCurtainGrouped(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -947,13 +939,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new curtain_1.Curtain(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -980,14 +972,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1010,13 +1002,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new plug_1.Plug(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1031,14 +1023,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1061,13 +1053,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new lock_1.Lock(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1082,14 +1074,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1112,13 +1104,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new colorbulb_1.ColorBulb(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1133,14 +1125,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (this.registerDevice(device)) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-                await this.connectionTypeExistingAccessory(device, existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1163,13 +1155,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `SwitchBot: ${device.deviceType}`;
-            await this.connectionTypeNewAccessory(device, accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new striplight_1.StripLight(this, accessory, device);
             this.debugLog(`${device.deviceType} uuid: ${device.deviceId}-${device.deviceType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1182,14 +1174,14 @@ class SwitchBotPlatform {
         // the cached devices we stored in the `configureAccessory` method above
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         if (!device.hide_device && existingAccessory) {
-            this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
             // 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.deviceName;
+            existingAccessory.displayName = device.configDeviceName || device.deviceName;
             existingAccessory.context.firmwareRevision = device.firmware;
             existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeExistingIRAccessory(existingAccessory);
+            this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+            existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
             this.api.updatePlatformAccessories([existingAccessory]);
             // create the accessory handler for the restored accessory
             // this is imported from `platformAccessory.ts`
@@ -1208,7 +1200,7 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new tv_1.TV(this, accessory, device);
@@ -1218,7 +1210,7 @@ class SwitchBotPlatform {
              * Only one TV can exist per bridge, to bypass this limitation, you should
              * publish your TV as an external accessory.
              */
-            this.api.publishExternalAccessories(settings_1.PLUGIN_NAME, [accessory]);
+            this.externalAccessory(accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1233,14 +1225,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1263,13 +1255,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new fan_1.Fan(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1284,14 +1276,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1314,13 +1306,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new light_1.Light(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1335,14 +1327,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1365,13 +1357,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new airconditioner_1.AirConditioner(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1386,14 +1378,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1416,13 +1408,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new airpurifier_1.AirPurifier(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1437,14 +1429,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1467,13 +1459,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new waterheater_1.WaterHeater(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1488,14 +1480,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1518,13 +1510,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new vacuumcleaner_1.VacuumCleaner(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1539,14 +1531,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1569,13 +1561,13 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new camera_1.Camera(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
@@ -1590,14 +1582,14 @@ class SwitchBotPlatform {
         if (existingAccessory) {
             // the accessory already exists
             if (!device.hide_device && device.hubDeviceId) {
-                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
                 // 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.deviceName;
+                existingAccessory.displayName = device.configDeviceName || device.deviceName;
                 existingAccessory.context.firmwareRevision = device.firmware;
                 existingAccessory.context.deviceType = `IR: ${device.remoteType}`;
-                await this.connectionTypeExistingIRAccessory(existingAccessory);
+                this.infoLog(`Restoring existing accessory from cache: ${existingAccessory.displayName} DeviceID: ${device.deviceId}`);
+                existingAccessory.context.connectionType = await this.connectionTypeExisting(device);
                 this.api.updatePlatformAccessories([existingAccessory]);
                 // create the accessory handler for the restored accessory
                 // this is imported from `platformAccessory.ts`
@@ -1620,40 +1612,76 @@ class SwitchBotPlatform {
             accessory.context.deviceID = device.deviceId;
             accessory.context.firmwareRevision = device.firmware;
             accessory.context.deviceType = `IR: ${device.remoteType}`;
-            await this.connectionTypeNewIRAccessory(accessory);
+            accessory.context.connectionType = await this.connectionTypeNew(device);
             // create the accessory handler for the newly create accessory
             // this is imported from `platformAccessory.ts`
             new other_1.Others(this, accessory, device);
             this.debugLog(`${device.remoteType} uuid: ${device.deviceId}-${device.remoteType}, (${accessory.UUID})`);
-            // link the accessory to your platform
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+            // publish device externally or link the accessory to your platform
+            this.externalOrPlatform(device, accessory);
             this.accessories.push(accessory);
         }
         else {
             this.debugLog(`Unable to Register new device: ${device.deviceName} ${device.remoteType} - ${device.deviceId}`);
         }
     }
-    async connectionTypeNewAccessory(device, accessory) {
-        if (device.ble) {
-            accessory.context.connectionType = 'BLE';
+    connectionTypeNew(device) {
+        let connectionType = '';
+        if (!device.connectionType && this.config.credentials?.token && this.config.credentials.secret) {
+            connectionType = 'OpenAPI';
         }
         else {
-            accessory.context.connectionType = 'OpenAPI';
+            connectionType = device.connectionType;
         }
+        return connectionType;
+    }
+    connectionTypeExisting(device) {
+        return device.connectionType || 'OpenAPI';
     }
-    async connectionTypeExistingAccessory(device, existingAccessory) {
-        if (device.ble) {
-            existingAccessory.context.connectionType = 'BLE';
+    registerDevice(device) {
+        if (!device.hide_device && device.enableCloudService && device.connectionType === 'OpenAPI & BLE') {
+            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') {
+            this.registeringDevice = true;
+            this.debugLog(`Device: ${device.deviceName} BLE Connection Enabled`);
+        }
+        else if (!device.hide_device && device.enableCloudService && device.connectionType === 'OpenAPI') {
+            this.registeringDevice = true;
+            this.debugLog(`Device: ${device.deviceName} OpenAPI Connection Enabled`);
+        }
+        else if (!device.hide_device && device.enableCloudService && device.connectionType === 'Disable') {
+            this.registeringDevice = true;
+            this.debugLog(`Device: ${device.deviceName} Device connection Disabled, will continue to display in HomeKit`);
+        }
+        else if (!device.connectionType) {
+            this.registeringDevice = false;
+            this.debugLog(`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`);
         }
         else {
-            existingAccessory.context.connectionType = 'OpenAPI';
+            this.registeringDevice = false;
+            this.debugLog(`Device: ${device.deviceName} OpenAPI and BLE Are Not Enabled`);
         }
+        return this.registeringDevice;
     }
-    async connectionTypeNewIRAccessory(accessory) {
-        accessory.context.connectionType = 'IR wirth OpenAPI';
+    async externalOrPlatform(device, accessory) {
+        this.debugLog(`${accessory.displayName} External Accessory Mode: ${device.external}`);
+        if (device.external) {
+            this.warnLog(`${accessory.displayName} External Accessory Mode`);
+            this.externalAccessory(accessory);
+        }
+        else {
+            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+        }
     }
-    async connectionTypeExistingIRAccessory(existingAccessory) {
-        existingAccessory.context.connectionType = 'IR with OpenAPI';
+    async externalAccessory(accessory) {
+        this.api.publishExternalAccessories(settings_1.PLUGIN_NAME, [accessory]);
     }
     unregisterPlatformAccessories(existingAccessory) {
         // remove platform accessories when no longer present
@@ -1662,12 +1690,12 @@ class SwitchBotPlatform {
     }
     deviceListInfo(devices) {
         if (this.platformLogging?.includes('debug')) {
-            this.warnLog(`deviceListInfoStatus: ${JSON.stringify(devices)}`);
+            this.warnLog(`deviceListInfoStatus: ${(0, super_stringify_1.default)(devices)}`);
         }
     }
     async deviceInfo(device) {
         if (this.platformLogging?.includes('debug')) {
-            this.warnLog(JSON.stringify(device));
+            this.warnLog((0, super_stringify_1.default)(device));
             const t = Date.now();
             const nonce = 'requestID';
             const data = this.config.credentials?.token + t + nonce;
@@ -1699,10 +1727,10 @@ class SwitchBotPlatform {
             req.end();
             this.deviceStatus = req;
             if (this.deviceStatus.message === 'success') {
-                this.warnLog(`${device.deviceName} deviceInfoStatus: ${JSON.stringify(this.deviceStatus)}`);
+                this.warnLog(`${device.deviceName} deviceInfoStatus: ${(0, super_stringify_1.default)(this.deviceStatus)}`);
             }
             else {
-                this.warnLog(`${device.deviceName} deviceInfoStatus: ${JSON.stringify(this.deviceStatus.message)}`);
+                this.warnLog(`${device.deviceName} deviceInfoStatus: ${(0, super_stringify_1.default)(this.deviceStatus.message)}`);
                 this.warnLog('Unable to retreive deviceInfoStatus.');
             }
         }