@switchbot/homebridge-switchbot 1.2.1-beta.5 → 1.2.3

package/src/devices/meters.ts

@@ -29,6 +29,7 @@ export class Meter {
   deviceStatus!: deviceStatusResponse;
 
   // BLE Others
+  connected?: boolean;
   switchbot!: switchbot;
   serviceData!: serviceData;
   battery!: serviceData['battery'];
@@ -190,8 +191,14 @@ export class Meter {
 
     // Current Temperature
     if (!this.device.meter?.hide_temperature) {
-      this.CurrentTemperature = Number(this.temperature);
-      this.platform.debug(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c, fahrenheit: ${this.fahrenheit}`);
+      if (this.device.meter?.unit === 1) {
+        this.CurrentTemperature = this.toFahrenheit(this.temperature!.c);
+      } else if (this.device.meter?.unit === 0) {
+        this.CurrentTemperature = this.toCelsius(this.temperature!.c);
+      } else {
+        this.CurrentTemperature = Number(this.temperature?.c);
+      }
+      this.platform.debug(`Meter: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
     }
   }
 
@@ -242,7 +249,7 @@ export class Meter {
   private connectBLE() {
     const switchbot = new Switchbot();
     this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
-    this.platform.log.error(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.platform.device(`Meter: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     return switchbot;
   }
 
@@ -252,7 +259,7 @@ export class Meter {
     const switchbot = this.connectBLE();
     // Start to monitor advertisement packets
     switchbot.startScan({
-      model: 'e',
+      model: 'T',
       id: this.device.bleMac,
     }).then(() => {
       // Set an event hander
@@ -264,16 +271,32 @@ export class Meter {
         this.battery = ad.serviceData.battery;
         this.platform.device(`Meter: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         this.platform.device(`Meter: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName}, `
-          + `temperature: ${ad.serviceData.temperature}, fahrenheit: ${ad.serviceData.fahrenheit}, humidity: ${ad.serviceData.humidity}, `
-          + `battery: ${ad.serviceData.battery}`);
+          + `temperature: ${JSON.stringify(ad.serviceData.temperature)}, fahrenheit: ${ad.serviceData.fahrenheit}, `
+          + `humidity: ${ad.serviceData.humidity}, battery: ${ad.serviceData.battery}`);
+
+        if (this.serviceData) {
+          this.connected = true;
+          this.platform.device(`Meter: ${this.accessory.displayName} connected: ${this.connected}`);
+        } else {
+          this.connected = false;
+          this.platform.device(`Meter: ${this.accessory.displayName} connected: ${this.connected}`);
+        }
       };
       // Wait 10 seconds
       return switchbot.wait(10000);
-    }).then(() => {
+    }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();
-      this.parseStatus();
-      this.updateHomeKitCharacteristics();
+      if (this.connected) {
+        this.parseStatus();
+        this.updateHomeKitCharacteristics();
+      } else {
+        this.platform.log.error(`Meter: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+        if (this.platform.config.credentials?.openToken) {
+          this.platform.log.warn(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
+          await this.openAPIRefreshStatus();
+        }
+      }
     }).catch(async (e: any) => {
       this.platform.log.error(`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
       if (this.deviceDebug) {

package/src/devices/motion.ts

@@ -26,6 +26,7 @@ export class Motion {
   deviceStatus!: deviceStatusResponse;
 
   // BLE Others
+  connected?: boolean;
   switchbot!: switchbot;
   serviceData!: serviceData;
   battery!: serviceData['battery'];
@@ -163,7 +164,7 @@ export class Motion {
   private connectBLE() {
     const switchbot = new Switchbot();
     this.device.bleMac = ((this.device.deviceId!.match(/.{1,2}/g))!.join(':')).toLowerCase();
-    this.platform.log.error(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+    this.platform.device(`Motion Sensor: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
     return switchbot;
   }
 
@@ -185,14 +186,30 @@ export class Motion {
         this.platform.device(`Motion Sensor: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
         this.platform.device(`Motion Sensor: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, lightLevel: `
           + `${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}`);
+
+        if (this.serviceData) {
+          this.connected = true;
+          this.platform.device(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
+        } else {
+          this.connected = false;
+          this.platform.device(`Motion Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
+        }
       };
       // Wait 10 seconds
       return switchbot.wait(10000);
-    }).then(() => {
+    }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();
-      this.parseStatus();
-      this.updateHomeKitCharacteristics();
+      if (this.connected) {
+        this.parseStatus();
+        this.updateHomeKitCharacteristics();
+      } else {
+        this.platform.log.error(`Motion Sensor: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+        if (this.platform.config.credentials?.openToken) {
+          this.platform.log.warn(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
+          await this.openAPIRefreshStatus();
+        }
+      }
     }).catch(async (e: any) => {
       this.platform.log.error(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
       if (this.deviceDebug) {

package/src/platform.ts

@@ -192,6 +192,9 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           const devices = deviceLists.map((v: any) => v);
           for (const device of devices) {
             if (device.deviceType) {
+              if (device.configDeviceName) {
+                device.deviceName = device.configDeviceName;
+              }
               this.createDevice(device);
             }
           }
@@ -209,6 +212,9 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
           this.debug(`SwitchBot Devices: ${JSON.stringify(devices)}`);
           for (const device of devices) {
             if (device.deviceType) {
+              if (device.configDeviceName) {
+                device.deviceName = device.configDeviceName;
+              }
               this.createDevice(device);
             }
           }