@rhizomatics/signalk-einklabel-plugin 1.3.0-beta1 → 1.3.0-beta2

package/dist/config.js

@@ -309,6 +309,18 @@ function configSchema(app, discovered = []) {
     return {
         type: "object",
         properties: {
+            ...(app.bleApi
+                ? {
+                    useBleApi: {
+                        type: "boolean",
+                        title: "Use the SignalK BLE Manager API",
+                        description: "Route Bluetooth access through SignalK server's BLE Manager API (server >= 2.32.0) instead of connecting to " +
+                            "BlueZ directly, so this plugin shares the adapter with other BLE plugins instead of contending for it. Requires " +
+                            "the server to have a local Bluetooth adapter or BLE gateway available (Server → Settings → Bluetooth).",
+                        default: defaults.useBleApi,
+                    },
+                }
+                : {}),
             templatesDir: {
                 type: "string",
                 title: "Templates directory",
@@ -331,18 +343,6 @@ function configSchema(app, discovered = []) {
                 minimum: 1,
                 default: defaults.scanDurationSeconds,
             },
-            ...(app.bleApi
-                ? {
-                    useBleApi: {
-                        type: "boolean",
-                        title: "Use the SignalK BLE Manager API",
-                        description: "Route Bluetooth access through SignalK server's BLE Manager API (server >= 2.32.0) instead of connecting to " +
-                            "BlueZ directly, so this plugin shares the adapter with other BLE plugins instead of contending for it. Requires " +
-                            "the server to have a local Bluetooth adapter or BLE gateway available (Server → Settings → Bluetooth).",
-                        default: defaults.useBleApi,
-                    },
-                }
-                : {}),
             paintConnectTimeoutSeconds: {
                 type: "number",
                 title: "Paint connect timeout (seconds)",

package/dist/devices/bleBackend.d.ts

@@ -15,7 +15,6 @@ export interface BleBackend {
 export declare function nodeBleBackend(): BleBackend;
 /**
  * `bleApi.connectGATT()` has no timeout of its own, same story as node-ble's `Device#connect()` (see
- * `connectWithTimeout` in `bleDiscovery.ts`) - races it against `timeoutMs` and disconnects in the
- * background if it eventually resolves after the caller has already given up.
+ * `connectWithTimeout` in `bleDiscovery.ts`) - races it against `timeoutMs`.
  */
 export declare function bleApiBackend(bleApi: BLEApi, pluginId: string): BleBackend;

package/dist/devices/bleBackend.js

@@ -50,8 +50,7 @@ function nodeBleBackend() {
 }
 /**
  * `bleApi.connectGATT()` has no timeout of its own, same story as node-ble's `Device#connect()` (see
- * `connectWithTimeout` in `bleDiscovery.ts`) - races it against `timeoutMs` and disconnects in the
- * background if it eventually resolves after the caller has already given up.
+ * `connectWithTimeout` in `bleDiscovery.ts`) - races it against `timeoutMs`.
  */
 function bleApiBackend(bleApi, pluginId) {
     return {
@@ -65,7 +64,18 @@ function bleApiBackend(bleApi, pluginId) {
             let timedOut = false;
             const conn = await Promise.race([connecting, (0, bleDiscovery_1.sleep)(timeoutMs).then(() => void (timedOut = true))]);
             if (timedOut || !conn) {
-                connecting.then((c) => c.disconnect()).catch(() => { });
+                // The server registers the claim as soon as `connectGATT()` is called, not once it succeeds -
+                // giving up here without releasing it would leave the claim (and, once/if the connect attempt
+                // does eventually land server-side, a live connection) orphaned indefinitely, since this
+                // plugin never gets a handle back to disconnect it itself. `releaseGATTDevice` tears down
+                // whatever the claim currently is, connected or still connecting, regardless of how the
+                // original `connectGATT()` promise eventually settles - disconnecting it too if it does still
+                // resolve afterwards, harmlessly, since a connection the server already released is a no-op to
+                // disconnect again.
+                void bleApi
+                    .releaseGATTDevice(address, pluginId)
+                    .catch(() => { })
+                    .then(() => connecting.then((c) => c.disconnect()).catch(() => { }));
                 throw new Error(`connecting to device timed out after ${timeoutMs}ms`);
             }
             return conn;

package/package.json

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