@switchbot/homebridge-switchbot 3.8.3-beta.11 → 3.8.3-beta.12

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 { SwitchBotOpenAPI } from 'node-switchbot';
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -32,6 +31,7 @@ export declare class SwitchBotPlatform implements DynamicPlatformPlugin {
     readonly bleEventHandler: {
         [x: string]: (context: any) => void;
     };
+    switchBotAPI: SwitchBotOpenAPI;
     constructor(log: Logging, config: SwitchBotPlatformConfig, api: API);
     setupMqtt(): Promise<void>;
     setupwebhook(): Promise<void>;
@@ -50,13 +50,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,9 +100,7 @@ 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<{
+    retryRequest(deviceId: string, deviceMaxRetries: number, deviceDelayBetweenRetries: number): Promise<{
         body: any;
         statusCode: number;
     }>;

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,MAAM,EAAkB,MAAM,WAAW,CAAA;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEzC,OAAO,KAAK,EAAE,GAAG,EAAE,qBAAqB,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAW,uBAAuB,EAAE,MAAM,eAAe,CAAA;AACrG,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAkDjF;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,qBAAqB;IAEtD,WAAW,EAAE,iBAAiB,EAAE,CAAK;IAC5C,SAAgB,GAAG,EAAE,GAAG,CAAA;IACxB,SAAgB,GAAG,EAAE,OAAO,CAAA;IAG5B,OAAO,EAAG,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EAAG,OAAO,CAAA;IACnB,UAAU,EAAG,MAAM,CAAA;IACnB,mBAAmB,EAAG,MAAM,CAAA;IAC5B,cAAc,EAAG,uBAAuB,CAAC,SAAS,CAAC,CAAA;IACnD,eAAe,EAAG,uBAAuB,CAAC,SAAS,CAAC,CAAA;IACpD,MAAM,EAAG,uBAAuB,CAAA;IAGhC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAO;IACpC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAO;IAG1C,SAAgB,GAAG,EAAE,GAAG,CAAA;IACxB,SAAgB,WAAW,EAAE,GAAG,CAAA;IAGhC,SAAgB,mBAAmB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAA;KAAE,CAAK;IACjF,SAAgB,eAAe,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAA;KAAE,CAAK;gBAG3E,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,GAAG;IA8EJ,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1B,YAAY;IA8HZ,QAAQ;IAwCd;;;OAGG;IACG,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAQrD;;OAEG;IACG,YAAY;IAgGlB;;;OAGG;IACG,WAAW;IAkDjB,eAAe;;;;;;MAiBd;IAEK,eAAe;YAoCP,kBAAkB;IAsBhC,OAAO,CAAC,oBAAoB;YAId,aAAa;YAoCb,eAAe;IAkB7B,OAAO,CAAC,eAAe;YAQT,mBAAmB;YASnB,YAAY;YA6CZ,cAAc;YA2Cd,gBAAgB;YA6DhB,SAAS;YA+DT,WAAW;YA8DX,eAAe;YA+Df,UAAU;YA+DV,cAAc;YA8Dd,mBAAmB;YA8DnB,YAAY;YA8DZ,aAAa;YA8Db,eAAe;YA6Ef,aAAa;YA6Eb,UAAU;YAsEV,UAAU;YA8DV,eAAe;YA8Df,kBAAkB;YA8DlB,gBAAgB;YA8DhB,SAAS;YA8DT,wBAAwB;YAkFxB,QAAQ;YAsDR,WAAW;YA4DX,WAAW;YA4DX,oBAAoB;YA4DpB,iBAAiB;YA4DjB,iBAAiB;YA4DjB,mBAAmB;YA4DnB,YAAY;YA4DZ,YAAY;IA4DpB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAclE,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC;IAgCnG,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC;IAU5D,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAgB7C,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBnE,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,eAAe,GAAG,aAAa,CAAC,EAAE,SAAS,EAAE,iBAAiB;IAazG,6BAA6B,CAAC,iBAAiB,EAAE,iBAAiB;IAOzE;;;;;OAKG;IACG,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC7C,YAAY,CAAC,gBAAgB,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAuBhT,UAAU,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtF,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAY7B,yBAAyB;IA8BzB,sBAAsB;IAc5B;;;;;;OAMG;IACG,2BAA2B,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgCpG;;;OAGG;IACG,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,UAAU,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC,eAAe,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1C,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtC,aAAa,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC;CAGlD"}
+{"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, SwitchBot, 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
@@ -70,9 +62,13 @@ export class SwitchBotPlatform {
     // Event Handlers
     webhookEventHandler = {};
     bleEventHandler = {};
+    switchBotAPI;
     constructor(log, config, api) {
         this.api = api;
         this.log = log;
+        this.switchBotAPI = new SwitchBotOpenAPI(this.config.credentials?.token, this.config.credentials?.secret);
+        // Set the log level
+        this.switchBotAPI.setLogLevel(LogLevel.DEBUG);
         // only load if configured
         if (!config) {
             return;
@@ -181,123 +177,31 @@ 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`);
-                        // }
-                    }
-                    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.switchBotAPI.setupWebhook(url);
+                // Listen for webhook events
+                this.switchBotAPI.on('webhookEvent', (body) => {
+                    this.debugLog('Received webhook event:', body);
+                    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}`);
+                await this.errorLog(`Failed to setup 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}`);
-                }
+                this.switchBotAPI.updateWebhook(url);
             }
             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]}`);
-                }
+                this.switchBotAPI.queryWebhook();
             }
             catch (e) {
-                await this.errorLog(`Failed to query webhook. Error:${e}`);
+                await this.errorLog(`Failed to query webhook. Error:${e.message}`);
             }
             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}`);
@@ -497,23 +401,6 @@ export class SwitchBotPlatform {
             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();
@@ -526,7 +413,7 @@ export class SwitchBotPlatform {
         await this.debugWarnLog(`Delay Between Retries: ${delayBetweenRetries}`);
         while (retryCount < maxRetries) {
             try {
-                const { body, statusCode } = await request(Devices, { headers: this.generateHeaders() });
+                const { body, statusCode } = await this.switchBotAPI.getDevices();
                 await this.debugWarnLog(`statusCode: ${statusCode}`);
                 const devicesAPI = await body.json();
                 await this.debugWarnLog(`devicesAPI: ${JSON.stringify(devicesAPI)}`);
@@ -2536,13 +2423,13 @@ 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);
+                const { body, statusCode } = await this.switchBotAPI.getDeviceStatus(deviceId);
                 if (statusCode === 200 || statusCode === 100) {
                     return { body, statusCode };
                 }