From fe3c26650bb1e267cce756831fdb9cde230cafd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Apr 2017 21:06:04 -0400 Subject: use UUID to generate a unique SessionID --- WebSockets.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'WebSockets.hs') diff --git a/WebSockets.hs b/WebSockets.hs index c7893fb..25f2162 100644 --- a/WebSockets.hs +++ b/WebSockets.hs @@ -20,12 +20,12 @@ runClientApp = runClient "localhost" 8081 "/" -- | Make a client that sends and receives Messages over a websocket. clientApp - :: (Show sent, WebSocketsData (Message sent), WebSocketsData (Message received)) + :: (WebSocketsData (Message sent), WebSocketsData (Message received)) => Mode -> (TChan (Message sent) -> TChan (Message received) -> SessionID -> IO a) -> ClientApp a clientApp mode a conn = do - vs <- negotiateWireVersion conn + _v <- negotiateWireVersion conn sendMode conn mode sid <- receiveData conn bracket setup cleanup (go sid) @@ -51,12 +51,11 @@ relayFromSocket conn sender = go sender msg go -relayToSocket :: Show sent => WebSocketsData (Message sent) => Connection -> (IO (Maybe (Message sent))) -> IO () +relayToSocket :: WebSocketsData (Message sent) => Connection -> (IO (Maybe (Message sent))) -> IO () relayToSocket conn getter = go where go = do mmsg <- getter - print ("got message", mmsg) case mmsg of Nothing -> go Just msg -> do -- cgit v1.2.3