X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FInteraction.hs;h=ac5c1d6285aa33d936d4ae23135cb09b4ef8e125;hb=ea2b7838f1b3d9d4923a220a601be2e04cc559d7;hp=6b872ca5ff24a38ab16b74fb32d4df7d40e06abd;hpb=a9e9f50818285bf66cd64e5a248175eecb8e1fea;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Interaction.hs b/Network/HTTP/Lucu/Interaction.hs
index 6b872ca..ac5c1d6 100644
--- a/Network/HTTP/Lucu/Interaction.hs
+++ b/Network/HTTP/Lucu/Interaction.hs
@@ -1,133 +1,139 @@
+{-# LANGUAGE
+    OverloadedStrings
+  , RecordWildCards
+  , UnicodeSyntax
+  #-}
 module Network.HTTP.Lucu.Interaction
     ( Interaction(..)
     , InteractionState(..)
     , InteractionQueue
-    , newInteractionQueue -- IO InteractionQueue
-    , newInteraction      -- HostName -> Maybe Request -> IO Interaction
-
-    , writeItr   -- Interaction -> (Interaction -> TVar a) -> a -> STM ()
-    , readItr    -- Interaction -> (Interaction -> TVar a) -> (a -> b) -> STM b
-    , readItrF   -- (Functor f) => Interaction -> (Interaction -> TVar (f a)) -> (a -> b) -> STM (f b)
-    , updateItr  -- Interaction -> (Interaction -> TVar a) -> (a -> a) -> STM ()
-    , updateItrF -- (Functor f) => Interaction -> (Interaction -> TVar (f a)) -> (a -> a) -> STM ()
+    , newInteractionQueue
+    , newInteraction
+    , defaultPageContentType
+
+    , setResponseStatus
     )
     where
-
-import           Control.Concurrent.STM
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
+import Blaze.ByteString.Builder (Builder)
+import Control.Concurrent.STM
+import Data.Ascii (Ascii)
+import qualified Data.ByteString as BS
+import Data.Sequence (Seq)
 import qualified Data.Sequence as S
-import           Data.Sequence (Seq)
-import           Network
-import           Network.HTTP.Lucu.Request
-import           Network.HTTP.Lucu.Response
+import Data.Text (Text)
+import Network.Socket
+import Network.HTTP.Lucu.Config
+import Network.HTTP.Lucu.Headers
+import Network.HTTP.Lucu.HttpVersion
+import Network.HTTP.Lucu.Preprocess
+import Network.HTTP.Lucu.Request
+import Network.HTTP.Lucu.Response
+import OpenSSL.X509
 
 data Interaction = Interaction {
-      itrRemoteHost  :: HostName
-    , itrRequest     :: Maybe Request
-    , itrResponse    :: TVar (Maybe Response)
-
-    , itrRequestHasBody    :: TVar Bool
-    , itrRequestBodyLength :: TVar (Maybe Integer) -- chunked の場合は不明
-    , itrRequestIsChunked  :: TVar Bool
-    , itrReceivedBody      :: TVar ByteString -- Resource が受領した部分は削除される
-    
-    , itrExpectedContinue  :: TVar Bool
-
-    , itrWillChunkBody    :: TVar Bool
-    , itrWillDiscardBody  :: TVar Bool
-    , itrWillClose        :: TVar Bool
-    , itrBodyToSend       :: TVar ByteString
-
-    , itrState :: TVar InteractionState
-
-    , itrWroteContinue :: TVar Bool
-    , itrWroteHeader   :: TVar Bool
+      itrConfig            ∷ !Config
+    , itrLocalPort         ∷ !PortNumber
+    , itrRemoteAddr        ∷ !SockAddr
+    , itrRemoteCert        ∷ !(Maybe X509)
+    , itrResourcePath      ∷ !(Maybe [Text])
+    , itrRequest           ∷ !(Maybe Request)
+
+    , itrExpectedContinue  ∷ !(Maybe Bool)
+    , itrReqBodyLength     ∷ !(Maybe RequestBodyLength)
+
+    , itrReqBodyWanted     ∷ !(TVar Int)
+    , itrReqBodyWasteAll   ∷ !(TVar Bool)
+    , itrReqChunkIsOver    ∷ !(TVar Bool)
+    , itrReceivedBody      ∷ !(TVar (Seq BS.ByteString))
+    , itrReceivedBodyLen   ∷ !(TVar Int)
+
+    , itrResponse          ∷ !(TVar Response)
+    , itrWillChunkBody     ∷ !(TVar Bool)
+    , itrWillDiscardBody   ∷ !(TVar Bool)
+    , itrWillClose         ∷ !(TVar Bool)
+    , itrBodyToSend        ∷ !(TMVar Builder)
+    , itrSentNoBodySoFar   ∷ !(TVar Bool)
+
+    , itrState             ∷ !(TVar InteractionState)
     }
 
--- Resource の視點で見た時の状態。常に上から下へ行き、逆行しない。初期
--- 状態は ExaminingHeader (リクエストボディが有る時) または
--- DecidingHeader (無い時)。終了状態は常に Done
-data InteractionState = ExaminingHeader
+-- |The interaction state of Resource monad. 'ExaminingRequest' is the
+-- initial state.
+data InteractionState = ExaminingRequest
                       | GettingBody
                       | DecidingHeader
                       | DecidingBody
                       | Done
-                        deriving (Show, Eq, Ord)
+                        deriving (Show, Eq, Ord, Enum)
 
 type InteractionQueue = TVar (Seq Interaction)
 
-
-newInteractionQueue :: IO InteractionQueue
+newInteractionQueue ∷ IO InteractionQueue
 newInteractionQueue = newTVarIO S.empty
 
-
-newInteraction :: HostName -> Maybe Request -> IO Interaction
-newInteraction host req
-    = do responce <- newTVarIO Nothing
-
-         requestHasBody    <- newTVarIO False
-         requestBodyLength <- newTVarIO Nothing
-         requestIsChunked  <- newTVarIO False
-         receivedBody      <- newTVarIO B.empty
-
-         expectedContinue <- newTVarIO False
-
-         willChunkBody   <- newTVarIO False
-         willDiscardBody <- newTVarIO False
-         willClose       <- newTVarIO False
-         bodyToSend      <- newTVarIO B.empty
-
-         state <- newTVarIO undefined
-
-         wroteContinue <- newTVarIO False
-         wroteHeader   <- newTVarIO False
-
-         return $ Interaction {
-                      itrRemoteHost = host
-                    , itrRequest    = req
-                    , itrResponse   = responce
-
-                    , itrRequestHasBody    = requestHasBody
-                    , itrRequestBodyLength = requestBodyLength
-                    , itrRequestIsChunked  = requestIsChunked
-                    , itrReceivedBody      = receivedBody
-
-                    , itrExpectedContinue = expectedContinue
-
+defaultPageContentType ∷ Ascii
+defaultPageContentType = "application/xhtml+xml"
+
+newInteraction ∷ Config
+               → PortNumber
+               → SockAddr
+               → Maybe X509
+               → Either StatusCode Request
+               → IO Interaction
+newInteraction conf@(Config {..}) port addr cert request
+    = do let ar  = preprocess cnfServerHost port request
+             res = Response {
+                     resVersion = HttpVersion 1 1
+                   , resStatus  = arInitialStatus ar
+                   , resHeaders = singleton "Content-Type" defaultPageContentType
+                   }
+
+         reqBodyWanted   ← newTVarIO 0
+         reqBodyWasteAll ← newTVarIO False
+         reqChunkIsOver  ← newTVarIO False
+         receivedBody    ← newTVarIO S.empty
+         receivedBodyLen ← newTVarIO 0
+
+         response        ← newTVarIO res
+         willChunkBody   ← newTVarIO False
+         willDiscardBody ← newTVarIO False
+         willClose       ← newTVarIO False
+         bodyToSend      ← newEmptyTMVarIO
+         sentNoBodySoFar ← newTVarIO True
+
+         state           ← newTVarIO ExaminingRequest
+
+         return Interaction {
+                      itrConfig       = conf
+                    , itrLocalPort    = port
+                    , itrRemoteAddr   = addr
+                    , itrRemoteCert   = cert
+                    , itrResourcePath = Nothing
+                    , itrRequest      = arRequest ar
+
+                    , itrExpectedContinue = arExpectedContinue ar
+                    , itrReqBodyLength    = arReqBodyLength    ar
+
+                    , itrReqBodyWanted    = reqBodyWanted
+                    , itrReqBodyWasteAll  = reqBodyWasteAll
+                    , itrReqChunkIsOver   = reqChunkIsOver
+                    , itrReceivedBody     = receivedBody
+                    , itrReceivedBodyLen  = receivedBodyLen
+
+                    , itrResponse         = response
                     , itrWillChunkBody    = willChunkBody
                     , itrWillDiscardBody  = willDiscardBody
                     , itrWillClose        = willClose
                     , itrBodyToSend       = bodyToSend
+                    , itrSentNoBodySoFar  = sentNoBodySoFar
                     
-                    , itrState = state
-                    
-                    , itrWroteContinue = wroteContinue
-                    , itrWroteHeader   = wroteHeader
+                    , itrState            = state
                     }
 
-
-writeItr :: Interaction -> (Interaction -> TVar a) -> a -> STM ()
-writeItr itr accessor value
-    = writeTVar (accessor itr) value
-
-
-readItr :: Interaction -> (Interaction -> TVar a) -> (a -> b) -> STM b
-readItr itr accessor reader
-    = readTVar (accessor itr) >>= return . reader
-
-
-readItrF :: (Functor f) => Interaction -> (Interaction -> TVar (f a)) -> (a -> b) -> STM (f b)
-readItrF itr accessor reader
-    = readItr itr accessor (fmap reader)
-
-
-updateItr :: Interaction -> (Interaction -> TVar a) -> (a -> a) -> STM ()
-updateItr itr accessor updator
-    = do old <- readItr itr accessor id
-         writeItr itr accessor (updator old)
-
-
-updateItrF :: (Functor f) => Interaction -> (Interaction -> TVar (f a)) -> (a -> a) -> STM ()
-updateItrF itr accessor updator
-    = updateItr itr accessor (fmap updator)
+setResponseStatus ∷ Interaction → StatusCode → STM ()
+setResponseStatus (Interaction {..}) sc
+    = do res ← readTVar itrResponse
+         let res' = res {
+                      resStatus = sc
+                    }
+         writeTVar itrResponse res'