fix news

README.md

@@ -21,8 +21,7 @@ proc cb(req: Request) {.async.} =
       await ws.send(packet)
   await req.respond(Http200, "Hello World")
 
-asyncCheck server.serve(Port(9001), cb)
-runForever()
+waitFor server.serve(Port(9001), cb)
 ```
 
 ## Websocket client
@@ -37,8 +36,7 @@ proc sendMsg() {.async.} =
         let packet = await ws.receivePacket()
         echo "received ", packet
 
-asyncCheck sendMsg()
-runForever()
+waitFor sendMsg()
 ```
 
 ## Websocket with chronos support:
@@ -55,6 +53,5 @@ proc sendMsg() {.async.} =
         let packet = await ws.receivePacket()
         echo "received ", packet
 
-asyncCheck sendMsg()
-runForever()
+waitFor sendMsg()
 ```

src/news.nim

@@ -107,6 +107,8 @@ when not newsUseChronos:
       responce.add("Sec-WebSocket-Protocol: " & ws.protocol & "\c\L")
     responce.add "\c\L"
 
+    ws.transp = req.client
+    # await ws.transp.connect(uri.hostname, port)
     await ws.transp.send(responce)
     ws.readyState = Open
     return ws
@@ -115,11 +117,9 @@ proc newWebSocket*(url: string): Future[WebSocket] {.async.} =
   ## Creates a client
   var ws = WebSocket()
   let uri = parseUri(url)
-  var port = Port(9001)
+  var port = Port(80)
   if uri.scheme != "ws":
     raise newException(WebSocketError, &"Scheme {uri.scheme} not supported yet.")
-  else:
-    port = Port(80)
   if uri.port.len > 0:
     port = Port(parseInt(uri.port))
 

tests/test.nim

@@ -2,6 +2,7 @@ import news, asyncdispatch, asynchttpserver
 
 var server = newAsyncHttpServer()
 proc cb(req: Request) {.async.} =
+  echo "cb ", req
   if req.url.path == "/ws":
     var ws = await newWebsocket(req)
     await ws.send("Welcome to simple echo server")