A peer-to-peer stack for code collaboration
Bidirectional Daemon API types serialization
Thomas Scholtesfe2bf3a9680f
diff --git a/src/Radicle/Daemon/HttpApi.hs b/src/Radicle/Daemon/HttpApi.hsindex 71368cf..e2f140c 100644--- a/src/Radicle/Daemon/HttpApi.hs+++ b/src/Radicle/Daemon/HttpApi.hs@@ -15,14 +15,14 @@ module Radicle.Daemon.HttpApi, daemonApi, swagger++ , MachineId(..)) where-import qualified Preludeimport Protolude-import Data.Aeson ((.:))+import Data.Aeson ((.:), (.=))import qualified Data.Aeson as A-import qualified Data.Aeson.Types as Aimport Data.Swaggerimport Data.Version (showVersion)import Radicle.Daemon.Ipfs@@ -33,46 +33,67 @@ import qualified Paths_radicle as Radicleimport Radicleinstance FromHttpApiData MachineId where- parseUrlPiece = Right . MachineId . toS- parseQueryParam = parseUrlPiece+ parseUrlPiece = Right . MachineId . toS+ parseQueryParam = parseUrlPiece-singleKey :: Prelude.String -> (a -> b) -> (A.Object -> A.Parser a) -> A.Value -> A.Parser b-singleKey tyName c k = A.withObject tyName $ k >=> pure . c+instance ToHttpApiData MachineId where+ toUrlPiece (MachineId id) = idnewtype QueryRequest = QueryRequest { expression :: Value }deriving (Generic)instance A.ToJSON QueryRequest where- toJSON = valueToJson . expression+ toJSON QueryRequest{..} = A.object+ [ "expression" .= valueToJson expression+ ]instance A.FromJSON QueryRequest where- parseJSON = singleKey "QueryRequest" QueryRequest $ (.: "expression") >=> jsonToValue+ parseJSON = A.withObject "QueryRequest" $ \o -> do+ expression <- o .: "expression" >>= jsonToValue+ pure $ QueryRequest {..}newtype QueryResponse = QueryResponse { result :: Value }deriving (Generic)instance A.ToJSON QueryResponse where- toJSON = valueToJson . result+ toJSON QueryResponse{..} = A.object+ [ "result" .= valueToJson result+ ]instance A.FromJSON QueryResponse where- parseJSON = singleKey "QueryResponse" QueryResponse $ (.: "result") >=> jsonToValue+ parseJSON = A.withObject "QueryResponse" $ \o -> do+ result <- o .: "result" >>= jsonToValue+ pure $ QueryResponse {..}newtype SendRequest = SendRequest { expressions :: [Value] }deriving (Generic)instance A.FromJSON SendRequest where- parseJSON = singleKey "SendRequest" SendRequest $ (.: "expressions") >=> traverse jsonToValue+ parseJSON = A.withObject "SendRequest" $ \o -> do+ expressions <- o .: "expressions" >>= traverse jsonToValue+ pure $ SendRequest {..}+instance A.ToJSON SendRequest where+ toJSON SendRequest{..} = A.object+ [ "expressions" .= map valueToJson expressions+ ]newtype SendResponse = SendResponse{ results :: [Value]} deriving (Generic)+instance A.FromJSON SendResponse where+ parseJSON = A.withObject "SendResponse" $ \o -> do+ results <- o .: "results" >>= traverse jsonToValue+ pure $ SendResponse {..}instance A.ToJSON SendResponse where- toJSON = A.toJSON . fmap valueToJson . (results :: SendResponse -> [Value])+ toJSON SendResponse{..} = A.object+ [ "results" .= map valueToJson results+ ]newtype NewResponse = NewResponse{ machineId :: MachineId} deriving (Generic)instance A.ToJSON NewResponse+instance A.FromJSON NewResponse-- * APIs