X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FInteraction.hs;h=19faec28fe7a1fb506f42d5416123f17ec52a61d;hb=c7a8bc012b1b70353d567bfab86fc6e849d60c20;hp=91979c9d5449e7a1b2ee7811a0c8294a9d381fc7;hpb=d05d8c883eaca12ee621975a2b95c5ebdc2357d2;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Interaction.hs b/Network/HTTP/Lucu/Interaction.hs
index 91979c9..19faec2 100644
--- a/Network/HTTP/Lucu/Interaction.hs
+++ b/Network/HTTP/Lucu/Interaction.hs
@@ -1,3 +1,8 @@
+{-# LANGUAGE
+    BangPatterns
+  , OverloadedStrings
+  , UnicodeSyntax
+  #-}
 module Network.HTTP.Lucu.Interaction
     ( Interaction(..)
     , InteractionState(..)
@@ -13,54 +18,57 @@ module Network.HTTP.Lucu.Interaction
     , updateItrF
     )
     where
-
-import           Control.Concurrent.STM
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
+import Control.Applicative
+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.Socket
-import           Network.HTTP.Lucu.Config
-import           Network.HTTP.Lucu.HttpVersion
-import           Network.HTTP.Lucu.Request
-import           Network.HTTP.Lucu.Response
+import Network.Socket
+import Network.HTTP.Lucu.Config
+import Network.HTTP.Lucu.Headers
+import Network.HTTP.Lucu.HttpVersion
+import Network.HTTP.Lucu.Request
+import Network.HTTP.Lucu.Response
+import OpenSSL.X509
+import Prelude.Unicode
 
 data Interaction = Interaction {
-      itrConfig       :: !Config
-    , itrRemoteAddr   :: !SockAddr
-    , itrResourcePath :: !(Maybe [String])
-    , itrRequest      :: !(TVar (Maybe Request))
-    , itrResponse     :: !(TVar Response)
-
-    -- FIXME: この三つは本來 TVar であるべきでないので、唯の Bool にす
-    -- るに越した事は無いが、それは重要でない。
-    , itrRequestHasBody    :: !(TVar Bool)
-    , itrRequestIsChunked  :: !(TVar Bool)
-    , itrExpectedContinue  :: !(TVar Bool)
-
-    , itrReqChunkLength    :: !(TVar (Maybe Int))
-    , itrReqChunkRemaining :: !(TVar (Maybe Int))
-    , itrReqChunkIsOver    :: !(TVar Bool)
-    , itrReqBodyWanted     :: !(TVar (Maybe Int))
-    , itrReqBodyWasteAll   :: !(TVar Bool)
-    , itrReceivedBody      :: !(TVar ByteString) -- Resource が受領した部分は削除される
-
-    , itrWillReceiveBody   :: !(TVar Bool)
-    , itrWillChunkBody     :: !(TVar Bool)
-    , itrWillDiscardBody   :: !(TVar Bool)
-    , itrWillClose         :: !(TVar Bool)
-
-    , itrBodyToSend :: !(TVar ByteString)
-    , itrBodyIsNull :: !(TVar Bool)
-
-    , itrState :: !(TVar InteractionState)
-
-    , itrWroteContinue :: !(TVar Bool)
-    , itrWroteHeader   :: !(TVar Bool)
+      itrConfig            ∷ !Config
+    , itrLocalPort         ∷ !PortNumber
+    , itrRemoteAddr        ∷ !SockAddr
+    , itrRemoteCert        ∷ !(Maybe X509)
+    , itrResourcePath      ∷ !(Maybe [Ascii])
+    , itrRequest           ∷ !(TVar (Maybe Request))
+    , itrResponse          ∷ !(TVar Response)
+
+    , itrRequestHasBody    ∷ !(TVar Bool)
+    , itrRequestIsChunked  ∷ !(TVar Bool)
+    , itrExpectedContinue  ∷ !(TVar Bool)
+
+    , itrReqChunkLength    ∷ !(TVar (Maybe Int))
+    , itrReqChunkRemaining ∷ !(TVar (Maybe Int))
+    , itrReqChunkIsOver    ∷ !(TVar Bool)
+    , itrReqBodyWanted     ∷ !(TVar (Maybe Int))
+    , itrReqBodyWasteAll   ∷ !(TVar Bool)
+    , itrReceivedBody      ∷ !(TVar (Seq BS.ByteString))
+
+    , itrWillReceiveBody   ∷ !(TVar Bool)
+    , itrWillChunkBody     ∷ !(TVar Bool)
+    , itrWillDiscardBody   ∷ !(TVar Bool)
+    , itrWillClose         ∷ !(TVar Bool)
+
+    , itrBodyToSend        ∷ !(TVar (Seq BS.ByteString))
+    , itrBodyIsNull        ∷ !(TVar Bool)
+
+    , itrState             ∷ !(TVar InteractionState)
+
+    , itrWroteContinue     ∷ !(TVar Bool)
+    , itrWroteHeader       ∷ !(TVar Bool)
     }
 
--- Resource の視點で見た時の状態。常に上から下へ行き、逆行しない。初期
--- 状態は ExaminingRequest。
+-- |The interaction state of Resource monad. 'ExaminingRequest' is the
+-- initial state.
 data InteractionState = ExaminingRequest
                       | GettingBody
                       | DecidingHeader
@@ -70,58 +78,56 @@ data InteractionState = ExaminingRequest
 
 type InteractionQueue = TVar (Seq Interaction)
 
-
-newInteractionQueue :: IO InteractionQueue
+newInteractionQueue ∷ IO InteractionQueue
 newInteractionQueue = newTVarIO S.empty
 
-
-defaultPageContentType :: String
+defaultPageContentType ∷ Ascii
 defaultPageContentType = "application/xhtml+xml"
 
-
-newInteraction :: Config -> SockAddr -> Maybe Request -> IO Interaction
-newInteraction conf addr req
-    = conf `seq` addr `seq` req `seq`
-      do request  <- newTVarIO $ req
-         responce <- newTVarIO $ Response {
+newInteraction ∷ Config → PortNumber → SockAddr → Maybe X509 → Maybe Request → IO Interaction
+newInteraction !conf !port !addr !cert !req
+    = do request  ← newTVarIO req
+         responce ← newTVarIO Response {
                        resVersion = HttpVersion 1 1
                      , resStatus  = Ok
-                     , resHeaders = [("Content-Type", defaultPageContentType)]
+                     , resHeaders = toHeaders [("Content-Type", defaultPageContentType)]
                      }
 
-         requestHasBody     <- newTVarIO False
-         requestIsChunked   <- newTVarIO False
-         expectedContinue   <- newTVarIO False
+         requestHasBody     ← newTVarIO False
+         requestIsChunked   ← newTVarIO False
+         expectedContinue   ← newTVarIO False
          
-         reqChunkLength     <- newTVarIO Nothing -- 現在のチャンク長
-         reqChunkRemaining  <- newTVarIO Nothing -- 現在のチャンクの殘り
-         reqChunkIsOver     <- newTVarIO False   -- 最後のチャンクを讀み終へた
-         reqBodyWanted      <- newTVarIO Nothing -- Resource が要求してゐるチャンク長
-         reqBodyWasteAll    <- newTVarIO False   -- 殘りの body を讀み捨てよと云ふ要求
-         receivedBody       <- newTVarIO B.empty
+         reqChunkLength     ← newTVarIO Nothing -- 現在のチャンク長
+         reqChunkRemaining  ← newTVarIO Nothing -- 現在のチャンクの殘り
+         reqChunkIsOver     ← newTVarIO False   -- 最後のチャンクを讀み終へた
+         reqBodyWanted      ← newTVarIO Nothing -- Resource が要求してゐるチャンク長
+         reqBodyWasteAll    ← newTVarIO False   -- 殘りの body を讀み捨てよと云ふ要求
+         receivedBody       ← newTVarIO S.empty
 
-         willReceiveBody   <- newTVarIO False
-         willChunkBody     <- newTVarIO False
-         willDiscardBody   <- newTVarIO False
-         willClose         <- newTVarIO False
+         willReceiveBody   ← newTVarIO False
+         willChunkBody     ← newTVarIO False
+         willDiscardBody   ← newTVarIO False
+         willClose         ← newTVarIO False
 
-         bodyToSend <- newTVarIO B.empty
-         bodyIsNull <- newTVarIO True -- 一度でも bodyToSend が空でなくなったら False
+         bodyToSend ← newTVarIO S.empty
+         bodyIsNull ← newTVarIO True -- 一度でも bodyToSend が空でなくなったら False
 
-         state <- newTVarIO ExaminingRequest
+         state ← newTVarIO ExaminingRequest
 
-         wroteContinue <- newTVarIO False
-         wroteHeader   <- newTVarIO False
+         wroteContinue ← newTVarIO False
+         wroteHeader   ← newTVarIO False
 
-         return $ Interaction {
+         return Interaction {
                       itrConfig       = conf
+                    , itrLocalPort    = port
                     , itrRemoteAddr   = addr
+                    , itrRemoteCert   = cert
                     , itrResourcePath = Nothing
                     , itrRequest      = request
                     , itrResponse     = responce
 
-                    , itrRequestHasBody    = requestHasBody
-                    , itrRequestIsChunked  = requestIsChunked
+                    , itrRequestHasBody   = requestHasBody
+                    , itrRequestIsChunked = requestIsChunked
                     , itrExpectedContinue = expectedContinue
 
                     , itrReqChunkLength    = reqChunkLength
@@ -145,35 +151,28 @@ newInteraction conf addr req
                     , itrWroteHeader   = wroteHeader
                     }
 
+writeItr ∷ Interaction → (Interaction → TVar a) → a → STM ()
+{-# INLINE writeItr #-}
+writeItr itr accessor
+    = writeTVar (accessor itr)
 
-writeItr :: Interaction -> (Interaction -> TVar a) -> a -> STM ()
-writeItr itr accessor value
-    = itr `seq` accessor `seq` value `seq`
-      writeTVar (accessor itr) value
-
-
-readItr :: Interaction -> (Interaction -> TVar a) -> (a -> b) -> STM b
+readItr ∷ Interaction → (Interaction → TVar a) → (a → b) → STM b
+{-# INLINE readItr #-}
 readItr itr accessor reader
-    = itr `seq` accessor `seq` reader `seq`
-      readTVar (accessor itr) >>= return . reader
-
+    = reader <$> readTVar (accessor itr)
 
-readItrF :: Functor f => Interaction -> (Interaction -> TVar (f a)) -> (a -> b) -> STM (f b)
+readItrF ∷ Functor f => Interaction → (Interaction → TVar (f a)) → (a → b) → STM (f b)
+{-# INLINE readItrF #-}
 readItrF itr accessor reader
-    = itr `seq` accessor `seq` reader `seq`
-      readItr itr accessor (fmap reader)
-{-# SPECIALIZE readItrF :: Interaction -> (Interaction -> TVar (Maybe a)) -> (a -> b) -> STM (Maybe b) #-}
+    = readItr itr accessor (fmap reader)
 
-
-updateItr :: Interaction -> (Interaction -> TVar a) -> (a -> a) -> STM ()
+updateItr ∷ Interaction → (Interaction → TVar a) → (a → a) → STM ()
+{-# INLINE updateItr #-}
 updateItr itr accessor updator
-    = itr `seq` accessor `seq` updator `seq`
-      do old <- readItr itr accessor id
+    = 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
-    = itr `seq` accessor `seq` updator `seq`
-      updateItr itr accessor (fmap updator)
-{-# SPECIALIZE updateItrF :: Interaction -> (Interaction -> TVar (Maybe a)) -> (a -> a) -> STM () #-}
\ No newline at end of file
+updateItrF ∷ Functor f => Interaction → (Interaction → TVar (f a)) → (a → a) → STM ()
+{-# INLINE updateItrF #-}
+updateItrF itr accessor
+    = updateItr itr accessor ∘ fmap