diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-04-27 09:39:55 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-04-27 09:47:07 -0400 |
commit | 937b55549b4ba72b0392d7e139e592a40eec2101 (patch) | |
tree | d11a33aff3bd54c6bc66058028657915481181de /WebSockets.hs | |
parent | c13c732ac4174dca2341a8b3ea84582c01ce5cde (diff) | |
download | debug-me-937b55549b4ba72b0392d7e139e592a40eec2101.tar.gz |
rename LogMessage to AnyMessage
Not related to the Log anymore.
Diffstat (limited to 'WebSockets.hs')
-rw-r--r-- | WebSockets.hs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/WebSockets.hs b/WebSockets.hs index d8d43e7..2fa9e35 100644 --- a/WebSockets.hs +++ b/WebSockets.hs @@ -56,11 +56,11 @@ runClientApp app = do catchconnclosed ConnectionClosed = Just () catchconnclosed _ = Nothing --- | Make a client that sends and receives LogMessages over a websocket. +-- | Make a client that sends and receives AnyMessages over a websocket. clientApp :: Mode - -> (sent -> LogMessage) - -> (LogMessage -> Maybe received) + -> (sent -> AnyMessage) + -> (AnyMessage -> Maybe received) -> (TMChan sent -> TMChan received -> SessionID -> IO a) -> ClientApp a clientApp mode mksent filterreceived a conn = do @@ -98,20 +98,20 @@ clientApp mode mksent filterreceived a conn = do void $ waitCatch rthread go sid (schan, rchan, _, _) = a schan rchan sid -relayFromSocket :: Connection -> (LogMessage -> IO ()) -> IO () +relayFromSocket :: Connection -> (AnyMessage -> IO ()) -> IO () relayFromSocket conn sender = go where go = do r <- receiveData conn case r of - LogMessage msg -> do + AnyMessage msg -> do sender msg go Done -> return () WireProtocolError e -> protocolError conn e _ -> protocolError conn "Protocol error" -relayToSocket :: Connection -> (received -> LogMessage) -> IO (Maybe received) -> IO () +relayToSocket :: Connection -> (received -> AnyMessage) -> IO (Maybe received) -> IO () relayToSocket conn mksent getter = go where go = do @@ -119,7 +119,7 @@ relayToSocket conn mksent getter = go case mmsg of Nothing -> return () Just msg -> do - sendBinaryData conn $ LogMessage $ mksent msg + sendBinaryData conn $ AnyMessage $ mksent msg go -- | Framing protocol used over a websocket connection. @@ -133,7 +133,7 @@ data WireProtocol = Version [WireVersion] | SelectMode ClientSends Mode | Ready ServerSends SessionID - | LogMessage LogMessage + | AnyMessage AnyMessage | Done | WireProtocolError String @@ -144,7 +144,7 @@ instance WebSocketsData WireProtocol where toLazyByteString (Version v) = "V" <> Data.Aeson.encode v toLazyByteString (SelectMode _ m) = "M" <> Data.Aeson.encode m toLazyByteString (Ready _ sid) = "R" <> Data.Aeson.encode sid - toLazyByteString (LogMessage msg) = "L" <> Data.Binary.encode msg + toLazyByteString (AnyMessage msg) = "L" <> Data.Binary.encode msg toLazyByteString Done = "D" toLazyByteString (WireProtocolError s) = "E" <> Data.Aeson.encode s fromLazyByteString b = case L.splitAt 1 b of @@ -159,7 +159,7 @@ instance WebSocketsData WireProtocol where (Data.Aeson.decode sid) ("L", l) -> case Data.Binary.decodeOrFail l of Left (_, _, err) -> WireProtocolError $ "Binary decode error: " ++ err - Right (_, _, msg) -> LogMessage msg + Right (_, _, msg) -> AnyMessage msg ("D", "") -> Done ("E", s) -> maybe (WireProtocolError "invalid JSON in WireProtocolError") WireProtocolError |