@matter/nodejs-ble 0.16.11-alpha.0-20260228-3ee9c97df → 0.16.11

package/dist/cjs/BleScanner.d.ts

@@ -3,17 +3,30 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BleScanner as BaseBleScanner, DiscoveredBleDevice } from "#protocol";
+import { ChannelType, Duration } from "#general";
+import { CommissionableDevice, CommissionableDeviceIdentifiers, Scanner } from "#protocol";
 import type { Peripheral } from "@stoprocent/noble";
 import { NobleBleClient } from "./NobleBleClient.js";
-export type { DiscoveredBleDevice } from "#protocol";
-export type NobleDiscoveredBleDevice = Omit<DiscoveredBleDevice, "peripheral"> & {
+export type DiscoveredBleDevice = {
+    deviceData: CommissionableDeviceData;
     peripheral: Peripheral;
+    hasAdditionalAdvertisementData: boolean;
 };
-export declare class BleScanner extends BaseBleScanner {
+type CommissionableDeviceData = CommissionableDevice & {
+    SD: number;
+};
+export declare class BleScanner implements Scanner {
     #private;
+    readonly type = ChannelType.BLE;
     constructor(nobleClient: NobleBleClient);
-    getDiscoveredDevice(address: string): NobleDiscoveredBleDevice;
-    protected closeClient(): void;
+    getDiscoveredDevice(address: string): DiscoveredBleDevice;
+    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers, resolvePromise?: boolean): void;
+    findOperationalDevice(): Promise<undefined>;
+    getDiscoveredOperationalDevice(): undefined;
+    findCommissionableDevices(identifier: CommissionableDeviceIdentifiers, timeout?: Duration, ignoreExistingRecords?: boolean): Promise<CommissionableDevice[]>;
+    findCommissionableDevicesContinuously(identifier: CommissionableDeviceIdentifiers, callback: (device: CommissionableDevice) => void, timeout?: Duration, cancelSignal?: Promise<void>): Promise<CommissionableDevice[]>;
+    getDiscoveredCommissionableDevices(identifier: CommissionableDeviceIdentifiers): CommissionableDevice[];
+    close(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=BleScanner.d.ts.map

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,EAAE,UAAU,IAAI,cAAc,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,YAAY,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErD,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,GAAG;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAE5G,qBAAa,UAAW,SAAQ,cAAc;;gBAG9B,WAAW,EAAE,cAAc;IAK9B,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,wBAAwB;cAIpD,WAAW;CAGjC"}
+{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../src/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEH,WAAW,EAGX,QAAQ,EAOX,MAAM,UAAU,CAAC;AAClB,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;IA+HhG,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAKjD,8BAA8B,IAAI,SAAS;IAKrC,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAc,EACrB,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,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAgDlC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE;IAIjG,KAAK;CAMd"}

package/dist/cjs/BleScanner.js

@@ -21,23 +21,250 @@ __export(BleScanner_exports, {
   BleScanner: () => BleScanner
 });
 module.exports = __toCommonJS(BleScanner_exports);
+var import_general = require("#general");
 var import_protocol = require("#protocol");
+var import_types = require("#types");
 /**
  * @license
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-class BleScanner extends import_protocol.BleScanner {
+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) {
-    super(nobleClient);
     this.#nobleClient = nobleClient;
+    this.#nobleClient.setDiscoveryCallback(
+      (address, manufacturerData) => this.#handleDiscoveredDevice(address, manufacturerData)
+    );
   }
   getDiscoveredDevice(address) {
-    return super.getDiscoveredDevice(address);
+    const device = this.#discoveredMatterDevices.get(address);
+    if (device === void 0) {
+      throw new import_protocol.BleError(`No device found for address ${address}`);
+    }
+    return device;
   }
-  closeClient() {
+  /**
+   * 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, timeout, resolveOnUpdatedRecords = true, cancelResolver) {
+    const { promise, resolver } = (0, import_general.createPromise)();
+    let timer;
+    if (timeout) {
+      timer = import_general.Time.getTimer("BLE query timeout", timeout, () => {
+        cancelResolver?.();
+        this.#finishWaiter(queryId, true);
+      }).start();
+    }
+    this.#recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords, cancelResolver });
+    logger.debug(
+      `Registered waiter for query ${queryId} with timeout ${timeout === void 0 ? "(none)" : import_general.Duration.format(timeout)} ${resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"}`
+    );
+    await promise;
+  }
+  /**
+   * 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);
+    if (waiter === void 0) return;
+    const { timer, resolver, resolveOnUpdatedRecords } = waiter;
+    if (isUpdatedRecord && !resolveOnUpdatedRecords) return;
+    logger.debug(`Finishing waiter for query ${queryId}, resolving: ${resolvePromise}`);
+    timer?.stop();
+    if (resolvePromise) {
+      resolver();
+    }
+    this.#recordWaiters.delete(queryId);
+  }
+  cancelCommissionableDeviceDiscovery(identifier, resolvePromise = true) {
+    const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+    const { cancelResolver } = this.#recordWaiters.get(queryKey) ?? {};
+    cancelResolver?.();
+    this.#finishWaiter(queryKey, resolvePromise);
+  }
+  #handleDiscoveredDevice(peripheral, manufacturerServiceData) {
+    const address = peripheral.address;
+    try {
+      const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } = import_protocol.BtpCodec.decodeBleAdvertisementServiceData(manufacturerServiceData);
+      const deviceData = {
+        deviceIdentifier: address,
+        D: discriminator,
+        SD: discriminator >> 8 & 15,
+        VP: `${vendorId}+${productId}`,
+        CM: 1,
+        // Can be no other mode,
+        addresses: [{ type: "ble", peripheralAddress: address }]
+      };
+      const deviceExisting = this.#discoveredMatterDevices.has(address);
+      logger.debug(
+        `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${import_general.Diagnostic.json(deviceData)}`
+      );
+      this.#discoveredMatterDevices.set(address, {
+        deviceData,
+        peripheral,
+        hasAdditionalAdvertisementData
+      });
+      const queryKey = this.#findCommissionableQueryIdentifier(deviceData);
+      if (queryKey !== void 0) {
+        this.#finishWaiter(queryKey, true, deviceExisting);
+      }
+    } catch (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)) {
+      return longDiscriminatorQueryId;
+    }
+    const shortDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
+    if (this.#recordWaiters.has(shortDiscriminatorQueryId)) {
+      return shortDiscriminatorQueryId;
+    }
+    if (record.VP !== void 0) {
+      const vpParts = record.VP.split("+");
+      const vendorIdQueryId = this.#buildCommissionableQueryIdentifier({
+        vendorId: (0, import_types.VendorId)(parseInt(vpParts[0]))
+      });
+      if (this.#recordWaiters.has(vendorIdQueryId)) {
+        return vendorIdQueryId;
+      }
+      if (vpParts[1] !== void 0) {
+        const productIdQueryId = this.#buildCommissionableQueryIdentifier({
+          productId: parseInt(vpParts[1])
+        });
+        if (this.#recordWaiters.has(productIdQueryId)) {
+          return productIdQueryId;
+        }
+      }
+    }
+    if (this.#recordWaiters.has("*")) {
+      return "*";
+    }
+    return void 0;
+  }
+  /**
+   * 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) {
+    if ("longDiscriminator" in identifier) {
+      return `D:${identifier.longDiscriminator}`;
+    } else if ("shortDiscriminator" in identifier) {
+      return `SD:${identifier.shortDiscriminator}`;
+    } else if ("vendorId" in identifier) {
+      return `V:${identifier.vendorId}`;
+    } else if ("productId" in identifier) {
+      return `P:${identifier.productId}`;
+    } else return "*";
+  }
+  #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));
+    } else if ("shortDiscriminator" in identifier) {
+      foundRecords.push(
+        ...storedRecords.filter(({ deviceData: { SD } }) => SD === identifier.shortDiscriminator)
+      );
+    } else if ("vendorId" in identifier) {
+      foundRecords.push(
+        ...storedRecords.filter(
+          ({ deviceData: { VP } }) => VP === `${identifier.vendorId}` || VP?.startsWith(`${identifier.vendorId}+`)
+        )
+      );
+    } else if ("productId" in identifier) {
+      foundRecords.push(
+        ...storedRecords.filter(({ deviceData: { VP } }) => VP?.endsWith(`+${identifier.productId}`))
+      );
+    } else {
+      foundRecords.push(...storedRecords.filter(({ deviceData: { CM } }) => CM === 1 || CM === 2));
+    }
+    return foundRecords;
+  }
+  async findOperationalDevice() {
+    logger.info(`skip BLE scan because scanning for operational devices is not supported`);
+    return void 0;
+  }
+  getDiscoveredOperationalDevice() {
+    logger.info(`skip BLE scan because scanning for operational devices is not supported`);
+    return void 0;
+  }
+  async findCommissionableDevices(identifier, timeout = (0, import_general.Seconds)(10), ignoreExistingRecords = false) {
+    let storedRecords = this.#getCommissionableDevices(identifier);
+    if (ignoreExistingRecords) {
+      for (const record of storedRecords) {
+        this.#discoveredMatterDevices.delete(record.peripheral.address);
+      }
+      storedRecords = [];
+    }
+    if (storedRecords.length === 0) {
+      const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+      await this.#nobleClient.startScanning();
+      await this.#registerWaiterPromise(queryKey, timeout);
+      storedRecords = this.#getCommissionableDevices(identifier);
+      await this.#nobleClient.stopScanning();
+    }
+    return storedRecords.map(({ deviceData }) => deviceData);
+  }
+  async findCommissionableDevicesContinuously(identifier, callback, timeout, cancelSignal) {
+    const discoveredDevices = /* @__PURE__ */ new Set();
+    const discoveryEndTime = timeout ? import_general.Time.nowMs + timeout : void 0;
+    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);
+      },
+      (cause) => {
+        logger.error("Unexpected error canceling commissioning", cause);
+      }
+    );
+    while (!canceled) {
+      this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
+        const { deviceIdentifier } = deviceData;
+        if (!discoveredDevices.has(deviceIdentifier)) {
+          discoveredDevices.add(deviceIdentifier);
+          callback(deviceData);
+        }
+      });
+      let remainingTime;
+      if (discoveryEndTime !== void 0) {
+        remainingTime = import_general.Millis.ceil((0, import_general.Timespan)(import_general.Time.nowMs, discoveryEndTime).duration);
+        if (remainingTime <= 0) {
+          break;
+        }
+      }
+      await this.#registerWaiterPromise(queryKey, remainingTime, false, queryResolver);
+    }
+    await this.#nobleClient.stopScanning();
+    return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+  }
+  getDiscoveredCommissionableDevices(identifier) {
+    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)
+    );
   }
 }
 //# sourceMappingURL=BleScanner.js.map

package/dist/cjs/BleScanner.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/BleScanner.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,sBAAkE;AANlE;AAAA;AAAA;AAAA;AAAA;AAcO,MAAM,mBAAmB,gBAAAA,WAAe;AAAA,EAClC;AAAA,EAET,YAAY,aAA6B;AACrC,UAAM,WAAW;AACjB,SAAK,eAAe;AAAA,EACxB;AAAA,EAES,oBAAoB,SAA2C;AACpE,WAAO,MAAM,oBAAoB,OAAO;AAAA,EAC5C;AAAA,EAEmB,cAAc;AAC7B,SAAK,aAAa,MAAM;AAAA,EAC5B;AACJ;",
-  "names": ["BaseBleScanner"]
+  "mappings": "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",
+  "names": []
 }

package/dist/esm/BleScanner.d.ts

@@ -3,17 +3,30 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BleScanner as BaseBleScanner, DiscoveredBleDevice } from "#protocol";
+import { ChannelType, Duration } from "#general";
+import { CommissionableDevice, CommissionableDeviceIdentifiers, Scanner } from "#protocol";
 import type { Peripheral } from "@stoprocent/noble";
 import { NobleBleClient } from "./NobleBleClient.js";
-export type { DiscoveredBleDevice } from "#protocol";
-export type NobleDiscoveredBleDevice = Omit<DiscoveredBleDevice, "peripheral"> & {
+export type DiscoveredBleDevice = {
+    deviceData: CommissionableDeviceData;
     peripheral: Peripheral;
+    hasAdditionalAdvertisementData: boolean;
 };
-export declare class BleScanner extends BaseBleScanner {
+type CommissionableDeviceData = CommissionableDevice & {
+    SD: number;
+};
+export declare class BleScanner implements Scanner {
     #private;
+    readonly type = ChannelType.BLE;
     constructor(nobleClient: NobleBleClient);
-    getDiscoveredDevice(address: string): NobleDiscoveredBleDevice;
-    protected closeClient(): void;
+    getDiscoveredDevice(address: string): DiscoveredBleDevice;
+    cancelCommissionableDeviceDiscovery(identifier: CommissionableDeviceIdentifiers, resolvePromise?: boolean): void;
+    findOperationalDevice(): Promise<undefined>;
+    getDiscoveredOperationalDevice(): undefined;
+    findCommissionableDevices(identifier: CommissionableDeviceIdentifiers, timeout?: Duration, ignoreExistingRecords?: boolean): Promise<CommissionableDevice[]>;
+    findCommissionableDevicesContinuously(identifier: CommissionableDeviceIdentifiers, callback: (device: CommissionableDevice) => void, timeout?: Duration, cancelSignal?: Promise<void>): Promise<CommissionableDevice[]>;
+    getDiscoveredCommissionableDevices(identifier: CommissionableDeviceIdentifiers): CommissionableDevice[];
+    close(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=BleScanner.d.ts.map

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,EAAE,UAAU,IAAI,cAAc,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,YAAY,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErD,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,GAAG;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC;AAE5G,qBAAa,UAAW,SAAQ,cAAc;;gBAG9B,WAAW,EAAE,cAAc;IAK9B,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,wBAAwB;cAIpD,WAAW;CAGjC"}
+{"version":3,"file":"BleScanner.d.ts","sourceRoot":"","sources":["../../src/BleScanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEH,WAAW,EAGX,QAAQ,EAOX,MAAM,UAAU,CAAC;AAClB,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;IA+HhG,qBAAqB,IAAI,OAAO,CAAC,SAAS,CAAC;IAKjD,8BAA8B,IAAI,SAAS;IAKrC,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAc,EACrB,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,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAgDlC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B,GAAG,oBAAoB,EAAE;IAIjG,KAAK;CAMd"}

package/dist/esm/BleScanner.js

@@ -3,18 +3,256 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BleScanner as BaseBleScanner } from "#protocol";
-class BleScanner extends BaseBleScanner {
+import {
+  Bytes,
+  ChannelType,
+  createPromise,
+  Diagnostic,
+  Duration,
+  Logger,
+  Millis,
+  Seconds,
+  Time,
+  Timespan
+} from "#general";
+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) {
-    super(nobleClient);
     this.#nobleClient = nobleClient;
+    this.#nobleClient.setDiscoveryCallback(
+      (address, manufacturerData) => this.#handleDiscoveredDevice(address, manufacturerData)
+    );
   }
   getDiscoveredDevice(address) {
-    return super.getDiscoveredDevice(address);
+    const device = this.#discoveredMatterDevices.get(address);
+    if (device === void 0) {
+      throw new BleError(`No device found for address ${address}`);
+    }
+    return device;
   }
-  closeClient() {
+  /**
+   * 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, timeout, resolveOnUpdatedRecords = true, cancelResolver) {
+    const { promise, resolver } = createPromise();
+    let timer;
+    if (timeout) {
+      timer = Time.getTimer("BLE query timeout", timeout, () => {
+        cancelResolver?.();
+        this.#finishWaiter(queryId, true);
+      }).start();
+    }
+    this.#recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords, cancelResolver });
+    logger.debug(
+      `Registered waiter for query ${queryId} with timeout ${timeout === void 0 ? "(none)" : Duration.format(timeout)} ${resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"}`
+    );
+    await promise;
+  }
+  /**
+   * 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);
+    if (waiter === void 0) return;
+    const { timer, resolver, resolveOnUpdatedRecords } = waiter;
+    if (isUpdatedRecord && !resolveOnUpdatedRecords) return;
+    logger.debug(`Finishing waiter for query ${queryId}, resolving: ${resolvePromise}`);
+    timer?.stop();
+    if (resolvePromise) {
+      resolver();
+    }
+    this.#recordWaiters.delete(queryId);
+  }
+  cancelCommissionableDeviceDiscovery(identifier, resolvePromise = true) {
+    const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+    const { cancelResolver } = this.#recordWaiters.get(queryKey) ?? {};
+    cancelResolver?.();
+    this.#finishWaiter(queryKey, resolvePromise);
+  }
+  #handleDiscoveredDevice(peripheral, manufacturerServiceData) {
+    const address = peripheral.address;
+    try {
+      const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } = BtpCodec.decodeBleAdvertisementServiceData(manufacturerServiceData);
+      const deviceData = {
+        deviceIdentifier: address,
+        D: discriminator,
+        SD: discriminator >> 8 & 15,
+        VP: `${vendorId}+${productId}`,
+        CM: 1,
+        // Can be no other mode,
+        addresses: [{ type: "ble", peripheralAddress: address }]
+      };
+      const deviceExisting = this.#discoveredMatterDevices.has(address);
+      logger.debug(
+        `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${Diagnostic.json(deviceData)}`
+      );
+      this.#discoveredMatterDevices.set(address, {
+        deviceData,
+        peripheral,
+        hasAdditionalAdvertisementData
+      });
+      const queryKey = this.#findCommissionableQueryIdentifier(deviceData);
+      if (queryKey !== void 0) {
+        this.#finishWaiter(queryKey, true, deviceExisting);
+      }
+    } catch (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)) {
+      return longDiscriminatorQueryId;
+    }
+    const shortDiscriminatorQueryId = this.#buildCommissionableQueryIdentifier({ shortDiscriminator: record.SD });
+    if (this.#recordWaiters.has(shortDiscriminatorQueryId)) {
+      return shortDiscriminatorQueryId;
+    }
+    if (record.VP !== void 0) {
+      const vpParts = record.VP.split("+");
+      const vendorIdQueryId = this.#buildCommissionableQueryIdentifier({
+        vendorId: VendorId(parseInt(vpParts[0]))
+      });
+      if (this.#recordWaiters.has(vendorIdQueryId)) {
+        return vendorIdQueryId;
+      }
+      if (vpParts[1] !== void 0) {
+        const productIdQueryId = this.#buildCommissionableQueryIdentifier({
+          productId: parseInt(vpParts[1])
+        });
+        if (this.#recordWaiters.has(productIdQueryId)) {
+          return productIdQueryId;
+        }
+      }
+    }
+    if (this.#recordWaiters.has("*")) {
+      return "*";
+    }
+    return void 0;
+  }
+  /**
+   * 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) {
+    if ("longDiscriminator" in identifier) {
+      return `D:${identifier.longDiscriminator}`;
+    } else if ("shortDiscriminator" in identifier) {
+      return `SD:${identifier.shortDiscriminator}`;
+    } else if ("vendorId" in identifier) {
+      return `V:${identifier.vendorId}`;
+    } else if ("productId" in identifier) {
+      return `P:${identifier.productId}`;
+    } else return "*";
+  }
+  #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));
+    } else if ("shortDiscriminator" in identifier) {
+      foundRecords.push(
+        ...storedRecords.filter(({ deviceData: { SD } }) => SD === identifier.shortDiscriminator)
+      );
+    } else if ("vendorId" in identifier) {
+      foundRecords.push(
+        ...storedRecords.filter(
+          ({ deviceData: { VP } }) => VP === `${identifier.vendorId}` || VP?.startsWith(`${identifier.vendorId}+`)
+        )
+      );
+    } else if ("productId" in identifier) {
+      foundRecords.push(
+        ...storedRecords.filter(({ deviceData: { VP } }) => VP?.endsWith(`+${identifier.productId}`))
+      );
+    } else {
+      foundRecords.push(...storedRecords.filter(({ deviceData: { CM } }) => CM === 1 || CM === 2));
+    }
+    return foundRecords;
+  }
+  async findOperationalDevice() {
+    logger.info(`skip BLE scan because scanning for operational devices is not supported`);
+    return void 0;
+  }
+  getDiscoveredOperationalDevice() {
+    logger.info(`skip BLE scan because scanning for operational devices is not supported`);
+    return void 0;
+  }
+  async findCommissionableDevices(identifier, timeout = Seconds(10), ignoreExistingRecords = false) {
+    let storedRecords = this.#getCommissionableDevices(identifier);
+    if (ignoreExistingRecords) {
+      for (const record of storedRecords) {
+        this.#discoveredMatterDevices.delete(record.peripheral.address);
+      }
+      storedRecords = [];
+    }
+    if (storedRecords.length === 0) {
+      const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+      await this.#nobleClient.startScanning();
+      await this.#registerWaiterPromise(queryKey, timeout);
+      storedRecords = this.#getCommissionableDevices(identifier);
+      await this.#nobleClient.stopScanning();
+    }
+    return storedRecords.map(({ deviceData }) => deviceData);
+  }
+  async findCommissionableDevicesContinuously(identifier, callback, timeout, cancelSignal) {
+    const discoveredDevices = /* @__PURE__ */ new Set();
+    const discoveryEndTime = timeout ? Time.nowMs + timeout : void 0;
+    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);
+      },
+      (cause) => {
+        logger.error("Unexpected error canceling commissioning", cause);
+      }
+    );
+    while (!canceled) {
+      this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
+        const { deviceIdentifier } = deviceData;
+        if (!discoveredDevices.has(deviceIdentifier)) {
+          discoveredDevices.add(deviceIdentifier);
+          callback(deviceData);
+        }
+      });
+      let remainingTime;
+      if (discoveryEndTime !== void 0) {
+        remainingTime = Millis.ceil(Timespan(Time.nowMs, discoveryEndTime).duration);
+        if (remainingTime <= 0) {
+          break;
+        }
+      }
+      await this.#registerWaiterPromise(queryKey, remainingTime, false, queryResolver);
+    }
+    await this.#nobleClient.stopScanning();
+    return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
+  }
+  getDiscoveredCommissionableDevices(identifier) {
+    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)
+    );
   }
 }
 export {

package/dist/esm/BleScanner.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/BleScanner.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc,sBAA2C;AAQ3D,MAAM,mBAAmB,eAAe;AAAA,EAClC;AAAA,EAET,YAAY,aAA6B;AACrC,UAAM,WAAW;AACjB,SAAK,eAAe;AAAA,EACxB;AAAA,EAES,oBAAoB,SAA2C;AACpE,WAAO,MAAM,oBAAoB,OAAO;AAAA,EAC5C;AAAA,EAEmB,cAAc;AAC7B,SAAK,aAAa,MAAM;AAAA,EAC5B;AACJ;",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/nodejs-ble",
-    "version": "0.16.11-alpha.0-20260228-3ee9c97df",
+    "version": "0.16.11",
     "description": "Matter BLE support for node.js",
     "keywords": [
         "iot",
@@ -28,16 +28,16 @@
         "build-clean": "matter-build --clean"
     },
     "dependencies": {
-        "@matter/general": "0.16.11-alpha.0-20260228-3ee9c97df",
-        "@matter/protocol": "0.16.11-alpha.0-20260228-3ee9c97df",
-        "@matter/types": "0.16.11-alpha.0-20260228-3ee9c97df"
+        "@matter/general": "0.16.11",
+        "@matter/protocol": "0.16.11",
+        "@matter/types": "0.16.11"
     },
     "devDependencies": {
-        "@matter/tools": "0.16.11-alpha.0-20260228-3ee9c97df"
+        "@matter/tools": "0.16.11"
     },
     "optionalDependencies": {
-        "@stoprocent/bleno": "^0.12.3",
-        "@stoprocent/noble": "^2.3.16"
+        "@stoprocent/bleno": "^0.12.1",
+        "@stoprocent/noble": "^2.3.10"
     },
     "engines": {
         "node": ">=20.19.0 <22.0.0 || >=22.13.0"

package/src/BleScanner.ts

@@ -4,27 +4,333 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BleScanner as BaseBleScanner, DiscoveredBleDevice } from "#protocol";
+import {
+    Bytes,
+    ChannelType,
+    createPromise,
+    Diagnostic,
+    Duration,
+    Logger,
+    Millis,
+    Seconds,
+    Time,
+    Timer,
+    Timespan,
+} from "#general";
+import { BleError, BtpCodec, CommissionableDevice, CommissionableDeviceIdentifiers, Scanner } from "#protocol";
+import { VendorId } from "#types";
 import type { Peripheral } from "@stoprocent/noble";
 import { NobleBleClient } from "./NobleBleClient.js";
 
-export type { DiscoveredBleDevice } from "#protocol";
+const logger = Logger.get("BleScanner");
 
-export type NobleDiscoveredBleDevice = Omit<DiscoveredBleDevice, "peripheral"> & { peripheral: Peripheral };
+export type DiscoveredBleDevice = {
+    deviceData: CommissionableDeviceData;
+    peripheral: Peripheral;
+    hasAdditionalAdvertisementData: boolean;
+};
+
+type CommissionableDeviceData = CommissionableDevice & {
+    SD: number; // Additional Field for Short discriminator
+};
+
+export class BleScanner implements Scanner {
+    readonly type = ChannelType.BLE;
 
-export class BleScanner extends BaseBleScanner {
     readonly #nobleClient: NobleBleClient;
+    readonly #recordWaiters = new Map<
+        string,
+        {
+            resolver: () => void;
+            timer?: Timer;
+            resolveOnUpdatedRecords: boolean;
+            cancelResolver?: (value: void) => void;
+        }
+    >();
+    readonly #discoveredMatterDevices = new Map<string, DiscoveredBleDevice>();
 
     constructor(nobleClient: NobleBleClient) {
-        super(nobleClient);
         this.#nobleClient = nobleClient;
+        this.#nobleClient.setDiscoveryCallback((address, manufacturerData) =>
+            this.#handleDiscoveredDevice(address, manufacturerData),
+        );
+    }
+
+    public getDiscoveredDevice(address: string): DiscoveredBleDevice {
+        const device = this.#discoveredMatterDevices.get(address);
+        if (device === undefined) {
+            throw new BleError(`No device found for address ${address}`);
+        }
+        return device;
+    }
+
+    /**
+     * 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: string,
+        timeout?: Duration,
+        resolveOnUpdatedRecords = true,
+        cancelResolver?: (value: void) => void,
+    ) {
+        const { promise, resolver } = createPromise<void>();
+        let timer;
+        if (timeout) {
+            timer = Time.getTimer("BLE query timeout", timeout, () => {
+                cancelResolver?.();
+                this.#finishWaiter(queryId, true);
+            }).start();
+        }
+        this.#recordWaiters.set(queryId, { resolver, timer, resolveOnUpdatedRecords, cancelResolver });
+        logger.debug(
+            `Registered waiter for query ${queryId} with timeout ${timeout === undefined ? "(none)" : Duration.format(timeout)} ${
+                resolveOnUpdatedRecords ? "" : " (not resolving on updated records)"
+            }`,
+        );
+        await promise;
+    }
+
+    /**
+     * Remove a waiter promise for a specific queryId and stop the connected timer. If required also resolve the
+     * promise.
+     */
+    #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;
+        logger.debug(`Finishing waiter for query ${queryId}, resolving: ${resolvePromise}`);
+        timer?.stop();
+        if (resolvePromise) {
+            resolver();
+        }
+        this.#recordWaiters.delete(queryId);
+    }
+
+    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);
+    }
+
+    #handleDiscoveredDevice(peripheral: Peripheral, manufacturerServiceData: Bytes) {
+        const address = peripheral.address;
+
+        try {
+            const { discriminator, vendorId, productId, hasAdditionalAdvertisementData } =
+                BtpCodec.decodeBleAdvertisementServiceData(manufacturerServiceData);
+
+            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: address }],
+            };
+            const deviceExisting = this.#discoveredMatterDevices.has(address);
+
+            logger.debug(
+                `${deviceExisting ? "Re-" : ""}Discovered device ${address} data: ${Diagnostic.json(deviceData)}`,
+            );
+
+            this.#discoveredMatterDevices.set(address, {
+                deviceData,
+                peripheral,
+                hasAdditionalAdvertisementData,
+            });
+
+            const queryKey = this.#findCommissionableQueryIdentifier(deviceData);
+            if (queryKey !== undefined) {
+                this.#finishWaiter(queryKey, true, deviceExisting);
+            }
+        } catch (error) {
+            logger.debug(
+                `Discovered device ${address} ${manufacturerServiceData === undefined ? undefined : Bytes.toHex(manufacturerServiceData)} does not seem to be a valid Matter device: ${error}`,
+            );
+        }
+    }
+
+    #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)) {
+            return shortDiscriminatorQueryId;
+        }
+
+        if (record.VP !== undefined) {
+            const vpParts = record.VP.split("+");
+            const vendorIdQueryId = this.#buildCommissionableQueryIdentifier({
+                vendorId: VendorId(parseInt(vpParts[0])),
+            });
+            if (this.#recordWaiters.has(vendorIdQueryId)) {
+                return vendorIdQueryId;
+            }
+            if (vpParts[1] !== undefined) {
+                const productIdQueryId = this.#buildCommissionableQueryIdentifier({
+                    productId: parseInt(vpParts[1]),
+                });
+                if (this.#recordWaiters.has(productIdQueryId)) {
+                    return productIdQueryId;
+                }
+            }
+        }
+
+        if (this.#recordWaiters.has("*")) {
+            return "*";
+        }
+
+        return undefined;
+    }
+
+    /**
+     * 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: CommissionableDeviceIdentifiers) {
+        if ("longDiscriminator" in identifier) {
+            return `D:${identifier.longDiscriminator}`;
+        } else if ("shortDiscriminator" in identifier) {
+            return `SD:${identifier.shortDiscriminator}`;
+        } else if ("vendorId" in identifier) {
+            return `V:${identifier.vendorId}`;
+        } else if ("productId" in identifier) {
+            // Custom identifier because normally productId is only included in TXT record
+            return `P:${identifier.productId}`;
+        } else return "*";
+    }
+
+    #getCommissionableDevices(identifier: CommissionableDeviceIdentifiers) {
+        const storedRecords = Array.from(this.#discoveredMatterDevices.values());
+
+        const foundRecords = new Array<DiscoveredBleDevice>();
+        if ("longDiscriminator" in identifier) {
+            foundRecords.push(...storedRecords.filter(({ deviceData: { D } }) => D === identifier.longDiscriminator));
+        } else if ("shortDiscriminator" in identifier) {
+            foundRecords.push(
+                ...storedRecords.filter(({ deviceData: { SD } }) => SD === identifier.shortDiscriminator),
+            );
+        } else if ("vendorId" in identifier) {
+            foundRecords.push(
+                ...storedRecords.filter(
+                    ({ deviceData: { VP } }) =>
+                        VP === `${identifier.vendorId}` || VP?.startsWith(`${identifier.vendorId}+`),
+                ),
+            );
+        } else if ("productId" in identifier) {
+            foundRecords.push(
+                ...storedRecords.filter(({ deviceData: { VP } }) => VP?.endsWith(`+${identifier.productId}`)),
+            );
+        } else {
+            foundRecords.push(...storedRecords.filter(({ deviceData: { CM } }) => CM === 1 || CM === 2));
+        }
+
+        return foundRecords;
+    }
+
+    async findOperationalDevice(): Promise<undefined> {
+        logger.info(`skip BLE scan because scanning for operational devices is not supported`);
+        return undefined;
+    }
+
+    getDiscoveredOperationalDevice(): undefined {
+        logger.info(`skip BLE scan because scanning for operational devices is not supported`);
+        return undefined;
+    }
+
+    async findCommissionableDevices(
+        identifier: CommissionableDeviceIdentifiers,
+        timeout = Seconds(10),
+        ignoreExistingRecords = false,
+    ): Promise<CommissionableDevice[]> {
+        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);
+            }
+            storedRecords = [];
+        }
+        if (storedRecords.length === 0) {
+            const queryKey = this.#buildCommissionableQueryIdentifier(identifier);
+
+            await this.#nobleClient.startScanning();
+            await this.#registerWaiterPromise(queryKey, timeout);
+
+            storedRecords = this.#getCommissionableDevices(identifier);
+            await this.#nobleClient.stopScanning();
+        }
+        return storedRecords.map(({ deviceData }) => deviceData);
+    }
+
+    async findCommissionableDevicesContinuously(
+        identifier: CommissionableDeviceIdentifiers,
+        callback: (device: CommissionableDevice) => void,
+        timeout?: Duration,
+        cancelSignal?: Promise<void>,
+    ): Promise<CommissionableDevice[]> {
+        const discoveredDevices = new Set<string>();
+
+        const discoveryEndTime = timeout ? Time.nowMs + timeout : undefined;
+        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);
+            },
+            cause => {
+                logger.error("Unexpected error canceling commissioning", cause);
+            },
+        );
+
+        while (!canceled) {
+            this.#getCommissionableDevices(identifier).forEach(({ deviceData }) => {
+                const { deviceIdentifier } = deviceData;
+                if (!discoveredDevices.has(deviceIdentifier)) {
+                    discoveredDevices.add(deviceIdentifier);
+                    callback(deviceData);
+                }
+            });
+
+            let remainingTime;
+            if (discoveryEndTime !== undefined) {
+                remainingTime = Millis.ceil(Timespan(Time.nowMs, discoveryEndTime).duration);
+                if (remainingTime <= 0) {
+                    break;
+                }
+            }
+
+            await this.#registerWaiterPromise(queryKey, remainingTime, false, queryResolver);
+        }
+        await this.#nobleClient.stopScanning();
+        return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
     }
 
-    override getDiscoveredDevice(address: string): NobleDiscoveredBleDevice {
-        return super.getDiscoveredDevice(address) as NobleDiscoveredBleDevice;
+    getDiscoveredCommissionableDevices(identifier: CommissionableDeviceIdentifiers): CommissionableDevice[] {
+        return this.#getCommissionableDevices(identifier).map(({ deviceData }) => deviceData);
     }
 
-    protected override closeClient() {
+    async close() {
         this.#nobleClient.close();
+        [...this.#recordWaiters.keys()].forEach(queryId =>
+            this.#finishWaiter(queryId, !!this.#recordWaiters.get(queryId)?.timer),
+        );
     }
 }