node-switchbot 1.7.1 → 1.7.3-beta.0

package/lib/switchbot-device.js

@@ -131,7 +131,7 @@ class SwitchbotDevice {
       });
 
       // Connect
-      this._peripheral.connectAsync((error) => {
+      this._peripheral.connect((error) => {
         if (error) {
           reject(error);
           return;
@@ -145,7 +145,7 @@ class SwitchbotDevice {
             resolve();
           })
           .catch((error) => {
-            this._peripheral.disconnectAsync();
+            this._peripheral.disconnect();
             reject(error);
           });
       });
@@ -224,7 +224,7 @@ class SwitchbotDevice {
 
   _discoverServices() {
     return new Promise((resolve, reject) => {
-      this._peripheral.discoverServicesAsync([], (error, service_list) => {
+      this._peripheral.discoverServices([], (error, service_list) => {
         if (error) {
           reject(error);
           return;
@@ -321,7 +321,7 @@ class SwitchbotDevice {
       // Unsubscribe
       this._unsubscribe().then(() => {
         // Disconnect
-        this._peripheral.disconnectAsync(() => {
+        this._peripheral.disconnect(() => {
           resolve();
         });
       });
@@ -443,6 +443,9 @@ class SwitchbotDevice {
 
       this._connect()
         .then(() => {
+          if (!this._chars) {
+            return reject("No characteristics available.");
+          }
           return this._write(this._chars.write, req_buf);
         })
         .then(() => {

package/lib/switchbot.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.7.1",
+  "version": "1.7.3-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": [
@@ -37,6 +37,6 @@
     "@abandonware/noble": "1.9.2-15"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.6.0"
+    "npm-check-updates": "^16.6.2"
   }
-}
+}