@stoprocent/bleno 0.8.1 → 0.8.3

package/index.d.ts

@@ -103,7 +103,7 @@ declare class PrimaryService {
     toString(): string;
 }
 
-interface Bleno extends NodeJS.EventEmitter {
+export interface Bleno extends NodeJS.EventEmitter {
     readonly Characteristic: typeof Characteristic;
     readonly Descriptor: typeof Descriptor;
     readonly PrimaryService: typeof PrimaryService;
@@ -120,6 +120,8 @@ interface Bleno extends NodeJS.EventEmitter {
 
     disconnect(): void;
 
+    stop(): void;
+
     setAddress(address: string): void;
 
     setServices(services: ReadonlyArray<PrimaryService>, callback?: (arg: Error | undefined | null) => void): void;

package/lib/bleno.js

@@ -211,6 +211,11 @@ class Bleno extends EventEmitter {
     this._bindings.disconnect();
   }
 
+  stop () {
+    debug('stop');
+    this._bindings.stop();
+  }
+
   updateRssi (callback) {
     if (typeof callback === 'function') {
       this.once('rssiUpdate', (rssi) => callback(null, rssi));

package/lib/hci-socket/bindings.js

@@ -74,10 +74,11 @@ class BlenoBindings extends EventEmitter {
   }
 
   init () {
-    this.onSigIntBinded = this.onSigInt.bind(this);
+    this._sigIntHandler = this.onSigInt.bind(this);
+    this._exitHandler = this.onExit.bind(this);
 
-    process.on('SIGINT', this.onSigIntBinded);
-    process.on('exit', this.onExit.bind(this));
+    process.on('SIGINT', this._sigIntHandler);
+    process.on('exit', this._exitHandler);
 
     this._gap.on('advertisingStart', this.onAdvertisingStart.bind(this));
     this._gap.on('advertisingStop', this.onAdvertisingStop.bind(this));
@@ -101,6 +102,14 @@ class BlenoBindings extends EventEmitter {
     this._hci.init();
   }
 
+  stop () {
+    process.removeListener('SIGINT', this._sigIntHandler);
+    process.removeListener('exit', this._exitHandler);
+    this.stopAdvertising();
+    this.disconnect();
+    this._hci.stop();
+  }
+
   onStateChange (state) {
     if (this._state === state) {
       return;
@@ -202,7 +211,7 @@ class BlenoBindings extends EventEmitter {
   onSigInt () {
     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);
@@ -210,9 +219,7 @@ class BlenoBindings extends EventEmitter {
   }
 
   onExit () {
-    this._gap.stopAdvertising();
-
-    this.disconnect();
+    this.stop();
   }
 }
 

package/lib/hci-socket/hci.js

@@ -116,6 +116,11 @@ class Hci extends EventEmitter {
     }
   }
 
+  stop () {
+    this._socket.removeAllListeners();
+    this._socket.stop();
+  }
+
   resetBuffers () {
     this._mainHandle = null;
     this._handleAclsInProgress = {};
@@ -584,6 +589,7 @@ class Hci extends EventEmitter {
             debug('\t\talready closed');
             continue;
           }
+          
           if (pkts > this._handleAclsInProgress[handle_]) {
             // Linux kernel may send acl packets by itself, so be ready for underflow
             this._handleAclsInProgress[handle_] = 0;

package/lib/mac/src/noble_mac.mm

@@ -228,6 +228,12 @@ Napi::Value BlenoMac::CleanUp(const Napi::CallbackInfo& info) {
     return Napi::Value();
 }
 
+Napi::Value BlenoMac::Stop(const Napi::CallbackInfo& info) {
+    CHECK_MANAGER()
+    CleanUp(info);
+    return Napi::Value();
+}
+
 Napi::Function BlenoMac::GetClass(Napi::Env env) {
     return DefineClass(env, "BlenoMac", {
         BlenoMac::InstanceMethod("init", &BlenoMac::Init),
@@ -248,6 +254,7 @@ Napi::Function BlenoMac::GetClass(Napi::Env env) {
         BlenoMac::InstanceMethod("readHandle", &BlenoMac::ReadValue),
         BlenoMac::InstanceMethod("writeHandle", &BlenoMac::WriteValue),
         BlenoMac::InstanceMethod("cleanUp", &BlenoMac::CleanUp),
+        BlenoMac::InstanceMethod("stop", &BlenoMac::Stop),
     });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoprocent/bleno",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "A Node.js module for implementing BLE (Bluetooth Low Energy) peripherals",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -70,7 +70,7 @@
     "node-gyp-build": "^4.8.1"
   },
   "optionalDependencies": {
-    "@stoprocent/bluetooth-hci-socket": "^1.4.1",
+    "@stoprocent/bluetooth-hci-socket": "^1.4.5",
     "bplist-parser": "0.3.2",
     "xpc-connect": "^3.0.0"
   },