@matter/nodejs-ble 0.12.0-alpha.0-20250103-ba0c01a01 → 0.12.0-alpha.0-20250108-7ae2a767d

package/dist/esm/NodeJsBle.js

@@ -15,31 +15,47 @@ class NodeJsBle extends Ble {
     super();
     this.options = options;
   }
-  blePeripheral;
-  bleCentral;
+  #blePeripheralInstance;
+  #bleCentralInstance;
+  #bleScanner;
+  #bleBroadcaster;
+  #bleCentralInterface;
+  #blePeripheralInterface;
+  get #blePeripheralServer() {
+    if (this.#blePeripheralInstance === void 0) {
+      this.#blePeripheralInstance = new BlenoBleServer(this.options);
+    }
+    return this.#blePeripheralInstance;
+  }
+  get #bleCentralClient() {
+    if (this.#bleCentralInstance === void 0) {
+      this.#bleCentralInstance = new NobleBleClient(this.options);
+    }
+    return this.#bleCentralInstance;
+  }
   getBlePeripheralInterface() {
-    if (this.blePeripheral === void 0) {
-      this.blePeripheral = new BlenoBleServer(this.options);
+    if (this.#blePeripheralInterface === void 0) {
+      this.#blePeripheralInterface = new BlePeripheralInterface(this.#blePeripheralServer);
     }
-    return new BlePeripheralInterface(this.blePeripheral);
+    return this.#blePeripheralInterface;
   }
   getBleCentralInterface() {
-    if (this.bleCentral === void 0) {
-      this.bleCentral = new NobleBleClient(this.options);
+    if (this.#bleCentralInterface === void 0) {
+      this.#bleCentralInterface = new NobleBleCentralInterface(this.getBleScanner());
     }
-    return new NobleBleCentralInterface();
+    return this.#bleCentralInterface;
   }
   getBleBroadcaster(additionalAdvertisementData) {
-    if (this.blePeripheral === void 0) {
-      this.blePeripheral = new BlenoBleServer(this.options);
+    if (this.#bleBroadcaster === void 0) {
+      this.#bleBroadcaster = new BleBroadcaster(this.#blePeripheralServer, additionalAdvertisementData);
     }
-    return new BleBroadcaster(this.blePeripheral, additionalAdvertisementData);
+    return this.#bleBroadcaster;
   }
   getBleScanner() {
-    if (this.bleCentral === void 0) {
-      this.bleCentral = new NobleBleClient(this.options);
+    if (this.#bleScanner === void 0) {
+      this.#bleScanner = new BleScanner(this.#bleCentralClient);
     }
-    return new BleScanner(this.bleCentral);
+    return this.#bleScanner;
   }
 }
 export {

package/dist/esm/NodeJsBle.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/NodeJsBle.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,WAAyC;AAClD,SAAS,sBAAsB;AAC/B,SAAS,8BAA8B;AACvC,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAC/B,SAAS,gCAAgC;AACzC,SAAS,sBAAsB;AAMxB,MAAM,kBAAkB,IAAI;AAAA,EAI/B,YAA6B,SAAsB;AAC/C,UAAM;AADmB;AAAA,EAE7B;AAAA,EALQ;AAAA,EACA;AAAA,EAMR,4BAAgD;AAC5C,QAAI,KAAK,kBAAkB,QAAW;AAClC,WAAK,gBAAgB,IAAI,eAAe,KAAK,OAAO;AAAA,IACxD;AACA,WAAO,IAAI,uBAAuB,KAAK,aAAa;AAAA,EACxD;AAAA,EAEA,yBAAuC;AACnC,QAAI,KAAK,eAAe,QAAW;AAC/B,WAAK,aAAa,IAAI,eAAe,KAAK,OAAO;AAAA,IACrD;AACA,WAAO,IAAI,yBAAyB;AAAA,EACxC;AAAA,EAEA,kBAAkB,6BAA+D;AAC7E,QAAI,KAAK,kBAAkB,QAAW;AAClC,WAAK,gBAAgB,IAAI,eAAe,KAAK,OAAO;AAAA,IACxD;AACA,WAAO,IAAI,eAAe,KAAK,eAAe,2BAA2B;AAAA,EAC7E;AAAA,EAEA,gBAAyB;AACrB,QAAI,KAAK,eAAe,QAAW;AAC/B,WAAK,aAAa,IAAI,eAAe,KAAK,OAAO;AAAA,IACrD;AACA,WAAO,IAAI,WAAW,KAAK,UAAU;AAAA,EACzC;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,WAAyC;AAClD,SAAS,sBAAsB;AAC/B,SAAS,8BAA8B;AACvC,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAC/B,SAAS,gCAAgC;AACzC,SAAS,sBAAsB;AAMxB,MAAM,kBAAkB,IAAI;AAAA,EAQ/B,YAA6B,SAAsB;AAC/C,UAAM;AADmB;AAAA,EAE7B;AAAA,EATA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAMA,IAAI,uBAAuB;AACvB,QAAI,KAAK,2BAA2B,QAAW;AAC3C,WAAK,yBAAyB,IAAI,eAAe,KAAK,OAAO;AAAA,IACjE;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,oBAAoB;AACpB,QAAI,KAAK,wBAAwB,QAAW;AACxC,WAAK,sBAAsB,IAAI,eAAe,KAAK,OAAO;AAAA,IAC9D;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,4BAAgD;AAC5C,QAAI,KAAK,4BAA4B,QAAW;AAC5C,WAAK,0BAA0B,IAAI,uBAAuB,KAAK,oBAAoB;AAAA,IACvF;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,yBAAuC;AACnC,QAAI,KAAK,yBAAyB,QAAW;AACzC,WAAK,uBAAuB,IAAI,yBAAyB,KAAK,cAAc,CAAe;AAAA,IAC/F;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,kBAAkB,6BAA+D;AAC7E,QAAI,KAAK,oBAAoB,QAAW;AACpC,WAAK,kBAAkB,IAAI,eAAe,KAAK,sBAAsB,2BAA2B;AAAA,IACpG;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,gBAAyB;AACrB,QAAI,KAAK,gBAAgB,QAAW;AAChC,WAAK,cAAc,IAAI,WAAW,KAAK,iBAAiB;AAAA,IAC5D;AACA,WAAO,KAAK;AAAA,EAChB;AACJ;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/nodejs-ble",
-    "version": "0.12.0-alpha.0-20250103-ba0c01a01",
+    "version": "0.12.0-alpha.0-20250108-7ae2a767d",
     "description": "Matter BLE support for node.js",
     "keywords": [
         "iot",
@@ -28,12 +28,12 @@
         "build-clean": "matter-build --clean"
     },
     "dependencies": {
-        "@matter/general": "0.12.0-alpha.0-20250103-ba0c01a01",
-        "@matter/types": "0.12.0-alpha.0-20250103-ba0c01a01",
-        "@matter/protocol": "0.12.0-alpha.0-20250103-ba0c01a01"
+        "@matter/general": "0.12.0-alpha.0-20250108-7ae2a767d",
+        "@matter/types": "0.12.0-alpha.0-20250108-7ae2a767d",
+        "@matter/protocol": "0.12.0-alpha.0-20250108-7ae2a767d"
     },
     "devDependencies": {
-        "@matter/tools": "0.12.0-alpha.0-20250103-ba0c01a01"
+        "@matter/tools": "0.12.0-alpha.0-20250108-7ae2a767d"
     },
     "optionalDependencies": {
         "@stoprocent/bleno": "^0.8.1",

package/src/BleScanner.ts

@@ -95,33 +95,42 @@ export class BleScanner implements Scanner {
     }
 
     private handleDiscoveredDevice(peripheral: Peripheral, manufacturerServiceData: Uint8Array) {
+        const address = peripheral.address;
         logger.debug(
-            `Discovered device ${peripheral.address} ${manufacturerServiceData === undefined ? undefined : Bytes.toHex(manufacturerServiceData)}`,
+            `Discovered device ${address} ${manufacturerServiceData === undefined ? undefined : Bytes.toHex(manufacturerServiceData)}`,
         );
 
         try {
             const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } =
                 BtpCodec.decodeBleAdvertisementServiceData(manufacturerServiceData);
 
-            const commissionableDevice: CommissionableDeviceData = {
-                deviceIdentifier: peripheral.address,
+            const deviceData: CommissionableDeviceData = {
+                deviceIdentifier: address,
                 D: discriminator,
                 SD: (discriminator >> 8) & 0x0f,
                 VP: `${vendorId}+${productId}`,
                 CM: 1, // Can be no other mode,
-                addresses: [{ type: "ble", peripheralAddress: peripheral.address }],
+                addresses: [{ type: "ble", peripheralAddress: address }],
             };
-            logger.debug(`Discovered device ${peripheral.address} data: ${Logger.toJSON(commissionableDevice)}`);
+            const deviceExisting = this.discoveredMatterDevices.has(address);
 
-            const deviceExisting = this.discoveredMatterDevices.has(peripheral.address);
+            logger.debug(
+                `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${Logger.toJSON(deviceData)}`,
+            );
+
+            if (deviceExisting) {
+                // Device got rediscovered, so clear the state
+                // TODO: Remove once noble does that by itself
+                peripheral.state = "disconnected";
+            }
 
-            this.discoveredMatterDevices.set(peripheral.address, {
-                deviceData: commissionableDevice,
-                peripheral: peripheral,
+            this.discoveredMatterDevices.set(address, {
+                deviceData,
+                peripheral,
                 hasAdditionalAdvertisementData,
             });
 
-            const queryKey = this.findCommissionableQueryIdentifier(commissionableDevice);
+            const queryKey = this.findCommissionableQueryIdentifier(deviceData);
             if (queryKey !== undefined) {
                 this.finishWaiter(queryKey, true, deviceExisting);
             }
@@ -223,8 +232,9 @@ export class BleScanner implements Scanner {
     async findCommissionableDevices(
         identifier: CommissionableDeviceIdentifiers,
         timeoutSeconds = 10,
+        ignoreExistingRecords = false,
     ): Promise<CommissionableDevice[]> {
-        let storedRecords = this.getCommissionableDevices(identifier);
+        let storedRecords = ignoreExistingRecords ? [] : this.getCommissionableDevices(identifier);
         if (storedRecords.length === 0) {
             const queryKey = this.buildCommissionableQueryIdentifier(identifier);
 
@@ -288,8 +298,8 @@ export class BleScanner implements Scanner {
         return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
     }
 
-    close(): void {
-        void this.nobleClient.stopScanning();
+    async close() {
+        await this.nobleClient.stopScanning();
         [...this.recordWaiters.keys()].forEach(queryId =>
             this.finishWaiter(queryId, !!this.recordWaiters.get(queryId)?.timer),
         );

package/src/BlenoBleServer.ts

@@ -64,15 +64,17 @@ function initializeBleno(server: BlenoBleServer, hciId?: number) {
             });
         }
 
-        override async onSubscribe(maxValueSize: number, updateValueCallback: (data: Buffer) => void) {
+        override onSubscribe(maxValueSize: number, updateValueCallback: (data: Buffer) => void) {
             logger.debug(`C2 subscribe ${maxValueSize}`);
 
-            await server.handleC2SubscribeRequest(maxValueSize, updateValueCallback);
+            server
+                .handleC2SubscribeRequest(maxValueSize, updateValueCallback)
+                .catch(e => logger.warn("Error happened in when handling C2 subscribe", e));
         }
 
-        override async onUnsubscribe() {
+        override onUnsubscribe() {
             logger.debug("C2 unsubscribe");
-            await server.close();
+            server.close().catch(e => logger.warn("Error happened when closing server for C2 unsubscribe", e));
         }
 
         override onIndicate() {