+{-# LANGUAGE
+ BangPatterns
+ , GeneralizedNewtypeDeriving
+ , OverloadedStrings
+ , UnicodeSyntax
+ #-}
module Network.HTTP.Lucu.Headers
( Headers
, HasHeaders(..)
- , emptyHeaders -- Headers
- , headersP -- Parser Headers
- , hPutHeaders -- Handle -> Headers -> IO ()
+
+ , toHeaders
+ , fromHeaders
+
+ , headersP
+ , hPutHeaders
)
where
+import Control.Applicative
+import Data.Ascii (Ascii, CIAscii)
+import qualified Data.Ascii as A
+import Data.Attoparsec.Char8 as P
+import qualified Data.ByteString as BS
+import Data.Map (Map)
+import qualified Data.Map as M
+import Data.Monoid
+import Data.Monoid.Unicode
+import Network.HTTP.Lucu.HandleLike
+import Network.HTTP.Lucu.Parser.Http
+import Network.HTTP.Lucu.Utils
+import Prelude.Unicode
-import Data.Char
-import Data.List
-import Network.HTTP.Lucu.Parser
-import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Utils
-import System.IO
-
-type Headers = [ (String, String) ]
+newtype Headers
+ = Headers (Map CIAscii Ascii)
+ deriving (Eq, Show, Monoid)
class HasHeaders a where
- getHeaders :: a -> Headers
- setHeaders :: a -> Headers -> a
+ getHeaders ∷ a → Headers
+ setHeaders ∷ a → Headers → a
- getHeader :: String -> a -> Maybe String
- getHeader key a
- = fmap snd $ find (noCaseEq key . fst) (getHeaders a)
+ getHeader ∷ CIAscii → a → Maybe Ascii
+ {-# INLINE getHeader #-}
+ getHeader !key !a
+ = case getHeaders a of
+ Headers m → M.lookup key m
- deleteHeader :: String -> a -> a
- deleteHeader key a
- = setHeaders a $ filter (not . noCaseEq key . fst) (getHeaders a)
+ deleteHeader ∷ CIAscii → a → a
+ {-# INLINE deleteHeader #-}
+ deleteHeader !key !a
+ = case getHeaders a of
+ Headers m
+ → setHeaders a $ Headers $ M.delete key m
- addHeader :: String -> String -> a -> a
- addHeader key val a
- = setHeaders a $ (getHeaders a) ++ [(key, val)]
+ setHeader ∷ CIAscii → Ascii → a → a
+ {-# INLINE setHeader #-}
+ setHeader !key !val !a
+ = case getHeaders a of
+ Headers m
+ → setHeaders a $ Headers $ M.insert key val m
- setHeader :: String -> String -> a -> a
- setHeader key val a
- = let list = getHeaders a
- deleted = filter (not . noCaseEq key . fst) list
- added = deleted ++ [(key, val)]
- in
- setHeaders a added
+toHeaders ∷ [(CIAscii, Ascii)] → Headers
+{-# INLINE toHeaders #-}
+toHeaders = flip mkHeaders (∅)
-emptyHeaders :: Headers
-emptyHeaders = []
+mkHeaders ∷ [(CIAscii, Ascii)] → Headers → Headers
+mkHeaders [] (Headers m) = Headers m
+mkHeaders ((key, val):xs) (Headers m)
+ = mkHeaders xs $ Headers $
+ case M.lookup key m of
+ Nothing → M.insert key val m
+ Just old → M.insert key (merge old val) m
+ where
+ merge ∷ Ascii → Ascii → Ascii
+ {-# INLINE merge #-}
+ merge a b
+ | nullA a ∧ nullA b = (∅)
+ | nullA a = b
+ | nullA b = a
+ | otherwise = a ⊕ ", " ⊕ b
+
+ nullA ∷ Ascii → Bool
+ {-# INLINE nullA #-}
+ nullA = BS.null ∘ A.toByteString
+fromHeaders ∷ Headers → [(CIAscii, Ascii)]
+fromHeaders (Headers m) = M.toList m
{-
message-header = field-name ":" [ field-value ]
field-value の先頭および末尾にある LWS は全て削除され、それ以外の
LWS は單一の SP に變換される。
-}
-headersP :: Parser Headers
-headersP = do xs <- many header
+headersP ∷ Parser Headers
+{-# INLINEABLE headersP #-}
+headersP = do xs ← P.many header
crlf
- return xs
+ return $ toHeaders xs
where
- header :: Parser (String, String)
- header = do name <- token
- char ':'
- -- FIXME: これは多少インチキだが、RFC 2616 のこの部分
- -- の記述はひどく曖昧であり、この動作が本當に間違って
- -- ゐるのかどうかも良く分からない。例へば
- -- quoted-string の内部にある空白は纏めていいのか惡い
- -- のか？直勸的には駄目さうに思へるが、そんな記述は見
- -- 付からない。
- contents <- many (lws <|> many1 text)
+ header ∷ Parser (CIAscii, Ascii)
+ header = try $
+ do name ← A.toCIAscii <$> token
+ _ ← char ':'
+ skipMany lws
+ values ← sepBy content lws
+ skipMany lws
crlf
- let value = foldr (++) "" contents
- return (name, normalize value)
-
- normalize :: String -> String
- normalize = trimBody . trim isWhiteSpace
+ return (name, joinValues values)
- trimBody = nubBy (\ a b -> a == ' ' && b == ' ')
- . map (\ c -> if isWhiteSpace c
- then ' '
- else c)
+ content ∷ Parser Ascii
+ {-# INLINE content #-}
+ content = A.unsafeFromByteString
+ <$>
+ takeWhile1 (\c → ((¬) (isSPHT c)) ∧ isText c)
+ joinValues ∷ [Ascii] → Ascii
+ {-# INLINE joinValues #-}
+ joinValues = A.fromAsciiBuilder ∘ joinWith "\x20" ∘ map A.toAsciiBuilder
-hPutHeaders :: Handle -> Headers -> IO ()
-hPutHeaders h hds = mapM_ putH hds >> hPutStr h "\r\n"
+hPutHeaders ∷ HandleLike h => h → Headers → IO ()
+hPutHeaders !h !(Headers m)
+ = mapM_ putH (M.toList m) >> hPutBS h "\r\n"
where
- putH (name, value) = do hPutStr h name
- hPutStr h ": "
- hPutStr h value
- hPutStr h "\r\n"
+ putH ∷ (CIAscii, Ascii) → IO ()
+ putH (!name, !value)
+ = do hPutBS h (A.ciToByteString name)
+ hPutBS h ": "
+ hPutBS h (A.toByteString value)
+ hPutBS h "\r\n"
projects / Lucu.git / blobdiff