@matter/node 0.16.0-alpha.0-20250809-ee8375bcb → 0.16.0-alpha.0-20250812-285b75d83

package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js

@@ -9,10 +9,10 @@ import { AccessLevel } from "#model";
 import { DeviceCommissioner, FailsafeContext, PaseServer, SessionManager } from "#protocol";
 import {
   Command,
-  MAXIMUM_COMMISSIONING_TIMEOUT_S,
   MINIMUM_COMMISSIONING_TIMEOUT_S,
   PAKE_PASSCODE_VERIFIER_LENGTH,
-  StatusCode,
+  STANDARD_COMMISSIONING_TIMEOUT_S,
+  Status,
   StatusResponseError,
   TlvByteString,
   TlvField,
@@ -142,13 +142,13 @@ class AdministratorCommissioningServer extends AdministratorCommissioningBehavio
     if (commissioningTimeout > this.internal.maximumCommissioningTimeoutS) {
       throw new StatusResponseError(
         `Commissioning timeout must not exceed ${this.internal.maximumCommissioningTimeoutS} seconds.`,
-        StatusCode.InvalidCommand
+        Status.InvalidCommand
       );
     }
     if (commissioningTimeout < this.internal.minimumCommissioningTimeoutS) {
       throw new StatusResponseError(
         `Commissioning timeout must not be lower then ${this.internal.minimumCommissioningTimeoutS} seconds.`,
-        StatusCode.InvalidCommand
+        Status.InvalidCommand
       );
     }
     if (commissioner.isFailsafeArmed) {
@@ -159,7 +159,7 @@ class AdministratorCommissioningServer extends AdministratorCommissioningBehavio
    * This method is used internally when the commissioning window timer expires or the commissioning was completed.
    */
   #endCommissioning() {
-    logger.debug("End commissioning window.");
+    logger.debug("Ending commissioning");
     if (this.internal.commissioningWindowTimeout !== void 0) {
       this.internal.commissioningWindowTimeout.stop();
       this.internal.commissioningWindowTimeout = void 0;
@@ -208,9 +208,10 @@ class AdministratorCommissioningServer extends AdministratorCommissioningBehavio
      */
     minimumCommissioningTimeoutS = MINIMUM_COMMISSIONING_TIMEOUT_S;
     /**
-     * Mandated by spec; should only be modified in testing.
+     * Commissioning beyond the standard 15-minute window is "extended commissioning" and has limitations on
+     * advertisement.  We default to the standard window.
      */
-    maximumCommissioningTimeoutS = MAXIMUM_COMMISSIONING_TIMEOUT_S;
+    maximumCommissioningTimeoutS = STANDARD_COMMISSIONING_TIMEOUT_S;
   }
   AdministratorCommissioningServer2.Internal = Internal;
   class State extends AdministratorCommissioningBehavior.State {

package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,kCAAkC;AAC3C,SAAS,eAAe,QAAQ,YAAmB;AACnD,SAAS,mBAAmB;AAC5B,SAAS,oBAAoB,iBAAiB,YAAY,sBAAsB;AAChF;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,0CAA0C;AAOnD,2BAA2B,QAAQ,WAAW;AAAA,EAC1C,GAAG,2BAA2B,QAAQ;AAAA,EACtC,yBAAyB;AAAA,IACrB;AAAA,IACA,UAAU;AAAA,MACN,sBAAsB,SAAS,GAAG,SAAS;AAAA,MAC3C,sBAAsB,SAAS,GAAG,aAAa;AAAA,MAC/C,eAAe,SAAS,GAAG,UAAU,MAAM,EAAE,KAAK,KAAK,CAAC,CAAC;AAAA,MACzD,YAAY,SAAS,GAAG,SAAS;AAAA,MACjC,MAAM,SAAS,GAAG,aAAa;AAAA,IACnC,CAAC;AAAA,IACD;AAAA,IACA;AAAA,IACA;AAAA,MACI,WAAW,YAAY;AAAA,MACvB,OAAO;AAAA,IACX;AAAA,EACJ;AACJ;AAEA,MAAM,SAAS,OAAO,IAAI,kCAAkC;AAQrD,MAAM,yCAAyC,mCAAmC;AAAA,EAIrF,OAAgB,eAAe;AAAA;AAAA;AAAA;AAAA,EAK/B,MAAe,wBAAwB;AAAA,IACnC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ,GAA8D;AAE1D,QAAI,qBAAqB,WAAW,+BAA+B;AAC/D,YAAM,IAAI,2BAA2B,mBAAmB,0CAA0C;AAAA,IACtG;AACA,QAAI,aAAa,OAAQ,aAAa,KAAS;AAC3C,YAAM,IAAI,2BAA2B,mBAAmB,yBAAyB;AAAA,IACrF;AACA,QAAI,KAAK,SAAS,MAAM,KAAK,SAAS,IAAI;AACtC,YAAM,IAAI,2BAA2B,mBAAmB,+BAA+B;AAAA,IAC3F;AAEA,UAAM,eAAe,KAAK,IAAI,IAAI,kBAAkB;AAEpD,SAAK,uCAAuC,sBAAsB,YAAY;AAE9E,SAAK;AAAA,MACD;AAAA,MACA,2BAA2B,0BAA0B;AAAA,IACzD;AAEA,UAAM,KAAK,IAAI,IAAI,kBAAkB,EAAE;AAAA,MACnC;AAAA,MACA,WAAW,sBAAsB,KAAK,IAAI,IAAI,cAAc,GAAG,sBAAsB;AAAA,QACjF;AAAA,QACA;AAAA,MACJ,CAAC;AAAA,MACD,KAAK,SAAS,KAAK,iBAAiB;AAAA,IACxC;AAAA,EACJ;AAAA;AAAA,EAGA,MAAM,6BAA6B;AAAA,IAC/B;AAAA,EACJ,GAAmE;AAC/D,UAAM,eAAe,KAAK,IAAI,IAAI,kBAAkB;AAEpD,SAAK,uCAAuC,sBAAsB,YAAY;AAE9E,SAAK;AAAA,MACD;AAAA,MACA,2BAA2B,0BAA0B;AAAA,IACzD;AAEA,UAAM,aAAa,wBAAwB,KAAK,SAAS,KAAK,iBAAiB,CAAC;AAAA,EACpF;AAAA;AAAA,EAGA,MAAe,sBAAsB;AACjC,QAAI,KAAK,SAAS,+BAA+B,QAAW;AACxD,YAAM,IAAI,2BAA2B;AAAA,QACjC;AAAA,MACJ;AAAA,IACJ;AAEA,WAAO,MAAM,gCAAgC;AAE7C,UAAM,KAAK,0BAA0B;AAErC,QAAI,KAAK,IAAI,IAAI,eAAe,GAAG;AAC/B,YAAM,kBAAkB,KAAK,IAAI,IAAI,eAAe;AACpD,UAAI,iBAAiB;AACjB,cAAM,gBAAgB,MAAM;AAAA,MAChC;AAAA,IACJ;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,+BACI,sBACA,cACF;AACE,QAAI,KAAK,SAAS,+BAA+B,QAAW;AAExD,YAAM,IAAI,cAAc,2CAA2C;AAAA,IACvE;AACA,WAAO;AAAA,MACH,0CAA0C,oBAAoB,gBAAgB,KAAK,QAAQ,SAAS,IAAI;AAAA,IAC5G;AACA,SAAK,SAAS,6BAA6B,KAAK;AAAA,MAC5C;AAAA,MACA,uBAAuB;AAAA,MACvB,KAAK,SAAS,KAAK,qBAAqB;AAAA,IAC5C,EAAE,MAAM;AAER,UAAM,cAAc,KAAK,QAAQ;AAEjC,SAAK,MAAM,eAAe;AAC1B,SAAK,MAAM,mBAAmB,YAAY;AAC1C,SAAK,MAAM,gBAAgB,YAAY;AAEvC,UAAM,iBAAiB,KAAK,SAAS,KAAK,sBAAsB;AAEhE,SAAK,SAAS,iCAAiC,MAAM;AACjD,kBAAY,qBAAqB,cAAc;AAAA,IACnD;AAEA,SAAK,QAAQ,iBAAiB,kBAAkB,cAAc;AAAA,EAClE;AAAA;AAAA;AAAA;AAAA,EAKA,uCAAuC,sBAA8B,cAAkC;AACnG,QAAI,KAAK,SAAS,+BAA+B,QAAW;AACxD,YAAM,IAAI,2BAA2B,UAAU,0CAA0C;AAAA,IAC7F;AAEA,QAAI,uBAAuB,KAAK,SAAS,8BAA8B;AACnE,YAAM,IAAI;AAAA,QACN,yCAAyC,KAAK,SAAS,4BAA4B;AAAA,QACnF,WAAW;AAAA,MACf;AAAA,IACJ;AAEA,QAAI,uBAAuB,KAAK,SAAS,8BAA8B;AACnE,YAAM,IAAI;AAAA,QACN,gDAAgD,KAAK,SAAS,4BAA4B;AAAA,QAC1F,WAAW;AAAA,MACf;AAAA,IACJ;AAEA,QAAI,aAAa,iBAAiB;AAC9B,YAAM,IAAI,2BAA2B,UAAU,yDAAyD;AAAA,IAC5G;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA,EAKA,oBAAoB;AAChB,WAAO,MAAM,2BAA2B;AACxC,QAAI,KAAK,SAAS,+BAA+B,QAAW;AACxD,WAAK,SAAS,2BAA2B,KAAK;AAC9C,WAAK,SAAS,6BAA6B;AAAA,IAC/C;AAEA,SAAK,SAAS,iCAAiC;AAC/C,SAAK,MAAM,mBAAmB;AAE9B,SAAK,MAAM,eAAe,2BAA2B,0BAA0B;AAC/E,SAAK,MAAM,mBAAmB;AAC9B,SAAK,MAAM,gBAAgB;AAAA,EAC/B;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,4BAA4B;AAC9B,UAAM,KAAK,IAAI,IAAI,kBAAkB,EAAE,iBAAiB;AAAA,EAC5D;AAAA;AAAA;AAAA;AAAA,EAKA,wBAAwB;AACpB,SAAK,IAAI,QAAQ,IAAI,KAAK,0BAA0B,CAAC;AAAA,EACzD;AAAA;AAAA;AAAA;AAAA,EAKA,yBAAyB;AACrB,SAAK,MAAM,mBAAmB;AAC9B,SAAK,SAAS,iCAAiC;AAAA,EACnD;AAAA;AAAA;AAAA;AAAA,EAKA,CAAU,OAAO,YAAY,IAAI;AAC7B,QAAI,KAAK,SAAS,+BAA+B,QAAW;AACxD,WAAK,SAAS,2BAA2B,KAAK;AAC9C,WAAK,SAAS,6BAA6B;AAAA,IAC/C;AAAA,EACJ;AACJ;AAAA,CAEO,CAAUA,sCAAV;AAAA,EACI,MAAM,SAAS;AAAA,IAClB;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,IAKA,+BAA+B;AAAA;AAAA;AAAA;AAAA,IAK/B,+BAA+B;AAAA,EACnC;AAbO,EAAAA,kCAAM;AAAA,EAeN,MAAM,cAAc,mCAAmC,MAAM;AAAA;AAAA,IAEvD,eAAe,2BAA2B,0BAA0B;AAAA,EACjF;AAHO,EAAAA,kCAAM;AAAA,GAhBA;",
+  "mappings": "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",
   "names": ["AdministratorCommissioningServer"]
 }

package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAA2B,YAAY,EAAE,MAAM,UAAU,CAAC;AAGjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAMjF;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,4BAA4B;;IAChE,KAAK,EAAE,0BAA0B,CAAC,KAAK,CAAC;IAEhD,OAAgB,YAAY,UAAS;IAE5B,UAAU,IAAI,YAAY;IA+F1B,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,kBAAkB;;;;IAItD,mBAAmB,CAAC,EAC/B,UAAU,EACV,mBAAmB,EACnB,WAAW,GACd,EAAE,oBAAoB,CAAC,0BAA0B;;;;IAyEnC,qBAAqB;;;;CA4CvC;AAED,yBAAiB,0BAA0B,CAAC;IAGxC,MAAa,KAAM,SAAQ,4BAA4B,CAAC,KAAK;QACzD;;WAEG;QACH,sBAAsB,UAAQ;QAE9B;;WAEG;QACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAa;KAC/C;CACJ"}
+{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAA8C,YAAY,EAAE,MAAM,UAAU,CAAC;AAGpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAMjF;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,4BAA4B;;IAChE,KAAK,EAAE,0BAA0B,CAAC,KAAK,CAAC;IAEhD,OAAgB,YAAY,UAAS;IAE5B,UAAU,IAAI,YAAY;IA+F1B,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,kBAAkB;;;;IAItD,mBAAmB,CAAC,EAC/B,UAAU,EACV,mBAAmB,EACnB,WAAW,GACd,EAAE,oBAAoB,CAAC,0BAA0B;;;;IAyEnC,qBAAqB;;;;CAkDvC;AAED,yBAAiB,0BAA0B,CAAC;IAGxC,MAAa,KAAM,SAAQ,4BAA4B,CAAC,KAAK;QACzD;;WAEG;QACH,sBAAsB,UAAQ;QAE9B;;WAEG;QACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAa;KAC/C;CACJ"}

package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js

@@ -7,7 +7,7 @@ import { AdministratorCommissioningServer } from "#behaviors/administrator-commi
 import { BasicInformationServer } from "#behaviors/basic-information";
 import { AdministratorCommissioning } from "#clusters/administrator-commissioning";
 import { GeneralCommissioning } from "#clusters/general-commissioning";
-import { Logger, MatterFlowError } from "#general";
+import { Bytes, Diagnostic, Logger, MatterFlowError } from "#general";
 import { DeviceCommissioner, FabricManager, GroupSession, NodeSession, SecureSession, SessionManager } from "#protocol";
 import { GeneralCommissioningBehavior } from "./GeneralCommissioningBehavior.js";
 import { ServerNodeFailsafeContext } from "./ServerNodeFailsafeContext.js";
@@ -155,7 +155,13 @@ class GeneralCommissioningServer extends GeneralCommissioningBehavior {
     }
     await failsafeContext.completeCommission();
     this.state.breadcrumb = BigInt(0);
-    logger.info(`Commissioning completed on fabric #${fabric.fabricId} as node #${fabric.nodeId}.`);
+    logger.info(
+      "Commissioned",
+      Diagnostic.dict({
+        fabric: `${Bytes.toHex(fabric.operationalId)} (#${fabric.fabricIndex})`,
+        node: fabric.nodeId.toString(16).padStart(16, "0")
+      })
+    );
     return SuccessResponse;
   }
 }

package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/node",
-    "version": "0.16.0-alpha.0-20250809-ee8375bcb",
+    "version": "0.16.0-alpha.0-20250812-285b75d83",
     "description": "API for building Matter nodes",
     "keywords": [
         "iot",
@@ -42,14 +42,14 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.16.0-alpha.0-20250809-ee8375bcb",
-        "@matter/model": "0.16.0-alpha.0-20250809-ee8375bcb",
-        "@matter/types": "0.16.0-alpha.0-20250809-ee8375bcb",
-        "@matter/protocol": "0.16.0-alpha.0-20250809-ee8375bcb"
+        "@matter/general": "0.16.0-alpha.0-20250812-285b75d83",
+        "@matter/model": "0.16.0-alpha.0-20250812-285b75d83",
+        "@matter/types": "0.16.0-alpha.0-20250812-285b75d83",
+        "@matter/protocol": "0.16.0-alpha.0-20250812-285b75d83"
     },
     "devDependencies": {
-        "@matter/tools": "0.16.0-alpha.0-20250809-ee8375bcb",
-        "@matter/testing": "0.16.0-alpha.0-20250809-ee8375bcb"
+        "@matter/tools": "0.16.0-alpha.0-20250812-285b75d83",
+        "@matter/testing": "0.16.0-alpha.0-20250812-285b75d83"
     },
     "files": [
         "dist/**/*",

package/src/behavior/system/commissioning/CommissioningServer.ts

@@ -22,6 +22,7 @@ import type { Node } from "#node/Node.js";
 import { NodeLifecycle } from "#node/NodeLifecycle.js";
 import type { ServerNode } from "#node/ServerNode.js";
 import {
+    BleAdvertiser,
     CommissioningConfigProvider,
     DeviceAdvertiser,
     DeviceCommissioner,
@@ -29,6 +30,7 @@ import {
     FabricAction,
     FabricManager,
     FailsafeContext,
+    MdnsAdvertiser,
     PaseClient,
     Val,
 } from "#protocol";
@@ -93,6 +95,8 @@ export class CommissioningServer extends Behavior {
         this.reactTo((this.endpoint as Node).lifecycle.online, this.#enterOnlineMode);
 
         this.reactTo((this.endpoint as Node).lifecycle.goingOffline, this.#enterOfflineMode);
+
+        this.reactTo(this.env.get(FabricManager).events.added, this.enterOperationalMode);
     }
 
     override async [Symbol.asyncDispose]() {
@@ -196,7 +200,7 @@ export class CommissioningServer extends Behavior {
         failsafe.construction.change.on(listener);
     }
 
-    #enterOnlineMode() {
+    async #enterOnlineMode() {
         // If already commissioned, trigger operational announcement
         if ((this.endpoint.lifecycle as NodeLifecycle).isCommissioned) {
             this.enterOperationalMode();
@@ -219,7 +223,7 @@ export class CommissioningServer extends Behavior {
         }
 
         // Advertise as commissionable
-        this.enterCommissionableMode();
+        await this.enterCommissionableMode();
     }
 
     #enterOfflineMode() {
@@ -237,20 +241,14 @@ export class CommissioningServer extends Behavior {
      * The server normally invokes this method when the node starts and is not yet commissioned.  You can disable by
      * setting {@link CommissioningServer.State#enabled} to false.  Then you must invoke yourself.
      */
-    enterCommissionableMode() {
+    async enterCommissionableMode() {
         if (!this.#hasAdvertisableDeviceType) {
             throw new ImplementationError(
                 `Node ${this.endpoint} has no endpoints with advertisable device types; you must add an endpoint or set the device type`,
             );
         }
 
-        // Ensure a device commissioner is loaded
-        //
-        // TODO - DeviceCommissioner/DeviceAdvertiser API is convoluted; refactor to allow directly moving to the
-        // desired mode
-        this.env.get(DeviceCommissioner);
-
-        this.beginAdvertising();
+        await this.env.get(DeviceCommissioner).allowBasicCommissioning();
 
         this.initiateCommissioning();
     }
@@ -260,7 +258,11 @@ export class CommissioningServer extends Behavior {
      * commissioning.
      */
     protected enterOperationalMode() {
-        this.beginAdvertising();
+        if (!(this.endpoint.lifecycle as NodeLifecycle).isOnline) {
+            throw new ImplementationError("Cannot advertise offline server");
+        }
+
+        this.env.get(DeviceAdvertiser).enterOperationalMode();
     }
 
     /**
@@ -330,21 +332,6 @@ export class CommissioningServer extends Behavior {
         ],
     });
 
-    /**
-     * Advertise and continue advertising at regular intervals until timeout per Matter specification.  If already
-     * advertising, the advertisement timeout resets.
-     */
-    beginAdvertising() {
-        if (!(this.endpoint.lifecycle as NodeLifecycle).isOnline) {
-            throw new ImplementationError("Cannot advertise offline server");
-        }
-
-        this.env
-            .get(DeviceAdvertiser)
-            .startAdvertising()
-            .catch(error => logger.error("Failed to open advertisement window", error));
-    }
-
     #initializeNode() {
         this.state.commissioned = !!this.agent.get(OperationalCredentialsBehavior).state.commissionedFabrics;
         (this.endpoint.lifecycle as NodeLifecycle).initialized.emit(this.state.commissioned);
@@ -389,6 +376,8 @@ export namespace CommissioningServer {
         flowType = CommissioningFlowType.Standard;
         additionalBleAdvertisementData?: Uint8Array = undefined;
         pairingCodes = {} as PairingCodes;
+        mdns?: MdnsAdvertiser.Options;
+        ble?: BleAdvertiser.Options;
 
         [Val.properties](endpoint: Endpoint) {
             return {

package/src/behavior/system/controller/ControllerBehavior.ts

@@ -17,7 +17,7 @@ import {
     FabricAuthority,
     FabricAuthorityConfigurationProvider,
     FabricManager,
-    MdnsScanner,
+    MdnsClient,
     MdnsScannerTargetCriteria,
     MdnsService,
     Scanner,
@@ -54,14 +54,14 @@ export class ControllerBehavior extends Behavior {
             this.state.ip = true;
         }
         if (this.state.ip !== false) {
-            this.env.get(ScannerSet).add((await this.env.load(MdnsService)).scanner);
+            this.env.get(ScannerSet).add((await this.env.load(MdnsService)).client);
         }
 
         if (this.state.ble === undefined) {
             this.state.ble = (await this.agent.load(NetworkServer)).state.ble;
         }
         if (this.state.ble !== false) {
-            this.env.get(ScannerSet).add(Ble.get().getBleScanner());
+            this.env.get(ScannerSet).add(Ble.get().scanner);
         }
 
         // Configure management of controlled fabrics
@@ -118,7 +118,7 @@ export class ControllerBehavior extends Behavior {
             }
         }
         if (this.state.ble) {
-            netInterfaces.add(Ble.get().getBleCentralInterface());
+            netInterfaces.add(Ble.get().centralInterface);
         }
 
         // Install handler to receive data reports for subscriptions
@@ -166,7 +166,7 @@ export class ControllerBehavior extends Behavior {
     }
 
     #enableScanningForScanner(scanner: Scanner) {
-        if (!(scanner instanceof MdnsScanner)) {
+        if (!(scanner instanceof MdnsClient)) {
             return;
         }
         scanner.targetCriteriaProviders.add(this.internal.mdnsTargetCriteria);

package/src/behavior/system/controller/discovery/ActiveDiscoveries.ts

@@ -5,7 +5,7 @@
  */
 
 import { Environment, Environmental } from "#general";
-import { MdnsScanner, MdnsScannerTargetCriteria, Scanner, ScannerSet } from "#protocol";
+import { MdnsClient, MdnsScannerTargetCriteria, Scanner, ScannerSet } from "#protocol";
 import type { Discovery } from "./Discovery.js";
 
 /**
@@ -44,7 +44,7 @@ export class ActiveDiscoveries extends Set<Discovery<any>> {
     }
 
     #activateCommissionableScanningFor(scanner: Scanner) {
-        if (!(scanner instanceof MdnsScanner)) {
+        if (!(scanner instanceof MdnsClient)) {
             return;
         }
 
@@ -60,7 +60,7 @@ export class ActiveDiscoveries extends Set<Discovery<any>> {
         }
         const scanners = this.#env.get(ScannerSet);
         for (const scanner of scanners) {
-            if (scanner instanceof MdnsScanner) {
+            if (scanner instanceof MdnsClient) {
                 scanner.targetCriteriaProviders.delete(this.#mdnsTargetCriteria);
             }
         }

package/src/behavior/system/network/ServerNetworkRuntime.ts

@@ -7,6 +7,7 @@
 import { SubscriptionBehavior } from "#behavior/system/subscription/SubscriptionBehavior.js";
 import {
     Construction,
+    Crypto,
     InterfaceType,
     Logger,
     NetInterfaceSet,
@@ -23,13 +24,14 @@ import type { ServerNode } from "#node/ServerNode.js";
 import { NodePeerAddressStore } from "#node/client/NodePeerAddressStore.js";
 import { InteractionServer } from "#node/server/InteractionServer.js";
 import {
+    Advertiser,
     Ble,
+    BleAdvertiser,
     ChannelManager,
     DeviceAdvertiser,
     DeviceCommissioner,
     ExchangeManager,
-    InstanceBroadcaster,
-    MdnsInstanceBroadcaster,
+    MdnsAdvertiser,
     MdnsService,
     PeerAddressStore,
     PeerSet,
@@ -58,8 +60,8 @@ function convertNetworkEnvironmentType(type: string | number) {
  * Handles network functionality for {@link NodeServer}.
  */
 export class ServerNetworkRuntime extends NetworkRuntime {
-    #mdnsBroadcaster?: MdnsInstanceBroadcaster;
-    #bleBroadcaster?: InstanceBroadcaster;
+    #mdnsAdvertiser?: MdnsAdvertiser;
+    #bleAdvertiser?: BleAdvertiser;
     #bleTransport?: TransportInterface;
     #ipv6UdpInterface?: UdpInterface;
     #observers = new ObserverGroup(this);
@@ -71,15 +73,17 @@ export class ServerNetworkRuntime extends NetworkRuntime {
     }
 
     /**
-     * Access the MDNS broadcaster for the node.
+     * Access the MDNS advertiser for the node.
      */
-    get mdnsBroadcaster() {
-        if (!this.#mdnsBroadcaster) {
-            this.#mdnsBroadcaster = this.owner.env
-                .get(MdnsService)
-                .createInstanceBroadcaster(this.owner.state.network.operationalPort);
+    get mdnsAdvertiser() {
+        if (!this.#mdnsAdvertiser) {
+            const port = this.owner.state.network.operationalPort;
+            const options = this.owner.state.commissioning.mdns;
+            const crypto = this.owner.env.get(Crypto);
+            const { server } = this.owner.env.get(MdnsService);
+            this.#mdnsAdvertiser = new MdnsAdvertiser(crypto, server, { ...options, port });
         }
-        return this.#mdnsBroadcaster;
+        return this.#mdnsAdvertiser;
     }
 
     get networkInterfaceConfiguration(): NetworkInterface[] {
@@ -109,14 +113,15 @@ export class ServerNetworkRuntime extends NetworkRuntime {
     }
 
     /**
-     * A BLE broadcaster.
+     * A BLE advertiser.
      */
-    protected get bleBroadcaster() {
-        if (this.#bleBroadcaster === undefined) {
-            const bleData = this.owner.state.commissioning.additionalBleAdvertisementData;
-            this.#bleBroadcaster = Ble.get().getBleBroadcaster(bleData);
+    protected get bleAdvertiser() {
+        if (this.#bleAdvertiser === undefined) {
+            const { peripheralInterface } = Ble.get();
+            const options = this.owner.state.commissioning.ble;
+            this.#bleAdvertiser = new BleAdvertiser(peripheralInterface, options);
         }
-        return this.#bleBroadcaster;
+        return this.#bleAdvertiser;
     }
 
     /**
@@ -124,7 +129,7 @@ export class ServerNetworkRuntime extends NetworkRuntime {
      */
     protected get bleTransport() {
         if (this.#bleTransport === undefined) {
-            this.#bleTransport = Ble.get().getBlePeripheralInterface();
+            this.#bleTransport = Ble.get().peripheralInterface;
         }
         return this.#bleTransport;
     }
@@ -177,7 +182,7 @@ export class ServerNetworkRuntime extends NetworkRuntime {
      * Add broadcasters to the {@link DeviceAdvertiser}.
      */
     protected async addBroadcasters(advertiser: DeviceAdvertiser) {
-        await advertiser.clearBroadcasters();
+        await advertiser.clearAdvertisers();
 
         const isCommissioned = !!this.#commissionedFabrics;
 
@@ -189,23 +194,23 @@ export class ServerNetworkRuntime extends NetworkRuntime {
         }
 
         if (discoveryCapabilities.onIpNetwork) {
-            advertiser.addBroadcaster(this.mdnsBroadcaster);
+            advertiser.addAdvertiser(this.mdnsAdvertiser);
         }
 
         if (discoveryCapabilities.ble) {
-            advertiser.addBroadcaster(this.bleBroadcaster);
+            advertiser.addAdvertiser(this.bleAdvertiser);
         }
     }
 
     /**
      * When the first Fabric gets added we need to enable MDNS broadcasting.
      */
-    enableMdnsBroadcasting() {
-        const advertiser = this.owner.env.get(DeviceAdvertiser);
-        const mdnsBroadcaster = this.mdnsBroadcaster;
-        if (!advertiser.hasBroadcaster(mdnsBroadcaster)) {
-            logger.debug("Enabling MDNS broadcasting");
-            advertiser.addBroadcaster(mdnsBroadcaster);
+    enableMdnsAdvertising() {
+        const device = this.owner.env.get(DeviceAdvertiser);
+        const mdnsAdvertiser = this.mdnsAdvertiser;
+        if (!device.hasAdvertiser(mdnsAdvertiser)) {
+            logger.debug("Enabling MDNS advertising");
+            device.addAdvertiser(mdnsAdvertiser);
         }
     }
 
@@ -217,29 +222,28 @@ export class ServerNetworkRuntime extends NetworkRuntime {
     endUncommissionedMode() {
         // Ensure MDNS broadcasting are active when the first fabric is added.  It might not be active initially if the
         // node was not on an IP network prior to commissioning
-        this.enableMdnsBroadcasting();
+        this.enableMdnsAdvertising();
 
-        if (this.#bleBroadcaster) {
-            this.owner.env.runtime.add(this.#removeBleBroadcaster(this.#bleBroadcaster));
-            this.#bleBroadcaster = undefined;
+        if (this.#bleAdvertiser) {
+            this.owner.env.runtime.add(this.#deleteAdvertiser(this.#bleAdvertiser));
+            this.#bleAdvertiser = undefined;
         }
 
         if (this.#bleTransport) {
-            this.owner.env.runtime.add(this.#removeBleTransport(this.#bleTransport));
+            this.owner.env.runtime.add(this.#deleteTransport(this.#bleTransport));
             this.#bleTransport = undefined;
         }
     }
 
-    async #removeBleBroadcaster(bleBroadcaster: InstanceBroadcaster) {
-        const advertiser = this.owner.env.get(DeviceAdvertiser);
-        await advertiser.deleteBroadcaster(bleBroadcaster);
-        await bleBroadcaster.close();
+    async #deleteAdvertiser(advertiser: Advertiser) {
+        const device = this.owner.env.get(DeviceAdvertiser);
+        await device.deleteAdvertiser(advertiser);
     }
 
-    async #removeBleTransport(bleTransport: TransportInterface) {
+    async #deleteTransport(transport: TransportInterface) {
         const transportInterfaces = this.owner.env.get(TransportInterfaceSet);
-        transportInterfaces.delete(bleTransport);
-        await bleTransport.close();
+        transportInterfaces.delete(transport);
+        await transport.close();
     }
 
     get #commissionedFabrics() {
@@ -285,15 +289,20 @@ export class ServerNetworkRuntime extends NetworkRuntime {
         // Monitor CommissioningServer to end "uncommissioned" mode when we are commissioned
         this.#observers.on(this.owner.eventsOf(CommissioningServer).commissioned, this.endUncommissionedMode);
 
-        // Monitor DeviceAdvertiser to enable MDNS broadcasting when the first Fabric is added
-        this.#observers.on(advertiser.operationalModeEnabled, this.enableMdnsBroadcasting);
+        // Enable MDNS broadcasting if there are fabrics present
+        if (this.owner.stateOf(CommissioningServer).commissioned) {
+            this.enableMdnsAdvertising();
+        }
     }
 
     override async [Construction.construct]() {
         await super[Construction.construct]();
 
+        // Initialize MDNS
+        const mdns = await this.owner.env.load(MdnsService);
+
         // Initialize ScannerSet
-        this.owner.env.get(ScannerSet).add((await this.owner.env.load(MdnsService)).scanner);
+        this.owner.env.get(ScannerSet).add(mdns.client);
         this.owner.env.set(PeerAddressStore, new NodePeerAddressStore(this.owner));
         await this.owner.env.load(PeerSet);
 
@@ -317,8 +326,8 @@ export class ServerNetworkRuntime extends NetworkRuntime {
         // We kick-off the Advertiser shutdown to prevent re-announces when removing sessions and wait a bit later
         const advertisementShutdown = this.owner.env.has(DeviceAdvertiser)
             ? this.owner.env.close(DeviceAdvertiser)
-            : this.#mdnsBroadcaster?.close();
-        this.#mdnsBroadcaster = undefined;
+            : this.#mdnsAdvertiser?.close();
+        this.#mdnsAdvertiser = undefined;
 
         await this.owner.prepareRuntimeShutdown();
 

package/src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts

@@ -10,10 +10,10 @@ import { AccessLevel } from "#model";
 import { DeviceCommissioner, FailsafeContext, PaseServer, SessionManager } from "#protocol";
 import {
     Command,
-    MAXIMUM_COMMISSIONING_TIMEOUT_S,
     MINIMUM_COMMISSIONING_TIMEOUT_S,
     PAKE_PASSCODE_VERIFIER_LENGTH,
-    StatusCode,
+    STANDARD_COMMISSIONING_TIMEOUT_S,
+    Status,
     StatusResponseError,
     TlvByteString,
     TlvField,
@@ -186,14 +186,14 @@ export class AdministratorCommissioningServer extends AdministratorCommissioning
         if (commissioningTimeout > this.internal.maximumCommissioningTimeoutS) {
             throw new StatusResponseError(
                 `Commissioning timeout must not exceed ${this.internal.maximumCommissioningTimeoutS} seconds.`,
-                StatusCode.InvalidCommand,
+                Status.InvalidCommand,
             );
         }
 
         if (commissioningTimeout < this.internal.minimumCommissioningTimeoutS) {
             throw new StatusResponseError(
                 `Commissioning timeout must not be lower then ${this.internal.minimumCommissioningTimeoutS} seconds.`,
-                StatusCode.InvalidCommand,
+                Status.InvalidCommand,
             );
         }
 
@@ -206,7 +206,7 @@ export class AdministratorCommissioningServer extends AdministratorCommissioning
      * This method is used internally when the commissioning window timer expires or the commissioning was completed.
      */
     #endCommissioning() {
-        logger.debug("End commissioning window.");
+        logger.debug("Ending commissioning");
         if (this.internal.commissioningWindowTimeout !== undefined) {
             this.internal.commissioningWindowTimeout.stop();
             this.internal.commissioningWindowTimeout = undefined;
@@ -264,9 +264,10 @@ export namespace AdministratorCommissioningServer {
         minimumCommissioningTimeoutS = MINIMUM_COMMISSIONING_TIMEOUT_S;
 
         /**
-         * Mandated by spec; should only be modified in testing.
+         * Commissioning beyond the standard 15-minute window is "extended commissioning" and has limitations on
+         * advertisement.  We default to the standard window.
          */
-        maximumCommissioningTimeoutS = MAXIMUM_COMMISSIONING_TIMEOUT_S;
+        maximumCommissioningTimeoutS = STANDARD_COMMISSIONING_TIMEOUT_S;
     }
 
     export class State extends AdministratorCommissioningBehavior.State {

package/src/behaviors/general-commissioning/GeneralCommissioningServer.ts

@@ -8,7 +8,7 @@ import { AdministratorCommissioningServer } from "#behaviors/administrator-commi
 import { BasicInformationServer } from "#behaviors/basic-information";
 import { AdministratorCommissioning } from "#clusters/administrator-commissioning";
 import { GeneralCommissioning } from "#clusters/general-commissioning";
-import { Logger, MatterFlowError, MaybePromise } from "#general";
+import { Bytes, Diagnostic, Logger, MatterFlowError, MaybePromise } from "#general";
 import type { ServerNode } from "#node/ServerNode.js";
 import { DeviceCommissioner, FabricManager, GroupSession, NodeSession, SecureSession, SessionManager } from "#protocol";
 import { GeneralCommissioningBehavior } from "./GeneralCommissioningBehavior.js";
@@ -241,7 +241,13 @@ export class GeneralCommissioningServer extends GeneralCommissioningBehavior {
         // 5. The Breadcrumb attribute SHALL be reset to zero.
         this.state.breadcrumb = BigInt(0);
 
-        logger.info(`Commissioning completed on fabric #${fabric.fabricId} as node #${fabric.nodeId}.`);
+        logger.info(
+            "Commissioned",
+            Diagnostic.dict({
+                fabric: `${Bytes.toHex(fabric.operationalId)} (#${fabric.fabricIndex})`,
+                node: fabric.nodeId.toString(16).padStart(16, "0"),
+            }),
+        );
 
         return SuccessResponse;
     }