@stoprocent/noble 2.1.5 → 2.1.7

package/lib/hci-socket/bindings.js

@@ -104,10 +104,8 @@ NobleBindings.prototype.startScanning = function (
 };
 
 NobleBindings.prototype.stopScanning = function () {
-  if (this._isScanning) {
-    this._gap.stopScanning();
-  }
-  else {
+  this._gap.stopScanning();
+  if (!this._isScanning) {
     this.emit('scanStop');
   }
 };
@@ -132,7 +130,7 @@ NobleBindings.prototype.connect = function (peripheralUuid, parameters = {}) {
   const processNextConnection = () => {
     if (this._connectionQueue.length === 1) {
       const nextConn = this._connectionQueue[0]; // Look at next connection but don't remove yet
-      this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params);
+      this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params, Object.keys(this._handles).length === 0);
     }
   };
 
@@ -215,7 +213,9 @@ NobleBindings.prototype.onScanParametersSet = function () {
 };
 
 NobleBindings.prototype.onScanStart = function (filterDuplicates) {
-  this._isScanning = true;
+  if (this._isScanningStarted) { 
+    this._isScanning = true;
+  }
   this.emit('scanStart', filterDuplicates);
 };
 
@@ -292,10 +292,6 @@ NobleBindings.prototype.onLeConnComplete = function (
   supervisionTimeout,
   masterClockAccuracy
 ) {
-  // 
-  this._isScanning = false;
-  this._isScanningStarted = false;
-
   if (role !== 0 && role !== undefined) {
     // not master, ignore
     return;
@@ -408,7 +404,7 @@ NobleBindings.prototype.onLeConnComplete = function (
   // Process next connection in queue if any
   if (this._connectionQueue.length > 0 && !this._isScanning) {
     const nextConn = this._connectionQueue[0];
-    this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params);
+    this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params, Object.keys(this._handles).length === 0);
   }
 };
 

package/lib/hci-socket/gap.js

@@ -40,11 +40,6 @@ Gap.prototype.setScanParameters = function (interval, window) {
 };
 
 Gap.prototype.startScanning = function (allowDuplicates) {
-  this._hci.once('reset', () => this.startScanningAfterReset(allowDuplicates));
-  this._hci.reset();
-};
-
-Gap.prototype.startScanningAfterReset = function (allowDuplicates) {
   this._scanState = 'starting';
   this._scanFilterDuplicates = !allowDuplicates;
 

package/lib/hci-socket/hci.js

@@ -508,9 +508,19 @@ Hci.prototype.setScanEnabled = function (enabled, filterDuplicates) {
   this._socket.write(cmd);
 };
 
-Hci.prototype.createLeConn = function (address, addressType, parameters = {}) {
-  this.once('reset', () => this.createLeConnAfterReset(address, addressType, parameters));
-  this.reset();
+// This is a mystery case for me. 
+// I don't know why we need to reset the hci socket before creating a LE connection.
+// Issues related to this:
+// https://github.com/stoprocent/noble/issues/12
+// https://github.com/bluez/bluez/issues/1178
+Hci.prototype.createLeConn = function (address, addressType, parameters = {}, reset = true) {
+  if (reset) {
+    this.once('reset', () => this.createLeConnAfterReset(address, addressType, parameters));
+    this.reset();
+  }
+  else {
+    this.createLeConnAfterReset(address, addressType, parameters);
+  }
 };
 
 Hci.prototype.createLeConnAfterReset = function (address, addressType, parameters = {}) {

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "name": "@stoprocent/noble",
   "description": "A Node.js BLE (Bluetooth Low Energy) central library.",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"

package/test/lib/hci-socket/bindings.test.js

@@ -216,7 +216,7 @@ describe('hci-socket bindings', () => {
 
       bindings.stopScanning();
 
-      expect(bindings._gap.stopScanning).not.toHaveBeenCalled();
+      expect(bindings._gap.stopScanning).toHaveBeenCalledTimes(1);
       expect(scanStopSpy).toHaveBeenCalledTimes(1);
     });
   });
@@ -239,7 +239,7 @@ describe('hci-socket bindings', () => {
       should(bindings._connectionQueue[0].params).eql({ addressType: 'public' });
 
       expect(bindings._hci.createLeConn).toHaveBeenCalledTimes(1);
-      expect(bindings._hci.createLeConn).toHaveBeenCalledWith('11:22:33:44:55:66', 'public', { addressType: 'public' });
+      expect(bindings._hci.createLeConn).toHaveBeenCalledWith('11:22:33:44:55:66', 'public', { addressType: 'public' }, true);
     });
 
     it('missing peripheral, no queue, random address', () => {
@@ -252,7 +252,7 @@ describe('hci-socket bindings', () => {
       should(bindings._connectionQueue[0].params).eql({ addressType: 'random' });
 
       expect(bindings._hci.createLeConn).toHaveBeenCalledTimes(1);
-      expect(bindings._hci.createLeConn).toHaveBeenCalledWith('f3:22:33:44:55:66', 'random', { addressType: 'random' });
+      expect(bindings._hci.createLeConn).toHaveBeenCalledWith('f3:22:33:44:55:66', 'random', { addressType: 'random' }, true);
     });
 
     it('existing peripheral, no queue', () => {
@@ -271,7 +271,7 @@ describe('hci-socket bindings', () => {
       should(bindings._connectionQueue[0].params).eql('parameters');
 
       expect(bindings._hci.createLeConn).toHaveBeenCalledTimes(1);
-      expect(bindings._hci.createLeConn).toHaveBeenCalledWith('address', 'addressType', 'parameters');
+      expect(bindings._hci.createLeConn).toHaveBeenCalledWith('address', 'addressType', 'parameters', true);
     });
 
     it('missing peripheral, with queue', () => {
@@ -801,8 +801,8 @@ describe('hci-socket bindings', () => {
       expect(connectCallback).toHaveBeenCalledTimes(1);
       expect(connectCallback).toHaveBeenCalledWith('112233445566', null);
       expect(Hci.createLeConnSpy).toHaveBeenCalledTimes(2);
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('112233445566', 'random', { addressType: 'random' });
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('998877665544', 'public', { addressType: 'public' });
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('112233445566', 'random', { addressType: 'random' }, true);
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('998877665544', 'public', { addressType: 'public' }, false);
 
       should(bindings._connectionQueue).length(1);
     });
@@ -822,14 +822,16 @@ describe('hci-socket bindings', () => {
       bindings.connect('queuedId_2', { addressType: 'public' });
       bindings.connect('queuedId_3', { addressType: 'random' });
 
+      bindings.emit('reset');
+
       bindings.on('connect', connectCallback);
       bindings.onLeConnComplete(status, handle, role, addressType, address);
 
       expect(connectCallback).toHaveBeenCalledTimes(1);
       expect(connectCallback).toHaveBeenCalledWith('112233445566', null);
       expect(Hci.createLeConnSpy).toHaveBeenCalledTimes(2);
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('112233445566', 'random', { addressType: 'random' });
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('998877665544', 'public', { addressType: 'public' });
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('112233445566', 'random', { addressType: 'random' }, true);
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('998877665544', 'public', { addressType: 'public' }, false);
       expect(bindings._connectionQueue).toHaveLength(2);
     });
 
@@ -865,9 +867,9 @@ describe('hci-socket bindings', () => {
       expect(connectCallback).toHaveBeenCalledWith('998877665544', null);
 
       expect(Hci.createLeConnSpy).toHaveBeenCalledTimes(3);
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('112233445566', 'random', { addressType: 'random' });
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('998877665544', 'public', { addressType: 'public' });
-      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('aabbccddeeff', 'random', { addressType: 'random' });
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('112233445566', 'random', { addressType: 'random' }, true);
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('998877665544', 'public', { addressType: 'public' }, false);
+      expect(Hci.createLeConnSpy).toHaveBeenCalledWith('aabbccddeeff', 'random', { addressType: 'random' }, false);
       expect(bindings._connectionQueue).toHaveLength(1);
     });
   });

package/test/lib/hci-socket/gap.test.js

@@ -46,7 +46,6 @@ describe('hci-socket gap', () => {
     const hci = {
       on: sinon.spy(),
       once: sinon.spy(),
-      reset: sinon.spy(),
       setScanEnabled: sinon.spy(),
       setScanParameters: sinon.spy()
     };
@@ -54,21 +53,6 @@ describe('hci-socket gap', () => {
     const gap = new Gap(hci);
     gap.startScanning(true);
 
-    assert.callCount(hci.once, 1);
-    assert.calledWithExactly(hci.reset);
-  });
-
-  it('startScanningAfterReset', () => {
-    const hci = {
-      on: sinon.spy(),
-      once: sinon.spy(),
-      setScanEnabled: sinon.spy(),
-      setScanParameters: sinon.spy()
-    };
-
-    const gap = new Gap(hci);
-    gap.startScanningAfterReset(true);
-
     should(gap._scanState).equal('starting');
     should(gap._scanFilterDuplicates).equal(false);