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

package/index.js

@@ -214,16 +214,18 @@ module.exports = function (app) {
     scanner.startScan(30000);
   };
 
-  // Search $HOME for a file named <bleName>.csv (case-insensitive).
+  // Search $HOME for an encryption CSV for bleName.
+  // Priority: 1) <bleName>.csv  2) bluetti_device_licence.csv
   function findEncryptionCsvInHome(bleName) {
     const homeDir = os.homedir();
-    const target  = `${bleName.toLowerCase()}.csv`;
     try {
-      const match = fs.readdirSync(homeDir).find(f => f.toLowerCase() === target);
-      return match ? path.join(homeDir, match) : null;
-    } catch (_) {
-      return null;
-    }
+      const files = fs.readdirSync(homeDir);
+      const specific = files.find(f => f.toLowerCase() === `${bleName.toLowerCase()}.csv`);
+      if (specific) return path.join(homeDir, specific);
+      const generic = files.find(f => f.toLowerCase() === 'bluetti_device_licence.csv');
+      if (generic) return path.join(homeDir, generic);
+    } catch (_) {}
+    return null;
   }
 
   function validateEncryptionCsvPath(csvPath, deviceName) {

package/lib/device.js

@@ -12,8 +12,9 @@ const WRITE_UUID       = 'ff02';
 const ALT_SERVICE_UUID = 'ffe0';
 const ALT_CHAR_UUID    = 'ffe1';
 
-const RECONNECT_DELAYS  = [5000, 10000, 20000, 30000, 60000];  // ms, capped at last value
-const CONNECT_TIMEOUT_MS = 30000;
+const RECONNECT_DELAYS    = [5000, 10000, 20000, 30000, 60000];  // ms, capped at last value
+const CONNECT_TIMEOUT_MS  = 30000;
+const DISCOVER_TIMEOUT_MS = 20000;
 
 class BluettiDevice extends EventEmitter {
   constructor({ address, name, device, fields, pollIntervalMs = 10000, xorKey = null, log }) {
@@ -63,6 +64,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.
@@ -110,16 +116,26 @@ class BluettiDevice extends EventEmitter {
     };
     this._device.once('disconnect', this._disconnectHandler);
 
-    await this._discoverServices();
+    let discoverSettled = false;
+    const discoverTimer = setTimeout(() => {
+      if (discoverSettled) return;
+      discoverSettled = true;
+      this._log(`[${this._name}] Service discovery timed out — will retry`);
+      this._scheduleReconnect();
+    }, DISCOVER_TIMEOUT_MS);
+
+    await this._discoverServices(() => !discoverSettled);
+    discoverSettled = true;
+    clearTimeout(discoverTimer);
   }
 
-  async _discoverServices() {
+  async _discoverServices(isActive) {
     let gatt;
     try {
       gatt = await this._device.gatt();
     } catch (err) {
       this._log(`[${this._name}] GATT error: ${err.message}`);
-      this._scheduleReconnect();
+      if (isActive()) this._scheduleReconnect();
       return;
     }
 
@@ -132,7 +148,7 @@ class BluettiDevice extends EventEmitter {
     }
     if (!service) {
       this._log(`[${this._name}] Could not find BLE service (tried ${SERVICE_UUID}, ${ALT_SERVICE_UUID})`);
-      this._scheduleReconnect();
+      if (isActive()) this._scheduleReconnect();
       return;
     }
 
@@ -148,7 +164,7 @@ class BluettiDevice extends EventEmitter {
 
     if (!notifyChar || !writeChar) {
       this._log(`[${this._name}] Could not find required GATT characteristics`);
-      this._scheduleReconnect();
+      if (isActive()) this._scheduleReconnect();
       return;
     }
 
@@ -156,7 +172,7 @@ class BluettiDevice extends EventEmitter {
       await notifyChar.startNotifications();
     } catch (err) {
       this._log(`[${this._name}] Subscribe error: ${err.message}`);
-      this._scheduleReconnect();
+      if (isActive()) this._scheduleReconnect();
       return;
     }
 

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
       }
     }
   }
@@ -92,8 +97,9 @@ class Scanner extends EventEmitter {
     this._scanning = false;
     // Decrement BlueZ discovery reference count — other plugins' sessions keep scanning.
     if (this._adapter) this._adapter.stopDiscovery().catch(() => {});
-    this._log(`Scan complete. Found ${this._found.size} Bluetti device(s).`);
-    this.emit('scanComplete', [...this._found.values()].map(({ address, name }) => ({ address, name })));
+    const found = [...this._found.values()].filter(v => v !== null);
+    this._log(`Scan complete. Found ${found.length} Bluetti device(s).`);
+    this.emit('scanComplete', found.map(({ address, name }) => ({ address, name })));
   }
 
   stopAll() {

package/package.json

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