@matter/node 0.16.0-alpha.0-20251031-0f308af69 → 0.16.0-alpha.0-20251101-70c8d51d7

package/dist/esm/node/server/OnlineServerInteraction.d.ts

@@ -5,7 +5,6 @@ export declare class OnlineServerInteraction implements Interactable<RemoteActor
     constructor(node: NodeProtocol);
     read(request: Read, context: RemoteActorContext.Options): ReadResult;
     subscribe(_request: Subscribe, _context: RemoteActorContext.Options): SubscribeResult;
-    cancelSubscription(_id: number): void;
     write<T extends Write>(request: T, context: RemoteActorContext.Options): WriteResult<T>;
     invoke(request: Invoke, context: RemoteActorContext.Options): AsyncGenerator<import("#protocol").InvokeResult.Chunk, undefined, unknown>;
 }

package/dist/esm/node/server/OnlineServerInteraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OnlineServerInteraction.d.ts","sourceRoot":"","sources":["../../../../src/node/server/OnlineServerInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAEpF,OAAO,EACH,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,UAAU,EAEV,SAAS,EACT,eAAe,EACf,KAAK,EACL,WAAW,EACd,MAAM,WAAW,CAAC;AAEnB,qBAAa,uBAAwB,YAAW,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC;;gBAGxE,IAAI,EAAE,YAAY;IAIvB,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,GAAG,UAAU;IAW3E,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,kBAAkB,CAAC,OAAO,GAAG,eAAe;IAIrF,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI/B,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC;IAItF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO;CAWrE"}
+{"version":3,"file":"OnlineServerInteraction.d.ts","sourceRoot":"","sources":["../../../../src/node/server/OnlineServerInteraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAEpF,OAAO,EACH,YAAY,EACZ,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,UAAU,EAEV,SAAS,EACT,eAAe,EACf,KAAK,EACL,WAAW,EACd,MAAM,WAAW,CAAC;AAEnB,qBAAa,uBAAwB,YAAW,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC;;gBAGxE,IAAI,EAAE,YAAY;IAIvB,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,GAAG,UAAU;IAW3E,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,kBAAkB,CAAC,OAAO,GAAG,eAAe;IAI/E,KAAK,CAAC,CAAC,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC;IAItF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO;CAWrE"}

package/dist/esm/node/server/OnlineServerInteraction.js

@@ -21,9 +21,6 @@ class OnlineServerInteraction {
   subscribe(_request, _context) {
     throw new NotImplementedError("subscribe not implemented");
   }
-  cancelSubscription(_id) {
-    throw new NotImplementedError("cancelSubscription not implemented");
-  }
   async write(request, context) {
     return RemoteActorContext(context).act((session) => this.#interaction.write(request, session));
   }

package/dist/esm/node/server/OnlineServerInteraction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/node/server/OnlineServerInteraction.ts"],
-  "mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,2BAA2B;AACpC;AAAA,EAMI;AAAA,OAKG;AAEA,MAAM,wBAA4E;AAAA,EAC5E;AAAA,EAET,YAAY,MAAoB;AAC5B,SAAK,eAAe,IAAI,kBAAkB,IAAI;AAAA,EAClD;AAAA,EAEA,OAAO,KAAK,SAAe,SAAiD;AACxE,UAAM,UAAU,mBAAmB,OAAO,EAAE,cAAc;AAC1D,QAAI;AACA,uBAAiB,UAAU,KAAK,aAAa,KAAK,SAAS,OAAO,GAAG;AACjE,cAAM;AAAA,MACV;AAAA,IACJ,UAAE;AACE,cAAQ,OAAO,OAAO,EAAE;AAAA,IAC5B;AAAA,EACJ;AAAA,EAEA,UAAU,UAAqB,UAAuD;AAClF,UAAM,IAAI,oBAAoB,2BAA2B;AAAA,EAC7D;AAAA,EAEA,mBAAmB,KAAmB;AAClC,UAAM,IAAI,oBAAoB,oCAAoC;AAAA,EACtE;AAAA,EAEA,MAAM,MAAuB,SAAY,SAAqD;AAC1F,WAAO,mBAAmB,OAAO,EAAE,IAAI,aAAW,KAAK,aAAa,MAAM,SAAS,OAAO,CAAC;AAAA,EAC/F;AAAA,EAEA,OAAO,OAAO,SAAiB,SAAqC;AAChE,UAAM,UAAU,mBAAmB,EAAE,GAAG,SAAS,SAAS,KAAK,CAAC,EAAE,KAAK;AACvE,QAAI;AACA,uBAAiB,SAAS,KAAK,aAAa,OAAO,SAAS,OAAO,GAAG;AAClE,cAAM;AAAA,MACV;AAAA,IACJ,SAAS,OAAO;AACZ,YAAM,QAAQ,OAAO,KAAK;AAAA,IAC9B;AACA,WAAO,QAAQ,QAAQ,MAAS;AAAA,EACpC;AACJ;",
+  "mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,2BAA2B;AACpC;AAAA,EAMI;AAAA,OAKG;AAEA,MAAM,wBAA4E;AAAA,EAC5E;AAAA,EAET,YAAY,MAAoB;AAC5B,SAAK,eAAe,IAAI,kBAAkB,IAAI;AAAA,EAClD;AAAA,EAEA,OAAO,KAAK,SAAe,SAAiD;AACxE,UAAM,UAAU,mBAAmB,OAAO,EAAE,cAAc;AAC1D,QAAI;AACA,uBAAiB,UAAU,KAAK,aAAa,KAAK,SAAS,OAAO,GAAG;AACjE,cAAM;AAAA,MACV;AAAA,IACJ,UAAE;AACE,cAAQ,OAAO,OAAO,EAAE;AAAA,IAC5B;AAAA,EACJ;AAAA,EAEA,UAAU,UAAqB,UAAuD;AAClF,UAAM,IAAI,oBAAoB,2BAA2B;AAAA,EAC7D;AAAA,EAEA,MAAM,MAAuB,SAAY,SAAqD;AAC1F,WAAO,mBAAmB,OAAO,EAAE,IAAI,aAAW,KAAK,aAAa,MAAM,SAAS,OAAO,CAAC;AAAA,EAC/F;AAAA,EAEA,OAAO,OAAO,SAAiB,SAAqC;AAChE,UAAM,UAAU,mBAAmB,EAAE,GAAG,SAAS,SAAS,KAAK,CAAC,EAAE,KAAK;AACvE,QAAI;AACA,uBAAiB,SAAS,KAAK,aAAa,OAAO,SAAS,OAAO,GAAG;AAClE,cAAM;AAAA,MACV;AAAA,IACJ,SAAS,OAAO;AACZ,YAAM,QAAQ,OAAO,KAAK;AAAA,IAC9B;AACA,WAAO,QAAQ,QAAQ,MAAS;AAAA,EACpC;AACJ;",
   "names": []
 }

package/package.json

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

package/src/behavior/Transitions.ts

@@ -220,7 +220,7 @@ export class Transitions<B extends Behavior> {
             return;
         }
 
-        // Only report if it changes, with a delta larger than 10, caused by the invoke of a command
+        // Only report if it changes, with a delta larger than 10, caused by an invoke of a command
         if (fromCommand && Math.abs(this.#prevPublishedRemainingTime - newRemainingTime) <= 10) {
             return;
         }

package/src/behavior/state/managed/Datasource.ts

@@ -285,7 +285,7 @@ interface CommitChanges {
  * Initialize the internal version of the datasource.
  */
 function configure(options: Datasource.Options): Internals {
-    const values = new options.type() as Val.Struct;
+    let values = new options.type() as Val.Struct;
 
     let storedValues = options.store?.initialValues;
 
@@ -328,11 +328,26 @@ function configure(options: Datasource.Options): Internals {
         primaryKey: options.primaryKey === "id" ? "id" : "name",
         events,
         version: options.entropy.randomUint32,
-        values,
         featuresKey,
         manageVersion: true,
         persistentFields,
 
+        get values() {
+            return values;
+        },
+
+        set values(newValues: Val.Struct) {
+            const oldValues = this.values;
+
+            values = newValues;
+
+            if (this.sessions) {
+                for (const context of this.sessions.values()) {
+                    context.onChange(oldValues);
+                }
+            }
+        },
+
         interactionObserver(session?: ValueSupervisor.Session) {
             function handleObserverError(error: any) {
                 logger.error(`Error in ${options.location.path} observer:`, error);
@@ -425,12 +440,6 @@ function configureExternalChanges(internals: Internals) {
             ...changes,
         };
 
-        if (internals.sessions) {
-            for (const context of internals.sessions.values()) {
-                context.onChange(oldValues!);
-            }
-        }
-
         const changedProps = Object.keys(changes);
 
         const onChangePromise = internals.onChange?.(Array.from(changedProps));
@@ -825,13 +834,7 @@ function createReference(resource: Transaction.Resource, internals: Internals, s
             return;
         }
 
-        const oldValues = internals.values;
         internals.values = values;
-        if (internals.sessions) {
-            for (const context of internals.sessions.values()) {
-                context.onChange(oldValues);
-            }
-        }
     }
 
     /**

package/src/behavior/state/managed/values/ListManager.ts

@@ -65,8 +65,8 @@ function createConfig(owner: RootSupervisor, schema: Schema): ListConfig {
 
     return {
         schema,
-        fabricScoped: schema.effectiveAccess.fabric == Access.Fabric.Scoped,
-        fabricSensitive: schema.effectiveAccess.fabric == Access.Fabric.Sensitive,
+        fabricScoped: schema.effectiveAccess.fabric === Access.Fabric.Scoped,
+        fabricSensitive: schema.effectiveAccess.fabric === Access.Fabric.Sensitive,
         manageEntries: entryManager.manage !== PrimitiveManager,
         manageEntry: entryManager.manage,
         validateEntry: entryManager.validate,

package/src/behavior/state/managed/values/ValuePatcher.ts

@@ -70,9 +70,12 @@ function StructPatcher(schema: ValueModel, supervisor: RootSupervisor): ValueSup
     // An object mapping name to default value (if any) for sub-structs
     const memberDefaults = {} as Record<string, Val.Struct>;
 
-    // An object mapping name to true iff member is an array
+    // An object mapping name to true if member is an array
     const memberArrays = {} as Record<string, boolean>;
 
+    // An object mapping alt keys (numeric IDs) to member names, if numeric IDs are defined
+    const memberAltKeys = {} as Record<string, string>;
+
     for (const member of supervisor.membersOf(schema)) {
         const metatype = member.effectiveMetatype;
 
@@ -82,6 +85,9 @@ function StructPatcher(schema: ValueModel, supervisor: RootSupervisor): ValueSup
         }
 
         const key = camelize(member.name);
+        if (member.id !== undefined) {
+            memberAltKeys[member.id.toString()] = key;
+        }
 
         memberPatchers[key] = handler;
 
@@ -105,14 +111,17 @@ function StructPatcher(schema: ValueModel, supervisor: RootSupervisor): ValueSup
             throw new WriteError(path, `cannot patch ${target} because it is not an object`);
         }
 
-        for (const key in changes as Val.Struct) {
+        for (let key in changes as Val.Struct) {
+            let newValue = (changes as Val.Struct)[key];
+
             // Validate the key
             if (!(key in memberPatchers)) {
-                throw new WriteError(path, `${key} is not a property of ${schema.name}`);
+                if (!(key in memberAltKeys)) {
+                    throw new WriteError(path, `${key} is not a property of ${schema.name}`);
+                }
+                key = memberAltKeys[key];
             }
 
-            let newValue = (changes as Val.Struct)[key];
-
             // If this is not a subcollection or the new value is not an object, just do direct set
             const subpatch = memberPatchers[key];
             if (!subpatch || newValue === null || typeof newValue !== "object") {
@@ -137,7 +146,7 @@ function StructPatcher(schema: ValueModel, supervisor: RootSupervisor): ValueSup
                 continue;
             }
 
-            // Patch existing container.  Casts to collection here may be incorrect but we the subpatcher will validate
+            // Patch existing container.  Casts to collection here may be incorrect but the subpatcher will validate
             // input and throw for non-collections
             subpatch(newValue as Val.Collection, target[key] as Val.Collection, path.at(key));
         }

package/src/behavior/supervision/ValueSupervisor.ts

@@ -74,6 +74,11 @@ export namespace ValueSupervisor {
          */
         transaction: Transaction;
 
+        /**
+         * Signal for terminating asynchronous processes.
+         */
+        abort?: AbortSignal;
+
         /**
          * If this is true, data validation is disabled.  This should only be used in contexts where data validation is
          * deferred.

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

@@ -521,15 +521,15 @@ export namespace CommissioningClient {
          * ```
          *
          * Note that certain clusters like Descriptor and Basic Information contain critical operational data. If your
-         * read omits them then the node will only be partially functional once initialized or relevant clusters and
-         * endpoints need to be enabled manually.
+         * read omits them then the node will only be partially functional once initialized.
          */
         defaultSubscription?: Subscribe;
 
         /**
          * By default, nodes we commission are automatically subscribed to using the {@link defaultSubscription} (or a
          * full wildcard subscription if that is undefined).
-         * When set to false, the node will not be automatically subscribed.
+         *
+         * Matter.js will not subscribe automatically if set to false.
          */
         autoSubscribe?: boolean;
 

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

@@ -61,10 +61,12 @@ export class ClientNetworkRuntime extends NetworkRuntime {
         });
         env.set(ExchangeProvider, exchangeProvider);
 
+        this.#client = new ClientInteraction({ environment: env, abort: this.abortSignal });
+        env.set(ClientInteraction, this.#client);
+
         // Monitor sessions to maintain online state.  We consider the node "online" if there is an active session.  If
         // not, we consider the node offline.  This is the only real way we have of determining whether the node is
         // healthy without actively polling
-        this.#client = env.get(ClientInteraction);
         const { sessions } = env.get(SessionManager);
 
         if (sessions.find(session => session.peerIs(address))) {
@@ -105,6 +107,8 @@ export class ClientNetworkRuntime extends NetworkRuntime {
     protected async stop() {
         await this.construction;
 
+        this.owner.env.delete(ClientInteraction, this.#client);
+
         try {
             await this.#client?.close();
         } catch (e) {
@@ -113,8 +117,4 @@ export class ClientNetworkRuntime extends NetworkRuntime {
 
         this.#observers.close();
     }
-
-    blockNewActivity() {
-        this.owner.env.delete(ClientInteraction, this.#client);
-    }
 }

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

@@ -5,11 +5,11 @@
  */
 
 import { RemoteDescriptor } from "#behavior/system/commissioning/RemoteDescriptor.js";
-import { ImplementationError, Observable, ServerAddress, ServerAddressUdp } from "#general";
+import { Observable, ServerAddress, ServerAddressUdp } from "#general";
 import { DatatypeModel, FieldElement } from "#model";
 import type { ClientNode } from "#node/ClientNode.js";
 import { Node } from "#node/Node.js";
-import { ClientInteraction, DEFAULT_MIN_INTERVAL_FLOOR, PeerSet, Subscribe } from "#protocol";
+import { ActiveSubscription, DEFAULT_MIN_INTERVAL_FLOOR, PeerSet, Subscribe } from "#protocol";
 import { CaseAuthenticatedTag } from "#types";
 import { ClientNetworkRuntime } from "./ClientNetworkRuntime.js";
 import { NetworkBehavior } from "./NetworkBehavior.js";
@@ -25,8 +25,8 @@ export class NetworkClient extends NetworkBehavior {
             this.state.autoSubscribe = false;
             this.state.defaultSubscription = undefined;
         } else {
-            this.reactTo(this.events.autoSubscribe$Changed, this.#handleSubscription, { offline: true });
-            this.reactTo(this.events.defaultSubscription$Changed, this.#handleChangedDefaultSubscription);
+            this.reactTo(this.events.autoSubscribe$Changed, this.#handleAutoSubscribeChanged, { offline: true });
+            this.reactTo(this.events.defaultSubscription$Changed, this.#handleDefaultSubscriptionChange);
         }
     }
 
@@ -48,36 +48,23 @@ export class NetworkClient extends NetworkBehavior {
             }
         }
 
-        await this.#handleSubscription();
+        await this.#handleAutoSubscribeChanged();
     }
 
-    /**
-     * Manually activate the subscription for the node, if not already active. This will fail if the node is disabled.
-     *
-     * If you want to disable subscription, set the isDisabled state to true or set autoSubscribe to false.
-     */
-    subscribe() {
-        if (this.state.isDisabled) {
-            throw new ImplementationError("Cannot subscribe when node is disabled");
-        }
-        return this.#handleSubscription(true);
-    }
+    async #handleDefaultSubscriptionChange() {
+        // Terminate any existing subscription
+        await this.#handleAutoSubscribeChanged(false);
 
-    async #handleChangedDefaultSubscription() {
-        if (!this.internal.subscriptionActivated) {
-            return;
+        if (this.state.autoSubscribe && !this.state.isDisabled) {
+            await this.#handleAutoSubscribeChanged(true);
         }
-
-        // Restart the subscription with the new parameters
-        await this.#handleSubscription(false);
-        await this.#handleSubscription(true);
     }
 
-    async #handleSubscription(desiredState = this.state.autoSubscribe) {
+    async #handleAutoSubscribeChanged(desiredState = this.state.autoSubscribe) {
         const { isDisabled } = this.state;
         const subscriptionDesired = desiredState && !isDisabled;
 
-        if (subscriptionDesired === this.internal.subscriptionActivated) {
+        if (subscriptionDesired === !!this.internal.activeSubscription) {
             return;
         }
 
@@ -93,22 +80,17 @@ export class NetworkClient extends NetworkBehavior {
                 ...this.state.defaultSubscription,
             });
 
-            // First, read.  This allows us to retrieve attributes that do not support subscription
+            // First, read.  This allows us to retrieve attributes that do not support subscription and gives us
+            // physical device information required to optimize subscription parameters
             for await (const _chunk of this.#node.interaction.read(subscribe));
 
             // Now subscribe for subsequent updates
-            const { subscriptionId } = await this.#node.interaction.subscribe(subscribe);
+            const subscription = await this.#node.interaction.subscribe(subscribe);
 
-            this.internal.subscriptionActivated = true;
-            this.internal.defaultSubscriptionId = subscriptionId;
+            this.internal.activeSubscription = subscription;
         } else {
-            if (this.internal.defaultSubscriptionId !== undefined) {
-                (this.#node.interaction as ClientInteraction).subscriptions
-                    .get(this.internal.defaultSubscriptionId)
-                    ?.close();
-                this.internal.defaultSubscriptionId = undefined;
-            }
-            this.internal.subscriptionActivated = false;
+            this.internal.activeSubscription?.close();
+            this.internal.activeSubscription = undefined;
         }
     }
 
@@ -167,13 +149,9 @@ export namespace NetworkClient {
         declare runtime?: ClientNetworkRuntime;
 
         /**
-         * Contains the subscription target state.  It will also be true if a subscription is in the process of being
-         * established, or we wait for the node to be rediscovered.
+         * The active default subscription.
          */
-        subscriptionActivated = false;
-
-        /** The ID of the current active default subscription, if any */
-        defaultSubscriptionId?: number;
+        activeSubscription?: ActiveSubscription;
     }
 
     export class State extends NetworkBehavior.State {
@@ -184,7 +162,7 @@ export namespace NetworkClient {
          * The default subscription is a wildcard for all attributes of the node.  You can set to undefined or filter
          * the fields and values but only values selected by this subscription will update automatically.
          *
-         * Set to null to disable automatic subscription.
+         * The default subscription updates automatically if you change this property.
          */
         defaultSubscription?: Subscribe;
 
@@ -199,6 +177,10 @@ export namespace NetworkClient {
         /**
          * If true, automatically subscribe to the provided default subscription (or all attributes and events) when
          * the node is started. If false, do not automatically subscribe.
+         *
+         * The subscription will activate or deactivate automatically if you change this property.
+         *
+         * Newly commissioned nodes default to true.
          */
         autoSubscribe = false;
 

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Construction, ImplementationError } from "#general";
+import { Abort, Construction, ImplementationError } from "#general";
 import type { Node } from "#node/Node.js";
 import { NodeActivity } from "../../context/NodeActivity.js";
 import { NetworkBehavior } from "./NetworkBehavior.js";
@@ -15,6 +15,11 @@ import { NetworkBehavior } from "./NetworkBehavior.js";
 export abstract class NetworkRuntime {
     #construction: Construction<NetworkRuntime>;
     #owner: Node;
+    #abort = new Abort();
+
+    get abortSignal() {
+        return this.#abort.signal;
+    }
 
     get construction() {
         return this.#construction;
@@ -37,7 +42,7 @@ export abstract class NetworkRuntime {
     }
 
     async [Construction.destruct]() {
-        this.blockNewActivity();
+        this.#abort();
         const activity = this.#owner.env.get(NodeActivity);
         if (activity.isActive) {
             await activity.inactive;
@@ -59,8 +64,6 @@ export abstract class NetworkRuntime {
 
     protected abstract stop(): Promise<void>;
 
-    protected abstract blockNewActivity(): void;
-
     protected get owner() {
         return this.#owner;
     }

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

@@ -294,12 +294,15 @@ export class ServerNetworkRuntime extends NetworkRuntime {
 
         await env.load(PeerSet);
 
+        // Prevent new connections when aborted
+        this.abortSignal.addEventListener("abort", () =>
+            this.owner.env.maybeGet(InteractionServer)?.blockNewActivity(),
+        );
+
         await this.owner.act(agent => this.owner.lifecycle.online.emit(agent.context));
     }
 
     protected override async stop() {
-        this.blockNewActivity();
-
         this.#observers.close();
 
         const { env } = this.owner;
@@ -327,10 +330,6 @@ export class ServerNetworkRuntime extends NetworkRuntime {
         await env.close(PeerSet);
     }
 
-    protected override blockNewActivity() {
-        this.owner.env.maybeGet(InteractionServer)?.blockNewActivity();
-    }
-
     async #initializeGroupNetworking() {
         if (this.#groupNetworking) {
             logger.warn("Group networking already initialized, skipping.");

package/src/behavior/system/remote/RemoteInterface.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AppAddress, BasicMultiplex, ImplementationError, Logger } from "#general";
+import { Abort, AppAddress, BasicMultiplex, ImplementationError, Logger } from "#general";
 import type { ServerNode } from "#node/ServerNode.js";
 import { ApiPath } from "./api/ApiPath.js";
 
@@ -16,7 +16,7 @@ const logger = Logger.get("RemoteAdapter");
 export abstract class RemoteInterface {
     #node: ServerNode;
     #address: AppAddress;
-    #abort = new AbortController();
+    #abort = new Abort();
     #root: ApiPath;
     #workers = new BasicMultiplex();
 
@@ -48,7 +48,7 @@ export abstract class RemoteInterface {
     }
 
     get isAborted() {
-        return this.#abort.signal.aborted;
+        return this.#abort.aborted;
     }
 
     get abort() {
@@ -75,7 +75,7 @@ export abstract class RemoteInterface {
             return;
         }
 
-        this.#abort.abort();
+        this.#abort();
 
         try {
             await this.stop();

package/src/behavior/system/subscriptions/SubscriptionsServer.ts

@@ -206,7 +206,7 @@ export class SubscriptionsBehavior extends Behavior {
         const { formerSubscriptions } = this.internal;
 
         if (!formerSubscriptions.length) {
-            logger.info("No former subscriptions to re-establish");
+            logger.debug("No former subscriptions to re-establish");
             return;
         } else {
             this.internal.formerSubscriptions = [];

package/src/behaviors/color-control/ColorConversionUtils.ts

@@ -172,8 +172,8 @@ export function rgbToXy(r: number, g: number, b: number): [number, number] {
     const Z = r * 0.000088 + g * 0.07231 + b * 0.986039;
     const sum = X + Y + Z;
 
-    const retX = sum == 0 ? 0 : X / sum;
-    const retY = sum == 0 ? 0 : Y / sum;
+    const retX = sum === 0 ? 0 : X / sum;
+    const retY = sum === 0 ? 0 : Y / sum;
 
     return [retX, retY];
 }

package/src/behaviors/thermostat/AtomicWriteHandler.ts

@@ -325,7 +325,7 @@ export class AtomicWriteHandler {
      */
     #pendingWriteStateForAttribute(endpoint: Endpoint, cluster: Behavior.Type, attribute: AttributeId) {
         const writeStates = this.#pendingWrites.filter(
-            s => s.endpoint.number == endpoint.number && s.clusterId === (cluster as ClusterBehavior.Type).cluster.id,
+            s => s.endpoint.number === endpoint.number && s.clusterId === (cluster as ClusterBehavior.Type).cluster.id,
         );
         if (writeStates.length === 0) {
             return undefined;

package/src/behaviors/thermostat/ThermostatServer.ts

@@ -999,7 +999,7 @@ export class ThermostatBaseServer extends ThermostatBehaviorLogicBase {
      * true.
      */
     #handleTemperatureChangeForMode(temperature: number | null) {
-        if (temperature == null) {
+        if (temperature === null) {
             return;
         }
         const consideration = this.temperatureConsideration;

package/src/node/client/ClientEventEmitter.ts

@@ -5,7 +5,7 @@
  */
 
 import type { ElementEvent, Events } from "#behavior/Events.js";
-import { camelize, Logger } from "#general";
+import { camelize, Diagnostic, Logger } from "#general";
 import { ClusterModel, EventModel, MatterModel } from "#model";
 import type { ClientNode } from "#node/ClientNode.js";
 import type { ReadResult } from "#protocol";
@@ -46,7 +46,7 @@ export function ClientEventEmitter(node: ClientNode, structure: ClientStructure)
             return;
         }
 
-        const event = getEvent(occurrence.path.endpointId, names.cluster, names.event);
+        const event = getEvent(node, occurrence.path.endpointId, names.cluster, names.event);
         if (event) {
             node.act(agent => {
                 // Current ActionContext is not writable, could skip act() but meh, see TODO above
@@ -56,26 +56,27 @@ export function ClientEventEmitter(node: ClientNode, structure: ClientStructure)
         }
     }
 
-    function getEvent(endpointId: EndpointNumber, clusterName: string, eventName: string) {
+    function getEvent(node: ClientNode, endpointId: EndpointNumber, clusterName: string, eventName: string) {
         const endpoint = structure.endpointFor(endpointId);
         if (endpoint === undefined) {
-            logger.error(`Received event for unsupported endpoint #${endpointId}`);
+            logger.warn(`Received event for unsupported endpoint #${endpointId} on ${node}`);
             return;
         }
 
         const events = (endpoint.events as Events.Generic<ElementEvent>)[clusterName];
         if (events === undefined) {
-            logger.error(`Received event ${eventName} for unsupported cluster ${clusterName} on ${endpoint}`);
+            logger.warn(`Received event ${eventName} for unsupported cluster ${clusterName} on ${endpoint}`);
             return;
         }
 
-        const event = events[eventName];
-        if (event === undefined) {
-            logger.error(`Received unsupported event ${eventName} for cluster ${clusterName} on ${endpoint}`);
-            return;
-        }
+        logger.info(
+            "Received event",
+            Diagnostic.strong(`${clusterName}.${eventName}`),
+            " on ",
+            Diagnostic.strong(endpoint.toString()),
+        );
 
-        return event;
+        return events[eventName];
     }
 }