@matter-server/ws-controller 0.6.2-alpha.0-20260426-e2eae3d → 0.6.2

package/src/controller/Nodes.ts

@@ -5,20 +5,16 @@
  */
 
 import { NodeId } from "@matter/main";
-import { ClusterClientObj } from "@matter/main/protocol";
-import { ClusterId, ClusterType, EndpointNumber } from "@matter/main/types";
-import { InteractionClient } from "@project-chip/matter.js/cluster";
 import { NodeStates, PairedNode } from "@project-chip/matter.js/device";
 import { ServerError } from "../types/WebSocketMessageTypes.js";
 import { AttributeDataCache } from "./AttributeDataCache.js";
 
 /**
- * Manages node storage and provides access to nodes and their clients.
+ * Manages node storage and tracks per-node availability.
  *
  * This class handles:
  * - Storage of PairedNode instances
  * - Node retrieval and existence checking
- * - Access to interaction clients and cluster clients
  * - Attribute data caching
  * - Connection state tracking for availability debouncing
  */
@@ -156,47 +152,4 @@ export class Nodes {
     isAvailable(nodeId: NodeId): boolean {
         return this.#lastAvailability.get(nodeId) ?? false;
     }
-
-    /**
-     * Get the interaction client for a node.
-     */
-    interactionClientFor(nodeId: NodeId): InteractionClient {
-        return this.get(nodeId).getInteractionClient();
-    }
-
-    /**
-     * Get a cluster client by cluster ID for a specific endpoint on a node.
-     * @throws Error if endpoint or cluster not found
-     * TODO: Migrate to new node API
-     */
-    clusterClientByIdFor(nodeId: NodeId, endpointId: EndpointNumber, clusterId: ClusterId): ClusterClientObj<any> {
-        const node = this.get(nodeId);
-
-        const endpoint = endpointId === 0 ? node.getRootEndpoint() : node.getDeviceById(endpointId);
-
-        if (endpoint === undefined) {
-            throw ServerError.invalidArguments(`Endpoint ${endpointId} on node ${nodeId} not found`);
-        }
-
-        const client = endpoint.getClusterClientById(clusterId);
-
-        if (client === undefined) {
-            throw ServerError.invalidArguments(
-                `Cluster ${clusterId} on endpoint ${endpointId} on node ${nodeId} not found`,
-            );
-        }
-
-        return client;
-    }
-
-    /**
-     * Get a typed cluster client for a specific endpoint on a node.
-     */
-    clusterClientFor<const T extends ClusterType>(
-        nodeId: NodeId,
-        endpointId: EndpointNumber,
-        cluster: T,
-    ): ClusterClientObj<T["Typing"]> {
-        return this.clusterClientByIdFor(nodeId, endpointId, cluster.id!) as ClusterClientObj<T["Typing"]>;
-    }
 }

package/src/types/CommandHandler.ts

@@ -3,28 +3,11 @@
  * Copyright 2025-2026 Open Home Foundation
  * SPDX-License-Identifier: Apache-2.0
  */
-import { AttributeId, ClusterId, CommandId, Duration, EventId, EventNumber, NodeId, Observable } from "@matter/main";
+import { AttributeId, ClusterId, Duration, NodeId } from "@matter/main";
 import { CommissionableDeviceIdentifiers } from "@matter/main/protocol";
 import { EndpointNumber, Status } from "@matter/main/types";
 import { ControllerCommissioningFlowOptions } from "@matter/protocol";
 
-export type ReadAttributeRequest = {
-    nodeId: NodeId;
-    /** Endpoint ID or undefined for wildcard */
-    endpointId?: EndpointNumber;
-    /** Cluster ID or undefined for wildcard */
-    clusterId?: ClusterId;
-    /** Attribute ID or undefined for wildcard */
-    attributeId?: AttributeId;
-    fabricFiltered?: boolean;
-};
-export type AttributeResponseData = {
-    clusterId: number;
-    attributeId: number;
-    endpointId: number;
-    dataVersion: number;
-    value: unknown;
-};
 export type AttributeResponseStatus = {
     clusterId: number;
     attributeId: number;
@@ -32,33 +15,6 @@ export type AttributeResponseStatus = {
     status?: Status;
     clusterStatus?: number;
 };
-export type ReadAttributeResponse = { values: AttributeResponseData[]; status?: AttributeResponseStatus[] };
-
-export type ReadByIdRequest = {
-    nodeId: NodeId;
-    endpointId: EndpointNumber;
-    clusterId: ClusterId;
-    attributeId: AttributeId;
-    fabricFiltered?: boolean;
-};
-export type AttributeErrorResponseData = {
-    clusterId: number;
-    attributeId: number;
-    endpointId: number;
-    error: string;
-};
-
-export type ReadByIdResponse = AttributeErrorResponseData;
-
-export type SubscribeAttributeRequest = ReadAttributeRequest & {
-    minInterval: number;
-    maxInterval: number;
-    changeListener: (data: AttributeResponseData) => void;
-};
-export type SubscribeAttributeResponse = {
-    values: AttributeResponseData[];
-    updated: Observable<[void]>;
-};
 
 export type WriteAttributeRequest = {
     nodeId: NodeId;
@@ -68,47 +24,6 @@ export type WriteAttributeRequest = {
     value: unknown;
 };
 
-export type WriteAttributeByIdRequest = {
-    nodeId: NodeId;
-    endpointId: EndpointNumber;
-    clusterId: ClusterId;
-    attributeId: AttributeId;
-    value: unknown;
-};
-
-export type ReadEventRequest = {
-    nodeId: NodeId;
-    endpointId: EndpointNumber;
-    clusterId: ClusterId;
-    eventId: EventId;
-    eventMin?: EventNumber;
-};
-export type EventResponseData = {
-    clusterId: number;
-    eventId: number;
-    endpointId: number;
-    eventNumber: number | bigint;
-    value: unknown;
-};
-export type EventResponseStatus = {
-    clusterId: number;
-    eventId: number;
-    endpointId: number;
-    status?: Status;
-    clusterStatus?: number;
-};
-export type ReadEventResponse = { values: EventResponseData[]; status?: EventResponseStatus[] };
-
-export type SubscribeEventRequest = ReadEventRequest & {
-    minInterval: number;
-    maxInterval: number;
-    changeListener: (data: EventResponseData) => void;
-};
-export type SubscribeEventResponse = {
-    values: EventResponseData[];
-    updated: Observable<[void]>;
-};
-
 export type InvokeRequest = {
     nodeId: NodeId;
     endpointId: EndpointNumber;
@@ -118,26 +33,6 @@ export type InvokeRequest = {
     timedInteractionTimeoutMs?: Duration;
     interactionTimeoutMs?: Duration;
 };
-export type InvokeResponse = {
-    clusterId: number;
-    commandId?: number;
-    endpointId: number;
-    value?: unknown;
-};
-
-export type InvokeByIdRequest = {
-    nodeId: NodeId;
-    endpointId: EndpointNumber;
-    clusterId: ClusterId;
-    commandId: CommandId;
-    data: unknown;
-    timedInteractionTimeoutMs?: number;
-};
-
-export type DelayRequest = {
-    nodeId?: NodeId;
-    expireExistingSession?: boolean;
-};
 
 export type CommissioningRequest = {
     nodeId?: NodeId;
@@ -185,22 +80,6 @@ export type DiscoveryResponse = {
     mrpSessionActiveInterval?: number;
 }[];
 
-export type RootCertificateResponse = {
-    RCAC: Uint8Array;
-};
-
-export type IssueNocChainRequest = {
-    elements: Uint8Array;
-    nodeId: NodeId;
-};
-
-export type IssueNocChainResponse = {
-    ICAC?: Uint8Array;
-    IPK: Uint8Array;
-    NOC: Uint8Array;
-    RCAC: Uint8Array;
-};
-
 export type OpenCommissioningWindowRequest = {
     nodeId: NodeId;
     timeout?: number;