@switchbot/homebridge-switchbot 2.2.2-beta.2 → 2.2.2-beta.21

package/src/device/colorbulb.ts

@@ -392,7 +392,7 @@ export class ColorBulb {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning(switchbot);
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -403,7 +403,7 @@ export class ColorBulb {
         })
         .then(async () => {
         // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning(switchbot);
         })
         .catch(async (e: any) => {
           this.apiError(e);
@@ -689,7 +689,7 @@ export class ColorBulb {
           'parameter': 'default',
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -766,7 +766,7 @@ export class ColorBulb {
           'parameter': `${red}:${green}:${blue}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -825,7 +825,7 @@ export class ColorBulb {
           'parameter': `${kelvin}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -882,7 +882,7 @@ export class ColorBulb {
           'parameter': `${this.Brightness}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -1065,7 +1065,7 @@ export class ColorBulb {
     }
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+  async stopScanning(switchbot: any) {
     await switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();

package/src/device/contact.ts

@@ -450,7 +450,7 @@ export class Contact {
     }
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+  async stopScanning(switchbot: any) {
     await switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();

package/src/device/curtain.ts

@@ -617,7 +617,7 @@ export class Curtain {
           'parameter': `0,${adjustedMode},${adjustedTargetPosition}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,

package/src/device/humidifier.ts

@@ -484,7 +484,7 @@ export class Humidifier {
           'parameter': `${this.RelativeHumidityHumidifierThreshold}`,
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -552,7 +552,7 @@ export class Humidifier {
           'parameter': 'auto',
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -613,7 +613,7 @@ export class Humidifier {
           'parameter': 'default',
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -765,7 +765,7 @@ export class Humidifier {
     }
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+  async stopScanning(switchbot: any) {
     await switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
@@ -923,11 +923,15 @@ export class Humidifier {
     }
     if (this.TargetHumidifierDehumidifierState === undefined) {
       this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
+    } else if (this.accessory.context.TargetHumidifierDehumidifierState === undefined) {
+      this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
     } else {
       this.TargetHumidifierDehumidifierState = this.accessory.context.TargetHumidifierDehumidifierState;
     }
     if (this.CurrentHumidifierDehumidifierState === undefined) {
       this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
+    } else if (this.accessory.context.CurrentHumidifierDehumidifierState === undefined) {
+      this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
     } else {
       this.CurrentHumidifierDehumidifierState = this.accessory.context.CurrentHumidifierDehumidifierState;
     }
@@ -1000,19 +1004,19 @@ export class Humidifier {
   /**
    * Logging for Device
    */
-  infoLog(...log: any[]): void {
+  async infoLog(...log: any[]): Promise<void> {
     if (this.enablingDeviceLogging()) {
       this.platform.log.info(String(...log));
     }
   }
 
-  warnLog(...log: any[]): void {
+  async warnLog(...log: any[]): Promise<void> {
     if (this.enablingDeviceLogging()) {
       this.platform.log.warn(String(...log));
     }
   }
 
-  debugWarnLog(...log: any[]): void {
+  async debugWarnLog(...log: any[]): Promise<void> {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging?.includes('debug')) {
         this.platform.log.warn('[DEBUG]', String(...log));
@@ -1020,13 +1024,13 @@ export class Humidifier {
     }
   }
 
-  errorLog(...log: any[]): void {
+  async errorLog(...log: any[]): Promise<void> {
     if (this.enablingDeviceLogging()) {
       this.platform.log.error(String(...log));
     }
   }
 
-  debugErrorLog(...log: any[]): void {
+  async debugErrorLog(...log: any[]): Promise<void> {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging?.includes('debug')) {
         this.platform.log.error('[DEBUG]', String(...log));
@@ -1034,7 +1038,7 @@ export class Humidifier {
     }
   }
 
-  debugLog(...log: any[]): void {
+  async debugLog(...log: any[]): Promise<void> {
     if (this.enablingDeviceLogging()) {
       if (this.deviceLogging === 'debug') {
         this.platform.log.info('[DEBUG]', String(...log));

package/src/device/lock.ts

@@ -408,7 +408,7 @@ export class Lock {
           'parameter': 'default',
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,

package/src/device/meter.ts

@@ -488,7 +488,7 @@ export class Meter {
       : null;
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+  async stopScanning(switchbot: any) {
     await switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();

package/src/device/meterplus.ts

@@ -487,7 +487,7 @@ export class MeterPlus {
       : null;
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+  async stopScanning(switchbot: any) {
     await switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();

package/src/device/motion.ts

@@ -44,6 +44,7 @@ export class Motion {
   led!: any;
   iot!: any;
   sense_distance!: any;
+  scanning!: boolean;
 
   // Config
   set_minLux!: number;
@@ -255,6 +256,7 @@ export class Motion {
         })
         .then(async () => {
           // Set an event hander
+          this.scanning = true;
           switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
@@ -278,6 +280,8 @@ export class Motion {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
               await this.stopScanning(switchbot);
+              this.scanning = false;
+              this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} scanning: ${this.scanning}`);
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -288,7 +292,10 @@ export class Motion {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning(switchbot);
+          this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} scanning: ${this.scanning}`);
+          if (this.scanning) {
+            await this.stopScanning(switchbot);
+          }
         })
         .catch(async (e: any) => {
           this.apiError(e);
@@ -301,6 +308,16 @@ export class Motion {
     }
   }
 
+  async stopScanning(switchbot: any) {
+    await switchbot.stopScan();
+    if (this.connected) {
+      await this.BLEparseStatus();
+      await this.updateHomeKitCharacteristics();
+    } else {
+      await this.BLERefreshConnection(switchbot);
+    }
+  }
+
   async openAPIRefreshStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
     try {
@@ -394,16 +411,6 @@ export class Motion {
     }
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
-    await await switchbot.stopScan();
-    if (this.connected) {
-      await this.BLEparseStatus();
-      await this.updateHomeKitCharacteristics();
-    } else {
-      await this.BLERefreshConnection(switchbot);
-    }
-  }
-
   async getCustomBLEAddress(switchbot: any) {
     if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
       (async () => {

package/src/device/plug.ts

@@ -392,7 +392,7 @@ export class Plug {
           'parameter': 'default',
           'commandType': 'command',
         });
-        this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API. body: ${body},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
         const options = {
           hostname: HostDomain,
           port: 443,
@@ -458,7 +458,7 @@ export class Plug {
     }
   }
 
-  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+  async stopScanning(switchbot: any) {
     await switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();