@rhizomatics/signalk-bluetti-plugin 1.0.5-alpha → 1.0.7-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,6 +191,9 @@ module.exports = function (app) {
       if (cfg) {
         pending.delete(normalise(address));
         app.setPluginStatus(`Found ${name} [${address}] — connecting …`);
+        // Noble cannot scan and connect simultaneously — stop scan first.
+        // The scanComplete handler will restart scanning for any remaining pending devices.
+        scanner.stopScan();
         startDevice(cfg, peripheral, name, deps);
       } else {
         log(`Discovered unconfigured Bluetti device: ${name} [${address}]`);
@@ -212,6 +226,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/scanner.js

@@ -27,9 +27,9 @@ class Scanner extends EventEmitter {
     return new Promise((resolve, reject) => {
       let noble;
       try {
-        noble = require('@abandonware/noble');
+        noble = require('@stoprocent/noble');
       } catch (e) {
-        return reject(new Error('@abandonware/noble not installed — run: npm install'));
+        return reject(new Error('@stoprocent/noble not installed — run: npm install'));
       }
 
       this._noble = noble;

package/package.json

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