@matter/node 0.16.0-alpha.0-20251001-7eb06da95 → 0.16.0-alpha.0-20251004-92135c7df

package/src/node/Node.ts

@@ -99,6 +99,7 @@ export abstract class Node<T extends Node.CommonRootEndpoint = Node.CommonRootEn
         if (this.lifecycle.isOnline) {
             return;
         }
+        this.lifecycle.targetState = "online";
 
         await this.lifecycle.mutex.produce(this.startWithMutex.bind(this));
     }
@@ -147,6 +148,7 @@ export abstract class Node<T extends Node.CommonRootEndpoint = Node.CommonRootEn
      * Once the node is offline you may use {@link start} to bring the node online again.
      */
     async cancel() {
+        this.lifecycle.targetState = "offline";
         await this.lifecycle.mutex.produce(this.cancelWithMutex.bind(this));
     }
 
@@ -174,6 +176,7 @@ export abstract class Node<T extends Node.CommonRootEndpoint = Node.CommonRootEn
     }
 
     override async close() {
+        this.lifecycle.targetState = "offline";
         await this.lifecycle.mutex.produce(this.closeWithMutex.bind(this));
     }
 

package/src/node/NodeLifecycle.ts

@@ -22,6 +22,7 @@ export class NodeLifecycle extends EndpointLifecycle {
     #onlineAt?: Date;
     #isCommissioned = false;
     #mutex: Mutex;
+    #targetState: "online" | "offline" = "offline";
 
     constructor(endpoint: Endpoint) {
         super(endpoint);
@@ -120,4 +121,16 @@ export class NodeLifecycle extends EndpointLifecycle {
     get mutex() {
         return this.#mutex;
     }
+
+    set targetState(state: "online" | "offline") {
+        this.#targetState = state;
+    }
+
+    get shouldBeOnline() {
+        return this.#targetState === "online";
+    }
+
+    get shouldBeOffline() {
+        return this.#targetState === "offline";
+    }
 }

package/src/node/ServerNode.ts

@@ -143,8 +143,8 @@ export class ServerNode<T extends ServerNode.RootEndpoint = ServerNode.RootEndpo
             // Reset reverts node to inactive state; now reinitialize
             this.construction.start();
 
-            // Go back online if we were online at time of reset, otherwise just await reinitialization
-            if (isOnline) {
+            // Go back online if we were online at time of reset and should still be online, otherwise just await reinitialization
+            if (isOnline && this.lifecycle.shouldBeOnline) {
                 await this.startWithMutex();
             } else {
                 await this.construction.ready;

package/src/node/client/NodePeerAddressStore.ts

@@ -10,7 +10,7 @@ import { IdentityService } from "#node/server/IdentityService.js";
 import type { ServerNode } from "#node/ServerNode.js";
 import { OperationalPeer, PeerAddress, PeerAddressMap, PeerAddressStore } from "#protocol";
 import { FabricIndex, NodeId } from "#types";
-import { Crypto, ServerAddress, ServerAddressIp } from "@matter/general";
+import { Crypto, ServerAddress, ServerAddressUdp } from "@matter/general";
 
 /**
  * This is an adapter for lower-level components in the protocol package.
@@ -65,7 +65,7 @@ export class NodePeerAddressStore extends PeerAddressStore {
 
                 return {
                     address: commissioning.peerAddress,
-                    operationalAddress: addr && (ServerAddress(addr) as ServerAddressIp),
+                    operationalAddress: addr && (ServerAddress(addr) as ServerAddressUdp),
                     discoveryData: RemoteDescriptor.fromLongForm(commissioning),
                 };
             })

package/src/node/server/InteractionServer.ts

@@ -18,7 +18,7 @@ import {
     Millis,
     Observable,
     Seconds,
-    ServerAddressIp,
+    ServerAddressUdp,
 } from "#general";
 import { GLOBAL_IDS, Specification } from "#model";
 import {
@@ -73,7 +73,7 @@ export interface PeerSubscription {
     isFabricFiltered: boolean;
     maxInterval: Duration;
     sendInterval: Duration;
-    operationalAddress?: ServerAddressIp;
+    operationalAddress?: ServerAddressUdp;
 }
 
 function validateReadAttributesPath(path: TypeFromSchema<typeof TlvAttributePath>, isGroupSession = false) {

package/src/storage/client/ClientEndpointStore.ts

@@ -26,6 +26,13 @@ export class ClientEndpointStore extends EndpointStore {
         return this.#number;
     }
 
+    /**
+     * Shortcut to persisted peer address so we can use in logging prior to full initialization.
+     */
+    get peerAddress() {
+        return this.initialValues.get("commissioning")?.["peerAddress"];
+    }
+
     participantFor(transaction: Transaction) {
         let participant = transaction.getParticipant(this.#owner);
         if (participant === undefined) {