@matter/protocol 0.16.0-alpha.0-20250809-ee8375bcb → 0.16.0-alpha.0-20250810-5c91a95d2

package/dist/esm/protocol/DeviceAdvertiser.js

@@ -3,63 +3,65 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CommissioningMode } from "#common/InstanceBroadcaster.js";
+import { Advertisement } from "#advertisement/Advertisement.js";
+import { ServiceDescription } from "#advertisement/ServiceDescription.js";
 import { FabricManager } from "#fabric/FabricManager.js";
-import {
-  AsyncObservable,
-  Diagnostic,
-  Environmental,
-  Logger,
-  MatterAggregateError,
-  Mutex,
-  ObserverGroup,
-  Time
-} from "#general";
+import { Environmental, MatterAggregateError, ObserverGroup } from "#general";
 import { SessionManager } from "#session/SessionManager.js";
-import { DEVICE_ANNOUNCEMENT_DURATION_MS, DEVICE_ANNOUNCEMENT_INTERVAL_MS } from "#types";
-const logger = Logger.get("DeviceAdvertiser");
 class DeviceAdvertiser {
   #context;
-  #broadcasters = /* @__PURE__ */ new Set();
-  #timedOut = AsyncObservable();
-  #operationalModeEnabled = new AsyncObservable();
-  #operationalModeEnded = new AsyncObservable();
+  #advertisers = /* @__PURE__ */ new Set();
   #observers = new ObserverGroup();
-  #interval;
-  #startTime = null;
+  #isOperational = false;
   #isClosing = false;
-  #commissioningMode = CommissioningMode.NotCommissioning;
-  // Currently we do not put much effort into synchronizing announcements as it probably isn't really necessary.  But
-  // this mutex prevents automated announcements from piling up and allows us to ensure announcements are complete on
-  // close
-  #mutex = new Mutex(this);
+  #commissioningService;
   constructor(context) {
     this.#context = context;
-    this.#interval = Time.getPeriodicTimer(
-      "Server node announcement",
-      DEVICE_ANNOUNCEMENT_INTERVAL_MS,
-      () => (
-        // Announcement needs to await a previous announcement because otherwise in testing at least announcement
-        // may crash if started simultaneously
-        this.#mutex.run(this.advertise.bind(this))
-      )
-    );
-    this.#observers.on(this.#context.fabrics.events.deleted, () => {
-      if (this.#context.fabrics.length === 0) {
-        this.#mutex.run(this.#exitOperationalMode.bind(this));
-      } else {
-        this.#mutex.run(() => this.advertise(true));
+    const { fabrics, sessions } = this.#context;
+    this.#observers.on(fabrics.events.added, (fabric) => {
+      if (!this.#isOperational) {
+        return;
       }
+      this.#advertiseFabric(fabric, "startup");
     });
-    this.#observers.on(this.#context.sessions.resubmissionStarted, (session) => {
-      logger.debug(`Resubmission started, re-announce node ${session?.nodeId}`);
-      this.#mutex.run(() => this.advertise(true));
+    this.#observers.on(fabrics.events.deleted, (fabric) => {
+      Advertisement.cancelAll(this.#advertisements((ad) => ad.isOperational() && ad.description.fabric === fabric));
+    });
+    this.#observers.on(sessions.sessions.added, (session) => {
+      const fabricIndex = session.fabric?.fabricIndex;
+      const fabric = fabricIndex ? fabrics.findByIndex(fabricIndex) : void 0;
+      if (!fabric) {
+        return;
+      }
+      for (const advertiser of this.#advertisers) {
+        const ad = advertiser.advertisementForFabric(fabric);
+        if (ad) {
+          ad.serviceConnected();
+        }
+      }
+    });
+    this.#observers.on(sessions.sessions.deleted, (session) => {
+      const fabricIndex = session.fabric?.fabricIndex;
+      const fabric = fabricIndex ? fabrics.findByIndex(fabricIndex) : void 0;
+      if (fabric) {
+        if (fabric.hasSessionForPeer(session.peerNodeId)) {
+          return;
+        }
+        for (const advertiser of this.#advertisers) {
+          const ad = advertiser.advertisementForFabric(fabric);
+          if (ad) {
+            ad.serviceDisconnected();
+          }
+        }
+        return;
+      }
+      this.#startCommissioningAdvertisement();
     });
-    this.#observers.on(this.#context.sessions.subscriptionsChanged, (_session, subscription) => {
-      if (subscription.isCanceledByPeer) {
-        logger.debug(`Subscription canceled by peer, re-announce`);
-        this.#mutex.run(this.startAdvertising.bind(this));
+    this.#observers.on(sessions.retry, (session) => {
+      if (!session.isSecure || !session.fabric) {
+        return;
       }
+      this.#advertiseFabric(session.associatedFabric, "retransmit");
     });
   }
   toString() {
@@ -74,125 +76,115 @@ class DeviceAdvertiser {
     return instance;
   }
   /**
-   * Emitted when the advertising window closes with no response.
+   * Advertise the device as commissionable.
    */
-  get timedOut() {
-    return this.#timedOut;
+  enterCommissioningMode(description) {
+    this.#commissioningService = description;
+    this.#startCommissioningAdvertisement();
   }
   /**
-   * Emitted when the device stops advertising due to decommissioning.
+   * Begin automatic broadcast for commissioning if in commissionable mode.
    */
-  get operationalModeEnded() {
-    return this.#operationalModeEnded;
+  #startCommissioningAdvertisement() {
+    if (this.#isClosing) {
+      return;
+    }
+    if (this.#commissioningService === void 0) {
+      return;
+    }
+    for (const advertiser of this.#advertisers) {
+      advertiser.advertise(this.#commissioningService, "startup");
+    }
   }
   /**
-   * Emitted when the device starts advertising in operational mode.
+   * Cease advertising the device as commissionable.
    */
-  get operationalModeEnabled() {
-    return this.#operationalModeEnabled;
-  }
-  async enterCommissioningMode(mode, deviceData) {
-    this.#commissioningMode = mode;
-    for (const broadcaster of this.#broadcasters) {
-      await broadcaster.setCommissionMode(mode, deviceData);
-    }
-    await this.startAdvertising();
-  }
-  async exitCommissioningMode() {
-    this.#commissioningMode = CommissioningMode.NotCommissioning;
-    this.#interval.stop();
-    this.#startTime = null;
-    for (const broadcaster of this.#broadcasters) {
-      await broadcaster.expireCommissioningAnnouncement();
+  exitCommissioningMode() {
+    if (!this.#commissioningService) {
+      return;
     }
+    this.#commissioningService = void 0;
+    return Advertisement.closeAll(this.#advertisements((ad) => ad.isCommissioning()));
   }
-  async startAdvertising() {
-    if (this.#isClosing) return;
-    if (this.#interval.isRunning) {
-      this.#interval.stop();
+  /**
+   * Advertise the device as operational.
+   */
+  enterOperationalMode() {
+    if (this.#isOperational) {
+      return;
     }
-    this.#startTime = Time.nowMs();
-    this.#interval.start();
-    await this.advertise();
-  }
-  async advertise(once = false) {
-    if (!once) {
-      if (this.#startTime !== null && Time.nowMs() - this.#startTime > DEVICE_ANNOUNCEMENT_DURATION_MS) {
-        logger.debug("Announcement duration reached, stop announcing");
-        await this.#timedOut.emit();
-        return;
-      }
-      if (this.#commissioningMode !== CommissioningMode.NotCommissioning) {
-        for (const broadcaster of this.#broadcasters) {
-          await broadcaster.announce();
-        }
-        return;
-      }
+    this.#isOperational = true;
+    this.#startOperationalAdvertisement();
+  }
+  /**
+   * Begin automatic broadcast for fabrics if in operational mode.
+   */
+  #startOperationalAdvertisement() {
+    if (!this.#isOperational) {
+      return;
     }
-    const fabrics = this.#context.fabrics;
-    if (fabrics.length) {
-      let fabricsWithoutSessions = 0;
-      for (const fabric of fabrics) {
-        const session = this.#context.sessions.getSessionForNode(fabric.addressOf(fabric.rootNodeId));
-        if (session === void 0 || !session.isSecure || session.subscriptions.size === 0) {
-          fabricsWithoutSessions++;
-          logger.debug(
-            "Announcing",
-            Diagnostic.dict({ fabricIndex: fabric.fabricIndex, fabricId: fabric.fabricId })
-          );
-        }
-      }
-      for (const broadcaster of this.#broadcasters) {
-        await broadcaster.setFabrics(fabrics.fabrics);
-        if (fabricsWithoutSessions > 0 || this.#commissioningMode !== CommissioningMode.NotCommissioning) {
-          await broadcaster.announce();
-        }
+    const fabricsAdvertised = new Set(
+      this.#advertisements((ad) => ad.isOperational()).map(
+        (ad) => ad.description.fabric
+      )
+    );
+    for (const fabric of this.#context.fabrics) {
+      if (!fabricsAdvertised.has(fabric)) {
+        this.#advertiseFabric(fabric, "startup");
       }
-    } else {
-      await this.#exitOperationalMode();
-      await this.#operationalModeEnded.emit();
     }
   }
-  async advertiseFabrics(fabrics, expireCommissioningAnnouncement = false) {
-    if (expireCommissioningAnnouncement) {
-      await this.#operationalModeEnabled.emit();
-    }
-    for (const broadcaster of this.#broadcasters) {
-      await broadcaster.setFabrics(fabrics, expireCommissioningAnnouncement);
-      await broadcaster.announce();
+  /**
+   * Cease advertising the device as operational.
+   */
+  exitOperationalMode() {
+    if (!this.#isOperational) {
+      return;
     }
+    this.#isOperational = false;
+    Advertisement.cancelAll(this.#advertisements((ad) => ad.isOperational()));
   }
-  async #exitOperationalMode() {
-    for (const broadcaster of this.#broadcasters) {
-      await broadcaster.expireFabricAnnouncement();
-    }
+  /**
+   * Reset automatic advertisement.
+   *
+   * This is useful when there is a network change.
+   */
+  restartAdvertisement() {
+    this.#startCommissioningAdvertisement();
+    this.#startOperationalAdvertisement();
   }
   async close() {
     this.#isClosing = true;
-    await this.#mutex;
     this.#observers.close();
-    this.#interval.stop();
-    await this.clearBroadcasters();
+    await this.clearAdvertisers();
+  }
+  hasAdvertiser(advertiser) {
+    return this.#advertisers.has(advertiser);
+  }
+  addAdvertiser(advertiser) {
+    this.#advertisers.add(advertiser);
   }
-  hasBroadcaster(broadcaster) {
-    return this.#broadcasters.has(broadcaster);
+  async deleteAdvertiser(advertiser) {
+    this.#advertisers.delete(advertiser);
+    await advertiser.close();
   }
-  addBroadcaster(broadcaster) {
-    this.#broadcasters.add(broadcaster);
+  async clearAdvertisers() {
+    const advertisers = [...this.#advertisers];
+    this.#advertisers.clear();
+    await MatterAggregateError.allSettled(advertisers.map((advertiser) => advertiser.close()));
   }
-  async deleteBroadcaster(broadcaster) {
-    if (this.#broadcasters.delete(broadcaster)) {
-      await broadcaster.expireAllAnnouncements();
+  #advertiseFabric(fabric, event) {
+    if (this.#isClosing) {
+      return;
+    }
+    for (const advertiser of this.#advertisers) {
+      advertiser.advertise(ServiceDescription.Operational({ fabric }), event);
     }
   }
-  async clearBroadcasters() {
-    const broadcasters = [...this.#broadcasters];
-    const closed = MatterAggregateError.allSettled(
-      broadcasters.map((b) => b.close()),
-      "Error closing broadcasters"
-    ).catch((error) => logger.error(error));
-    this.#broadcasters.clear();
-    await closed;
+  #advertisements(predicate) {
+    return [...this.#advertisers].flatMap(
+      (advertiser) => predicate ? advertiser.filter(predicate) : [...advertiser.advertisements]
+    );
   }
 }
 export {

package/dist/esm/protocol/DeviceAdvertiser.js.map

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

package/dist/esm/protocol/DeviceCommissioner.d.ts

@@ -43,7 +43,6 @@ export declare class DeviceCommissioner {
     beginTimed(failsafeContext: FailsafeContext): void;
     get isFailsafeArmed(): boolean;
     assertFailsafeArmed(message?: string): void;
-    reactivateAdvertiser(): void;
     endCommissioning(): Promise<void>;
     close(): Promise<void>;
 }

package/dist/esm/protocol/DeviceCommissioner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceCommissioner.d.ts","sourceRoot":"","sources":["../../../src/protocol/DeviceCommissioner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAEH,WAAW,EACX,aAAa,EAKb,YAAY,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAmC,MAAM,QAAQ,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;GAEG;AACH,8BAAsB,2BAA2B;IAC7C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC,aAAa,CAAC;CACvD;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,mBAAmB,EAAE,2BAA2B,CAAC;CACpD;AAED;;;;;GAKG;AACH,qBAAa,kBAAkB;;gBAQf,OAAO,EAAE,yBAAyB;IA+C9C,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAY9C,IAAI,eAAe,oBAGlB;IAEK,0BAA0B,CAC5B,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,UAAU,EACtB,wBAAwB,EAAE,MAAM,YAAY;IAgB1C,uBAAuB,CAAC,wBAAwB,CAAC,EAAE,MAAM,YAAY;IAoB3E,UAAU,CAAC,eAAe,EAAE,eAAe;IAsB3C,IAAI,eAAe,YAElB;IAED,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM;IAQpC,oBAAoB;IAmDd,gBAAgB;IAsBhB,KAAK;CAQd"}
+{"version":3,"file":"DeviceCommissioner.d.ts","sourceRoot":"","sources":["../../../src/protocol/DeviceCommissioner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACH,WAAW,EACX,aAAa,EAKb,YAAY,EAIf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAqE,MAAM,QAAQ,CAAC;AAEjH,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;GAEG;AACH,8BAAsB,2BAA2B;IAC7C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC,aAAa,CAAC;CACvD;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,mBAAmB,EAAE,2BAA2B,CAAC;CACpD;AAED;;;;;GAKG;AACH,qBAAa,kBAAkB;;gBASf,OAAO,EAAE,yBAAyB;IAU9C,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAY9C,IAAI,eAAe,oBAGlB;IAEK,0BAA0B,CAC5B,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,UAAU,EACtB,wBAAwB,EAAE,MAAM,YAAY;IAgB1C,uBAAuB,CAAC,wBAAwB,CAAC,EAAE,MAAM,YAAY;IAoB3E,UAAU,CAAC,eAAe,EAAE,eAAe;IAY3C,IAAI,eAAe,YAElB;IAED,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM;IAmF9B,gBAAgB;IAsBhB,KAAK;CAkBd"}

package/dist/esm/protocol/DeviceCommissioner.js

@@ -3,22 +3,23 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { CommissioningMode } from "#advertisement/CommissioningMode.js";
+import { ServiceDescription } from "#advertisement/ServiceDescription.js";
 import { AdministratorCommissioning } from "#clusters/administrator-commissioning";
-import { CommissioningMode } from "#common/InstanceBroadcaster.js";
 import { FabricManager } from "#fabric/FabricManager.js";
 import {
-  Diagnostic,
   Environmental,
   InternalError,
   Lifecycle,
   Logger,
   MatterFlowError,
-  ObserverGroup
+  ObserverGroup,
+  Time
 } from "#general";
 import { SecureChannelProtocol } from "#securechannel/SecureChannelProtocol.js";
 import { PaseServer } from "#session/pase/PaseServer.js";
 import { SessionManager } from "#session/SessionManager.js";
-import { StatusCode, StatusResponseError } from "#types";
+import { STANDARD_COMMISSIONING_TIMEOUT_S, StatusCode, StatusResponseError } from "#types";
 import { DeviceAdvertiser } from "./DeviceAdvertiser.js";
 const logger = Logger.get("DeviceCommissioner");
 class CommissioningConfigProvider {
@@ -30,26 +31,13 @@ class DeviceCommissioner {
   #activeDiscriminator;
   #activeCommissioningEndCallback;
   #observers = new ObserverGroup(this);
+  #commissioningTimeout;
   constructor(context) {
     this.#context = context;
-    this.#observers.on(this.#context.advertiser.timedOut, this.endCommissioning);
-    this.#observers.on(this.#context.fabrics.events.deleted, async () => {
-      if (this.#context.fabrics.length === 0 || this.#windowStatus !== AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen) {
-        this.reactivateAdvertiser();
-      }
-    });
-    this.#observers.on(this.#context.advertiser.operationalModeEnded, this.allowBasicCommissioning);
     this.#observers.on(this.#context.secureChannelProtocol.tooManyPaseErrors, async () => {
       logger.info("Maximum number of PASE pairing errors reached, canceling commissioning");
       await this.endCommissioning();
     });
-    this.#observers.on(this.#context.sessions.sessions.deleted, (session) => {
-      const currentFabricIndex = session.fabric?.fabricIndex;
-      const existingSessionFabric = currentFabricIndex === void 0 ? void 0 : this.#context.fabrics.findByIndex(currentFabricIndex)?.fabricIndex;
-      if (this.#context.fabrics.length > 0 || session.isPase || !existingSessionFabric) {
-        this.#context.advertiser.startAdvertising().catch((error) => logger.warn(`Error while announcing`, error));
-      }
-    });
   }
   static [Environmental.create](env) {
     const instance = new DeviceCommissioner({
@@ -69,11 +57,11 @@ class DeviceCommissioner {
   async allowEnhancedCommissioning(discriminator, paseServer, commissioningEndCallback) {
     if (this.#windowStatus === AdministratorCommissioning.CommissioningWindowStatus.BasicWindowOpen) {
       throw new MatterFlowError(
-        "Basic commissioning window is already open! Cannot set Enhanced commissioning mode."
+        "Basic commissioning window is already open! Cannot set enhanced commissioning mode."
       );
     }
     this.#context.secureChannelProtocol.setPaseCommissioner(paseServer);
-    await this.#becomeCommissionable(
+    this.#becomeCommissionable(
       AdministratorCommissioning.CommissioningWindowStatus.EnhancedWindowOpen,
       commissioningEndCallback,
       discriminator
@@ -82,7 +70,7 @@ class DeviceCommissioner {
   async allowBasicCommissioning(commissioningEndCallback) {
     if (this.#windowStatus === AdministratorCommissioning.CommissioningWindowStatus.EnhancedWindowOpen) {
       throw new MatterFlowError(
-        "Enhanced commissioning window is already open! Cannot set Basic commissioning mode."
+        "Enhanced commissioning window is already open! Cannot set basic commissioning mode."
       );
     }
     this.#context.secureChannelProtocol.setPaseCommissioner(
@@ -91,20 +79,13 @@ class DeviceCommissioner {
         salt: this.#context.fabrics.crypto.randomBytes(32)
       })
     );
-    await this.#becomeCommissionable(
+    this.#becomeCommissionable(
       AdministratorCommissioning.CommissioningWindowStatus.BasicWindowOpen,
       commissioningEndCallback
     );
   }
   beginTimed(failsafeContext) {
     this.#failsafeContext = failsafeContext;
-    this.#context.fabrics.events.added.on((fabric) => {
-      const fabrics = this.#context.fabrics.fabrics;
-      this.#context.advertiser.advertiseFabrics(fabrics, true).catch(
-        (error) => logger.warn(`Error sending Fabric announcement for Index ${fabric.fabricIndex}`, error)
-      );
-      logger.info("Announce done", Diagnostic.dict({ fabric: fabric.fabricId, fabricIndex: fabric.fabricIndex }));
-    });
     failsafeContext.commissioned.on(async () => await this.endCommissioning());
     failsafeContext.construction.change.on((status) => {
       if (status === Lifecycle.Status.Destroyed) {
@@ -122,28 +103,39 @@ class DeviceCommissioner {
       StatusCode.FailsafeRequired
     );
   }
-  reactivateAdvertiser() {
-    if (this.#windowStatus === AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen) {
-      return;
-    }
-    this.#enterCommissioningMode(this.#windowStatus, this.#activeDiscriminator).catch(
-      (error) => logger.warn("Error sending announcement:", error)
-    );
-  }
-  async #enterCommissioningMode(windowStatus, discriminator) {
+  #enterCommissioningMode(windowStatus, discriminator) {
+    this.#cancelTimeout();
     this.#windowStatus = windowStatus;
     const commissioningConfig = this.#context.commissioningConfig.values;
-    await this.#context.advertiser.enterCommissioningMode(
-      windowStatus === AdministratorCommissioning.CommissioningWindowStatus.EnhancedWindowOpen ? CommissioningMode.Enhanced : CommissioningMode.Basic,
-      {
+    const advertisementWindowS = commissioningConfig.advertisementWindowS ?? STANDARD_COMMISSIONING_TIMEOUT_S;
+    const mode = windowStatus === AdministratorCommissioning.CommissioningWindowStatus.EnhancedWindowOpen ? CommissioningMode.Enhanced : CommissioningMode.Basic;
+    this.#context.advertiser.enterCommissioningMode(
+      ServiceDescription.Commissionable({
         ...commissioningConfig.productDescription,
+        mode,
         discriminator: discriminator ?? commissioningConfig.discriminator
-      }
+      })
+    );
+    this.#commissioningTimeout = Time.getTimer(
+      "Commissioning timeout",
+      advertisementWindowS,
+      this.endCommissioning.bind(this)
     );
   }
-  async #becomeCommissionable(windowStatus, activeCommissioningEndCallback, discriminator) {
+  #becomeCommissionable(windowStatus, activeCommissioningEndCallback, discriminator) {
+    if (this.#windowStatus !== AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen) {
+      if (this.#windowStatus !== windowStatus) {
+        throw new InternalError(
+          `Commissioning mode ${windowStatus} request but already in mode ${this.#windowStatus}`
+        );
+      }
+      if (this.#activeCommissioningEndCallback && this.#activeCommissioningEndCallback !== activeCommissioningEndCallback) {
+        throw new InternalError(`Already in commissioning mode with a different callback`);
+      }
+    }
     if (this.#windowStatus === windowStatus && (discriminator === void 0 || discriminator === this.#activeDiscriminator)) {
-      return this.reactivateAdvertiser();
+      this.#enterCommissioningMode(this.#windowStatus, this.#activeDiscriminator);
+      return;
     }
     if (this.#windowStatus !== AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen) {
       throw new InternalError(`Commissioning window already open with different mode (${this.#windowStatus})!`);
@@ -153,13 +145,13 @@ class DeviceCommissioner {
     }
     this.#activeCommissioningEndCallback = activeCommissioningEndCallback;
     this.#activeDiscriminator = discriminator;
-    await this.#enterCommissioningMode(windowStatus, discriminator);
+    this.#enterCommissioningMode(windowStatus, discriminator);
   }
   async endCommissioning() {
     if (this.#windowStatus === AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen) {
       return;
     }
-    logger.debug("Commissioning mode ended, stop announcements.");
+    this.#cancelTimeout();
     this.#context.secureChannelProtocol.removePaseCommissioner();
     this.#windowStatus = AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen;
     if (this.#activeCommissioningEndCallback !== void 0) {
@@ -168,9 +160,10 @@ class DeviceCommissioner {
       await activeCommissioningEndCallback();
     }
     await this.#context.advertiser.exitCommissioningMode();
-    logger.info("All commissioning announcements stopped");
+    logger.debug("No longer commissioning");
   }
   async close() {
+    this.#cancelTimeout();
     this.#observers.close();
     await this.endCommissioning();
     if (this.#failsafeContext) {
@@ -178,6 +171,13 @@ class DeviceCommissioner {
       this.#failsafeContext = void 0;
     }
   }
+  #cancelTimeout() {
+    if (!this.#commissioningTimeout) {
+      return;
+    }
+    this.#commissioningTimeout.stop();
+    this.#commissioningTimeout = void 0;
+  }
 }
 export {
   CommissioningConfigProvider,

package/dist/esm/protocol/DeviceCommissioner.js.map

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

package/dist/esm/protocol/ExchangeManager.js

@@ -323,7 +323,7 @@ class ExchangeManager {
     return {
       channel,
       localSessionParameters: this.#sessionManager.sessionParameters,
-      resubmissionStarted: () => this.#sessionManager.resubmissionStarted.emit(channel.session)
+      retry: (number) => this.#sessionManager.retry.emit(channel.session, number)
     };
   }
   #addListener(transportInterface) {