From e489815fe8840f82a36a681e1e840a7ce418640d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Fri, 12 Jul 2024 01:15:10 +0200
Subject: [PATCH] Fix

---
 packages/server/src/http/ExpressHTTPServer.ts |  4 ++--
 packages/server/src/http/WebSocketServer.ts   | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/server/src/http/ExpressHTTPServer.ts b/packages/server/src/http/ExpressHTTPServer.ts
index 1b5474a..dbde7ac 100644
--- a/packages/server/src/http/ExpressHTTPServer.ts
+++ b/packages/server/src/http/ExpressHTTPServer.ts
@@ -20,9 +20,9 @@ export module ExpressHTTPServer {
         }),
 
         server => Effect.gen(function*() {
-            yield* Effect.logInfo(`HTTP server is stopping. Waiting for existing connections to end...`)
+            yield* Effect.logInfo("HTTP server is stopping. Waiting for existing connections to end...")
             yield* Effect.async(resume => {
-                server.close(() => resume(Effect.logInfo(`HTTP server closed`)))
+                server.close(() => resume(Effect.logInfo("HTTP server closed")))
             })
         }),
     ))
diff --git a/packages/server/src/http/WebSocketServer.ts b/packages/server/src/http/WebSocketServer.ts
index 99e8699..0f09f86 100644
--- a/packages/server/src/http/WebSocketServer.ts
+++ b/packages/server/src/http/WebSocketServer.ts
@@ -1,26 +1,21 @@
-import { Context, Effect, Layer, Runtime } from "effect"
+import { Context, Effect, Layer } from "effect"
 import ws from "ws"
 import { ExpressHTTPServer } from "../http/ExpressHTTPServer"
 
 
-export class WebSocketServer extends Context.Tag("RPCWebSocketServer")<WebSocketServer, ws.Server>() {}
+export class WebSocketServer extends Context.Tag("WebSocketServer")<WebSocketServer, ws.Server>() {}
 
 export module WebSocketServer {
     export const Live = Layer.effect(WebSocketServer, Effect.acquireRelease(
         Effect.gen(function*() {
-            const runSync = yield* Effect.runtime().pipe(
-                Effect.map(Runtime.runSync)
-            )
-
-            return new ws.WebSocketServer({ server: yield* ExpressHTTPServer }, () =>
-                runSync(Effect.logInfo(`WebSocket server started`))
-            )
+            yield* Effect.logInfo("WebSocket server started")
+            return new ws.WebSocketServer({ server: yield* ExpressHTTPServer })
         }),
 
         wss => Effect.gen(function*() {
-            yield* Effect.logInfo(`WebSocket server is stopping. Waiting for existing connections to end...`)
+            yield* Effect.logInfo("WebSocket server is stopping. Waiting for existing connections to end...")
             yield* Effect.async(resume => {
-                wss.close(() => resume(Effect.logInfo(`WebSocket server closed`)))
+                wss.close(() => resume(Effect.logInfo("WebSocket server closed")))
             })
         }),
     ))