Ensure callbacks are registered before responding the request

Signed-off-by: Marcos Candeia <[email protected]>
deco-cx · Jun 17, 2024 · df2b489 · df2b489
1 parent ea7c7dc
commit df2b489
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@deco/warp",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "exports": "./mod.ts",
   "tasks": {
     "check": "deno fmt && deno lint && deno check mod.ts"

diff --git a/server.ts b/server.ts
@@ -82,17 +82,18 @@ export const serveHandler = (
     const url = new URL(req.url);
     if (url.pathname === connectPath) {
       const { socket, response } = Deno.upgradeWebSocket(req);
+      const clientVersion = url.searchParams.get(CLIENT_VERSION_QUERY_STRING);
+      const chPromise = clientVersion === null
+        ? makeWebSocket<ServerMessage, ClientMessage, string>(
+          socket,
+          jsonSerializer(),
+        )
+        : makeWebSocket<ServerMessage, ClientMessage, ArrayBuffer>(
+          socket,
+          dataViewerSerializer(),
+        );
       (async () => {
-        const clientVersion = url.searchParams.get(CLIENT_VERSION_QUERY_STRING);
-        const ch = clientVersion === null
-          ? await makeWebSocket<ServerMessage, ClientMessage, string>(
-            socket,
-            jsonSerializer(),
-          )
-          : await makeWebSocket<ServerMessage, ClientMessage, ArrayBuffer>(
-            socket,
-            dataViewerSerializer(),
-          );
+        const ch = await chPromise;
         const clientId = crypto.randomUUID();
         const hosts: string[] = [];
         const state: ServerConnectionState = {