diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2024-06-19 15:09:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-19 16:09:17 +0200 |
commit | b94707af7df757db13f24b7b70dbd7956d1e1e1c (patch) | |
tree | 5e2ce944f66f4fda8b0982b68e7e422c2960753a /ext/kv/remote.rs | |
parent | f4eead61ebd0af203784134c0a8b6339874531b5 (diff) |
Revert "chore: upgrade to reqwest 0.12.4 and rustls 0.22 (#24056)" (#24262)
This reverts commit fb31eaa9ca59f6daaee0210d5cd206185c7041b9.
Reverting because users reported spurious errors when downloading
dependencies - https://github.com/denoland/deno/issues/24260.
Closes https://github.com/denoland/deno/issues/24260
Diffstat (limited to 'ext/kv/remote.rs')
-rw-r--r-- | ext/kv/remote.rs | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/ext/kv/remote.rs b/ext/kv/remote.rs index 7541b5a06..a1273e78b 100644 --- a/ext/kv/remote.rs +++ b/ext/kv/remote.rs @@ -8,14 +8,10 @@ use std::sync::Arc; use crate::DatabaseHandler; use anyhow::Context; use async_trait::async_trait; -use bytes::Bytes; use deno_core::error::type_error; use deno_core::error::AnyError; -use deno_core::futures::Stream; -use deno_core::futures::TryStreamExt as _; use deno_core::OpState; use deno_fetch::create_http_client; -use deno_fetch::reqwest; use deno_fetch::CreateHttpClientOptions; use deno_tls::rustls::RootCertStore; use deno_tls::Proxy; @@ -23,8 +19,6 @@ use deno_tls::RootCertStoreProvider; use deno_tls::TlsKeys; use denokv_remote::MetadataEndpoint; use denokv_remote::Remote; -use denokv_remote::RemoteResponse; -use denokv_remote::RemoteTransport; use url::Url; #[derive(Clone)] @@ -108,44 +102,11 @@ impl<P: RemoteDbHandlerPermissions + 'static> denokv_remote::RemotePermissions } } -#[derive(Clone)] -pub struct ReqwestClient(reqwest::Client); -pub struct ReqwestResponse(reqwest::Response); - -impl RemoteTransport for ReqwestClient { - type Response = ReqwestResponse; - async fn post( - &self, - url: Url, - headers: http::HeaderMap, - body: Bytes, - ) -> Result<(Url, http::StatusCode, Self::Response), anyhow::Error> { - let res = self.0.post(url).headers(headers).body(body).send().await?; - let url = res.url().clone(); - let status = res.status(); - Ok((url, status, ReqwestResponse(res))) - } -} - -impl RemoteResponse for ReqwestResponse { - async fn bytes(self) -> Result<Bytes, anyhow::Error> { - Ok(self.0.bytes().await?) - } - fn stream( - self, - ) -> impl Stream<Item = Result<Bytes, anyhow::Error>> + Send + Sync { - self.0.bytes_stream().map_err(|e| e.into()) - } - async fn text(self) -> Result<String, anyhow::Error> { - Ok(self.0.text().await?) - } -} - #[async_trait(?Send)] impl<P: RemoteDbHandlerPermissions + 'static> DatabaseHandler for RemoteDbHandler<P> { - type DB = Remote<PermissionChecker<P>, ReqwestClient>; + type DB = Remote<PermissionChecker<P>>; async fn open( &self, @@ -201,14 +162,13 @@ impl<P: RemoteDbHandlerPermissions + 'static> DatabaseHandler http2: true, }, )?; - let reqwest_client = ReqwestClient(client); let permissions = PermissionChecker { state: state.clone(), _permissions: PhantomData, }; - let remote = Remote::new(reqwest_client, permissions, metadata_endpoint); + let remote = Remote::new(client, permissions, metadata_endpoint); Ok(remote) } |