@stoprocent/noble 1.18.2 → 1.18.3

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);

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.18.3",
   "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.4.5"
   },
   "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];