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

package/dist/cjs/NobleBleChannel.js

@@ -45,127 +45,251 @@ function nobleUuidToUuid(uuid) {
   return parts.join("-");
 }
 class NobleBleCentralInterface {
-  openChannels = /* @__PURE__ */ new Map();
-  onMatterMessageListener;
+  #bleScanner;
+  #connectionsInProgress = /* @__PURE__ */ new Set();
+  #connectionGuards = /* @__PURE__ */ new Set();
+  #openChannels = /* @__PURE__ */ new Map();
+  #onMatterMessageListener;
+  #closed = false;
+  constructor(bleScanner) {
+    this.#bleScanner = bleScanner;
+  }
   openChannel(address, tryCount = 1) {
+    if (this.#closed) {
+      throw new import_general.NetworkError("Network interface is closed");
+    }
     return new Promise((resolve, reject) => {
-      if (this.onMatterMessageListener === void 0) {
-        reject(new import_general.InternalError(`Network Interface was not added to the system yet.`));
+      if (this.#onMatterMessageListener === void 0) {
+        reject(new import_general.InternalError(`Network Interface was not added to the system yet, so can not connect it.`));
         return;
       }
       if (address.type !== "ble") {
         reject(new import_general.InternalError(`Unsupported address type ${address.type}.`));
         return;
       }
-      const { peripheral, hasAdditionalAdvertisementData } = import_protocol.Ble.get().getBleScanner().getDiscoveredDevice(address.peripheralAddress);
+      const { peripheralAddress } = address;
       if (tryCount > 3) {
-        reject(new import_protocol.BleError(`Failed to connect to peripheral ${peripheral.address}`));
+        reject(new import_protocol.BleError(`Failed to connect to peripheral ${peripheralAddress}`));
         return;
       }
-      logger.debug("BLE peripheral state", peripheral.state);
-      if (peripheral.state === "connected" || peripheral.state === "connecting") {
+      const { peripheral, hasAdditionalAdvertisementData } = this.#bleScanner.getDiscoveredDevice(peripheralAddress);
+      if (this.#openChannels.has(address)) {
         reject(
           new import_protocol.BleError(
-            `Peripheral ${address.peripheralAddress} is already connected or connecting. Only one connection supported right now.`
+            `Peripheral ${peripheralAddress} is already connected. Only one connection supported right now.`
           )
         );
         return;
       }
-      if (this.openChannels.has(address)) {
+      if (this.#connectionsInProgress.has(address)) {
+        logger.debug(`Connection to peripheral ${peripheralAddress} is already in progress.`);
+        return;
+      }
+      if (peripheral.state === "error") {
         reject(
           new import_protocol.BleError(
-            `Peripheral ${address.peripheralAddress} is already connected. Only one connection supported right now.`
+            `Can not connect to peripheral "${peripheralAddress}" because unexpected state "${peripheral.state}"`
           )
         );
         return;
       }
-      if (peripheral.state !== "disconnected") {
-        peripheral.disconnectAsync().then(() => this.openChannel(address, tryCount), reject);
-        return;
-      }
-      peripheral.once("connect", async () => {
-        if (this.onMatterMessageListener === void 0) {
-          reject(new import_general.InternalError(`Network Interface was not added to the system yet.`));
-          return;
-        }
-        const services = await peripheral.discoverServicesAsync([import_protocol.BLE_MATTER_SERVICE_UUID]);
-        logger.debug(`Found services: ${services.map((s) => s.uuid).join(", ")}`);
-        for (const service of services) {
-          logger.debug(`found service: ${service.uuid}`);
-          if (service.uuid !== import_protocol.BLE_MATTER_SERVICE_UUID) continue;
-          const characteristics = await service.discoverCharacteristicsAsync();
-          let characteristicC1ForWrite;
-          let characteristicC2ForSubscribe;
-          let additionalCommissioningRelatedData;
-          for (const characteristic of characteristics) {
-            logger.debug("found characteristic:", characteristic.uuid, characteristic.properties);
-            switch (nobleUuidToUuid(characteristic.uuid)) {
-              case import_protocol.BLE_MATTER_C1_CHARACTERISTIC_UUID:
-                logger.debug("found C1 characteristic");
-                characteristicC1ForWrite = characteristic;
-                break;
-              case import_protocol.BLE_MATTER_C2_CHARACTERISTIC_UUID:
-                logger.debug("found C2 characteristic");
-                characteristicC2ForSubscribe = characteristic;
-                break;
-              case import_protocol.BLE_MATTER_C3_CHARACTERISTIC_UUID:
-                logger.debug("found C3 characteristic");
-                if (hasAdditionalAdvertisementData) {
-                  logger.debug("reading additional commissioning related data");
-                  const data = await characteristic.readAsync();
-                  additionalCommissioningRelatedData = new Uint8Array(data);
-                  logger.debug("additional data", data);
-                }
-            }
+      const connectionGuard = {
+        // Timeout when trying to connect to the device because sometimes connect fails and noble does
+        // not emit an event. If device does not connect we do not try any longer and reject the promise
+        // because a re-discovery is the best option to get teh device into a good state again
+        connectTimeout: import_general.Time.getTimer("BLE connect timeout", 6e4, () => {
+          logger.debug(`Timeout while connecting to peripheral ${peripheralAddress}`);
+          peripheral.removeListener("connect", connectHandler);
+          peripheral.removeListener("disconnect", reTryHandler);
+          clearConnectionGuard();
+          reject(new import_protocol.BleError(`Timeout while connecting to peripheral ${peripheralAddress}`));
+        }),
+        disconnectTimeout: import_general.Time.getTimer("BLE disconnect timeout", 6e4, () => {
+          logger.debug(`Timeout while disconnecting to peripheral ${peripheralAddress}`);
+          peripheral.removeListener("disconnect", reTryHandler);
+          clearConnectionGuard();
+          reject(new import_protocol.BleError(`Timeout while disconnecting to peripheral ${peripheralAddress}`));
+        }),
+        // Timeout when trying to interview the device because sometimes when no response from device
+        // comes noble does not resolve promises
+        interviewTimeout: import_general.Time.getTimer("BLE interview timeout", 6e4, () => {
+          logger.debug(`Timeout while interviewing peripheral ${peripheralAddress}`);
+          peripheral.removeListener("disconnect", reTryHandler);
+          clearConnectionGuard();
+          if (peripheral.state === "connected") {
+            peripheral.disconnectAsync().catch((error) => logger.error(`Ignored error while disconnecting`, error));
           }
-          if (!characteristicC1ForWrite || !characteristicC2ForSubscribe) {
-            logger.debug("missing characteristics");
-            continue;
-          }
-          peripheral.removeAllListeners("disconnect");
-          this.openChannels.set(address, peripheral);
-          resolve(
-            await NobleBleChannel.create(
-              peripheral,
-              characteristicC1ForWrite,
-              characteristicC2ForSubscribe,
-              this.onMatterMessageListener,
-              additionalCommissioningRelatedData
-            )
-          );
-          return;
-        }
-        peripheral.removeAllListeners("disconnect");
-        reject(new import_protocol.BleError(`Peripheral ${peripheral.address} does not have the required characteristics`));
-      });
-      const reTryHandler = async (error) => {
+          reject(new import_protocol.BleError(`Timeout while interviewing peripheral ${peripheralAddress}`));
+        })
+      };
+      this.#connectionGuards.add(connectionGuard);
+      const clearConnectionGuard = () => {
+        const { connectTimeout, interviewTimeout, disconnectTimeout } = connectionGuard;
+        connectTimeout?.stop();
+        interviewTimeout?.stop();
+        disconnectTimeout?.stop();
+        this.#connectionGuards.delete(connectionGuard);
+      };
+      const reTryHandler = (error) => {
+        clearConnectionGuard();
+        this.#connectionsInProgress.delete(address);
+        peripheral.removeListener("connect", connectHandler);
+        peripheral.removeListener("disconnect", reTryHandler);
         if (error) {
           logger.error(
-            `Peripheral ${peripheral.address} disconnected while trying to connect, try again`,
+            `Peripheral ${peripheralAddress} disconnected while trying to connect, try again`,
             error
           );
         } else {
-          logger.info(`Peripheral ${peripheral.address} disconnected while trying to connect, try gain`);
+          logger.info(`Peripheral ${peripheralAddress} disconnected while trying to connect, try again`);
         }
-        peripheral.removeAllListeners("disconnect");
-        peripheral.removeAllListeners("connect");
         this.openChannel(address, tryCount + 1).then(resolve).catch(reject);
       };
-      peripheral.once("disconnect", reTryHandler);
-      logger.debug(`Connect to Peripheral now (try ${tryCount})`);
-      peripheral.connectAsync().catch(reTryHandler);
+      const connectHandler = async (error) => {
+        connectionGuard.connectTimeout.stop();
+        if (!this.#connectionGuards.has(connectionGuard)) {
+          return;
+        }
+        if (error) {
+          clearConnectionGuard();
+          reject(new import_protocol.BleError(`Error while connecting to peripheral ${peripheralAddress}`, error));
+          return;
+        }
+        if (this.#onMatterMessageListener === void 0) {
+          clearConnectionGuard();
+          reject(new import_general.InternalError(`Network Interface was not added to the system yet or was cleared.`));
+          return;
+        }
+        if (this.#connectionsInProgress.has(address)) {
+          return;
+        }
+        this.#connectionsInProgress.add(address);
+        try {
+          connectionGuard.interviewTimeout.start();
+          const services = await peripheral.discoverServicesAsync([import_protocol.BLE_MATTER_SERVICE_UUID]);
+          if (!this.#connectionGuards.has(connectionGuard)) {
+            return;
+          }
+          logger.debug(
+            `Peripheral ${peripheralAddress}: Found services: ${services.map((s) => s.uuid).join(", ")}`
+          );
+          for (const service of services) {
+            logger.debug(`Peripheral ${peripheralAddress}: Handle service: ${service.uuid}`);
+            if (service.uuid !== import_protocol.BLE_MATTER_SERVICE_UUID) continue;
+            const characteristics = await service.discoverCharacteristicsAsync();
+            if (!this.#connectionGuards.has(connectionGuard)) {
+              return;
+            }
+            let characteristicC1ForWrite;
+            let characteristicC2ForSubscribe;
+            let additionalCommissioningRelatedData;
+            for (const characteristic of characteristics) {
+              logger.debug(
+                `Peripheral ${peripheralAddress}: Handle characteristic:`,
+                characteristic.uuid,
+                characteristic.properties
+              );
+              switch (nobleUuidToUuid(characteristic.uuid)) {
+                case import_protocol.BLE_MATTER_C1_CHARACTERISTIC_UUID:
+                  logger.debug(`Peripheral ${peripheralAddress}: Found C1 characteristic`);
+                  characteristicC1ForWrite = characteristic;
+                  break;
+                case import_protocol.BLE_MATTER_C2_CHARACTERISTIC_UUID:
+                  logger.debug(`Peripheral ${peripheralAddress}: Found C2 characteristic`);
+                  characteristicC2ForSubscribe = characteristic;
+                  break;
+                case import_protocol.BLE_MATTER_C3_CHARACTERISTIC_UUID:
+                  logger.debug(`Peripheral ${peripheralAddress}: Found C3 characteristic`);
+                  if (hasAdditionalAdvertisementData) {
+                    logger.debug(
+                      `Peripheral ${peripheralAddress}: Reading additional commissioning related data`
+                    );
+                    const data = await characteristic.readAsync();
+                    if (!this.#connectionGuards.has(connectionGuard)) {
+                      return;
+                    }
+                    additionalCommissioningRelatedData = new Uint8Array(data);
+                    logger.debug(`Peripheral ${peripheralAddress}: Additional data:`, data);
+                  }
+              }
+            }
+            if (!characteristicC1ForWrite || !characteristicC2ForSubscribe) {
+              logger.debug(
+                `Peripheral ${peripheralAddress}: Missing required Matter characteristics. Ignore.`
+              );
+              continue;
+            }
+            connectionGuard.interviewTimeout.stop();
+            peripheral.removeListener("disconnect", reTryHandler);
+            this.#openChannels.set(address, peripheral);
+            try {
+              resolve(
+                await NobleBleChannel.create(
+                  peripheral,
+                  characteristicC1ForWrite,
+                  characteristicC2ForSubscribe,
+                  this.#onMatterMessageListener,
+                  additionalCommissioningRelatedData
+                )
+              );
+              clearConnectionGuard();
+              this.#connectionsInProgress.delete(address);
+            } catch (error2) {
+              this.#connectionsInProgress.delete(address);
+              this.#openChannels.delete(address);
+              await peripheral.disconnectAsync();
+              reTryHandler(error2);
+              return;
+            }
+          }
+        } finally {
+          this.#connectionsInProgress.delete(address);
+          clearConnectionGuard();
+        }
+        peripheral.removeListener("disconnect", reTryHandler);
+        reject(
+          new import_protocol.BleError(`Peripheral ${peripheralAddress} does not have the required Matter characteristics`)
+        );
+      };
+      if (peripheral.state === "connected") {
+        logger.debug(`Peripheral ${peripheralAddress}: Already connected`);
+        connectHandler().catch((error) => logger.warn(`Error while connecting`, error));
+      } else if (peripheral.state === "disconnecting") {
+        logger.debug(`Peripheral ${peripheralAddress}: Disconnect in progress`);
+        connectionGuard.disconnectTimeout.start();
+        tryCount--;
+        peripheral.once("disconnect", reTryHandler);
+      } else {
+        if (peripheral.state === "connecting") {
+          peripheral.cancelConnect();
+          peripheral.state = "disconnected";
+        }
+        connectionGuard.connectTimeout.start();
+        peripheral.once("connect", connectHandler);
+        peripheral.once("disconnect", reTryHandler);
+        logger.debug(`Peripheral ${peripheralAddress}: Connect to Peripheral now (try ${tryCount})`);
+        peripheral.connectAsync().catch((error) => {
+          if (!this.#connectionGuards.has(connectionGuard)) {
+            return;
+          }
+          logger.info(`Peripheral ${peripheralAddress}: Error while connecting to peripheral`, error);
+          reTryHandler(error);
+        });
+      }
     });
   }
   onData(listener) {
-    this.onMatterMessageListener = listener;
+    this.#onMatterMessageListener = listener;
     return {
       close: async () => await this.close()
     };
   }
   async close() {
-    for (const peripheral of this.openChannels.values()) {
-      await peripheral.disconnectAsync();
+    this.#closed = true;
+    for (const peripheral of this.#openChannels.values()) {
+      peripheral.disconnectAsync().catch((error) => logger.error(`Peripheral ${peripheral.address}: Error while disconnecting`, error));
     }
+    this.#openChannels.clear();
   }
   supports(type, _address) {
     if (type !== import_general.ChannelType.BLE) {
@@ -186,33 +310,52 @@ class NobleBleChannel extends import_protocol.BleChannel {
     });
   }
   static async create(peripheral, characteristicC1ForWrite, characteristicC2ForSubscribe, onMatterMessageListener, _additionalCommissioningRelatedData) {
+    const { address: peripheralAddress } = peripheral;
     let mtu = peripheral.mtu ?? 0;
     if (mtu > import_protocol.BLE_MAXIMUM_BTP_MTU) {
       mtu = import_protocol.BLE_MAXIMUM_BTP_MTU;
     }
-    logger.debug(`Using MTU=${mtu} (Peripheral MTU=${peripheral.mtu})`);
+    logger.debug(
+      `Peripheral ${peripheralAddress}: Using MTU=${mtu} bytes (Peripheral supports up to ${peripheral.mtu} bytes)`
+    );
+    const {
+      promise: handshakeResponseReceivedPromise,
+      resolver: handshakeResolver,
+      rejecter: handshakeRejecter
+    } = (0, import_general.createPromise)();
+    const handshakeHandler = (data, isNotification) => {
+      if (data[0] === 101 && data[1] === 108 && data.length === 6) {
+        logger.info(
+          `Peripheral ${peripheralAddress}: Received Matter handshake response: ${data.toString("hex")}.`
+        );
+        btpHandshakeTimeout.stop();
+        handshakeResolver(data);
+      } else {
+        logger.debug(
+          `Peripheral ${peripheralAddress}: Received first data on C2: ${data.toString("hex")} (isNotification: ${isNotification}) - No handshake response, inforing`
+        );
+      }
+    };
+    const btpHandshakeTimeout = import_general.Time.getTimer("BLE handshake timeout", import_protocol.BTP_CONN_RSP_TIMEOUT_MS, async () => {
+      characteristicC2ForSubscribe.removeListener("data", handshakeHandler);
+      characteristicC2ForSubscribe.unsubscribeAsync().catch((error) => logger.error(`Peripheral ${peripheralAddress}: Error while unsubscribing`, error));
+      logger.debug(
+        `Peripheral ${peripheralAddress}: Handshake Response not received. Disconnected from peripheral`
+      );
+      handshakeRejecter(new import_protocol.BleError(`Peripheral ${peripheralAddress}: Handshake Response not received`));
+    }).start();
     const btpHandshakeRequest = import_protocol.BtpCodec.encodeBtpHandshakeRequest({
       versions: import_protocol.BTP_SUPPORTED_VERSIONS,
       attMtu: mtu,
       clientWindowSize: import_protocol.BTP_MAXIMUM_WINDOW_SIZE
     });
-    logger.debug(`sending BTP handshake request: ${import_general.Logger.toJSON(btpHandshakeRequest)}`);
+    logger.debug(
+      `Peripheral ${peripheralAddress}: Sending BTP handshake request: ${import_general.Logger.toJSON(btpHandshakeRequest)}`
+    );
     await characteristicC1ForWrite.writeAsync(Buffer.from(btpHandshakeRequest.buffer), false);
-    const btpHandshakeTimeout = import_general.Time.getTimer("BLE handshake timeout", import_protocol.BTP_CONN_RSP_TIMEOUT_MS, async () => {
-      await peripheral.disconnectAsync();
-      logger.debug("Handshake Response not received. Disconnected from peripheral");
-    }).start();
-    logger.debug("subscribing to C2 characteristic");
+    logger.debug(`Peripheral ${peripheralAddress}: Subscribing to C2 characteristic`);
     await characteristicC2ForSubscribe.subscribeAsync();
-    const { promise: handshakeResponseReceivedPromise, resolver } = (0, import_general.createPromise)();
-    characteristicC2ForSubscribe.once("data", (data, isNotification) => {
-      logger.debug(`received first data on C2: ${data.toString("hex")} (isNotification: ${isNotification})`);
-      if (data[0] === 101 && data[1] === 108 && data.length === 6) {
-        logger.info(`Received Matter handshake response: ${data.toString("hex")}.`);
-        btpHandshakeTimeout.stop();
-        resolver(data);
-      }
-    });
+    characteristicC2ForSubscribe.once("data", handshakeHandler);
     const handshakeResponse = await handshakeResponseReceivedPromise;
     const btpSession = await import_protocol.BtpSessionHandler.createAsCentral(
       new Uint8Array(handshakeResponse),
@@ -221,7 +364,9 @@ class NobleBleChannel extends import_protocol.BleChannel {
         return await characteristicC1ForWrite.writeAsync(Buffer.from(data.buffer), false);
       },
       // callback to disconnect the BLE connection
-      async () => void characteristicC2ForSubscribe.unsubscribeAsync().then(() => peripheral.disconnectAsync().then(() => logger.debug("disconnected from peripheral"))),
+      async () => void characteristicC2ForSubscribe.unsubscribeAsync().then(
+        () => peripheral.disconnectAsync().then(() => logger.debug(`Peripheral ${peripheralAddress}: Disconnected from peripheral`))
+      ),
       // callback to forward decoded and de-assembled Matter messages to ExchangeManager
       async (data) => {
         if (onMatterMessageListener === void 0) {
@@ -231,7 +376,9 @@ class NobleBleChannel extends import_protocol.BleChannel {
       }
     );
     characteristicC2ForSubscribe.on("data", (data, isNotification) => {
-      logger.debug(`received data on C2: ${data.toString("hex")} (isNotification: ${isNotification})`);
+      logger.debug(
+        `Peripheral ${peripheralAddress}: received data on C2: ${data.toString("hex")} (isNotification: ${isNotification})`
+      );
       void btpSession.handleIncomingBleData(new Uint8Array(data));
     });
     const nobleChannel = new NobleBleChannel(peripheral, btpSession);
@@ -245,11 +392,15 @@ class NobleBleChannel extends import_protocol.BleChannel {
    */
   async send(data) {
     if (!this.connected) {
-      logger.debug("Cannot send data because not connected to peripheral.");
+      logger.debug(
+        `Peripheral ${this.peripheral.address}: Cannot send data because not connected to peripheral.`
+      );
       return;
     }
     if (this.btpSession === void 0) {
-      throw new import_protocol.BtpFlowError(`Cannot send data, no BTP session initialized`);
+      throw new import_protocol.BtpFlowError(
+        `Peripheral ${this.peripheral.address}: Cannot send data, no BTP session initialized`
+      );
     }
     await this.btpSession.sendMatterMessage(data);
   }
@@ -259,7 +410,7 @@ class NobleBleChannel extends import_protocol.BleChannel {
   }
   async close() {
     await this.btpSession.close();
-    await this.peripheral.disconnectAsync();
+    this.peripheral.disconnectAsync().catch((error) => logger.error(`Peripheral ${this.peripheral.address}: Error while disconnecting`, error));
   }
 }
 //# sourceMappingURL=NobleBleChannel.js.map

package/dist/cjs/NobleBleChannel.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/NobleBleChannel.ts"],
-  "mappings": "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",
-  "names": []
+  "mappings": "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",
+  "names": ["error"]
 }

package/dist/cjs/NobleBleClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NobleBleClient.d.ts","sourceRoot":"","sources":["../../src/NobleBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAkB5C,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAGlC;IACJ,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,wBAAwB,CAA+E;gBAEnG,OAAO,CAAC,EAAE,UAAU;IA2BzB,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,KAAK,IAAI;IAOvF,aAAa;IAYb,YAAY;IAQzB,OAAO,CAAC,sBAAsB;CA0BjC"}
+{"version":3,"file":"NobleBleClient.d.ts","sourceRoot":"","sources":["../../src/NobleBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAkB5C,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAGlC;IACJ,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,wBAAwB,CAA+E;gBAEnG,OAAO,CAAC,EAAE,UAAU;IAkCzB,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,KAAK,IAAI;IAOvF,aAAa;IAcb,YAAY;IAQzB,OAAO,CAAC,sBAAsB;CA2BjC"}

package/dist/cjs/NobleBleClient.js

@@ -60,7 +60,12 @@ class NobleBleClient {
       }
     });
     noble.on("discover", (peripheral) => this.handleDiscoveredDevice(peripheral));
-    noble.on("scanStart", () => this.isScanning = true);
+    noble.on("scanStart", () => {
+      if (!this.shouldScan) {
+        return;
+      }
+      this.isScanning = true;
+    });
     noble.on("scanStop", () => this.isScanning = false);
   }
   setDiscoveryCallback(callback) {
@@ -70,11 +75,13 @@ class NobleBleClient {
     }
   }
   async startScanning() {
-    if (this.isScanning) return;
+    if (this.isScanning) {
+      return;
+    }
     this.shouldScan = true;
     if (this.nobleState === "poweredOn") {
       logger.debug("Start BLE scanning for Matter Services ...");
-      await noble.startScanningAsync([import_protocol.BLE_MATTER_SERVICE_UUID], false);
+      await noble.startScanningAsync([import_protocol.BLE_MATTER_SERVICE_UUID], true);
     } else {
       logger.debug("noble state is not poweredOn ... delay scanning till poweredOn");
     }
@@ -87,23 +94,24 @@ class NobleBleClient {
     }
   }
   handleDiscoveredDevice(peripheral) {
+    const address = peripheral.address;
     logger.debug(
-      `Found peripheral ${peripheral.address} (${peripheral.advertisement.localName}): ${import_general.Logger.toJSON(
+      `Found peripheral ${address} (${peripheral.advertisement.localName}): ${import_general.Logger.toJSON(
         peripheral.advertisement
       )}`
     );
     if (!peripheral.connectable) {
-      logger.info(`Peripheral ${peripheral.address} is not connectable ... ignoring`);
+      logger.info(`Peripheral ${address} is not connectable ... ignoring`);
       return;
     }
     const matterServiceData = peripheral.advertisement.serviceData.find(
       (serviceData) => serviceData.uuid === import_protocol.BLE_MATTER_SERVICE_UUID
     );
     if (matterServiceData === void 0 || matterServiceData.data.length !== 8) {
-      logger.info(`Peripheral ${peripheral.address} does not advertise Matter Service ... ignoring`);
+      logger.info(`Peripheral ${address} does not advertise Matter Service ... ignoring`);
       return;
     }
-    this.discoveredPeripherals.set(peripheral.address, { peripheral, matterServiceData: matterServiceData.data });
+    this.discoveredPeripherals.set(address, { peripheral, matterServiceData: matterServiceData.data });
     this.deviceDiscoveredCallback?.(peripheral, matterServiceData.data);
   }
 }

package/dist/cjs/NobleBleClient.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/NobleBleClient.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AACvB,qBAAwB;AACxB,sBAAwC;AARxC;AAAA;AAAA;AAAA;AAAA;AAYA,MAAM,SAAS,sBAAO,IAAI,gBAAgB;AAC1C,IAAI;AAEJ,SAAS,UAAU,OAAgB;AAE/B,MAAI,UAAU,QAAW;AACrB,YAAQ,IAAI,sBAAsB,MAAM,SAAS;AAAA,EACrD;AACA,cAAQ,wBAAQ,mBAAmB;AACnC,MAAI,OAAO,MAAM,OAAO,YAAY;AAGhC,YAAS,MAAc,EAAE,UAAU,MAAM,CAAC;AAAA,EAC9C;AACJ;AAEO,MAAM,eAAe;AAAA,EACP,wBAAwB,oBAAI,IAG3C;AAAA,EACM,aAAa;AAAA,EACb,aAAa;AAAA,EACb,aAAa;AAAA,EACb;AAAA,EAER,YAAY,SAAsB;AAC9B,cAAU,SAAS,KAAK;AAUxB,UAAM,GAAG,eAAe,WAAS;AAC7B,WAAK,aAAa;AAClB,aAAO,MAAM,0BAA0B,KAAK,EAAE;AAC9C,UAAI,UAAU,aAAa;AACvB,YAAI,KAAK,YAAY;AACjB,eAAK,KAAK,cAAc;AAAA,QAC5B;AAAA,MACJ,OAAO;AACH,aAAK,KAAK,aAAa;AAAA,MAC3B;AAAA,IACJ,CAAC;AACD,UAAM,GAAG,YAAY,gBAAc,KAAK,uBAAuB,UAAU,CAAC;AAC1E,UAAM,GAAG,aAAa,MAAO,KAAK,aAAa,IAAK;AACpD,UAAM,GAAG,YAAY,MAAO,KAAK,aAAa,KAAM;AAAA,EACxD;AAAA,EAEO,qBAAqB,UAA0E;AAClG,SAAK,2BAA2B;AAChC,eAAW,EAAE,YAAY,kBAAkB,KAAK,KAAK,sBAAsB,OAAO,GAAG;AACjF,WAAK,yBAAyB,YAAY,iBAAiB;AAAA,IAC/D;AAAA,EACJ;AAAA,EAEA,MAAa,gBAAgB;AACzB,QAAI,KAAK,WAAY;AAErB,SAAK,aAAa;AAClB,QAAI,KAAK,eAAe,aAAa;AACjC,aAAO,MAAM,4CAA4C;AACzD,YAAM,MAAM,mBAAmB,CAAC,uCAAuB,GAAG,KAAK;AAAA,IACnE,OAAO;AACH,aAAO,MAAM,gEAAgE;AAAA,IACjF;AAAA,EACJ;AAAA,EAEA,MAAa,eAAe;AACxB,SAAK,aAAa;AAClB,QAAI,KAAK,YAAY;AACjB,aAAO,MAAM,2CAA2C;AACxD,YAAM,MAAM,kBAAkB;AAAA,IAClC;AAAA,EACJ;AAAA,EAEQ,uBAAuB,YAAwB;AAInD,WAAO;AAAA,MACH,oBAAoB,WAAW,OAAO,KAAK,WAAW,cAAc,SAAS,MAAM,sBAAO;AAAA,QACtF,WAAW;AAAA,MACf,CAAC;AAAA,IACL;AAEA,QAAI,CAAC,WAAW,aAAa;AACzB,aAAO,KAAK,cAAc,WAAW,OAAO,kCAAkC;AAC9E;AAAA,IACJ;AACA,UAAM,oBAAoB,WAAW,cAAc,YAAY;AAAA,MAC3D,iBAAe,YAAY,SAAS;AAAA,IACxC;AACA,QAAI,sBAAsB,UAAa,kBAAkB,KAAK,WAAW,GAAG;AACxE,aAAO,KAAK,cAAc,WAAW,OAAO,iDAAiD;AAC7F;AAAA,IACJ;AAEA,SAAK,sBAAsB,IAAI,WAAW,SAAS,EAAE,YAAY,mBAAmB,kBAAkB,KAAK,CAAC;AAE5G,SAAK,2BAA2B,YAAY,kBAAkB,IAAI;AAAA,EACtE;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AACvB,qBAAwB;AACxB,sBAAwC;AARxC;AAAA;AAAA;AAAA;AAAA;AAYA,MAAM,SAAS,sBAAO,IAAI,gBAAgB;AAC1C,IAAI;AAEJ,SAAS,UAAU,OAAgB;AAE/B,MAAI,UAAU,QAAW;AACrB,YAAQ,IAAI,sBAAsB,MAAM,SAAS;AAAA,EACrD;AACA,cAAQ,wBAAQ,mBAAmB;AACnC,MAAI,OAAO,MAAM,OAAO,YAAY;AAGhC,YAAS,MAAc,EAAE,UAAU,MAAM,CAAC;AAAA,EAC9C;AACJ;AAEO,MAAM,eAAe;AAAA,EACP,wBAAwB,oBAAI,IAG3C;AAAA,EACM,aAAa;AAAA,EACb,aAAa;AAAA,EACb,aAAa;AAAA,EACb;AAAA,EAER,YAAY,SAAsB;AAC9B,cAAU,SAAS,KAAK;AAUxB,UAAM,GAAG,eAAe,WAAS;AAC7B,WAAK,aAAa;AAClB,aAAO,MAAM,0BAA0B,KAAK,EAAE;AAC9C,UAAI,UAAU,aAAa;AACvB,YAAI,KAAK,YAAY;AACjB,eAAK,KAAK,cAAc;AAAA,QAC5B;AAAA,MACJ,OAAO;AACH,aAAK,KAAK,aAAa;AAAA,MAC3B;AAAA,IACJ,CAAC;AACD,UAAM,GAAG,YAAY,gBAAc,KAAK,uBAAuB,UAAU,CAAC;AAC1E,UAAM,GAAG,aAAa,MAAM;AACxB,UAAI,CAAC,KAAK,YAAY;AAGlB;AAAA,MACJ;AACA,WAAK,aAAa;AAAA,IACtB,CAAC;AACD,UAAM,GAAG,YAAY,MAAO,KAAK,aAAa,KAAM;AAAA,EACxD;AAAA,EAEO,qBAAqB,UAA0E;AAClG,SAAK,2BAA2B;AAChC,eAAW,EAAE,YAAY,kBAAkB,KAAK,KAAK,sBAAsB,OAAO,GAAG;AACjF,WAAK,yBAAyB,YAAY,iBAAiB;AAAA,IAC/D;AAAA,EACJ;AAAA,EAEA,MAAa,gBAAgB;AACzB,QAAI,KAAK,YAAY;AACjB;AAAA,IACJ;AAEA,SAAK,aAAa;AAClB,QAAI,KAAK,eAAe,aAAa;AACjC,aAAO,MAAM,4CAA4C;AACzD,YAAM,MAAM,mBAAmB,CAAC,uCAAuB,GAAG,IAAI;AAAA,IAClE,OAAO;AACH,aAAO,MAAM,gEAAgE;AAAA,IACjF;AAAA,EACJ;AAAA,EAEA,MAAa,eAAe;AACxB,SAAK,aAAa;AAClB,QAAI,KAAK,YAAY;AACjB,aAAO,MAAM,2CAA2C;AACxD,YAAM,MAAM,kBAAkB;AAAA,IAClC;AAAA,EACJ;AAAA,EAEQ,uBAAuB,YAAwB;AAInD,UAAM,UAAU,WAAW;AAC3B,WAAO;AAAA,MACH,oBAAoB,OAAO,KAAK,WAAW,cAAc,SAAS,MAAM,sBAAO;AAAA,QAC3E,WAAW;AAAA,MACf,CAAC;AAAA,IACL;AAEA,QAAI,CAAC,WAAW,aAAa;AACzB,aAAO,KAAK,cAAc,OAAO,kCAAkC;AACnE;AAAA,IACJ;AACA,UAAM,oBAAoB,WAAW,cAAc,YAAY;AAAA,MAC3D,iBAAe,YAAY,SAAS;AAAA,IACxC;AACA,QAAI,sBAAsB,UAAa,kBAAkB,KAAK,WAAW,GAAG;AACxE,aAAO,KAAK,cAAc,OAAO,iDAAiD;AAClF;AAAA,IACJ;AAEA,SAAK,sBAAsB,IAAI,SAAS,EAAE,YAAY,mBAAmB,kBAAkB,KAAK,CAAC;AAEjG,SAAK,2BAA2B,YAAY,kBAAkB,IAAI;AAAA,EACtE;AACJ;",
   "names": []
 }

package/dist/cjs/NodeJsBle.d.ts

@@ -9,9 +9,8 @@ export type BleOptions = {
     hciId?: number;
 };
 export declare class NodeJsBle extends Ble {
+    #private;
     private readonly options?;
-    private blePeripheral;
-    private bleCentral;
     constructor(options?: BleOptions | undefined);
     getBlePeripheralInterface(): TransportInterface;
     getBleCentralInterface(): NetInterface;

package/dist/cjs/NodeJsBle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeJsBle.d.ts","sourceRoot":"","sources":["../../src/NodeJsBle.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAQrE,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,SAAU,SAAQ,GAAG;IAIlB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAHrC,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,UAAU,CAA6B;gBAElB,OAAO,CAAC,EAAE,UAAU,YAAA;IAIjD,yBAAyB,IAAI,kBAAkB;IAO/C,sBAAsB,IAAI,YAAY;IAOtC,iBAAiB,CAAC,2BAA2B,CAAC,EAAE,UAAU,GAAG,mBAAmB;IAOhF,aAAa,IAAI,OAAO;CAM3B"}
+{"version":3,"file":"NodeJsBle.d.ts","sourceRoot":"","sources":["../../src/NodeJsBle.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAQrE,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,SAAU,SAAQ,GAAG;;IAQlB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAR,OAAO,CAAC,EAAE,UAAU,YAAA;IAkBjD,yBAAyB,IAAI,kBAAkB;IAO/C,sBAAsB,IAAI,YAAY;IAOtC,iBAAiB,CAAC,2BAA2B,CAAC,EAAE,UAAU,GAAG,mBAAmB;IAOhF,aAAa,IAAI,OAAO;CAM3B"}