X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=e1abcab63d8fc5344262f3cde0f14eec136347b8;hb=01fe22bec14421e3b9430efbfc9daee05f181730;hp=70df37766c209bbd6c0e5cbde3bb115e46beecfe;hpb=9961a721f98b101825ef154a2122c1fc2fa6d1ac;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index 70df377..e1abcab 100644
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -1,52 +1,116 @@
+{-# LANGUAGE
+    CPP
+  , UnicodeSyntax
+  #-}
+-- |The entry point of Lucu httpd.
 module Network.HTTP.Lucu.Httpd
-    ( ResourceTable
-    , mkResourceTable -- [ ([String], Resource ()) ] -> ResourceTable
-    , runHttpd        -- Config -> ResourceTable -> IO ()
+    ( runHttpd
     )
     where
+import Control.Concurrent
+import Control.Exception
+import Control.Monad
+import Control.Monad.Unicode
+import Data.Maybe
+import Network.BSD
+import Network.Socket
+import Network.HTTP.Lucu.Config
+import Network.HTTP.Lucu.Dispatcher
+import Network.HTTP.Lucu.Interaction
+import Network.HTTP.Lucu.RequestReader
+import Network.HTTP.Lucu.ResponseWriter
+import Network.HTTP.Lucu.SocketLike as SL
+import Prelude.Unicode
 
-import           Control.Concurrent
-import qualified Data.ByteString.Lazy.Char8 as B
-import           Data.ByteString.Lazy.Char8 (ByteString)
-import           Data.Map as M
-import           Data.Map (Map)
-import           Network
-import           Network.HTTP.Lucu.Config
-import           Network.HTTP.Lucu.Parser
-import           Network.HTTP.Lucu.Request
-import           Network.HTTP.Lucu.Resource
-import           Network.HTTP.Lucu.Response
-import           System.IO
-
-
-type ResourceTable = Map [String] (Resource ())
-
-
-mkResourceTable :: [ ([String], Resource ()) ] -> ResourceTable
-mkResourceTable = M.fromList
-
-
-runHttpd :: Config -> ResourceTable -> IO ()
-runHttpd cnf table
-    = withSocketsDo $
-      do so <- listenOn (cnfServerPort cnf)
-         loop so
+-- |This is the entry point of Lucu httpd. It listens to a socket and
+-- waits for clients. 'runHttpd' never stops by itself so the only way
+-- to stop it is to raise an exception in the thread running it.
+--
+-- Example:
+--
+-- > {-# LANGUAGE OverloadedStrings #-}
+-- > {-# LANGUAGE QuasiQuotes #-}
+-- > module Main where
+-- > import Network
+-- > import Network.HTTP.Lucu
+-- > 
+-- > main :: IO ()
+-- > main = let config    = defaultConfig
+-- >            resources = mkResTree [ ([], helloWorld) ]
+-- >        in
+-- >          withSocketsDo $ runHttpd config resourcees []
+-- >
+-- > helloWorld :: Resource
+-- > helloWorld = emptyResource {
+-- >                resGet
+-- >                  = Just $ do setContentType [mimeType| text/plain |]
+-- >                              putChunk "Hello, world!"
+-- >              }
+--
+-- FIXME: update the above example
+runHttpd ∷ Config → SchemeMap → IO ()
+runHttpd cnf sm
+    = do let launchers
+                 = catMaybes
+                   [ do addr ← cnfServerV4Addr cnf
+                        return ( launchListener =≪ listenOn AF_INET addr (cnfServerPort cnf)
+                               )
+                   , do addr ← cnfServerV6Addr cnf
+                        return ( launchListener =≪ listenOn AF_INET6 addr (cnfServerPort cnf)
+                               )
+#if defined(HAVE_SSL)
+                   , do scnf ← cnfSSLConfig    cnf
+                        addr ← cnfServerV4Addr cnf
+                        return ( do so ← listenOn AF_INET addr (sslServerPort scnf)
+                                    launchListener (sslContext scnf, so)
+                               )
+                   , do scnf ← cnfSSLConfig    cnf
+                        addr ← cnfServerV6Addr cnf
+                        return ( do so ← listenOn AF_INET6 addr (sslServerPort scnf)
+                                    launchListener (sslContext scnf, so)
+                               )
+#endif
+                   ]
+         sequence_ launchers
+         waitForever
     where
-      loop :: Socket -> IO ()
-      loop so
-          = do (h, host, port) <- accept so
-               forkIO $ service h host port
-               loop so
+      launchListener ∷ SocketLike s ⇒ s → IO ()
+      launchListener so
+          = do p ← SL.socketPort so
+               -- FIXME: Don't throw away the thread ID as we can't
+               -- kill it later then.
+               void ∘ forkIO $ httpLoop p so
 
+      listenOn ∷ Family → HostName → ServiceName → IO Socket
+      listenOn fam host srv
+          = do proto ← getProtocolNumber "tcp"
+               let hints = defaultHints {
+                             addrFlags      = [AI_PASSIVE]
+                           , addrFamily     = fam
+                           , addrSocketType = Stream
+                           , addrProtocol   = proto
+                           }
+               addrs ← getAddrInfo (Just hints) (Just host) (Just srv)
+               let addr = head addrs
+               bracketOnError
+                   (socket (addrFamily     addr)
+                           (addrSocketType addr)
+                           (addrProtocol   addr))
+                   sClose
+                   (\ sock →
+                        do setSocketOption sock ReuseAddr 1
+                           bindSocket sock (addrAddress addr)
+                           listen sock maxListenQueue
+                           return sock
+                   )
 
-service :: Handle -> HostName -> PortNumber -> IO ()
-service h host port
-    = do input <- B.hGetContents h
-         loop input
-    where
-      loop :: ByteString -> IO ()
-      loop input = case parse requestP input of
-                     Nothing
-                         -> fail "FIXME"
-                     Just (req, input')
-                         -> print req
+      httpLoop ∷ SocketLike s ⇒ PortNumber → s → IO ()
+      httpLoop port so
+          = do (h, addr)  ← SL.accept so
+               tQueue     ← mkInteractionQueue
+               readerTID  ← forkIO $ requestReader cnf sm h port addr tQueue
+               _writerTID ← forkIO $ responseWriter cnf h tQueue readerTID
+               httpLoop port so
+
+      waitForever ∷ IO ()
+      waitForever = forever $ threadDelay 1000000