homebridge-bedjet 0.1.6 → 0.1.8

package/package.json

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

package/src/bedjet/BedJet.ts

@@ -149,28 +149,26 @@ export class BedJet extends EventEmitter {
 
     peripheral.once('disconnect', () => this._onDisconnected());
 
-    await peripheral.connectAsync();
+    try {
+      await peripheral.connectAsync();
+    } catch (err) {
+      throw new Error(`[${this.config.name}] connectAsync failed: ${err}`);
+    }
     this.log.info(`[${this.config.name}] Connected — discovering services…`);
 
-    // 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 ?? []);
-        }
-      });
-    });
+    // Use async discovery — works on Linux when the device is already bonded
+    let characteristics: Characteristic[];
+    try {
+      const result = await peripheral.discoverAllServicesAndCharacteristicsAsync();
+      characteristics = result.characteristics;
+    } catch (err) {
+      throw new Error(`[${this.config.name}] discoverAllServices failed: ${err}`);
+    }
 
     this.log.info(`[${this.config.name}] Found ${characteristics.length} characteristics`);
     for (const char of characteristics) {
       const uuid = normalize(char.uuid);
-      this.log.debug(`[${this.config.name}]   char: ${uuid}`);
+      this.log.info(`[${this.config.name}]   char: ${uuid}`);
       if (uuid === NORM_STATUS_UUID) {
         this.statusChar = char;
         this.log.info(`[${this.config.name}] Found status characteristic`);
@@ -180,32 +178,37 @@ export class BedJet extends EventEmitter {
       }
     }
 
+    // Small delay to let noble/BlueZ internal events settle after discovery
+    await new Promise<void>(resolve => setTimeout(resolve, 500));
+
+    this.log.info(`[${this.config.name}] Char check: status=${!!this.statusChar} command=${!!this.commandChar}`);
+
     if (!this.commandChar || !this.statusChar) {
-      throw new Error(`[${this.config.name}] Required characteristics not found (status=${!!this.statusChar} command=${!!this.commandChar})`);
+      throw new Error(`[${this.config.name}] Required characteristics not found`);
     }
 
     // Subscribe to notifications on the status characteristic
     this.log.info(`[${this.config.name}] Subscribing to notifications…`);
-    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();
-        }
-      });
-    });
+    try {
+      await this.statusChar.subscribeAsync();
+    } catch (err) {
+      throw new Error(`[${this.config.name}] subscribeAsync failed: ${err}`);
+    }
     this.log.info(`[${this.config.name}] Subscribed — reading device status…`);
     this.statusChar.on('data', (data: Buffer) => this._handleNotification(data));
 
     // Read extended status and device name
-    await this._readDeviceStatus();
+    try {
+      await this._readDeviceStatus();
+    } catch (err) {
+      this.log.warn(`[${this.config.name}] _readDeviceStatus failed: ${err}`);
+    }
     this.log.info(`[${this.config.name}] Reading device name…`);
-    await this._readDeviceName();
+    try {
+      await this._readDeviceName();
+    } catch (err) {
+      this.log.warn(`[${this.config.name}] _readDeviceName failed: ${err}`);
+    }
 
     this.reconnectAttempts = 0;
     this._state = { ...this._state, isConnected: true };