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

package/src/platform.ts

@@ -40,17 +40,17 @@ 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, deleteWebhook, queryWebhook, setupWebhook, updateWebhook } 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';
+import type { IncomingMessage, Server, ServerResponse } from 'http';
 
 /**
  * HomebridgePlatform
@@ -71,11 +71,11 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   platformLogging!: SwitchBotPlatformConfig['logging'];
   config!: SwitchBotPlatformConfig;
 
-  webhookEventListener: Server | null = null;
   mqttClient: MqttClient | null = null;
+  webhookEventListener: Server | null = null;
 
-  public readonly fakegatoAPI: any;
   public readonly eve: any;
+  public readonly fakegatoAPI: any;
   public readonly webhookEventHandler: { [x: string]: (context: any) => void } = {};
 
   constructor(
@@ -2678,10 +2678,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 +2735,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 +2753,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 +2768,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 +2804,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 +2814,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';