@matter-server/ws-controller 0.5.9 → 0.5.11

package/src/controller/Nodes.ts

@@ -168,7 +168,7 @@ export class Nodes {
         nodeId: NodeId,
         endpointId: EndpointNumber,
         cluster: T,
-    ): ClusterClientObj<T> {
-        return this.clusterClientByIdFor(nodeId, endpointId, cluster.id) as ClusterClientObj<T>;
+    ): ClusterClientObj<T["Typing"]> {
+        return this.clusterClientByIdFor(nodeId, endpointId, cluster.id!) as ClusterClientObj<T["Typing"]>;
     }
 }

package/src/controller/ServerIdResolver.ts

@@ -104,39 +104,49 @@ export async function resolveServerId(
         // Open and verify the fabric configuration matches
         try {
             const baseStorage = await config.service.open(DEFAULT_SERVER_ID);
-            const fabricsContext = baseStorage.createContext("fabrics");
+            let closed = false;
+            try {
+                const fabricsContext = baseStorage.createContext("fabrics");
 
-            // Read fabric entries
-            const fabrics = await fabricsContext.get<{ fabricId: FabricId; rootVendorId: VendorId }[]>("fabrics", []);
-            if (fabrics.length === 1) {
-                // Single fabric - check if it matches
-                const fabricData = fabrics[0];
-                const storedFabricId = fabricData.fabricId;
-                const storedVendorId = fabricData.rootVendorId;
-                if (storedFabricId === FabricId(fabricId) && storedVendorId === vendorId) {
-                    // Matching fabric - rename it to the new format to avoid future checks
-                    await baseStorage.close();
-                    if (storagePath !== undefined) {
-                        const oldPath = join(storagePath, DEFAULT_SERVER_ID);
-                        const newPath = join(storagePath, candidateId);
-                        try {
-                            await rename(oldPath, newPath);
-                            logger.info(`Renamed storage "${DEFAULT_SERVER_ID}" to "${candidateId}"`);
-                            return candidateId;
-                        } catch (renameErr) {
-                            logger.error(
-                                `Failed to rename storage from "${DEFAULT_SERVER_ID}" to "${candidateId}"`,
-                                renameErr,
-                            );
-                            return DEFAULT_SERVER_ID;
+                // Read fabric entries
+                const fabrics = await fabricsContext.get<{ fabricId: FabricId; rootVendorId: VendorId }[]>(
+                    "fabrics",
+                    [],
+                );
+                if (fabrics.length === 1) {
+                    // Single fabric - check if it matches
+                    const fabricData = fabrics[0];
+                    const storedFabricId = fabricData.fabricId;
+                    const storedVendorId = fabricData.rootVendorId;
+                    if (storedFabricId === FabricId(fabricId) && storedVendorId === vendorId) {
+                        // Matching fabric - close before rename to release file handles
+                        await baseStorage.close();
+                        closed = true;
+                        if (storagePath !== undefined) {
+                            const oldPath = join(storagePath, DEFAULT_SERVER_ID);
+                            const newPath = join(storagePath, candidateId);
+                            try {
+                                await rename(oldPath, newPath);
+                                logger.info(`Renamed storage "${DEFAULT_SERVER_ID}" to "${candidateId}"`);
+                                return candidateId;
+                            } catch (renameErr) {
+                                logger.error(
+                                    `Failed to rename storage from "${DEFAULT_SERVER_ID}" to "${candidateId}"`,
+                                    renameErr,
+                                );
+                                return DEFAULT_SERVER_ID;
+                            }
                         }
+                        return DEFAULT_SERVER_ID;
                     }
-                    return DEFAULT_SERVER_ID;
+                } else {
+                    logger.error(`Multiple fabrics found, using new storage`, fabrics);
+                }
+            } finally {
+                if (!closed) {
+                    await baseStorage.close();
                 }
-            } else {
-                logger.error(`Multiple fabrics found, using new storage`, fabrics);
             }
-            await baseStorage.close();
             logger.info(`Existing "server" storage does not match fabric config, using new ID: ${candidateId}`);
         } catch (err) {
             logger.debug(`Could not verify "server" storage: ${err}`);

package/src/server/WebSocketControllerHandler.ts

@@ -4,7 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { camelize, ClusterId, FabricIndex, Logger, LogLevel, Millis, NodeId, ObserverGroup } from "@matter/main";
+import {
+    MatterError,
+    Diagnostic,
+    Bytes,
+    camelize,
+    ClusterId,
+    FabricIndex,
+    Logger,
+    LogLevel,
+    Millis,
+    NodeId,
+    ObserverGroup,
+} from "@matter/main";
 import { ControllerCommissioningFlowOptions } from "@matter/main/protocol";
 import { EndpointNumber, QrPairingCodeCodec } from "@matter/main/types";
 import { NodeStates } from "@project-chip/matter.js/device";
@@ -874,6 +886,19 @@ export class WebSocketControllerHandler implements WebServerHandler {
 
     async #handleSetThreadDataset(args: ArgsOf<"set_thread_dataset">): Promise<ResponseOf<"set_thread_dataset">> {
         const { dataset } = args;
+        if (!/^[0-9a-fA-F]*$/.test(dataset) || dataset.length % 2 !== 0) {
+            throw ServerError.invalidArguments(
+                "Invalid Thread operational dataset: must be a hex string with even length (each byte is two hex characters)",
+            );
+        }
+        try {
+            Bytes.fromHex(dataset);
+        } catch (error) {
+            MatterError.accept(error);
+            throw ServerError.invalidArguments(
+                `Invalid Thread operational dataset: failed to parse hex string: ${Diagnostic.errorMessage(error)}`,
+            );
+        }
         await this.#config.set({ threadDataset: dataset });
         // Broadcast server_info_updated event to notify clients of credential change
         try {