homebridge-bedjet 0.1.4 → 0.1.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-bedjet",
   "displayName": "BedJet",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Homebridge plugin for BedJet V3 via Bluetooth LE",
   "license": "MIT",
   "main": "dist/index.js",

package/src/bedjet/BedJet.ts

@@ -152,14 +152,20 @@ export class BedJet extends EventEmitter {
     await peripheral.connectAsync();
     this.log.info(`[${this.config.name}] Connected — discovering services…`);
 
-    // Wrap service discovery in a timeout — it hangs indefinitely on Linux/BlueZ
-    // if the adapter is busy or the device is in a bad state.
-    const { characteristics } = await Promise.race([
-      peripheral.discoverAllServicesAndCharacteristicsAsync(),
-      new Promise<never>((_, reject) =>
-        setTimeout(() => reject(new Error(`[${this.config.name}] Service discovery timed out`)), 10_000),
-      ),
-    ]);
+    // discoverAllServicesAndCharacteristicsAsync can hang on Linux/BlueZ even after
+    // returning characteristics — use the callback API directly instead.
+    const characteristics = await new Promise<Characteristic[]>((resolve, reject) => {
+      const timer = setTimeout(() =>
+        reject(new Error(`[${this.config.name}] Service discovery timed out`)), 10_000);
+      peripheral.discoverAllServicesAndCharacteristics((err, _services, chars) => {
+        clearTimeout(timer);
+        if (err) {
+          reject(new Error(`[${this.config.name}] Discovery error: ${err}`));
+        } else {
+          resolve(chars ?? []);
+        }
+      });
+    });
 
     this.log.info(`[${this.config.name}] Found ${characteristics.length} characteristics`);
     for (const char of characteristics) {
@@ -180,12 +186,19 @@ export class BedJet extends EventEmitter {
 
     // Subscribe to notifications on the status characteristic
     this.log.info(`[${this.config.name}] Subscribing to notifications…`);
-    await Promise.race([
-      this.statusChar.subscribeAsync(),
-      new Promise<never>((_, reject) =>
-        setTimeout(() => reject(new Error(`[${this.config.name}] Subscribe timed out`)), 10_000),
-      ),
-    ]);
+    const statusChar = this.statusChar;
+    await new Promise<void>((resolve, reject) => {
+      const timer = setTimeout(() =>
+        reject(new Error(`[${this.config.name}] Subscribe timed out`)), 10_000);
+      statusChar.subscribe((err) => {
+        clearTimeout(timer);
+        if (err) {
+          reject(new Error(`[${this.config.name}] Subscribe error: ${err}`));
+        } else {
+          resolve();
+        }
+      });
+    });
     this.log.info(`[${this.config.name}] Subscribed — reading device status…`);
     this.statusChar.on('data', (data: Buffer) => this._handleNotification(data));