@matter/node 0.16.0-alpha.0-20251018-dd1ea6a8a → 0.16.0-alpha.0-20251021-cca02fb0e

package/dist/esm/storage/client/ClientNodeStores.d.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Construction, StorageContext } from "#general";
+import type { ClientGroup } from "#node/ClientGroup.js";
 import type { ClientNode } from "#node/ClientNode.js";
 import { ClientNodeStore } from "./ClientNodeStore.js";
 /**
@@ -27,6 +28,7 @@ export declare class ClientNodeStores {
      * These stores are cached internally by ID.
      */
     storeForNode(node: ClientNode): ClientNodeStore;
+    storeForGroup(node: ClientGroup): ClientNodeStore;
     /**
      * List all nodes present.
      */

package/dist/esm/storage/client/ClientNodeStores.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientNodeStores.d.ts","sourceRoot":"","sources":["../../../../src/storage/client/ClientNodeStores.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAwB,cAAc,EAAE,MAAM,UAAU,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQvD;;GAEG;AACH,qBAAa,gBAAgB;;IAMzB,IAAI,YAAY,mCAEf;gBAEW,OAAO,EAAE,cAAc;IAM7B,CAAC,YAAY,CAAC,SAAS,CAAC;IAwB9B;;;;;OAKG;IACH,UAAU;IAMV;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe;IAW/C;;OAEG;IACH,IAAI,QAAQ,aAIX;IAEK,KAAK;CAUd"}
+{"version":3,"file":"ClientNodeStores.d.ts","sourceRoot":"","sources":["../../../../src/storage/client/ClientNodeStores.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAA8C,cAAc,EAAkB,MAAM,UAAU,CAAC;AACpH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQvD;;GAEG;AACH,qBAAa,gBAAgB;;IAMzB,IAAI,YAAY,mCAEf;gBAEW,OAAO,EAAE,cAAc;IAM7B,CAAC,YAAY,CAAC,SAAS,CAAC;IAwB9B;;;;;OAKG;IACH,UAAU;IAMV;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,eAAe;IAW/C,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,eAAe;IAWjD;;OAEG;IACH,IAAI,QAAQ,aAIX;IAEK,KAAK;CAsBd"}

package/dist/esm/storage/client/ClientNodeStores.js

@@ -3,7 +3,7 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Construction, MatterAggregateError } from "#general";
+import { Construction, MatterAggregateError, StorageBackendMemory, StorageManager } from "#general";
 import { ClientNodeStore } from "./ClientNodeStore.js";
 const CLIENT_ID_PREFIX = "peer";
 class ClientNodeStores {
@@ -61,6 +61,14 @@ class ClientNodeStores {
     }
     return this.#createNodeStore(node.id);
   }
+  storeForGroup(node) {
+    this.#construction.assert();
+    const store = this.#stores[node.id];
+    if (store) {
+      return store;
+    }
+    return this.#createGroupStore(node.id);
+  }
   /**
    * List all nodes present.
    */
@@ -71,6 +79,17 @@ class ClientNodeStores {
   async close() {
     await this.construction;
   }
+  /**
+   * Group stores are always created with a memory backend as they are transient.
+   */
+  #createGroupStore(id) {
+    const manager = new StorageManager(new StorageBackendMemory());
+    manager.initialize();
+    const store = new ClientNodeStore(id, manager.createContext(id));
+    store.construction.start();
+    this.#stores[id] = store;
+    return store;
+  }
   #createNodeStore(id) {
     const store = new ClientNodeStore(id, this.#storage.createContext(id));
     store.construction.start();

package/dist/esm/storage/client/ClientNodeStores.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/storage/client/ClientNodeStores.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc,4BAA4C;AAGnE,SAAS,uBAAuB;AAMhC,MAAM,mBAAmB;AAKlB,MAAM,iBAAiB;AAAA,EAC1B;AAAA,EACA,UAAU,CAAC;AAAA,EACX;AAAA,EACA,mBAAmB;AAAA,EAEnB,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,SAAyB;AACjC,SAAK,WAAW;AAChB,SAAK,gBAAgB,aAAa,IAAI;AACtC,SAAK,cAAc,MAAM;AAAA,EAC7B;AAAA,EAEA,OAAO,aAAa,SAAS,IAAI;AAC7B,UAAM,WAAW,MAAM,KAAK,SAAS,SAAS;AAE9C,eAAW,MAAM,UAAU;AACvB,UAAI,CAAC,GAAG,WAAW,gBAAgB,GAAG;AAClC;AAAA,MACJ;AAEA,YAAM,MAAM,OAAO,SAAS,GAAG,MAAM,iBAAiB,MAAM,CAAC;AAC7D,UAAI,OAAO,SAAS,GAAG,GAAG;AACtB,YAAI,KAAK,oBAAoB,KAAK;AAC9B,eAAK,mBAAmB,MAAM;AAAA,QAClC;AAAA,MACJ;AAEA,WAAK,iBAAiB,EAAE;AAAA,IAC5B;AAEA,UAAM,qBAAqB;AAAA,MACvB,OAAO,OAAO,KAAK,OAAO,EAAE,IAAI,WAAS,MAAM,aAAa,KAAK;AAAA,MACjE;AAAA,IACJ;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,aAAa;AACT,SAAK,cAAc,OAAO;AAE1B,WAAO,GAAG,gBAAgB,GAAG,KAAK,kBAAkB;AAAA,EACxD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,MAAmC;AAC5C,SAAK,cAAc,OAAO;AAE1B,UAAM,QAAQ,KAAK,QAAQ,KAAK,EAAE;AAClC,QAAI,OAAO;AACP,aAAO;AAAA,IACX;AAEA,WAAO,KAAK,iBAAiB,KAAK,EAAE;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,WAAW;AACX,SAAK,cAAc,OAAO;AAE1B,WAAO,OAAO,KAAK,KAAK,OAAO;AAAA,EACnC;AAAA,EAEA,MAAM,QAAQ;AACV,UAAM,KAAK;AAAA,EACf;AAAA,EAEA,iBAAiB,IAAY;AACzB,UAAM,QAAQ,IAAI,gBAAgB,IAAI,KAAK,SAAS,cAAc,EAAE,CAAC;AACrE,UAAM,aAAa,MAAM;AACzB,SAAK,QAAQ,EAAE,IAAI;AACnB,WAAO;AAAA,EACX;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc,sBAAsB,sBAAsC,sBAAsB;AAIzG,SAAS,uBAAuB;AAMhC,MAAM,mBAAmB;AAKlB,MAAM,iBAAiB;AAAA,EAC1B;AAAA,EACA,UAAU,CAAC;AAAA,EACX;AAAA,EACA,mBAAmB;AAAA,EAEnB,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,SAAyB;AACjC,SAAK,WAAW;AAChB,SAAK,gBAAgB,aAAa,IAAI;AACtC,SAAK,cAAc,MAAM;AAAA,EAC7B;AAAA,EAEA,OAAO,aAAa,SAAS,IAAI;AAC7B,UAAM,WAAW,MAAM,KAAK,SAAS,SAAS;AAE9C,eAAW,MAAM,UAAU;AACvB,UAAI,CAAC,GAAG,WAAW,gBAAgB,GAAG;AAClC;AAAA,MACJ;AAEA,YAAM,MAAM,OAAO,SAAS,GAAG,MAAM,iBAAiB,MAAM,CAAC;AAC7D,UAAI,OAAO,SAAS,GAAG,GAAG;AACtB,YAAI,KAAK,oBAAoB,KAAK;AAC9B,eAAK,mBAAmB,MAAM;AAAA,QAClC;AAAA,MACJ;AAEA,WAAK,iBAAiB,EAAE;AAAA,IAC5B;AAEA,UAAM,qBAAqB;AAAA,MACvB,OAAO,OAAO,KAAK,OAAO,EAAE,IAAI,WAAS,MAAM,aAAa,KAAK;AAAA,MACjE;AAAA,IACJ;AAAA,EACJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,aAAa;AACT,SAAK,cAAc,OAAO;AAE1B,WAAO,GAAG,gBAAgB,GAAG,KAAK,kBAAkB;AAAA,EACxD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,aAAa,MAAmC;AAC5C,SAAK,cAAc,OAAO;AAE1B,UAAM,QAAQ,KAAK,QAAQ,KAAK,EAAE;AAClC,QAAI,OAAO;AACP,aAAO;AAAA,IACX;AAEA,WAAO,KAAK,iBAAiB,KAAK,EAAE;AAAA,EACxC;AAAA,EAEA,cAAc,MAAoC;AAC9C,SAAK,cAAc,OAAO;AAE1B,UAAM,QAAQ,KAAK,QAAQ,KAAK,EAAE;AAClC,QAAI,OAAO;AACP,aAAO;AAAA,IACX;AAEA,WAAO,KAAK,kBAAkB,KAAK,EAAE;AAAA,EACzC;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,WAAW;AACX,SAAK,cAAc,OAAO;AAE1B,WAAO,OAAO,KAAK,KAAK,OAAO;AAAA,EACnC;AAAA,EAEA,MAAM,QAAQ;AACV,UAAM,KAAK;AAAA,EACf;AAAA;AAAA;AAAA;AAAA,EAKA,kBAAkB,IAAY;AAC1B,UAAM,UAAU,IAAI,eAAe,IAAI,qBAAqB,CAAC;AAC7D,YAAQ,WAAW;AACnB,UAAM,QAAQ,IAAI,gBAAgB,IAAI,QAAQ,cAAc,EAAE,CAAC;AAC/D,UAAM,aAAa,MAAM;AACzB,SAAK,QAAQ,EAAE,IAAI;AACnB,WAAO;AAAA,EACX;AAAA,EAEA,iBAAiB,IAAY;AACzB,UAAM,QAAQ,IAAI,gBAAgB,IAAI,KAAK,SAAS,cAAc,EAAE,CAAC;AACrE,UAAM,aAAa,MAAM;AACzB,SAAK,QAAQ,EAAE,IAAI;AACnB,WAAO;AAAA,EACX;AACJ;",
   "names": []
 }

package/package.json

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

package/src/behavior/Behavior.ts

@@ -14,12 +14,11 @@ import {
     Observable,
     Transaction,
 } from "#general";
-import { Schema } from "#model";
+import { ClassSemantics, Schema, Semantics } from "#model";
 import type { ClusterType } from "#types";
 import { Reactor } from "./Reactor.js";
 import type { BehaviorBacking } from "./internal/BehaviorBacking.js";
 import { DerivedState, EmptyState } from "./state/StateType.js";
-import { BehaviorSupervisor } from "./supervision/BehaviorSupervisor.js";
 import { RootSupervisor } from "./supervision/RootSupervisor.js";
 
 // Internal fields
@@ -68,7 +67,9 @@ export abstract class Behavior {
      * Schema is inferred from the methods and properties of the behavior but you can specify explicitly for additional
      * control.
      */
-    static readonly schema?: Schema;
+    static get schema() {
+        return Schema(this);
+    }
 
     /**
      * By default behaviors load lazily as they are accessed.  You can set this flag to true to force behaviors to load
@@ -139,7 +140,7 @@ export abstract class Behavior {
         if (Object.hasOwn(this, SUPERVISOR)) {
             return (this as StaticInternal)[SUPERVISOR] as RootSupervisor;
         }
-        return ((this as StaticInternal)[SUPERVISOR] = BehaviorSupervisor(this));
+        return ((this as StaticInternal)[SUPERVISOR] = RootSupervisor.for(Schema(this) ?? Schema.empty));
     }
 
     /**
@@ -310,6 +311,43 @@ Object.defineProperties(Behavior.prototype, {
     },
 });
 
+/**
+ * Install {@link ClassSemantics} extension logic to integrate schema metadata.
+ */
+Object.defineProperties(Behavior, {
+    [ClassSemantics.extend]: {
+        value(this: Behavior.Type, decoration: ClassSemantics) {
+            const type = decoration.new as Behavior.Type;
+
+            // Support static override of schema
+            if (Object.hasOwn(type, "schema") && type.schema !== undefined) {
+                decoration.mutableModel = type.schema;
+            }
+
+            // Obtain state and base schema
+            const { State, Events, defaults } = type;
+            if (!State || !defaults) {
+                return;
+            }
+
+            // Merge state properties into my schema
+            if (ClassSemantics.hasOwnSemantics(State)) {
+                const stateSemantics = Semantics.classOf(State);
+                stateSemantics.mutableModel = decoration.mutableModel;
+            }
+
+            // Merge events into my schema
+            if (ClassSemantics.hasOwnSemantics(Events)) {
+                const eventSemantics = Semantics.classOf(Events);
+                eventSemantics.mutableModel = decoration.mutableModel;
+            }
+
+            // Augment with fields for untyped state members
+            decoration.defineUnknownMembers(defaults);
+        },
+    },
+});
+
 export namespace Behavior {
     /**
      * Static properties supported by all behaviors.

package/src/behavior/cluster/ClusterBehavior.ts

@@ -7,7 +7,7 @@
 import { Events } from "#behavior/Events.js";
 import type { Agent } from "#endpoint/Agent.js";
 import { ImplementationError, MaybePromise } from "#general";
-import type { Schema } from "#model";
+import { type Schema } from "#model";
 import { ClusterComposer, ClusterType, ElementModifier, TypeFromBitSchema } from "#types";
 import { Behavior } from "../Behavior.js";
 import type { BehaviorBacking } from "../internal/BehaviorBacking.js";

package/src/behavior/cluster/ClusterBehaviorUtil.ts

@@ -7,6 +7,7 @@
 import { Events, OfflineEvent, OnlineEvent, QuietEvent } from "#behavior/Events.js";
 import { camelize, EventEmitter, GeneratedClass, ImplementationError, Observable } from "#general";
 import {
+    ClassSemantics,
     ClusterModel,
     DefaultValue,
     ElementTag,
@@ -81,9 +82,6 @@ export function createType<const C extends ClusterType>(
         }
     }
 
-    // Mutation of schema will almost certainly result in logic errors so ensure that can't happen
-    schema.freeze();
-
     const newProps = {} as Record<string, ValueModel>;
     const scope = Scope(schema);
 
@@ -110,15 +108,17 @@ export function createType<const C extends ClusterType>(
                 value: cluster,
                 enumerable: true,
             },
-
-            schema: {
-                value: schema,
-            },
         },
 
         instanceDescriptors: createDefaultCommandDescriptors(cluster, base),
     }) as ClusterBehavior.Type;
 
+    // Decorate the class
+    ClassSemantics.of(type).mutableModel = schema;
+
+    // Mutation of schema will almost certainly result in logic errors so ensure that can't happen
+    schema.finalize();
+
     if (useCache) {
         ClusterBehaviorCache.set(cluster, base, schema, type);
     }

package/src/behavior/supervision/RootSupervisor.ts

@@ -8,6 +8,7 @@ import { camelize, InternalError } from "#general";
 import {
     AttributeModel,
     ClusterModel,
+    ElementTag,
     FeatureMap,
     FeatureSet,
     Matter,
@@ -160,8 +161,9 @@ export class RootSupervisor implements ValueSupervisor {
             // TODO: We should handle writable/fabric scoped being non-volatile already in the conformance interpreter
             if (
                 member.effectiveQuality.nonvolatile ||
-                member.effectiveAccess.writable ||
-                member.effectiveAccess.fabricScoped
+                // Persist all writable attributes in addition to those officially marked as nonvolatile
+                (member.tag === ElementTag.Attribute &&
+                    (member.effectiveAccess.writable || member.effectiveAccess.fabricScoped))
             ) {
                 if (key === "id") {
                     const id = member.effectiveId;

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

@@ -19,7 +19,22 @@ import {
     Time,
     Timestamp,
 } from "#general";
-import { DatatypeModel, FieldElement } from "#model";
+import {
+    bool,
+    duration,
+    fabricIdx,
+    field,
+    listOf,
+    mandatory,
+    nodeId,
+    nonvolatile,
+    string,
+    systimeMs,
+    uint16,
+    uint32,
+    uint8,
+    vendorId,
+} from "#model";
 import type { ClientNode } from "#node/ClientNode.js";
 import type { Node } from "#node/Node.js";
 import { IdentityService } from "#node/server/IdentityService.js";
@@ -32,14 +47,15 @@ import {
     FabricAuthority,
     FabricManager,
     LocatedNodeCommissioningOptions,
-    PeerAddress,
-    SessionParameters,
+    PeerAddress as ProtocolPeerAddress,
+    SessionIntervals as ProtocolSessionIntervals,
     Subscribe,
 } from "#protocol";
 import {
     CaseAuthenticatedTag,
     DeviceTypeId,
     DiscoveryCapabilitiesBitmap,
+    FabricIndex,
     ManualPairingCodeCodec,
     NodeId,
     TypeFromPartialBitSchema,
@@ -109,11 +125,17 @@ export class CommissioningClient extends Behavior {
         await node.owner?.act(agent => agent.load(ControllerBehavior));
 
         // Obtain the fabric we will commission into
-        const fabricAuthority = opts.fabricAuthority || this.env.get(FabricAuthority);
+        const fabricAuthority = opts.fabricAuthority ?? this.env.get(FabricAuthority);
         let { fabric } = opts;
         if (fabric === undefined) {
             if (this.context.fabric === undefined) {
-                fabric = await fabricAuthority.defaultFabric();
+                const config = await node.owner?.act(agent => agent.get(ControllerBehavior).fabricAuthorityConfig);
+                if (config === undefined) {
+                    throw new ImplementationError(
+                        `Cannot commission ${node} because no fabric was specified and the controller has no fabric configuration`,
+                    );
+                }
+                fabric = await fabricAuthority.defaultFabric(config);
             } else {
                 fabric = node.env.get(FabricManager).for(this.context.fabric);
             }
@@ -194,7 +216,7 @@ export class CommissioningClient extends Behavior {
             throw new ImplementationError("Cannot decommission node that is not commissioned");
         }
 
-        const formerAddress = PeerAddress(peerAddress).toString();
+        const formerAddress = ProtocolPeerAddress(peerAddress).toString();
 
         const opcreds = this.agent.get(OperationalCredentialsClient);
 
@@ -218,7 +240,7 @@ export class CommissioningClient extends Behavior {
      * If you override, matter.js commissions to the point where commissioning over PASE is complete.  You must then
      * complete commissioning yourself by connecting to the device and invokeint the "CommissioningComplete" command.
      */
-    protected async finalizeCommissioning(_address: PeerAddress, _discoveryData?: DiscoveryData) {
+    protected async finalizeCommissioning(_address: ProtocolPeerAddress, _discoveryData?: DiscoveryData) {
         throw new NotImplementedError();
     }
 
@@ -235,7 +257,7 @@ export class CommissioningClient extends Behavior {
         endpoint.lifecycle.initialized.emit(this.state.peerAddress !== undefined);
     }
 
-    #peerAddressChanged(addr?: PeerAddress) {
+    #peerAddressChanged(addr?: ProtocolPeerAddress) {
         const node = this.endpoint as ClientNode;
 
         if (addr) {
@@ -258,174 +280,198 @@ export class CommissioningClient extends Behavior {
             node.lifecycle.decommissioned.emit(this.context);
         }
     }
+}
 
+export namespace CommissioningClient {
     /**
-     * Define logical schema.  This enables runtime validation, make fields persistent and makes subfields editable.
+     * Concrete version of {@link ProtocolPeerAddress}.
      */
-    static override readonly schema = new DatatypeModel(
-        {
-            name: "CommissioningState",
-            type: "struct",
-        },
-
-        FieldElement({
-            name: "peerAddress",
-            type: "struct",
-            quality: "N",
-            children: [
-                FieldElement({ name: "fabricIndex", type: "fabric-id" }),
-                FieldElement({ name: "nodeId", type: "node-id" }),
-            ],
-        }),
-
-        FieldElement({
-            name: "addresses",
-            type: "list",
-            quality: "N",
-            children: [
-                FieldElement({
-                    name: "entry",
-                    type: "struct",
-                    children: [
-                        FieldElement({ name: "type", type: "string" }),
-                        FieldElement({ name: "ip", type: "string" }),
-                        FieldElement({ name: "port", type: "uint16" }),
-                        FieldElement({ name: "peripheralAddress", type: "string" }),
-                    ],
-                }),
-            ],
-        }),
-
-        FieldElement({ name: "discoveredAt", type: "systime-ms", quality: "N", conformance: "M" }),
-        FieldElement({ name: "onlineAt", type: "systime-ms" }),
-        FieldElement({ name: "offlineAt", type: "systime-ms" }),
-        FieldElement({ name: "ttl", type: "uint32", quality: "N" }),
-        FieldElement({ name: "deviceIdentifier", type: "string", quality: "N" }),
-        FieldElement({ name: "discriminator", type: "uint16", quality: "N" }),
-        FieldElement({ name: "commissioningMode", type: "uint8", quality: "N" }),
-        FieldElement({ name: "vendorId", type: "vendor-id", quality: "N" }),
-        FieldElement({ name: "productId", type: "uint16", quality: "N" }),
-        FieldElement({ name: "deviceType", type: "uint16", quality: "N" }),
-        FieldElement({ name: "deviceName", type: "string", quality: "N" }),
-        FieldElement({ name: "rotatingIdentifier", type: "string", quality: "N" }),
-        FieldElement({ name: "pairingHint", type: "uint32", quality: "N" }),
-        FieldElement({ name: "pairingInstructions", type: "string", quality: "N" }),
-        FieldElement({
-            name: "sessionParameters",
-            type: "struct",
-            quality: "N",
-            children: [
-                FieldElement({ name: "idleInterval", type: "duration", constraint: "max 3600000" }),
-                FieldElement({ name: "activeInterval", type: "duration", constraint: "max 3600000" }),
-                FieldElement({ name: "activeThreshold", type: "duration", constraint: "max 65535" }),
-            ],
-        }),
-        FieldElement({ name: "tcpSupport", type: "uint8", quality: "N" }),
-        FieldElement({ name: "longIdleOperatingMode", type: "bool", quality: "N" }),
-    );
-}
+    export class PeerAddress implements ProtocolPeerAddress {
+        @field(fabricIdx, mandatory)
+        fabricIndex: FabricIndex;
+
+        @field(nodeId, mandatory)
+        nodeId: NodeId;
+
+        constructor(fabricIndex: FabricIndex, nodeId: NodeId) {
+            this.fabricIndex = fabricIndex;
+            this.nodeId = nodeId;
+        }
+    }
+
+    /**
+     * Concrete version of {@link SessionIntervals}.
+     */
+    export class SessionIntervals implements ProtocolSessionIntervals {
+        @field(duration.extend({ constraint: "max 3600000" }), mandatory)
+        idleInterval: Duration;
+
+        @field(duration.extend({ constraint: "max 3600000" }), mandatory)
+        activeInterval: Duration;
+
+        @field(duration.extend({ constraint: "max 65535" }), mandatory)
+        activeThreshold: Duration;
+
+        constructor(intervals: SessionIntervals) {
+            this.idleInterval = intervals.idleInterval;
+            this.activeInterval = intervals.activeInterval;
+            this.activeThreshold = intervals.activeThreshold;
+        }
+    }
+
+    /**
+     * The network address of a node.
+     */
+    export class NetworkAddress implements ServerAddress.Definition {
+        @field(string, mandatory)
+        type: "udp" | "tcp" | "ble";
+
+        @field(string)
+        ip?: string;
+
+        @field(uint16)
+        port?: number;
+
+        @field(string)
+        peripheralAddress?: string;
+
+        @field(uint32)
+        ttl?: Duration | undefined;
+
+        @field(systimeMs)
+        discoveredAt?: Timestamp | undefined;
+
+        constructor(address: NetworkAddress) {
+            this.type = address.type;
+            this.ip = address.ip;
+            this.port = address.port;
+            this.peripheralAddress = address.peripheralAddress;
+            this.ttl = address.ttl;
+            this.discoveredAt = address.discoveredAt;
+        }
+    }
 
-export namespace CommissioningClient {
     export class State {
         /**
          * Fabric index and node ID for paired peers.  If this is undefined the node is uncommissioned.
          */
+        @field(PeerAddress, nonvolatile)
         peerAddress?: PeerAddress;
 
         /**
          * Known network addresses for the device.  If this is undefined the node has not been located on any network
          * interface.
          */
+        @field(listOf(NetworkAddress), nonvolatile)
         addresses?: ServerAddress.Definition[];
 
         /**
          * Time at which the device was discovered.
          */
+        @field(systimeMs, nonvolatile)
         discoveredAt?: Timestamp;
 
         /**
          * Time at which we discovered the device's current operational addresses.
          */
+        @field(systimeMs)
         onlineAt?: Timestamp;
 
         /**
          * Time at which we concluded the device's current operational address is unreachable.
          */
+        @field(systimeMs)
         offlineAt?: Timestamp;
 
         /**
          * The TTL of the discovery record if applicable (in seconds).
          */
+        @field(duration, nonvolatile)
         ttl?: Duration;
 
         /**
          * The canonical global ID of the device.
          */
+        @field(string, nonvolatile)
         deviceIdentifier?: string;
 
         /**
          * The device's long discriminator.
          */
+        @field(uint16, nonvolatile)
         discriminator?: number;
 
         /**
          * The last know commissioning mode of the device.
          */
+        @field(uint8, nonvolatile)
         commissioningMode?: CommissioningMode;
 
         /**
          * Vendor.
          */
+        @field(vendorId, nonvolatile)
         vendorId?: VendorId;
 
         /**
          * Product.
          */
+        @field(uint16, nonvolatile)
         productId?: number;
 
         /**
          * Advertised device type.
          */
+        @field(uint16, nonvolatile)
         deviceType?: DeviceTypeId;
 
         /**
          * The advertised device name specified by the user.
          */
+        @field(string, nonvolatile)
         deviceName?: string;
 
         /**
          * An optional manufacturer-specific unique rotating ID for uniquely identifying the device.
          */
+        @field(string, nonvolatile)
         rotatingIdentifier?: string;
 
         /**
          * A bitmap indicating how to transition the device to commissioning mode from its current state.
          */
+        @field(uint32, nonvolatile)
         pairingHint?: number;
 
         /**
          * Textual pairing instructions associated with pairing hint.
          */
+        @field(string, nonvolatile)
         pairingInstructions?: string;
 
         /**
-         * The remote node's session parameters.
+         * The remote node's session intervals.
          */
-        sessionParameters?: Partial<SessionParameters>;
+        @field(SessionIntervals, nonvolatile)
+        sessionIntervals?: Partial<ProtocolSessionIntervals>;
 
         /**
          * TCP support bitmap.
          */
+        @field(uint8, nonvolatile)
         tcpSupport?: number;
 
         /**
          * Indicates whether node is ICD with a slow (15 s+) polling interval.
          */
+        @field(bool, nonvolatile)
         longIdleTimeOperatingMode?: boolean;
     }
 
     export class Events extends BaseEvents {
-        peerAddress$Changed = new Observable<[value: PeerAddress | undefined, oldValue: PeerAddress | undefined]>();
+        peerAddress$Changed = new Observable<
+            [value: ProtocolPeerAddress | undefined, oldValue: ProtocolPeerAddress | undefined]
+        >();
     }
 
     /**