@stoprocent/noble 1.19.0 → 2.0.0

package/lib/hci-socket/bindings.js

@@ -1,5 +1,4 @@
-const events = require('events');
-const util = require('util');
+const { EventEmitter } = require('events');
 
 const AclStream = require('./acl-stream');
 const Gatt = require('./gatt');
@@ -10,7 +9,10 @@ const Signaling = require('./signaling');
 const NobleBindings = function (options) {
   this._state = null;
   this._isScanning = false;
+  this._isScanningStarted = false;
+  this._scanServiceUuids = [];
 
+  this._options = { ...options };
   this._addresses = {};
   this._addresseTypes = {};
   this._connectable = {};
@@ -25,11 +27,57 @@ const NobleBindings = function (options) {
   this._aclStreams = {};
   this._signalings = {};
 
-  this._hci = new Hci(options);
+  this._hci = null;
+  this._gap = null;
+};
+
+Object.setPrototypeOf(NobleBindings.prototype, EventEmitter.prototype);
+
+NobleBindings.prototype.start = function () {
+  /* 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);
+
+  // Initialize the hci
+  this._hci = new Hci(this._options);
+
+  // Register event listeners for the hci
+  this._hci.on('stateChange', this.onStateChange.bind(this));
+  this._hci.on('addressChange', this.onAddressChange.bind(this));
+  this._hci.on('leConnComplete', this.onLeConnComplete.bind(this));
+  this._hci.on('leConnUpdateComplete', this.onLeConnUpdateComplete.bind(this));
+  this._hci.on('rssiRead', this.onRssiRead.bind(this));
+  this._hci.on('disconnComplete', this.onDisconnComplete.bind(this));
+  this._hci.on('encryptChange', this.onEncryptChange.bind(this));
+  this._hci.on('aclDataPkt', this.onAclDataPkt.bind(this));
+
+  // Initialize the gap
   this._gap = new Gap(this._hci);
+
+  // Register event listeners for the gap
+  this._gap.on('scanParametersSet', this.onScanParametersSet.bind(this));
+  this._gap.on('scanStart', this.onScanStart.bind(this));
+  this._gap.on('scanStop', this.onScanStop.bind(this));
+  this._gap.on('discover', this.onDiscover.bind(this));
+
+  // Initialize the hci
+  this._hci.init();
 };
 
-util.inherits(NobleBindings, events.EventEmitter);
+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);
+  }
+  this._hci.stop();
+};
 
 NobleBindings.prototype.setScanParameters = function (interval, window) {
   this._gap.setScanParameters(interval, window);
@@ -43,13 +91,25 @@ NobleBindings.prototype.startScanning = function (
   serviceUuids,
   allowDuplicates
 ) {
+  if (this._isScanning) { 
+    this.emit('scanStart'); 
+    return;
+  }
+  if (this._isScanningStarted) { 
+    return; 
+  }
+  this._isScanningStarted = true;
   this._scanServiceUuids = serviceUuids || [];
-
   this._gap.startScanning(allowDuplicates);
 };
 
 NobleBindings.prototype.stopScanning = function () {
-  this._gap.stopScanning();
+  if (this._isScanning) {
+    this._gap.stopScanning();
+  }
+  else {
+    this.emit('scanStop');
+  }
 };
 
 NobleBindings.prototype.connect = function (peripheralUuid, parameters = {}) {
@@ -66,14 +126,14 @@ NobleBindings.prototype.connect = function (peripheralUuid, parameters = {}) {
     id: peripheralUuid, 
     address, 
     addressType, 
-    params: parameters 
+    params: parameters
   });
 
   const processNextConnection = () => {
-    if (this._connectionQueue.length === 0) return;
-    
-    const nextConn = this._connectionQueue[0]; // Look at next connection but don't remove yet
-    this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params);
+    if (this._connectionQueue.length === 1) {
+      const nextConn = this._connectionQueue[0]; // Look at next connection but don't remove yet
+      this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params);
+    }
   };
 
   if (this._isScanning) {
@@ -96,62 +156,21 @@ NobleBindings.prototype.cancelConnect = function (peripheralUuid) {
   this._hci.cancelConnect(this._handles[peripheralUuid]);
 };
 
-NobleBindings.prototype.reset = function () {
-  this._hci.reset();
-};
-
 NobleBindings.prototype.updateRssi = function (peripheralUuid) {
   this._hci.readRssi(this._handles[peripheralUuid]);
 };
 
-NobleBindings.prototype.init = function () {
-  /* 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));
-  this._gap.on('scanStop', this.onScanStop.bind(this));
-  this._gap.on('discover', this.onDiscover.bind(this));
-
-  this._hci.on('stateChange', this.onStateChange.bind(this));
-  this._hci.on('addressChange', this.onAddressChange.bind(this));
-  this._hci.on('leConnComplete', this.onLeConnComplete.bind(this));
-  this._hci.on('leConnUpdateComplete', this.onLeConnUpdateComplete.bind(this));
-  this._hci.on('rssiRead', this.onRssiRead.bind(this));
-  this._hci.on('disconnComplete', this.onDisconnComplete.bind(this));
-  this._hci.on('encryptChange', this.onEncryptChange.bind(this));
-  this._hci.on('aclDataPkt', this.onAclDataPkt.bind(this));
-  
-  this._hci.init();
-};
-
 NobleBindings.prototype.onSigInt = function () {
   const sigIntListeners = process.listeners('SIGINT');
 
   if (sigIntListeners[sigIntListeners.length - 1] === this._sigIntHandler) {
     // we are the last listener, so exit
     // this will trigger onExit, and clean up
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
 };
 
-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);
-  }
-  this._hci.reset();
-  this._hci.stop();
-};
-
 NobleBindings.prototype.onStateChange = function (state) {
   if (this._state === state) {
     return;
@@ -202,6 +221,7 @@ NobleBindings.prototype.onScanStart = function (filterDuplicates) {
 
 NobleBindings.prototype.onScanStop = function () {
   this._isScanning = false;
+  this._isScanningStarted = false;
   this.emit('scanStop');
 };
 
@@ -242,7 +262,7 @@ NobleBindings.prototype.onDiscover = function (
   }
 
   if (hasScanServiceUuids) {
-    const uuid = address.split(':').join('');
+    const uuid = this.addressToId(address);
     this._addresses[uuid] = address;
     this._addresseTypes[uuid] = addressType;
     this._connectable[uuid] = connectable;
@@ -281,7 +301,7 @@ NobleBindings.prototype.onLeConnComplete = function (
   let error = null;
 
   if (status === 0) {
-    uuid = address.split(':').join('').toLowerCase();
+    uuid = this.addressToId(address);
 
     // Check if address is already known
     if (!this._addresses[uuid]) {
@@ -428,7 +448,7 @@ NobleBindings.prototype.onEncryptChange = function (handle, encrypt) {
 };
 
 NobleBindings.prototype.onMtu = function (address, mtu) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('onMtu', uuid, mtu);
 };
@@ -471,13 +491,13 @@ NobleBindings.prototype.onServicesDiscovered = function (
   address,
   serviceUuids
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('servicesDiscover', uuid, serviceUuids);
 };
 
 NobleBindings.prototype.onServicesDiscoveredEX = function (address, services) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('servicesDiscovered', uuid, services);
 };
@@ -502,7 +522,7 @@ NobleBindings.prototype.onIncludedServicesDiscovered = function (
   serviceUuid,
   includedServiceUuids
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit(
     'includedServicesDiscover',
@@ -547,7 +567,7 @@ NobleBindings.prototype.onCharacteristicsDiscovered = function (
   serviceUuid,
   characteristics
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('characteristicsDiscover', uuid, serviceUuid, characteristics);
 };
@@ -557,7 +577,7 @@ NobleBindings.prototype.onCharacteristicsDiscoveredEX = function (
   serviceUuid,
   characteristics
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('characteristicsDiscovered', uuid, serviceUuid, characteristics);
 };
@@ -583,7 +603,7 @@ NobleBindings.prototype.onRead = function (
   characteristicUuid,
   data
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('read', uuid, serviceUuid, characteristicUuid, data, false);
 };
@@ -610,7 +630,7 @@ NobleBindings.prototype.onWrite = function (
   serviceUuid,
   characteristicUuid
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('write', uuid, serviceUuid, characteristicUuid);
 };
@@ -637,7 +657,7 @@ NobleBindings.prototype.onBroadcast = function (
   characteristicUuid,
   state
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('broadcast', uuid, serviceUuid, characteristicUuid, state);
 };
@@ -650,7 +670,6 @@ NobleBindings.prototype.notify = function (
 ) {
   const handle = this._handles[peripheralUuid];
   const gatt = this._gatts[handle];
-
   if (gatt) {
     gatt.notify(serviceUuid, characteristicUuid, notify);
   } else {
@@ -664,7 +683,7 @@ NobleBindings.prototype.onNotify = function (
   characteristicUuid,
   state
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('notify', uuid, serviceUuid, characteristicUuid, state);
 };
@@ -675,7 +694,7 @@ NobleBindings.prototype.onNotification = function (
   characteristicUuid,
   data
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('read', uuid, serviceUuid, characteristicUuid, data, true);
 };
@@ -701,7 +720,7 @@ NobleBindings.prototype.onDescriptorsDiscovered = function (
   characteristicUuid,
   descriptorUuids
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit(
     'descriptorsDiscover',
@@ -735,7 +754,7 @@ NobleBindings.prototype.onValueRead = function (
   descriptorUuid,
   data
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit(
     'valueRead',
@@ -770,7 +789,7 @@ NobleBindings.prototype.onValueWrite = function (
   characteristicUuid,
   descriptorUuid
 ) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit(
     'valueWrite',
@@ -793,7 +812,7 @@ NobleBindings.prototype.readHandle = function (peripheralUuid, attHandle) {
 };
 
 NobleBindings.prototype.onHandleRead = function (address, handle, data) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('handleRead', uuid, handle, data);
 };
@@ -815,13 +834,13 @@ NobleBindings.prototype.writeHandle = function (
 };
 
 NobleBindings.prototype.onHandleWrite = function (address, handle) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('handleWrite', uuid, handle);
 };
 
 NobleBindings.prototype.onHandleNotify = function (address, handle, data) {
-  const uuid = address.split(':').join('').toLowerCase();
+  const uuid = this.addressToId(address);
 
   this.emit('handleNotify', uuid, handle, data);
 };
@@ -842,4 +861,8 @@ NobleBindings.prototype.onConnectionParameterUpdateRequest = function (
   );
 };
 
+NobleBindings.prototype.addressToId = function (address) {
+  return address.replace(/:/g, '').toLowerCase();
+};
+
 module.exports = NobleBindings;

package/lib/hci-socket/gap.js

@@ -1,8 +1,7 @@
 const debug = require('debug')('gap');
 
-const events = require('events');
+const { EventEmitter } = require('events');
 const os = require('os');
-const util = require('util');
 
 const isChip = os.platform() === 'linux' && os.release().indexOf('-ntc') !== -1;
 
@@ -34,7 +33,7 @@ const Gap = function (hci) {
   this._hci.on('leScanEnableSetCmd', this.onLeScanEnableSetCmd.bind(this));
 };
 
-util.inherits(Gap, events.EventEmitter);
+Object.setPrototypeOf(Gap.prototype, EventEmitter.prototype);
 
 Gap.prototype.setScanParameters = function (interval, window) {
   this._hci.setScanParameters(interval, window);

package/lib/hci-socket/gatt.js

@@ -1,7 +1,6 @@
 const debug = require('debug')('att');
 
-const events = require('events');
-const util = require('util');
+const { EventEmitter } = require('events');
 
 /* eslint-disable no-unused-vars */
 const ATT_OP_ERROR = 0x01;
@@ -83,7 +82,7 @@ const Gatt = function (address, aclStream) {
   this._aclStream.on('end', this.onAclStreamEndBinded);
 };
 
-util.inherits(Gatt, events.EventEmitter);
+Object.setPrototypeOf(Gatt.prototype, EventEmitter.prototype);
 
 Gatt.prototype.onAclStreamData = function (cid, data) {
   if (cid !== ATT_CID) {
@@ -683,10 +682,8 @@ Gatt.prototype.notify = function (serviceUuid, characteristicUuid, notify) {
 
       const valueBuffer = Buffer.alloc(2);
       valueBuffer.writeUInt16LE(value, 0);
-
       this._queueCommand(this.writeRequest(handle, valueBuffer, false), data => {
         const opcode = data[0];
-
         if (opcode === ATT_OP_WRITE_RESP) {
           this.emit('notify', this._address, serviceUuid, characteristicUuid, notify);
         }

package/lib/hci-socket/hci.js

@@ -1,9 +1,8 @@
 const debug = require('debug')('hci');
 
-const events = require('events');
-const util = require('util');
+const { EventEmitter } = require('events');
 
-const BluetoothHciSocket = require('@stoprocent/bluetooth-hci-socket');
+const { loadDriver } = require('@stoprocent/bluetooth-hci-socket');
 const vendorSpecific = require('./vs');
 
 const HCI_COMMAND_PKT = 0x01;
@@ -99,7 +98,11 @@ const STATUS_MAPPER = require('./hci-status');
 const Hci = function (options) {
   options = options || {};
   this._manufacturer = null;
+  
+  const BluetoothHciSocket = loadDriver(options.hciDriver || 'default');
   this._socket = new BluetoothHciSocket();
+  
+  this._isStarted = false;
   this._isDevUp = null;
   this._isExtended = 'extended' in options && options.extended;
   this._state = null;
@@ -146,7 +149,7 @@ const Hci = function (options) {
   this.on('stateChange', this.onStateChange.bind(this));
 };
 
-util.inherits(Hci, events.EventEmitter);
+Object.setPrototypeOf(Hci.prototype, EventEmitter.prototype);
 
 Hci.STATUS_MAPPER = STATUS_MAPPER;
 
@@ -166,7 +169,7 @@ Hci.prototype.init = function (options) {
       this._bound = true;
     }
     this._socket.start();
-    
+    this._isStarted = true;
     this.reset();
     this.pollIsDevUp();
   }
@@ -193,8 +196,9 @@ Hci.prototype.pollIsDevUp = function () {
 
     this._isDevUp = isDevUp;
   }
-
-  setTimeout(this.pollIsDevUp.bind(this), 1000);
+  if (this._isStarted) {
+    setTimeout(this.pollIsDevUp.bind(this), 1000);
+  }
 };
 
 Hci.prototype.setCodedPhySupport = function () {
@@ -287,6 +291,7 @@ Hci.prototype.reset = function () {
 
 Hci.prototype.stop = function () {
   this._socket.stop();
+  this._isStarted = false;
 };
 
 Hci.prototype.readSupportedCommands = function () {
@@ -926,6 +931,7 @@ Hci.prototype.processCmdCompleteEvent = function (cmd, status, result) {
     this.setLeEventMask();
     this.readLocalVersion();
     this.readBdAddr();
+    this.emit('reset');
   } else if (cmd === LE_READ_LOCAL_SUPPORTED_FEATURES && status === 0) {
     // Set _isExtended based on leExtendedAdvertising bit (12)
     this._isExtended = !!(result.readUInt32LE(0) & (1 << 12));
@@ -1054,6 +1060,9 @@ Hci.prototype.processLeMetaEvent = function (eventType, numReports, data) {
 };
 
 Hci.prototype.processLeConnComplete = function (status, data) {
+  if (data.every(byte => byte === 0)) {
+    return;
+  }
   const handle = data.readUInt16LE(0);
   const role = data.readUInt8(2);
   const addressType = data.readUInt8(3) === 0x01 ? 'random' : 'public';
@@ -1094,6 +1103,9 @@ Hci.prototype.processLeConnComplete = function (status, data) {
 };
 
 Hci.prototype.processLeEnhancedConnComplete = function (status, data) {
+  if (data.every(byte => byte === 0)) {
+    return;
+  }
   const handle = data.readUInt16LE(0);
   const role = data.readUInt8(2);
   const addressType = data.readUInt8(3) === 0x01 ? 'random' : 'public';

package/lib/hci-socket/signaling.js

@@ -1,8 +1,7 @@
 const debug = require('debug')('signaling');
 
-const events = require('events');
+const { EventEmitter } = require('events');
 const os = require('os');
-const util = require('util');
 
 const CONNECTION_PARAMETER_UPDATE_REQUEST = 0x12;
 const CONNECTION_PARAMETER_UPDATE_RESPONSE = 0x13;
@@ -20,7 +19,7 @@ const Signaling = function (handle, aclStream) {
   this._aclStream.on('end', this.onAclStreamEndBinded);
 };
 
-util.inherits(Signaling, events.EventEmitter);
+Object.setPrototypeOf(Signaling.prototype, EventEmitter.prototype);
 
 Signaling.prototype.onAclStreamData = function (cid, data) {
   if (cid !== SIGNALING_CID) {

package/lib/hci-socket/smp.js

@@ -1,5 +1,4 @@
-const events = require('events');
-const util = require('util');
+const { EventEmitter } = require('events');
 
 const crypto = require('./crypto');
 
@@ -28,7 +27,7 @@ const Smp = function (aclStream, localAddressType, localAddress, remoteAddressTy
   this._aclStream.on('end', this.onAclStreamEndBinded);
 };
 
-util.inherits(Smp, events.EventEmitter);
+Object.setPrototypeOf(Smp.prototype, EventEmitter.prototype);
 
 Smp.prototype.sendPairingRequest = function () {
   this._preq = Buffer.from([

package/lib/hci-socket/vs.js

@@ -142,6 +142,7 @@ vendors.set(18, write_common_bd_addr(OCF_ZEEVO_WRITE_BD_ADDR));
 vendors.set(48, st_write_bd_addr);
 vendors.set(57, write_common_bd_addr(OCF_ERICSSON_WRITE_BD_ADDR));
 vendors.set(72, mrvl_write_bd_addr);
+vendors.set(305, write_common_bd_addr(OCF_BCM_WRITE_BD_ADDR));
 vendors.set(1521, write_common_bd_addr(OCF_LINUX_FOUNDATION_WRITE_BD_ADDR));
 
 module.exports = {

package/lib/mac/binding.gyp

@@ -6,21 +6,19 @@
     {
       'target_name': 'binding',
       'sources': [ 
-        'src/noble_mac.mm', 
-        'src/napi_objc.mm', 
-        'src/ble_manager.mm', 
-        'src/objc_cpp.mm', 
-        'src/callbacks.cc' 
+        "<!@(node -p \"require('fs').readdirSync('src').filter(f=>new RegExp('.*\\\\.(c|cc|cpp|mm)$').test(f)).map(f=>'src/'+f).join(' ')\")",
+        "<!@(node -p \"require('fs').readdirSync('../common/src').filter(f=>new RegExp('.*\\\\.(c|cc|cpp)$').test(f)).map(f=>'../common/src/'+f).join(' ')\")"
       ],
       'include_dirs': [
-        "<!(node -p \"require('node-addon-api').include_dir\")"
+        "<!(node -p \"require('node-addon-api').include_dir\")",
+        "../common/include"
       ],
       'cflags!': [ '-fno-exceptions' ],
       'cflags_cc!': [ '-fno-exceptions' ],
       "defines": ["NAPI_CPP_EXCEPTIONS"],
       'xcode_settings': {
         'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
-        'MACOSX_DEPLOYMENT_TARGET': '10.9',
+        'MACOSX_DEPLOYMENT_TARGET': '11',
         'CLANG_CXX_LIBRARY': 'libc++',
         'OTHER_CFLAGS': [
           '-fobjc-arc',

package/lib/mac/bindings.js

@@ -1,11 +1,9 @@
 const { EventEmitter } = require('events');
-const { inherits } = require('util');
 const { resolve } = require('path');
 const dir = resolve(__dirname, '..', '..');
 const binding = require('node-gyp-build')(dir);
-
 const { NobleMac } = binding;
 
-inherits(NobleMac, EventEmitter);
+Object.setPrototypeOf(NobleMac.prototype, EventEmitter.prototype);
 
 module.exports = NobleMac;

package/lib/mac/src/ble_manager.h

@@ -1,17 +1,10 @@
-//
-//  ble_manager.h
-//  noble-mac-native
-//
-//  Created by Georg Vienna on 28.08.18.
-//
-
 #pragma once
 
 #import <Foundation/Foundation.h>
 #import <CoreBluetooth/CoreBluetooth.h>
 #include <dispatch/dispatch.h>
 
-#include "callbacks.h"
+#include "Emit.h"
 
 @interface BLEManager : NSObject <CBCentralManagerDelegate, CBPeripheralDelegate> {
     Emit emit;