Merge branch 'release/4.0.4'

README.md

@@ -32,7 +32,7 @@ The following nodes are no longer included:
 
 ## サンプルフロー
 
-BLEIo向けのサンプルフロー[`example-flow.json`](https://github.com/CANDY-LINE/node-red-contrib-asakusa_giken/blob/develop/src/exmple-flow.json) が利用可能です。クリックして中身を表示してから全体をコピーし、Node-REDの`Import`から`Clipboard`を選択して内容を貼り付けてください。
+BLEIo向けのサンプルフロー[`example-flow.json`](https://github.com/CANDY-LINE/node-red-contrib-asakusa_giken/blob/develop/src/example-flow.json) が利用可能です。クリックして中身を表示してから全体をコピーし、Node-REDの`Import`から`Clipboard`を選択して内容を貼り付けてください。
 
 # Install
 
@@ -58,6 +58,9 @@ $ npm run build
 will generate ES5 js files.
 
 # Revision History
+* 4.0.4
+    - Fix an issue where TimeoutError can be thrown when valid BLE peripherals are missing
+
 * 4.0.3
     - Invoke done() callback at least one associated peripheral exists
 
@@ -72,6 +75,9 @@ will generate ES5 js files.
     - Remove Node.js v0.12 support
     - Remove [BLECAST_TM](http://www.robotsfx.com/robot/BLECAST_TM.html) node and [BLECAST_BL](http://www.robotsfx.com/robot/BLECAST_BL.html) node
 
+* 3.x
+    - See 3.x branch for future 3.x releases
+
 * 3.0.4
     - Remove redundant dependency
 
@@ -118,6 +124,6 @@ will generate ES5 js files.
 
 # Copyright and License
 
-PNG images under icon folder are released under [CC BY-NC-SA](http://creativecommons.org/licenses/by-nc-sa/4.0/), copyright 2016 [CANDY LINE INC.](http://www.candy-line.io).
+PNG images under icon folder are released under [CC BY-NC-SA](http://creativecommons.org/licenses/by-nc-sa/4.0/), copyright 2017 [CANDY LINE INC.](http://www.candy-line.io).
 
 The project is released under MIT License. See LICENSE for detail.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-asakusa_giken",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Node-RED nodes for Asakusa Giken Devices",
   "license": "MIT",
   "repository": {

src/asakusa_giken.es6.js

@@ -79,7 +79,9 @@ export default function(RED) {
 
         this.on('close', (done) => {
           if (this.bleioNode) {
-            bleio.remove(this, done, RED);
+            if (!bleio.remove(this, done, RED)) {
+              done();
+            }
           }
         });
         bleio.clear(RED);
@@ -105,7 +107,9 @@ export default function(RED) {
 
         this.on('close', (done) => {
           if (this.bleioNode) {
-            bleio.remove(this, done, RED);
+            if (!bleio.remove(this, done, RED)) {
+              done();
+            }
           }
         });
         bleio.clear(RED);

src/bleio.es6.js

@@ -629,9 +629,15 @@ export function register(node, RED) {
   if (CONN_DEBUG) { RED.log.info(`${TAG}[CONN_DEBUG] (register) end`); }
 }
 
+/* false when done() is never called */
 export function remove(node, done, RED) {
   if (!node || !node.bleioNode) {
-    throw new Error('invalid node');
+    let err = new Error('invalid node');
+    if (done) {
+      done(err);
+      return true;
+    }
+    throw err;
   }
   let localName = node.bleioNode.localName;
   if (!localName) {
@@ -664,6 +670,10 @@ export function remove(node, done, RED) {
         done();
       }
     }
+  } else {
+    if (done) {
+      done();
+    }
   }
   return true;
 }