Export more request types

src/Network/WebSockets.hs

@@ -101,11 +101,15 @@ module Network.WebSockets
     , I.runServer
     , I.runWithSocket
 
-      -- * Types
+      -- * HTTP Types
     , I.Headers
-    , I.RequestHttpPart (..)
     , I.Request (..)
+    , I.RequestHttpPart (..)
+    , I.RequestBody (..)
     , I.ResponseHttpPart (..)
+    , I.ResponseBody (..)
+
+      -- * WebSockets types
     , I.Message (..)
     , I.ControlMessage (..)
     , I.DataMessage (..)

src/Network/WebSockets/Handshake/Http.hs

@@ -2,9 +2,9 @@
 {-# LANGUAGE DeriveDataTypeable, OverloadedStrings #-}
 module Network.WebSockets.Handshake.Http
     ( Headers
+    , Request (..)
     , RequestHttpPart (..)
     , RequestBody (..)
-    , Request (..)
     , ResponseHttpPart (..)
     , ResponseBody (..)
     , HandshakeError (..)
@@ -45,6 +45,13 @@ import qualified Data.Enumerator as E
 -- | Request headers
 type Headers = [(CI.CI B.ByteString, B.ByteString)]
 
+-- | Full request type, including the response to it
+data Request = Request
+    { requestPath     :: !B.ByteString
+    , requestHeaders  :: Headers
+    , requestResponse :: ResponseBody
+    } deriving (Show)
+
 -- | (Internally used) HTTP headers and requested path.
 data RequestHttpPart = RequestHttpPart
     { requestHttpPath    :: !B.ByteString
@@ -56,20 +63,14 @@ data RequestHttpPart = RequestHttpPart
 data RequestBody = RequestBody RequestHttpPart B.ByteString
     deriving (Show)
 
--- | Full request type
-data Request = Request
-    { requestPath     :: !B.ByteString
-    , requestHeaders  :: Headers
-    , requestResponse :: ResponseBody
-    } deriving (Show)
-
 -- | Response to a 'Request'
 data ResponseHttpPart = ResponseHttpPart
     { responseHttpCode    :: !Int
     , responseHttpMessage :: !B.ByteString
     , responseHttpHeaders :: Headers
     } deriving (Show)
 
+-- | A response including a body
 data ResponseBody = ResponseBody ResponseHttpPart B.ByteString
     deriving (Show)