Released v0.0.5

Author: futomi

README.md

@@ -750,6 +750,8 @@ The `battery` is *experimental* for now. I'm not sure whether the value is corre
 ---------------------------------------
 ## <a id="Release-Note">Release Note</a>
 
+* v0.0.5 (2020-02-19)
+  * Improved the stability of discovering the BLE characteristics.
 * v0.0.4 (2020-02-11)
   * Fixed the bug that temperature value lower than 0 degC could not be handled. (Thanks to [@musimasami](https://github.com/futomi/node-switchbot/issues/2))
 * v0.0.3 (2020-02-10)

lib/switchbot-device.js

@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2019-2020, Futomi Hatano, All rights reserved.
 * Released under the MIT license
-* Date: 2020-02-10
+* Date: 2020-02-19
 * ---------------------------------------------------------------- */
 'use strict';
 const parameterChecker = require('./parameter-checker.js');
@@ -108,6 +108,7 @@ class SwitchbotDevice {
       this._peripheral.once('connect', () => {
         this._onconnect();
       });
+
       this._peripheral.once('disconnect', () => {
         this._chars = null;
         this._peripheral.removeAllListeners();
@@ -121,7 +122,7 @@ class SwitchbotDevice {
           reject(error);
           return;
         }
-        this._discoverCharacteristics().then((chars) => {
+        this._getCharacteristics().then((chars) => {
           this._chars = chars;
           return this._subscribe();
         }).then(() => {
@@ -134,12 +135,12 @@ class SwitchbotDevice {
     });
   }
 
-  _discoverCharacteristics() {
+  _getCharacteristics() {
     return new Promise((resolve, reject) => {
       // Set timeout timer
       let timer = setTimeout(() => {
         this._ondisconnect_internal = () => { };
-        this._peripheral.disconnect();
+        timer = null;
         reject(new Error('Failed to discover services and characteristics: TIMEOUT'));
       }, 5000);
 
@@ -148,60 +149,89 @@ class SwitchbotDevice {
         if (timer) {
           clearTimeout(timer);
           timer = null;
+          this._ondisconnect_internal = () => { };
         }
         reject(new Error('Failed to discover services and characteristics: DISCONNECTED'));
       };
 
       // Discover services and characteristics
-      this._peripheral.discoverAllServicesAndCharacteristics((error, services, chars) => {
+      (async () => {
+        let service_list = await this._discoverServices();
+        if (!timer) {
+          throw new Error('');
+        }
+
+        let chars = {
+          write: null,
+          notify: null,
+          device: null
+        };
+
+        for (let service of service_list) {
+          let char_list = await this._discoverCharacteristics(service);
+          for (let char of char_list) {
+            if (char.uuid === this._CHAR_UUID_WRITE) {
+              chars.write = char;
+            } else if (char.uuid === this._CHAR_UUID_NOTIFY) {
+              chars.notify = char;
+            } else if (char.uuid === this._CHAR_UUID_DEVICE) {
+              // Some models of Bot don't seem to support this characteristic UUID
+              chars.device = char;
+            }
+          }
+        }
+
+        if (chars.write && chars.notify) {
+          resolve(chars);
+        } else {
+          reject(new Error('No characteristic was found.'));
+        }
+
+      })().catch((error) => {
         if (timer) {
           clearTimeout(timer);
           timer = null;
+          this._ondisconnect_internal = () => { };
+          reject(error);
+        } else {
+          // Do nothing
         }
-        this._ondisconnect_internal = () => { };
+      });
+    });
+  }
 
+  _discoverServices() {
+    return new Promise((resolve, reject) => {
+      this._peripheral.discoverServices([], (error, service_list) => {
         if (error) {
           reject(error);
           return;
         }
 
-        // Check the primary service UUID
         let service = null;
-        services.forEach((s) => {
+        for (let s of service_list) {
           if (s.uuid === this._SERV_UUID_PRIMARY) {
             service = s;
+            break;
           }
-        });
-        if (!service) {
-          reject(new Error('No service was found'));
-          return;
         }
-
-        // Check the characteristics
-        let char_write = null;
-        let char_notify = null;
-        let char_device = null;
-
-        chars.forEach((c) => {
-          if (c.uuid === this._CHAR_UUID_WRITE) {
-            char_write = c;
-          } else if (c.uuid === this._CHAR_UUID_NOTIFY) {
-            char_notify = c;
-          } else if (c.uuid === this._CHAR_UUID_DEVICE) {
-            // Some models of Bot don't seem to support this characteristic UUID
-            char_device = c;
-          }
-        });
-        if (!(char_write && char_notify)) {
-          reject(new Error('No characteristic was found.'));
-          return;
+        if (service) {
+          resolve(service_list);
+        } else {
+          reject(new Error('No service was found.'));
         }
+      });
+    });
+  }
 
-        resolve({
-          write: char_write,
-          notify: char_notify,
-          device: char_device
-        });
+  _discoverCharacteristics(service) {
+    return new Promise((resolve, reject) => {
+      service.discoverCharacteristics([], (error, char_list) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve(char_list);
+        }
       });
     });
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "The node-switchbot is a Node.js module which allows you to move your Switchbot (Bot)'s arm and to monitor the temperature/humidity from SwitchBot Thermometer & Hygrometer (Meter).",
   "main": "./lib/switchbot.js",
   "files": [