WIP

lib/LiBro/WebService.hs

@@ -0,0 +1,29 @@
+module LiBro.WebService where
+
+import Data.Aeson
+import Data.Proxy
+import Servant
+import GHC.Generics
+
+newtype PersonIDs = PersonIDs {personIDs :: [Int]} deriving Generic
+instance ToJSON PersonIDs
+
+type LiBroAPI = "hello" :> Get '[JSON]      PersonIDs
+          :<|>  "yay"   :> Get '[PlainText] String
+
+libroServer :: Server LiBroAPI
+libroServer =     handleHello
+            :<|>  handleYay
+  where
+        handleHello :: Handler PersonIDs
+        handleHello = return $ PersonIDs [17, 42]
+
+        handleYay :: Handler String
+        handleYay = return "Yay!"
+
+libroApi :: Proxy LiBroAPI
+libroApi = Proxy
+
+libro :: Application
+libro = serve libroApi libroServer
+

lib/LiBro/WebService/State.hs

@@ -0,0 +1,25 @@
+module LiBro.WebService.State where
+
+import LiBro.Config
+import LiBro.Data
+import LiBro.Control
+import Control.Concurrent
+
+data LiBroState = LiBroState
+  { config      :: Config
+  , mvBlocking  :: MVar Blocking
+  , mvData      :: MVar LiBroData
+  }
+
+lsConfig :: LiBroState -> IO Config
+lsConfig = return . config
+
+lsData :: LiBroState -> IO LiBroData
+lsData = readMVar . mvData
+
+lsInit :: Config -> IO LiBroState
+lsInit config = do
+  mvb <- newEmptyMVar
+  mvd <- newEmptyMVar
+  initData config mvb mvd
+  return $ LiBroState config mvb mvd

libro-backend.cabal

@@ -41,8 +41,8 @@ library
                     , LiBro.Data.Storage
                     , LiBro.Data.SafeText
                     , LiBro.Control
-                    , LiBro.WebService.API
-                    , LiBro.WebService.Server
+                    , LiBro.WebService
+                    , LiBro.WebService.State
                     , LiBro.Util
   build-depends:      aeson
                     , attoparsec
@@ -108,3 +108,4 @@ test-suite libro-backend-test
                     , text
                     , transformers
                     , vector
+                    , wai

server/Main.hs

@@ -1,7 +1,7 @@
 module Main where
 
 import LiBro.Config as Conf
-import LiBro.WebService.Server
+import LiBro.WebService
 import Network.Wai.Handler.Warp
 
 configuredMain :: Config -> IO ()