@matter-server/ws-controller 0.5.6 → 0.5.8

package/src/controller/CustomClusterPoller.ts

@@ -32,10 +32,10 @@ const EVE_ENERGY_ATTRIBUTE_IDS = {
 // Standard Matter ElectricalPowerMeasurement cluster ID
 const ELECTRICAL_POWER_MEASUREMENT_CLUSTER_ID = 0x0090; // 144
 
-// Polling interval in milliseconds (30 seconds, same as Python server)
-const POLLING_INTERVAL_MS = 30_000;
+// Polling interval in milliseconds (60 seconds)
+const POLLING_INTERVAL_MS = 60_000;
 
-// Maximum initial delay in milliseconds (random 0-30s to stagger startup)
+// Maximum initial delay in milliseconds (random 30-60s to stagger startup)
 const MAX_INITIAL_DELAY_MS = 30_000;
 
 // Attribute path format: endpoint/cluster/attribute
@@ -117,11 +117,12 @@ export class CustomClusterPoller {
     #attributeReader: NodeAttributeReader;
     #isPolling = false;
     #currentDelayPromise?: CancelablePromise;
+    #currentReadPromise?: Promise<void>;
     #closed = false;
 
     constructor(attributeReader: NodeAttributeReader) {
         this.#attributeReader = attributeReader;
-        const delay = Millis(Math.random() * MAX_INITIAL_DELAY_MS);
+        const delay = Millis(MAX_INITIAL_DELAY_MS + Math.random() * MAX_INITIAL_DELAY_MS);
         this.#pollerTimer = Time.getTimer("eve-poller", delay, () => this.#pollAllNodes());
     }
 
@@ -160,13 +161,16 @@ export class CustomClusterPoller {
     }
 
     /**
-     * Stop all polling and cleanup.
+     * Stop all polling and cleanup. Awaits any in-flight read operation.
      */
-    stop(): void {
+    async stop(): Promise<void> {
         this.#closed = true;
         this.#currentDelayPromise?.cancel(new Error("Close"));
         this.#pollerTimer?.stop();
         this.#polledAttributes.clear();
+        if (this.#currentReadPromise) {
+            await this.#currentReadPromise;
+        }
         logger.info("Custom attribute poller stopped");
     }
 
@@ -210,6 +214,9 @@ export class CustomClusterPoller {
         try {
             const entries = Array.from(this.#polledAttributes.entries());
             for (let i = 0; i < entries.length; i++) {
+                if (this.#closed) {
+                    break;
+                }
                 const [nodeId, attributePaths] = entries[i];
                 if (!this.#polledAttributes.has(nodeId)) {
                     // Node was removed, so skip it
@@ -253,9 +260,16 @@ export class CustomClusterPoller {
         try {
             // Read with fabricFiltered=true as per Eve's requirements
             // This automatically updates the attribute cache and triggers change events
-            await this.#attributeReader.handleReadAttributes(nodeId, paths, true);
+            const readPromise = this.#attributeReader.handleReadAttributes(nodeId, paths, true);
+            this.#currentReadPromise = readPromise.then(
+                () => {},
+                () => {},
+            );
+            await readPromise;
         } catch (error) {
             logger.warn(`Failed to poll custom attributes for node ${nodeId}: `, error);
+        } finally {
+            this.#currentReadPromise = undefined;
         }
     }
 }

package/src/controller/LegacyDataInjector.ts

@@ -95,7 +95,7 @@ export interface LegacyVendorInfo {
 
 /** Node data from Python Matter Server nodes map */
 export interface LegacyNodeData {
-    node_id: number;
+    node_id: number | bigint;
     date_commissioned: string;
     last_interview: string;
     interview_version: number;
@@ -108,7 +108,7 @@ export interface LegacyNodeData {
 /** Structure of the <compressedFabricId>.json file */
 export interface LegacyServerFile {
     vendor_info: Record<string, LegacyVendorInfo>;
-    last_node_id: number;
+    last_node_id: number | bigint;
     nodes: Record<string, LegacyNodeData>;
 }
 
@@ -279,9 +279,13 @@ export namespace LegacyDataInjector {
             }
             commissionedNodes.push([NodeId(BigInt(nodeId)), {}]);
             let newNode = true;
+            const attributes = Object.entries(nodeDetails.attributes);
+            if (attributes.length === 0) {
+                continue;
+            }
             logger.info(`Injecting node ${nodeId} into storage`);
             const nodeWrites = new Array<MaybePromise<void>>();
-            for (const [attributeKey, value] of Object.entries(nodeDetails.attributes)) {
+            for (const [attributeKey, value] of attributes) {
                 let currentEndpointId: string | undefined;
                 let currentClusterId: string | undefined;
                 let endpointStorage: StorageContext | undefined;

package/src/controller/MatterController.ts

@@ -122,9 +122,10 @@ export class MatterController {
 
             // Check if the nextNodeId needs to be updated based on legacy data
             const lastNodeId = legacyData.nodeData?.last_node_id;
-            if (typeof lastNodeId === "number") {
-                if (config.nextNodeId <= lastNodeId) {
-                    const newNextNodeId = lastNodeId + 10;
+            if (typeof lastNodeId === "number" || typeof lastNodeId === "bigint") {
+                // Compare as BigInt to safely handle both number and bigint types
+                if (BigInt(config.nextNodeId) <= BigInt(lastNodeId)) {
+                    const newNextNodeId = BigInt(lastNodeId) + 10n;
                     logger.info(
                         `Updating nextNodeId from ${config.nextNodeId} to ${newNextNodeId} (legacy last_node_id: ${lastNodeId})`,
                     );

package/src/model/ModelMapper.ts

@@ -15,7 +15,7 @@ import {
     EventModel,
     FeatureMap,
     GeneratedCommandList,
-    MatterModel,
+    Matter,
 } from "@matter/main/model";
 
 type AttributeDetails = { readonly [key: string]: AttributeModel | undefined };
@@ -53,7 +53,7 @@ export type ClusterMapType = {
 // Build the cluster map at module load time
 const clusterMapBuilder: { [key: string]: ClusterMapEntry | undefined } = {};
 
-MatterModel.standard.clusters.forEach(cluster => {
+Matter.clusters.forEach(cluster => {
     if (cluster.id === undefined) {
         return;
     } // Skip clusters without an ID

package/src/server/ConfigStorage.ts

@@ -20,7 +20,7 @@ function sanitizeForLog(key: string, value: unknown): string {
 
 interface ConfigData {
     fabricLabel: string;
-    nextNodeId: number; // formally wrong, should be bigint
+    nextNodeId: number | bigint;
     wifiSsid?: string;
     wifiCredentials?: string;
     threadDataset?: string;
@@ -68,7 +68,7 @@ export class ConfigStorage {
         const fabricLabel = (await this.#configStore.has("fabricLabel"))
             ? await this.#configStore.get<string>("fabricLabel")
             : (this.#env.vars.string("fabricLabel") ?? this.#data.fabricLabel);
-        const nextNodeId = await this.#configStore.get<number>("nextNodeId", this.#data.nextNodeId);
+        const nextNodeId = await this.#configStore.get<number | bigint>("nextNodeId", this.#data.nextNodeId);
 
         const wifiSsid = (await this.#configStore.has("wifiSsid"))
             ? await this.#configStore.get<string>("wifiSsid", "")

package/src/server/Converters.ts

@@ -90,7 +90,7 @@ export function convertWebSocketTagBasedToMatter(
 
     // Handle lists
     if (Array.isArray(value) && model.type === "list") {
-        return value.map(v => convertWebSocketTagBasedToMatter(v, model.members[0], clusterModel));
+        return value.map(v => convertWebSocketTagBasedToMatter(v, model.members.at(0), clusterModel));
     }
 
     // Handle structs - convert numeric keys to camelCased member names
@@ -136,7 +136,7 @@ export function convertCommandDataToMatter(
 
     // Handle lists
     if (Array.isArray(value) && model.type === "list") {
-        return value.map(v => convertCommandDataToMatter(v, model.members[0], clusterModel));
+        return value.map(v => convertCommandDataToMatter(v, model.members.at(0), clusterModel));
     }
 
     // Handle structs - convert numeric keys to camelCased member names
@@ -303,7 +303,7 @@ function convertMatterToWebSocket(
 
         case ConvKind.List:
             return Array.isArray(value)
-                ? value.map(v => convertMatterToWebSocket(v, model.members[0], clusterModel, tagBased))
+                ? value.map(v => convertMatterToWebSocket(v, model.members.at(0), clusterModel, tagBased))
                 : value;
 
         case ConvKind.Struct: {
@@ -527,7 +527,7 @@ export function convertWebsocketDataToMatter(value: any, model: ValueModel): any
             value = parseChipJSON(value);
         }
         if (Array.isArray(value)) {
-            return value.map(v => convertWebsocketDataToMatter(v, model.members[0]));
+            return value.map(v => convertWebsocketDataToMatter(v, model.members.at(0)!));
         }
     }
 

package/src/server/WebSocketControllerHandler.ts

@@ -165,7 +165,7 @@ export class WebSocketControllerHandler implements WebServerHandler {
 
             // Register all event listeners using ObserverGroup for easy cleanup
             observers.on(this.#commandHandler.events.attributeChanged, (nodeId, data) => {
-                if (this.#closed) return;
+                if (this.#closed || !listening) return;
                 const { endpointId, clusterId, attributeId } = data.path;
                 const pathStr = `${endpointId}/${clusterId}/${attributeId}`;
                 const clusterData = ClusterMap[clusterId];
@@ -206,7 +206,7 @@ export class WebSocketControllerHandler implements WebServerHandler {
                     const eventModel = clusterData?.events[eventId];
                     const convertedData =
                         event.data !== undefined
-                            ? convertMatterToWebSocketTagBased(event.data, eventModel, clusterData?.model)
+                            ? convertMatterToWebSocketNameBased(event.data, eventModel, clusterData?.model)
                             : null;
 
                     const nodeEvent: MatterNodeEvent = {
@@ -361,7 +361,6 @@ export class WebSocketControllerHandler implements WebServerHandler {
                 }
             }
         });
-        console.log("send close to clients");
 
         const wss = this.#wss;
         // Wait for the WebSocket server to close properly
@@ -379,10 +378,10 @@ export class WebSocketControllerHandler implements WebServerHandler {
     async #handleWebSocketRequest(
         connId: string,
         data: string,
-    ): Promise<{ response: ErrorResultMessage | SuccessResultMessage<any>; enableListeners?: boolean }> {
+    ): Promise<{ response: ErrorResultMessage | SuccessResultMessage; enableListeners?: boolean }> {
         let messageId: string | undefined;
         try {
-            logger.debug(`[${connId}] Received WebSocket request`, () => data);
+            logger.debug(`[${connId}] WebSocket request`, () => data);
             const request = parseBigIntAwareJson(data) as { message_id: string; command: string; args: any };
             const { command, args } = request;
             messageId = request.message_id;
@@ -491,9 +490,9 @@ export class WebSocketControllerHandler implements WebServerHandler {
                 throw ServerError.sdkStackError("Command handler returned no response");
             }
             if (skipMessageContentInLogFor.includes(command)) {
-                logger.debug(`[${connId}] WebSocket request (${command}) handled`, messageId);
+                logger.debug(`[${connId}] WebSocket response (${command})`, messageId);
             } else {
-                logger.debug(`[${connId}] WebSocket request (${command}) handled`, messageId, result);
+                logger.debug(`[${connId}] WebSocket response (${command})`, messageId, result);
             }
             return {
                 response: {
@@ -603,7 +602,9 @@ export class WebSocketControllerHandler implements WebServerHandler {
             }
         }
 
-        await this.#config.set({ nextNodeId: nextNodeId + 1 });
+        await this.#config.set({
+            nextNodeId: typeof nextNodeId === "bigint" ? nextNodeId + 1n : nextNodeId + 1,
+        });
 
         const { nodeId } = await this.#commandHandler.commissionNode({
             nodeId: NodeId(nextNodeId),
@@ -657,7 +658,9 @@ export class WebSocketControllerHandler implements WebServerHandler {
                 break;
         }
 
-        await this.#config.set({ nextNodeId: nextNodeId + 1 });
+        await this.#config.set({
+            nextNodeId: typeof nextNodeId === "bigint" ? nextNodeId + 1n : nextNodeId + 1,
+        });
 
         const { nodeId } = await this.#commandHandler.commissionNode(commissionRequest);
 

package/src/tsconfig.json

@@ -1,7 +1,13 @@
 {
     "extends": "../../tools/tsc/tsconfig.lib.json",
     "compilerOptions": {
-        "types": ["globals"]
+        "types": [
+            "globals"
+        ]
     },
-    "references": []
-}
+    "references": [
+        {
+            "path": "../../ws-client/src"
+        }
+    ]
+}

package/src/types/CommandHandler.ts

@@ -211,11 +211,9 @@ export type OpenCommissioningWindowResponse = {
     qrCode: string;
 };
 
-import { AttributesData, MatterNode } from "./WebSocketMessageTypes.js";
+import type { AttributesData, MatterNodeData } from "@matter-server/ws-client";
 
-/** MatterNode details for WebSocket API - re-export from WebSocketMessageTypes */
-export type { AttributesData };
-export type MatterNodeData = MatterNode;
+export type { AttributesData, MatterNodeData };
 
 /**
  * Interface for node command handlers.