@stoprocent/noble 2.1.4 → 2.1.6

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');
   }
 };
@@ -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);
 };
 

package/lib/hci-socket/gap.js

@@ -40,6 +40,11 @@ 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

@@ -511,7 +511,7 @@ Hci.prototype.setScanEnabled = function (enabled, filterDuplicates) {
 Hci.prototype.createLeConn = function (address, addressType, parameters = {}) {
   this.once('reset', () => this.createLeConnAfterReset(address, addressType, parameters));
   this.reset();
-}
+};
 
 Hci.prototype.createLeConnAfterReset = function (address, addressType, parameters = {}) {
   const {

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.4",
+  "version": "2.1.6",
   "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);
     });
   });

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

@@ -45,6 +45,8 @@ describe('hci-socket gap', () => {
   it('startScanning', () => {
     const hci = {
       on: sinon.spy(),
+      once: sinon.spy(),
+      reset: sinon.spy(),
       setScanEnabled: sinon.spy(),
       setScanParameters: sinon.spy()
     };
@@ -52,6 +54,21 @@ 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);
 

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

@@ -386,10 +386,26 @@ describe('hci-socket hci', () => {
   });
 
   describe('createLeConn', () => {
+    it('should emit reset event and call createLeConnAfterReset', () => {
+      const address = 'aa:bb:cc:dd:ee:ff';
+      const addressType = 'random';
+      const parameters = { minInterval: 0x0060, maxInterval: 0x00c0 };
+      
+      hci.createLeConnAfterReset = jest.fn();      
+      hci.createLeConn(address, addressType, parameters);
+      hci.emit('reset');
+
+      expect(hci.createLeConnAfterReset).toHaveBeenCalledWith(
+        address, addressType, parameters
+      );
+    });
+  });
+
+  describe('createLeConnAfterReset', () => {
     it('should keep default parameters', () => {
       const address = 'aa:bb:cc:dd:ee';
       const addressType = 'random';
-      hci.createLeConn(address, addressType);
+      hci.createLeConnAfterReset(address, addressType);
       assert.calledOnceWithExactly(hci._socket.write, Buffer.from([0x01, 0x0d, 0x20, 0x19, 0x60, 0x00, 0x30, 0x00, 0x00, 0x01, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x00, 0x00, 0x06, 0x00, 0x12, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x04, 0x00, 0x06, 0x00]));
     });
 
@@ -397,7 +413,7 @@ describe('hci-socket hci', () => {
       const address = 'aa:bb:cc:dd:ee';
       const addressType = 'random';
       hci._isExtended = true;
-      hci.createLeConn(address, addressType);
+      hci.createLeConnAfterReset(address, addressType);
       assert.calledOnceWithExactly(hci._socket.write, Buffer.from([0x01, 0x43, 0x20, 0x2a, 0x00, 0x00, 0x01, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x00, 0x05, 0x60, 0x00, 0x60, 0x00, 0x06, 0x00, 0x12, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x06, 0x00, 0x12, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00]));
     });
 
@@ -405,7 +421,7 @@ describe('hci-socket hci', () => {
       const address = 'ee:dd:cc:bb:aa';
       const addressType = 'not_random';
       const parameters = { minInterval: 0x0060, maxInterval: 0x00c0, latency: 0x0010, timeout: 0x0c80 };
-      hci.createLeConn(address, addressType, parameters);
+      hci.createLeConnAfterReset(address, addressType, parameters);
       assert.calledOnceWithExactly(hci._socket.write, Buffer.from([0x01, 0x0d, 0x20, 0x19, 0x60, 0x00, 0x30, 0x00, 0x00, 0x00, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 0x10, 0x00, 0x80, 0x0c, 0x04, 0x00, 0x06, 0x00]));
     });
 
@@ -414,7 +430,7 @@ describe('hci-socket hci', () => {
       const addressType = 'not_random';
       const parameters = { minInterval: 0x0060, maxInterval: 0x00c0, latency: 0x0010, timeout: 0x0c80 };
       hci._isExtended = true;
-      hci.createLeConn(address, addressType, parameters);
+      hci.createLeConnAfterReset(address, addressType, parameters);
       assert.calledOnceWithExactly(hci._socket.write, Buffer.from([0x01, 0x43, 0x20, 0x2a, 0x00, 0x00, 0x00, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0x00, 0x05, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0xc0, 0x00, 0x10, 0x00, 0x80, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0xc0, 0x00, 0x10, 0x00, 0x80, 0x0c, 0x00, 0x00, 0x00, 0x00]));
     });
   });