@matter/protocol 0.12.0-alpha.0-20250108-7ae2a767d → 0.12.0-alpha.0-20250110-6349da2f0

package/dist/esm/peer/ControllerCommissioningFlow.js

@@ -9,7 +9,7 @@ import { GeneralCommissioning } from "#clusters/general-commissioning";
 import { NetworkCommissioning } from "#clusters/network-commissioning";
 import { OperationalCredentials } from "#clusters/operational-credentials";
 import { TimeSynchronizationCluster } from "#clusters/time-synchronization";
-import { Bytes, ChannelType, Crypto, Logger, MatterError, Time, UnexpectedDataError, repackErrorAs } from "#general";
+import { Bytes, ChannelType, Crypto, Logger, MatterError, repackErrorAs, Time, UnexpectedDataError } from "#general";
 import {
   EndpointNumber,
   StatusResponseError
@@ -62,9 +62,15 @@ class ControllerCommissioningFlow {
    */
   async executeCommissioning() {
     this.#sortSteps();
+    let failSafeTimerReArmedAfterPreviousStep = false;
     for (const step of this.#commissioningSteps) {
       logger.info(`Executing commissioning step ${step.stepNumber}.${step.subStepNumber}: ${step.name}`);
       try {
+        if (step.reArmFailsafe && !failSafeTimerReArmedAfterPreviousStep) {
+          logger.debug(`Re-Arming failsafe timer before executing step`);
+          await this.#armFailsafe();
+        }
+        failSafeTimerReArmedAfterPreviousStep = false;
         const result = await step.stepLogic();
         this.#setCommissioningStepResult(step, result);
         if (this.#lastFailSafeTime !== void 0) {
@@ -82,6 +88,7 @@ class ControllerCommissioningFlow {
               )}s elapsed since last arm failsafe, re-arming failsafe`
             );
             await this.#armFailsafe();
+            failSafeTimerReArmedAfterPreviousStep = true;
           }
         }
         if (result.code === 3 /* Stop */) {
@@ -193,6 +200,7 @@ class ControllerCommissioningFlow {
           // includes step 13
           subStepNumber: 2,
           name: "NetworkCommissioning.Wifi",
+          reArmFailsafe: true,
           stepLogic: () => this.#configureNetworkWifi()
         });
       }
@@ -202,6 +210,7 @@ class ControllerCommissioningFlow {
           // includes step 13
           subStepNumber: 3,
           name: "NetworkCommissioning.Thread",
+          reArmFailsafe: true,
           stepLogic: () => this.#configureNetworkThread()
         });
       }
@@ -215,6 +224,7 @@ class ControllerCommissioningFlow {
       // includes step 15 (CASE connection)
       subStepNumber: 1,
       name: "Reconnect",
+      reArmFailsafe: true,
       stepLogic: () => this.#reconnectWithDevice()
     });
     this.#commissioningSteps.push({
@@ -840,12 +850,35 @@ class ControllerCommissioningFlow {
    *
    */
   async #reconnectWithDevice() {
-    logger.debug("Reconnecting with device ...");
+    const isConcurrentFlow = this.#collectedCommissioningData.supportsConcurrentConnection !== false;
+    logger.debug(`Reconnecting with device with ${isConcurrentFlow ? "concurrent" : "non-concurrent"} flow ...`);
+    const reArmFailsafeInterval = Time.getPeriodicTimer(
+      "Re-Arm Failsafe during reconnect",
+      this.#failSafeTimeMs / 2,
+      () => {
+        const now = Time.nowMs();
+        if (this.#commissioningExpiryTime !== void 0 && now < this.#commissioningExpiryTime) {
+          logger.error(
+            `Re-Arm Failsafe Timer during reconnect with device. Time left: ${Math.round((this.#commissioningExpiryTime - now) / 1e3)}s`
+          );
+          this.#armFailsafe().catch((error) => {
+            logger.error("Error while re-arming failsafe during reconnect", error);
+            reArmFailsafeInterval.stop();
+          });
+        } else {
+          reArmFailsafeInterval.stop();
+        }
+      }
+    );
+    if (isConcurrentFlow) {
+      reArmFailsafeInterval.start();
+    }
     const transitionResult = await this.#transitionToCase(
       this.#interactionClient.address,
       // Assume concurrent connections are supported if not know (which should not be the case when we came here)
-      this.#collectedCommissioningData.supportsConcurrentConnection ?? true
+      isConcurrentFlow
     );
+    reArmFailsafeInterval.stop();
     if (transitionResult === void 0) {
       logger.debug("CASE commissioning handled externally, terminating commissioning flow");
       return {

package/dist/esm/peer/ControllerCommissioningFlow.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"DeviceAdvertiser.d.ts","sourceRoot":"","sources":["../../../src/protocol/DeviceAdvertiser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACvH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACH,eAAe,EAEf,WAAW,EACX,aAAa,EAOhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAK5D;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,gBAAgB;;gBAiBb,OAAO,EAAE,uBAAuB;IA6B5C,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAS9C;;OAEG;IACH,IAAI,QAAQ,8BAEX;IAED;;OAEG;IACH,IAAI,oBAAoB,8BAEvB;IAED;;OAEG;IACH,IAAI,sBAAsB,8BAEzB;IAEK,sBAAsB,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,6BAA6B;IAQzF,qBAAqB;IASrB,gBAAgB;IAUhB,SAAS,CAAC,IAAI,UAAQ;IA0CtB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,+BAA+B,UAAQ;IAmB3E,KAAK;IAOX,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAI/C,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAIzC,iBAAiB,CAAC,WAAW,EAAE,mBAAmB;IAMlD,iBAAiB;CAS1B"}
+{"version":3,"file":"DeviceAdvertiser.d.ts","sourceRoot":"","sources":["../../../src/protocol/DeviceAdvertiser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACvH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACH,eAAe,EAEf,WAAW,EACX,aAAa,EAOhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAK5D;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,gBAAgB;;gBAiBb,OAAO,EAAE,uBAAuB;IAgC5C,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAS9C;;OAEG;IACH,IAAI,QAAQ,8BAEX;IAED;;OAEG;IACH,IAAI,oBAAoB,8BAEvB;IAED;;OAEG;IACH,IAAI,sBAAsB,8BAEzB;IAEK,sBAAsB,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,6BAA6B;IAQzF,qBAAqB;IASrB,gBAAgB;IAUhB,SAAS,CAAC,IAAI,UAAQ;IA6CtB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,+BAA+B,UAAQ;IAmB3E,KAAK;IAOX,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAI/C,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAIzC,iBAAiB,CAAC,WAAW,EAAE,mBAAmB;IAMlD,iBAAiB;CAS1B"}

package/dist/esm/protocol/DeviceAdvertiser.js

@@ -47,6 +47,8 @@ class DeviceAdvertiser {
     this.#observers.on(this.#context.fabrics.events.deleted, async () => {
       if (this.#context.fabrics.length === 0) {
         await this.#exitOperationalMode();
+      } else {
+        await this.advertise(true);
       }
     });
     this.#observers.on(this.#context.sessions.resubmissionStarted, (session) => {
@@ -131,7 +133,10 @@ class DeviceAdvertiser {
         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({ fabric: fabric.fabricId }));
+          logger.debug(
+            "Announcing",
+            Diagnostic.dict({ fabricIndex: fabric.fabricIndex, fabricId: fabric.fabricId })
+          );
         }
       }
       for (const broadcaster of this.#broadcasters) {

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.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,EAGH,WAAW,EACX,aAAa,EAKb,YAAY,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC/D,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;IAsC9C,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;IAoBrE,UAAU,CAAC,eAAe,EAAE,eAAe;IAwBjD,IAAI,eAAe,YAElB;IAED,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM;IAQpC,oBAAoB;IAsDd,gBAAgB;IA0BhB,KAAK;CAQd"}
+{"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,EAGH,WAAW,EACX,aAAa,EAKb,YAAY,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC/D,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;IAoBrE,UAAU,CAAC,eAAe,EAAE,eAAe;IAwBjD,IAAI,eAAe,YAElB;IAED,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM;IAQpC,oBAAoB;IAsDd,gBAAgB;IA0BhB,KAAK;CAQd"}

package/dist/esm/protocol/DeviceCommissioner.js

@@ -33,7 +33,11 @@ class DeviceCommissioner {
   constructor(context) {
     this.#context = context;
     this.#observers.on(this.#context.advertiser.timedOut, this.endCommissioning);
-    this.#observers.on(this.#context.fabrics.events.deleted, this.reactivateAdvertiser);
+    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");

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/protocol",
-    "version": "0.12.0-alpha.0-20250108-7ae2a767d",
+    "version": "0.12.0-alpha.0-20250110-6349da2f0",
     "description": "Low-level APIs for Matter interaction",
     "keywords": [
         "iot",
@@ -40,14 +40,14 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.12.0-alpha.0-20250108-7ae2a767d",
-        "@matter/model": "0.12.0-alpha.0-20250108-7ae2a767d",
-        "@matter/types": "0.12.0-alpha.0-20250108-7ae2a767d",
+        "@matter/general": "0.12.0-alpha.0-20250110-6349da2f0",
+        "@matter/model": "0.12.0-alpha.0-20250110-6349da2f0",
+        "@matter/types": "0.12.0-alpha.0-20250110-6349da2f0",
         "@noble/curves": "^1.8.0"
     },
     "devDependencies": {
-        "@matter/tools": "0.12.0-alpha.0-20250108-7ae2a767d",
-        "@matter/testing": "0.12.0-alpha.0-20250108-7ae2a767d"
+        "@matter/tools": "0.12.0-alpha.0-20250110-6349da2f0",
+        "@matter/testing": "0.12.0-alpha.0-20250110-6349da2f0"
     },
     "files": [
         "dist/**/*",

package/src/interaction/ServerSubscription.ts

@@ -676,9 +676,9 @@ export class ServerSubscription extends Subscription {
                 attributes.push({ path, value, version, schema: attribute.schema, attribute });
             } catch (error) {
                 if (StatusResponseError.is(error, StatusCode.UnsupportedAccess)) {
-                    logger.error(`Permission denied reading attribute ${this.#structure.resolveAttributeName(path)}`);
+                    logger.warn(`Permission denied reading attribute ${this.#structure.resolveAttributeName(path)}`);
                 } else {
-                    logger.error(`Error reading attribute ${this.#structure.resolveAttributeName(path)}:`, error);
+                    logger.warn(`Error reading attribute ${this.#structure.resolveAttributeName(path)}:`, error);
                 }
             }
         }
@@ -726,7 +726,11 @@ export class ServerSubscription extends Subscription {
                     });
                 }
             } catch (error) {
-                logger.error(`Error reading event ${this.#structure.resolveEventName(path)}:`, error);
+                if (StatusResponseError.is(error, StatusCode.UnsupportedAccess)) {
+                    logger.warn(`Permission denied reading event ${this.#structure.resolveEventName(path)}`);
+                } else {
+                    logger.warn(`Error reading event ${this.#structure.resolveEventName(path)}:`, error);
+                }
             }
         }
         eventReportsPayload.sort((a, b) => {

package/src/mdns/MdnsBroadcaster.ts

@@ -14,6 +14,7 @@ import {
     DnsRecord,
     ImplementationError,
     Logger,
+    MatterAggregateError,
     Network,
     PtrRecord,
     SrvRecord,
@@ -66,7 +67,7 @@ const DEFAULT_PAIRING_HINT = {
  */
 export class MdnsBroadcaster {
     readonly #activeCommissioningAnnouncements = new Set<number>();
-    readonly #activeOperationalAnnouncements = new Map<number, FabricIndex[]>();
+    readonly #activeOperationalAnnouncements = new Map<number, { fabricIndex: FabricIndex; forInstance: string }[]>();
     readonly #network: Network;
     readonly #mdnsServer: MdnsServer;
     readonly #enableIpv4?: boolean;
@@ -255,20 +256,37 @@ export class MdnsBroadcaster {
         }: OperationalInstanceData = {},
     ) {
         const currentOperationalFabrics = this.#activeOperationalAnnouncements.get(announcedNetPort);
+
+        this.#activeOperationalAnnouncements.set(
+            announcedNetPort,
+            fabrics.map(f => ({
+                fabricIndex: f.fabricIndex,
+                forInstance: getDeviceMatterQname(
+                    Bytes.toHex(f.operationalId).toUpperCase(),
+                    NodeId.toHexString(f.nodeId),
+                ),
+            })),
+        );
+
+        const expires = new Array<Promise<void>>();
+
         if (currentOperationalFabrics !== undefined) {
             const fabricIndexesSet = new Set(fabrics.map(f => f.fabricIndex));
 
-            // Expire Fabric announcements if any entry got removed
-            if (!currentOperationalFabrics.every(fabricIndex => fabricIndexesSet.has(fabricIndex))) {
-                await this.expireFabricAnnouncement(announcedNetPort);
+            // Expire Fabric announcements for instances that got removed
+            for (const { fabricIndex, forInstance } of currentOperationalFabrics) {
+                if (!fabricIndexesSet.has(fabricIndex)) {
+                    expires.push(
+                        this.#mdnsServer.expireAnnouncements({
+                            announcedNetPort,
+                            type: AnnouncementType.Operative,
+                            forInstance,
+                        }),
+                    );
+                }
             }
         }
 
-        this.#activeOperationalAnnouncements.set(
-            announcedNetPort,
-            fabrics.map(f => f.fabricIndex),
-        );
-
         await this.#mdnsServer.setRecordsGenerator(announcedNetPort, AnnouncementType.Operative, async netInterface => {
             const ipMac = await this.#network.getIpMac(netInterface);
             if (ipMac === undefined) return [];
@@ -285,30 +303,40 @@ export class MdnsBroadcaster {
                 logger.debug(
                     "Announcement Generator: Fabric",
                     Diagnostic.dict({
-                        id: `${Bytes.toHex(operationalId)}/${nodeId}`,
+                        id: `${operationalIdString}-${NodeId.toHexString(nodeId)}`,
                         qname: deviceMatterQname,
                         port: announcedNetPort,
                         interface: netInterface,
                     }),
                 );
                 const fabricRecords = [
-                    PtrRecord(SERVICE_DISCOVERY_QNAME, fabricQname),
-                    PtrRecord(MATTER_SERVICE_QNAME, deviceMatterQname),
-                    PtrRecord(fabricQname, deviceMatterQname),
-                    SrvRecord(deviceMatterQname, { priority: 0, weight: 0, port: announcedNetPort, target: hostname }),
-                    TxtRecord(deviceMatterQname, [
-                        `SII=${sessionIdleInterval}` /* Session Idle Interval */,
-                        `SAI=${sessionActiveInterval}` /* Session Active Interval */,
-                        `SAT=${sessionActiveThreshold}` /* Session Active Threshold */,
-                        //`T=${TCP_SUPPORTED}` /* TCP not supported */,
-                        //`ICD=${ICD_SUPPORTED}` /* ICD not supported */,
-                    ]),
+                    PtrRecord(SERVICE_DISCOVERY_QNAME, fabricQname, deviceMatterQname),
+                    PtrRecord(MATTER_SERVICE_QNAME, deviceMatterQname, deviceMatterQname),
+                    PtrRecord(fabricQname, deviceMatterQname, deviceMatterQname),
+                    SrvRecord(
+                        deviceMatterQname,
+                        { priority: 0, weight: 0, port: announcedNetPort, target: hostname },
+                        deviceMatterQname,
+                    ),
+                    TxtRecord(
+                        deviceMatterQname,
+                        [
+                            `SII=${sessionIdleInterval}` /* Session Idle Interval */,
+                            `SAI=${sessionActiveInterval}` /* Session Active Interval */,
+                            `SAT=${sessionActiveThreshold}` /* Session Active Threshold */,
+                            //`T=${TCP_SUPPORTED}` /* TCP not supported */,
+                            //`ICD=${ICD_SUPPORTED}` /* ICD not supported */,
+                        ],
+                        deviceMatterQname,
+                    ),
                 ];
                 records.push(...fabricRecords);
             });
             records.push(...this.#getIpRecords(hostname, [...ipV6, ...ipV4]));
             return records;
         });
+
+        await MatterAggregateError.allSettled(expires);
     }
 
     /** Set the Broadcaster data to announce a Commissioner (aka Commissioner discovery) */
@@ -378,29 +406,29 @@ export class MdnsBroadcaster {
         this.#mdnsServer.announce(announcementPort).catch(error => logger.error(error));
     }
 
-    async expireFabricAnnouncement(announcementPort: number) {
-        if (this.#activeOperationalAnnouncements.has(announcementPort)) {
-            await this.#mdnsServer.expireAnnouncements(announcementPort, AnnouncementType.Operative);
-            this.#activeOperationalAnnouncements.delete(announcementPort);
+    async expireFabricAnnouncement(announcedNetPort: number) {
+        if (this.#activeOperationalAnnouncements.has(announcedNetPort)) {
+            await this.#mdnsServer.expireAnnouncements({ announcedNetPort, type: AnnouncementType.Operative });
+            this.#activeOperationalAnnouncements.delete(announcedNetPort);
         }
     }
 
-    async expireCommissioningAnnouncement(announcementPort: number) {
-        if (this.#activeCommissioningAnnouncements.has(announcementPort)) {
-            await this.#mdnsServer.expireAnnouncements(announcementPort, AnnouncementType.Commissionable);
-            this.#activeCommissioningAnnouncements.delete(announcementPort);
+    async expireCommissioningAnnouncement(announcedNetPort: number) {
+        if (this.#activeCommissioningAnnouncements.has(announcedNetPort)) {
+            await this.#mdnsServer.expireAnnouncements({ announcedNetPort, type: AnnouncementType.Commissionable });
+            this.#activeCommissioningAnnouncements.delete(announcedNetPort);
         }
     }
 
-    async expireAllAnnouncements(announcementPort: number) {
+    async expireAllAnnouncements(announcedNetPort: number) {
         if (
-            !this.#activeCommissioningAnnouncements.has(announcementPort) &&
-            !this.#activeOperationalAnnouncements.has(announcementPort)
+            !this.#activeCommissioningAnnouncements.has(announcedNetPort) &&
+            !this.#activeOperationalAnnouncements.has(announcedNetPort)
         )
             return;
-        await this.#mdnsServer.expireAnnouncements(announcementPort);
-        this.#activeCommissioningAnnouncements.delete(announcementPort);
-        this.#activeOperationalAnnouncements.delete(announcementPort);
+        await this.#mdnsServer.expireAnnouncements({ announcedNetPort });
+        this.#activeCommissioningAnnouncements.delete(announcedNetPort);
+        this.#activeOperationalAnnouncements.delete(announcedNetPort);
     }
 
     async close() {