@matter/node 0.16.0-alpha.0-20251115-d89e62680 → 0.16.0-alpha.0-20251129-96ad07c6e

package/dist/esm/node/client/Peers.js

@@ -20,7 +20,8 @@ import {
   Mutex,
   Seconds,
   Time,
-  Timestamp
+  Timestamp,
+  UninitializedDependencyError
 } from "#general";
 import { ClientGroup } from "#node/ClientGroup.js";
 import { InteractionServer } from "#node/server/InteractionServer.js";
@@ -46,13 +47,22 @@ class Peers extends EndpointContainer {
     this.added.on(this.#handlePeerAdded.bind(this));
     this.deleted.on(this.#manageExpiration.bind(this));
     this.clusterInstalled(BasicInformationClient).on(this.#instrumentBasicInformation.bind(this));
+    const lifecycle = owner.lifecycle;
+    lifecycle.online.on(this.#nodeOnline.bind(this));
+    lifecycle.offline.on(this.#nodeOffline.bind(this));
   }
   /**
    * Load nodes.  Invoked automatically by owner.
    */
   initialize() {
     const factory = this.owner.env.get(ClientNodeFactory);
-    const clientStores = this.owner.env.get(ServerNodeStore).clientStores;
+    const clientStores = this.owner.env.maybeGet(ServerNodeStore)?.clientStores;
+    if (clientStores === void 0) {
+      throw new UninitializedDependencyError(
+        "Peers",
+        "are not available because ServerNode initialization is incomplete"
+      );
+    }
     for (const id of clientStores.knownIds) {
       this.add(
         factory.create({
@@ -62,6 +72,15 @@ class Peers extends EndpointContainer {
       );
     }
   }
+  async #nodeOnline() {
+    this.#manageExpiration();
+  }
+  async #nodeOffline() {
+    this.#cancelExpiration();
+    for (const peer of this) {
+      await peer.cancel();
+    }
+  }
   /**
    * Find a specific commissionable node.
    */
@@ -255,12 +274,12 @@ class Peers extends EndpointContainer {
   }
   #onLeave(node, fabricIndex) {
     this.#mutex.run(async () => {
-      const { fabrics: peerFabrics } = node.maybeStateOf(OperationalCredentialsClient);
-      const peerFabric = peerFabrics.find((fabric) => fabric.fabricIndex === fabricIndex);
+      const { fabrics: peerFabrics } = node.maybeStateOf(OperationalCredentialsClient) ?? {};
+      const peerFabric = peerFabrics?.find((fabric) => fabric.fabricIndex === fabricIndex);
       if (!peerFabric) {
         return;
       }
-      const peerAddress = node.maybeStateOf(CommissioningClient).peerAddress;
+      const peerAddress = node.maybeStateOf(CommissioningClient)?.peerAddress;
       if (!peerAddress) {
         return;
       }

package/dist/esm/node/client/Peers.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/node/client/Peers.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["freshestExp"]
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ServerEnvironment.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAU,UAAU,EAAE,MAAM,UAAU,CAAC;AAI9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAC/B,sGAAsG;IAC/F,MAAM,yBAAyB,yBAAe,CAAC;IAEtD,SAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBA+BhD;IAED,SAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,iBAa3C;CACJ"}
+{"version":3,"file":"ServerEnvironment.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAU,UAAU,EAAE,MAAM,UAAU,CAAC;AAI9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAC/B,sGAAsG;IAC/F,MAAM,yBAAyB,yBAAe,CAAC;IAEtD,SAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBA+BhD;IAED,SAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,iBAQ3C;CACJ"}

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

@@ -9,7 +9,7 @@ import { Crypto, Observable } from "#general";
 import { NodePeerAddressStore } from "#node/client/NodePeerAddressStore.js";
 import { ChangeNotificationService } from "#node/integration/ChangeNotificationService.js";
 import { ServerEndpointInitializer } from "#node/server/ServerEndpointInitializer.js";
-import { FabricManager, MdnsService, OccurrenceManager, PeerAddressStore, SessionManager } from "#protocol";
+import { FabricManager, OccurrenceManager, PeerAddressStore, SessionManager } from "#protocol";
 import { ServerNodeStore } from "#storage/server/ServerNodeStore.js";
 import { IdentityService } from "./IdentityService.js";
 var ServerEnvironment;
@@ -46,9 +46,6 @@ var ServerEnvironment;
     await env.close(SessionManager);
     await env.close(OccurrenceManager);
     await env.close(ServerNodeStore);
-    if (env.owns(MdnsService)) {
-      await env.close(MdnsService);
-    }
   }
   ServerEnvironment2.close = close;
 })(ServerEnvironment || (ServerEnvironment = {}));

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/node/server/ServerEnvironment.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,qCAAqC;AAC9C,SAAS,2BAA2B;AACpC,SAAS,QAAQ,kBAAkB;AACnC,SAAS,4BAA4B;AACrC,SAAS,iCAAiC;AAC1C,SAAS,iCAAiC;AAE1C,SAAS,eAAe,aAAa,mBAAmB,kBAAkB,sBAAsB;AAChG,SAAS,uBAAuB;AAChC,SAAS,uBAAuB;AAKzB,IAAU;AAAA,CAAV,CAAUA,uBAAV;AAEI,EAAMA,mBAAA,4BAA4B,WAAW;AAEpD,iBAAsB,WAAW,MAAkB;AAC/C,UAAM,EAAE,IAAI,IAAI;AAGhB,QAAI,CAAC,IAAI,IAAI,eAAe,GAAG;AAE3B,YAAM,QAAQ,MAAM,gBAAgB,OAAO,KAAK,KAAK,EAAE;AACvD,UAAI,IAAI,iBAAiB,KAAK;AAAA,IAClC;AACA,QAAI,IAAI,qBAAqB,IAAI,0BAA0B,GAAG,CAAC;AAC/D,QAAI,IAAI,iBAAiB,IAAI,gBAAgB,IAAI,CAAC;AAClD,QAAI,CAAC,IAAI,IAAI,gBAAgB,GAAG;AAE5B,UAAI,IAAI,kBAAkB,IAAI,qBAAqB,IAAI,CAAC;AAAA,IAC5D;AACA,QAAI,IAAI,2BAA2B,IAAI,0BAA0B,IAAI,CAAC;AAGtE,UAAM,UAAU,MAAM,IAAI,KAAK,aAAa;AAE5C,YAAQ,OAAO,QAAQ,GAAG,YAAY;AAClC,YAAM,gBAAgB,QAAQ,QAAQ,IAAI,YAAU,OAAO,WAAW;AACtE,UAAI,cAAc,SAAS,GAAG;AAC1B,cAAM,8BAA8B,MAAM,aAAa;AAAA,MAC3D;AACA,MAAAA,mBAAA,0BAA0B,KAAK;AAAA,IACnC,CAAC;AAED,UAAM,IAAI,KAAK,cAAc;AAE7B,QAAI,IAAI,MAAM,EAAE,YAAY,KAAK,EAAE;AAAA,EACvC;AA/BA,EAAAA,mBAAsB;AAiCtB,iBAAsB,MAAM,MAAkB;AAC1C,UAAM,EAAE,IAAI,IAAI;AAEhB,QAAI,MAAM,aAAa;AACvB,UAAM,IAAI,MAAM,yBAAyB;AACzC,UAAM,IAAI,MAAM,cAAc;AAC9B,UAAM,IAAI,MAAM,iBAAiB;AACjC,UAAM,IAAI,MAAM,eAAe;AAG/B,QAAI,IAAI,KAAK,WAAW,GAAG;AACvB,YAAM,IAAI,MAAM,WAAW;AAAA,IAC/B;AAAA,EACJ;AAbA,EAAAA,mBAAsB;AAAA,GArCT;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,qCAAqC;AAC9C,SAAS,2BAA2B;AACpC,SAAS,QAAQ,kBAAkB;AACnC,SAAS,4BAA4B;AACrC,SAAS,iCAAiC;AAC1C,SAAS,iCAAiC;AAE1C,SAAS,eAAe,mBAAmB,kBAAkB,sBAAsB;AACnF,SAAS,uBAAuB;AAChC,SAAS,uBAAuB;AAKzB,IAAU;AAAA,CAAV,CAAUA,uBAAV;AAEI,EAAMA,mBAAA,4BAA4B,WAAW;AAEpD,iBAAsB,WAAW,MAAkB;AAC/C,UAAM,EAAE,IAAI,IAAI;AAGhB,QAAI,CAAC,IAAI,IAAI,eAAe,GAAG;AAE3B,YAAM,QAAQ,MAAM,gBAAgB,OAAO,KAAK,KAAK,EAAE;AACvD,UAAI,IAAI,iBAAiB,KAAK;AAAA,IAClC;AACA,QAAI,IAAI,qBAAqB,IAAI,0BAA0B,GAAG,CAAC;AAC/D,QAAI,IAAI,iBAAiB,IAAI,gBAAgB,IAAI,CAAC;AAClD,QAAI,CAAC,IAAI,IAAI,gBAAgB,GAAG;AAE5B,UAAI,IAAI,kBAAkB,IAAI,qBAAqB,IAAI,CAAC;AAAA,IAC5D;AACA,QAAI,IAAI,2BAA2B,IAAI,0BAA0B,IAAI,CAAC;AAGtE,UAAM,UAAU,MAAM,IAAI,KAAK,aAAa;AAE5C,YAAQ,OAAO,QAAQ,GAAG,YAAY;AAClC,YAAM,gBAAgB,QAAQ,QAAQ,IAAI,YAAU,OAAO,WAAW;AACtE,UAAI,cAAc,SAAS,GAAG;AAC1B,cAAM,8BAA8B,MAAM,aAAa;AAAA,MAC3D;AACA,MAAAA,mBAAA,0BAA0B,KAAK;AAAA,IACnC,CAAC;AAED,UAAM,IAAI,KAAK,cAAc;AAE7B,QAAI,IAAI,MAAM,EAAE,YAAY,KAAK,EAAE;AAAA,EACvC;AA/BA,EAAAA,mBAAsB;AAiCtB,iBAAsB,MAAM,MAAkB;AAC1C,UAAM,EAAE,IAAI,IAAI;AAEhB,QAAI,MAAM,aAAa;AACvB,UAAM,IAAI,MAAM,yBAAyB;AACzC,UAAM,IAAI,MAAM,cAAc;AAC9B,UAAM,IAAI,MAAM,iBAAiB;AACjC,UAAM,IAAI,MAAM,eAAe;AAAA,EACnC;AARA,EAAAA,mBAAsB;AAAA,GArCT;",
   "names": ["ServerEnvironment"]
 }

package/package.json

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

package/src/behavior/Events.ts

@@ -259,7 +259,7 @@ export class QuietEvent<T extends any[] = any[], S extends ValueModel = ValueMod
         super(schema, owner);
         this.#quiet = new QuietObservable({
             shouldEmit(...args: T) {
-                const [oldValue, newValue] = args;
+                const [newValue, oldValue] = args;
 
                 return oldValue === null || (newValue === null && oldValue !== newValue) ? "now" : true;
             },

package/src/behavior/cluster/ClientBehavior.ts

@@ -14,7 +14,7 @@ import { markClientBehavior } from "./cluster-behavior-utils.js";
  * You may use a client behavior to access the type-safe version of a behavior without knowing details of the underlying
  * implementation such as the base class or supported features.
  *
- * For appropriate type safety {@link cluster} must be specify all cluster elements, and those that are not mandatory
+ * For appropriate type safety {@link cluster} must specify all cluster elements, and those that are not mandatory
  * without features must be marked as optional.
  */
 export function ClientBehavior<const T extends ClusterType>(cluster: T): ClusterBehavior.Type<T> {

package/src/behavior/cluster/ClusterBehavior.ts

@@ -32,7 +32,7 @@ import type { ClusterState } from "./ClusterState.js";
  * and may not be retained across invocations.
  *
  * ClusterBehaviors may be instantiated with unsupported mandatory commands and attributes.  This is currently results
- * in a runtime error but it will not cause a type error during development.
+ * in a runtime error, but it will not cause a type error during development.
  */
 export class ClusterBehavior extends Behavior {
     declare static readonly schema: Schema.Cluster;

package/src/behavior/cluster/ClusterBehaviorType.ts

@@ -161,7 +161,7 @@ export namespace ClusterBehaviorType {
         /**
          * Factory for command implementations.
          *
-         * By default commands install as {@link Behavior.unimplemented}.  In client scenarios this allows the caller to
+         * By default, commands install as {@link Behavior.unimplemented}.  In client scenarios this allows the caller to
          * provide a useful default implementation.
          */
         commandFactory?: CommandFactory;
@@ -469,12 +469,11 @@ function createDefaultCommandDescriptors({ scope, base, commandFactory }: Deriva
 
         // Choose implementation, or skip if appropriate implementation is already present
         if (!conformantNames.has(name)) {
-            // Non-conformant; install as unimplemented
-            if (instance[name]) {
+            if (instance[name] && instance[name] !== Behavior.unimplemented) {
                 continue;
             }
-            implementation = Behavior.unimplemented;
-        } else if (commandFactory) {
+        }
+        if (commandFactory) {
             // With a factory, replace any existing implementation not provided by the factory
             if ((instance[name] as MarkedCommand | undefined)?.[sourceFactory] === commandFactory) {
                 continue;

package/src/behavior/cluster/ValidatedElements.ts

@@ -230,7 +230,7 @@ export class ValidatedElements {
             if (implementation === Behavior.unimplemented) {
                 if (!command.optional) {
                     // TODO - do not pollute the logs with these as Matter spec is in flux (should this include groups
-                    // or just scenes?)
+                    //  or just scenes?)
                     if (this.#name.match(/^(?:Groups|Scenes|GroupKeyManagement)(?:Server|Behavior)/)) {
                         continue;
                     }

package/src/behavior/state/validation/ValueValidator.ts

@@ -221,11 +221,23 @@ function createSimpleValidator(
 }
 
 function createIntegerValidator(schema: ValueModel, supervisor: RootSupervisor, name: string) {
+    const nullable = schema.effectiveQuality.nullable;
     let assertion;
-    if (schema.effectiveQuality.nullable) {
-        assertion = assertInt.nullable[name];
-    } else {
-        assertion = assertInt.notNullable[name];
+    // Let's check schema type specific assertations first
+    // TODO maybe introduce a date type and then optimize this here later
+    if (schema.type === "epoch-s" || schema.type === "epoch-us") {
+        if (nullable) {
+            assertion = assertInt.nullable[schema.type];
+        } else {
+            assertion = assertInt.notNullable[schema.type];
+        }
+    }
+    if (assertion === undefined) {
+        if (nullable) {
+            assertion = assertInt.nullable[name];
+        } else {
+            assertion = assertInt.notNullable[name];
+        }
     }
 
     if (assertion === undefined) {

package/src/behavior/state/validation/assertions.ts

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Bytes, isObject } from "#general";
+import { Bytes, isObject, UINT32_MAX, UINT64_MAX } from "#general";
 import { SchemaErrorPath } from "#model";
 import { DatatypeError, IntegerRangeError, Val } from "#protocol";
+import { MATTER_EPOCH_OFFSET_S, MATTER_EPOCH_OFFSET_US } from "@matter/types";
 
 export function assertNumber(value: Val, path: SchemaErrorPath): asserts value is number {
     if (Number.isFinite(value)) {
@@ -94,6 +95,31 @@ for (let i = 1n; i < 9n; i++) {
     assertInt.nullable[intName] = createIntAssertion(`nullable ${intName}`, signedMin + 1n, signedMax);
 }
 
+// Add special epoch-s case
+assertInt.notNullable["epoch-s"] = createIntAssertion(
+    "epoch-s",
+    BigInt(MATTER_EPOCH_OFFSET_S),
+    BigInt(UINT32_MAX + MATTER_EPOCH_OFFSET_S),
+);
+assertInt.nullable["epoch-s"] = createIntAssertion(
+    `nullable epoch-s`,
+    BigInt(MATTER_EPOCH_OFFSET_S),
+    BigInt(UINT32_MAX + MATTER_EPOCH_OFFSET_S) - 1n,
+);
+
+// Add special epoch-us case
+// TODO Think about representing as float like other high precision time values?
+assertInt.notNullable["epoch-us"] = createIntAssertion(
+    "epoch-us",
+    MATTER_EPOCH_OFFSET_US,
+    UINT64_MAX + MATTER_EPOCH_OFFSET_US,
+);
+assertInt.nullable["epoch-us"] = createIntAssertion(
+    `nullable epoch-us`,
+    MATTER_EPOCH_OFFSET_US,
+    UINT64_MAX + MATTER_EPOCH_OFFSET_US - 1n,
+);
+
 function createIntAssertion(name: string, lowerBoundInclusive: bigint, upperBoundExclusive: bigint) {
     if (lowerBoundInclusive < Number.MIN_SAFE_INTEGER || upperBoundExclusive > Number.MAX_SAFE_INTEGER) {
         return createVarIntAssertion(name, lowerBoundInclusive, upperBoundExclusive);

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

@@ -181,10 +181,8 @@ export class CommissioningClient extends Behavior {
 
         const network = this.agent.get(NetworkClient);
         network.state.defaultSubscription = opts.defaultSubscription;
-        if (opts.autoSubscribe || opts.autoSubscribe === undefined) {
-            // Nodes we commission are auto-subscribed by default, unless disabled explicitly
-            network.state.autoSubscribe = opts.autoSubscribe ?? true;
-        }
+        // Nodes we commission are auto-subscribed by default, unless disabled explicitly
+        network.state.autoSubscribe = opts.autoSubscribe !== false;
         network.state.caseAuthenticatedTags = opts.caseAuthenticatedTags;
 
         logger.notice(

package/src/behavior/system/controller/ControllerBehavior.ts

@@ -6,7 +6,7 @@
 
 import { Behavior } from "#behavior/Behavior.js";
 import { BasicInformationBehavior } from "#behaviors/basic-information";
-import { ConnectionlessTransportSet, ImplementationError, Logger } from "#general";
+import { ConnectionlessTransportSet, ImplementationError, Logger, SharedEnvironmentServices } from "#general";
 import { Node } from "#node/Node.js";
 import {
     Ble,
@@ -49,12 +49,15 @@ export class ControllerBehavior extends Behavior {
             throw new ImplementationError("adminFabricLabel must be set for ControllerBehavior");
         }
 
+        const node = Node.forEndpoint(this.endpoint);
+
         // Configure discovery transports
         if (this.state.ip === undefined) {
             this.state.ip = true;
         }
         if (this.state.ip !== false) {
-            this.env.get(ScannerSet).add((await this.env.load(MdnsService)).client);
+            this.internal.services = this.env.asDependent();
+            this.env.get(ScannerSet).add((await this.internal.services.load(MdnsService)).client);
         }
 
         if (this.state.ble === undefined) {
@@ -83,7 +86,6 @@ export class ControllerBehavior extends Behavior {
             }
         }
 
-        const node = Node.forEndpoint(this.endpoint);
         this.reactTo(node.lifecycle.online, this.#nodeOnline);
         if (node.lifecycle.isOnline) {
             this.#nodeOnline();
@@ -95,6 +97,7 @@ export class ControllerBehavior extends Behavior {
         await this.env.close(ActiveDiscoveries);
         this.env.delete(FabricAuthority);
         this.env.delete(ScannerSet);
+        await this.internal.services?.close();
     }
 
     get fabricAuthorityConfig(): FabricAuthorityConfiguration {
@@ -168,6 +171,8 @@ export namespace ControllerBehavior {
             commissionable: true,
             operationalTargets: [],
         };
+
+        services?: SharedEnvironmentServices;
     }
 
     export class State {

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

@@ -15,6 +15,7 @@ import {
     NetworkInterfaceDetailed,
     NoAddressAvailableError,
     ObserverGroup,
+    SharedEnvironmentServices,
     UdpInterface,
 } from "#general";
 import type { ServerNode } from "#node/ServerNode.js";
@@ -61,6 +62,12 @@ export class ServerNetworkRuntime extends NetworkRuntime {
     #ipv6UdpInterface?: UdpInterface;
     #observers = new ObserverGroup(this);
     #groupNetworking?: ServerGroupNetworking;
+    #services: SharedEnvironmentServices;
+
+    constructor(owner: ServerNode) {
+        super(owner);
+        this.#services = owner.env.asDependent();
+    }
 
     override get owner() {
         return super.owner as ServerNode;
@@ -74,7 +81,7 @@ export class ServerNetworkRuntime extends NetworkRuntime {
             const port = this.owner.state.network.operationalPort;
             const options = this.owner.state.commissioning.mdns;
             const crypto = this.owner.env.get(Crypto);
-            const { server } = this.owner.env.get(MdnsService);
+            const { server } = this.#services.get(MdnsService);
             this.#mdnsAdvertiser = new MdnsAdvertiser(crypto, server, { ...options, port });
         }
         return this.#mdnsAdvertiser;
@@ -253,7 +260,7 @@ export class ServerNetworkRuntime extends NetworkRuntime {
         await this.addTransports(interfaces);
 
         // Initialize MDNS
-        const mdns = await owner.env.load(MdnsService);
+        const mdns = await this.#services.load(MdnsService);
 
         const advertiser = env.get(DeviceAdvertiser);
 
@@ -323,6 +330,8 @@ export class ServerNetworkRuntime extends NetworkRuntime {
         // Now all sessions are closed, so we wait for Advertiser to be gone
         await advertisementShutdown;
 
+        await this.#services.close();
+
         await env.close(ExchangeManager);
         await env.close(SecureChannelProtocol);
         await env.close(ConnectionlessTransportSet);

package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts

@@ -327,7 +327,8 @@ export class GeneralDiagnosticsServer extends Base {
     }
 
     async #updateNetworkList() {
-        const mdnsService = this.env.get(MdnsService);
+        await using services = this.env.asDependent();
+        const mdnsService = services.get(MdnsService);
         const mdnsLimitedToNetworkInterfaces = mdnsService.limitedToNetInterface;
 
         const networkRuntime = this.env.get(NetworkRuntime) as ServerNetworkRuntime;

package/src/behaviors/group-key-management/GroupKeyManagementServer.ts

@@ -9,7 +9,7 @@ import { GroupKeyManagement } from "#clusters/group-key-management";
 import { deepCopy, ImplementationError, Logger, MaybePromise } from "#general";
 import { DatatypeModel, FieldElement } from "#model";
 import { NodeLifecycle } from "#node/NodeLifecycle.js";
-import { assertRemoteActor, Fabric, FabricManager, hasRemoteActor } from "#protocol";
+import { assertRemoteActor, Fabric, FabricManager, hasRemoteActor, IPK_DEFAULT_EPOCH_START_TIME } from "#protocol";
 import { EndpointNumber, FabricIndex, GroupId, StatusCode, StatusResponseError } from "#types";
 import { GroupKeyManagementBehavior } from "./GroupKeyManagementBehavior.js";
 
@@ -91,12 +91,27 @@ export class GroupKeyManagementServer extends GroupKeyManagementBehavior {
         // When we have group key sets, we need to ensure that they are initialized on the Fabric group manager
         if (this.state.groupKeySets.length) {
             const groupKeysForFabric = new Map<FabricIndex, GroupKeyManagement.GroupKeySet[]>();
-            for (const groupKeySet of this.state.groupKeySets) {
+            const groupKeySets = deepCopy(this.state.groupKeySets);
+            for (let i = 0; i < groupKeySets.length; i++) {
+                const groupKeySet = groupKeySets[i];
                 const fabricIndex = groupKeySet.fabricIndex;
                 const keys = groupKeysForFabric.get(fabricIndex) ?? [];
+                if (keys.length === 0 && !fabrics.has(fabricIndex)) {
+                    // Should normally not happen, but we saw such crashes without details, so handle it gracefully
+                    logger.warn(
+                        `Stored GroupKeySets for FabricIndex ${fabricIndex}, but no such fabric exists anymore. Cleaning up stale entries.`,
+                    );
+                    groupKeySets.splice(i, 1);
+                    i--;
+                    continue;
+                }
                 keys.push(groupKeySet);
                 groupKeysForFabric.set(fabricIndex, keys);
             }
+            if (groupKeySets.length !== this.state.groupKeySets.length) {
+                // Some entries were removed, so update the persisted state
+                this.state.groupKeySets = groupKeySets;
+            }
 
             for (const [fabricIndex, keys] of groupKeysForFabric.entries()) {
                 const fabric = fabrics.for(fabricIndex);
@@ -290,7 +305,8 @@ export class GroupKeyManagementServer extends GroupKeyManagementBehavior {
         if (epochKey0 === null || epochStartTime0 === null) {
             throw new StatusResponseError("EpochKey0 and EpochStartTime0 must be set", StatusCode.InvalidCommand);
         }
-        if (epochStartTime0 === 0) {
+        if (epochStartTime0 <= IPK_DEFAULT_EPOCH_START_TIME) {
+            // Formally can never be < IPK_DEFAULT_EPOCH_START_TIME, but let's be sure
             throw new StatusResponseError("EpochStartTime0 must not be 0", StatusCode.InvalidCommand);
         }
 

package/src/behaviors/identify/IdentifyServer.ts

@@ -6,6 +6,7 @@
 
 import { Identify } from "#clusters/identify";
 import { MaybePromise, Observable, Seconds, Time, Timer } from "#general";
+import { hasRemoteActor } from "@matter/protocol";
 import { IdentifyBehavior } from "./IdentifyBehavior.js";
 
 /**
@@ -33,6 +34,14 @@ export class IdentifyServer extends IdentifyBehavior {
             this.state.identifyType = Identify.IdentifyType.None;
         }
 
+        this.events.identifyTime$Changed.quiet.config = {
+            shouldEmit: (newValue, oldValue, context) =>
+                hasRemoteActor(context) || ((oldValue === 0 || newValue === 0) && newValue !== oldValue)
+                    ? "now"
+                    : false,
+            suppressionEnabled: false,
+        };
+
         // TODO - identifyTime should become virtual attribute with timer to update isIdentifying
         // Enable I/2.4 once this is done
         this.internal.identifyTimer = Time.getPeriodicTimer(

package/src/behaviors/service-area/ServiceAreaServer.ts

@@ -57,7 +57,7 @@ export class ServiceAreaBaseServer extends ServiceAreaBase {
                 // • when it changes to or from 0
                 // • when it decreases
                 // • when it changes to or from null
-                this.events.estimatedEndTime$Changed.quiet.shouldEmit = (oldValue, newValue) => {
+                this.events.estimatedEndTime$Changed.quiet.shouldEmit = (newValue, oldValue) => {
                     return oldValue === null ||
                         oldValue === 0 ||
                         newValue === null ||

package/src/behaviors/switch/SwitchServer.ts

@@ -30,13 +30,13 @@ const schema = SwitchServerBase.schema.extend({
     children: [
         FieldElement({
             name: "longPressDelay",
-            type: "epoch-s",
+            type: "duration",
             conformance: "MSL",
             default: DEFAULT_LONG_PRESS_DELAY,
         }),
         FieldElement({
             name: "multiPressDelay",
-            type: "epoch-s",
+            type: "duration",
             conformance: "MSM",
             default: DEFAULT_MULTIPRESS_DELAY,
         }),