@matter/protocol 0.16.0-alpha.0-20251020-3f6e46245 → 0.16.0-alpha.0-20251022-5a69ce65a

package/src/peer/ControllerDiscovery.ts

@@ -88,9 +88,9 @@ export class ControllerDiscovery {
     ): Promise<CommissionableDevice[]> {
         const discoveredDevices = new Map<string, CommissionableDevice>();
 
-        await Promise.all(
-            scanners.map(async scanner => {
-                await scanner.findCommissionableDevicesContinuously(
+        const results = await Promise.all(
+            scanners.map(async scanner =>
+                scanner.findCommissionableDevicesContinuously(
                     identifier,
                     device => {
                         const { deviceIdentifier } = device;
@@ -100,14 +100,13 @@ export class ControllerDiscovery {
                         }
                     },
                     timeout,
-                );
-            }),
+                ),
+            ),
         );
 
         // The final answer only consists the devices still left, so expired ones will be excluded
         const finalDiscoveredDevices = new Map<string, CommissionableDevice>();
-        scanners.forEach(scanner => {
-            const devices = scanner.getDiscoveredCommissionableDevices(identifier);
+        results.forEach(devices => {
             devices.forEach(device => {
                 const { deviceIdentifier } = device;
                 if (!discoveredDevices.has(deviceIdentifier)) {

package/src/protocol/DeviceAdvertiser.ts

@@ -166,7 +166,7 @@ export class DeviceAdvertiser {
      * Advertise the device as operational.
      */
     enterOperationalMode() {
-        if (this.#isOperational) {
+        if (this.#isOperational || this.#isClosing) {
             return;
         }
 
@@ -179,7 +179,7 @@ export class DeviceAdvertiser {
      * Begin automatic broadcast for fabrics if in operational mode.
      */
     #startOperationalAdvertisement() {
-        if (!this.#isOperational) {
+        if (!this.#isOperational || this.#isClosing) {
             return;
         }
 

package/src/protocol/MessageExchange.ts

@@ -494,10 +494,10 @@ export class MessageExchange {
 
     #retransmitMessage(message: Message, expectedProcessingTime?: Duration) {
         this.#retransmissionCounter++;
-        if (this.#retransmissionCounter >= MRP.MAX_TRANSMISSIONS) {
+        if (this.#isClosing || this.#retransmissionCounter >= MRP.MAX_TRANSMISSIONS) {
             // Ok all 4 resubmissions are done, but we need to wait a bit longer because of processing time and
             // the resubmissions from the other side
-            if (expectedProcessingTime) {
+            if (expectedProcessingTime && !this.#isClosing) {
                 // We already have waited after the last message was sent, so deduct this time from the final wait time
                 const finalWaitTime = Millis(
                     this.channel.calculateMaximumPeerResponseTime(

package/src/session/SessionManager.ts

@@ -31,7 +31,7 @@ import { PeerAddress, PeerAddressMap } from "#peer/PeerAddress.js";
 import { GroupSession } from "#session/GroupSession.js";
 import { CaseAuthenticatedTag, DEFAULT_MAX_PATHS_PER_INVOKE, FabricId, FabricIndex, GroupId, NodeId } from "#types";
 import { UnexpectedDataError } from "@matter/general";
-import { Fabric } from "../fabric/Fabric.js";
+import { ExposedFabricInformation, Fabric } from "../fabric/Fabric.js";
 import { MessageCounter } from "../protocol/MessageCounter.js";
 import { InsecureSession } from "./InsecureSession.js";
 import { NodeSession } from "./NodeSession.js";
@@ -90,6 +90,18 @@ type ResumptionStorageRecord = {
     caseAuthenticatedTags?: CaseAuthenticatedTag[];
 };
 
+export interface ActiveSessionInformation {
+    name: string;
+    nodeId: NodeId;
+    peerNodeId: NodeId;
+    fabric?: ExposedFabricInformation;
+    isPeerActive: boolean;
+    secure: boolean;
+    lastInteractionTimestamp?: number;
+    lastActiveTimestamp?: number;
+    numberOfActiveSubscriptions: number;
+}
+
 /**
  * Interfaces {@link SessionManager} with other components.
  */
@@ -654,7 +666,7 @@ export class SessionManager {
         );
     }
 
-    getActiveSessionInformation() {
+    getActiveSessionInformation(): ActiveSessionInformation[] {
         this.#construction.assert();
         return [...this.#sessions]
             .filter(session => session.isSecure && !session.isPase)