node-switchbot 1.7.0 → 1.7.1-beta.0

package/lib/switchbot-device.js

@@ -131,7 +131,7 @@ class SwitchbotDevice {
       });
 
       // Connect
-      this._peripheral.connect((error) => {
+      this._peripheral.connectAsync((error) => {
         if (error) {
           reject(error);
           return;
@@ -145,7 +145,7 @@ class SwitchbotDevice {
             resolve();
           })
           .catch((error) => {
-            this._peripheral.disconnect();
+            this._peripheral.disconnectAsync();
             reject(error);
           });
       });
@@ -224,7 +224,7 @@ class SwitchbotDevice {
 
   _discoverServices() {
     return new Promise((resolve, reject) => {
-      this._peripheral.discoverServices([], (error, service_list) => {
+      this._peripheral.discoverServicesAsync([], (error, service_list) => {
         if (error) {
           reject(error);
           return;
@@ -321,7 +321,7 @@ class SwitchbotDevice {
       // Unsubscribe
       this._unsubscribe().then(() => {
         // Disconnect
-        this._peripheral.disconnect(() => {
+        this._peripheral.disconnectAsync(() => {
           resolve();
         });
       });

package/lib/switchbot.js

@@ -30,7 +30,7 @@ class Switchbot {
     if (params && params.noble) {
       noble = params.noble;
     } else {
-      noble = require("@abandonware/noble");
+      noble = require('@abandonware/noble')({extended: false});
     }
 
     // Public properties
@@ -127,7 +127,7 @@ class Switchbot {
               clearTimeout(timer);
             }
             this.noble.removeAllListeners("discover");
-            this.noble.stopScanning();
+            this.noble.stopScanningAsync(() => process.exit());
             let device_list = [];
             for (let addr in peripherals) {
               device_list.push(peripherals[addr]);
@@ -155,7 +155,7 @@ class Switchbot {
           });
 
           // Start scanning
-          this.noble.startScanning(
+          this.noble.startScanningAsync([
             this._PRIMARY_SERVICE_UUID_LIST,
             false,
             (error) => {
@@ -167,7 +167,7 @@ class Switchbot {
                 finishDiscovery();
               }, p.duration);
             }
-          );
+          ], false);
         })
         .catch((error) => {
           reject(error);
@@ -371,7 +371,7 @@ class Switchbot {
           });
 
           // Start scanning
-          this.noble.startScanning(
+          this.noble.startScanningAsync([
             this._PRIMARY_SERVICE_UUID_LIST,
             true,
             (error) => {
@@ -381,7 +381,7 @@ class Switchbot {
                 resolve();
               }
             }
-          );
+          ], false);
         })
         .catch((error) => {
           reject(error);
@@ -402,7 +402,7 @@ class Switchbot {
    * ---------------------------------------------------------------- */
   stopScan() {
     this.noble.removeAllListeners("discover");
-    this.noble.stopScanning();
+    this.noble.stopScanningAsync(() => process.exit());
   }
 
   /* ------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.7.0",
+  "version": "1.7.1-beta.0",
   "description": "The node-switchbot is a Node.js module which allows you to control your Switchbot Devices through Bluetooth (BLE).",
   "main": "./lib/switchbot.js",
   "files": [
@@ -34,9 +34,9 @@
   },
   "readmeFilename": "README.md",
   "dependencies": {
-    "@abandonware/noble": "^1.9.2-15"
+    "@abandonware/noble": "^1.9.2-17"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.5.1"
+    "npm-check-updates": "^16.6.0"
   }
-}
+}