fix installing issues

Beetroit · Oct 5, 2024 · 5fd9370 · 5fd9370
1 parent 20402b9
commit 5fd9370
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/happyx/ssr/core.nim b/src/happyx/ssr/core.nim
@@ -17,6 +17,7 @@
 
 
 import
+  std/asyncnet,
   std/net,
   std/nativesockets,
   std/os,
@@ -29,7 +30,8 @@ import
   std/parseutils,
   std/monotimes,
   std/sugar,
-  std/deques
+  std/deques,
+  ws
 
 import ioselectors
 
@@ -800,3 +802,32 @@ when false:
     # TODO: Figure out the best way to implement this. One way is to use async
     # events to signal our `eventLoop`. Maybe it would be better not to support
     # multiple servers running at the same time?
+
+
+
+proc newWebSocket*(req: Request): Future[WebSocket] {.async.} =
+  ## Creates a new socket from an httpbeast request.
+  try:
+    let headers = req.headers.get
+
+    if not headers.hasKey("Sec-WebSocket-Version"):
+      req.send(Http404, "Not Found")
+      raise newException(WebSocketError, "Not a valid websocket handshake.")
+
+    var ws = WebSocket()
+    ws.masked = false
+
+    # Here is the magic:
+    req.forget() # Remove from HttpBeast event loop.
+    asyncdispatch.register(req.client.AsyncFD) # Add to async event loop.
+
+    ws.tcpSocket = newAsyncSocket(req.client.AsyncFD)
+    await ws.handshake(headers)
+    return ws
+
+  except ValueError, KeyError:
+    # Wrap all exceptions in a WebSocketError so its easy to catch
+    raise newException(
+      WebSocketError,
+      "Failed to create WebSocket from request: " & getCurrentExceptionMsg()
+    )
diff --git a/src/happyx/ssr/types.nim b/src/happyx/ssr/types.nim
@@ -32,9 +32,12 @@ else:
 when enableHttpBeast:
   import websocket
   export websocket
-else:
+elif not enableBuiltin:
   import websocketx
   export websocketx
+else:
+  import ws
+  export ws
 
 
 when enableDefaultComponents: