@switchbot/homebridge-switchbot 3.8.3 → 4.0.0-beta.1

package/dist/platform.js

@@ -1,18 +1,10 @@
-import { Buffer } from 'node:buffer';
-import crypto, { randomUUID } from 'node:crypto';
-import { readFileSync, writeFileSync } from 'node:fs';
-import { createServer } from 'node:http';
+import { readFileSync } from 'node:fs';
 import process from 'node:process';
 import asyncmqtt from 'async-mqtt';
 import fakegato from 'fakegato-history';
 import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes';
-/*
-* For Testing Locally:
-* import { SwitchBotModel } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
-*/
-import { SwitchBot, SwitchBotModel } from 'node-switchbot';
+import { LogLevel, SwitchBotBLE, SwitchBotModel, SwitchBotOpenAPI } from 'node-switchbot';
 import { queueScheduler } from 'rxjs';
-import { request } from 'undici';
 import { BlindTilt } from './device/blindtilt.js';
 import { Bot } from './device/bot.js';
 import { CeilingLight } from './device/ceilinglight.js';
@@ -40,7 +32,7 @@ import { Others } from './irdevice/other.js';
 import { TV } from './irdevice/tv.js';
 import { VacuumCleaner } from './irdevice/vacuumcleaner.js';
 import { WaterHeater } from './irdevice/waterheater.js';
-import { deleteWebhook, Devices, PLATFORM_NAME, PLUGIN_NAME, queryWebhook, setupWebhook, updateWebhook } from './settings.js';
+import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
 import { formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, sleep } from './utils.js';
 /**
  * HomebridgePlatform
@@ -64,6 +56,9 @@ export class SwitchBotPlatform {
     // MQTT and Webhook properties
     mqttClient = null;
     webhookEventListener = null;
+    // SwitchBot APIs
+    switchBotAPI;
+    switchBotBLE;
     // External APIs
     eve;
     fakegatoAPI;
@@ -75,6 +70,7 @@ export class SwitchBotPlatform {
         this.log = log;
         // only load if configured
         if (!config) {
+            this.log.error('No configuration found for the plugin, please check your config.');
             return;
         }
         // Plugin options into our config variables.
@@ -83,6 +79,8 @@ export class SwitchBotPlatform {
             name: config.name,
             credentials: config.credentials,
             options: config.options,
+            devices: config.devices,
+            deviceConfig: config.deviceConfig,
         };
         // Plugin Configuration
         this.getPlatformLogSettings();
@@ -96,10 +94,52 @@ export class SwitchBotPlatform {
             this.debugLog('Config OK');
         }
         catch (e) {
-            this.errorLog(`Verify Config, Error Message: ${e.message}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
-            this.debugErrorLog(`Verify Config, Error: ${e}`);
+            this.errorLog(`Verify Config, Error Message: ${e.message ?? e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+            this.debugErrorLog(`Verify Config, Error: ${e.message ?? e}`);
             return;
         }
+        // SwitchBot OpenAPI
+        if (this.config.credentials?.token && this.config.credentials?.secret) {
+            this.switchBotAPI = new SwitchBotOpenAPI(this.config.credentials.token, this.config.credentials.secret);
+        }
+        else {
+            this.debugErrorLog('Missing SwitchBot API credentials (token or secret).');
+        }
+        // Listen for log events
+        if (!this.config.options?.disableLogsforOpenAPI && this.switchBotAPI) {
+            this.switchBotAPI.on('log', (log) => {
+                switch (log.level) {
+                    case LogLevel.SUCCESS:
+                        this.successLog(log.message);
+                        break;
+                    case LogLevel.DEBUGSUCCESS:
+                        this.debugSuccessLog(log.message);
+                        break;
+                    case LogLevel.WARN:
+                        this.warnLog(log.message);
+                        break;
+                    case LogLevel.DEBUGWARN:
+                        this.debugWarnLog(log.message);
+                        break;
+                    case LogLevel.ERROR:
+                        this.errorLog(log.message);
+                        break;
+                    case LogLevel.DEBUGERROR:
+                        this.debugErrorLog(log.message);
+                        break;
+                    case LogLevel.DEBUG:
+                        this.debugLog(log.message);
+                        break;
+                    case LogLevel.INFO:
+                    default:
+                        this.infoLog(log.message);
+                }
+            });
+        }
+        else {
+            this.debugErrorLog(`SwitchBot OpenAPI logs are disabled, enable it by setting disableLogsforOpenAPI to false.`);
+            this.debugLog(`SwitchBot OpenAPI: ${JSON.stringify(this.switchBotAPI)}, disableLogsforOpenAPI: ${this.config.options?.disableLogsforOpenAPI}`);
+        }
         // import fakegato-history module and EVE characteristics
         this.fakegatoAPI = fakegato(api);
         this.eve = new EveHomeKitTypes(api);
@@ -111,38 +151,30 @@ export class SwitchBotPlatform {
             await this.debugLog('Executed didFinishLaunching callback');
             // run the method to discover / register your devices as accessories
             try {
-                if (this.config.credentials?.openToken && !this.config.credentials.token) {
-                    await this.updateToken();
-                }
-                else if (this.config.credentials?.token && !this.config.credentials?.secret) {
-                    await this.errorLog('"secret" config is not populated, you must populate then please restart Homebridge.');
-                }
-                else {
-                    await this.discoverDevices();
-                }
+                await this.discoverDevices();
             }
             catch (e) {
-                await this.errorLog(`Failed to Discover, Error Message: ${e.message}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
-                await this.debugErrorLog(`Failed to Discover, Error: ${e}`);
+                await this.errorLog(`Failed to Discover, Error Message: ${e.message ?? e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+                await this.debugErrorLog(`Failed to Discover, Error: ${e.message ?? e}`);
             }
         });
         try {
             this.setupMqtt();
         }
         catch (e) {
-            this.errorLog(`Setup MQTT, Error Message: ${e.message}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+            this.errorLog(`Setup MQTT, Error Message: ${e.message ?? e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
         }
         try {
             this.setupwebhook();
         }
         catch (e) {
-            this.errorLog(`Setup Webhook, Error Message: ${e.message}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+            this.errorLog(`Setup Webhook, Error Message: ${e.message ?? e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
         }
         try {
             this.setupBlE();
         }
         catch (e) {
-            this.errorLog(`Setup Platform BLE, Error Message: ${e.message}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
+            this.errorLog(`Setup Platform BLE, Error Message: ${e.message ?? e}, Submit Bugs Here: ` + 'https://tinyurl.com/SwitchBotBug');
         }
     }
     async setupMqtt() {
@@ -152,7 +184,7 @@ export class SwitchBotPlatform {
                 this.mqttClient = await connectAsync(this.config.options?.mqttURL, this.config.options.mqttOptions || {});
                 await this.debugLog('MQTT connection has been established successfully.');
                 this.mqttClient.on('error', async (e) => {
-                    await this.errorLog(`Failed to publish MQTT messages. ${e}`);
+                    await this.errorLog(`Failed to publish MQTT messages. ${e.message ?? e}`);
                 });
                 if (!this.config.options?.webhookURL) {
                     // receive webhook events via MQTT
@@ -165,14 +197,14 @@ export class SwitchBotPlatform {
                             this.webhookEventHandler[context.deviceMac]?.(context);
                         }
                         catch (e) {
-                            await this.errorLog(`Failed to handle webhook event. Error:${e}`);
+                            await this.errorLog(`Failed to handle webhook event. Error:${e.message ?? e}`);
                         }
                     });
                 }
             }
             catch (e) {
                 this.mqttClient = null;
-                await this.errorLog(`Failed to establish MQTT connection. ${e}`);
+                await this.errorLog(`Failed to establish MQTT connection. ${e.message ?? e}`);
             }
         }
     }
@@ -181,160 +213,96 @@ export class SwitchBotPlatform {
         if (this.config.options?.webhookURL) {
             const url = this.config.options?.webhookURL;
             try {
-                const xurl = new URL(url);
-                const port = Number(xurl.port);
-                const path = xurl.pathname;
-                this.webhookEventListener = createServer((request, response) => {
-                    try {
-                        if (request.url === path && request.method === 'POST') {
-                            request.on('data', async (data) => {
-                                try {
-                                    const body = JSON.parse(data);
-                                    await this.debugLog(`Received Webhook: ${JSON.stringify(body)}`);
-                                    if (this.config.options?.mqttURL) {
-                                        const mac = body.context.deviceMac?.toLowerCase().match(/[\s\S]{1,2}/g)?.join(':');
-                                        const options = this.config.options?.mqttPubOptions || {};
-                                        this.mqttClient?.publish(`homebridge-switchbot/webhook/${mac}`, `${JSON.stringify(body.context)}`, options);
-                                    }
-                                    this.webhookEventHandler[body.context.deviceMac]?.(body.context);
-                                }
-                                catch (e) {
-                                    await this.errorLog(`Failed to handle webhook event. Error:${e}`);
-                                }
-                            });
-                            response.writeHead(200, { 'Content-Type': 'text/plain' });
-                            response.end('OK');
-                        }
-                        // else {
-                        //   response.writeHead(403, {'Content-Type': 'text/plain'});
-                        //   response.end(`NG`);
-                        // }
+                this.switchBotAPI.setupWebhook(url);
+                // Listen for webhook events
+                this.switchBotAPI.on('webhookEvent', (body) => {
+                    if (this.config.options?.mqttURL) {
+                        const mac = body.context.deviceMac?.toLowerCase().match(/[\s\S]{1,2}/g)?.join(':');
+                        const options = this.config.options?.mqttPubOptions || {};
+                        this.mqttClient?.publish(`homebridge-switchbot/webhook/${mac}`, `${JSON.stringify(body.context)}`, options);
                     }
-                    catch (e) {
-                        this.errorLog(`Failed to handle webhook event. Error:${e}`);
-                    }
-                }).listen(port || 80);
-            }
-            catch (e) {
-                await this.errorLog(`Failed to create webhook listener. Error:${e.message}`);
-                return;
-            }
-            try {
-                const { body, statusCode } = await request(setupWebhook, {
-                    method: 'POST',
-                    headers: this.generateHeaders(),
-                    body: JSON.stringify({
-                        action: 'setupWebhook',
-                        url,
-                        deviceList: 'ALL',
-                    }),
+                    this.webhookEventHandler[body.context.deviceMac]?.(body.context);
                 });
-                const response = await body.json();
-                await this.debugLog(`setupWebhook: url:${url}, body:${JSON.stringify(response)}, statusCode:${statusCode}`);
-                if (statusCode !== 200 || response?.statusCode !== 100) {
-                    await this.errorLog(`Failed to configure webhook. Existing webhook well be overridden. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-                }
-            }
-            catch (e) {
-                await this.errorLog(`Failed to configure webhook. Error: ${e.message}`);
-            }
-            try {
-                const { body, statusCode } = await request(updateWebhook, {
-                    method: 'POST',
-                    headers: this.generateHeaders(),
-                    body: JSON.stringify({
-                        action: 'updateWebhook',
-                        config: {
-                            url,
-                            enable: true,
-                        },
-                    }),
-                });
-                const response = await body.json();
-                await this.debugLog(`updateWebhook: url:${url}, body:${JSON.stringify(response)}, statusCode:${statusCode}`);
-                if (statusCode !== 200 || response?.statusCode !== 100) {
-                    await this.errorLog(`Failed to update webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-                }
-            }
-            catch (e) {
-                await this.errorLog(`Failed to update webhook. Error:${e.message}`);
-            }
-            try {
-                const { body, statusCode } = await request(queryWebhook, {
-                    method: 'POST',
-                    headers: this.generateHeaders(),
-                    body: JSON.stringify({
-                        action: 'queryUrl',
-                    }),
-                });
-                const response = await body.json();
-                await this.debugLog(`queryWebhook: body:${JSON.stringify(response)}`);
-                await this.debugLog(`queryWebhook: statusCode:${statusCode}`);
-                if (statusCode !== 200 || response?.statusCode !== 100) {
-                    await this.errorLog(`Failed to query webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-                }
-                else {
-                    await this.infoLog(`Listening webhook on ${response?.body?.urls[0]}`);
-                }
             }
             catch (e) {
-                await this.errorLog(`Failed to query webhook. Error:${e}`);
+                await this.errorLog(`Failed to setup webhook. Error:${e.message ?? e}`);
             }
             this.api.on('shutdown', async () => {
                 try {
-                    const { body, statusCode } = await request(deleteWebhook, {
-                        method: 'POST',
-                        headers: this.generateHeaders(),
-                        body: JSON.stringify({
-                            action: 'deleteWebhook',
-                            url,
-                        }),
-                    });
-                    const response = await body.json();
-                    await this.debugLog(`deleteWebhook: url:${url}, body:${JSON.stringify(response)}, statusCode:${statusCode}`);
-                    if (statusCode !== 200 || response?.statusCode !== 100) {
-                        await this.errorLog(`Failed to delete webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-                    }
-                    else {
-                        await this.infoLog('Unregistered webhook to close listening.');
-                    }
+                    this.switchBotAPI.deleteWebhook(url);
                 }
                 catch (e) {
-                    await this.errorLog(`Failed to delete webhook. Error:${e.message}`);
+                    await this.errorLog(`Failed to delete webhook. Error:${e.message ?? e}`);
                 }
             });
         }
     }
     async setupBlE() {
+        this.switchBotBLE = new SwitchBotBLE();
+        // Listen for log events
+        if (!this.config.options?.disableLogsforBLE) {
+            this.switchBotBLE.on('log', (log) => {
+                switch (log.level) {
+                    case LogLevel.SUCCESS:
+                        this.successLog(log.message);
+                        break;
+                    case LogLevel.DEBUGSUCCESS:
+                        this.debugSuccessLog(log.message);
+                        break;
+                    case LogLevel.WARN:
+                        this.warnLog(log.message);
+                        break;
+                    case LogLevel.DEBUGWARN:
+                        this.debugWarnLog(log.message);
+                        break;
+                    case LogLevel.ERROR:
+                        this.errorLog(log.message);
+                        break;
+                    case LogLevel.DEBUGERROR:
+                        this.debugErrorLog(log.message);
+                        break;
+                    case LogLevel.DEBUG:
+                        this.debugLog(log.message);
+                        break;
+                    case LogLevel.INFO:
+                    default:
+                        this.infoLog(log.message);
+                }
+            });
+        }
         if (this.config.options?.BLE) {
             await this.debugLog('setupBLE');
-            const switchbot = new SwitchBot();
-            if (switchbot === undefined) {
-                await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${switchbot}`);
+            if (this.switchBotBLE === undefined) {
+                await this.errorLog(`wasn't able to establish BLE Connection, node-switchbot: ${JSON.stringify(this.switchBotBLE)}`);
             }
             else {
                 // Start to monitor advertisement packets
                 (async () => {
                     // Start to monitor advertisement packets
                     await this.debugLog('Scanning for BLE SwitchBot devices...');
-                    await switchbot.startScan();
+                    try {
+                        await this.switchBotBLE.startScan();
+                    }
+                    catch (e) {
+                        await this.errorLog(`Failed to start BLE scanning. Error:${e.message ?? e}`);
+                    }
                     // Set an event handler to monitor advertisement packets
-                    switchbot.onadvertisement = async (ad) => {
+                    this.switchBotBLE.onadvertisement = async (ad) => {
                         try {
                             this.bleEventHandler[ad.address]?.(ad.serviceData);
                         }
                         catch (e) {
-                            await this.errorLog(`Failed to handle BLE event. Error:${e}`);
+                            await this.errorLog(`Failed to handle BLE event. Error:${e.message ?? e}`);
                         }
                     };
                 })();
                 this.api.on('shutdown', async () => {
                     try {
-                        switchbot.stopScan();
+                        // this.switchBotBLE.stopScan()
                         await this.infoLog('Stopped BLE scanning to close listening.');
                     }
                     catch (e) {
-                        await this.errorLog(`Failed to stop Platform BLE scanning. Error:${e.message}`);
+                        await this.errorLog(`Failed to stop Platform BLE scanning. Error:${e.message ?? e}`);
                     }
                 });
             }
@@ -445,70 +413,6 @@ export class SwitchBotPlatform {
             }
         }
     }
-    /**
-     * The openToken was old config.
-     * This method saves the openToken as the token in the config.json file
-     */
-    async updateToken() {
-        try {
-            // check the new token was provided
-            if (!this.config.credentials?.openToken) {
-                throw new Error('New token not provided');
-            }
-            // load in the current config
-            const currentConfig = JSON.parse(readFileSync(this.api.user.configPath(), 'utf8'));
-            // check the platforms section is an array before we do array things on it
-            if (!Array.isArray(currentConfig.platforms)) {
-                throw new TypeError('Cannot find platforms array in config');
-            }
-            // find this plugins current config
-            const pluginConfig = currentConfig.platforms.find((x) => x.platform === PLATFORM_NAME);
-            if (!pluginConfig) {
-                throw new Error(`Cannot find config for ${PLATFORM_NAME} in platforms array`);
-            }
-            // check the .credentials is an object before doing object things with it
-            if (typeof pluginConfig.credentials !== 'object') {
-                throw new TypeError('pluginConfig.credentials is not an object');
-            }
-            // Move openToken to token
-            if (!this.config.credentials.secret) {
-                await 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');
-                this.errorLog('"secret" config is not populated, you must populate then please restart Homebridge.');
-            }
-            else {
-                await 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;
-            if (pluginConfig.credentials.token) {
-                pluginConfig.credentials.openToken = undefined;
-            }
-            await this.debugWarnLog(`token: ${pluginConfig.credentials.token}`);
-            // save the config, ensuring we maintain pretty json
-            writeFileSync(this.api.user.configPath(), JSON.stringify(currentConfig, null, 4));
-            await this.verifyConfig();
-        }
-        catch (e) {
-            await this.errorLog(`Update Token: ${e}`);
-        }
-    }
-    generateHeaders = () => {
-        const t = `${Date.now()}`;
-        const nonce = randomUUID();
-        const data = this.config.credentials?.token + t + nonce;
-        const signTerm = crypto
-            .createHmac('sha256', this.config.credentials?.secret)
-            .update(Buffer.from(data, 'utf-8'))
-            .digest();
-        const sign = signTerm.toString('base64');
-        return {
-            'Authorization': this.config.credentials?.token,
-            'sign': sign,
-            'nonce': nonce,
-            't': t,
-            'Content-Type': 'application/json',
-        };
-    };
     async discoverDevices() {
         if (!this.config.credentials?.token) {
             return this.handleManualConfig();
@@ -521,24 +425,22 @@ export class SwitchBotPlatform {
         await this.debugWarnLog(`Delay Between Retries: ${delayBetweenRetries}`);
         while (retryCount < maxRetries) {
             try {
-                const { body, statusCode } = await request(Devices, { headers: this.generateHeaders() });
-                await this.debugWarnLog(`statusCode: ${statusCode}`);
-                const devicesAPI = await body.json();
-                await this.debugWarnLog(`devicesAPI: ${JSON.stringify(devicesAPI)}`);
-                if (this.isSuccessfulResponse(statusCode, devicesAPI.statusCode)) {
-                    await this.handleDevices(devicesAPI.body.deviceList);
-                    await this.handleIRDevices(devicesAPI.body.infraredRemoteList);
+                const { response, statusCode } = await this.switchBotAPI.getDevices();
+                await this.debugLog(`response: ${JSON.stringify(response)}`);
+                if (this.isSuccessfulResponse(statusCode)) {
+                    await this.handleDevices(Array.isArray(response.body.deviceList) ? response.body.deviceList : []);
+                    await this.handleIRDevices(Array.isArray(response.body.infraredRemoteList) ? response.body.infraredRemoteList : []);
                     break;
                 }
                 else {
-                    await this.handleErrorResponse(statusCode, devicesAPI.statusCode, retryCount, maxRetries, delayBetweenRetries);
+                    await this.handleErrorResponse(statusCode, retryCount, maxRetries, delayBetweenRetries);
                     retryCount++;
                 }
             }
             catch (e) {
                 retryCount++;
                 await this.debugErrorLog(`Failed to Discover Devices, Error Message: ${JSON.stringify(e.message)}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`);
-                await this.debugErrorLog(`Failed to Discover Devices, Error: ${e}`);
+                await this.debugErrorLog(`Failed to Discover Devices, Error: ${e.message ?? e}`);
             }
         }
     }
@@ -565,8 +467,8 @@ export class SwitchBotPlatform {
             await this.errorLog('Neither SwitchBot Token or Device Config are set.');
         }
     }
-    isSuccessfulResponse(statusCode, apiStatusCode) {
-        return (statusCode === 200 || statusCode === 100) && (apiStatusCode === 200 || apiStatusCode === 100);
+    isSuccessfulResponse(apiStatusCode) {
+        return (apiStatusCode === 200 || apiStatusCode === 100);
     }
     async handleDevices(deviceLists) {
         if (!this.config.options?.devices) {
@@ -631,11 +533,10 @@ export class SwitchBotPlatform {
             return { ...matchingItem, ...itm };
         });
     }
-    async handleErrorResponse(statusCode, apiStatusCode, retryCount, maxRetries, delayBetweenRetries) {
-        await this.statusCode(statusCode);
+    async handleErrorResponse(apiStatusCode, retryCount, maxRetries, delayBetweenRetries) {
         await this.statusCode(apiStatusCode);
-        if (statusCode === 500) {
-            this.infoLog(`statusCode: ${statusCode} Attempt ${retryCount + 1} of ${maxRetries}`);
+        if (apiStatusCode === 500) {
+            this.infoLog(`statusCode: ${apiStatusCode} Attempt ${retryCount + 1} of ${maxRetries}`);
             await sleep(delayBetweenRetries);
         }
     }
@@ -1299,7 +1200,7 @@ export class SwitchBotPlatform {
         }
         else if (await this.registerDevice(device)) {
             if (isBlindTiltDevice(device)) {
-                if (device.group && !device.curtain?.disable_group) {
+                if (device.group && !device.disable_group) {
                     this.debugLog('Your Curtains are grouped, '
                         + `, Secondary curtain automatically hidden. Main Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                 }
@@ -1373,7 +1274,7 @@ export class SwitchBotPlatform {
         }
         else if (await this.registerDevice(device)) {
             if (isCurtainDevice(device)) {
-                if (device.group && !device.curtain?.disable_group) {
+                if (device.group && !device.disable_group) {
                     this.debugLog('Your Curtains are grouped, '
                         + `, Secondary curtain automatically hidden. Main Curtain: ${device.deviceName}, deviceId: ${device.deviceId}`);
                 }
@@ -1901,7 +1802,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -1958,7 +1859,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2016,7 +1917,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2074,7 +1975,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2132,7 +2033,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2190,7 +2091,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2248,7 +2149,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2306,7 +2207,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2364,7 +2265,7 @@ export class SwitchBotPlatform {
                 ? await this.validateAndCleanDisplayName(device.configDeviceName, 'configDeviceName', device.configDeviceName)
                 : await this.validateAndCleanDisplayName(device.deviceName, 'deviceName', device.deviceName);
             accessory.context.connectionType = await this.connectionType(device);
-            accessory.context.version = device.firmware ?? device.version ?? this.version ?? '0.0.0';
+            accessory.context.version = device.firmware ?? this.version ?? '0.0.0';
             const newOrExternal = !device.external ? 'Adding new' : 'Loading external';
             await this.infoLog(`${newOrExternal} accessory: ${accessory.displayName} deviceId: ${device.deviceId}`);
             // create the accessory handler for the newly create accessory
@@ -2382,11 +2283,11 @@ export class SwitchBotPlatform {
     async registerCurtains(device) {
         let registerWindowCovering;
         if (isCurtainDevice(device)) {
-            await this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds},x master: ${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
+            await this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, curtainDevicesIds: ${device.curtainDevicesIds},x master: ${device.master}, group: ${device.group}, disable_group: ${device.disable_group}, connectionType: ${device.connectionType}`);
             registerWindowCovering = await this.registerWindowCovering(device);
         }
         else if (isBlindTiltDevice(device)) {
-            await this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, blindTiltDevicesIds: ${device.blindTiltDevicesIds}, master: ${device.master}, group: ${device.group}, disable_group: ${device.curtain?.disable_group}, connectionType: ${device.connectionType}`);
+            await this.debugWarnLog(`deviceName: ${device.deviceName} deviceId: ${device.deviceId}, blindTiltDevicesIds: ${device.blindTiltDevicesIds}, master: ${device.master}, group: ${device.group}, disable_group: ${device.disable_group}, connectionType: ${device.connectionType}`);
             registerWindowCovering = await this.registerWindowCovering(device);
         }
         else {
@@ -2403,11 +2304,9 @@ export class SwitchBotPlatform {
             await this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, device.group: ${device.group} connectionType; ${device.connectionType}`);
             await this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
-        else if (!device.master && device.curtain?.disable_group) {
-            // !device.group && device.connectionType === 'BLE'
-            // OpenAPI: Non-Master Curtains/Blind Tilts that has Disable Grouping Checked
+        else if (!device.master && device.disable_group) {
             registerCurtain = true;
-            await this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, disable_group: ${device.curtain?.disable_group}, connectionType; ${device.connectionType}`);
+            await this.debugLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] device.master: ${device.master}, disable_group: ${device.disable_group}, connectionType; ${device.connectionType}`);
             await this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}`);
         }
         else if (device.master && !device.group) {
@@ -2424,7 +2323,7 @@ export class SwitchBotPlatform {
         }
         else {
             registerCurtain = false;
-            await this.debugErrorLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] disable_group: ${device.curtain?.disable_group}, device.master: ${device.master}, device.group: ${device.group}`);
+            await this.debugErrorLog(`deviceName: ${device.deviceName} [${device.deviceType} Config] disable_group: ${device.disable_group}, device.master: ${device.master}, device.group: ${device.group}`);
             await this.debugWarnLog(`Device: ${device.deviceName} registerCurtains: ${registerCurtain}, device.connectionType: ${device.connectionType}`);
         }
         return registerCurtain;
@@ -2531,19 +2430,15 @@ export class SwitchBotPlatform {
             await this.errorLog(message);
         }
     }
-    async retryRequest(deviceMaxRetries, deviceDelayBetweenRetries, url, options) {
+    async retryRequest(deviceId, deviceMaxRetries, deviceDelayBetweenRetries) {
         let retryCount = 0;
         const maxRetries = deviceMaxRetries;
         const delayBetweenRetries = deviceDelayBetweenRetries;
         while (retryCount < maxRetries) {
             try {
-                const { body, statusCode } = await request(url, options);
-                if (statusCode === 200 || statusCode === 100) {
-                    return { body, statusCode };
-                }
-                else {
-                    await this.debugLog(`Received status code: ${statusCode}`);
-                }
+                const { response, statusCode } = await this.switchBotAPI.getDeviceStatus(deviceId);
+                await this.debugLog(`response: ${JSON.stringify(response)}`);
+                return { response, statusCode };
             }
             catch (error) {
                 await this.errorLog(`Error making request: ${error.message}`);
@@ -2552,18 +2447,17 @@ export class SwitchBotPlatform {
             await this.debugLog(`Retry attempt ${retryCount} of ${maxRetries}`);
             await sleep(delayBetweenRetries);
         }
-        return { body: null, statusCode: -1 };
+        return { response: null, statusCode: 500 };
     }
     // BLE Connection
     async connectBLE(accessory, device) {
         try {
-            const switchbot = new SwitchBot();
-            queueScheduler.schedule(async () => switchbot);
-            await this.debugLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' found: ${switchbot}`);
-            return switchbot;
+            queueScheduler.schedule(async () => this.switchBotBLE);
+            await this.debugLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' found: ${this.switchBotBLE}`);
+            return this.switchBotBLE;
         }
         catch (e) {
-            await this.errorLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' not found, Error: ${e}`);
+            await this.errorLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' not found, Error: ${e.message ?? e}`);
             return false;
         }
     }