Commit b211d059d2b88e3ffce38b5e9b59cdc7b2e0259a | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-02-25 17:51:56-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-26 13:20:36-08:00
log	b211d059d2b88e3ffce38b5e9b59cdc7b2e0259a
tree	71d326369e9aaf9c634023598edb8de70bd6393f
parent	52681634cdf71e05a8df069664953b42352a388c

fix

1 files changed, 39 insertions(+), 33 deletions(-)

apps
- server
  - src
    wsServer.ts

apps/server/src/wsServer.ts+39-33

 @@ -16,7 +16,7 @@ import {
   WsResponse,
 } from "@t3tools/contracts";
 import { NodeHttpServer } from "@effect/platform-node";
-import { Cause, Effect, Exit, Layer, Schema, Scope, ServiceMap, Stream, Struct } from "effect";
+import { Cause, Effect, Exit, Layer, Ref, Schema, Scope, ServiceMap, Stream, Struct } from "effect";
 import { WebSocketServer, type WebSocket } from "ws";
 import { createLogger } from "./logger";
 @@ -171,7 +171,7 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
   const keybindingsManager = yield* Keybindings;
   const git = yield* GitCore;
-  const clients = new Set<WebSocket>();
+  const clients = yield* Ref.make(new Set<WebSocket>());
   const logger = createLogger("ws");
   function logOutgoingPush(push: WsPush, recipients: number) {
 @@ -183,22 +183,23 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     });
   }
-  const onTerminalEvent = (event: TerminalEvent) => {
+  const onTerminalEvent = (event: TerminalEvent) =>
-    const push: WsPush = {
+    Effect.gen(function* () {
-      type: "push",
+      const push: WsPush = {
-      channel: WS_CHANNELS.terminalEvent,
+        type: "push",
-      data: event,
+        channel: WS_CHANNELS.terminalEvent,
-    };
+        data: event,
-    const message = JSON.stringify(push);
+      };
-    let recipients = 0;
+      const message = yield* Schema.encodeEffect(Schema.fromJsonString(WsPush))(push);
-    for (const client of clients) {
+      let recipients = 0;
-      if (client.readyState === client.OPEN) {
+      for (const client of yield* Ref.get(clients)) {
-        client.send(message);
+        if (client.readyState === client.OPEN) {
-        recipients += 1;
+          client.send(message);
+          recipients += 1;
+        }
       }
-    }
+      logOutgoingPush(push, recipients);
-    logOutgoingPush(push, recipients);
+    }).pipe(Effect.runPromise);
-  };
   // HTTP server — serves static files or redirects to Vite dev server
   const httpServer = http.createServer((req, res) => {
 @@ -273,12 +274,10 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     });
   });
-  const closeAllClients = () => {
+  const closeAllClients = Ref.get(clients).pipe(
-    for (const client of clients) {
+    Effect.flatMap(Effect.forEach((client) => Effect.sync(() => client.close()))),
-      client.close();
+    Effect.flatMap(() => Ref.set(clients, new Set())),
-    }
+  );
-    clients.clear();
-  };
   const listenOptions = host ? { host, port } : { port };
 @@ -295,15 +294,15 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
   );
   yield* Stream.runForEach(orchestrationEngine.streamDomainEvents, (event) =>
-    Effect.sync(() => {
+    Effect.gen(function* () {
       const push: WsPush = {
         type: "push",
         channel: ORCHESTRATION_WS_CHANNELS.domainEvent,
         data: event,
       };
-      const message = JSON.stringify(push);
+      const message = yield* Schema.encodeEffect(Schema.fromJsonString(WsPush))(push);
       let recipients = 0;
-      for (const client of clients) {
+      for (const client of yield* Ref.get(clients)) {
         if (client.readyState === client.OPEN) {
           client.send(message);
           recipients += 1;
 @@ -532,7 +531,7 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
   });
   wss.on("connection", (ws) => {
-    clients.add(ws);
+    void Effect.runPromise(Ref.update(clients, (clients) => clients.add(ws)));
     const segments = cwd.split(/[/\\]/).filter(Boolean);
     const projectName = segments[segments.length - 1] ?? "project";
 @@ -550,11 +549,21 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     });
     ws.on("close", () => {
-      clients.delete(ws);
+      void Effect.runPromise(
+        Ref.update(clients, (clients) => {
+          clients.delete(ws);
+          return clients;
+        }),
+      );
     });
     ws.on("error", () => {
-      clients.delete(ws);
+      void Effect.runPromise(
+        Ref.update(clients, (clients) => {
+          clients.delete(ws);
+          return clients;
+        }),
+      );
     });
   });
 @@ -575,10 +584,7 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
   yield* NodeHttpServer.make(() => httpServer, listenOptions);
   yield* Effect.addFinalizer(() =>
-    Effect.all([
+    Effect.all([closeAllClients, closeWebSocketServer.pipe(Effect.orElseSucceed(() => undefined))]),
-      Effect.sync(() => closeAllClients()),
-      closeWebSocketServer.pipe(Effect.orElseSucceed(() => undefined)),
-    ]),
   );
   return httpServer;