nits

Julius Marminge committed 8 months ago

Commit 5a755ad1 parent b211d053 files · +33 −29Browse files

Showing the changes to apps/server/src (1 of 3 files). Show all

Unified · Split

     });
   }
-  const onTerminalEvent = (event: TerminalEvent) =>
+  const onTerminalEvent = Effect.fnUntraced(function* (event: TerminalEvent) {
-    Effect.gen(function* () {
+    const push: WsPush = {
-      const push: WsPush = {
+      type: "push",
-        type: "push",
+      channel: WS_CHANNELS.terminalEvent,
-        channel: WS_CHANNELS.terminalEvent,
+      data: event,
-        data: event,
+    };
-      };
+    const message = yield* Schema.encodeEffect(Schema.fromJsonString(WsPush))(push);
-      const message = yield* Schema.encodeEffect(Schema.fromJsonString(WsPush))(push);
+    let recipients = 0;
-      let recipients = 0;
+    for (const client of yield* Ref.get(clients)) {
-      for (const client of yield* Ref.get(clients)) {
+      if (client.readyState === client.OPEN) {
-        if (client.readyState === client.OPEN) {
+        client.send(message);
-          client.send(message);
+        recipients += 1;
-          recipients += 1;
-        }
       }
-      logOutgoingPush(push, recipients);
+    }
-    }).pipe(Effect.runPromise);
+    logOutgoingPush(push, recipients);
+  });
   // HTTP server — serves static files or redirects to Vite dev server
   const httpServer = http.createServer((req, res) => {
   const { openInEditor } = yield* Open;
   const subscriptionsScope = yield* Scope.make("sequential");
-  yield* Effect.addFinalizer(() =>
+  yield* Effect.addFinalizer(() => Scope.close(subscriptionsScope, Exit.void));
-    Scope.close(subscriptionsScope, Exit.void).pipe(Effect.orElseSucceed(() => undefined)),
-  );
   yield* Stream.runForEach(orchestrationEngine.streamDomainEvents, (event) =>
     Effect.gen(function* () {
     }),
   ).pipe(Effect.forkIn(subscriptionsScope));
-  yield* orchestrationReactor.start.pipe(Scope.provide(subscriptionsScope));
+  yield* Scope.provide(orchestrationReactor.start, subscriptionsScope);
   if (autoBootstrapProjectFromCwd) {
     const snapshot = yield* projectionReadModelQuery.getSnapshot();
     }
   }
-  const routeRequest = Effect.fn(function* (request: WebSocketRequest) {
+  const routeRequest = Effect.fnUntraced(function* (request: WebSocketRequest) {
     switch (request.body._tag) {
       case ORCHESTRATION_WS_METHODS.getSnapshot:
         return yield* projectionReadModelQuery.getSnapshot();
     ),
   );
-  const unsubscribeTerminalEvents = yield* terminalManager.subscribe(onTerminalEvent);
+  const unsubscribeTerminalEvents = yield* terminalManager.subscribe(
+    (event) => void Effect.runPromise(onTerminalEvent(event)),
+  );
   yield* Effect.addFinalizer(() =>
-    Effect.sync(() => {
+    Effect.all([Effect.sync(() => unsubscribeTerminalEvents()), terminalManager.dispose()]),
-      unsubscribeTerminalEvents();
-    }),
   );
-  yield* Effect.addFinalizer(terminalManager.dispose);
   yield* NodeHttpServer.make(() => httpServer, listenOptions);
   yield* Effect.addFinalizer(() =>
-    Effect.all([closeAllClients, closeWebSocketServer.pipe(Effect.orElseSucceed(() => undefined))]),
+    Effect.all([
+      closeAllClients,
+      closeWebSocketServer.pipe(
+        Effect.catch((error) =>
+          Effect.logWarning("failed to close web socket server", { cause: error }),
+        ),
+      ),
+    ]),
   );
   return httpServer;