@rhizomatics/signalk-bluetti-plugin 1.1.0-alpha → 1.1.1-alpha

package/lib/device.js

@@ -63,6 +63,11 @@ class BluettiDevice extends EventEmitter {
 
   async _connect() {
     if (this._stopped) return;
+    // Cancel any lingering BlueZ connection state (e.g. a previous attempt that
+    // timed out on our side but is still in progress inside BlueZ).
+    if (!this._connected) {
+      try { await this._device.disconnect(); } catch (_) {}
+    }
     this._log(`[${this._name}] Connecting to ${this._address} …`);
 
     // Clear any stale disconnect handler from a previous attempt.

package/lib/scanner.js

@@ -70,17 +70,22 @@ class Scanner extends EventEmitter {
       return;
     }
     for (const addr of addresses) {
+      if (!this._scanning) break;  // scanner stopped while we were iterating
       const normAddr = addr.toLowerCase().replace(/:/g, '');
       if (this._found.has(normAddr)) continue;
+      // Reserve the slot immediately to prevent concurrent _poll() calls from
+      // both processing the same address before either stores the device.
+      this._found.set(normAddr, null);
       try {
         const device = await this._adapter.getDevice(addr);
         const name   = await Promise.resolve(device.getName()).catch(() => '') || '';
-        if (!isBluettiDevice(name)) continue;
+        if (!this._scanning) break;
+        if (!isBluettiDevice(name)) { this._found.delete(normAddr); continue; }
         this._found.set(normAddr, { address: addr, name, device });
         this._log(`Discovered Bluetti device: ${name} [${addr}]`);
         this.emit('discovered', { address: addr, name, device });
       } catch (_) {
-        // Device may have disappeared before we could read it; skip
+        this._found.delete(normAddr);  // allow retry on transient D-Bus error
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhizomatics/signalk-bluetti-plugin",
-  "version": "1.1.0-alpha",
+  "version": "1.1.1-alpha",
   "signalk": {
     "displayName": "Bluetti Monitoring"
   },