@rhizomatics/signalk-bluetti-plugin 1.0.6-alpha → 1.0.8-alpha

package/index.js

@@ -169,6 +169,17 @@ module.exports = function (app) {
       return;
     }
 
+    // Validate any explicitly-configured encryption CSV paths up front.
+    for (const cfg of devices) {
+      if (cfg.encryptionCsvPath) {
+        const err = validateEncryptionCsvPath(cfg.encryptionCsvPath, cfg.name);
+        if (err) {
+          app.setPluginError(err);
+          return;
+        }
+      }
+    }
+
     // Build address → cfg lookup (normalise to lowercase, no colons)
     const normalise = (addr) => addr.toLowerCase().replace(/:/g, '');
     const pending   = new Map(devices.map(cfg => [normalise(cfg.address), cfg]));
@@ -180,7 +191,11 @@ module.exports = function (app) {
       if (cfg) {
         pending.delete(normalise(address));
         app.setPluginStatus(`Found ${name} [${address}] — connecting …`);
-        startDevice(cfg, peripheral, name, deps);
+        // Noble cannot scan and connect simultaneously — stop scan first.
+        // A short delay lets the BlueZ adapter finish scanning before we connect.
+        // The scanComplete handler will restart scanning for any remaining pending devices.
+        scanner.stopScan();
+        setTimeout(() => startDevice(cfg, peripheral, name, deps), 500);
       } else {
         log(`Discovered unconfigured Bluetti device: ${name} [${address}]`);
       }
@@ -212,6 +227,27 @@ module.exports = function (app) {
     }
   }
 
+  function validateEncryptionCsvPath(csvPath, deviceName) {
+    try {
+      fs.accessSync(csvPath, fs.constants.R_OK);
+    } catch (_) {
+      return `[${deviceName}] Encryption CSV not found or not readable: ${csvPath}`;
+    }
+    let lines;
+    try {
+      lines = fs.readFileSync(csvPath, 'utf8').split('\n').map(l => l.trim()).filter(Boolean);
+    } catch (err) {
+      return `[${deviceName}] Could not read encryption CSV "${csvPath}": ${err.message}`;
+    }
+    if (lines[0] !== 'bluetti') {
+      return `[${deviceName}] Encryption CSV does not look like a Bluetti key file (expected first line "bluetti"): ${csvPath}`;
+    }
+    if (lines.length < 4) {
+      return `[${deviceName}] Encryption CSV is missing the key line (expected 4 lines): ${csvPath}`;
+    }
+    return null;
+  }
+
   function resolveRegisterMapPath(cfg) {
     const { builtinModel, csvPath } = cfg;
     if (!builtinModel || builtinModel === 'custom') {

package/lib/device.js

@@ -13,6 +13,7 @@ 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 = 15000;
 
 class BluettiDevice extends EventEmitter {
   constructor({ address, name, peripheral, fields, pollIntervalMs = 10000, xorKey = null, log }) {
@@ -60,7 +61,18 @@ class BluettiDevice extends EventEmitter {
     if (this._stopped) return;
     this._log(`[${this._name}] Connecting to ${this._address} …`);
 
+    let settled = false;
+    const connectTimer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      this._log(`[${this._name}] Connect timed out after ${CONNECT_TIMEOUT_MS / 1000}s — will retry`);
+      this._scheduleReconnect();
+    }, CONNECT_TIMEOUT_MS);
+
     this._peripheral.connect((err) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(connectTimer);
       if (err) {
         this._log(`[${this._name}] Connect error: ${err.message}`);
         this._scheduleReconnect();

package/package.json

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