Merge branch 'release/2.0.2'

Author: Daisuke Baba

README.md

@@ -131,6 +131,9 @@ Set `GENERIC_BLE_TRACE=true` on starting Node-RED and you can find the precise l
 
 # Revision History
 
+* 2.0.2
+  - Fix an issue where Write operation cannot be performed properly (#4)
+
 * 2.0.1
   - Fix an issue where `Select from scan result` failed to list characteristics
 

examples/01-read-write.json

@@ -1,31 +1,31 @@
 [
     {
-        "id": "867e39b4.d517f",
+        "id": "31e26832.b13058",
         "type": "tab",
         "label": "Generic BLE Example",
         "disabled": false,
         "info": "This flow shows BLE Read/Write example.\n"
     },
     {
-        "id": "dfcf20d6.138ff",
+        "id": "72e93d17.88e32c",
         "type": "Generic BLE in",
-        "z": "867e39b4.d517f",
+        "z": "31e26832.b13058",
         "name": "",
-        "genericBle": "3b98076c.99a4c8",
+        "genericBle": "bee5eec.96bf31",
         "useString": false,
         "notification": true,
         "x": 450,
         "y": 320,
         "wires": [
             [
-                "da23254.83523d8"
+                "ef614de2.5caa4"
             ]
         ]
     },
     {
-        "id": "215c4824.9513c8",
+        "id": "d0252715.dac4b8",
         "type": "inject",
-        "z": "867e39b4.d517f",
+        "z": "31e26832.b13058",
         "name": "Get Battery Level",
         "topic": "2a19",
         "payload": "",
@@ -37,14 +37,14 @@
         "y": 220,
         "wires": [
             [
-                "dfcf20d6.138ff"
+                "72e93d17.88e32c"
             ]
         ]
     },
     {
-        "id": "da23254.83523d8",
+        "id": "ef614de2.5caa4",
         "type": "debug",
-        "z": "867e39b4.d517f",
+        "z": "31e26832.b13058",
         "name": "",
         "active": true,
         "console": "false",
@@ -54,38 +54,38 @@
         "wires": []
     },
     {
-        "id": "f717fa38.f4e548",
+        "id": "73fbb96b.2b7cf8",
         "type": "Generic BLE out",
-        "z": "867e39b4.d517f",
+        "z": "31e26832.b13058",
         "name": "",
-        "genericBle": "3b98076c.99a4c8",
+        "genericBle": "bee5eec.96bf31",
         "x": 450,
         "y": 400,
         "wires": []
     },
     {
-        "id": "bcb384fa.99e64",
+        "id": "66eb9698.1366b8",
         "type": "inject",
-        "z": "867e39b4.d517f",
-        "name": "Write Some Data",
+        "z": "31e26832.b13058",
+        "name": "Write Transient Data",
         "topic": "",
-        "payload": "{\"2a00\":\"yayyay\"}",
+        "payload": "{\"f000aa0204514000b000000000000000\":\"ca\"}",
         "payloadType": "json",
         "repeat": "",
         "crontab": "",
         "once": false,
-        "x": 200,
+        "x": 210,
         "y": 460,
         "wires": [
             [
-                "f717fa38.f4e548"
+                "73fbb96b.2b7cf8"
             ]
         ]
     },
     {
-        "id": "940c1128.0cc1f8",
+        "id": "2b7c6888.26cb88",
         "type": "inject",
-        "z": "867e39b4.d517f",
+        "z": "31e26832.b13058",
         "name": "Get All Readable Attributes",
         "topic": "",
         "payload": "",
@@ -97,14 +97,14 @@
         "y": 140,
         "wires": [
             [
-                "dfcf20d6.138ff"
+                "72e93d17.88e32c"
             ]
         ]
     },
     {
-        "id": "5525464e.999a4",
+        "id": "1589318.4ea604f",
         "type": "inject",
-        "z": "867e39b4.d517f",
+        "z": "31e26832.b13058",
         "name": "Poll Notify Events",
         "topic": "2a19",
         "payload": "{\"notify\":true,\"period\":5000}",
@@ -116,12 +116,31 @@
         "y": 300,
         "wires": [
             [
-                "dfcf20d6.138ff"
+                "72e93d17.88e32c"
+            ]
+        ]
+    },
+    {
+        "id": "164faa57.c92a66",
+        "type": "inject",
+        "z": "31e26832.b13058",
+        "name": "Read Trransient Data",
+        "topic": "f000aa0204514000b000000000000000",
+        "payload": "",
+        "payloadType": "date",
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "x": 220,
+        "y": 360,
+        "wires": [
+            [
+                "72e93d17.88e32c"
             ]
         ]
     },
     {
-        "id": "3b98076c.99a4c8",
+        "id": "bee5eec.96bf31",
         "type": "Generic BLE",
         "z": "",
         "localName": "CC2650 SensorTag",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-generic-ble",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Node-RED nodes for generic BLE devices",
   "license": "Apache-2.0",
   "repository": {

src/generic-ble.js

@@ -142,17 +142,25 @@ function characteristicsTask(services, bleDevice) {
   return new Promise((taskResolve, taskReject) => {
     loop = () => {
       let writeRequest = bleDevice._writeRequests.shift() || [];
+      if (TRACE) {
+        bleDevice.log(`<characteristicsTask> writeRequest => ${JSON.stringify(writeRequest)}`);
+      }
       let writeUuidList = writeRequest.map(c => c.uuid);
       let writeChars = writeRequest.length > 0 ?
         characteristics.filter(c => writeUuidList.indexOf(c.uuid) >= 0) : [];
       let writePromises = writeChars.map((c) => {
-        if (!writeRequest.data) {
+        let req = writeRequest.filter((r) => r.uuid === c.uuid)[0];
+        if (!req || !req.data) {
           return null;
         }
         return new Promise((resolve, reject) => {
+          let buf = valToBuffer(req.data);
+          if (TRACE) {
+            bleDevice.log(`<Write> uuid => ${c.uuid}, data => ${buf}, writeWithoutResponse => ${req.writeWithoutResponse}`);
+          }
           c.write(
-            valToBuffer(writeRequest.data),
-            writeRequest.writeWithoutResponse,
+            buf,
+            req.writeWithoutResponse,
             (err) => {
               if (err) {
                 if (TRACE) {
@@ -169,9 +177,15 @@ function characteristicsTask(services, bleDevice) {
         });
       }).filter(p => p);
       operationTimeoutMs += writePromises.length * BLE_OPERATION_WAIT_MS;
+      if (TRACE) {
+        bleDevice.log(`<characteristicsTask> writePromises.length => ${writePromises.length}`);
+      }
 
       let readObj = {};
       let readRequest = bleDevice._readRequests.shift() || [];
+      if (TRACE) {
+        bleDevice.log(`<characteristicsTask> readRequest => ${JSON.stringify(readRequest)}`);
+      }
       let readUuidList = readRequest.map(c => c.uuid);
       let readChars = readUuidList.length > 0 ?
         characteristics.filter(c => c && readUuidList.indexOf(c.uuid) >= 0) : [];
@@ -186,7 +200,7 @@ function characteristicsTask(services, bleDevice) {
                 return reject(err);
               }
               if (TRACE) {
-                bleDevice.log(`<Read> ${c.uuid} => ${data}`);
+                bleDevice.log(`<Read> ${c.uuid} => ${JSON.stringify(data)}`);
               }
               readObj[c.uuid] = data;
               resolve();