X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FPostprocess.hs;h=4950a0b97006e29b00446a9a6cfbf8ee90ea1781;hb=2bb7a0baa35dadb5d36d3f9fa98bd242baabc6d1;hp=806ed1c1c9d07529ec3e84e65b367d69d1d881dd;hpb=70bf5bd248aa426ca4e410b3fb9a0529354aedaf;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Postprocess.hs b/Network/HTTP/Lucu/Postprocess.hs
index 806ed1c..4950a0b 100644
--- a/Network/HTTP/Lucu/Postprocess.hs
+++ b/Network/HTTP/Lucu/Postprocess.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE
-    BangPatterns
+    DoAndIfThenElse
+  , OverloadedStrings
+  , RecordWildCards
   , UnicodeSyntax
   #-}
 module Network.HTTP.Lucu.Postprocess
@@ -7,26 +9,28 @@ module Network.HTTP.Lucu.Postprocess
     , completeUnconditionalHeaders
     )
     where
-
-import           Control.Concurrent.STM
-import           Control.Monad
-import qualified Data.ByteString as Strict (ByteString)
-import qualified Data.ByteString.Char8 as C8 hiding (ByteString)
-import           Data.IORef
-import           Data.Maybe
-import           Data.Time
+import Control.Applicative
+import Control.Concurrent.STM
+import Control.Monad
+import Control.Monad.Unicode
+import Data.Ascii (Ascii, CIAscii)
+import qualified Data.Ascii as A
+import Data.Monoid.Unicode
+import Data.Time
 import qualified Data.Time.HTTP as HTTP
-import           GHC.Conc (unsafeIOToSTM)
-import           Network.HTTP.Lucu.Abortion
-import           Network.HTTP.Lucu.Config
-import           Network.HTTP.Lucu.Headers
-import           Network.HTTP.Lucu.HttpVersion
-import           Network.HTTP.Lucu.Interaction
-import           Network.HTTP.Lucu.Request
-import           Network.HTTP.Lucu.Response
-import           System.IO.Unsafe
+import GHC.Conc (unsafeIOToSTM)
+import Network.HTTP.Lucu.Abortion
+import Network.HTTP.Lucu.Config
+import Network.HTTP.Lucu.Headers
+import Network.HTTP.Lucu.HttpVersion
+import Network.HTTP.Lucu.Interaction
+import Network.HTTP.Lucu.Request
+import Network.HTTP.Lucu.Response
+import Prelude.Unicode
 
 {-
+  TODO: Tanslate this memo into English. It doesn't make sense to
+  non-Japanese speakers.
   
   * Response が未設定なら、200 OK にする。
 
@@ -59,122 +63,117 @@ import           System.IO.Unsafe
 
 -}
 
-postprocess :: Interaction -> STM ()
-postprocess !itr
-    = do reqM <- readItr itr itrRequest id
-         res  <- readItr itr itrResponse id
+postprocess ∷ Interaction → STM ()
+postprocess (Interaction {..})
+    = do res  ← readTVar itrResponse
          let sc = resStatus res
 
-         unless (any (\ p -> p sc) [isSuccessful, isRedirection, isError])
-                  $ abortSTM InternalServerError []
-                        $ Just ("The status code is not good for a final status: "
-                                ++ show sc)
-
-         when (sc == MethodNotAllowed && getHeader (C8.pack "Allow") res == Nothing)
-                  $ abortSTM InternalServerError []
-                        $ Just ("The status was " ++ show sc ++ " but no Allow header.")
-
-         when (sc /= NotModified && isRedirection sc && getHeader (C8.pack "Location") res == Nothing)
-                  $ abortSTM InternalServerError []
-                        $ Just ("The status code was " ++ show sc ++ " but no Location header.")
-
-         when (reqM /= Nothing) relyOnRequest
+         unless (any (\ p → p sc) [isSuccessful, isRedirection, isError])
+             $ abortSTM InternalServerError []
+             $ Just
+             $ A.toText
+             $ A.fromAsciiBuilder
+             $ A.toAsciiBuilder "The status code is not good for a final status of a response: "
+             ⊕ printStatusCode sc
+
+         when (sc ≡ MethodNotAllowed ∧ getHeader "Allow" res ≡ Nothing)
+             $ abortSTM InternalServerError []
+             $ Just
+             $ A.toText
+             $ A.fromAsciiBuilder
+             $ A.toAsciiBuilder "The status was "
+             ⊕ printStatusCode sc
+             ⊕ A.toAsciiBuilder " but no Allow header."
+
+         when (sc ≢ NotModified ∧ isRedirection sc ∧ getHeader "Location" res ≡ Nothing)
+             $ abortSTM InternalServerError []
+             $ Just
+             $ A.toText
+             $ A.fromAsciiBuilder
+             $ A.toAsciiBuilder "The status code was "
+             ⊕ printStatusCode sc
+             ⊕ A.toAsciiBuilder " but no Location header."
+
+         reqM ← readTVar itrRequest
+         case reqM of
+           Just req → postprocessWithRequest sc req
+           Nothing  → return ()
 
          -- itrResponse の内容は relyOnRequest によって變へられてゐる可
          -- 能性が高い。
-         do oldRes <- readItr itr itrResponse id
-            newRes <- unsafeIOToSTM
-                      $ completeUnconditionalHeaders (itrConfig itr) oldRes
-            writeItr itr itrResponse newRes
+         do oldRes ← readTVar itrResponse
+            newRes ← unsafeIOToSTM
+                     $ completeUnconditionalHeaders itrConfig oldRes
+            writeTVar itrResponse newRes
     where
-      relyOnRequest :: STM ()
-      relyOnRequest
-          = do status <- readItr itr itrResponse resStatus
-               req    <- readItr itr itrRequest fromJust
-
-               let reqVer      = reqVersion req
-                   canHaveBody = if reqMethod req == HEAD then
+      postprocessWithRequest ∷ StatusCode → Request → STM ()
+      postprocessWithRequest sc (Request {..})
+          = do let canHaveBody = if reqMethod ≡ HEAD then
                                      False
                                  else
-                                     not (isInformational status ||
-                                          status == NoContent    ||
-                                          status == ResetContent ||
-                                          status == NotModified    )
+                                     (¬) (isInformational sc ∨
+                                          sc ≡ NoContent     ∨
+                                          sc ≡ ResetContent  ∨
+                                          sc ≡ NotModified   )
 
-               updateRes $! deleteHeader (C8.pack "Content-Length")
-               updateRes $! deleteHeader (C8.pack "Transfer-Encoding")
+               updateRes $ deleteHeader "Content-Length"
+               updateRes $ deleteHeader "Transfer-Encoding"
 
-               cType <- readHeader (C8.pack "Content-Type")
-               when (cType == Nothing)
-                        $ updateRes $ setHeader (C8.pack "Content-Type") defaultPageContentType
+               cType ← readHeader "Content-Type"
+               when (cType ≡ Nothing)
+                        $ updateRes $ setHeader "Content-Type" defaultPageContentType
 
                if canHaveBody then
-                   when (reqVer == HttpVersion 1 1)
-                            $ do updateRes $! setHeader (C8.pack "Transfer-Encoding") (C8.pack "chunked")
-                                 writeItr itr itrWillChunkBody True
-                 else
+                   when (reqVersion ≡ HttpVersion 1 1)
+                       $ do updateRes $ setHeader "Transfer-Encoding" "chunked"
+                            writeTVar itrWillChunkBody True
+               else
                    -- body 関連のヘッダを削除。但し HEAD なら Content-* は殘す
-                   when (reqMethod req /= HEAD)
-                            $ do updateRes $! deleteHeader (C8.pack "Content-Type")
-                                 updateRes $! deleteHeader (C8.pack "Etag")
-                                 updateRes $! deleteHeader (C8.pack "Last-Modified")
+                   when (reqMethod ≢ HEAD)
+                       $ do updateRes $ deleteHeader "Content-Type"
+                            updateRes $ deleteHeader "Etag"
+                            updateRes $ deleteHeader "Last-Modified"
 
-               conn <- readHeader (C8.pack "Connection")
+               conn ← readCIHeader "Connection"
                case conn of
-                 Nothing    -> return ()
-                 Just value -> when (value `noCaseEq` C8.pack "close")
-                                   $ writeItr itr itrWillClose True
+                 Nothing    → return ()
+                 Just value → when (value ≡ "close")
+                                  $ writeTVar itrWillClose True
 
-               willClose <- readItr itr itrWillClose id
+               willClose ← readTVar itrWillClose
                when willClose
-                        $ updateRes $! setHeader (C8.pack "Connection") (C8.pack "close")
+                   $ updateRes $ setHeader "Connection" "close"
 
-               when (reqMethod req == HEAD || not canHaveBody)
-                        $ writeTVar (itrWillDiscardBody itr) True
+               when (reqMethod ≡ HEAD ∨ not canHaveBody)
+                   $ writeTVar itrWillDiscardBody True
 
-      readHeader :: Strict.ByteString -> STM (Maybe Strict.ByteString)
-      readHeader !name
-          = readItr itr itrResponse $ getHeader name
+      readHeader ∷ CIAscii → STM (Maybe Ascii)
+      {-# INLINE readHeader #-}
+      readHeader k = getHeader k <$> readTVar itrResponse
 
-      updateRes :: (Response -> Response) -> STM ()
-      updateRes !updator 
-          = updateItr itr itrResponse updator
+      readCIHeader ∷ CIAscii → STM (Maybe CIAscii)
+      {-# INLINE readCIHeader #-}
+      readCIHeader k = getCIHeader k <$> readTVar itrResponse
 
+      updateRes ∷ (Response → Response) → STM ()
+      {-# INLINE updateRes #-}
+      updateRes f
+          = do old ← readTVar itrResponse
+               writeTVar itrResponse (f old)
 
-completeUnconditionalHeaders :: Config -> Response -> IO Response
-completeUnconditionalHeaders !conf !res
-    = compServer res >>= compDate
+completeUnconditionalHeaders ∷ Config → Response → IO Response
+completeUnconditionalHeaders conf = (compDate =≪) ∘ compServer
       where
         compServer res'
-            = case getHeader (C8.pack "Server") res' of
-                Nothing -> return $ setHeader (C8.pack "Server") (cnfServerSoftware conf) res'
-                Just _  -> return res'
+            = case getHeader "Server" res' of
+                Nothing → return $ setHeader "Server" (cnfServerSoftware conf) res'
+                Just _  → return res'
 
         compDate res'
-            = case getHeader (C8.pack "Date") res' of
-                Nothing -> do date <- getCurrentDate
-                              return $ setHeader (C8.pack "Date") date res'
-                Just _  -> return res'
-
-
-cache :: IORef (UTCTime, Strict.ByteString)
-cache = unsafePerformIO $
-        newIORef (UTCTime (ModifiedJulianDay 0) 0, undefined)
-{-# NOINLINE cache #-}
-
-getCurrentDate :: IO Strict.ByteString
-getCurrentDate = do now                     <- getCurrentTime
-                    (cachedTime, cachedStr) <- readIORef cache
-
-                    if now `mostlyEq` cachedTime then
-                        return cachedStr
-                      else
-                        do let dateStr = C8.pack $ HTTP.format now
-                           writeIORef cache (now, dateStr)
-                           return dateStr
-    where
-      mostlyEq :: UTCTime -> UTCTime -> Bool
-      mostlyEq a b
-          = (utctDay a == utctDay b)
-            &&
-            (fromEnum (utctDayTime a) == fromEnum (utctDayTime b))
+            = case getHeader "Date" res' of
+                Nothing → do date ← getCurrentDate
+                             return $ setHeader "Date" date res'
+                Just _  → return res'
+
+getCurrentDate ∷ IO Ascii
+getCurrentDate = HTTP.toAscii <$> getCurrentTime