@switchbot/homebridge-switchbot 3.8.3-beta.3 → 3.8.3-beta.31

package/dist/platform.d.ts

@@ -1,10 +1,9 @@
 import type { Server } from 'node:http';
-import type { UrlObject } from 'node:url';
 import type { API, DynamicPlatformPlugin, Logging, PlatformAccessory } from 'homebridge';
 import type { MqttClient } from 'mqtt';
-import type { Dispatcher } from 'undici';
 import type { devicesConfig, irDevicesConfig, SwitchBotPlatformConfig } from './settings.js';
-import type { blindTilt, curtain, curtain3, device } from './types/devicelist.js';
+import type { blindTilt, curtain, curtain3, device } from 'node-switchbot';
+import { SwitchBotBLE, SwitchBotOpenAPI } from 'node-switchbot';
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -24,6 +23,8 @@ export declare class SwitchBotPlatform implements DynamicPlatformPlugin {
     config: SwitchBotPlatformConfig;
     mqttClient: MqttClient | null;
     webhookEventListener: Server | null;
+    switchBotAPI: SwitchBotOpenAPI;
+    switchBotBLE: SwitchBotBLE;
     readonly eve: any;
     readonly fakegatoAPI: any;
     readonly webhookEventHandler: {
@@ -50,13 +51,6 @@ export declare class SwitchBotPlatform implements DynamicPlatformPlugin {
      * This method saves the openToken as the token in the config.json file
      */
     updateToken(): Promise<void>;
-    generateHeaders: () => {
-        Authorization: any;
-        sign: string;
-        nonce: `${string}-${string}-${string}-${string}-${string}`;
-        t: string;
-        'Content-Type': string;
-    };
     discoverDevices(): Promise<void>;
     private handleManualConfig;
     private isSuccessfulResponse;
@@ -107,10 +101,8 @@ export declare class SwitchBotPlatform implements DynamicPlatformPlugin {
      * @returns A promise that resolves when the logging is complete.
      */
     statusCode(statusCode: number): Promise<void>;
-    retryRequest(deviceMaxRetries: number, deviceDelayBetweenRetries: number, url: string | URL | UrlObject, options?: {
-        dispatcher?: Dispatcher;
-    } & Omit<Dispatcher.RequestOptions, 'origin' | 'path' | 'method'> & Partial<Pick<Dispatcher.RequestOptions, 'method'>>): Promise<{
-        body: any;
+    retryRequest(deviceId: string, deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{
+        response: any;
         statusCode: number;
     }>;
     connectBLE(accessory: PlatformAccessory, device: device & devicesConfig): Promise<any>;

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}

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 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;
@@ -96,10 +91,43 @@ 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
+        this.switchBotAPI = new SwitchBotOpenAPI(this.config.credentials?.token, this.config.credentials?.secret);
+        // Listen for log events
+        if (!this.config.options?.disableLogsforOpenAPI) {
+            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);
+                }
+            });
+        }
         // import fakegato-history module and EVE characteristics
         this.fakegatoAPI = fakegato(api);
         this.eve = new EveHomeKitTypes(api);
@@ -122,27 +150,27 @@ export class SwitchBotPlatform {
                 }
             }
             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 +180,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 +193,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 +209,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}`);
                     }
                 });
             }
@@ -489,26 +453,9 @@ export class SwitchBotPlatform {
             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',
-        };
-    };
+            await this.errorLog(`Update Token: ${e.message ?? e}`);
+        }
+    }
     async discoverDevices() {
         if (!this.config.credentials?.token) {
             return this.handleManualConfig();
@@ -521,24 +468,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 +510,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 +576,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);
         }
     }
@@ -2531,19 +2475,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 +2492,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;
         }
     }