upgrade to wai 3.0

Author: winterland1989

SocketIO.cabal

@@ -77,8 +77,9 @@ library
                     , ansi-terminal         >=0.6   && <1.0
                     , unordered-containers  >=0.2   && <1.0
                     , random                >=1.0   && <2.0
-                    , wai                   >=2.0   && <3.0
-                    , warp                  >=2.0   && <3.0
+                    , wai                   >=3.0   && <4.0
+                    , wai-conduit           >=3.0   && <4.0
+                    , warp                  >=3.0   && <4.0
                     , http-types            >=0.8   && <1.0
                     , mtl                   >=2.1   && <3.0
                     , transformers-base     >=0.4   && <1.0
@@ -110,11 +111,12 @@ test-suite socketio-test
                     , ansi-terminal         >=0.6   && <1.0
                     , unordered-containers  >=0.2   && <1.0
                     , random                >=1.0   && <2.0
-                    , wai                   >=2.0   && <3.0
-                    , warp                  >=2.0   && <3.0
+                    , wai                   >=3.0   && <4.0
+                    , wai-conduit           >=3.0   && <4.0
+                    , warp                  >=3.0   && <4.0
                     , http-types            >=0.8   && <1.0
                     , mtl                   >=2.1   && <3.0
                     , transformers-base     >=0.4   && <1.0
                     , monad-control         >=0.3   && <1.0
                     , lifted-base           >=0.2   && <1.0
-                    , vector                >=0.10  && <1.0
+                    , vector                >=0.10  && <1.0

Web/SocketIO/Request.hs

@@ -15,6 +15,7 @@ import qualified    Data.ByteString                 as B
 import              Data.Conduit
 import qualified    Data.Conduit.List               as CL
 import qualified    Network.Wai                     as Wai
+import qualified    Network.Wai.Conduit             as Wai
 
 --------------------------------------------------------------------------------
 -- | Run!
@@ -31,7 +32,9 @@ sourceHTTPRequest request = do
     case (method, path) of
         ("GET", (WithoutSession _ _)) -> yield Handshake
         ("GET", (WithSession _ _ _ sessionID)) -> yield (Connect sessionID)
-        ("POST", (WithSession _ _ _ sessionID)) -> Wai.requestBody request $= demultiplexMessage =$= awaitForever (yield . Request sessionID)
+        ("POST", (WithSession _ _ _ sessionID)) -> do
+           let reqSource = Wai.sourceRequestBody request
+           reqSource $= demultiplexMessage =$= awaitForever (yield . Request sessionID)
         (_, (WithSession _ _ _ sessionID)) -> yield (Disconnect sessionID)
         _ -> error "error handling http request"
 
@@ -71,4 +74,4 @@ toFlushBuilder = do
         Just b' -> do
             yield $ Chunk (Builder.fromByteString b')
             toFlushBuilder
-        Nothing -> yield $ Flush
+        Nothing -> yield $ Flush

Web/SocketIO/Server.hs

@@ -20,6 +20,7 @@ import              Data.Conduit
 import              Network.HTTP.Types              (status200)
 import              Network.HTTP.Types.Header       (ResponseHeaders)
 import qualified    Network.Wai                     as Wai
+import qualified    Network.Wai.Conduit             as Wai
 import qualified    Network.Wai.Handler.Warp        as Warp
 
 --------------------------------------------------------------------------------
@@ -50,14 +51,13 @@ serverConfig port config handler = do
 --------------------------------------------------------------------------------
 -- | Wrapped as a HTTP app
 httpApp :: ResponseHeaders -> (Request -> IO Message) -> Wai.Application
-httpApp headerFields runConnection' httpRequest = liftIO $ do
+httpApp headerFields runConnection' httpRequest respond = do
 
     let origin = lookupOrigin httpRequest
     let headerFields' = insertOrigin headerFields origin
-
     let sourceBody = sourceHTTPRequest httpRequest $= runRequest runConnection'
 
-    return $ Wai.responseSource status200 headerFields' sourceBody
+    respond $ Wai.responseSource status200 headerFields' sourceBody
 
     where   lookupOrigin req = case lookup "Origin" (Wai.requestHeaders req) of
                 Just origin -> origin
@@ -102,4 +102,4 @@ defaultConfig = Configuration
     ,   heartbeatTimeout = 60
     ,   heartbeatInterval = 25
     ,   pollingDuration = 20
-}
+}