@switchbot/homebridge-switchbot 3.5.1-beta.12 → 3.5.1-beta.13

package/src/irdevice/tv.ts

@@ -369,7 +369,7 @@ export class TV extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -388,22 +388,11 @@ export class TV extends irdeviceBase {
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
     // Active
-    if (this.Television.Active === undefined) {
-      await this.debugLog(`Active: ${this.Television.Active}`);
-    } else {
-      this.accessory.context.Active = this.Television.Active;
-      this.Television.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Television.Active);
-      await this.debugLog(`updateCharacteristic Active: ${this.Television.Active}`);
-    }
+    await this.updateCharacteristic(this.Television.Service, this.hap.Characteristic.Active,
+      this.Television.Active, 'Active');
     // ActiveIdentifier
-    if (this.Television.ActiveIdentifier === undefined) {
-      await this.debugLog(`ActiveIdentifier: ${this.Television.ActiveIdentifier}`);
-    } else {
-      this.accessory.context.ActiveIdentifier = this.Television.ActiveIdentifier;
-      this.Television.Service.updateCharacteristic(this.hap.Characteristic.ActiveIdentifier, this.Television.ActiveIdentifier);
-      await this.debugLog('updateCharacteristic'
-        + ` ActiveIdentifier: ${this.Television.ActiveIdentifier}`);
-    }
+    await this.updateCharacteristic(this.Television.Service, this.hap.Characteristic.ActiveIdentifier,
+      this.Television.ActiveIdentifier, 'ActiveIdentifier');
   }
 
   async apiError(e: any): Promise<void> {

package/src/irdevice/vacuumcleaner.ts

@@ -103,7 +103,7 @@ export class VacuumCleaner extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -122,13 +122,8 @@ export class VacuumCleaner extends irdeviceBase {
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
     // On
-    if (this.Switch.On === undefined) {
-      await this.debugLog(`On: ${this.Switch.On}`);
-    } else {
-      this.accessory.context.On = this.Switch.On;
-      this.Switch.Service.updateCharacteristic(this.hap.Characteristic.On, this.Switch.On);
-      await this.debugLog(`updateCharacteristic On: ${this.Switch.On}`);
-    }
+    await this.updateCharacteristic(this.Switch.Service, this.hap.Characteristic.On,
+      this.Switch.On, 'On');
   }
 
   async apiError(e: any): Promise<void> {

package/src/irdevice/waterheater.ts

@@ -105,7 +105,7 @@ export class WaterHeater extends irdeviceBase {
         const { body, statusCode } = await this.pushChangeRequest(bodyChange);
         const deviceStatus: any = await body.json();
         await this.pushStatusCodes(statusCode, deviceStatus);
-        if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
+        if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
           await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
           await this.updateHomeKitCharacteristics();
         } else {
@@ -124,13 +124,8 @@ export class WaterHeater extends irdeviceBase {
   async updateHomeKitCharacteristics(): Promise<void> {
     await this.debugLog('updateHomeKitCharacteristics');
     // Active
-    if (this.Valve.Active === undefined) {
-      await this.debugLog(`Active: ${this.Valve.Active}`);
-    } else {
-      this.accessory.context.Active = this.Valve.Active;
-      this.Valve.Service.updateCharacteristic(this.hap.Characteristic.Active, this.Valve.Active);
-      await this.debugLog(`updateCharacteristic Active: ${this.Valve.Active}`);
-    }
+    await this.updateCharacteristic(this.Valve.Service, this.hap.Characteristic.Active,
+      this.Valve.Active, 'Active');
   }
 
   async apiError({ e }: { e: any }): Promise<void> {

package/src/platform.ts

@@ -33,21 +33,17 @@ import { AirConditioner } from './irdevice/airconditioner.js';
 
 import { Buffer } from 'buffer';
 import { request } from 'undici';
-import asyncmqtt from 'async-mqtt';
-import { createServer } from 'http';
 import { queueScheduler } from 'rxjs';
 import fakegato from 'fakegato-history';
 import crypto, { randomUUID } from 'crypto';
 import { readFileSync, writeFileSync } from 'fs';
 import { EveHomeKitTypes } from 'homebridge-lib/EveHomeKitTypes';
+import { PLATFORM_NAME, PLUGIN_NAME, Devices } from './settings.js';
 import { isBlindTiltDevice, isCurtainDevice, sleep } from './utils.js';
-import { PLATFORM_NAME, PLUGIN_NAME, Devices, setupWebhook, updateWebhook, deleteWebhook, queryWebhook } from './settings.js';
 
 import type { UrlObject } from 'url';
-import type { MqttClient } from 'mqtt';
 import type { Dispatcher } from 'undici';
 import type { irdevice } from './types/irdevicelist.js';
-import type { Server, IncomingMessage, ServerResponse } from 'http';
 import type { blindTilt, curtain, curtain3, device } from './types/devicelist.js';
 import type { API, DynamicPlatformPlugin, Logging, PlatformAccessory } from 'homebridge';
 import type { SwitchBotPlatformConfig, devicesConfig, irDevicesConfig } from './settings.js';
@@ -71,12 +67,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   platformLogging!: SwitchBotPlatformConfig['logging'];
   config!: SwitchBotPlatformConfig;
 
-  webhookEventListener: Server | null = null;
-  mqttClient: MqttClient | null = null;
-
   public readonly fakegatoAPI: any;
   public readonly eve: any;
-  public readonly webhookEventHandler: { [x: string]: (context: any) => void } = {};
 
   constructor(
     log: Logging,
@@ -144,171 +136,6 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         await this.debugErrorLog(`Failed to Discover, Error: ${e}`);
       }
     });
-
-    this.setupMqtt();
-    this.setupwebhook();
-  }
-
-  async setupMqtt(): Promise<void> {
-    if (this.config.options?.mqttURL) {
-      try {
-        const { connectAsync } = asyncmqtt;
-        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: Error) => {
-          await this.errorLog(`Failed to publish MQTT messages. ${e}`);
-        });
-        if (!this.config.options?.webhookURL) {
-          // receive webhook events via MQTT
-          await this.infoLog(`Webhook is configured to be received through ${this.config.options.mqttURL}/homebridge-switchbot/webhook.`);
-          this.mqttClient.subscribe('homebridge-switchbot/webhook/+');
-          this.mqttClient.on('message', async (topic: string, message) => {
-            try {
-              await await this.debugLog(`Received Webhook via MQTT: ${topic}=${message}`);
-              const context = JSON.parse(message.toString());
-              this.webhookEventHandler[context.deviceMac]?.(context);
-            } catch (e: any) {
-              await this.errorLog(`Failed to handle webhook event. Error:${e}`);
-            }
-          });
-        }
-      } catch (e) {
-        this.mqttClient = null;
-        await this.errorLog(`Failed to establish MQTT connection. ${e}`);
-      }
-    }
-  }
-
-  async setupwebhook() {
-    //webhook configuration
-    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: IncomingMessage, response: ServerResponse) => {
-          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: any) {
-                  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: any) {
-            this.errorLog(`Failed to handle webhook event. Error:${e}`);
-          }
-        }).listen(port ? port : 80);
-      } catch (e: any) {
-        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': url,
-            'deviceList': 'ALL',
-          }),
-        });
-        const response: any = await body.json();
-        await this.debugLog(`setupWebhook: url:${url}`);
-        await this.debugLog(`setupWebhook: body:${JSON.stringify(response)}`);
-        await this.debugLog(`setupWebhook: statusCode:${statusCode}`);
-        if (statusCode !== 200 || response?.statusCode !== 100) {
-          this.errorLog(`Failed to configure webhook. Existing webhook well be overridden. HTTP:${statusCode} API:${response?.statusCode} `
-            + `message:${response?.message}`);
-        }
-      } catch (e: any) {
-        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': url,
-              'enable': true,
-            },
-          }),
-        });
-        const response: any = await body.json();
-        await this.debugLog(`updateWebhook: url:${url}`);
-        await this.debugLog(`updateWebhook: body:${JSON.stringify(response)}`);
-        await this.debugLog(`updateWebhook: statusCode:${statusCode}`);
-        if (statusCode !== 200 || response?.statusCode !== 100) {
-          this.errorLog(`Failed to update webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-        }
-      } catch (e: any) {
-        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: any = await body.json();
-        await this.debugLog(`queryWebhook: body:${JSON.stringify(response)}`);
-        await this.debugLog(`queryWebhook: statusCode:${statusCode}`);
-        if (statusCode !== 200 || response?.statusCode !== 100) {
-          this.errorLog(`Failed to query webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-        } else {
-          this.infoLog(`Listening webhook on ${response?.body?.urls[0]}`);
-        }
-      } catch (e: any) {
-        this.errorLog(`Failed to query webhook. Error:${e}`);
-      }
-
-      this.api.on('shutdown', async () => {
-        try {
-          const { body, statusCode } = await request(deleteWebhook, {
-            method: 'POST',
-            headers: this.generateHeaders(),
-            body: JSON.stringify({
-              'action': 'deleteWebhook',
-              'url': url,
-            }),
-          });
-          const response: any = await body.json();
-          await this.debugLog(`deleteWebhook: url:${url}, body:${JSON.stringify(response)}, statusCode:${statusCode}`);
-          if (statusCode !== 200 || response?.statusCode !== 100) {
-            this.errorLog(`Failed to delete webhook. HTTP:${statusCode} API:${response?.statusCode} message:${response?.message}`);
-          } else {
-            this.infoLog('Unregistered webhook to close listening.');
-          }
-        } catch (e: any) {
-          this.errorLog(`Failed to delete webhook. Error:${e.message}`);
-        }
-      });
-    }
   }
 
   /**
@@ -2678,10 +2505,10 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         await this.errorLog(`Requests reached the daily limit, statusCode: ${statusCode}`);
         break;
       case 100:
-        await await this.debugLog(`Command successfully sent, statusCode: ${statusCode}`);
+        await this.debugLog(`Command successfully sent, statusCode: ${statusCode}`);
         break;
       case 200:
-        await await this.debugLog(`Request successful, statusCode: ${statusCode}`);
+        await this.debugLog(`Request successful, statusCode: ${statusCode}`);
         break;
       case 400:
         await this.errorLog('Bad Request, The client has issued an invalid request. This is commonly used to specify validation errors in a request '
@@ -2735,13 +2562,13 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         if (statusCode === 200 || statusCode === 100) {
           return { body, statusCode };
         } else {
-          await await this.debugLog(`Received status code: ${statusCode}`);
+          await this.debugLog(`Received status code: ${statusCode}`);
         }
       } catch (error: any) {
         await this.errorLog(`Error making request: ${error.message}`);
       }
       retryCount++;
-      await await this.debugLog(`Retry attempt ${retryCount} of ${maxRetries}`);
+      await this.debugLog(`Retry attempt ${retryCount} of ${maxRetries}`);
       await sleep(delayBetweenRetries);
     }
     return { body: null, statusCode: -1 };
@@ -2753,7 +2580,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     try {
       const SwitchBot = (await import('node-switchbot')).SwitchBot;
       queueScheduler.schedule(() => (switchbot = new SwitchBot()));
-      await await this.debugLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' found: ${switchbot}`);
+      await this.debugLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' found: ${switchbot}`);
     } catch (e: any) {
       switchbot = false;
       await this.errorLog(`${device.deviceType}: ${accessory.displayName} 'node-switchbot' found: ${switchbot}, Error: ${e}`);
@@ -2768,7 +2595,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         'utf-8',
       ),
     );
-    await await this.debugLog(`Plugin Version: ${json.version}`);
+    await this.debugLog(`Plugin Version: ${json.version}`);
     this.version = json.version;
   }
 
@@ -2804,7 +2631,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         platformConfig.delayBetweenRetries = this.delayBetweenRetries / 1000;
       }
       if (Object.entries(platformConfig).length !== 0) {
-        await await this.debugLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
+        await this.debugLog(`Platform Config: ${JSON.stringify(platformConfig)}`);
       }
       this.platformConfig = platformConfig;
     }
@@ -2814,13 +2641,13 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
     this.debugMode = process.argv.includes('-D') || process.argv.includes('--debug');
     if (this.config.options?.logging === 'debug' || this.config.options?.logging === 'standard' || this.config.options?.logging === 'none') {
       this.platformLogging = this.config.options.logging;
-      await await this.debugWarnLog(`Using Config Logging: ${this.platformLogging}`);
+      await this.debugWarnLog(`Using Config Logging: ${this.platformLogging}`);
     } else if (this.debugMode) {
       this.platformLogging = 'debugMode';
-      await await this.debugWarnLog(`Using ${this.platformLogging} Logging`);
+      await this.debugWarnLog(`Using ${this.platformLogging} Logging`);
     } else {
       this.platformLogging = 'standard';
-      await await this.debugWarnLog(`Using ${this.platformLogging} Logging`);
+      await this.debugWarnLog(`Using ${this.platformLogging} Logging`);
     }
   }
 

package/src/settings.ts

@@ -56,18 +56,18 @@ interface credentials {
 }
 
 interface options {
-  refreshRate?: number;
-  updateRate?: number;
-  pushRate?: number;
-  maxRetries?: number;
-  delayBetweenRetries?: number;
-  logging?: string;
   devices?: devicesConfig[];
   irdevices?: irDevicesConfig[];
-  webhookURL?: string;
   mqttURL?: string;
   mqttOptions?: IClientOptions;
   mqttPubOptions?: IClientOptions;
+  webhookURL?: string;
+  maxRetries?: number;
+  delayBetweenRetries?: number;
+  refreshRate?: number;
+  updateRate?: number;
+  pushRate?: number;
+  logging?: string;
 };
 
 export interface devicesConfig extends device {
@@ -111,7 +111,7 @@ export interface devicesConfig extends device {
   colorbulb?: colorbulb;
   striplight?: striplight;
   ceilinglight?: ceilinglight;
-  plug?: Record<any, any>;
+  plug?: plug;
   lock?: lock;
   hub?: hub;
 }
@@ -198,6 +198,8 @@ interface ceilinglight {
   adaptiveLightingShift?: number;
 };
 
+type plug = object;
+
 interface lock {
   hide_contactsensor?: boolean;
   activate_latchbutton?: boolean;

package/src/types/bledevicestatus.ts

@@ -16,8 +16,9 @@ export type ad = {
   rssi: number;
   serviceData: botServiceData | colorBulbServiceData | contactSensorServiceData |
     curtainServiceData | curtain3ServiceData | stripLightServiceData | lockServiceData |
-    lockProServiceData | meterServiceData | meterPlusServiceData | motionSensorServiceData |
-    plugMiniUSServiceData | plugMiniJPServiceData | blindTiltServiceData;
+    lockProServiceData | meterServiceData | meterPlusServiceData | motionSensorServiceData | outdoorMeterServiceData |
+    plugMiniUSServiceData | plugMiniJPServiceData | blindTiltServiceData | ceilingLightServiceData | ceilingLightProServiceData |
+    hub2ServiceData | batteryCirculatorFanServiceData | waterLeakDetectorServiceData | humidifierServiceData | robotVacuumCleanerServiceData;
 };
 
 type serviceData = {
@@ -271,6 +272,7 @@ export type batteryCirculatorFanServiceData = serviceData & {
   modelName: SwitchBotBLEModelName.Unknown,
   modelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
   state: string;
+  fanSpeed: number;
 };
 
 export type waterLeakDetectorServiceData = serviceData & {

package/src/types/devicestatus.ts

@@ -154,7 +154,7 @@ export type humidifierStatus = deviceStatus & {
 
 export type blindTiltStatus = deviceStatus & {
   calibrate: boolean;
-  battery: boolean;
+  battery: number;
   direction: string;
   slidePosition: string;
   lightLevel?: 'bright' | 'dim';