@stoprocent/noble 1.17.3 → 1.18.0

package/lib/hci-socket/bindings.js

@@ -9,6 +9,7 @@ const Signaling = require('./signaling');
 
 const NobleBindings = function (options) {
   this._state = null;
+  this._isScanning = false;
 
   this._addresses = {};
   this._addresseTypes = {};
@@ -53,21 +54,33 @@ NobleBindings.prototype.stopScanning = function () {
 
 NobleBindings.prototype.connect = function (peripheralUuid, parameters = {}) {
   let address = this._addresses[peripheralUuid];
-  let addressType = this._addresseTypes[peripheralUuid] || 'random'; // Default to 'random' if type is not defined
+  let addressType = this._addresseTypes[peripheralUuid] || 'random';
   
-  // If address is not available, generate it from the UUID using the transformation logic inline
   if (!address) {
-    address = peripheralUuid.match(/.{1,2}/g).join(':'); // Converts UUID back to MAC address format
-    addressType = typeof(parameters) === 'object' && parameters.addressType ? parameters.addressType : 'random';
+    address = peripheralUuid.match(/.{1,2}/g).join(':');
+    addressType = parameters && parameters.addressType ? parameters.addressType : 'random';
   }
 
-  // Manage connection attempts
-  if (!this._pendingConnectionUuid) {
-    this._pendingConnectionUuid = peripheralUuid;
-    this._hci.createLeConn(address, addressType, parameters);
+  // Add connection request to queue
+  this._connectionQueue.push({ 
+    id: peripheralUuid, 
+    address, 
+    addressType, 
+    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._isScanning) {
+    this.once('scanStop', processNextConnection);
+    this.stopScanning();
   } else {
-    // If there is already a pending connection, queue this one
-    this._connectionQueue.push({ id: peripheralUuid, params: parameters });
+    processNextConnection();
   }
 };
 
@@ -121,6 +134,21 @@ NobleBindings.prototype.onSigInt = function () {
   const sigIntListeners = process.listeners('SIGINT');
 
   if (sigIntListeners[sigIntListeners.length - 1] === this.onSigIntBinded) {
+    // Stop scanning if active
+    if (this._isScanning) {
+      this.stopScanning();
+    }
+
+    // Disconnect all active connections
+    for (const handle in this._handles) {
+      if (this._handles.hasOwnProperty(handle)) {
+        this.disconnect(this._handles[handle]);
+      }
+    }
+
+    // Clear connection queue
+    this._connectionQueue = [];
+
     // we are the last listener, so exit
     // this will trigger onExit, and clean up
     process.exit(1);
@@ -158,7 +186,7 @@ NobleBindings.prototype.onStateChange = function (state) {
     );
     console.log('               Try to run with environment variable:');
     console.log('               [sudo] NOBLE_HCI_DEVICE_ID=x node ...');
-  }
+  } 
 
   this.emit('stateChange', state);
 };
@@ -172,10 +200,12 @@ NobleBindings.prototype.onScanParametersSet = function () {
 };
 
 NobleBindings.prototype.onScanStart = function (filterDuplicates) {
+  this._isScanning = true;
   this.emit('scanStart', filterDuplicates);
 };
 
 NobleBindings.prototype.onScanStop = function () {
+  this._isScanning = false;
   this.emit('scanStop');
 };
 
@@ -250,8 +280,8 @@ NobleBindings.prototype.onLeConnComplete = function (
     // not master, ignore
     return;
   }
-  let uuid = null;
 
+  let uuid = null;
   let error = null;
 
   if (status === 0) {
@@ -342,27 +372,23 @@ NobleBindings.prototype.onLeConnComplete = function (
 
     this._gatts[handle].exchangeMtu();
   } else {
-    uuid = this._pendingConnectionUuid;
+    const currentConn = this._connectionQueue[0];
+    uuid = currentConn ? currentConn.id : null;
     let statusMessage = Hci.STATUS_MAPPER[status] || 'HCI Error: Unknown';
     const errorCode = ` (0x${status.toString(16)})`;
     statusMessage = statusMessage + errorCode;
     error = new Error(statusMessage);
   }
 
-  this.emit('connect', uuid, error);
-
-  if (this._connectionQueue.length > 0) {
-    const queueItem = this._connectionQueue.shift();
-    const peripheralUuid = queueItem.id;
+  // Remove the completed/failed connection attempt from queue
+  this._connectionQueue.shift();
 
-    address = this._addresses[peripheralUuid];
-    addressType = this._addresseTypes[peripheralUuid];
-
-    this._pendingConnectionUuid = peripheralUuid;
+  this.emit('connect', uuid, error);
 
-    this._hci.createLeConn(address, addressType, queueItem.params);
-  } else {
-    this._pendingConnectionUuid = null;
+  // Process next connection in queue if any
+  if (this._connectionQueue.length > 0 && !this._isScanning) {
+    const nextConn = this._connectionQueue[0];
+    this._hci.createLeConn(nextConn.address, nextConn.addressType, nextConn.params);
   }
 };
 

package/lib/hci-socket/gap.js

@@ -276,13 +276,7 @@ Gap.prototype.parseServices = function (
         serviceUuids: [],
         solicitationServiceUuids: []
       };
-
-  if (leMetaEventType !== LE_META_EVENT_TYPE_SCAN_RESPONSE) {
-    // reset service data every non-scan response event
-    advertisement.serviceUuids = [];
-    advertisement.serviceSolicitationUuids = [];
-  }
-
+      
   while (i + 1 < eir.length) {
     const length = eir.readUInt8(i);
 

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "name": "@stoprocent/noble",
   "description": "A Node.js BLE (Bluetooth Low Energy) central library.",
-  "version": "1.17.3",
+  "version": "1.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"