@rhizomatics/signalk-einklabel-plugin 1.3.0-beta15 → 1.3.0-beta16

package/dist/devices/bleBackend.js

@@ -247,7 +247,24 @@ function bleApiBackend(bleApi, pluginId) {
                 }
                 throw new Error(`connecting to device timed out after ${timeoutMs}ms`);
             }
-            return withSessionWatchdog(conn, GATT_SESSION_WATCHDOG_MS, async () => {
+            // Disconnecting alone doesn't always drop the server's claim - it only clears that itself once it
+            // sees the link close, which a half-dead link may never report - so every disconnect releases the
+            // claim explicitly too, leaving the device free for the next paint (or another plugin).
+            const released = {
+                read: conn.read.bind(conn),
+                write: conn.write.bind(conn),
+                startNotifications: conn.startNotifications.bind(conn),
+                stopNotifications: conn.stopNotifications.bind(conn),
+                discoverServices: conn.discoverServices.bind(conn),
+                onDisconnect: conn.onDisconnect.bind(conn),
+                get connected() {
+                    return conn.connected;
+                },
+                async disconnect() {
+                    await Promise.allSettled([conn.disconnect(), bleApi.releaseGATTDevice(address, pluginId)]);
+                },
+            };
+            return withSessionWatchdog(released, GATT_SESSION_WATCHDOG_MS, async () => {
                 // Belt-and-suspenders, matching the timeout-cleanup above: `releaseGATTDevice` is the
                 // authoritative claim release, `disconnect()` a secondary teardown of this specific handle -
                 // do both regardless of which (if either) itself hangs or rejects.

package/dist/devices/zhsunyco/index.js

@@ -56,7 +56,7 @@ class ZhsunycoDriver {
         const conn = await backend.connectGatt(config.address, config.connectTimeoutMs ?? DEFAULT_PAINT_CONNECT_TIMEOUT_MS);
         log("connected");
         try {
-            const info = (0, protocol_1.decodeAdvertisedInfo)(await conn.read(protocol_1.WOLINK_SERVICE_UUID, protocol_1.WOLINK_CHARACTERISTIC_UUIDS.config));
+            const info = (0, protocol_1.decodeAdvertisedInfo)(await readConfig(conn, log));
             if (!info) {
                 throw new Error("zhsunyco device did not return valid config data");
             }
@@ -125,6 +125,22 @@ class ZhsunycoDriver {
     }
 }
 exports.ZhsunycoDriver = ZhsunycoDriver;
+/**
+ * The first read of a paint. If the label's service isn't there at all (seen as node-ble's "Service not
+ * available" behind the BLE Manager), logs which services the connection does report - the difference
+ * between BlueZ not having discovered the label's services yet and it seeing a different set entirely.
+ */
+async function readConfig(conn, log) {
+    try {
+        return await conn.read(protocol_1.WOLINK_SERVICE_UUID, protocol_1.WOLINK_CHARACTERISTIC_UUIDS.config);
+    }
+    catch (err) {
+        const services = await conn.discoverServices().catch((discoverErr) => `could not list them: ${discoverErr.message}`);
+        const listed = Array.isArray(services) ? services.map((service) => service.uuid).join(", ") || "none" : services;
+        log(`reading the label's config failed (${err.message}) - services visible on this connection: ${listed}`);
+        throw err;
+    }
+}
 /**
  * Battery level needs a connection regardless, so reuse it to also fill in the PID/hwVersion
  * when the advertisement didn't carry decodable manufacturer data - a scan matched purely by name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhizomatics/signalk-einklabel-plugin",
-  "version": "1.3.0-beta15",
+  "version": "1.3.0-beta16",
   "description": "Display SignalK data on eInk Electronic Shelf Labels, includes working examples for tide clock and watch schedule.",
   "keywords": [
     "ble",