@matter/protocol 0.16.0-alpha.0-20251107-6bcb5baf4 → 0.16.0-alpha.0-20251110-c4c70a41b

package/src/session/NodeSession.ts

@@ -337,8 +337,8 @@ export class NodeSession extends SecureSession {
     }
 
     /** Destroys a session. Outstanding subscription data will be discarded. */
-    async destroy(sendClose = false, closeAfterExchangeFinished = true) {
-        await this.clearSubscriptions(false);
+    async destroy(sendClose = false, closeAfterExchangeFinished = true, flushSubscriptions = false) {
+        await this.clearSubscriptions(flushSubscriptions);
         this.#fabric?.removeSession(this);
         if (!sendClose) {
             this.#sendCloseMessageWhenClosing = false;

package/src/session/Session.ts

@@ -218,7 +218,11 @@ export abstract class Session {
     abstract decode(packet: DecodedPacket, aad?: Bytes): DecodedMessage;
     abstract encode(message: Message): Packet;
     abstract end(sendClose: boolean): Promise<void>;
-    abstract destroy(sendClose?: boolean, closeAfterExchangeFinished?: boolean): Promise<void>;
+    abstract destroy(
+        sendClose?: boolean,
+        closeAfterExchangeFinished?: boolean,
+        flushSubscriptions?: boolean,
+    ): Promise<void>;
 
     protected get manager() {
         return this.#manager;

package/src/session/SessionManager.ts

@@ -421,7 +421,7 @@ export class SessionManager {
 
         return [...this.#sessions].find(
             session => NodeSession.is(session) && session.isPase && !session.closingAfterExchangeFinished,
-        ) as NodeSession;
+        );
     }
 
     forFabric(fabric: Fabric) {

package/src/session/case/CaseServer.ts

@@ -49,7 +49,7 @@ export class CaseServer implements ProtocolHandler {
         try {
             await this.#handleSigma1(messenger);
         } catch (error) {
-            logger.error("An error occurred during the commissioning", error);
+            logger.error("Error establishing CASE session", error);
 
             if (error instanceof FabricNotFoundError) {
                 await messenger.sendError(SecureChannelStatusCode.NoSharedTrustRoots);

package/src/session/pase/PaseServer.ts

@@ -72,46 +72,53 @@ export class PaseServer implements ProtocolHandler {
             return;
         }
         const messenger = new PaseServerMessenger(exchange);
-        try {
-            // When a Commissioner is either in the process of establishing a PASE session with the Commissionee or has
-            // successfully established a session, the Commissionee SHALL NOT accept any more requests for new PASE
-            // sessions until session establishment fails or the successfully established PASE session is terminated on
-            // the commissioning channel.
-            const paseSession = this.sessions.getPaseSession();
-            if (paseSession !== undefined && !paseSession.isClosing) {
-                logger.info("Pase server: Pairing already in progress (PASE session exists), ignoring new exchange.");
-            } else if (this.#pairingTimer?.isRunning) {
-                logger.info(
-                    "Pase server: Pairing already in progress (PASE establishment Timer running), ignoring new exchange.",
-                );
-            } else if (this.#pairingMessenger !== undefined) {
-                logger.info("Already handling a pairing request, ignoring new exchange.");
-            } else {
+
+        // When a Commissioner is either in the process of establishing a PASE session with the Commissionee or has
+        // successfully established a session, the Commissionee SHALL NOT accept any more requests for new PASE
+        // sessions until session establishment fails or the successfully established PASE session is terminated on
+        // the commissioning channel.
+        const paseSession = this.sessions.getPaseSession();
+        if (paseSession !== undefined && !paseSession.isClosing) {
+            logger.info("Pase server: Pairing already in progress (PASE session exists), ignoring new exchange.");
+        } else if (this.#pairingTimer?.isRunning) {
+            logger.info(
+                "Pase server: Pairing already in progress (PASE establishment Timer running), ignoring new exchange.",
+            );
+        } else if (this.#pairingMessenger !== undefined) {
+            logger.info("Already handling a pairing request, ignoring new exchange.");
+        } else {
+            // All checks done, we handle the pairing request
+            try {
                 this.#pairingMessenger = messenger;
                 // Ok new pairing try, handle it
                 await this.handlePairingRequest(this.sessions.crypto);
-            }
-        } catch (error) {
-            this.#pairingErrors++;
-            logger.error(
-                `An error occurred during the PASE commissioning (${this.#pairingErrors}/${PASE_COMMISSIONING_MAX_ERRORS}):`,
-                error,
-            );
-
-            // If we received a ChannelStatusResponseError we do not need to send one back, so just cancel pairing
-            const sendError = !(error instanceof ChannelStatusResponseError);
-            await this.cancelPairing(messenger, sendError);
-
-            if (this.#pairingErrors >= PASE_COMMISSIONING_MAX_ERRORS) {
-                throw new MaximumPasePairingErrorsReachedError(
-                    `Pase server: Too many errors during PASE commissioning, aborting commissioning window`,
+            } catch (error) {
+                this.#pairingErrors++;
+                logger.error(
+                    `An error occurred during the PASE commissioning (${this.#pairingErrors}/${PASE_COMMISSIONING_MAX_ERRORS}):`,
+                    error,
                 );
+
+                // If we received a ChannelStatusResponseError we do not need to send one back, so just cancel pairing
+                const sendError = !(error instanceof ChannelStatusResponseError);
+                await this.cancelPairing(messenger, sendError);
+
+                if (this.#pairingErrors >= PASE_COMMISSIONING_MAX_ERRORS) {
+                    throw new MaximumPasePairingErrorsReachedError(
+                        `Pase server: Too many errors during PASE commissioning, aborting commissioning window`,
+                    );
+                }
+            } finally {
+                this.#pairingMessenger = undefined;
+                // Destroy the unsecure session used to establish the Pase session
+                await exchange.session.destroy();
             }
-        } finally {
-            this.#pairingMessenger = undefined;
-            // Destroy the unsecure session used to establish the Pase session
-            await exchange.session.destroy();
+            return;
         }
+
+        // We are not handing the pairing request, send error and close messenger
+        await messenger.sendError(SecureChannelStatusCode.InvalidParam);
+        await messenger.close();
     }
 
     private async handlePairingRequest(crypto: Crypto) {