A peer-to-peer stack for code collaboration
Replace 'wreq' with 'http-client'
Thomas Scholtesadd116a85b60
diff --git a/exe/Daemon.hs b/exe/Daemon.hsindex a4f0a31..617188f 100644--- a/exe/Daemon.hs+++ b/exe/Daemon.hs@@ -82,6 +82,7 @@ main = doCli.Opts{..} <- Cli.parsemachineConfigFileLock <- newMVar ()machines <- CachedMachines <$> CMap.empty+ envIpfsClient <- Ipfs.newClientlet env = Env{ logLevel = if debug then LogDebug else LogInfo, ..}machineConfig <- readMachineConfigIO machineConfigFileLock machineConfigFileinitRes <- runDaemon env $ dodiff --git a/package.yaml b/package.yamlindex 01a2ae9..8aab39a 100644--- a/package.yaml+++ b/package.yaml@@ -48,9 +48,9 @@ library:- haskeline- http-client- http-conduit+ - http-types- ipld-cid- megaparsec- - microlens- mtl- multibase- optparse-applicative@@ -73,7 +73,6 @@ library:- unliftio- unordered-containers- uuid- - wreqtests:spec:diff --git a/src/Radicle/Daemon/Monad.hs b/src/Radicle/Daemon/Monad.hsindex ba59ca7..1afdd28 100644--- a/src/Radicle/Daemon/Monad.hs+++ b/src/Radicle/Daemon/Monad.hs@@ -42,7 +42,8 @@ instance MonadLog Daemon whereinstance MonadMachineStore Daemon whereaskMachines = asks machines-instance Ipfs.MonadIpfs Daemon+instance Ipfs.MonadIpfs Daemon where+ askClient = asks envIpfsClientinstance MonadMachineIpfs Daemon@@ -55,4 +56,5 @@ data Env = Env, machineConfigFile :: FilePath, machines :: CachedMachines, logLevel :: LogLevel+ , envIpfsClient :: Ipfs.Client}diff --git a/src/Radicle/Ipfs.hs b/src/Radicle/Ipfs.hsindex 2245c5b..358ce59 100644--- a/src/Radicle/Ipfs.hs+++ b/src/Radicle/Ipfs.hs@@ -1,6 +1,9 @@-- | Functions to talk to the IPFS APImodule Radicle.Ipfs- ( MonadIpfs+ ( MonadIpfs(..)+ , Client+ , newClient+, IpfsException(..), ipldLink, parseIpldLink@@ -46,16 +49,28 @@ import qualified Data.HashMap.Strict as HashMapimport Data.IPLD.CIDimport qualified Data.Text as Timport qualified Data.Text.Encoding as T-import Lens.Micro ((.~), (^.))import Network.HTTP.Client(HttpException(..), HttpExceptionContent(..))-import qualified Network.HTTP.Client as HTTP-import qualified Network.HTTP.Client as Http-import qualified Network.HTTP.Conduit as HTTP-import qualified Network.Wreq as Wreq+import qualified Network.HTTP.Client as HttpClient+import qualified Network.HTTP.Client.MultipartFormData as HttpClient+import qualified Network.HTTP.Conduit as HttpConduit+import qualified Network.HTTP.Types.Method as Httpimport System.Environment (lookupEnv)-class (MonadIO m, MonadCatch m) => MonadIpfs m+class (MonadIO m, MonadCatch m) => MonadIpfs m where+ askClient :: m Client++data Client = Client+ { clientBaseRequest :: HttpClient.Request+ , clientHttpManager :: HttpClient.Manager+ }++newClient :: MonadIO m => m Client+newClient = liftIO $ do+ baseUrl <- fromMaybe "http://localhost:9301" <$> lookupEnv "RAD_IPFS_API_URL"+ clientBaseRequest <- HttpClient.parseUrlThrow baseUrl+ clientHttpManager <- HttpClient.newManager HttpClient.defaultManagerSettings+ pure Client{clientBaseRequest, clientHttpManager}data IpfsException= IpfsException Text@@ -97,16 +112,16 @@ mapHttpException path io = catch io (throw . mapHttpExceptionData)wheremapHttpExceptionData :: HttpException -> IpfsExceptionmapHttpExceptionData = \case- Http.HttpExceptionRequest _ content -> mapHttpExceptionContent content+ HttpClient.HttpExceptionRequest _ content -> mapHttpExceptionContent content_ -> IpfsExceptionErrRespNoMsgmapHttpExceptionContent :: HttpExceptionContent -> IpfsExceptionmapHttpExceptionContent = \case- (Http.StatusCodeException _+ (HttpClient.StatusCodeException _(Aeson.decodeStrict ->Just (Aeson.Object (HashMap.lookup "Message" ->Just (Aeson.String msg))))) -> (IpfsExceptionErrResp msg)- Http.ResponseTimeout -> IpfsExceptionTimeout path+ HttpClient.ResponseTimeout -> IpfsExceptionTimeout pathConnectionFailure _ -> IpfsExceptionNoDaemon_ -> IpfsExceptionErrRespNoMsg@@ -189,18 +204,18 @@ instance FromJSON PubsubMessage where-- The IO action blocks while we are subscribed. To stop subscription-- you need to kill the thread the subscription is running in.subscribe :: (MonadIpfs m) => Text -> (PubsubMessage -> IO ()) -> m ()-subscribe topic messageHandler = liftIO $ runResourceT $ do- mgr <- liftIO $ HTTP.newManager HTTP.defaultManagerSettings- url <- liftIO $ ipfsApiUrl "pubsub/sub"- req <- HTTP.parseRequest (toS url) <&>- HTTP.setQueryString- [ ("arg", Just $ T.encodeUtf8 topic)- , ("encoding", Just "json")- , ("stream-channels", Just "true")- ]- body <- HTTP.responseBody <$> HTTP.http req mgr- C.runConduit $ body .| fromJSONC .| C.mapM_ (liftIO . messageHandler) .| C.sinkNull- pure ()+subscribe topic messageHandler = do+ Client{clientHttpManager, clientBaseRequest} <- askClient+ liftIO $ runResourceT $ do+ let req = clientBaseRequest+ & HttpClient.setQueryString+ [ ("arg", Just $ T.encodeUtf8 topic)+ , ("encoding", Just "json")+ , ("stream-channels", Just "true")+ ]+ body <- HttpConduit.responseBody <$> HttpConduit.http req clientHttpManager+ C.runConduit $ body .| fromJSONC .| C.mapM_ (liftIO . messageHandler) .| C.sinkNull+ pure ()wherefromJSONC :: (MonadThrow m, Aeson.FromJSON a) => C.ConduitT ByteString a m ()fromJSONC = jsonC .| C.mapM parseThrow@@ -296,11 +311,12 @@ ipfsHttpGet=> Text -- ^ Path of the endpoint under "/api/v0/"-> [(Text, Text)] -- ^ URL query parameters-> m a-ipfsHttpGet path params = liftIO $ mapHttpException path $ do- let opts = Wreq.defaults & Wreq.params .~ params- url <- ipfsApiUrl path- res <- Wreq.getWith opts (toS url)- getJsonResponseBody path res+ipfsHttpGet path params = do+ Client{clientHttpManager, clientBaseRequest} <- askClient+ liftIO $ mapHttpException path $ do+ let request = makeIpfsRequest clientBaseRequest Http.methodGet path params+ response <- HttpClient.httpLbs request clientHttpManager+ parseJsonResponse path $ HttpClient.responseBody responseipfsHttpPost:: (MonadIpfs m, FromJSON a)@@ -309,9 +325,9 @@ ipfsHttpPost-> Text -- ^ Name of the argument for payload-> LByteString -- ^ Payload argument-> m a-ipfsHttpPost path params payloadArgName payload = mapHttpException path $ do+ipfsHttpPost path params payloadArgName payload = dores <- ipfsHttpPost' path params payloadArgName payload- liftIO $ getJsonResponseBody path res+ parseJsonResponse path resipfsHttpPost':: (MonadIpfs m)@@ -319,22 +335,38 @@ ipfsHttpPost'-> [(Text, Text)] -- ^ URL query parameters-> Text -- ^ Name of the argument for payload-> LByteString -- ^ Payload argument- -> m (Wreq.Response LByteString)-ipfsHttpPost' path params payloadArgName payload = liftIO $ mapHttpException path $ do- let opts = Wreq.defaults & Wreq.params .~ params- url <- ipfsApiUrl path- Wreq.postWith opts (toS url) (Wreq.partLBS payloadArgName payload)--ipfsApiUrl :: Text -> IO Text-ipfsApiUrl path = do- baseUrl <- fromMaybe "http://localhost:9301" <$> lookupEnv "RAD_IPFS_API_URL"- pure $ toS baseUrl <> "/api/v0/" <> path+ -> m LByteString+ipfsHttpPost' path params payloadArgName payload = do+ Client{clientHttpManager, clientBaseRequest} <- askClient+ liftIO $ mapHttpException path $ do+ let request = makeIpfsRequest clientBaseRequest Http.methodPost path params+ let part = HttpClient.partLBS payloadArgName payload+ requestWithPayload <- HttpClient.formDataBody [part] request+ response <- HttpClient.httpLbs requestWithPayload clientHttpManager+ pure $ HttpClient.responseBody response+++makeIpfsRequest+ :: HttpClient.Request -- ^ Base request that contains the base URL+ -> Http.Method+ -> Text -- ^ Path of the endpoint under "/api/v0/"+ -> [(Text, Text)] -- ^ URL query parameters+ -> HttpClient.Request+makeIpfsRequest baseRequest method path params =+ HttpClient.setQueryString params'+ baseRequest+ { HttpClient.path = toS $ "/api/v0/" <> path+ , HttpClient.method = method+ }+ where+ params' = [ (encodeUtf8 key, Just (encodeUtf8 value)) | (key, value) <- params]+-- | Parses response body as JSON and returns the parsed value. @path@-- is the IPFS API the response was obtained from. Throws-- 'IpfsExceptionInvalidResponse' if parsing fails.-getJsonResponseBody :: FromJSON a => Text -> Wreq.Response LByteString -> IO a-getJsonResponseBody path res = do- jsonRes <- Wreq.asJSON res `catch`- \(Wreq.JSONError msg) -> throw $ IpfsExceptionInvalidResponse path (toS msg)- pure $ jsonRes ^. Wreq.responseBody+parseJsonResponse :: (MonadThrow m, FromJSON a) => Text -> LByteString -> m a+parseJsonResponse path body = do+ case Aeson.eitherDecode' body of+ Left err -> throw $ IpfsExceptionInvalidResponse path (toS err)+ Right a -> pure a