>
where
- API: AsyncBounds,
+ A: Api,
{
(**self).retrieve(pkgs_aux).await
}
diff --git a/wtx/src/client_api_framework/network/transport/mock.rs b/wtx/src/client_api_framework/network/transport/mock.rs
index 23c861bb..2b0de441 100644
--- a/wtx/src/client_api_framework/network/transport/mock.rs
+++ b/wtx/src/client_api_framework/network/transport/mock.rs
@@ -8,6 +8,7 @@ use crate::{
misc::{manage_after_sending_related, manage_before_sending_related, FromBytes},
network::{transport::Transport, TransportGroup},
pkg::{Package, PkgsAux},
+ Api,
},
misc::AsyncBounds,
};
@@ -100,13 +101,14 @@ where
type Params = ();
#[inline]
- async fn send(
+ async fn send(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result<(), P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result<(), A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
manage_before_sending_related(pkg, pkgs_aux, &mut *self).await?;
self.requests.push(Cow::Owned(FromBytes::from_bytes(&pkgs_aux.byte_buffer)?));
@@ -116,13 +118,14 @@ where
}
#[inline]
- async fn send_and_retrieve(
+ async fn send_and_retrieve(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result, P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result, A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
>::send(self, pkg, pkgs_aux).await?;
let response = self.pop_response()?;
diff --git a/wtx/src/client_api_framework/network/transport/reqwest.rs b/wtx/src/client_api_framework/network/transport/reqwest.rs
index a47c5d9e..3a9e06f5 100644
--- a/wtx/src/client_api_framework/network/transport/reqwest.rs
+++ b/wtx/src/client_api_framework/network/transport/reqwest.rs
@@ -7,8 +7,9 @@ use crate::{
HttpParams, TransportGroup,
},
pkg::{Package, PkgsAux},
+ Api,
},
- misc::{AsyncBounds, _from_utf8_basic_rslt},
+ misc::{from_utf8_basic_rslt, AsyncBounds},
};
use core::ops::Range;
use reqwest::{
@@ -25,7 +26,7 @@ use reqwest::{
/// let _ = reqwest::Client::new()
/// .send_retrieve_and_decode_contained(
/// &mut (),
-/// &mut PkgsAux::from_minimum((), (), HttpParams::from_url("URL")?.into()),
+/// &mut PkgsAux::from_minimum((), (), HttpParams::from_uri("URI").into()),
/// )
/// .await?;
/// # Ok(()) }
@@ -38,26 +39,28 @@ where
type Params = HttpParams;
#[inline]
- async fn send(
+ async fn send(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result<(), P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result<(), A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
let _res = response(self, pkg, pkgs_aux).await?;
Ok(())
}
#[inline]
- async fn send_and_retrieve(
+ async fn send_and_retrieve(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result, P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result, A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
let res = response(self, pkg, pkgs_aux).await?;
let received_bytes = res.bytes().await.map_err(Into::into)?;
@@ -66,18 +69,19 @@ where
}
}
-async fn response(
+async fn response(
client: &mut Client,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
-) -> Result
+ pkgs_aux: &mut PkgsAux,
+) -> Result
where
+ A: Api,
DRSR: AsyncBounds,
- P: Package,
+ P: Package,
{
- fn manage_data(
+ fn manage_data(
mut rb: RequestBuilder,
- pkgs_aux: &mut PkgsAux,
+ pkgs_aux: &mut PkgsAux,
) -> RequestBuilder {
if let Some(data_format) = &pkgs_aux.tp.ext_req_params().mime_type {
rb = rb.header(CONTENT_TYPE, HeaderValue::from_static(data_format._as_str()));
@@ -88,13 +92,13 @@ where
pkgs_aux.byte_buffer.clear();
manage_before_sending_related(pkg, pkgs_aux, &mut *client).await?;
let mut rb = match pkgs_aux.tp.ext_req_params().method {
- HttpMethod::Delete => client.delete(pkgs_aux.tp.ext_req_params().url.url()),
- HttpMethod::Get => client.get(pkgs_aux.tp.ext_req_params().url.url()),
+ HttpMethod::Delete => client.delete(pkgs_aux.tp.ext_req_params().uri.uri()),
+ HttpMethod::Get => client.get(pkgs_aux.tp.ext_req_params().uri.uri()),
HttpMethod::Patch => {
- manage_data(client.patch(pkgs_aux.tp.ext_req_params().url.url()), pkgs_aux)
+ manage_data(client.patch(pkgs_aux.tp.ext_req_params().uri.uri()), pkgs_aux)
}
- HttpMethod::Post => manage_data(client.post(pkgs_aux.tp.ext_req_params().url.url()), pkgs_aux),
- HttpMethod::Put => manage_data(client.put(pkgs_aux.tp.ext_req_params().url.url()), pkgs_aux),
+ HttpMethod::Post => manage_data(client.post(pkgs_aux.tp.ext_req_params().uri.uri()), pkgs_aux),
+ HttpMethod::Put => manage_data(client.put(pkgs_aux.tp.ext_req_params().uri.uri()), pkgs_aux),
};
pkgs_aux.byte_buffer.clear();
for (key, value) in pkgs_aux.tp.ext_req_params().headers.iter() {
@@ -109,7 +113,7 @@ where
.tp
.ext_res_params_mut()
.headers
- .push_str(key.as_str(), _from_utf8_basic_rslt(value.as_bytes()).map_err(Into::into)?)?;
+ .push_str(key.as_str(), from_utf8_basic_rslt(value.as_bytes()).map_err(Into::into)?)?;
}
pkgs_aux.tp.ext_res_params_mut().status_code = <_>::try_from(Into::::into(res.status()))?;
manage_after_sending_related(pkg, pkgs_aux).await?;
diff --git a/wtx/src/client_api_framework/network/transport/std.rs b/wtx/src/client_api_framework/network/transport/std.rs
index 54c54521..4e727540 100644
--- a/wtx/src/client_api_framework/network/transport/std.rs
+++ b/wtx/src/client_api_framework/network/transport/std.rs
@@ -6,6 +6,7 @@ use crate::{
TcpParams, TransportGroup, UdpParams,
},
pkg::{Package, PkgsAux},
+ Api,
},
misc::AsyncBounds,
};
@@ -23,25 +24,27 @@ where
type Params = TcpParams;
#[inline]
- async fn send(
+ async fn send(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result<(), P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result<(), A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
send(pkg, pkgs_aux, self, |bytes, _, trans| Ok(trans.write(bytes)?)).await
}
#[inline]
- async fn send_and_retrieve(
+ async fn send_and_retrieve(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result, P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result, A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
send_and_retrieve(pkg, pkgs_aux, self, |bytes, _, trans| Ok(trans.read(bytes)?)).await
}
@@ -55,46 +58,49 @@ where
type Params = UdpParams;
#[inline]
- async fn send(
+ async fn send(
&mut self,
pkg: &mut P,
- pkgs_aux: &mut PkgsAux,
- ) -> Result<(), P::Error>
+ pkgs_aux: &mut PkgsAux,
+ ) -> Result<(), A::Error>
where
- P: AsyncBounds + Package,
+ A: Api,
+ P: AsyncBounds + Package,
{
send(pkg, pkgs_aux, self, |bytes, ext_req_params, trans| {
- Ok(trans.send_to(bytes, ext_req_params.url.url())?)
+ Ok(trans.send_to(bytes, ext_req_params.url.uri())?)
})
.await
}
#[inline]
- async fn send_and_retrieve(
+ async fn send_and_retrieve