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

package/src/device/meterplus.ts

@@ -40,7 +40,9 @@ export class MeterPlus {
   switchbot!: switchbot;
   serviceData!: serviceData;
   address!: ad['address'];
-  temperature!: temperature['c'];
+  temperature!: serviceData['temperature'];
+  celsius!: temperature['c'];
+  fahrenheit!: temperature['f'];
   battery!: serviceData['battery'];
   humidity!: serviceData['humidity'];
 
@@ -209,7 +211,7 @@ export class MeterPlus {
 
     // Current Temperature
     if (!this.device.meter?.hide_temperature) {
-      this.temperature < 0 ? 0 : this.temperature > 100 ? 100 : this.temperature;
+      this.celsius < 0 ? 0 : this.celsius > 100 ? 100 : this.temperature;
       this.CurrentTemperature = this.temperature;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
     }
@@ -266,7 +268,7 @@ export class MeterPlus {
         })
         .then(() => {
           // Set an event hander
-          switchbot.onadvertisement = (ad: ad) => {
+          switchbot.onadvertisement = async (ad: ad) => {
             this.address = ad.address;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},`
             + ` BLE Address Found: ${this.address}`);
@@ -275,7 +277,9 @@ export class MeterPlus {
               this.humidity = ad.serviceData.humidity;
             }
             this.serviceData = ad.serviceData;
-            this.temperature = ad.serviceData.temperature!.c;
+            this.temperature = ad.serviceData.temperature;
+            this.celsius = ad.serviceData.temperature!.c;
+            this.fahrenheit = ad.serviceData.temperature!.f;
             this.battery = ad.serviceData.battery;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             this.debugLog(
@@ -287,6 +291,7 @@ export class MeterPlus {
             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}`);
@@ -297,13 +302,7 @@ export class MeterPlus {
         })
         .then(async () => {
           // Stop to monitor
-          switchbot.stopScan();
-          if (this.connected) {
-            this.parseStatus();
-            this.updateHomeKitCharacteristics();
-          } else {
-            await this.BLERefreshConnection(switchbot);
-          }
+          await this.stopScanning(switchbot);
         })
         .catch(async (e: any) => {
           this.apiError(e);
@@ -488,6 +487,16 @@ export class MeterPlus {
       : null;
   }
 
+  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')) {
       (async () => {

package/src/device/motion.ts

@@ -39,6 +39,11 @@ export class Motion {
   battery!: serviceData['battery'];
   movement!: serviceData['movement'];
   lightLevel!: serviceData['lightLevel'];
+  is_light!: any;//serviceData['is_light'];
+  tested!: any;
+  led!: any;
+  iot!: any;
+  sense_distance!: any;
 
   // Config
   set_minLux!: number;
@@ -250,40 +255,40 @@ 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}`);
             this.serviceData = ad.serviceData;
             this.movement = ad.serviceData.movement;
+            this.tested = ad.serviceData.tested;
             this.battery = ad.serviceData.battery;
+            this.led = ad.serviceData.led;
+            this.iot = ad.serviceData.led;
+            this.sense_distance = ad.serviceData.sense_distance;
             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}, lightLevel: ` +
-                `${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`,
+              `${this.device.deviceType}: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, is_light: ` +
+                `${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);
@@ -389,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?