@switchbot/homebridge-switchbot 2.2.0-beta.6 → 2.2.0-beta.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge SwitchBot",
   "name": "@switchbot/homebridge-switchbot",
-  "version": "2.2.0-beta.6",
+  "version": "2.2.0-beta.8",
   "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
   "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
   "license": "ISC",
@@ -80,6 +80,6 @@
   },
   "optionalDependencies": {
     "@abandonware/noble": "^1.9.2-15",
-    "node-switchbot": "^1.6.0-beta.12"
+    "node-switchbot": "^1.6.0"
   }
 }

package/src/device/bot.ts

@@ -455,7 +455,7 @@ export class Bot {
           model: 'H',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
         // Set an event hander
           switchbot.onadvertisement = async (ad: ad) => {
             this.address = ad.address;
@@ -478,8 +478,8 @@ export class Bot {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
         // Stop to monitor

package/src/device/ceilinglight.ts

@@ -333,7 +333,7 @@ export class CeilingLight {
           model: 'u',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = (ad: any) => {
             this.address = ad.address;
@@ -363,8 +363,8 @@ export class CeilingLight {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
         // Stop to monitor

package/src/device/colorbulb.ts

@@ -362,7 +362,7 @@ export class ColorBulb {
           model: 'u',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
@@ -398,8 +398,8 @@ export class ColorBulb {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
         // Stop to monitor

package/src/device/contact.ts

@@ -329,7 +329,7 @@ export class Contact {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
+          // Wait
           return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {

package/src/device/curtain.ts

@@ -420,7 +420,7 @@ export class Curtain {
           model: 'c',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
@@ -447,8 +447,8 @@ export class Curtain {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/humidifier.ts

@@ -312,7 +312,7 @@ export class Humidifier {
           model: 'e',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: ad) => {
             this.address = ad.address;
@@ -337,8 +337,8 @@ export class Humidifier {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/lock.ts

@@ -229,7 +229,7 @@ export class Lock {
           model: 'o',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
@@ -251,8 +251,8 @@ export class Lock {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/meter.ts

@@ -266,7 +266,7 @@ export class Meter {
           model: 'T',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: ad) => {
             this.address = ad.address;
@@ -297,8 +297,8 @@ export class Meter {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 10 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/meterplus.ts

@@ -266,7 +266,7 @@ export class MeterPlus {
           model: 'i',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: ad) => {
             this.address = ad.address;
@@ -297,8 +297,8 @@ export class MeterPlus {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 10 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/motion.ts

@@ -283,8 +283,8 @@ export class Motion {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 10 seconds
-          return await switchbot.wait(this.scanDuration * 2000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/plug.ts

@@ -197,7 +197,7 @@ export class Plug {
           model: this.BLEmodel(),
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
@@ -227,8 +227,8 @@ export class Plug {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
           // Stop to monitor

package/src/device/striplight.ts

@@ -309,7 +309,7 @@ export class StripLight {
           model: 'r',
           id: this.device.bleMac,
         })
-        .then(() => {
+        .then(async () => {
           // Set an event hander
           switchbot.onadvertisement = async (ad: any) => {
             this.address = ad.address;
@@ -340,8 +340,8 @@ export class StripLight {
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
             }
           };
-          // Wait 2 seconds
-          return switchbot.wait(this.scanDuration * 1000);
+          // Wait
+          return await switchbot.wait(this.scanDuration * 1000);
         })
         .then(async () => {
         // Stop to monitor

package/src/platform.ts

@@ -1837,8 +1837,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       device.external = true;
       this.debugWarnLog(`${accessory.displayName} External TV Accessory Mode`);
       this.externalAccessory(accessory);
-    }
-    if (device.external) {
+    } else if (device.external) {
       this.debugWarnLog(`${accessory.displayName} External Accessory Mode`);
       this.externalAccessory(accessory);
     } else {