@stoprocent/bleno 0.10.5 → 0.11.1

package/index.d.ts

@@ -179,8 +179,14 @@ declare module '@stoprocent/bleno' {
     }
 
     export interface HciBindingsOptions extends BaseBindingsOptions {
+        /** Driver Type ('default' | 'uart' | 'usb' | 'native') */
         hciDriver?: import('@stoprocent/bluetooth-hci-socket').DriverType;
+        /** Bind Params (for USB and UART Hci Drivers only) */
         bindParams?: import('@stoprocent/bluetooth-hci-socket').BindParams;
+        /** HCI Device ID (Linux Only), Default is 0 */
+        deviceId?: number;
+        /** Uses User channel instead of Raw HCI Channel */
+        userChannel?: boolean;
     }
 
     export interface MacBindingsOptions extends BaseBindingsOptions {

package/lib/hci-socket/hci.js

@@ -85,7 +85,17 @@ class Hci extends EventEmitter {
     this._manufacturer = null;
     this._isDevUp = null;
     this._state = null;
-    this._deviceId = null;
+    
+    this._deviceId = options.deviceId != null
+    ? parseInt(options.deviceId, 10)
+    : process.env.BLENO_HCI_DEVICE_ID
+      ? parseInt(process.env.BLENO_HCI_DEVICE_ID, 10)
+      : undefined;
+
+    this._userChannel =
+      (typeof options.userChannel === 'undefined' && options.userChannel) ||
+      process.env.HCI_CHANNEL_USER;
+
     // le-u min payload size + l2cap header size
     // see Bluetooth spec 4.2 [Vol 3, Part A, Chapter 4]
     this._aclMtu = 23 + 4;
@@ -102,16 +112,13 @@ class Hci extends EventEmitter {
     this._socket.on('error', this.onSocketError.bind(this));
     this._socket.on('state', this.pollIsDevUp.bind(this));
 
-    const deviceId = process.env.BLENO_HCI_DEVICE_ID ? parseInt(process.env.BLENO_HCI_DEVICE_ID) : undefined;
-
-    if (process.env.HCI_CHANNEL_USER) {
-      this._deviceId = this._socket.bindUser(deviceId, this._bindParams);
-
+    if (this._userChannel) {
+      this._deviceId = this._socket.bindUser(this._deviceId, this._bindParams);
       this._socket.start();
 
       this.reset();
     } else {
-      this._deviceId = this._socket.bindRaw(deviceId, this._bindParams);
+      this._deviceId = this._socket.bindRaw(this._deviceId, this._bindParams);
       this._socket.start();
 
       this.pollIsDevUp();

package/lib/mac/src/bleno_mac.h

@@ -8,7 +8,7 @@ class BlenoMac : public Napi::ObjectWrap<BlenoMac>
 public:
     BlenoMac(const Napi::CallbackInfo&);
     Napi::Value Init(const Napi::CallbackInfo&);
-    Napi::Value CleanUp(const Napi::CallbackInfo&);
+    Napi::Value Stop(const Napi::CallbackInfo&);
 
     Napi::Value StartAdvertising(const Napi::CallbackInfo&);
     Napi::Value StartAdvertisingIBeacon(const Napi::CallbackInfo&);

package/lib/mac/src/bleno_mac.mm

@@ -52,9 +52,8 @@ Napi::Value BlenoMac::Init(const Napi::CallbackInfo& info) {
     return info.Env().Undefined();
 }
 
-Napi::Value BlenoMac::CleanUp(const Napi::CallbackInfo& info) {
+Napi::Value BlenoMac::Stop(const Napi::CallbackInfo& info) {
     CHECK_MANAGER()
-    CFRelease((__bridge CFTypeRef)peripheralManager);
     peripheralManager = nil;
     return info.Env().Undefined();
 }
@@ -135,7 +134,7 @@ Napi::Value BlenoMac::UpdateRssi(const Napi::CallbackInfo& info) {
 Napi::Function BlenoMac::GetClass(Napi::Env env) {
     return DefineClass(env, "BlenoMac", {
         BlenoMac::InstanceMethod("init", &BlenoMac::Init),
-        BlenoMac::InstanceMethod("cleanUp", &BlenoMac::CleanUp),
+        BlenoMac::InstanceMethod("stop", &BlenoMac::Stop),
         BlenoMac::InstanceMethod("startAdvertising", &BlenoMac::StartAdvertising),
         BlenoMac::InstanceMethod("startAdvertisingIBeacon", &BlenoMac::StartAdvertisingIBeacon),
         BlenoMac::InstanceMethod("startAdvertisingWithEIRData", &BlenoMac::StartAdvertisingWithEIRData),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoprocent/bleno",
-  "version": "0.10.5",
+  "version": "0.11.1",
   "description": "A Node.js module for implementing BLE (Bluetooth Low Energy) peripherals",
   "main": "./index.js",
   "types": "./index.d.ts",