@matter/protocol 0.16.0-alpha.0-20251203-aaf94bca8 → 0.16.0-alpha.0-20251207-37e501b18

package/src/action/client/ClientInteraction.ts

@@ -13,6 +13,7 @@ import { Write } from "#action/request/Write.js";
 import { DecodedInvokeResult, InvokeResult } from "#action/response/InvokeResult.js";
 import { ReadResult } from "#action/response/ReadResult.js";
 import { WriteResult } from "#action/response/WriteResult.js";
+import { Mark } from "#common/Mark.js";
 import {
     Abort,
     BasicSet,
@@ -22,12 +23,14 @@ import {
     Environment,
     ImplementationError,
     isObject,
+    Lifetime,
     Logger,
     Minutes,
     RetrySchedule,
     Seconds,
 } from "#general";
 import { InteractionClientMessenger, MessageType } from "#interaction/InteractionMessenger.js";
+import { Subscription } from "#interaction/Subscription.js";
 import { ExchangeProvider } from "#protocol/ExchangeProvider.js";
 import { SecureSession } from "#session/SecureSession.js";
 import { Status, TlvAttributeReport, TlvNoResponse, TlvSubscribeResponse, TypeFromSchema } from "#types";
@@ -65,6 +68,7 @@ const DEFAULT_MINIMUM_RESPONSE_TIMEOUT_WITH_FAILSAFE = Seconds(30);
 export class ClientInteraction<
     SessionT extends InteractionSession = InteractionSession,
 > implements Interactable<SessionT> {
+    readonly #lifetime: Lifetime;
     readonly #exchanges: ExchangeProvider;
     readonly #subscriptions: ClientSubscriptions;
     readonly #interactions = new BasicSet<Read | Write | Invoke | Subscribe>();
@@ -79,6 +83,17 @@ export class ClientInteraction<
             environment.get(Entropy),
             RetrySchedule.Configuration(SustainedSubscription.DefaultRetrySchedule, sustainRetries),
         );
+
+        this.#lifetime = environment.join("interactions");
+        Object.defineProperties(this.#lifetime.details, {
+            "# active": {
+                get: () => {
+                    return this.#interactions.size;
+                },
+
+                enumerable: true,
+            },
+        });
     }
 
     get session() {
@@ -86,6 +101,8 @@ export class ClientInteraction<
     }
 
     async close() {
+        using _closing = this.#lifetime.closing();
+
         this.#abort();
 
         while (this.#interactions.size) {
@@ -108,10 +125,10 @@ export class ClientInteraction<
             );
         }
 
-        await using context = await this.#begin(request, session);
+        await using context = await this.#begin("reading", request, session);
         const { checkAbort, messenger } = context;
 
-        logger.debug("Read »", messenger.exchange.via, request);
+        logger.debug("Read", Mark.OUTBOUND, messenger.exchange.via, request);
         await messenger.sendReadRequest(request);
         checkAbort();
 
@@ -128,7 +145,8 @@ export class ClientInteraction<
         }
 
         logger.debug(
-            "Read «",
+            "Read",
+            Mark.INBOUND,
             messenger.exchange.via,
             Diagnostic.weak(
                 attributeReportCount + eventReportCount === 0
@@ -145,7 +163,7 @@ export class ClientInteraction<
      * You must check each {@link WriteResult.AttributeStatus} to determine whether individual updates failed.
      */
     async write<T extends Write>(request: T, session?: SessionT): WriteResult<T> {
-        await using context = await this.#begin(request, session);
+        await using context = await this.#begin("writing", request, session);
         const { checkAbort, messenger } = context;
 
         if (request.timedRequest) {
@@ -153,7 +171,7 @@ export class ClientInteraction<
             checkAbort();
         }
 
-        logger.info("Write »", messenger.exchange.via, request);
+        logger.info("Write", Mark.OUTBOUND, messenger.exchange.via, request);
 
         const response = await messenger.sendWriteCommand(request);
         checkAbort();
@@ -192,7 +210,8 @@ export class ClientInteraction<
         ) as Awaited<WriteResult<T>>;
 
         logger.info(
-            "Write «",
+            "Write",
+            Mark.INBOUND,
             messenger.exchange.via,
             Diagnostic.weak(
                 successCount + failureCount === 0
@@ -208,7 +227,7 @@ export class ClientInteraction<
      * Invoke one or more commands.
      */
     async *invoke(request: ClientInvoke, session?: SessionT): DecodedInvokeResult {
-        await using context = await this.#begin(request, session);
+        await using context = await this.#begin("invoking", request, session);
         const { checkAbort, messenger } = context;
 
         if (request.timedRequest) {
@@ -217,7 +236,8 @@ export class ClientInteraction<
         }
 
         logger.info(
-            "Invoke »",
+            "Invoke",
+            Mark.OUTBOUND,
             messenger.exchange.via,
             Diagnostic.asFlags({ suppressResponse: request.suppressResponse, timed: request.timedRequest }),
             request,
@@ -259,7 +279,8 @@ export class ClientInteraction<
                                 commandFields === undefined ? undefined : responseSchema.decodeTlv(commandFields);
 
                             logger.info(
-                                "Invoke «",
+                                "Invoke",
+                                Mark.INBOUND,
                                 messenger.exchange.via,
                                 Diagnostic.strong(resolvePathForSpecifier(cmd)),
                                 isObject(data) ? Diagnostic.dict(data) : Diagnostic.weak("(no payload)"),
@@ -320,7 +341,7 @@ export class ClientInteraction<
         if (!request.keepSubscriptions) {
             for (const subscription of this.#subscriptions) {
                 logger.debug(
-                    `Removing subscription with ID ${subscription.subscriptionId} because new subscription replaces it`,
+                    `Removing subscription with ID ${Subscription.idStrOf(subscription)} because new subscription replaces it`,
                 );
                 subscription.close();
             }
@@ -343,7 +364,7 @@ export class ClientInteraction<
         const peer = this.#exchanges.session.peerAddress;
 
         const subscribe = async (request: ClientSubscribe) => {
-            await using context = await this.#begin(request, session);
+            await using context = await this.#begin("subscribing", request, session);
             const { checkAbort, messenger } = context;
 
             logger.info(
@@ -371,7 +392,8 @@ export class ClientInteraction<
             const response = TlvSubscribeResponse.decode(responseMessage.payload);
 
             logger.info(
-                "Subscription successful «",
+                "Subscription successful",
+                Mark.INBOUND,
                 messenger.exchange.via,
                 Diagnostic.dict({
                     id: response.subscriptionId,
@@ -380,6 +402,7 @@ export class ClientInteraction<
             );
 
             const subscription = new PeerSubscription({
+                lifetime: this.#subscriptions,
                 request,
                 peer,
                 closed: () => this.#subscriptions.delete(subscription),
@@ -394,6 +417,7 @@ export class ClientInteraction<
         let subscription: ClientSubscription;
         if (request.sustain) {
             subscription = new SustainedSubscription({
+                lifetime: this.#subscriptions,
                 subscribe,
                 peer,
                 closed: () => this.#subscriptions.delete(subscription),
@@ -423,7 +447,9 @@ export class ClientInteraction<
         }
     }
 
-    async #begin(request: Read | Write | Invoke | Subscribe, session: SessionT | undefined) {
+    async #begin(what: string, request: Read | Write | Invoke | Subscribe, session: SessionT | undefined) {
+        using lifetime = this.#lifetime.join(what);
+
         if (this.#abort.aborted) {
             throw new ImplementationError("Client interaction unavailable after close");
         }
@@ -433,10 +459,18 @@ export class ClientInteraction<
 
         const messenger = await InteractionClientMessenger.create(this.#exchanges);
 
+        // Provide via dynamically so is up-to-date if exchange changes due to retry
+        Object.defineProperty(lifetime.details, "via", {
+            get() {
+                return messenger.exchange.via;
+            },
+        });
+
         const context: RequestContext = {
             checkAbort,
             messenger,
             [Symbol.asyncDispose]: async () => {
+                using _closing = lifetime.closing();
                 await messenger.close();
                 this.#interactions.delete(request);
             },

package/src/action/client/subscription/ClientSubscription.ts

@@ -6,9 +6,10 @@
 
 import type { Subscribe } from "#action/request/Subscribe.js";
 import type { ActiveSubscription } from "#action/response/SubscribeResult.js";
-import { Abort, Diagnostic, Logger } from "#general";
-import { PeerAddress } from "#peer/PeerAddress.js";
-import { ClientSubscribe } from "./ClientSubscribe.js";
+import { Abort, decamelize, Diagnostic, Lifetime, Logger } from "#general";
+import type { SubscriptionId } from "#interaction/Subscription.js";
+import type { PeerAddress } from "#peer/PeerAddress.js";
+import type { ClientSubscribe } from "./ClientSubscribe.js";
 
 const logger = Logger.get("ClientSubscription");
 
@@ -18,7 +19,6 @@ const logger = Logger.get("ClientSubscription");
 export abstract class ClientSubscription implements ActiveSubscription {
     readonly request: Subscribe;
     readonly peer: PeerAddress;
-    abstract subscriptionId: number;
     abstract maxInterval: number;
     abstract interactionModelRevision: number;
 
@@ -27,11 +27,14 @@ export abstract class ClientSubscription implements ActiveSubscription {
      */
     done?: Promise<void>;
 
+    readonly #lifetime: Lifetime;
     readonly #closed: () => void;
     readonly #abort: Abort;
     #isClosed = false;
+    #id: SubscriptionId = -1;
 
-    constructor({ request, peer, closed, abort }: ClientSubscription.Configuration) {
+    constructor({ request, peer, closed, abort, lifetime }: ClientSubscription.Configuration) {
+        this.#lifetime = lifetime.join(this.kind);
         this.request = request;
         this.peer = peer;
         this.#closed = closed;
@@ -41,10 +44,26 @@ export abstract class ClientSubscription implements ActiveSubscription {
         });
     }
 
+    get kind() {
+        return decamelize(this.constructor.name.replace(/Subscription$/, ""), " ");
+    }
+
+    get subscriptionId() {
+        return this.#id;
+    }
+
+    set subscriptionId(id: SubscriptionId) {
+        this.#id = id;
+        this.#lifetime.name = [this.kind, Diagnostic.strong(id)];
+    }
+
     close() {
         if (this.#isClosed) {
             return;
         }
+
+        const closing = this.#lifetime.closing();
+
         this.#isClosed = true;
 
         this.#abort();
@@ -58,6 +77,7 @@ export abstract class ClientSubscription implements ActiveSubscription {
             this.done
                 .finally(() => {
                     this.request.closed?.();
+                    closing[Symbol.dispose]();
                 })
                 .catch(unhandledError);
         } else {
@@ -65,6 +85,8 @@ export abstract class ClientSubscription implements ActiveSubscription {
                 this.request.closed?.();
             } catch (e) {
                 unhandledError(e);
+            } finally {
+                closing[Symbol.dispose]();
             }
         }
     }
@@ -79,10 +101,13 @@ export abstract class ClientSubscription implements ActiveSubscription {
 }
 
 export namespace ClientSubscription {
+    export const NO_SUBSCRIPTION = -1;
+
     export interface Configuration {
         request: ClientSubscribe;
         peer: PeerAddress;
         closed: () => void;
+        lifetime: Lifetime.Owner;
         abort?: AbortSignal;
     }
 }

package/src/action/client/subscription/ClientSubscriptionHandler.ts

@@ -8,7 +8,7 @@ import { ReadResult } from "#action/response/ReadResult.js";
 import { Diagnostic, InternalError, Logger } from "#general";
 import { DecodedDataReport } from "#interaction/DecodedDataReport.js";
 import { IncomingInteractionClientMessenger } from "#interaction/InteractionMessenger.js";
-import { SubscriptionId } from "#interaction/Subscription.js";
+import { Subscription, SubscriptionId } from "#interaction/Subscription.js";
 import { MessageExchange } from "#protocol/MessageExchange.js";
 import { ProtocolHandler } from "#protocol/ProtocolHandler.js";
 import { SecureSession } from "#session/SecureSession.js";
@@ -94,9 +94,7 @@ export class ClientSubscriptionHandler implements ProtocolHandler {
 async function sendInvalid(messenger: IncomingInteractionClientMessenger, subscriptionId?: SubscriptionId) {
     await messenger.sendStatus(Status.InvalidSubscription, {
         multipleMessageInteraction: true,
-        logContext: {
-            subId: subscriptionId,
-        },
+        logContext: Subscription.diagnosticOf(subscriptionId),
     });
     await messenger.close();
 }

package/src/action/client/subscription/ClientSubscriptions.ts

@@ -6,7 +6,7 @@
 
 import { ReadResult } from "#action/response/ReadResult.js";
 import type { ActiveSubscription } from "#action/response/SubscribeResult.js";
-import { BasicSet, Environment, Environmental, Millis, Time, Timer, Timestamp } from "#general";
+import { BasicSet, Environment, Environmental, Lifetime, Millis, Time, Timer, Timestamp } from "#general";
 import { SubscriptionId } from "#interaction/Subscription.js";
 import { PeerAddress } from "#peer/PeerAddress.js";
 import { ClientSubscription } from "./ClientSubscription.js";
@@ -15,17 +15,26 @@ import type { PeerSubscription } from "./PeerSubscription.js";
 /**
  * A managed set of {@link ActiveSubscription} instances.
  */
-export class ClientSubscriptions {
+export class ClientSubscriptions implements Lifetime.Owner {
+    #lifetime: Lifetime;
     #active = new BasicSet<ClientSubscription>();
     #peers = new Map<PeerAddress, Map<number, PeerSubscription>>();
     #timeout?: Timer;
 
+    constructor(lifetime: Lifetime.Owner) {
+        this.#lifetime = lifetime.join("client subscriptions");
+    }
+
     static [Environmental.create](env: Environment) {
-        const instance = new ClientSubscriptions();
+        const instance = new ClientSubscriptions(env);
         env.set(ClientSubscriptions, instance);
         return instance;
     }
 
+    join(...name: unknown[]) {
+        return this.#lifetime.join(...name);
+    }
+
     /**
      * Register a user-facing {@link ClientSubscription}.
      */
@@ -77,6 +86,8 @@ export class ClientSubscriptions {
      * Terminate all subscriptions.
      */
     async close() {
+        using _closing = this.#lifetime.closing();
+
         if (this.#timeout) {
             this.#timeout.stop();
             this.#timeout = undefined;

package/src/action/client/subscription/PeerSubscription.ts

@@ -14,15 +14,15 @@ import { ClientSubscription } from "./ClientSubscription.js";
 export class PeerSubscription extends ClientSubscription {
     readonly interactionModelRevision: number;
     readonly maxInterval: number;
-    readonly subscriptionId: number;
     isReading = false;
 
     timeoutAt?: Timestamp;
 
     constructor(config: PeerSubscription.Configuration) {
+        const { subscriptionId, interactionModelRevision, maxInterval } = config.response;
+
         super(config);
 
-        const { subscriptionId, interactionModelRevision, maxInterval } = config.response;
         this.subscriptionId = subscriptionId;
         this.interactionModelRevision = interactionModelRevision;
         this.maxInterval = maxInterval;

package/src/action/client/subscription/SustainedSubscription.ts

@@ -81,6 +81,7 @@ export class SustainedSubscription extends ClientSubscription {
             const closed = new Promise<void>(resolve => {
                 request.closed = () => {
                     this.#subscription = undefined;
+                    this.subscriptionId = ClientSubscription.NO_SUBSCRIPTION;
                     resolve();
                 };
             });
@@ -89,6 +90,7 @@ export class SustainedSubscription extends ClientSubscription {
             for (const retry of this.#retries) {
                 try {
                     this.#subscription = await this.#subscribe(request);
+                    this.subscriptionId = this.#subscription.subscriptionId;
                     break;
                 } catch (e) {
                     if (this.abort.aborted) {
@@ -146,10 +148,6 @@ export class SustainedSubscription extends ClientSubscription {
     get maxInterval() {
         return this.#subscription?.maxInterval ?? Hours.one;
     }
-
-    get subscriptionId() {
-        return this.#subscription?.subscriptionId ?? SustainedSubscription.NO_SUBSCRIPTION;
-    }
 }
 
 export namespace SustainedSubscription {
@@ -177,8 +175,6 @@ export namespace SustainedSubscription {
         }
     }
 
-    export const NO_SUBSCRIPTION = -1;
-
     export const DefaultRetrySchedule: RetrySchedule.Configuration = {
         // Protocol-level level happens at the exchange level and is faster; this is an application-level retry.  Retry
         // more slowly so we do not hammer devices that are experiencing transient errors

package/src/action/request/Invoke.ts

@@ -5,7 +5,7 @@
  */
 
 import { Diagnostic, Duration, isObject } from "#general";
-import { FALLBACK_INTERACTIONMODEL_REVISION } from "#session/Session.js";
+import { SessionParameters } from "#session/SessionParameters.js";
 import { ClusterType, CommandData, FabricIndex, InvokeRequest, ObjectSchema, TlvSchema, TypeFromSchema } from "#types";
 import { MalformedRequestError } from "./MalformedRequestError.js";
 import { resolvePathForSpecifier, Specifier } from "./Specifier.js";
@@ -58,7 +58,7 @@ export function Invoke(
     }
 
     const {
-        interactionModelRevision = FALLBACK_INTERACTIONMODEL_REVISION,
+        interactionModelRevision = SessionParameters.fallbacks.interactionModelRevision,
         suppressResponse = false,
         timeout,
         expectedProcessingTime,

package/src/action/server/AttributeReadResponse.ts

@@ -64,6 +64,8 @@ export class AttributeReadResponse<
     }
 
     *process({ dataVersionFilters, attributeRequests }: Read.Attributes): Generator<ReadResult.Chunk, void, void> {
+        using _reading = this.join("reading attributes");
+
         const nodeId = hasLocalActor(this.session) ? NodeId.UNSPECIFIED_NODE_ID : this.nodeId;
 
         // Index versions

package/src/action/server/AttributeWriteResponse.ts

@@ -53,6 +53,8 @@ export class AttributeWriteResponse<
     }
 
     async process<T extends Write>({ writeRequests, suppressResponse }: T): WriteResult<T> {
+        using _writing = this.join("writing");
+
         const writeResponses = new Array<WriteResult.AttributeStatus>();
         for (const { path, data, dataVersion } of writeRequests) {
             if (path.endpointId === undefined || path.clusterId === undefined || path.attributeId === undefined) {

package/src/action/server/CommandInvokeResponse.ts

@@ -63,6 +63,7 @@ export class CommandInvokeResponse<
     }
 
     async *process<T extends Invoke>({ invokeRequests, suppressResponse }: T): InvokeResult {
+        using _invoking = this.join("invoking");
         const multipleInvokes = invokeRequests.length > 1;
 
         // Register paths

package/src/action/server/DataResponse.ts

@@ -53,6 +53,10 @@ export abstract class DataResponse<SessionT extends InteractionSession = Interac
         return this.#cachedNodeId;
     }
 
+    protected join(...name: unknown[]) {
+        return this.#session.transaction?.join(...name);
+    }
+
     abstract counts: {
         /**
          * Number of existent entries that were processed. Not all must have had data to send.

package/src/action/server/ServerInteraction.ts

@@ -65,17 +65,17 @@ export class ServerInteraction<
         throw new NotImplementedError();
     }
 
-    write<T extends Write>(request: T, session: SessionT): WriteResult<T> {
+    async write<T extends Write>(request: T, session: SessionT): WriteResult<T> {
         // TODO - validate request
 
         const writer = new AttributeWriteResponse(this.#node, session);
-        return writer.process(request);
+        return await writer.process(request);
     }
 
-    invoke(request: Invoke, session: SessionT): InvokeResult {
+    async *invoke(request: Invoke, session: SessionT): InvokeResult {
         // TODO -  validate request
 
         const invoker = new CommandInvokeResponse(this.#node, session);
-        return invoker.process(request);
+        yield* invoker.process(request);
     }
 }

package/src/advertisement/Advertisement.ts

@@ -257,13 +257,12 @@ export abstract class Advertisement<T extends ServiceDescription = ServiceDescri
         });
     }
 
-    async #run(context: ActivityContext, event: Advertiser.BroadcastEvent, previous?: ActivityContext) {
-        // If automatic advertisement starts when it is already active, kill the previous version
-        if (previous) {
-            await previous;
-        }
-
-        logger.debug("Begin auto broadcast", this.dict());
+    async #run(context: ActivityContext, event: Advertiser.BroadcastEvent) {
+        // Diagnostics
+        const dict = this.dict();
+        using advertising = this.advertiser.join("advertising");
+        Object.assign(advertising.details, dict);
+        logger.debug("Begin auto broadcast", dict);
 
         // Perform advertisement
         try {

package/src/advertisement/Advertiser.ts

@@ -5,16 +5,22 @@
  */
 
 import type { Fabric } from "#fabric/Fabric.js";
+import { Lifetime } from "@matter/general";
 import { Advertisement } from "./Advertisement.js";
 import type { ServiceDescription } from "./ServiceDescription.js";
 
 /**
  * A component that advertises a Matter service.
  */
-export abstract class Advertiser {
+export abstract class Advertiser implements Lifetime.Owner {
+    #lifetime: Lifetime;
     #advertisements = new Set<Advertisement>();
     #isClosed = false;
 
+    constructor(lifetime = Lifetime.process) {
+        this.#lifetime = lifetime.join("advertiser");
+    }
+
     /**
      * Begin advertising on configured schedule.
      *
@@ -45,6 +51,7 @@ export abstract class Advertiser {
      * Destroy the instance.
      */
     async close() {
+        using _closing = this.#lifetime.closing();
         this.#isClosed = true;
         await Advertisement.closeAll(this.#advertisements);
     }
@@ -73,6 +80,10 @@ export abstract class Advertiser {
     filter(predicate: (ad: Advertisement) => boolean) {
         return [...this.#advertisements].filter(predicate);
     }
+
+    join(...name: unknown[]): Lifetime {
+        return this.#lifetime.join(...name);
+    }
 }
 
 export namespace Advertiser {

package/src/advertisement/ble/BleAdvertiser.ts

@@ -5,7 +5,7 @@
  */
 
 import { BlePeripheralInterface } from "#ble/Ble.js";
-import { Bytes, Duration, ImplementationError, Millis } from "#general";
+import { Bytes, Duration, ImplementationError, Lifetime, Millis } from "#general";
 import { DatatypeModel, FieldElement } from "#model";
 import { MAXIMUM_COMMISSIONING_TIMEOUT } from "#types";
 import { Advertisement } from "../Advertisement.js";
@@ -20,7 +20,7 @@ export class BleAdvertiser extends Advertiser {
     #isClosed = false;
 
     constructor(peripheral: BlePeripheralInterface, options?: BleAdvertiser.Options) {
-        super();
+        super(options?.lifetime);
 
         this.#peripheral = peripheral;
         this.#config = BleAdvertiser.Configuration(options);
@@ -58,6 +58,11 @@ export namespace BleAdvertiser {
      * All intervals are in milliseconds.
      */
     export interface Configuration {
+        /**
+         * Lifetime of advertiser owner.
+         */
+        readonly lifetime?: Lifetime.Owner;
+
         /**
          * Additional advertisement data.
          */

package/src/advertisement/mdns/MdnsAdvertiser.ts

@@ -13,6 +13,7 @@ import {
     ImplementationError,
     Instant,
     InternalError,
+    Lifetime,
     RetrySchedule,
     Seconds,
     STANDARD_MATTER_PORT,
@@ -39,7 +40,7 @@ export class MdnsAdvertiser extends Advertiser {
         readonly server: MdnsServer,
         options?: MdnsAdvertiser.Options,
     ) {
-        super();
+        super(options?.lifetime);
 
         this.port = options?.port ?? STANDARD_MATTER_PORT;
         this.omitPrivateDetails = options?.omitPrivateDetails ?? false;
@@ -153,6 +154,11 @@ export namespace MdnsAdvertiser {
      * MDNS advertisement configuration options.
      */
     export interface Options {
+        /**
+         * Lifetime of advertiser owner.
+         */
+        readonly lifetime?: Lifetime.Owner;
+
         /**
          * The port of the Matter service to advertise.
          *

package/src/certificate/kinds/definitions/asn.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Bytes, DerObject, X520 } from "#general";
+import { Bytes, DerObject, hex, X520 } from "#general";
 import { FabricId, MATTER_EPOCH_OFFSET_S, NodeId, VendorId } from "#types";
 import { InternalError } from "@matter/general";
 
@@ -64,7 +64,7 @@ const GenericMatterObject = <T>(
     fieldName: string,
     valueConverter?: (value: T) => string,
 ) => {
-    const oidHex = `${oidBase}${id.toString(16).padStart(2, "0")}`;
+    const oidHex = `${oidBase}${hex.byte(id)}`;
     // Register in reverse lookup map immediately at function creation time
     if (MATTER_OID_TO_FIELD_MAP[oidHex] !== undefined && MATTER_OID_TO_FIELD_MAP[oidHex] !== fieldName) {
         throw new InternalError(

package/src/certificate/kinds/definitions/attestation.ts

@@ -3,6 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+
 import { VendorId } from "#types";
 import { X509Certificate } from "./base.js";
 

package/src/cluster/client/AttributeClient.ts

@@ -6,9 +6,9 @@
 
 import { ImplementationError } from "#general";
 import { FabricIndex as FabricIndexElement } from "#model";
+import { NoAssociatedFabricError } from "#protocol/errors.js";
 import { Attribute, AttributeError, AttributeId, ClusterId, EndpointNumber, FabricIndex, TlvSchema } from "#types";
 import { InteractionClient } from "../../interaction/InteractionClient.js";
-import { NoAssociatedFabricError } from "../../session/NodeSession.js";
 
 /**
  * Factory function to create an AttributeClient for a given attribute.