wot-ble-client-factory 0.1.2 → 0.1.4

package/README.md

@@ -12,21 +12,35 @@ npm install wot-ble-client-factory @node-wot/core
 ```
 
 ## Minimal Setup
+
+#### GATT
+```js
+const { Servient } = require("@node-wot/core");
+const { BluetoothGATTClientFactory } = require("wot-ble-client-factory");
+
+const servient = new Servient();
+servient.addClientFactory(new BluetoothGATTClientFactory());
+```
+
+#### GAP
 ```js
 const { Servient } = require("@node-wot/core");
-const { BluetoothClientFactory } = require("wot-ble-client-factory");
+const { BluetoothGapClientFactory } = require("wot-ble-client-factory");
 
 const servient = new Servient();
-servient.addClientFactory(new BluetoothClientFactory());
+servient.addClientFactory(new BluetoothGapClientFactory());
 ```
 
 Check the `examples` folder for more complete Thing Descriptions.
 
-## Protocol specifier
+To enable debug logs run with this command:
+```bash
+DEBUG=binding-Bluetooth node example.js
+```
 
-The protocol prefix handled by this binding is <code>gatt://</code>.
+## Protocol Specifier
 
-A planned protocol prefix is <code>gap://</code>.
+The protocol prefix handled by this binding is <code>gatt://</code> and <code>gap://</code>.
 
 ## Getting Started
 If you want to build this package locally:
@@ -35,8 +49,19 @@ git clone git@github.com:wintechis/Bluetooth-Bindings.git
 cd Bluetooth-Bindings
 npm install
 npm run build
+```
+
+For local development you can use yalc:
+```
+npm install -g yalc
+./publish_yalc.sh
+```
 
+If the library code has been updated run: 
 ```
+./update_yalc.sh
+```
+
 Then you can run the examples:
 
 ```
@@ -49,7 +74,7 @@ node examples/govee_lamp.js
 In order to align a new protocol into the WoT context, the required abstract WoT operations must first be mapped to the concrete operations of the new protocol.
 A distinction must be made between the two GATT methods write and write-without-response. Both are capable of writing WoT resources, but the two methods differ in that write expects a confirmation message from the server after a write operation, while write-without-response requires no such confirmation. Thus the GATT method chosen depends on the implementation of the attribute in the GATT server.
 
-| WoT Operation  | BLE GATT Method            |
+| WoT Operation  | BLE GATT Method            | 
 | -------------- | -------------------------- |
 | readproperty   | read                       |
 | writeproperty  | write / write-w/o-response |
@@ -64,9 +89,13 @@ It has the following structure:
 ```
 gatt://<MAC>/<service>/<characteristic>
 ```
+or 
+```
+gap://<MAC>
+```
 
 with the following meaning:
-- `gatt` Identification of the transfer protocol
+- `gatt` or `gap` Identification of the transfer protocol
 - `<MAC>` MAC address of the Bluetooth device
 - `<service>` GATT service containing the characteristic
 - `<characteristic>` GATT characteristic to interact with
@@ -80,15 +109,16 @@ For the Bluetooth LE bindings, we chose the new, non-standard subtype `x.binary-
 The Binary Data Ontology (bdo) is intended to provide maximum flexibility and describe all kinds of binary data.
 We want to use the bdo ontology to describe the data transmitted by Bluetooth LE devices, even those that do not comply with the Bluetooth standard. The terms of the vocabulary are in our use case only useful within the properties, actions, or events parts of a Thing Description because they contain information about the data that is needed in the codec associated with application/x.binary-data-stream.
 
-| Vocabulary term | Description                                 | Assignment                      | Type    | Default Value    |
-| --------------- | ------------------------------------------- | ------------------------------- | ------- | ---------------- |
-| bdo:bytelength  | Number of octets in the data                | required                        | integer | None             |
-| bdo:signed      | Indicates if the data is signed             | required                        | boolean | false            |
-| bdo:endianess   | Byte order of the binary data               | required                        | string  | bdo:littleEndian |
-| bdo:scale       | Scale of received integer value             | optional                        | float   | 1.0              |
-| bdo:offset      | Offset in number of octets                  | optional                        | integer | 0                |
-| bdo:pattern     | The byte pattern of the binary data         | optional                        | string  | None             |
-| bdo:variable    | Description of the variables in bdo:pattern | required if bdo:pattern is used | ---     | None             |
+| Vocabulary term | Description                                      | Assignment                      | Type    | Default Value    |
+| --------------- | ------------------------------------------------ | ------------------------------- | ------- | ---------------- |
+| bdo:bytelength  | Number of octets in the data                     | required                        | integer | None             |
+| bdo:signed      | Indicates if the data is signed                  | required                        | boolean | false            |
+| bdo:byteOrder   | Byte order of the binary data                    | required                        | string  | bdo:littleEndian |
+| bdo:scale       | Scale of received integer value (multiplicaiton) | optional                        | float   | 1.0              |
+| bdo:valueAdd    | Scale of received integer value (addition)       | optional                        | float   | 0                |
+| bdo:offset      | Offset in number of octets                       | optional                        | integer | 0                |
+| bdo:pattern     | The byte pattern of the binary data              | optional                        | string  | None             |
+| bdo:variables   | Description of the variables in bdo:pattern      | required if bdo:pattern is used | ---     | None             |
 
 ### Simple Bluetooth Ontology
 The communication and metadata of a Bluetooth Low Energy device is described using the Simple Bluetooth Ontology with preferred prefix sbo. 

package/dist/Bluetooth-client-factory.d.ts

@@ -1,11 +1,16 @@
-/**
- * Bluetooth protocol binding
- */
-import { ProtocolClientFactory, ProtocolClient, ContentSerdes } from '@node-wot/core';
-export default class BluetoothClientFactory implements ProtocolClientFactory {
+import { ProtocolClientFactory, ProtocolClient } from '@node-wot/core';
+export declare class BluetoothGATTClientFactory implements ProtocolClientFactory {
     readonly scheme: string;
-    contentSerdes: ContentSerdes;
     constructor();
+    private registerCodec;
+    getClient(): ProtocolClient;
+    init: () => boolean;
+    destroy: () => boolean;
+}
+export declare class BluetoothGapClientFactory implements ProtocolClientFactory {
+    readonly scheme: string;
+    constructor();
+    private registerCodec;
     getClient(): ProtocolClient;
     init: () => boolean;
     destroy: () => boolean;

package/dist/Bluetooth-client-factory.js

@@ -3,24 +3,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Bluetooth protocol binding
- */
+exports.BluetoothGapClientFactory = exports.BluetoothGATTClientFactory = void 0;
 const core_1 = require("@node-wot/core");
-const Bluetooth_client_js_1 = __importDefault(require("./Bluetooth-client.js"));
+const Bluetooth_gatt_client_js_1 = __importDefault(require("./Bluetooth-gatt-client.js"));
+const Bluetooth_gap_client_js_1 = __importDefault(require("./Bluetooth-gap-client.js"));
 const codec_js_1 = require("./codec.js");
-class BluetoothClientFactory {
+const debug_1 = __importDefault(require("debug"));
+const log = (0, debug_1.default)('binding-Bluetooth');
+class BluetoothGATTClientFactory {
     scheme = 'gatt';
-    contentSerdes = core_1.ContentSerdes.get();
     constructor() {
-        this.contentSerdes.addCodec(new codec_js_1.BLEBinaryCodec());
+        this.registerCodec();
+    }
+    registerCodec() {
+        const cs = core_1.ContentSerdes.get();
+        if (!cs.getSupportedMediaTypes().includes('application/x.binary-data-stream')) {
+            cs.addCodec(new codec_js_1.BLEBinaryCodec());
+            log('Registered BLEBinaryCodec for "application/x.binary-data-stream"');
+        }
+    }
+    getClient() {
+        return new Bluetooth_gatt_client_js_1.default();
+    }
+    init = () => true;
+    destroy = () => true;
+}
+exports.BluetoothGATTClientFactory = BluetoothGATTClientFactory;
+class BluetoothGapClientFactory {
+    scheme = 'gap';
+    constructor() {
+        this.registerCodec();
+    }
+    registerCodec() {
+        const cs = core_1.ContentSerdes.get();
+        if (!cs.getSupportedMediaTypes().includes('application/x.binary-data-stream')) {
+            cs.addCodec(new codec_js_1.BLEBinaryCodec());
+            log('Registered BLEBinaryCodec for "application/x.binary-data-stream"');
+        }
     }
     getClient() {
-        console.debug('[binding-Bluetooth]', `BluetoothClientFactory creating client for ${this.scheme}`);
-        return new Bluetooth_client_js_1.default();
+        return new Bluetooth_gap_client_js_1.default();
     }
     init = () => true;
     destroy = () => true;
 }
-exports.default = BluetoothClientFactory;
+exports.BluetoothGapClientFactory = BluetoothGapClientFactory;
 //# sourceMappingURL=Bluetooth-client-factory.js.map

package/dist/Bluetooth-client-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bluetooth-client-factory.js","sourceRoot":"","sources":["../src/Bluetooth-client-factory.ts"],"names":[],"mappings":";;;;;AAAA;;GAEG;AACH,yCAIwB;AACxB,gFAAoD;AACpD,yCAA0C;AAE1C,MAAqB,sBAAsB;IACzB,MAAM,GAAW,MAAM,CAAC;IAEjC,aAAa,GAAkB,oBAAa,CAAC,GAAG,EAAE,CAAC;IAE1D;QACE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,yBAAc,EAAE,CAAC,CAAC;IACpD,CAAC;IAEM,SAAS;QACd,OAAO,CAAC,KAAK,CACX,qBAAqB,EACrB,8CAA8C,IAAI,CAAC,MAAM,EAAE,CAC5D,CAAC;QACF,OAAO,IAAI,6BAAe,EAAE,CAAC;IAC/B,CAAC;IAEM,IAAI,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC;CACtC;AAnBD,yCAmBC"}
+{"version":3,"file":"Bluetooth-client-factory.js","sourceRoot":"","sources":["../src/Bluetooth-client-factory.ts"],"names":[],"mappings":";;;;;;AAAA,yCAIwB;AACxB,0FAAyD;AACzD,wFAA2D;AAC3D,yCAA4C;AAC5C,kDAA0B;AAE1B,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAC;AAEvC,MAAa,0BAA0B;IACrB,MAAM,GAAW,MAAM,CAAC;IAExC;QACE,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,aAAa;QACnB,MAAM,EAAE,GAAG,oBAAa,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,EAAE,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,kCAAkC,CAAC,EAAE,CAAC;YAC7E,EAAE,CAAC,QAAQ,CAAC,IAAI,yBAAc,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,kEAAkE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,kCAAe,EAAE,CAAC;IAC/B,CAAC;IAEM,IAAI,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC;CACtC;AArBD,gEAqBC;AAED,MAAa,yBAAyB;IACpB,MAAM,GAAW,KAAK,CAAC;IAEvC;QACE,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IACO,aAAa;QACnB,MAAM,EAAE,GAAG,oBAAa,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,EAAE,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,kCAAkC,CAAC,EAAE,CAAC;YAC7E,EAAE,CAAC,QAAQ,CAAC,IAAI,yBAAc,EAAE,CAAC,CAAC;YAClC,GAAG,CAAC,kEAAkE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,iCAAkB,EAAE,CAAC;IAClC,CAAC;IAEM,IAAI,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC;CACtC;AApBD,8DAoBC"}

package/dist/Bluetooth-gap-client.d.ts

@@ -0,0 +1,14 @@
+import { Content, ProtocolClient } from '@node-wot/core';
+import type { Form, SecurityScheme } from 'wot-thing-description-types';
+export default class BluetoothGapClient implements ProtocolClient {
+    toString(): string;
+    readResource(form: Form): Promise<Content>;
+    writeResource(form: Form, content?: Content): Promise<void>;
+    invokeResource(form: Form, content?: Content): Promise<Content>;
+    unlinkResource(form: Form): Promise<void>;
+    subscribeResource(form: Form, next: (content: Content) => void, error?: (error: Error) => void, complete?: () => void): Promise<any>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    setSecurity(_metadata: SecurityScheme[], _credentials?: unknown): boolean;
+    requestThingDescription(uri: string): Promise<Content>;
+}

package/dist/Bluetooth-gap-client.js

@@ -0,0 +1,146 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = require("stream");
+const debug_1 = __importDefault(require("debug"));
+const BLELibCore = __importStar(require("./bluetooth/Bluetooth_lib"));
+const log = (0, debug_1.default)('binding-Bluetooth-GAP');
+// --- Helper Functions ---
+function fromObject(data) {
+    const json = JSON.stringify(data);
+    return {
+        type: 'application/json',
+        body: stream_1.Readable.from(json),
+        async toBuffer() {
+            return Buffer.from(json);
+        },
+    };
+}
+// Add this function here:
+function fromBuffer(type, buf) {
+    return {
+        type,
+        body: stream_1.Readable.from(buf),
+        async toBuffer() {
+            return buf;
+        },
+    };
+}
+// --- Class Definition ---
+class BluetoothGapClient {
+    toString() {
+        return '[BluetoothGapClient]';
+    }
+    async readResource(form) {
+        // Parse URL
+        // Expected formats: 
+        // - gap://<mac>
+        // - gap://<mac>/manufacturerData           (Auto-select first)
+        // - gap://<mac>/manufacturerData/<id>      (Select specific)
+        const path = form.href.split('//')[1];
+        const parts = path.split('/');
+        let deviceId = parts[0];
+        let resource = parts[1] ?? "manufacturerData";
+        const companyIdStr = parts[2]; // Optional
+        deviceId = deviceId.toUpperCase().replaceAll('-', ':');
+        if (resource !== 'manufacturerData') {
+            throw new Error(`[BluetoothGapClient] Only 'manufacturerData' is supported.`);
+        }
+        log(`invoke read GAP on ${deviceId}`);
+        // Fetch all data
+        const dataEntries = await BLELibCore.getDeviceManufacturerData(deviceId);
+        if (dataEntries.length === 0) {
+            throw new Error(`No manufacturer data found on ${deviceId}`);
+        }
+        // LOGIC: Auto-select or Specific Select
+        let selectedEntry;
+        if (companyIdStr) {
+            // Case A: ID specified in URL (e.g. 0x0499)
+            const companyId = companyIdStr.startsWith('0x')
+                ? parseInt(companyIdStr, 16)
+                : parseInt(companyIdStr, 10);
+            selectedEntry = dataEntries.find(e => e.companyId === companyId);
+            if (!selectedEntry) {
+                throw new Error(`Company ID ${companyIdStr} not found in advertisements.`);
+            }
+        }
+        else {
+            // Case B: No ID specified -> Auto-select the first one
+            selectedEntry = dataEntries[0];
+            log(`Auto-selected Manufacturer ID: 0x${selectedEntry.companyId.toString(16)}`);
+        }
+        // Return Data based on Content-Type
+        // If the TD expects binary (for the Codec), return the Buffer directly.
+        // If the TD expects JSON (debugging), return the simplified object.
+        if (form.contentType === 'application/json') {
+            // Return the simplified object info if JSON is requested
+            return fromObject(selectedEntry);
+        }
+        else {
+            // Default / Binary: Return the RAW BUFFER so the Codec can parse it
+            return fromBuffer(form.contentType || 'application/x.binary-data-stream', selectedEntry.data);
+        }
+    }
+    async writeResource(form, content) {
+        throw new Error('Method not implemented for GAP.');
+    }
+    async invokeResource(form, content) {
+        throw new Error('Method not implemented for GAP.');
+    }
+    async unlinkResource(form) {
+        throw new Error('Method not implemented for GAP.');
+    }
+    async subscribeResource(form, next, error, complete) {
+        throw new Error('Subscribe not yet implemented for GAP.');
+    }
+    async start() {
+        // no-op
+    }
+    async stop() {
+        // no-op
+    }
+    setSecurity(_metadata, _credentials) {
+        return false;
+    }
+    // --- ADDED THIS METHOD TO FIX ERROR 1 & 2 ---
+    async requestThingDescription(uri) {
+        throw new Error('requestThingDescription not supported by BluetoothGapClient');
+    }
+}
+exports.default = BluetoothGapClient;
+//# sourceMappingURL=Bluetooth-gap-client.js.map

package/dist/Bluetooth-gap-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Bluetooth-gap-client.js","sourceRoot":"","sources":["../src/Bluetooth-gap-client.ts"],"names":[],"mappings":"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"}

package/dist/{Bluetooth-client.d.ts → Bluetooth-gatt-client.d.ts}

@@ -1,6 +1,8 @@
 import { Content, ProtocolClient } from '@node-wot/core';
 import { Subscription } from 'rxjs/Subscription';
 import type { Form, SecurityScheme } from 'wot-thing-description-types';
+export declare function enableAutoDisconnect(): void;
+export declare function disableAutoDisconnect(): void;
 export declare const deconstructForm: (form: Form) => Record<string, any>;
 export default class BluetoothClient implements ProtocolClient {
     toString(): string;

package/dist/{Bluetooth-client.js → Bluetooth-gatt-client.js}

@@ -32,12 +32,28 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deconstructForm = void 0;
+exports.enableAutoDisconnect = enableAutoDisconnect;
+exports.disableAutoDisconnect = disableAutoDisconnect;
 const core_1 = require("@node-wot/core");
 const Subscription_1 = require("rxjs/Subscription");
 const stream_1 = require("stream");
+const debug_1 = __importDefault(require("debug"));
 const BLELibCore = __importStar(require("./bluetooth/Bluetooth_lib"));
+// If conenction should be closed automatically
+let autoDisconnect = true;
+function enableAutoDisconnect() {
+    autoDisconnect = true;
+}
+function disableAutoDisconnect() {
+    autoDisconnect = false;
+}
+// Create a logger with a specific namespace
+const log = (0, debug_1.default)('binding-Bluetooth');
 function asBle(form) {
     return form;
 }
@@ -98,7 +114,8 @@ class BluetoothClient {
     async readResource(form) {
         const deconstructedForm = (0, exports.deconstructForm)(form);
         await BLELibCore.connect(deconstructedForm.deviceId);
-        console.debug('[binding-Bluetooth]', `invoke read operation on characteristic ${deconstructedForm.characteristicId}` +
+        BLELibCore.touchConnection(deconstructedForm.deviceId);
+        log(`invoke read operation on characteristic ${deconstructedForm.characteristicId}` +
             ` from service ${deconstructedForm.serviceId} on ${deconstructedForm.deviceId}`);
         // Get Characteristic
         const characteristic = await BLELibCore.getCharacteristic(deconstructedForm.deviceId, deconstructedForm.serviceId, deconstructedForm.characteristicId);
@@ -111,7 +128,10 @@ class BluetoothClient {
             console.error(error);
             throw new Error(`Error reading from Bluetooth device ${deconstructedForm.characteristicId}`);
         }
-        await BLELibCore.close();
+        if (autoDisconnect) {
+            // disconnect on idle (handled inside BLELibCore timers)
+            BLELibCore.touchConnection(deconstructedForm.deviceId);
+        }
         // Return proper Content (with toBuffer)
         return fromBuffer(deconstructedForm.contentType || 'application/x.binary-data-stream', buffer);
     }
@@ -121,23 +141,43 @@ class BluetoothClient {
     async writeResource(form, content) {
         const deconstructedForm = (0, exports.deconstructForm)(form);
         await BLELibCore.connect(deconstructedForm.deviceId);
+        BLELibCore.touchConnection(deconstructedForm.deviceId);
         // Convert content -> Buffer
         let buffer;
         if (content) {
-            // prefer the canonical method available on node-wot Content
+            // 1) If node-wot gives you a canonical helper, use it
             if (typeof content.toBuffer === 'function') {
                 buffer = await content.toBuffer();
             }
             else {
+                // 2) Manually read the body and preserve Buffers as-is
                 const chunks = [];
                 for await (const chunk of content.body) {
-                    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+                    if (Buffer.isBuffer(chunk)) {
+                        chunks.push(chunk); // already a Buffer → keep as-is
+                    }
+                    else if (typeof chunk === 'string') {
+                        chunks.push(Buffer.from(chunk, 'utf8'));
+                    }
+                    else {
+                        // covers Uint8Array, Array<number>, etc.
+                        chunks.push(Buffer.from(chunk));
+                    }
+                }
+                // If there was exactly one Buffer, just use it directly
+                if (chunks.length === 0) {
+                    buffer = Buffer.alloc(0);
+                }
+                else if (chunks.length === 1) {
+                    buffer = chunks[0];
+                }
+                else {
+                    buffer = Buffer.concat(chunks);
                 }
-                buffer = Buffer.concat(chunks);
             }
         }
         else {
-            // If content not defined write buffer < 00 >
+            // If content not defined write buffer <00>
             buffer = Buffer.alloc(1);
         }
         // Get Characteristic
@@ -145,13 +185,13 @@ class BluetoothClient {
         // Select what operation should be executed
         switch (deconstructedForm.ble_operation) {
             case 'sbo:write':
-                console.debug('[binding-Bluetooth]', `invoke write operation on characteristic ${deconstructedForm.characteristicId}` +
+                log(`invoke write operation on characteristic ${deconstructedForm.characteristicId}` +
                     ` from service ${deconstructedForm.serviceId} on ${deconstructedForm.deviceId}`);
                 // write value with response
                 await characteristic.writeValue(buffer, { offset: 0, type: 'request' });
                 break;
             case 'sbo:write-without-response':
-                console.debug('[binding-Bluetooth]', `invoke write-without-response operation on characteristic ${deconstructedForm.characteristicId}` +
+                log(`invoke write-without-response operation on characteristic ${deconstructedForm.characteristicId}` +
                     ` from service ${deconstructedForm.serviceId} on ${deconstructedForm.deviceId}`);
                 // write value without response
                 await characteristic.writeValue(buffer, { offset: 0, type: 'command' });
@@ -160,7 +200,9 @@ class BluetoothClient {
                 throw new Error(`[binding-Bluetooth] unknown operation ${deconstructedForm.operation}`);
             }
         }
-        await BLELibCore.close();
+        if (autoDisconnect) {
+            BLELibCore.touchConnection(deconstructedForm.deviceId);
+        }
     }
     /**
      * Invokes an action (write + trivial response)
@@ -175,7 +217,7 @@ class BluetoothClient {
     }
     async unlinkResource(form) {
         const deconstructedForm = (0, exports.deconstructForm)(form);
-        console.debug('[binding-Bluetooth]', `unsubscribing from characteristic with serviceId ${deconstructedForm.serviceId} characteristicId ` +
+        log(`unsubscribing from characteristic with serviceId ${deconstructedForm.serviceId} characteristicId ` +
             `${deconstructedForm.characteristicId} on ${deconstructedForm.deviceId}`);
         const characteristic = await BLELibCore.getCharacteristic(deconstructedForm.deviceId, deconstructedForm.serviceId, deconstructedForm.characteristicId);
         await characteristic.stopNotifications();
@@ -185,10 +227,12 @@ class BluetoothClient {
      */
     async subscribeResource(form, next, error, complete) {
         const deconstructedForm = (0, exports.deconstructForm)(form);
+        await BLELibCore.connect(deconstructedForm.deviceId);
+        BLELibCore.holdConnection(deconstructedForm.deviceId);
         if (deconstructedForm.ble_operation !== 'sbo:notify') {
             throw new Error(`[binding-Bluetooth] operation ${deconstructedForm.ble_operation} is not supported`);
         }
-        console.debug('[binding-Bluetooth]', `subscribing to characteristic with serviceId ${deconstructedForm.serviceId} ` +
+        log(`subscribing to characteristic with serviceId ${deconstructedForm.serviceId} ` +
             `characteristicId ${deconstructedForm.characteristicId}`);
         const characteristic = await BLELibCore.getCharacteristic(deconstructedForm.deviceId, deconstructedForm.serviceId, deconstructedForm.characteristicId);
         await characteristic.startNotifications();
@@ -213,9 +257,11 @@ class BluetoothClient {
             void characteristic
                 .stopNotifications()
                 .then(() => {
+                BLELibCore.releaseConnection(deconstructedForm.deviceId);
                 complete?.();
             })
                 .catch((e) => {
+                BLELibCore.releaseConnection(deconstructedForm.deviceId);
                 error?.(e);
             });
         });
@@ -235,4 +281,4 @@ class BluetoothClient {
     }
 }
 exports.default = BluetoothClient;
-//# sourceMappingURL=Bluetooth-client.js.map
+//# sourceMappingURL=Bluetooth-gatt-client.js.map

package/dist/Bluetooth-gatt-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Bluetooth-gatt-client.js","sourceRoot":"","sources":["../src/Bluetooth-gatt-client.ts"],"names":[],"mappings":"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"}

package/dist/Bluetooth.d.ts

@@ -1,6 +1,7 @@
 import { Form } from "@node-wot/core";
-export { default as BluetoothClient } from './Bluetooth-client.js';
-export { default as BluetoothClientFactory } from './Bluetooth-client-factory.js';
+export { default as BluetoothClient } from './Bluetooth-gatt-client.js';
+export { BluetoothGATTClientFactory } from './Bluetooth-client-factory.js';
+export { BluetoothGapClientFactory } from './Bluetooth-client-factory.js';
 export declare class BluetoothForm extends Form {
     'wbt:id': string;
     'datatype': string;

package/dist/Bluetooth.js

@@ -3,12 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BluetoothForm = exports.BluetoothClientFactory = exports.BluetoothClient = void 0;
+exports.BluetoothForm = exports.BluetoothGapClientFactory = exports.BluetoothGATTClientFactory = exports.BluetoothClient = void 0;
 const core_1 = require("@node-wot/core");
-var Bluetooth_client_js_1 = require("./Bluetooth-client.js");
-Object.defineProperty(exports, "BluetoothClient", { enumerable: true, get: function () { return __importDefault(Bluetooth_client_js_1).default; } });
+var Bluetooth_gatt_client_js_1 = require("./Bluetooth-gatt-client.js");
+Object.defineProperty(exports, "BluetoothClient", { enumerable: true, get: function () { return __importDefault(Bluetooth_gatt_client_js_1).default; } });
+// Export the default (GATT) factory as expected by legacy code
 var Bluetooth_client_factory_js_1 = require("./Bluetooth-client-factory.js");
-Object.defineProperty(exports, "BluetoothClientFactory", { enumerable: true, get: function () { return __importDefault(Bluetooth_client_factory_js_1).default; } });
+Object.defineProperty(exports, "BluetoothGATTClientFactory", { enumerable: true, get: function () { return Bluetooth_client_factory_js_1.BluetoothGATTClientFactory; } });
+// Also export the GAP factory so it can be used
+var Bluetooth_client_factory_js_2 = require("./Bluetooth-client-factory.js");
+Object.defineProperty(exports, "BluetoothGapClientFactory", { enumerable: true, get: function () { return Bluetooth_client_factory_js_2.BluetoothGapClientFactory; } });
 class BluetoothForm extends core_1.Form {
     'wbt:id';
     'datatype';

package/dist/Bluetooth.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bluetooth.js","sourceRoot":"","sources":["../src/Bluetooth.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAsC;AAEtC,6DAAiE;AAAzD,uIAAA,OAAO,OAAmB;AAClC,6EAAgF;AAAxE,sJAAA,OAAO,OAA0B;AAEzC,MAAa,aAAc,SAAQ,WAAI;IAC9B,QAAQ,CAAS;IACjB,UAAU,CAAS;CAC3B;AAHD,sCAGC"}
+{"version":3,"file":"Bluetooth.js","sourceRoot":"","sources":["../src/Bluetooth.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAsC;AAEtC,uEAAwE;AAA/D,4IAAA,OAAO,OAAmB;AACnC,+DAA+D;AAC/D,6EAA2E;AAAlE,yIAAA,0BAA0B,OAAA;AAEnC,gDAAgD;AAChD,6EAA0E;AAAjE,wIAAA,yBAAyB,OAAA;AAElC,MAAa,aAAc,SAAQ,WAAI;IAC9B,QAAQ,CAAS;IACjB,UAAU,CAAS;CAC3B;AAHD,sCAGC"}