fix

Julius Marminge committed 8 months ago

Commit b211d051 parent 52681631 file · +39 −33Browse files

Showing the changes to apps/server/src/wsServer.ts (1 of 1 file). Show all

Unified · Split

   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";
   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) {
     });
   }
-  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) => {
     });
   });
-  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 };
   );
   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;
   });
   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";
     });
     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;
+        }),
+      );
     });
   });
   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;