@stoprocent/bleno 0.10.4 → 0.11.0

package/index.d.ts

@@ -51,12 +51,12 @@ declare module '@stoprocent/bleno' {
 
         constructor(options: CharacteristicOptions);
 
-        onIndicate: OnIndicateFn;
-        onNotify: OnNotifyFn;
-        onReadRequest: OnReadRequestFn;
-        onSubscribe: OnSubscribeFn;
-        onUnsubscribe: OnUnsubscribeFn;
-        onWriteRequest: OnWriteRequestFn;
+        onIndicate(handle: ConnectionHandle): void;
+        onNotify(handle: ConnectionHandle): void;
+        onReadRequest(handle: ConnectionHandle, offset: number, callback: ReadRequestCallback): void;
+        onSubscribe(handle: ConnectionHandle, maxValueSize: number, updateValueCallback: UpdateValueCallback): void;
+        onUnsubscribe(handle: ConnectionHandle): void;
+        onWriteRequest(handle: ConnectionHandle, data: Buffer, offset: number, withoutResponse: boolean, callback: WriteRequestCallback): void;
 
         toString(): string;
 
@@ -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/package.json

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