Merge branch 'develop' of https://github.com/CANDY-LINE/node-red-contrib-generic-ble into develop

Author: Daisuke Baba

src/generic-ble.html

@@ -161,7 +161,8 @@
     return peripheral.uuid;
   }
   const state = {
-    fetchBleDevicesTask: null
+    fetchBleDevicesTask: null,
+    lastBledevRequest: null
   };
   RED.nodes.registerType('Generic BLE',{
     category: 'config',
@@ -187,9 +188,15 @@
     },
     oneditcancel: function() {
       state.fetchBleDevicesTask = null;
+      if (state.lastBledevRequest) {
+        state.lastBledevRequest.abort();
+      }
     },
     oneditsave: function() {
       state.fetchBleDevicesTask = null;
+      if (state.lastBledevRequest) {
+        state.lastBledevRequest.abort();
+      }
       var address = $('#node-config-input-address').val();
       if (address) {
         $('#node-config-input-address').val(address.toLowerCase());
@@ -283,7 +290,6 @@
         return current ? toDeviceKey(current) : '';
       }
 
-      var lastBledevRequest = null;
       function applyBleDevice() {
         var selected = getBleDevice();
         if (!selected) {
@@ -299,16 +305,16 @@
           {style:'display:block; margin-left:auto; margin-right:auto;'})
           .appendTo($('#node-config-input-characteristics-container'));
 
-        if (lastBledevRequest) {
-          lastBledevRequest.abort();
-          lastBledevRequest = null;
+        if (state.lastBledevRequest) {
+          state.lastBledevRequest.abort();
+          state.lastBledevRequest = null;
         }
-        lastBledevRequest = $.ajax({
+        state.lastBledevRequest = $.ajax({
           cache: false,
           url: '__bledev/' + encodeURIComponent(getUuid(selected)),
           dataType: 'json',
           success: function(bleDevice) {
-            lastBledevRequest = null;
+            state.lastBledevRequest = null;
             spin.remove();
             if (getBleDeviceKey() === selectedId) {
               clearCharacteristics();
@@ -333,7 +339,7 @@
             }
           },
           error: function () {
-            lastBledevRequest = null;
+            state.lastBledevRequest = null;
             spin.remove();
             if (getBleDeviceKey() === selectedId) {
               clearCharacteristics();

src/generic-ble.js

@@ -215,6 +215,9 @@ async function toDetailedObject(peripheral, RED) {
           };
           peripheral.once('disconnect', discoveryInterrupted);
           peripheral.discoverAllServicesAndCharacteristics((err, services) => {
+            debug(
+              `<toDetailedObject${peripheral.uuid}:discoverAllServicesAndCharacteristics> Callback OK!`
+            );
             peripheral.removeListener('disconnect', discoveryInterrupted);
             if (err) {
               return reject(err);

src/noble/lib/bluez/bindings.js

@@ -20,9 +20,6 @@ import debugLogger from 'debug';
 import dbus from 'dbus-next';
 
 const debug = debugLogger('node-red-contrib-generic-ble:noble:bluez');
-const CHRARACTERISTICS_DISCOVERY_TIMEOUT_MS = parseInt(
-  process.env.CHRARACTERISTICS_DISCOVERY_TIMEOUT_MS || '500'
-);
 
 // Workaround for a Jest Issue
 // https://github.com/kulshekhar/ts-jest/issues/727#issuecomment-422747294
@@ -360,48 +357,30 @@ class BluezBindings extends EventEmitter {
     debug(
       `discoverCharacteristics:deviceUuid=>${deviceUuid},serviceUuid=>${serviceUuid},characteristicUuids=>${characteristicUuids}`
     );
-    let timeout = 0;
-    let discoveredCharacteristics = await this._listCharacteristics(
+    const discoveredCharacteristics = await this._listCharacteristics(
       deviceUuid,
       serviceUuid,
       characteristicUuids
     );
-    if (!discoveredCharacteristics) {
-      timeout = CHRARACTERISTICS_DISCOVERY_TIMEOUT_MS;
-    }
-    setTimeout(async () => {
-      if (!discoveredCharacteristics) {
-        discoveredCharacteristics = await this._listCharacteristics(
-          deviceUuid,
-          serviceUuid,
-          characteristicUuids
-        );
+    const resultChrs = Object.values(discoveredCharacteristics || {}).map(
+      (chr) => {
+        return {
+          uuid: this._stripDashes(chr.UUID.value),
+          properties: chr.Flags.value,
+        };
       }
-      const resultChrs = Object.values(discoveredCharacteristics || {}).map(
-        (chr) => {
-          return {
-            uuid: this._stripDashes(chr.UUID.value),
-            properties: chr.Flags.value,
-          };
-        }
+    );
+    debug(`resultChrs => ${JSON.stringify(resultChrs)}`);
+    try {
+      this.emit('characteristicsDiscover', deviceUuid, serviceUuid, resultChrs);
+      debug(
+        `[${deviceUuid}] OK. Found ${resultChrs.length} Characteristics. characteristicsDiscover event`
       );
-      debug(`resultChrs => ${JSON.stringify(resultChrs)}`);
-      try {
-        this.emit(
-          'characteristicsDiscover',
-          deviceUuid,
-          serviceUuid,
-          resultChrs
-        );
-        debug(
-          `[${deviceUuid}] OK. Found ${resultChrs.length} Characteristics.`
-        );
-      } catch (err) {
-        debug(
-          `Failed to emit 'characteristicsDiscover' event. message:${err.message}`
-        );
-      }
-    }, timeout);
+    } catch (err) {
+      debug(
+        `Failed to emit 'characteristicsDiscover' event. message:${err.message}`
+      );
+    }
   }
 
   async read(deviceUuid, serviceUuid, characteristicUuid) {