@stoprocent/noble 1.18.2 → 1.19.0

package/lib/hci-socket/bindings.js

@@ -105,7 +105,13 @@ NobleBindings.prototype.updateRssi = function (peripheralUuid) {
 };
 
 NobleBindings.prototype.init = function () {
-  this.onSigIntBinded = this.onSigInt.bind(this);
+  /* Add exit handlers after `init()` has completed. If no adaptor
+  is present it can throw an exception - in which case we don't
+  want to try and clear up afterwards (issue #502) */
+  this._sigIntHandler = this.onSigInt.bind(this);
+  this._exitHandler = this.stop.bind(this);
+  process.on('SIGINT', this._sigIntHandler);
+  process.on('exit', this._exitHandler);
 
   this._gap.on('scanParametersSet', this.onScanParametersSet.bind(this));
   this._gap.on('scanStart', this.onScanStart.bind(this));
@@ -122,18 +128,12 @@ NobleBindings.prototype.init = function () {
   this._hci.on('aclDataPkt', this.onAclDataPkt.bind(this));
   
   this._hci.init();
-
-  /* Add exit handlers after `init()` has completed. If no adaptor
-  is present it can throw an exception - in which case we don't
-  want to try and clear up afterwards (issue #502) */
-  process.on('SIGINT', this.onSigIntBinded);
-  process.on('exit', this.stop.bind(this));
 };
 
 NobleBindings.prototype.onSigInt = function () {
   const sigIntListeners = process.listeners('SIGINT');
 
-  if (sigIntListeners[sigIntListeners.length - 1] === this.onSigIntBinded) {
+  if (sigIntListeners[sigIntListeners.length - 1] === this._sigIntHandler) {
     // we are the last listener, so exit
     // this will trigger onExit, and clean up
     process.exit(1);
@@ -141,6 +141,9 @@ NobleBindings.prototype.onSigInt = function () {
 };
 
 NobleBindings.prototype.stop = function () {
+  process.removeListener('exit', this._exitHandler);
+  process.removeListener('SIGINT', this._sigIntHandler);
+
   this.stopScanning();
   for (const handle in this._aclStreams) {
     this._hci.disconnect(handle);
@@ -153,6 +156,14 @@ NobleBindings.prototype.onStateChange = function (state) {
   if (this._state === state) {
     return;
   }
+
+  // If we are powered on and we are powered off, disconnect all connections
+  if (this._state === 'poweredOn' && state === 'poweredOff') {
+    for (const handle in this._handles) {
+      this.onDisconnComplete(handle, 0x03); // Hardward Failure
+    }
+  }
+
   this._state = state;
 
   if (state === 'unauthorized') {

package/lib/hci-socket/gatt.js

@@ -182,7 +182,6 @@ Gatt.prototype.onAclStreamEnd = function () {
 
 Gatt.prototype.writeAtt = function (data) {
   debug(`${this._address}: write: ${data.toString('hex')}`);
-
   this._aclStream.write(ATT_CID, data);
 };
 

package/lib/hci-socket/hci.js

@@ -104,18 +104,19 @@ const Hci = function (options) {
   this._isExtended = 'extended' in options && options.extended;
   this._state = null;
   this._bindParams = 'bindParams' in options ? options.bindParams : undefined;
-
   this._handleBuffers = {};
-
   this._aclBuffers = undefined;
   this._resolveAclBuffers = undefined;
+
   const aclBuffersPromise = new Promise((resolve) => {
     this._resolveAclBuffers = resolve;
   });
+  
   this.getAclBuffers = async function () {
     if (this._aclBuffers) return this._aclBuffers;
     return await aclBuffersPromise;
   }.bind(this);
+  
   this.setAclBuffers = function (length, num) {
     if (this._aclBuffers) {
       this._aclBuffers.length = length;
@@ -130,7 +131,6 @@ const Hci = function (options) {
   }.bind(this);
 
   this._aclConnections = new Map();
-
   this._aclQueue = [];
 
   this._deviceId = options.deviceId != null
@@ -926,32 +926,28 @@ Hci.prototype.processCmdCompleteEvent = function (cmd, status, result) {
     this.setLeEventMask();
     this.readLocalVersion();
     this.readBdAddr();
-  } else if (cmd === LE_READ_LOCAL_SUPPORTED_FEATURES) {
-    if (status === 0) {
-      // Set _isExtended based on leExtendedAdvertising bit (12)
-      this._isExtended = !!(result.readUInt32LE(0) & (1 << 12));
+  } else if (cmd === LE_READ_LOCAL_SUPPORTED_FEATURES && status === 0) {
+    // Set _isExtended based on leExtendedAdvertising bit (12)
+    this._isExtended = !!(result.readUInt32LE(0) & (1 << 12));
 
-      this.emit('leFeatures', result);
+    this.emit('leFeatures', result);
 
-      if (this._isExtended) {
-        this.setCodedPhySupport();
-      }
-      this.setEventMask();
-      this.setLeEventMask();
-      this.readLocalVersion();
-      this.writeLeHostSupported();
-      this.readLeHostSupported();
-      this.readLeBufferSize();
-      this.readBdAddr();
+    if (this._isExtended) {
+      this.setCodedPhySupport();
     }
-  } else if (cmd === READ_LE_HOST_SUPPORTED_CMD) {
-    if (status === 0) {
-      const le = result.readUInt8(0);
-      const simul = result.readUInt8(1);
+    this.setEventMask();
+    this.setLeEventMask();
+    this.readLocalVersion();
+    this.writeLeHostSupported();
+    this.readLeHostSupported();
+    this.readLeBufferSize();
+    this.readBdAddr();
+  } else if (cmd === READ_LE_HOST_SUPPORTED_CMD && status === 0) {
+    const le = result.readUInt8(0);
+    const simul = result.readUInt8(1);
 
-      debug(`\t\t\tle = ${le}`);
-      debug(`\t\t\tsimul = ${simul}`);
-    }
+    debug(`\t\t\tle = ${le}`);
+    debug(`\t\t\tsimul = ${simul}`);
   } else if (cmd === READ_LOCAL_VERSION_CMD) {
     const hciVer = result.readUInt8(0);
     const hciRev = result.readUInt16LE(1);
@@ -1289,6 +1285,11 @@ Hci.prototype.processCmdStatusEvent = function (cmd, status) {
 };
 
 Hci.prototype.onStateChange = function (state) {
+  // If we are powered on and we are powered off, clean up
+  if (this._state === 'poweredOn' && state === 'poweredOff') {
+    this._aclConnections.clear();
+    this._aclQueue = [];
+  }
   this._state = state;
 };
 

package/lib/noble.js

@@ -14,11 +14,8 @@ function Noble (bindings) {
   this.address = 'unknown';
   this._state = 'unknown';
   this._bindings = bindings;
-  this._peripherals = {};
-  this._services = {};
-  this._characteristics = {};
-  this._descriptors = {};
-  this._discoveredPeripheralUUids = {};
+  
+  this._cleanupPeriperals();
 
   this._bindings.on('stateChange', this.onStateChange.bind(this));
   this._bindings.on('addressChange', this.onAddressChange.bind(this));
@@ -56,7 +53,6 @@ function Noble (bindings) {
   this.on('newListener', (event) => {
     if (event === 'stateChange' && !this.initialized) {
       this.initialized = true;
-
       process.nextTick(() => {
         try {
           this._bindings.init();
@@ -73,7 +69,6 @@ function Noble (bindings) {
       get: function () {
         if (!this.initialized) {
           this.initialized = true;
-
           this._bindings.init();
         }
         return this._state;
@@ -84,11 +79,23 @@ function Noble (bindings) {
 
 util.inherits(Noble, events.EventEmitter);
 
+Noble.prototype._cleanupPeriperals = function () {
+  this._peripherals = {};
+  this._services = {};
+  this._characteristics = {};
+  this._descriptors = {};
+  this._discoveredPeripheralUUids = {};
+};
+
 Noble.prototype.onStateChange = function (state) {
   debug(`stateChange ${state}`);
 
-  this._state = state;
+  // If the state is poweredOff and the previous state was poweredOn, clean up the peripherals
+  if (state === 'poweredOff' && this._state === 'poweredOn') {
+    this._cleanupPeriperals();
+  }
 
+  this._state = state;
   this.emit('stateChange', state);
 };
 

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "name": "@stoprocent/noble",
   "description": "A Node.js BLE (Bluetooth Low Energy) central library.",
-  "version": "1.18.2",
+  "version": "1.19.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"
@@ -34,7 +34,7 @@
     "node-gyp-build": "^4.8.1"
   },
   "optionalDependencies": {
-    "@stoprocent/bluetooth-hci-socket": "^1.4.4"
+    "@stoprocent/bluetooth-hci-socket": "^1.5.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",

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

@@ -78,13 +78,13 @@ describe('hci-socket bindings', () => {
   describe('onSigInt', () => {
     it('should exit', () => {
       const sigIntListeners = process.listeners('SIGINT');
-      bindings.onSigIntBinded = sigIntListeners[sigIntListeners.length - 1];
+      bindings._sigIntHandler = sigIntListeners[sigIntListeners.length - 1];
       bindings.onSigInt();
       assert.calledOnceWithExactly(process.exit, 1);
     });
 
     it('should not exit', () => {
-      bindings.onSigIntBinded = sinon.spy();
+      bindings._sigIntHandler = sinon.spy();
       bindings.onSigInt();
       assert.notCalled(process.exit);
     });
@@ -292,7 +292,9 @@ describe('hci-socket bindings', () => {
       bindings._gap.stopScanning = fake.resolves(null);
       bindings._hci.reset = fake.resolves(null);
       bindings._hci.stop = fake.resolves(null);
-
+      bindings._sigIntHandler = fake.resolves(null);
+      bindings._exitHandler = fake.resolves(null);
+      
       bindings.stop();
 
       assert.calledOnce(bindings._gap.stopScanning);
@@ -305,6 +307,8 @@ describe('hci-socket bindings', () => {
       bindings._hci.disconnect = fake.resolves(null);
       bindings._hci.reset = fake.resolves(null);
       bindings._hci.stop = fake.resolves(null);
+      bindings._sigIntHandler = fake.resolves(null);
+      bindings._exitHandler = fake.resolves(null);
 
       bindings._aclStreams = [1, 2, 3];