@switchbot/homebridge-switchbot 2.2.0-beta.1 → 2.2.0-beta.2

package/src/device/motion.ts

@@ -38,12 +38,12 @@ export class Motion {
   address!: ad['address'];
   battery!: serviceData['battery'];
   movement!: serviceData['movement'];
+  lightLevel!: serviceData['lightLevel'];
   is_light!: any;//serviceData['is_light'];
   tested!: any;
   led!: any;
   iot!: any;
   sense_distance!: any;
-  light_intensity!: any;
 
   // Config
   set_minLux!: number;
@@ -169,15 +169,16 @@ export class Motion {
     if (!this.device.motion?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
-      switch (this.is_light) {
-        case true:
+      switch (this.lightLevel) {
+        case 'dark':
+        case 1:
           this.CurrentAmbientLightLevel = this.set_minLux;
           break;
         default:
           this.CurrentAmbientLightLevel = this.set_maxLux;
       }
       this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.is_light},` +
+        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
           ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
       );
     }
@@ -254,7 +255,7 @@ export class Motion {
         })
         .then(async () => {
           // Set an event hander
-          switchbot.onadvertisement = (ad: any) => {
+          switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
             + ` BLE Address Found: ${this.address}`);
@@ -265,34 +266,29 @@ export class Motion {
             this.led = ad.serviceData.led;
             this.iot = ad.serviceData.led;
             this.sense_distance = ad.serviceData.sense_distance;
-            this.light_intensity = ad.serviceData.light_intensity;
+            this.lightLevel = ad.serviceData.lightLevel;
             this.is_light = ad.serviceData.is_light;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, is_light: ` +
-                `${ad.serviceData.is_light}, battery: ${ad.serviceData.battery}`,
+                `${ad.serviceData.is_light}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`,
             );
 
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              await this.stopScanning(switchbot);
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
           // Wait 10 seconds
-          return await switchbot.wait(this.scanDuration * 1000);
+          return await switchbot.wait(this.scanDuration * 2000);
         })
         .then(async () => {
           // Stop to monitor
-          switchbot.stopScan();
-          if (this.connected) {
-            this.BLEparseStatus();
-            this.updateHomeKitCharacteristics();
-          } else {
-            await this.BLERefreshConnection(switchbot);
-          }
+          await this.stopScanning(switchbot);
         })
         .catch(async (e: any) => {
           this.apiError(e);
@@ -398,6 +394,16 @@ export class Motion {
     }
   }
 
+  async stopScanning(switchbot: any) {
+    switchbot.stopScan();
+    if (this.connected) {
+      this.BLEparseStatus();
+      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

@@ -199,7 +199,7 @@ export class Plug {
         })
         .then(() => {
           // Set an event hander
-          switchbot.onadvertisement = (ad: any) => {
+          switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
             + ` BLE Address Found: ${this.address}`);
@@ -221,6 +221,7 @@ export class Plug {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              await this.stopScanning(switchbot);
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -231,13 +232,7 @@ export class Plug {
         })
         .then(async () => {
           // Stop to monitor
-          switchbot.stopScan();
-          if (this.connected) {
-            this.BLEparseStatus();
-            this.updateHomeKitCharacteristics();
-          } else {
-            await this.BLERefreshConnection(switchbot);
-          }
+          await this.stopScanning(switchbot);
         })
         .catch(async (e: any) => {
           this.apiError(e);
@@ -463,6 +458,16 @@ export class Plug {
     }
   }
 
+  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+    switchbot.stopScan();
+    if (this.connected) {
+      this.BLEparseStatus();
+      this.updateHomeKitCharacteristics();
+    } else {
+      await this.BLERefreshConnection(switchbot);
+    }
+  }
+
   BLEmodel(): 'g' | 'j' {
     if (this.device.deviceType === 'Plug Mini (US)') {
       return 'g';

package/src/device/striplight.ts

@@ -311,7 +311,7 @@ export class StripLight {
         })
         .then(() => {
           // Set an event hander
-          switchbot.onadvertisement = (ad: any) => {
+          switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
             + ` BLE Address Found: ${this.address}`);
@@ -334,6 +334,7 @@ export class StripLight {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              await this.stopScanning(switchbot);
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -344,13 +345,7 @@ export class StripLight {
         })
         .then(async () => {
         // Stop to monitor
-          switchbot.stopScan();
-          if (this.connected) {
-            this.BLEparseStatus();
-            this.updateHomeKitCharacteristics();
-          } else {
-            await this.BLERefreshConnection(switchbot);
-          }
+          await this.stopScanning(switchbot);
         })
         .catch(async (e: any) => {
           this.apiError(e);
@@ -814,6 +809,16 @@ export class StripLight {
     }
   }
 
+  async stopScanning({ switchbot }: { switchbot: any; }): Promise<void> {
+    switchbot.stopScan();
+    if (this.connected) {
+      this.BLEparseStatus();
+      this.updateHomeKitCharacteristics();
+    } else {
+      await this.BLERefreshConnection(switchbot);
+    }
+  }
+
   async getCustomBLEAddress(switchbot: any) {
     if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);

package/src/settings.ts

@@ -314,8 +314,18 @@ export type serviceData = {
   modelName: string;
   //Mode for Bot either Press or Switch
   mode?: boolean;
-  //Bot State
-  state?: string;
+  //Bot/ColorBulb State
+  state?: string | boolean;
+  //ColorBulb Power
+  power?: boolean;
+  //ColorBulb R
+  red?: number;
+  //ColorBulb G
+  green?: number;
+  //ColorBulb B
+  blue?: number;
+  //ColorBulb Color temperature
+  color_temperature?: number;
   //Battery percentage left on Bot, Meter, Motion, Contact, PlugMini, and Curtain
   battery?: number;
   //Humidifier's humidity level percentage
@@ -343,6 +353,8 @@ export type serviceData = {
   calibration?: boolean;
   //Current Curtain Positon %
   position?: number;
+  //Is Curtain Moving?
+  inMotion?: boolean;
   //PlugMini - Is there a delay?
   delay?: boolean;
   //PlugMini - Is there a Timer?