homebridge-bedjet 0.1.8 → 0.2.0

package/dist/bedjet/BedJet.d.ts

@@ -5,27 +5,24 @@ import type { BedJetConfig, BedJetState } from './types';
 export declare class BedJet extends EventEmitter {
     private readonly config;
     private readonly log;
-    private peripheral;
-    private commandChar;
-    private statusChar;
-    private disconnectTimer;
-    private staleTimer;
-    private reconnectAttempts;
-    private connecting;
     private _state;
     private deviceName;
     private firmwareVersion;
+    private reconnectAttempts;
+    private connecting;
+    private destroyed;
+    private bleDestroy;
+    private commandChar;
+    private disconnectTimer;
+    private staleTimer;
     constructor(config: BedJetConfig, log: Logger);
     get state(): BedJetState;
     get name(): string;
     get firmware(): string | null;
     connect(): Promise<void>;
-    private _scan;
-    private _connectPeripheral;
+    private _doConnect;
     private _handleNotification;
     private _handleStatusRead;
-    private _readDeviceName;
-    private _readDeviceStatus;
     private _sendCommand;
     setTemperature(celsius: number): Promise<void>;
     setFanSpeed(percent: number): Promise<void>;
@@ -38,5 +35,6 @@ export declare class BedJet extends EventEmitter {
     private _resetDisconnectTimer;
     private _resetStaleTimer;
     private _onDisconnected;
+    private _scheduleReconnect;
     disconnect(): Promise<void>;
 }

package/dist/bedjet/BedJet.js

@@ -2,159 +2,112 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BedJet = void 0;
 const events_1 = require("events");
-// noble is a singleton process-level instance; require() gives us the live object.
-// The default ESM export doesn't expose `.state` in its type — we patch it here.
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const noble = require('@abandonware/noble');
+const NodeBle = require("node-ble");
+const { createBluetooth } = NodeBle;
 const constants_1 = require("./constants");
 const types_1 = require("./types");
-// noble strips hyphens from UUIDs internally
-const normalize = (uuid) => uuid.replace(/-/g, '').toLowerCase();
-const NORM_STATUS_UUID = normalize(constants_1.BEDJET3_STATUS_UUID);
-const NORM_NAME_UUID = normalize(constants_1.BEDJET3_NAME_UUID);
-const NORM_COMMAND_UUID = normalize(constants_1.BEDJET3_COMMAND_UUID);
-const NORM_SERVICE_UUID = normalize(constants_1.BEDJET3_SERVICE_UUID);
+// node-ble uses BlueZ D-Bus — works alongside BlueZ without raw HCI conflicts.
+// This mirrors how Python bleak / Home Assistant ha-bedjet connects.
 class BedJet extends events_1.EventEmitter {
     constructor(config, log) {
         super();
         this.config = config;
         this.log = log;
-        this.peripheral = null;
-        this.commandChar = null;
-        this.statusChar = null;
-        this.disconnectTimer = null;
-        this.staleTimer = null;
-        this.reconnectAttempts = 0;
-        this.connecting = false;
         this._state = { ...types_1.DEFAULT_STATE };
         this.deviceName = null;
         this.firmwareVersion = null;
+        this.reconnectAttempts = 0;
+        this.connecting = false;
+        this.destroyed = false;
+        this.bleDestroy = null;
+        this.commandChar = null;
+        this.disconnectTimer = null;
+        this.staleTimer = null;
     }
-    get state() {
-        return this._state;
-    }
-    get name() {
-        return this.deviceName ?? this.config.name;
-    }
-    get firmware() {
-        return this.firmwareVersion;
-    }
-    // ── Connection ────────────────────────────────────────────────────────────
+    get state() { return this._state; }
+    get name() { return this.deviceName ?? this.config.name; }
+    get firmware() { return this.firmwareVersion; }
+    // ── Connection ─────────────────────────────────────────────────────────────
     async connect() {
-        if (this.connecting) {
+        if (this.connecting || this.destroyed) {
             return;
         }
         this.connecting = true;
         try {
-            await this._scan();
+            await this._doConnect();
         }
         catch (err) {
+            this.log.error(`[${this.config.name}] Connect failed: ${err}`);
+            this._scheduleReconnect();
+        }
+        finally {
             this.connecting = false;
-            throw err;
         }
-        this.connecting = false;
     }
-    _scan() {
-        return new Promise((resolve, reject) => {
-            // On macOS, noble exposes a CoreBluetooth UUID (e.g. BF5DEE8A-4B98-...)
-            // rather than a real MAC. We match against both peripheral.uuid and
-            // peripheral.address so the config works on Linux (MAC) and macOS (UUID).
-            const targetNorm = this.config.address.toLowerCase().replace(/:/g, '').replace(/-/g, '');
-            const timeoutMs = (this.config.scanTimeout ?? 30) * 1000;
-            const scanTimeout = setTimeout(() => {
-                noble.stopScanning();
-                noble.removeListener('discover', onDiscover);
-                reject(new Error(`[${this.config.name}] Scan timed out after ${this.config.scanTimeout ?? 30}s`));
-            }, timeoutMs);
-            const onDiscover = async (peripheral) => {
-                const addrNorm = peripheral.address.toLowerCase().replace(/:/g, '').replace(/-/g, '');
-                const uuidNorm = (peripheral.uuid ?? '').toLowerCase().replace(/-/g, '');
-                if (addrNorm !== targetNorm && uuidNorm !== targetNorm) {
-                    return;
-                }
-                clearTimeout(scanTimeout);
-                noble.stopScanning();
-                noble.removeListener('discover', onDiscover);
-                try {
-                    await this._connectPeripheral(peripheral);
-                    resolve();
-                }
-                catch (err) {
-                    reject(err);
-                }
-            };
-            noble.on('discover', onDiscover);
-            const startScan = () => {
-                // Scan with no service UUID filter — BlueZ on Linux silently drops devices
-                // when filtering by 128-bit custom UUIDs. We match by address in onDiscover instead.
-                noble.startScanning([], false, (err) => {
-                    if (err) {
-                        clearTimeout(scanTimeout);
-                        noble.removeListener('discover', onDiscover);
-                        reject(new Error(`[${this.config.name}] startScanning failed: ${err}`));
-                    }
-                });
-            };
-            if (noble.state === 'poweredOn') {
-                startScan();
-            }
-            else {
-                noble.once('stateChange', (state) => {
-                    if (state === 'poweredOn') {
-                        startScan();
-                    }
-                    else {
-                        clearTimeout(scanTimeout);
-                        noble.removeListener('discover', onDiscover);
-                        reject(new Error(`[${this.config.name}] Bluetooth not available (state: ${state})`));
-                    }
-                });
+    async _doConnect() {
+        // Clean up any previous bluetooth instance
+        if (this.bleDestroy) {
+            try {
+                this.bleDestroy();
             }
+            catch { /* ignore */ }
+            this.bleDestroy = null;
+        }
+        const { bluetooth, destroy } = createBluetooth();
+        this.bleDestroy = destroy;
+        this.log.info(`[${this.config.name}] Getting Bluetooth adapter…`);
+        const adapter = await bluetooth.defaultAdapter();
+        if (!await adapter.isDiscovering()) {
+            await adapter.startDiscovery();
+        }
+        const timeoutMs = (this.config.scanTimeout ?? 30) * 1000;
+        this.log.info(`[${this.config.name}] Waiting for device ${this.config.address}…`);
+        const device = await adapter.waitDevice(this.config.address.toUpperCase(), timeoutMs);
+        await adapter.stopDiscovery().catch(() => { });
+        this.log.info(`[${this.config.name}] Connecting…`);
+        await device.connect();
+        this.log.info(`[${this.config.name}] Connected — getting GATT server…`);
+        device.on('disconnect', () => {
+            this.log.warn(`[${this.config.name}] Device disconnected`);
+            this._onDisconnected();
         });
-    }
-    async _connectPeripheral(peripheral) {
-        this.peripheral = peripheral;
-        this.log.info(`[${this.config.name}] Connecting to ${peripheral.address}…`);
-        peripheral.once('disconnect', () => this._onDisconnected());
-        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((_, reject) => setTimeout(() => reject(new Error(`[${this.config.name}] Service discovery timed out`)), 10000)),
-        ]);
-        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}`);
-            if (uuid === NORM_STATUS_UUID) {
-                this.statusChar = char;
-                this.log.info(`[${this.config.name}] Found status characteristic`);
-            }
-            else if (uuid === NORM_COMMAND_UUID) {
-                this.commandChar = char;
-                this.log.info(`[${this.config.name}] Found command characteristic`);
-            }
+        const gatt = await device.gatt();
+        this.log.info(`[${this.config.name}] Got GATT server — getting BedJet service…`);
+        const service = await gatt.getPrimaryService(constants_1.BEDJET3_SERVICE_UUID);
+        this.log.info(`[${this.config.name}] Got service — getting characteristics…`);
+        const statusChar = await service.getCharacteristic(constants_1.BEDJET3_STATUS_UUID);
+        this.commandChar = await service.getCharacteristic(constants_1.BEDJET3_COMMAND_UUID);
+        this.log.info(`[${this.config.name}] Got characteristics — subscribing to notifications…`);
+        await statusChar.startNotifications();
+        statusChar.on('valuechanged', (buf) => this._handleNotification(buf));
+        this.log.info(`[${this.config.name}] Subscribed — reading initial state…`);
+        // Read the 11-byte status characteristic directly
+        try {
+            const statusData = await statusChar.readValue();
+            this._handleStatusRead(statusData);
+        }
+        catch (err) {
+            this.log.warn(`[${this.config.name}] Could not read device status: ${err}`);
         }
-        if (!this.commandChar || !this.statusChar) {
-            throw new Error(`[${this.config.name}] Required characteristics not found (status=${!!this.statusChar} command=${!!this.commandChar})`);
+        // Read device name
+        try {
+            const nameChar = await service.getCharacteristic(constants_1.BEDJET3_NAME_UUID);
+            const nameData = await nameChar.readValue();
+            this.deviceName = nameData.toString('utf8').replace(/\0/g, '').trim();
+            this.log.info(`[${this.config.name}] Device name: ${this.deviceName}`);
+        }
+        catch (err) {
+            this.log.warn(`[${this.config.name}] Could not read device name: ${err}`);
         }
-        // Subscribe to notifications on the status characteristic
-        await this.statusChar.subscribeAsync();
-        this.statusChar.on('data', (data) => this._handleNotification(data));
-        // Read extended status and device name
-        await this._readDeviceStatus();
-        await this._readDeviceName();
         this.reconnectAttempts = 0;
         this._state = { ...this._state, isConnected: true };
         this._resetDisconnectTimer();
         this._resetStaleTimer();
         this.emit('connected');
         this.emit('stateChange', this._state);
-        this.log.info(`[${this.config.name}] Ready (firmware: ${this.firmwareVersion ?? 'unknown'})`);
+        this.log.info(`[${this.config.name}] Ready`);
     }
-    // ── Packet parsing ────────────────────────────────────────────────────────
+    // ── Packet parsing ──────────────────────────────────────────────────────────
     _handleNotification(data) {
         if (data.length !== constants_1.BEDJET3_NOTIFICATION_LENGTH) {
             return;
@@ -168,13 +121,10 @@ class BedJet extends events_1.EventEmitter {
             targetTemperature: data[8] / 2,
             operatingMode: data[9],
             fanSpeed: (data[10] + 1) * 5,
-            // data[11] = maximum_hours, data[12] = maximum_minutes (not stored in state)
             minimumTemperature: data[13] / 2,
             maximumTemperature: data[14] / 2,
-            // bytes [15–16] = turbo_time uint16 big-endian
             turboTimeSeconds: (data[15] << 8) | data[16],
             ambientTemperature: data[17] / 2,
-            // data[18] = shutdown_reason (not stored)
             isConnected: true,
         };
         this._resetStaleTimer();
@@ -188,7 +138,6 @@ class BedJet extends events_1.EventEmitter {
         this._state = {
             ...this._state,
             isDualZone: (data[2] & 0x02) !== 0,
-            // flags bits MSB→LSB: [_, _, connTestPassed, ledEnabled, _, unitsSetup, _, beepsMuted]
             connTestPassed: (flags & 0x20) !== 0,
             ledEnabled: (flags & 0x10) !== 0,
             unitsSetup: (flags & 0x04) !== 0,
@@ -196,45 +145,15 @@ class BedJet extends events_1.EventEmitter {
             notificationCode: data[9],
         };
     }
-    async _readDeviceName() {
-        if (!this.peripheral) {
-            return;
-        }
-        try {
-            // Rediscover to get the name characteristic
-            const { characteristics } = await this.peripheral.discoverSomeServicesAndCharacteristicsAsync([NORM_SERVICE_UUID], [NORM_NAME_UUID]);
-            const nameChar = characteristics.find(c => normalize(c.uuid) === NORM_NAME_UUID);
-            if (nameChar) {
-                const data = await nameChar.readAsync();
-                this.deviceName = data.toString('utf8').replace(/\0/g, '').trim();
-                this.log.debug(`[${this.config.name}] Device name: ${this.deviceName}`);
-            }
-        }
-        catch (err) {
-            this.log.warn(`[${this.config.name}] Could not read device name: ${err}`);
-        }
-    }
-    async _readDeviceStatus() {
-        if (!this.statusChar) {
-            return;
-        }
-        try {
-            const data = await this.statusChar.readAsync();
-            this._handleStatusRead(data);
-        }
-        catch (err) {
-            this.log.warn(`[${this.config.name}] Could not read device status: ${err}`);
-        }
-    }
-    // ── Commands ──────────────────────────────────────────────────────────────
+    // ── Commands ────────────────────────────────────────────────────────────────
     async _sendCommand(command, ...args) {
         if (!this.commandChar) {
             throw new Error(`[${this.config.name}] Not connected`);
         }
         const buf = Buffer.from([command, ...args]);
         try {
-            // withoutResponse = false (write with response) — required for V3
-            await this.commandChar.writeAsync(buf, false);
+            // writeValueWithResponse = write with response, required for BedJet V3
+            await this.commandChar.writeValueWithResponse(buf);
             this._resetDisconnectTimer();
         }
         catch (err) {
@@ -267,7 +186,7 @@ class BedJet extends events_1.EventEmitter {
     async setMuted(muted) {
         await this.pressButton(muted ? constants_1.BedJetButton.MUTE : constants_1.BedJetButton.UNMUTE);
     }
-    // ── Timers ────────────────────────────────────────────────────────────────
+    // ── Timers ──────────────────────────────────────────────────────────────────
     _resetDisconnectTimer() {
         if (this.disconnectTimer) {
             clearTimeout(this.disconnectTimer);
@@ -277,7 +196,6 @@ class BedJet extends events_1.EventEmitter {
             await this.disconnect();
         }, constants_1.DISCONNECT_DELAY_MS);
     }
-    // Mark stale and update HomeKit if no notification arrives within 65s
     _resetStaleTimer() {
         if (this.staleTimer) {
             clearTimeout(this.staleTimer);
@@ -288,10 +206,9 @@ class BedJet extends events_1.EventEmitter {
             this.emit('stateChange', this._state);
         }, 65000);
     }
-    // ── Disconnect / reconnect ────────────────────────────────────────────────
+    // ── Disconnect / reconnect ──────────────────────────────────────────────────
     _onDisconnected() {
         this.commandChar = null;
-        this.statusChar = null;
         if (this.disconnectTimer) {
             clearTimeout(this.disconnectTimer);
             this.disconnectTimer = null;
@@ -303,22 +220,27 @@ class BedJet extends events_1.EventEmitter {
         this._state = { ...this._state, isConnected: false };
         this.emit('disconnected');
         this.emit('stateChange', this._state);
-        if (this.reconnectAttempts < constants_1.MAX_RECONNECT_ATTEMPTS) {
-            // Exponential backoff: 2s, 4s, 8s, 16s, 32s
-            const delay = Math.pow(2, this.reconnectAttempts + 1) * 1000;
-            this.reconnectAttempts++;
-            this.log.info(`[${this.config.name}] Disconnected — reconnecting in ${delay / 1000}s ` +
-                `(attempt ${this.reconnectAttempts}/${constants_1.MAX_RECONNECT_ATTEMPTS})`);
-            setTimeout(() => {
-                this.connect().catch(err => this.log.error(`[${this.config.name}] Reconnect failed: ${err}`));
-            }, delay);
-        }
-        else {
-            this.log.error(`[${this.config.name}] Max reconnect attempts reached — giving up`);
-            this.emit('maxReconnectReached');
+        this._scheduleReconnect();
+    }
+    _scheduleReconnect() {
+        if (this.destroyed || this.reconnectAttempts >= constants_1.MAX_RECONNECT_ATTEMPTS) {
+            if (!this.destroyed && this.reconnectAttempts >= constants_1.MAX_RECONNECT_ATTEMPTS) {
+                this.log.error(`[${this.config.name}] Max reconnect attempts reached`);
+                this.emit('maxReconnectReached');
+            }
+            return;
         }
+        const delay = Math.pow(2, this.reconnectAttempts + 1) * 1000;
+        this.reconnectAttempts++;
+        this.log.info(`[${this.config.name}] Reconnecting in ${delay / 1000}s ` +
+            `(attempt ${this.reconnectAttempts}/${constants_1.MAX_RECONNECT_ATTEMPTS})`);
+        setTimeout(() => {
+            this.connect().catch(err => this.log.error(`[${this.config.name}] Reconnect failed: ${err}`));
+        }, delay);
     }
     async disconnect() {
+        this.destroyed = true;
+        this.commandChar = null;
         if (this.disconnectTimer) {
             clearTimeout(this.disconnectTimer);
             this.disconnectTimer = null;
@@ -327,16 +249,12 @@ class BedJet extends events_1.EventEmitter {
             clearTimeout(this.staleTimer);
             this.staleTimer = null;
         }
-        // Setting max attempts prevents the disconnect handler from triggering a reconnect
-        this.reconnectAttempts = constants_1.MAX_RECONNECT_ATTEMPTS;
-        if (this.peripheral) {
+        if (this.bleDestroy) {
             try {
-                await this.peripheral.disconnectAsync();
-            }
-            catch {
-                // ignore errors during intentional disconnect
+                this.bleDestroy();
             }
-            this.peripheral = null;
+            catch { /* ignore */ }
+            this.bleDestroy = null;
         }
     }
 }

package/dist/bedjet/BedJet.js.map

@@ -1 +1 @@
-{"version":3,"file":"BedJet.js","sourceRoot":"","sources":["../../src/bedjet/BedJet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BedJet.js","sourceRoot":"","sources":["../../src/bedjet/BedJet.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAEtC,oCAAqC;AACrC,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;AACpC,2CAaqB;AAErB,mCAAwC;AAExC,+EAA+E;AAC/E,qEAAqE;AAErE,MAAa,MAAO,SAAQ,qBAAY;IActC,YACmB,MAAoB,EACpB,GAAW;QAE5B,KAAK,EAAE,CAAC;QAHS,WAAM,GAAN,MAAM,CAAc;QACpB,QAAG,GAAH,GAAG,CAAQ;QAftB,WAAM,GAAgB,EAAE,GAAG,qBAAa,EAAE,CAAC;QAC3C,eAAU,GAAkB,IAAI,CAAC;QACjC,oBAAe,GAAkB,IAAI,CAAC;QAEtC,sBAAiB,GAAG,CAAC,CAAC;QACtB,eAAU,GAAG,KAAK,CAAC;QACnB,cAAS,GAAG,KAAK,CAAC;QAElB,eAAU,GAAwB,IAAI,CAAC;QACvC,gBAAW,GAAsC,IAAI,CAAC;QACtD,oBAAe,GAA0B,IAAI,CAAC;QAC9C,eAAU,GAA0B,IAAI,CAAC;IAOjD,CAAC;IAED,IAAI,KAAK,KAAkB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,IAAI,IAAI,KAAa,OAAO,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,IAAI,QAAQ,KAAoB,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAE9D,8EAA8E;IAE9E,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,qBAAqB,GAAG,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,2CAA2C;QAC3C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC;gBAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;QACjD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAE1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,8BAA8B,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC;QAEjD,IAAI,CAAC,MAAM,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;YACnC,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,wBAAwB,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;QAElF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CACrC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EACjC,SAAS,CACV,CAAC;QAEF,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAmC,CAAC,CAAC,CAAC;QAE/E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,CAAC;QACnD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,oCAAoC,CAAC,CAAC;QAExE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,uBAAuB,CAAC,CAAC;YAC3D,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,6CAA6C,CAAC,CAAC;QAEjF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,gCAAoB,CAAC,CAAC;QACnE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,0CAA0C,CAAC,CAAC;QAE9E,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,+BAAmB,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW,GAAI,MAAM,OAAO,CAAC,iBAAiB,CAAC,gCAAoB,CAAC,CAAC;QAE1E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,uDAAuD,CAAC,CAAC;QAC3F,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACtC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,uCAAuC,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC;YAChD,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,mCAAmC,GAAG,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,6BAAiB,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACtE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,kBAAkB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACzE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,iCAAiC,GAAG,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,+EAA+E;IAEvE,mBAAmB,CAAC,IAAY;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,uCAA2B,EAAE,CAAC;YAChD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,IAAI,CAAC,MAAM;YACd,cAAc,EAAM,IAAI,CAAC,CAAC,CAAC;YAC3B,gBAAgB,EAAI,IAAI,CAAC,CAAC,CAAC;YAC3B,gBAAgB,EAAI,IAAI,CAAC,CAAC,CAAC;YAC3B,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;YAC/B,iBAAiB,EAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;YAC/B,aAAa,EAAO,IAAI,CAAC,CAAC,CAAkB;YAC5C,QAAQ,EAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC;YACtC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;YAChC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;YAChC,gBAAgB,EAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;YAC9C,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;YAChC,WAAW,EAAS,IAAI;SACzB,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAEO,iBAAiB,CAAC,IAAY;QACpC,IAAI,IAAI,CAAC,MAAM,KAAK,iCAAqB,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,IAAI,CAAC,MAAM;YACd,UAAU,EAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACxC,cAAc,EAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,UAAU,EAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,UAAU,EAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,UAAU,EAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,+EAA+E;IAEvE,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,GAAG,IAAc;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,iBAAiB,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC;YACH,uEAAuE;YACvE,MAAM,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,eAAe,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC;YACzF,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe;QAClC,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAa,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAmB;QACxC,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAa,CAAC,MAAM,EAAE,qCAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAoB;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,MAAc;QACzC,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAa,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAa,EAAE,OAAe;QACtD,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAa,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAW;QACtB,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAY,CAAC,MAAM,CAAC,CAAC,CAAC,wBAAY,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAc;QAC3B,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,wBAAY,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAY,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;IAED,+EAA+E;IAEvE,qBAAqB;QAC3B,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,sCAAsC,CAAC,CAAC;YAC3E,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC,EAAE,+BAAmB,CAAC,CAAC;IAC1B,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,mDAAmD,CAAC,CAAC;YACvF,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;YACrD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,EAAE,KAAM,CAAC,CAAC;IACb,CAAC;IAED,+EAA+E;IAEvE,eAAe;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAExB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAEO,kBAAkB;QACxB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAiB,IAAI,kCAAsB,EAAE,CAAC;YACvE,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAiB,IAAI,kCAAsB,EAAE,CAAC;gBACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,kCAAkC,CAAC,CAAC;gBACvE,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACnC,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;QAC7D,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,qBAAqB,KAAK,GAAG,IAAI,IAAI;YACzD,YAAY,IAAI,CAAC,iBAAiB,IAAI,kCAAsB,GAAG,CAChE,CAAC;QACF,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,uBAAuB,GAAG,EAAE,CAAC,CACjE,CAAC;QACJ,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAExB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC;gBAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;YACjD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;CACF;AAvSD,wBAuSC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-bedjet",
   "displayName": "BedJet",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "Homebridge plugin for BedJet V3 via Bluetooth LE",
   "license": "MIT",
   "main": "dist/index.js",
@@ -16,7 +16,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@abandonware/noble": "^1.9.2-15"
+    "node-ble": "^1.10.1"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/bedjet/BedJet.ts

@@ -1,11 +1,7 @@
 import { EventEmitter } from 'events';
-import type { Peripheral, Characteristic } from '@abandonware/noble';
 import type { Logger } from 'homebridge';
-
-// noble is a singleton process-level instance; require() gives us the live object.
-// The default ESM export doesn't expose `.state` in its type — we patch it here.
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const noble = require('@abandonware/noble') as typeof import('@abandonware/noble') & { state: string };
+import NodeBle = require('node-ble');
+const { createBluetooth } = NodeBle;
 import {
   BEDJET3_SERVICE_UUID,
   BEDJET3_STATUS_UUID,
@@ -23,26 +19,23 @@ import {
 import type { BedJetConfig, BedJetState } from './types';
 import { DEFAULT_STATE } from './types';
 
-// noble strips hyphens from UUIDs internally
-const normalize = (uuid: string) => uuid.replace(/-/g, '').toLowerCase();
-
-const NORM_STATUS_UUID  = normalize(BEDJET3_STATUS_UUID);
-const NORM_NAME_UUID    = normalize(BEDJET3_NAME_UUID);
-const NORM_COMMAND_UUID = normalize(BEDJET3_COMMAND_UUID);
-const NORM_SERVICE_UUID = normalize(BEDJET3_SERVICE_UUID);
+// node-ble uses BlueZ D-Bus — works alongside BlueZ without raw HCI conflicts.
+// This mirrors how Python bleak / Home Assistant ha-bedjet connects.
 
 export class BedJet extends EventEmitter {
-  private peripheral: Peripheral | null = null;
-  private commandChar: Characteristic | null = null;
-  private statusChar: Characteristic | null = null;
-  private disconnectTimer: NodeJS.Timeout | null = null;
-  private staleTimer: NodeJS.Timeout | null = null;
-  private reconnectAttempts = 0;
-  private connecting = false;
   private _state: BedJetState = { ...DEFAULT_STATE };
   private deviceName: string | null = null;
   private firmwareVersion: string | null = null;
 
+  private reconnectAttempts = 0;
+  private connecting = false;
+  private destroyed = false;
+
+  private bleDestroy: (() => void) | null = null;
+  private commandChar: NodeBle.GattCharacteristic | null = null;
+  private disconnectTimer: NodeJS.Timeout | null = null;
+  private staleTimer: NodeJS.Timeout | null = null;
+
   constructor(
     private readonly config: BedJetConfig,
     private readonly log: Logger,
@@ -50,164 +43,94 @@ export class BedJet extends EventEmitter {
     super();
   }
 
-  get state(): BedJetState {
-    return this._state;
-  }
+  get state(): BedJetState { return this._state; }
+  get name(): string { return this.deviceName ?? this.config.name; }
+  get firmware(): string | null { return this.firmwareVersion; }
 
-  get name(): string {
-    return this.deviceName ?? this.config.name;
-  }
-
-  get firmware(): string | null {
-    return this.firmwareVersion;
-  }
-
-  // ── Connection ────────────────────────────────────────────────────────────
+  // ── Connection ─────────────────────────────────────────────────────────────
 
   async connect(): Promise<void> {
-    if (this.connecting) {
+    if (this.connecting || this.destroyed) {
       return;
     }
     this.connecting = true;
-
     try {
-      await this._scan();
+      await this._doConnect();
     } catch (err) {
+      this.log.error(`[${this.config.name}] Connect failed: ${err}`);
+      this._scheduleReconnect();
+    } finally {
       this.connecting = false;
-      throw err;
     }
-
-    this.connecting = false;
   }
 
-  private _scan(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      // On macOS, noble exposes a CoreBluetooth UUID (e.g. BF5DEE8A-4B98-...)
-      // rather than a real MAC. We match against both peripheral.uuid and
-      // peripheral.address so the config works on Linux (MAC) and macOS (UUID).
-      const targetNorm = this.config.address.toLowerCase().replace(/:/g, '').replace(/-/g, '');
-      const timeoutMs = (this.config.scanTimeout ?? 30) * 1000;
-
-      const scanTimeout = setTimeout(() => {
-        noble.stopScanning();
-        noble.removeListener('discover', onDiscover);
-        reject(new Error(`[${this.config.name}] Scan timed out after ${this.config.scanTimeout ?? 30}s`));
-      }, timeoutMs);
-
-      const onDiscover = async (peripheral: Peripheral) => {
-        const addrNorm = peripheral.address.toLowerCase().replace(/:/g, '').replace(/-/g, '');
-        const uuidNorm = (peripheral.uuid ?? '').toLowerCase().replace(/-/g, '');
-        if (addrNorm !== targetNorm && uuidNorm !== targetNorm) {
-          return;
-        }
-
-        clearTimeout(scanTimeout);
-        noble.stopScanning();
-        noble.removeListener('discover', onDiscover);
-
-        try {
-          await this._connectPeripheral(peripheral);
-          resolve();
-        } catch (err) {
-          reject(err);
-        }
-      };
-
-      noble.on('discover', onDiscover);
-
-      const startScan = () => {
-        // Scan with no service UUID filter — BlueZ on Linux silently drops devices
-        // when filtering by 128-bit custom UUIDs. We match by address in onDiscover instead.
-        noble.startScanning([], false, (err) => {
-          if (err) {
-            clearTimeout(scanTimeout);
-            noble.removeListener('discover', onDiscover);
-            reject(new Error(`[${this.config.name}] startScanning failed: ${err}`));
-          }
-        });
-      };
-
-      if (noble.state === 'poweredOn') {
-        startScan();
-      } else {
-        noble.once('stateChange', (state) => {
-          if (state === 'poweredOn') {
-            startScan();
-          } else {
-            clearTimeout(scanTimeout);
-            noble.removeListener('discover', onDiscover);
-            reject(new Error(`[${this.config.name}] Bluetooth not available (state: ${state})`));
-          }
-        });
-      }
-    });
-  }
+  private async _doConnect(): Promise<void> {
+    // Clean up any previous bluetooth instance
+    if (this.bleDestroy) {
+      try { this.bleDestroy(); } catch { /* ignore */ }
+      this.bleDestroy = null;
+    }
 
-  private async _connectPeripheral(peripheral: Peripheral): Promise<void> {
-    this.peripheral = peripheral;
-    this.log.info(`[${this.config.name}] Connecting to ${peripheral.address}…`);
+    const { bluetooth, destroy } = createBluetooth();
+    this.bleDestroy = destroy;
 
-    peripheral.once('disconnect', () => this._onDisconnected());
+    this.log.info(`[${this.config.name}] Getting Bluetooth adapter…`);
+    const adapter = await bluetooth.defaultAdapter();
 
-    try {
-      await peripheral.connectAsync();
-    } catch (err) {
-      throw new Error(`[${this.config.name}] connectAsync failed: ${err}`);
+    if (!await adapter.isDiscovering()) {
+      await adapter.startDiscovery();
     }
-    this.log.info(`[${this.config.name}] Connected — discovering services…`);
 
-    // 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}`);
-    }
+    const timeoutMs = (this.config.scanTimeout ?? 30) * 1000;
+    this.log.info(`[${this.config.name}] Waiting for device ${this.config.address}…`);
 
-    this.log.info(`[${this.config.name}] Found ${characteristics.length} characteristics`);
-    for (const char of characteristics) {
-      const uuid = normalize(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`);
-      } else if (uuid === NORM_COMMAND_UUID) {
-        this.commandChar = char;
-        this.log.info(`[${this.config.name}] Found command characteristic`);
-      }
-    }
+    const device = await adapter.waitDevice(
+      this.config.address.toUpperCase(),
+      timeoutMs,
+    );
 
-    // Small delay to let noble/BlueZ internal events settle after discovery
-    await new Promise<void>(resolve => setTimeout(resolve, 500));
+    await adapter.stopDiscovery().catch(() => { /* ignore if already stopped */ });
 
-    this.log.info(`[${this.config.name}] Char check: status=${!!this.statusChar} command=${!!this.commandChar}`);
+    this.log.info(`[${this.config.name}] Connecting…`);
+    await device.connect();
+    this.log.info(`[${this.config.name}] Connected — getting GATT server…`);
 
-    if (!this.commandChar || !this.statusChar) {
-      throw new Error(`[${this.config.name}] Required characteristics not found`);
-    }
+    device.on('disconnect', () => {
+      this.log.warn(`[${this.config.name}] Device disconnected`);
+      this._onDisconnected();
+    });
 
-    // Subscribe to notifications on the status characteristic
-    this.log.info(`[${this.config.name}] Subscribing to notifications…`);
-    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));
+    const gatt = await device.gatt();
+    this.log.info(`[${this.config.name}] Got GATT server — getting BedJet service…`);
+
+    const service = await gatt.getPrimaryService(BEDJET3_SERVICE_UUID);
+    this.log.info(`[${this.config.name}] Got service — getting characteristics…`);
 
-    // Read extended status and device name
+    const statusChar = await service.getCharacteristic(BEDJET3_STATUS_UUID);
+    this.commandChar  = await service.getCharacteristic(BEDJET3_COMMAND_UUID);
+
+    this.log.info(`[${this.config.name}] Got characteristics — subscribing to notifications…`);
+    await statusChar.startNotifications();
+    statusChar.on('valuechanged', (buf: Buffer) => this._handleNotification(buf));
+
+    this.log.info(`[${this.config.name}] Subscribed — reading initial state…`);
+
+    // Read the 11-byte status characteristic directly
     try {
-      await this._readDeviceStatus();
+      const statusData = await statusChar.readValue();
+      this._handleStatusRead(statusData);
     } catch (err) {
-      this.log.warn(`[${this.config.name}] _readDeviceStatus failed: ${err}`);
+      this.log.warn(`[${this.config.name}] Could not read device status: ${err}`);
     }
-    this.log.info(`[${this.config.name}] Reading device name…`);
+
+    // Read device name
     try {
-      await this._readDeviceName();
+      const nameChar = await service.getCharacteristic(BEDJET3_NAME_UUID);
+      const nameData = await nameChar.readValue();
+      this.deviceName = nameData.toString('utf8').replace(/\0/g, '').trim();
+      this.log.info(`[${this.config.name}] Device name: ${this.deviceName}`);
     } catch (err) {
-      this.log.warn(`[${this.config.name}] _readDeviceName failed: ${err}`);
+      this.log.warn(`[${this.config.name}] Could not read device name: ${err}`);
     }
 
     this.reconnectAttempts = 0;
@@ -218,16 +141,15 @@ export class BedJet extends EventEmitter {
     this.emit('connected');
     this.emit('stateChange', this._state);
 
-    this.log.info(`[${this.config.name}] Ready (firmware: ${this.firmwareVersion ?? 'unknown'})`);
+    this.log.info(`[${this.config.name}] Ready`);
   }
 
-  // ── Packet parsing ────────────────────────────────────────────────────────
+  // ── Packet parsing ──────────────────────────────────────────────────────────
 
   private _handleNotification(data: Buffer): void {
     if (data.length !== BEDJET3_NOTIFICATION_LENGTH) {
       return;
     }
-
     this._state = {
       ...this._state,
       hoursRemaining:     data[4],
@@ -237,16 +159,12 @@ export class BedJet extends EventEmitter {
       targetTemperature:  data[8] / 2,
       operatingMode:      data[9] as OperatingMode,
       fanSpeed:           (data[10] + 1) * 5,
-      // data[11] = maximum_hours, data[12] = maximum_minutes (not stored in state)
       minimumTemperature: data[13] / 2,
       maximumTemperature: data[14] / 2,
-      // bytes [15–16] = turbo_time uint16 big-endian
       turboTimeSeconds:   (data[15] << 8) | data[16],
       ambientTemperature: data[17] / 2,
-      // data[18] = shutdown_reason (not stored)
-      isConnected: true,
+      isConnected:        true,
     };
-
     this._resetStaleTimer();
     this.emit('stateChange', this._state);
   }
@@ -255,54 +173,19 @@ export class BedJet extends EventEmitter {
     if (data.length !== BEDJET3_STATUS_LENGTH) {
       return;
     }
-
     const flags = data[7];
     this._state = {
       ...this._state,
-      isDualZone:    (data[2] & 0x02) !== 0,
-      // flags bits MSB→LSB: [_, _, connTestPassed, ledEnabled, _, unitsSetup, _, beepsMuted]
-      connTestPassed: (flags & 0x20) !== 0,
-      ledEnabled:     (flags & 0x10) !== 0,
-      unitsSetup:     (flags & 0x04) !== 0,
-      beepsMuted:     (flags & 0x01) !== 0,
+      isDualZone:       (data[2] & 0x02) !== 0,
+      connTestPassed:   (flags & 0x20) !== 0,
+      ledEnabled:       (flags & 0x10) !== 0,
+      unitsSetup:       (flags & 0x04) !== 0,
+      beepsMuted:       (flags & 0x01) !== 0,
       notificationCode: data[9],
     };
   }
 
-  private async _readDeviceName(): Promise<void> {
-    if (!this.peripheral) {
-      return;
-    }
-    try {
-      // Rediscover to get the name characteristic
-      const { characteristics } = await this.peripheral.discoverSomeServicesAndCharacteristicsAsync(
-        [NORM_SERVICE_UUID],
-        [NORM_NAME_UUID],
-      );
-      const nameChar = characteristics.find(c => normalize(c.uuid) === NORM_NAME_UUID);
-      if (nameChar) {
-        const data = await nameChar.readAsync();
-        this.deviceName = data.toString('utf8').replace(/\0/g, '').trim();
-        this.log.debug(`[${this.config.name}] Device name: ${this.deviceName}`);
-      }
-    } catch (err) {
-      this.log.warn(`[${this.config.name}] Could not read device name: ${err}`);
-    }
-  }
-
-  private async _readDeviceStatus(): Promise<void> {
-    if (!this.statusChar) {
-      return;
-    }
-    try {
-      const data = await this.statusChar.readAsync();
-      this._handleStatusRead(data);
-    } catch (err) {
-      this.log.warn(`[${this.config.name}] Could not read device status: ${err}`);
-    }
-  }
-
-  // ── Commands ──────────────────────────────────────────────────────────────
+  // ── Commands ────────────────────────────────────────────────────────────────
 
   private async _sendCommand(command: BedJetCommand, ...args: number[]): Promise<void> {
     if (!this.commandChar) {
@@ -310,8 +193,8 @@ export class BedJet extends EventEmitter {
     }
     const buf = Buffer.from([command, ...args]);
     try {
-      // withoutResponse = false (write with response) — required for V3
-      await this.commandChar.writeAsync(buf, false);
+      // writeValueWithResponse = write with response, required for BedJet V3
+      await this.commandChar.writeValueWithResponse(buf);
       this._resetDisconnectTimer();
     } catch (err) {
       this.log.error(`[${this.config.name}] Command 0x${command.toString(16)} failed: ${err}`);
@@ -352,7 +235,7 @@ export class BedJet extends EventEmitter {
     await this.pressButton(muted ? BedJetButton.MUTE : BedJetButton.UNMUTE);
   }
 
-  // ── Timers ────────────────────────────────────────────────────────────────
+  // ── Timers ──────────────────────────────────────────────────────────────────
 
   private _resetDisconnectTimer(): void {
     if (this.disconnectTimer) {
@@ -364,7 +247,6 @@ export class BedJet extends EventEmitter {
     }, DISCONNECT_DELAY_MS);
   }
 
-  // Mark stale and update HomeKit if no notification arrives within 65s
   private _resetStaleTimer(): void {
     if (this.staleTimer) {
       clearTimeout(this.staleTimer);
@@ -376,11 +258,10 @@ export class BedJet extends EventEmitter {
     }, 65_000);
   }
 
-  // ── Disconnect / reconnect ────────────────────────────────────────────────
+  // ── Disconnect / reconnect ──────────────────────────────────────────────────
 
   private _onDisconnected(): void {
     this.commandChar = null;
-    this.statusChar = null;
 
     if (this.disconnectTimer) {
       clearTimeout(this.disconnectTimer);
@@ -395,26 +276,34 @@ export class BedJet extends EventEmitter {
     this.emit('disconnected');
     this.emit('stateChange', this._state);
 
-    if (this.reconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
-      // Exponential backoff: 2s, 4s, 8s, 16s, 32s
-      const delay = Math.pow(2, this.reconnectAttempts + 1) * 1000;
-      this.reconnectAttempts++;
-      this.log.info(
-        `[${this.config.name}] Disconnected — reconnecting in ${delay / 1000}s ` +
-        `(attempt ${this.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`,
-      );
-      setTimeout(() => {
-        this.connect().catch(err =>
-          this.log.error(`[${this.config.name}] Reconnect failed: ${err}`),
-        );
-      }, delay);
-    } else {
-      this.log.error(`[${this.config.name}] Max reconnect attempts reached — giving up`);
-      this.emit('maxReconnectReached');
+    this._scheduleReconnect();
+  }
+
+  private _scheduleReconnect(): void {
+    if (this.destroyed || this.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
+      if (!this.destroyed && this.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
+        this.log.error(`[${this.config.name}] Max reconnect attempts reached`);
+        this.emit('maxReconnectReached');
+      }
+      return;
     }
+    const delay = Math.pow(2, this.reconnectAttempts + 1) * 1000;
+    this.reconnectAttempts++;
+    this.log.info(
+      `[${this.config.name}] Reconnecting in ${delay / 1000}s ` +
+      `(attempt ${this.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`,
+    );
+    setTimeout(() => {
+      this.connect().catch(err =>
+        this.log.error(`[${this.config.name}] Reconnect failed: ${err}`),
+      );
+    }, delay);
   }
 
   async disconnect(): Promise<void> {
+    this.destroyed = true;
+    this.commandChar = null;
+
     if (this.disconnectTimer) {
       clearTimeout(this.disconnectTimer);
       this.disconnectTimer = null;
@@ -423,15 +312,9 @@ export class BedJet extends EventEmitter {
       clearTimeout(this.staleTimer);
       this.staleTimer = null;
     }
-    // Setting max attempts prevents the disconnect handler from triggering a reconnect
-    this.reconnectAttempts = MAX_RECONNECT_ATTEMPTS;
-    if (this.peripheral) {
-      try {
-        await this.peripheral.disconnectAsync();
-      } catch {
-        // ignore errors during intentional disconnect
-      }
-      this.peripheral = null;
+    if (this.bleDestroy) {
+      try { this.bleDestroy(); } catch { /* ignore */ }
+      this.bleDestroy = null;
     }
   }
 }