@rhizomatics/signalk-bluetti-plugin 1.3.0 → 1.3.1

package/README.md

@@ -6,7 +6,7 @@
 ![code style: oxfmt](https://img.shields.io/badge/code_style-oxfmt-blue.svg)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/rhizomatics/signalk-bluetti-plugin/blob/main/LICENSE)
 
-A SignalK plugin to display data from Bluetti power stations over a Bluetooth Low Energy (BLE) connection. ALPHA status
+A SignalK plugin to display data from Bluetti power stations over a Bluetooth Low Energy (BLE) connection. BETA status
 
 ## Pre-requisites
 
@@ -79,3 +79,32 @@ node cli.js info aa:bb:cc:dd:ee:ff --registers ./my-device-registers.csv --encry
 
 node cli.js info aa:bb:cc:dd:ee:ff --registers ac200p --timeout 30   # discovery timeout if device isn't already known to BlueZ (default: 20)
 ```
+
+## FAQ
+
+### SignalK starts before the Bluetooth daemon — does the plugin need `bluetoothd` running at boot?
+
+The plugin retries BLE adapter initialisation with backoff (starting at 2s, capping at 30s) if `bluetoothd`/D-Bus isn't up yet when the plugin starts, so a slow-starting Bluetooth stack on boot will no longer strand it — it keeps retrying until the adapter appears rather than failing once and giving up. You'll see `BLE adapter not ready … — retrying in Ns …` in the SignalK logs in the meantime.
+
+That said, it's cleaner to fix the boot ordering at the systemd level so the plugin finds the adapter ready on its first attempt. If SignalK runs as a systemd service (`systemctl status signalk`) and its unit file has no `[Unit]` section (check with `systemctl cat signalk`), add one:
+
+```bash
+sudo systemctl edit signalk.service
+```
+
+This opens an override file — add:
+
+```ini
+[Unit]
+After=bluetooth.target
+Wants=bluetooth.target
+```
+
+Save and exit, then:
+
+```bash
+sudo systemctl daemon-reload
+sudo systemctl restart signalk
+```
+
+This tells systemd to start `bluetoothd` first and wait for it before starting SignalK, rather than relying on both racing to start in parallel at boot.

package/lib/scanner.js

@@ -4,6 +4,13 @@ const EventEmitter = require("events");
 
 const BLUETTI_NAME_PREFIXES = ["BT-TH-", "BLUETTI", "AC", "EP", "EB", "EL"];
 
+// Retry/backoff for BLE adapter init — covers the case where SignalK (and this
+// plugin) starts before bluetoothd/D-Bus is up, e.g. on boot when service
+// ordering isn't configured. Retries forever with capped exponential backoff
+// rather than giving up after one attempt.
+const ADAPTER_INIT_RETRY_INITIAL_MS = 2000;
+const ADAPTER_INIT_RETRY_MAX_MS = 30000;
+
 function isBluettiDevice(name) {
   if (!name) return false;
   return BLUETTI_NAME_PREFIXES.some((p) => name.toUpperCase().startsWith(p.toUpperCase()));
@@ -21,17 +28,71 @@ class Scanner extends EventEmitter {
     this._scanTimer = null;
     this._pollTimer = null;
     this._found = new Map(); // normalised address → { address, name, device, isBluetti }
+    this._stopped = false;
+    this._retryTimer = null;
+    this._retryResolve = null;
   }
 
   async _init() {
     if (this._adapter) return;
     const { createBluetooth } = require("@naugehyde/node-ble");
     const bt = createBluetooth();
+    try {
+      this._adapter = await bt.bluetooth.defaultAdapter();
+    } catch (err) {
+      // Don't leak the D-Bus connection on a failed attempt — a retry will
+      // create a fresh one.
+      try {
+        bt.destroy();
+      } catch {}
+      throw err;
+    }
     this._bluetooth = bt.bluetooth;
     // Call through `bt` rather than destructuring — destroy() is a method on the
     // returned object and must keep its receiver.
     this._destroy = () => bt.destroy();
-    this._adapter = await bt.bluetooth.defaultAdapter();
+  }
+
+  // Retries _init() with capped exponential backoff until it succeeds or
+  // stopAll()/stopScan() cancels the wait (this._stopped).
+  async _initWithRetry() {
+    let delay = ADAPTER_INIT_RETRY_INITIAL_MS;
+    for (;;) {
+      try {
+        await this._init();
+        return;
+      } catch (err) {
+        if (this._stopped) throw err;
+        this._log(`BLE adapter not ready (${err.message}) — retrying in ${Math.round(delay / 1000)}s …`);
+        await this._delay(delay);
+        if (this._stopped) throw new Error("scanner stopped while waiting for BLE adapter");
+        delay = Math.min(delay * 2, ADAPTER_INIT_RETRY_MAX_MS);
+      }
+    }
+  }
+
+  _delay(ms) {
+    return new Promise((resolve) => {
+      this._retryResolve = resolve;
+      this._retryTimer = setTimeout(() => {
+        this._retryTimer = null;
+        this._retryResolve = null;
+        resolve();
+      }, ms);
+    });
+  }
+
+  // Cancels a pending _delay() wait immediately, if one is in flight.
+  _cancelRetryWait() {
+    if (this._retryTimer) {
+      clearTimeout(this._retryTimer);
+      this._retryTimer = null;
+    }
+    if (this._retryResolve) {
+      const resolve = this._retryResolve;
+      this._retryResolve = null;
+      resolve();
+    }
   }
 
   // `durationMs` — auto-stop (and release BlueZ discovery) after this long.
@@ -40,14 +101,15 @@ class Scanner extends EventEmitter {
   // the adapter's shared discovery session (see stopScan()).
   async startScan(durationMs = 15000) {
     if (this._scanning) return;
+    this._stopped = false;
 
     try {
-      await this._init();
-    } catch (err) {
-      this._log(`BLE adapter init failed: ${err.message}`);
-      this.emit("error", err);
+      await this._initWithRetry();
+    } catch {
+      // Cancelled via stopAll()/stopScan() while waiting for the adapter.
       return;
     }
+    if (this._stopped) return;
 
     this._found.clear();
     this._scanning = true;
@@ -119,6 +181,8 @@ class Scanner extends EventEmitter {
   }
 
   stopAll() {
+    this._stopped = true;
+    this._cancelRetryWait();
     this.stopScan();
     if (this._destroy) {
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhizomatics/signalk-bluetti-plugin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "SignalK plugin for Bluetti power station monitoring via Bluetooth LE. Beta, use with caution.",
   "keywords": [
     "battery",

package/registers/el100v2.csv

@@ -5,7 +5,7 @@
 # Note: DEVICE_TYPE (110) and DEVICE_SN (116) are string/serial fields — omitted.
 #
 field_name,register_address,register_count,data_type,scale,offset,unit,signalk_path
-battery_soc,102,1,uint16,0.01,0,%,electrical.batteries.{name}.stateOfCharge
+battery_soc,102,1,uint16,1,0,%,electrical.batteries.{name}.stateOfCharge
 dc_output_power,140,1,uint16,1,0,W,electrical.dc.{name}.power
 ac_output_power,142,1,uint16,1,0,W,electrical.inverters.{name}.ac.power
 dc_input_power,144,1,uint16,1,0,W,electrical.solar.{name}.panelPower