Patch/box svc improvement (#835)

Author: GlenDC

benches/e2e_http_client_server.rs

@@ -13,7 +13,7 @@ use std::{
 use rama::{
     Layer, Service,
     bytes::Bytes,
-    error::BoxError,
+    error::{BoxError, extra::OpaqueError},
     extensions::ExtensionsMut,
     http::{
         HeaderName, HeaderValue, Request, Response, Version,
@@ -269,7 +269,7 @@ fn spawn_http_server(params: TestParameters, body_content: Bytes) -> SocketAddre
 fn get_inner_client(
     http: HttpVersion,
     tls: Tls,
-) -> impl Service<Request, Output = Response, Error = BoxError> {
+) -> impl Service<Request, Output = Response, Error = OpaqueError> {
     let b = EasyHttpWebClient::connector_builder()
         .with_default_transport_connector()
         .without_tls_proxy_support()

examples/grpc/src/shared/tests/compression/util.rs

@@ -12,7 +12,7 @@ use pin_project_lite::pin_project;
 use rama::{
     Service,
     bytes::{Buf, Bytes},
-    error::BoxError,
+    error::{BoxError, extra::OpaqueError},
     http::{
         self, Body, StreamingBody,
         body::{Frame, SizeHint, util::BodyExt as _},
@@ -139,7 +139,7 @@ pub(super) fn measure_request_body_size_layer(
     })
 }
 
-pub(super) type WebClient = BoxService<http::Request, http::Response, BoxError>;
+pub(super) type WebClient = BoxService<http::Request, http::Response, OpaqueError>;
 
 pub(super) fn mock_io_client<F, Server>(make_server: F) -> WebClient
 where

examples/grpc/src/shared/tests/examples/mod.rs

@@ -1,6 +1,6 @@
 use rama::{
     Service,
-    error::BoxError,
+    error::{BoxError, extra::OpaqueError},
     http::{self, Body, client::EasyHttpWebClient},
     net::test_utils::client::{MockConnectorService, MockSocket},
     rt::Executor,
@@ -10,7 +10,7 @@ use rama::{
 mod health;
 mod helloworld;
 
-pub(super) type WebClient = BoxService<http::Request, http::Response, BoxError>;
+pub(super) type WebClient = BoxService<http::Request, http::Response, OpaqueError>;
 
 // TODO: might make sense in future to turn this into a general utility,
 // for testing or generic one-time stuff. Be it perhaps with an actual error

examples/grpc/src/shared/tests/integration/mod.rs

@@ -1,6 +1,6 @@
 use rama::{
     Service,
-    error::BoxError,
+    error::{BoxError, extra::OpaqueError},
     http::{self, Body, client::EasyHttpWebClient},
     net::test_utils::client::{MockConnectorService, MockSocket},
     rt::Executor,
@@ -18,7 +18,7 @@ mod http2_max_header_list_size;
 mod max_message_size;
 mod timeout;
 
-pub(super) type WebClient = BoxService<http::Request, http::Response, BoxError>;
+pub(super) type WebClient = BoxService<http::Request, http::Response, OpaqueError>;
 
 pub(super) fn mock_io_client<F, Server>(make_server: F) -> WebClient
 where

examples/tls_sni_proxy_mitm.rs

@@ -87,7 +87,7 @@
 
 use rama::{
     Layer, Service,
-    error::{BoxError, ErrorContext},
+    error::{BoxError, ErrorContext, extra::OpaqueError},
     extensions::{ExtensionsMut, ExtensionsRef},
     graceful::Shutdown,
     http::{
@@ -317,7 +317,7 @@ struct HttpsMITMService<C> {
 
 impl<C> Service<Request> for HttpsMITMService<C>
 where
-    C: Service<Request, Output = Response, Error = BoxError>,
+    C: Service<Request, Output = Response, Error = OpaqueError>,
 {
     type Output = Response;
     type Error = BoxError;

rama-cli/src/cmd/resolve.rs

@@ -28,7 +28,7 @@ pub async fn run(cfg: ResolveCommand) -> Result<(), BoxError> {
 
     let resolver = GlobalDnsResolver::default();
     let rt = cfg.record_type.unwrap_or_default();
-    println!("Resolving {rt:?} for domain: {}...", cfg.domain);
+    println!("Resolving {rt:?} for domain: {}", cfg.domain);
 
     match rt {
         RecordType::A => {

rama-cli/src/cmd/send/http/client/mod.rs

@@ -1,6 +1,6 @@
 use rama::{
     Layer, Service,
-    error::{BoxError, ErrorContext},
+    error::{BoxError, ErrorContext, ErrorExt, extra::OpaqueError},
     http::{
         Request, Response, StreamingBody,
         client::{
@@ -15,7 +15,7 @@ use rama::{
             required_header::AddRequiredRequestHeadersLayer,
         },
     },
-    layer::{HijackLayer, MapResultLayer, TimeoutLayer, layer_fn},
+    layer::{HijackLayer, MapErrLayer, MapResultLayer, TimeoutLayer, layer_fn},
     net::{
         tls::client::ServerVerifyMode,
         user::{Basic, ProxyCredential},
@@ -53,7 +53,7 @@ mod writer;
 
 pub(super) async fn new(
     cfg: &SendCommand,
-) -> Result<impl Service<Request, Output = Response, Error = BoxError>, BoxError> {
+) -> Result<impl Service<Request, Output = Response, Error = OpaqueError>, BoxError> {
     let writer = writer::try_new(cfg).await?;
 
     let inner_client = new_inner_client(cfg)?;
@@ -114,6 +114,7 @@ pub(super) async fn new(
         },
         SetProxyAuthHttpHeaderLayer::default(),
         HijackLayer::new(cfg.curl, curl_writer::CurlWriter { writer }),
+        MapErrLayer::into_box_error(),
         layer_fn(move |svc| logger_headers_res::ResponseHeaderLogger {
             inner: svc,
             show_headers,
@@ -125,7 +126,7 @@ pub(super) async fn new(
 
 fn new_inner_client(
     cfg: &SendCommand,
-) -> Result<impl Service<Request, Output = Response, Error = BoxError> + Clone, BoxError> {
+) -> Result<impl Service<Request, Output = Response, Error = OpaqueError> + Clone, BoxError> {
     let mut tls_config = if cfg.emulate {
         TlsConnectorDataBuilder::new()
     } else {
@@ -209,13 +210,13 @@ pub(super) struct VerboseLogs;
 
 fn map_internal_client_error<E, Body>(
     result: Result<Response<Body>, E>,
-) -> Result<Response, BoxError>
+) -> Result<Response, OpaqueError>
 where
     E: Into<BoxError>,
     Body: StreamingBody<Data = rama::bytes::Bytes, Error: Into<BoxError>> + Send + Sync + 'static,
 {
     match result {
         Ok(response) => Ok(response.map(rama::http::Body::new)),
-        Err(err) => Err(err.into()),
+        Err(err) => Err(err.into_opaque_error()),
     }
 }

rama-cli/src/cmd/send/http/ws/client.rs

@@ -1,6 +1,6 @@
 use rama::{
     Service,
-    error::{BoxError, ErrorContext},
+    error::{BoxError, ErrorContext, extra::OpaqueError},
     extensions::Extensions,
     http::{
         Request, Response,
@@ -16,7 +16,7 @@ pub(super) async fn connect<C>(
     protocols: Option<NonEmptySmallVec<3, NonEmptyStr>>,
 ) -> Result<ClientWebSocket, BoxError>
 where
-    C: Service<Request, Output = Response, Error = BoxError>,
+    C: Service<Request, Output = Response, Error = OpaqueError>,
 {
     client
         .websocket_with_request(req)

rama-cli/src/cmd/send/http/ws/mod.rs

@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use rama::{
     Service,
-    error::{BoxError, ErrorContext},
+    error::{BoxError, ErrorContext, extra::OpaqueError},
     graceful::{self, Shutdown},
     http::{Request, Response},
     utils::{collections::NonEmptySmallVec, str::NonEmptyStr},
@@ -20,7 +20,7 @@ pub(super) async fn run<C>(
     protocols: Option<NonEmptySmallVec<3, NonEmptyStr>>,
 ) -> Result<(), BoxError>
 where
-    C: Service<Request, Output = Response, Error = BoxError>,
+    C: Service<Request, Output = Response, Error = OpaqueError>,
 {
     let app = tui::App::new(req, client, protocols)
         .await

rama-cli/src/cmd/send/http/ws/tui.rs

@@ -1,6 +1,6 @@
 use rama::{
     Service,
-    error::{BoxError, ErrorContext, ErrorExt},
+    error::{BoxError, ErrorContext, ErrorExt, extra::OpaqueError},
     futures::{FutureExt, StreamExt},
     graceful::ShutdownGuard,
     http::{
@@ -103,7 +103,7 @@ impl App {
         protocols: Option<NonEmptySmallVec<3, NonEmptyStr>>,
     ) -> Result<Self, BoxError>
     where
-        C: Service<Request, Output = Response, Error = BoxError>,
+        C: Service<Request, Output = Response, Error = OpaqueError>,
     {
         let title = format!("  rama-ws @ {}", req.uri());