@matter/nodejs-ble 0.14.1-alpha.0-20250607-a93593303 → 0.15.0-alpha.0-20250613-a55f991d4

package/dist/cjs/BleScanner.d.ts

@@ -16,31 +16,11 @@ type CommissionableDeviceData = CommissionableDevice & {
     SD: number;
 };
 export declare class BleScanner implements Scanner {
-    private readonly nobleClient;
-    get type(): ChannelType;
-    private readonly recordWaiters;
-    private readonly discoveredMatterDevices;
+    #private;
+    readonly type = ChannelType.BLE;
     constructor(nobleClient: NobleBleClient);
     getDiscoveredDevice(address: string): DiscoveredBleDevice;
-    /**
-     * Registers a deferred promise for a specific queryId together with a timeout and return the promise.
-     * The promise will be resolved when the timer runs out latest.
-     */
-    private registerWaiterPromise;
-    /**
-     * Remove a waiter promise for a specific queryId and stop the connected timer. If required also resolve the
-     * promise.
-     */
-    private finishWaiter;
-    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers): void;
-    private handleDiscoveredDevice;
-    private findCommissionableQueryIdentifier;
-    /**
-     * Builds an identifier string for commissionable queries based on the given identifier object.
-     * Some identifiers are identical to the official DNS-SD identifiers, others are custom.
-     */
-    private buildCommissionableQueryIdentifier;
-    private getCommissionableDevices;
+    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers, resolvePromise?: boolean): void;
     findOperationalDevice(): Promise<undefined>;
     getDiscoveredOperationalDevice(): undefined;
     findCommissionableDevices(identifier: CommissionableDeviceIdentifiers, timeoutSeconds?: number, ignoreExistingRecords?: boolean): Promise<CommissionableDevice[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../src/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAS,WAAW,EAAkD,MAAM,UAAU,CAAC;AAC9F,OAAO,EAAsB,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAEF,KAAK,wBAAwB,GAAG,oBAAoB,GAAG;IACnD,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,UAAW,YAAW,OAAO;IAe1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAdxC,IAAI,IAAI,gBAEP;IAED,OAAO,CAAC,QAAQ,CAAC,aAAa,CAO1B;IACJ,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA0C;gBAErD,WAAW,EAAE,cAAc;IAMjD,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB;IAQhE;;;OAGG;YACW,qBAAqB;IAiBnC;;;OAGG;IACH,OAAO,CAAC,YAAY;IAapB,mCAAmC,CAAC,UAAU,EAAE,+BAA+B;IAK/E,OAAO,CAAC,sBAAsB;IAuC9B,OAAO,CAAC,iCAAiC;IAmCzC;;;OAGG;IACH,OAAO,CAAC,kCAAkC;IAa1C,OAAO,CAAC,wBAAwB;IA4B1B,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAKjD,8BAA8B,IAAI,SAAS;IAKrC,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,cAAc,SAAK,EACnB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqB5B,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IA0ClC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE;IAIjG,KAAK;CAMd"}
+{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../src/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAS,WAAW,EAAkD,MAAM,UAAU,CAAC;AAC9F,OAAO,EAAsB,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAEF,KAAK,wBAAwB,GAAG,oBAAoB,GAAG;IACnD,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;gBAcpB,WAAW,EAAE,cAAc;IAOhC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB;IAoDhE,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO;IA8HhG,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAKjD,8BAA8B,IAAI,SAAS;IAKrC,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,cAAc,SAAK,EACnB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqB5B,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAmDlC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE;IAIjG,KAAK;CAMd"}

package/dist/cjs/BleScanner.js

@@ -31,19 +31,18 @@ var import_types = require("#types");
  */
 const logger = import_general.Logger.get("BleScanner");
 class BleScanner {
+  type = import_general.ChannelType.BLE;
+  #nobleClient;
+  #recordWaiters = /* @__PURE__ */ new Map();
+  #discoveredMatterDevices = /* @__PURE__ */ new Map();
   constructor(nobleClient) {
-    this.nobleClient = nobleClient;
-    this.nobleClient.setDiscoveryCallback(
-      (address, manufacturerData) => this.handleDiscoveredDevice(address, manufacturerData)
+    this.#nobleClient = nobleClient;
+    this.#nobleClient.setDiscoveryCallback(
+      (address, manufacturerData) => this.#handleDiscoveredDevice(address, manufacturerData)
     );
   }
-  get type() {
-    return import_general.ChannelType.BLE;
-  }
-  recordWaiters = /* @__PURE__ */ new Map();
-  discoveredMatterDevices = /* @__PURE__ */ new Map();
   getDiscoveredDevice(address) {
-    const device = this.discoveredMatterDevices.get(address);
+    const device = this.#discoveredMatterDevices.get(address);
     if (device === void 0) {
       throw new import_protocol.BleError(`No device found for address ${address}`);
     }
@@ -53,17 +52,16 @@ class BleScanner {
    * Registers a deferred promise for a specific queryId together with a timeout and return the promise.
    * The promise will be resolved when the timer runs out latest.
    */
-  async registerWaiterPromise(queryId, timeoutSeconds, resolveOnUpdatedRecords = true) {
+  async #registerWaiterPromise(queryId, timeoutSeconds, resolveOnUpdatedRecords = true, cancelResolver) {
     const { promise, resolver } = (0, import_general.createPromise)();
     let timer;
     if (timeoutSeconds !== void 0) {
-      timer = import_general.Time.getTimer(
-        "BLE query timeout",
-        timeoutSeconds * 1e3,
-        () => this.finishWaiter(queryId, true)
-      ).start();
+      timer = import_general.Time.getTimer("BLE query timeout", timeoutSeconds * 1e3, () => {
+        cancelResolver?.();
+        this.#finishWaiter(queryId, true);
+      }).start();
     }
-    this.recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords });
+    this.#recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords, cancelResolver });
     logger.debug(
       `Registered waiter for query ${queryId} with timeout ${timeoutSeconds} seconds${resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"}`
     );
@@ -73,8 +71,8 @@ class BleScanner {
    * Remove a waiter promise for a specific queryId and stop the connected timer. If required also resolve the
    * promise.
    */
-  finishWaiter(queryId, resolvePromise, isUpdatedRecord = false) {
-    const waiter = this.recordWaiters.get(queryId);
+  #finishWaiter(queryId, resolvePromise, isUpdatedRecord = false) {
+    const waiter = this.#recordWaiters.get(queryId);
     if (waiter === void 0) return;
     const { timer, resolver, resolveOnUpdatedRecords } = waiter;
     if (isUpdatedRecord && !resolveOnUpdatedRecords) return;
@@ -83,17 +81,16 @@ class BleScanner {
     if (resolvePromise) {
       resolver();
     }
-    this.recordWaiters.delete(queryId);
+    this.#recordWaiters.delete(queryId);
   }
-  cancelCommissionableDeviceDiscovery(identifier) {
-    const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-    this.finishWaiter(queryKey, true);
+  cancelCommissionableDeviceDiscovery(identifier, resolvePromise = true) {
+    const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+    const { cancelResolver } = this.#recordWaiters.get(queryKey) ?? {};
+    cancelResolver?.();
+    this.#finishWaiter(queryKey, resolvePromise);
   }
-  handleDiscoveredDevice(peripheral, manufacturerServiceData) {
+  #handleDiscoveredDevice(peripheral, manufacturerServiceData) {
     const address = peripheral.address;
-    logger.debug(
-      `Discovered device ${address} ${manufacturerServiceData === void 0 ? void 0 : import_general.Bytes.toHex(manufacturerServiceData)}`
-    );
     try {
       const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } = import_protocol.BtpCodec.decodeBleAdvertisementServiceData(manufacturerServiceData);
       const deviceData = {
@@ -105,49 +102,51 @@ class BleScanner {
         // Can be no other mode,
         addresses: [{ type: "ble", peripheralAddress: address }]
       };
-      const deviceExisting = this.discoveredMatterDevices.has(address);
+      const deviceExisting = this.#discoveredMatterDevices.has(address);
       logger.debug(
         `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${import_general.Diagnostic.json(deviceData)}`
       );
-      this.discoveredMatterDevices.set(address, {
+      this.#discoveredMatterDevices.set(address, {
         deviceData,
         peripheral,
         hasAdditionalAdvertisementData
       });
-      const queryKey = this.findCommissionableQueryIdentifier(deviceData);
+      const queryKey = this.#findCommissionableQueryIdentifier(deviceData);
       if (queryKey !== void 0) {
-        this.finishWaiter(queryKey, true, deviceExisting);
+        this.#finishWaiter(queryKey, true, deviceExisting);
       }
     } catch (error) {
-      logger.debug(`Seems not to be a valid Matter device: Failed to decode device data: ${error}`);
+      logger.debug(
+        `Discovered device ${address} ${manufacturerServiceData === void 0 ? void 0 : import_general.Bytes.toHex(manufacturerServiceData)} does not seem to be a valid Matter device: ${error}`
+      );
     }
   }
-  findCommissionableQueryIdentifier(record) {
-    const longDiscriminatorQueryId = this.buildCommissionableQueryIdentifier({ longDiscriminator: record.D });
-    if (this.recordWaiters.has(longDiscriminatorQueryId)) {
+  #findCommissionableQueryIdentifier(record) {
+    const longDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ longDiscriminator: record.D });
+    if (this.#recordWaiters.has(longDiscriminatorQueryId)) {
       return longDiscriminatorQueryId;
     }
-    const shortDiscriminatorQueryId = this.buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
-    if (this.recordWaiters.has(shortDiscriminatorQueryId)) {
+    const shortDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
+    if (this.#recordWaiters.has(shortDiscriminatorQueryId)) {
       return shortDiscriminatorQueryId;
     }
     if (record.VP !== void 0) {
-      const vendorIdQueryId = this.buildCommissionableQueryIdentifier({
+      const vendorIdQueryId = this.#buildCommissionableQueryIdentifier({
         vendorId: (0, import_types.VendorId)(parseInt(record.VP.split("+")[0]))
       });
-      if (this.recordWaiters.has(vendorIdQueryId)) {
+      if (this.#recordWaiters.has(vendorIdQueryId)) {
         return vendorIdQueryId;
       }
       if (record.VP.includes("+")) {
-        const productIdQueryId = this.buildCommissionableQueryIdentifier({
+        const productIdQueryId = this.#buildCommissionableQueryIdentifier({
           vendorId: (0, import_types.VendorId)(parseInt(record.VP.split("+")[1]))
         });
-        if (this.recordWaiters.has(productIdQueryId)) {
+        if (this.#recordWaiters.has(productIdQueryId)) {
           return productIdQueryId;
         }
       }
     }
-    if (this.recordWaiters.has("*")) {
+    if (this.#recordWaiters.has("*")) {
       return "*";
     }
     return void 0;
@@ -156,7 +155,7 @@ class BleScanner {
    * Builds an identifier string for commissionable queries based on the given identifier object.
    * Some identifiers are identical to the official DNS-SD identifiers, others are custom.
    */
-  buildCommissionableQueryIdentifier(identifier) {
+  #buildCommissionableQueryIdentifier(identifier) {
     if ("longDiscriminator" in identifier) {
       return `D:${identifier.longDiscriminator}`;
     } else if ("shortDiscriminator" in identifier) {
@@ -167,8 +166,8 @@ class BleScanner {
       return `P:${identifier.productId}`;
     } else return "*";
   }
-  getCommissionableDevices(identifier) {
-    const storedRecords = Array.from(this.discoveredMatterDevices.values());
+  #getCommissionableDevices(identifier) {
+    const storedRecords = Array.from(this.#discoveredMatterDevices.values());
     const foundRecords = new Array();
     if ("longDiscriminator" in identifier) {
       foundRecords.push(...storedRecords.filter(({ deviceData: { D } }) => D === identifier.longDiscriminator));
@@ -200,39 +199,47 @@ class BleScanner {
     return void 0;
   }
   async findCommissionableDevices(identifier, timeoutSeconds = 10, ignoreExistingRecords = false) {
-    let storedRecords = this.getCommissionableDevices(identifier);
+    let storedRecords = this.#getCommissionableDevices(identifier);
     if (ignoreExistingRecords) {
       for (const record of storedRecords) {
-        this.discoveredMatterDevices.delete(record.peripheral.address);
+        this.#discoveredMatterDevices.delete(record.peripheral.address);
       }
       storedRecords = [];
     }
     if (storedRecords.length === 0) {
-      const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-      await this.nobleClient.startScanning();
-      await this.registerWaiterPromise(queryKey, timeoutSeconds);
-      storedRecords = this.getCommissionableDevices(identifier);
-      await this.nobleClient.stopScanning();
+      const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+      await this.#nobleClient.startScanning();
+      await this.#registerWaiterPromise(queryKey, timeoutSeconds);
+      storedRecords = this.#getCommissionableDevices(identifier);
+      await this.#nobleClient.stopScanning();
     }
     return storedRecords.map(({ deviceData }) => deviceData);
   }
   async findCommissionableDevicesContinuously(identifier, callback, timeoutSeconds, cancelSignal) {
     const discoveredDevices = /* @__PURE__ */ new Set();
     const discoveryEndTime = timeoutSeconds ? import_general.Time.nowMs() + timeoutSeconds * 1e3 : void 0;
-    const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-    await this.nobleClient.startScanning();
+    const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+    await this.#nobleClient.startScanning();
+    let queryResolver;
+    if (cancelSignal === void 0) {
+      const { promise, resolver } = (0, import_general.createPromise)();
+      cancelSignal = promise;
+      queryResolver = resolver;
+    }
     let canceled = false;
     cancelSignal?.then(
       () => {
         canceled = true;
-        this.finishWaiter(queryKey, true);
+        if (queryResolver === void 0) {
+          this.#finishWaiter(queryKey, true);
+        }
       },
       (cause) => {
         logger.error("Unexpected error canceling commissioning", cause);
       }
     );
     while (!canceled) {
-      this.getCommissionableDevices(identifier).forEach(({ deviceData }) => {
+      this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
         const { deviceIdentifier } = deviceData;
         if (!discoveredDevices.has(deviceIdentifier)) {
           discoveredDevices.add(deviceIdentifier);
@@ -241,24 +248,23 @@ class BleScanner {
       });
       let remainingTime;
       if (discoveryEndTime !== void 0) {
-        const remainingTime2 = Math.ceil((discoveryEndTime - import_general.Time.nowMs()) / 1e3);
-        if (remainingTime2 <= 0) {
+        remainingTime = Math.ceil((discoveryEndTime - import_general.Time.nowMs()) / 1e3);
+        if (remainingTime <= 0) {
           break;
         }
       }
-      const waiter = this.registerWaiterPromise(queryKey, remainingTime, false);
-      await waiter;
+      await this.#registerWaiterPromise(queryKey, remainingTime, false, queryResolver);
     }
-    await this.nobleClient.stopScanning();
-    return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+    await this.#nobleClient.stopScanning();
+    return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
   }
   getDiscoveredCommissionableDevices(identifier) {
-    return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+    return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
   }
   async close() {
-    this.nobleClient.close();
-    [...this.recordWaiters.keys()].forEach(
-      (queryId) => this.finishWaiter(queryId, !!this.recordWaiters.get(queryId)?.timer)
+    this.#nobleClient.close();
+    [...this.#recordWaiters.keys()].forEach(
+      (queryId) => this.#finishWaiter(queryId, !!this.#recordWaiters.get(queryId)?.timer)
     );
   }
 }

package/dist/cjs/BleScanner.js.map

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

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,EAAS,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,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;gBAGnG,OAAO,CAAC,EAAE,UAAU;IAqCzB,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,KAAK,IAAI;IAOvF,aAAa;IAgBb,YAAY;IASzB,OAAO,CAAC,sBAAsB;IAsC9B,KAAK;CAgBR"}
+{"version":3,"file":"NobleBleClient.d.ts","sourceRoot":"","sources":["../../src/NobleBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAS,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,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;gBAGnG,OAAO,CAAC,EAAE,UAAU;IAqCzB,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,KAAK,IAAI;IAOvF,aAAa;IAcb,YAAY;IASzB,OAAO,CAAC,sBAAsB;IAsC9B,KAAK;CAgBR"}

package/dist/cjs/NobleBleClient.js

@@ -85,7 +85,7 @@ class NobleBleClient {
     this.shouldScan = true;
     if (this.nobleState === "poweredOn") {
       logger.debug("Start BLE scanning for Matter Services ...");
-      await noble.startScanningAsync(process.platform !== "win32" ? [import_protocol.BLE_MATTER_SERVICE_UUID] : void 0, true);
+      await noble.startScanningAsync([import_protocol.BLE_MATTER_SERVICE_UUID], true);
     } else {
       logger.debug("noble state is not poweredOn ... delay scanning till poweredOn");
     }

package/dist/cjs/NobleBleClient.js.map

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

package/dist/esm/BleScanner.d.ts

@@ -16,31 +16,11 @@ type CommissionableDeviceData = CommissionableDevice & {
     SD: number;
 };
 export declare class BleScanner implements Scanner {
-    private readonly nobleClient;
-    get type(): ChannelType;
-    private readonly recordWaiters;
-    private readonly discoveredMatterDevices;
+    #private;
+    readonly type = ChannelType.BLE;
     constructor(nobleClient: NobleBleClient);
     getDiscoveredDevice(address: string): DiscoveredBleDevice;
-    /**
-     * Registers a deferred promise for a specific queryId together with a timeout and return the promise.
-     * The promise will be resolved when the timer runs out latest.
-     */
-    private registerWaiterPromise;
-    /**
-     * Remove a waiter promise for a specific queryId and stop the connected timer. If required also resolve the
-     * promise.
-     */
-    private finishWaiter;
-    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers): void;
-    private handleDiscoveredDevice;
-    private findCommissionableQueryIdentifier;
-    /**
-     * Builds an identifier string for commissionable queries based on the given identifier object.
-     * Some identifiers are identical to the official DNS-SD identifiers, others are custom.
-     */
-    private buildCommissionableQueryIdentifier;
-    private getCommissionableDevices;
+    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers, resolvePromise?: boolean): void;
     findOperationalDevice(): Promise<undefined>;
     getDiscoveredOperationalDevice(): undefined;
     findCommissionableDevices(identifier: CommissionableDeviceIdentifiers, timeoutSeconds?: number, ignoreExistingRecords?: boolean): Promise<CommissionableDevice[]>;

package/dist/esm/BleScanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../src/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAS,WAAW,EAAkD,MAAM,UAAU,CAAC;AAC9F,OAAO,EAAsB,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAEF,KAAK,wBAAwB,GAAG,oBAAoB,GAAG;IACnD,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,UAAW,YAAW,OAAO;IAe1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAdxC,IAAI,IAAI,gBAEP;IAED,OAAO,CAAC,QAAQ,CAAC,aAAa,CAO1B;IACJ,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA0C;gBAErD,WAAW,EAAE,cAAc;IAMjD,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB;IAQhE;;;OAGG;YACW,qBAAqB;IAiBnC;;;OAGG;IACH,OAAO,CAAC,YAAY;IAapB,mCAAmC,CAAC,UAAU,EAAE,+BAA+B;IAK/E,OAAO,CAAC,sBAAsB;IAuC9B,OAAO,CAAC,iCAAiC;IAmCzC;;;OAGG;IACH,OAAO,CAAC,kCAAkC;IAa1C,OAAO,CAAC,wBAAwB;IA4B1B,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAKjD,8BAA8B,IAAI,SAAS;IAKrC,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,cAAc,SAAK,EACnB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqB5B,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IA0ClC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE;IAIjG,KAAK;CAMd"}
+{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../src/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAS,WAAW,EAAkD,MAAM,UAAU,CAAC;AAC9F,OAAO,EAAsB,oBAAoB,EAAE,+BAA+B,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,UAAU,EAAE,wBAAwB,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,8BAA8B,EAAE,OAAO,CAAC;CAC3C,CAAC;AAEF,KAAK,wBAAwB,GAAG,oBAAoB,GAAG;IACnD,EAAE,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,UAAW,YAAW,OAAO;;IACtC,QAAQ,CAAC,IAAI,mBAAmB;gBAcpB,WAAW,EAAE,cAAc;IAOhC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB;IAoDhE,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO;IA8HhG,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAKjD,8BAA8B,IAAI,SAAS;IAKrC,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,cAAc,SAAK,EACnB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqB5B,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAmDlC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE;IAIjG,KAAK;CAMd"}

package/dist/esm/BleScanner.js

@@ -8,19 +8,18 @@ import { BleError, BtpCodec } from "#protocol";
 import { VendorId } from "#types";
 const logger = Logger.get("BleScanner");
 class BleScanner {
+  type = ChannelType.BLE;
+  #nobleClient;
+  #recordWaiters = /* @__PURE__ */ new Map();
+  #discoveredMatterDevices = /* @__PURE__ */ new Map();
   constructor(nobleClient) {
-    this.nobleClient = nobleClient;
-    this.nobleClient.setDiscoveryCallback(
-      (address, manufacturerData) => this.handleDiscoveredDevice(address, manufacturerData)
+    this.#nobleClient = nobleClient;
+    this.#nobleClient.setDiscoveryCallback(
+      (address, manufacturerData) => this.#handleDiscoveredDevice(address, manufacturerData)
     );
   }
-  get type() {
-    return ChannelType.BLE;
-  }
-  recordWaiters = /* @__PURE__ */ new Map();
-  discoveredMatterDevices = /* @__PURE__ */ new Map();
   getDiscoveredDevice(address) {
-    const device = this.discoveredMatterDevices.get(address);
+    const device = this.#discoveredMatterDevices.get(address);
     if (device === void 0) {
       throw new BleError(`No device found for address ${address}`);
     }
@@ -30,17 +29,16 @@ class BleScanner {
    * Registers a deferred promise for a specific queryId together with a timeout and return the promise.
    * The promise will be resolved when the timer runs out latest.
    */
-  async registerWaiterPromise(queryId, timeoutSeconds, resolveOnUpdatedRecords = true) {
+  async #registerWaiterPromise(queryId, timeoutSeconds, resolveOnUpdatedRecords = true, cancelResolver) {
     const { promise, resolver } = createPromise();
     let timer;
     if (timeoutSeconds !== void 0) {
-      timer = Time.getTimer(
-        "BLE query timeout",
-        timeoutSeconds * 1e3,
-        () => this.finishWaiter(queryId, true)
-      ).start();
+      timer = Time.getTimer("BLE query timeout", timeoutSeconds * 1e3, () => {
+        cancelResolver?.();
+        this.#finishWaiter(queryId, true);
+      }).start();
     }
-    this.recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords });
+    this.#recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords, cancelResolver });
     logger.debug(
       `Registered waiter for query ${queryId} with timeout ${timeoutSeconds} seconds${resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"}`
     );
@@ -50,8 +48,8 @@ class BleScanner {
    * Remove a waiter promise for a specific queryId and stop the connected timer. If required also resolve the
    * promise.
    */
-  finishWaiter(queryId, resolvePromise, isUpdatedRecord = false) {
-    const waiter = this.recordWaiters.get(queryId);
+  #finishWaiter(queryId, resolvePromise, isUpdatedRecord = false) {
+    const waiter = this.#recordWaiters.get(queryId);
     if (waiter === void 0) return;
     const { timer, resolver, resolveOnUpdatedRecords } = waiter;
     if (isUpdatedRecord && !resolveOnUpdatedRecords) return;
@@ -60,17 +58,16 @@ class BleScanner {
     if (resolvePromise) {
       resolver();
     }
-    this.recordWaiters.delete(queryId);
+    this.#recordWaiters.delete(queryId);
   }
-  cancelCommissionableDeviceDiscovery(identifier) {
-    const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-    this.finishWaiter(queryKey, true);
+  cancelCommissionableDeviceDiscovery(identifier, resolvePromise = true) {
+    const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+    const { cancelResolver } = this.#recordWaiters.get(queryKey) ?? {};
+    cancelResolver?.();
+    this.#finishWaiter(queryKey, resolvePromise);
   }
-  handleDiscoveredDevice(peripheral, manufacturerServiceData) {
+  #handleDiscoveredDevice(peripheral, manufacturerServiceData) {
     const address = peripheral.address;
-    logger.debug(
-      `Discovered device ${address} ${manufacturerServiceData === void 0 ? void 0 : Bytes.toHex(manufacturerServiceData)}`
-    );
     try {
       const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } = BtpCodec.decodeBleAdvertisementServiceData(manufacturerServiceData);
       const deviceData = {
@@ -82,49 +79,51 @@ class BleScanner {
         // Can be no other mode,
         addresses: [{ type: "ble", peripheralAddress: address }]
       };
-      const deviceExisting = this.discoveredMatterDevices.has(address);
+      const deviceExisting = this.#discoveredMatterDevices.has(address);
       logger.debug(
         `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${Diagnostic.json(deviceData)}`
       );
-      this.discoveredMatterDevices.set(address, {
+      this.#discoveredMatterDevices.set(address, {
         deviceData,
         peripheral,
         hasAdditionalAdvertisementData
       });
-      const queryKey = this.findCommissionableQueryIdentifier(deviceData);
+      const queryKey = this.#findCommissionableQueryIdentifier(deviceData);
       if (queryKey !== void 0) {
-        this.finishWaiter(queryKey, true, deviceExisting);
+        this.#finishWaiter(queryKey, true, deviceExisting);
       }
     } catch (error) {
-      logger.debug(`Seems not to be a valid Matter device: Failed to decode device data: ${error}`);
+      logger.debug(
+        `Discovered device ${address} ${manufacturerServiceData === void 0 ? void 0 : Bytes.toHex(manufacturerServiceData)} does not seem to be a valid Matter device: ${error}`
+      );
     }
   }
-  findCommissionableQueryIdentifier(record) {
-    const longDiscriminatorQueryId = this.buildCommissionableQueryIdentifier({ longDiscriminator: record.D });
-    if (this.recordWaiters.has(longDiscriminatorQueryId)) {
+  #findCommissionableQueryIdentifier(record) {
+    const longDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ longDiscriminator: record.D });
+    if (this.#recordWaiters.has(longDiscriminatorQueryId)) {
       return longDiscriminatorQueryId;
     }
-    const shortDiscriminatorQueryId = this.buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
-    if (this.recordWaiters.has(shortDiscriminatorQueryId)) {
+    const shortDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
+    if (this.#recordWaiters.has(shortDiscriminatorQueryId)) {
       return shortDiscriminatorQueryId;
     }
     if (record.VP !== void 0) {
-      const vendorIdQueryId = this.buildCommissionableQueryIdentifier({
+      const vendorIdQueryId = this.#buildCommissionableQueryIdentifier({
         vendorId: VendorId(parseInt(record.VP.split("+")[0]))
       });
-      if (this.recordWaiters.has(vendorIdQueryId)) {
+      if (this.#recordWaiters.has(vendorIdQueryId)) {
         return vendorIdQueryId;
       }
       if (record.VP.includes("+")) {
-        const productIdQueryId = this.buildCommissionableQueryIdentifier({
+        const productIdQueryId = this.#buildCommissionableQueryIdentifier({
           vendorId: VendorId(parseInt(record.VP.split("+")[1]))
         });
-        if (this.recordWaiters.has(productIdQueryId)) {
+        if (this.#recordWaiters.has(productIdQueryId)) {
           return productIdQueryId;
         }
       }
     }
-    if (this.recordWaiters.has("*")) {
+    if (this.#recordWaiters.has("*")) {
       return "*";
     }
     return void 0;
@@ -133,7 +132,7 @@ class BleScanner {
    * Builds an identifier string for commissionable queries based on the given identifier object.
    * Some identifiers are identical to the official DNS-SD identifiers, others are custom.
    */
-  buildCommissionableQueryIdentifier(identifier) {
+  #buildCommissionableQueryIdentifier(identifier) {
     if ("longDiscriminator" in identifier) {
       return `D:${identifier.longDiscriminator}`;
     } else if ("shortDiscriminator" in identifier) {
@@ -144,8 +143,8 @@ class BleScanner {
       return `P:${identifier.productId}`;
     } else return "*";
   }
-  getCommissionableDevices(identifier) {
-    const storedRecords = Array.from(this.discoveredMatterDevices.values());
+  #getCommissionableDevices(identifier) {
+    const storedRecords = Array.from(this.#discoveredMatterDevices.values());
     const foundRecords = new Array();
     if ("longDiscriminator" in identifier) {
       foundRecords.push(...storedRecords.filter(({ deviceData: { D } }) => D === identifier.longDiscriminator));
@@ -177,39 +176,47 @@ class BleScanner {
     return void 0;
   }
   async findCommissionableDevices(identifier, timeoutSeconds = 10, ignoreExistingRecords = false) {
-    let storedRecords = this.getCommissionableDevices(identifier);
+    let storedRecords = this.#getCommissionableDevices(identifier);
     if (ignoreExistingRecords) {
       for (const record of storedRecords) {
-        this.discoveredMatterDevices.delete(record.peripheral.address);
+        this.#discoveredMatterDevices.delete(record.peripheral.address);
       }
       storedRecords = [];
     }
     if (storedRecords.length === 0) {
-      const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-      await this.nobleClient.startScanning();
-      await this.registerWaiterPromise(queryKey, timeoutSeconds);
-      storedRecords = this.getCommissionableDevices(identifier);
-      await this.nobleClient.stopScanning();
+      const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+      await this.#nobleClient.startScanning();
+      await this.#registerWaiterPromise(queryKey, timeoutSeconds);
+      storedRecords = this.#getCommissionableDevices(identifier);
+      await this.#nobleClient.stopScanning();
     }
     return storedRecords.map(({ deviceData }) => deviceData);
   }
   async findCommissionableDevicesContinuously(identifier, callback, timeoutSeconds, cancelSignal) {
     const discoveredDevices = /* @__PURE__ */ new Set();
     const discoveryEndTime = timeoutSeconds ? Time.nowMs() + timeoutSeconds * 1e3 : void 0;
-    const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-    await this.nobleClient.startScanning();
+    const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+    await this.#nobleClient.startScanning();
+    let queryResolver;
+    if (cancelSignal === void 0) {
+      const { promise, resolver } = createPromise();
+      cancelSignal = promise;
+      queryResolver = resolver;
+    }
     let canceled = false;
     cancelSignal?.then(
       () => {
         canceled = true;
-        this.finishWaiter(queryKey, true);
+        if (queryResolver === void 0) {
+          this.#finishWaiter(queryKey, true);
+        }
       },
       (cause) => {
         logger.error("Unexpected error canceling commissioning", cause);
       }
     );
     while (!canceled) {
-      this.getCommissionableDevices(identifier).forEach(({ deviceData }) => {
+      this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
         const { deviceIdentifier } = deviceData;
         if (!discoveredDevices.has(deviceIdentifier)) {
           discoveredDevices.add(deviceIdentifier);
@@ -218,24 +225,23 @@ class BleScanner {
       });
       let remainingTime;
       if (discoveryEndTime !== void 0) {
-        const remainingTime2 = Math.ceil((discoveryEndTime - Time.nowMs()) / 1e3);
-        if (remainingTime2 <= 0) {
+        remainingTime = Math.ceil((discoveryEndTime - Time.nowMs()) / 1e3);
+        if (remainingTime <= 0) {
           break;
         }
       }
-      const waiter = this.registerWaiterPromise(queryKey, remainingTime, false);
-      await waiter;
+      await this.#registerWaiterPromise(queryKey, remainingTime, false, queryResolver);
     }
-    await this.nobleClient.stopScanning();
-    return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+    await this.#nobleClient.stopScanning();
+    return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
   }
   getDiscoveredCommissionableDevices(identifier) {
-    return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+    return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
   }
   async close() {
-    this.nobleClient.close();
-    [...this.recordWaiters.keys()].forEach(
-      (queryId) => this.finishWaiter(queryId, !!this.recordWaiters.get(queryId)?.timer)
+    this.#nobleClient.close();
+    [...this.#recordWaiters.keys()].forEach(
+      (queryId) => this.#finishWaiter(queryId, !!this.#recordWaiters.get(queryId)?.timer)
     );
   }
 }

package/dist/esm/BleScanner.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"NobleBleClient.d.ts","sourceRoot":"","sources":["../../src/NobleBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAS,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,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;gBAGnG,OAAO,CAAC,EAAE,UAAU;IAqCzB,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,KAAK,IAAI;IAOvF,aAAa;IAgBb,YAAY;IASzB,OAAO,CAAC,sBAAsB;IAsC9B,KAAK;CAgBR"}
+{"version":3,"file":"NobleBleClient.d.ts","sourceRoot":"","sources":["../../src/NobleBleClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAS,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3D,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;gBAGnG,OAAO,CAAC,EAAE,UAAU;IAqCzB,oBAAoB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,UAAU,KAAK,IAAI;IAOvF,aAAa;IAcb,YAAY;IASzB,OAAO,CAAC,sBAAsB;IAsC9B,KAAK;CAgBR"}

package/dist/esm/NobleBleClient.js

@@ -62,7 +62,7 @@ class NobleBleClient {
     this.shouldScan = true;
     if (this.nobleState === "poweredOn") {
       logger.debug("Start BLE scanning for Matter Services ...");
-      await noble.startScanningAsync(process.platform !== "win32" ? [BLE_MATTER_SERVICE_UUID] : void 0, true);
+      await noble.startScanningAsync([BLE_MATTER_SERVICE_UUID], true);
     } else {
       logger.debug("noble state is not poweredOn ... delay scanning till poweredOn");
     }

package/dist/esm/NobleBleClient.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/nodejs-ble",
-    "version": "0.14.1-alpha.0-20250607-a93593303",
+    "version": "0.15.0-alpha.0-20250613-a55f991d4",
     "description": "Matter BLE support for node.js",
     "keywords": [
         "iot",
@@ -28,12 +28,12 @@
         "build-clean": "matter-build --clean"
     },
     "dependencies": {
-        "@matter/general": "0.14.1-alpha.0-20250607-a93593303",
-        "@matter/protocol": "0.14.1-alpha.0-20250607-a93593303",
-        "@matter/types": "0.14.1-alpha.0-20250607-a93593303"
+        "@matter/general": "0.15.0-alpha.0-20250613-a55f991d4",
+        "@matter/protocol": "0.15.0-alpha.0-20250613-a55f991d4",
+        "@matter/types": "0.15.0-alpha.0-20250613-a55f991d4"
     },
     "devDependencies": {
-        "@matter/tools": "0.14.1-alpha.0-20250607-a93593303"
+        "@matter/tools": "0.15.0-alpha.0-20250613-a55f991d4"
     },
     "optionalDependencies": {
         "@stoprocent/bleno": "^0.11.4",

package/src/BleScanner.ts

@@ -23,28 +23,29 @@ type CommissionableDeviceData = CommissionableDevice & {
 };
 
 export class BleScanner implements Scanner {
-    get type() {
-        return ChannelType.BLE;
-    }
+    readonly type = ChannelType.BLE;
 
-    private readonly recordWaiters = new Map<
+    readonly #nobleClient: NobleBleClient;
+    readonly #recordWaiters = new Map<
         string,
         {
             resolver: () => void;
             timer?: Timer;
             resolveOnUpdatedRecords: boolean;
+            cancelResolver?: (value: void) => void;
         }
     >();
-    private readonly discoveredMatterDevices = new Map<string, DiscoveredBleDevice>();
+    readonly #discoveredMatterDevices = new Map<string, DiscoveredBleDevice>();
 
-    constructor(private readonly nobleClient: NobleBleClient) {
-        this.nobleClient.setDiscoveryCallback((address, manufacturerData) =>
-            this.handleDiscoveredDevice(address, manufacturerData),
+    constructor(nobleClient: NobleBleClient) {
+        this.#nobleClient = nobleClient;
+        this.#nobleClient.setDiscoveryCallback((address, manufacturerData) =>
+            this.#handleDiscoveredDevice(address, manufacturerData),
         );
     }
 
     public getDiscoveredDevice(address: string): DiscoveredBleDevice {
-        const device = this.discoveredMatterDevices.get(address);
+        const device = this.#discoveredMatterDevices.get(address);
         if (device === undefined) {
             throw new BleError(`No device found for address ${address}`);
         }
@@ -55,15 +56,21 @@ export class BleScanner implements Scanner {
      * Registers a deferred promise for a specific queryId together with a timeout and return the promise.
      * The promise will be resolved when the timer runs out latest.
      */
-    private async registerWaiterPromise(queryId: string, timeoutSeconds?: number, resolveOnUpdatedRecords = true) {
+    async #registerWaiterPromise(
+        queryId: string,
+        timeoutSeconds?: number,
+        resolveOnUpdatedRecords = true,
+        cancelResolver?: (value: void) => void,
+    ) {
         const { promise, resolver } = createPromise<void>();
         let timer;
         if (timeoutSeconds !== undefined) {
-            timer = Time.getTimer("BLE query timeout", timeoutSeconds * 1000, () =>
-                this.finishWaiter(queryId, true),
-            ).start();
+            timer = Time.getTimer("BLE query timeout", timeoutSeconds * 1000, () => {
+                cancelResolver?.();
+                this.#finishWaiter(queryId, true);
+            }).start();
         }
-        this.recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords });
+        this.#recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords, cancelResolver });
         logger.debug(
             `Registered waiter for query ${queryId} with timeout ${timeoutSeconds} seconds${
                 resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"
@@ -76,8 +83,8 @@ export class BleScanner implements Scanner {
      * Remove a waiter promise for a specific queryId and stop the connected timer. If required also resolve the
      * promise.
      */
-    private finishWaiter(queryId: string, resolvePromise: boolean, isUpdatedRecord = false) {
-        const waiter = this.recordWaiters.get(queryId);
+    #finishWaiter(queryId: string, resolvePromise: boolean, isUpdatedRecord = false) {
+        const waiter = this.#recordWaiters.get(queryId);
         if (waiter === undefined) return;
         const { timer, resolver, resolveOnUpdatedRecords } = waiter;
         if (isUpdatedRecord && !resolveOnUpdatedRecords) return;
@@ -86,19 +93,19 @@ export class BleScanner implements Scanner {
         if (resolvePromise) {
             resolver();
         }
-        this.recordWaiters.delete(queryId);
+        this.#recordWaiters.delete(queryId);
     }
 
-    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers) {
-        const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-        this.finishWaiter(queryKey, true);
+    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers, resolvePromise = true) {
+        const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+        const { cancelResolver } = this.#recordWaiters.get(queryKey) ?? {};
+        // Mark as canceled to not loop further in discovery, if cancel-resolver is used
+        cancelResolver?.();
+        this.#finishWaiter(queryKey, resolvePromise);
     }
 
-    private handleDiscoveredDevice(peripheral: Peripheral, manufacturerServiceData: Uint8Array) {
+    #handleDiscoveredDevice(peripheral: Peripheral, manufacturerServiceData: Uint8Array) {
         const address = peripheral.address;
-        logger.debug(
-            `Discovered device ${address} ${manufacturerServiceData === undefined ? undefined : Bytes.toHex(manufacturerServiceData)}`,
-        );
 
         try {
             const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } =
@@ -112,56 +119,58 @@ export class BleScanner implements Scanner {
                 CM: 1, // Can be no other mode,
                 addresses: [{ type: "ble", peripheralAddress: address }],
             };
-            const deviceExisting = this.discoveredMatterDevices.has(address);
+            const deviceExisting = this.#discoveredMatterDevices.has(address);
 
             logger.debug(
                 `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${Diagnostic.json(deviceData)}`,
             );
 
-            this.discoveredMatterDevices.set(address, {
+            this.#discoveredMatterDevices.set(address, {
                 deviceData,
                 peripheral,
                 hasAdditionalAdvertisementData,
             });
 
-            const queryKey = this.findCommissionableQueryIdentifier(deviceData);
+            const queryKey = this.#findCommissionableQueryIdentifier(deviceData);
             if (queryKey !== undefined) {
-                this.finishWaiter(queryKey, true, deviceExisting);
+                this.#finishWaiter(queryKey, true, deviceExisting);
             }
         } catch (error) {
-            logger.debug(`Seems not to be a valid Matter device: Failed to decode device data: ${error}`);
+            logger.debug(
+                `Discovered device ${address} ${manufacturerServiceData === undefined ? undefined : Bytes.toHex(manufacturerServiceData)} does not seem to be a valid Matter device: ${error}`,
+            );
         }
     }
 
-    private findCommissionableQueryIdentifier(record: CommissionableDeviceData) {
-        const longDiscriminatorQueryId = this.buildCommissionableQueryIdentifier({ longDiscriminator: record.D });
-        if (this.recordWaiters.has(longDiscriminatorQueryId)) {
+    #findCommissionableQueryIdentifier(record: CommissionableDeviceData) {
+        const longDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ longDiscriminator: record.D });
+        if (this.#recordWaiters.has(longDiscriminatorQueryId)) {
             return longDiscriminatorQueryId;
         }
 
-        const shortDiscriminatorQueryId = this.buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
-        if (this.recordWaiters.has(shortDiscriminatorQueryId)) {
+        const shortDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
+        if (this.#recordWaiters.has(shortDiscriminatorQueryId)) {
             return shortDiscriminatorQueryId;
         }
 
         if (record.VP !== undefined) {
-            const vendorIdQueryId = this.buildCommissionableQueryIdentifier({
+            const vendorIdQueryId = this.#buildCommissionableQueryIdentifier({
                 vendorId: VendorId(parseInt(record.VP.split("+")[0])),
             });
-            if (this.recordWaiters.has(vendorIdQueryId)) {
+            if (this.#recordWaiters.has(vendorIdQueryId)) {
                 return vendorIdQueryId;
             }
             if (record.VP.includes("+")) {
-                const productIdQueryId = this.buildCommissionableQueryIdentifier({
+                const productIdQueryId = this.#buildCommissionableQueryIdentifier({
                     vendorId: VendorId(parseInt(record.VP.split("+")[1])),
                 });
-                if (this.recordWaiters.has(productIdQueryId)) {
+                if (this.#recordWaiters.has(productIdQueryId)) {
                     return productIdQueryId;
                 }
             }
         }
 
-        if (this.recordWaiters.has("*")) {
+        if (this.#recordWaiters.has("*")) {
             return "*";
         }
 
@@ -172,7 +181,7 @@ export class BleScanner implements Scanner {
      * Builds an identifier string for commissionable queries based on the given identifier object.
      * Some identifiers are identical to the official DNS-SD identifiers, others are custom.
      */
-    private buildCommissionableQueryIdentifier(identifier: CommissionableDeviceIdentifiers) {
+    #buildCommissionableQueryIdentifier(identifier: CommissionableDeviceIdentifiers) {
         if ("longDiscriminator" in identifier) {
             return `D:${identifier.longDiscriminator}`;
         } else if ("shortDiscriminator" in identifier) {
@@ -185,8 +194,8 @@ export class BleScanner implements Scanner {
         } else return "*";
     }
 
-    private getCommissionableDevices(identifier: CommissionableDeviceIdentifiers) {
-        const storedRecords = Array.from(this.discoveredMatterDevices.values());
+    #getCommissionableDevices(identifier: CommissionableDeviceIdentifiers) {
+        const storedRecords = Array.from(this.#discoveredMatterDevices.values());
 
         const foundRecords = new Array<DiscoveredBleDevice>();
         if ("longDiscriminator" in identifier) {
@@ -228,22 +237,22 @@ export class BleScanner implements Scanner {
         timeoutSeconds = 10,
         ignoreExistingRecords = false,
     ): Promise<CommissionableDevice[]> {
-        let storedRecords = this.getCommissionableDevices(identifier);
+        let storedRecords = this.#getCommissionableDevices(identifier);
         if (ignoreExistingRecords) {
             // We want to have a fresh discovery result, so clear out the stored records because they might be outdated
             for (const record of storedRecords) {
-                this.discoveredMatterDevices.delete(record.peripheral.address);
+                this.#discoveredMatterDevices.delete(record.peripheral.address);
             }
             storedRecords = [];
         }
         if (storedRecords.length === 0) {
-            const queryKey = this.buildCommissionableQueryIdentifier(identifier);
+            const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
 
-            await this.nobleClient.startScanning();
-            await this.registerWaiterPromise(queryKey, timeoutSeconds);
+            await this.#nobleClient.startScanning();
+            await this.#registerWaiterPromise(queryKey, timeoutSeconds);
 
-            storedRecords = this.getCommissionableDevices(identifier);
-            await this.nobleClient.stopScanning();
+            storedRecords = this.#getCommissionableDevices(identifier);
+            await this.#nobleClient.stopScanning();
         }
         return storedRecords.map(({ deviceData }) => deviceData);
     }
@@ -257,14 +266,24 @@ export class BleScanner implements Scanner {
         const discoveredDevices = new Set<string>();
 
         const discoveryEndTime = timeoutSeconds ? Time.nowMs() + timeoutSeconds * 1000 : undefined;
-        const queryKey = this.buildCommissionableQueryIdentifier(identifier);
-        await this.nobleClient.startScanning();
+        const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+        await this.#nobleClient.startScanning();
+
+        let queryResolver: ((value: void) => void) | undefined;
+        if (cancelSignal === undefined) {
+            const { promise, resolver } = createPromise<void>();
+            cancelSignal = promise;
+            queryResolver = resolver;
+        }
 
         let canceled = false;
         cancelSignal?.then(
             () => {
                 canceled = true;
-                this.finishWaiter(queryKey, true);
+                if (queryResolver === undefined) {
+                    // Always finish when cancelSignal parameter was used, else cancelling is done separately
+                    this.#finishWaiter(queryKey, true);
+                }
             },
             cause => {
                 logger.error("Unexpected error canceling commissioning", cause);
@@ -272,7 +291,7 @@ export class BleScanner implements Scanner {
         );
 
         while (!canceled) {
-            this.getCommissionableDevices(identifier).forEach(({ deviceData }) => {
+            this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
                 const { deviceIdentifier } = deviceData;
                 if (!discoveredDevices.has(deviceIdentifier)) {
                     discoveredDevices.add(deviceIdentifier);
@@ -282,27 +301,26 @@ export class BleScanner implements Scanner {
 
             let remainingTime;
             if (discoveryEndTime !== undefined) {
-                const remainingTime = Math.ceil((discoveryEndTime - Time.nowMs()) / 1000);
+                remainingTime = Math.ceil((discoveryEndTime - Time.nowMs()) / 1000);
                 if (remainingTime <= 0) {
                     break;
                 }
             }
 
-            const waiter = this.registerWaiterPromise(queryKey, remainingTime, false);
-            await waiter;
+            await this.#registerWaiterPromise(queryKey, remainingTime, false, queryResolver);
         }
-        await this.nobleClient.stopScanning();
-        return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+        await this.#nobleClient.stopScanning();
+        return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
     }
 
     getDiscoveredCommissionableDevices(identifier: CommissionableDeviceIdentifiers): CommissionableDevice[] {
-        return this.getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+        return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
     }
 
     async close() {
-        this.nobleClient.close();
-        [...this.recordWaiters.keys()].forEach(queryId =>
-            this.finishWaiter(queryId, !!this.recordWaiters.get(queryId)?.timer),
+        this.#nobleClient.close();
+        [...this.#recordWaiters.keys()].forEach(queryId =>
+            this.#finishWaiter(queryId, !!this.#recordWaiters.get(queryId)?.timer),
         );
     }
 }

package/src/NobleBleClient.ts

@@ -90,9 +90,7 @@ export class NobleBleClient {
         this.shouldScan = true;
         if (this.nobleState === "poweredOn") {
             logger.debug("Start BLE scanning for Matter Services ...");
-            // TODO Remove this Windows hack once Noble Windows issue is fixed
-            //  see https://github.com/stoprocent/noble/issues/20
-            await noble.startScanningAsync(process.platform !== "win32" ? [BLE_MATTER_SERVICE_UUID] : undefined, true);
+            await noble.startScanningAsync([BLE_MATTER_SERVICE_UUID], true);
         } else {
             logger.debug("noble state is not poweredOn ... delay scanning till poweredOn");
         }