@stoprocent/noble 2.3.7 → 2.3.9

package/index.d.ts

@@ -122,14 +122,14 @@ declare module '@stoprocent/noble' {
         toString(): string;
     
         on(event: "connect", listener: (error: Error | undefined) => void): this;
-        on(event: "disconnect", listener: (error: Error | undefined) => void): this;
+        on(event: "disconnect", listener: (reason: string) => void): this;
         on(event: "rssiUpdate", listener: (rssi: number) => void): this;
         on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
         on(event: "mtu", listener: (mtu: number) => void): this;
         on(event: string, listener: Function): this;
     
         once(event: "connect", listener: (error: Error | undefined) => void): this;
-        once(event: "disconnect", listener: (error: Error | undefined) => void): this;
+        once(event: "disconnect", listener: (reason: string) => void): this;
         once(event: "rssiUpdate", listener: (rssi: number) => void): this;
         once(event: "servicesDiscover", listener: (services: Service[]) => void): this;
         once(event: string, listener: Function): this;

package/lib/hci-socket/hci.js

@@ -158,20 +158,29 @@ Hci.prototype.init = function (options) {
   this._socket.on('error', this.onSocketError.bind(this));
   this._socket.on('state', this.pollIsDevUp.bind(this));
 
-  if (this._userChannel) {
-    this._socket.bindUser(this._deviceId, this._bindParams);
-    this._socket.start();
-
-    this.reset();
-  } else {
-    if (!this._bound) {
-      this._socket.bindRaw(this._deviceId, this._bindParams);
-      this._bound = true;
+  try {
+    // Bind first (either user channel or raw)
+    if (this._userChannel) {
+      this._socket.bindUser(this._deviceId, this._bindParams);
+    } else {
+      if (!this._bound) {
+        this._socket.bindRaw(this._deviceId, this._bindParams);
+        this._bound = true;
+      }
     }
+
+    // Start and reset (common to both paths)
     this._socket.start();
-    this._isStarted = true;
     this.reset();
-    this.pollIsDevUp();
+
+    // Set started flag and poll only for non-userChannel
+    if (!this._userChannel) {
+      this._isStarted = true;
+      this.pollIsDevUp();
+    }
+  } catch (error) {
+    debug(`init error: ${error.message}`);
+    this.emit('stateChange', 'unsupported');
   }
 };
 

package/lib/noble.js

@@ -431,7 +431,7 @@ class Noble extends EventEmitter {
     this._bindings.disconnect(peripheralId);
   }
 
-  _onDisconnect (peripheralId, reason) {
+  _onDisconnect (peripheralId, reason = 'unknown') {
     const peripheral = this._peripherals.get(peripheralId);
 
     if (peripheral) {
@@ -786,7 +786,7 @@ class Noble extends EventEmitter {
 
   async _withDisconnectHandler (peripheralId, operation) {
     return new Promise((resolve, reject) => {
-      const disconnectListener = error => reject(error);
+      const disconnectListener = reason => reject(new Error(`Disconnected ${reason}`));
       this.once(`disconnect:${peripheralId}`, disconnectListener);
       
       Promise.resolve(operation())

package/package.json

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

package/test/noble.test.js

@@ -932,4 +932,18 @@ describe('noble', () => {
       expect(peripheral.state).toBe('disconnected');
     });
   });
-});
+
+  describe("_withDisconnectHandler", () => {
+    test("resolves operation result", async () => {
+      const promise = noble._withDisconnectHandler('peripheralUuid', () => Promise.resolve(1))
+      await expect(promise).resolves.toBe(1)
+    })
+
+    test("throws disconnect error if disconnected before resolve", async () => {
+      noble._peripherals.set('uuid', {emit: jest.fn()});
+      const promise = noble._withDisconnectHandler('uuid', () => Promise.resolve(1))
+      noble._onDisconnect('uuid')
+      await expect(promise).rejects.toThrow('Disconnected unknown')
+    })
+  })
+});