Keep going

Author: tclem

crates/twirp-build/src/lib.rs

@@ -175,14 +175,11 @@ impl prost_build::ServiceGenerator for ServiceGenerator {
                 async fn #name(&self, req: #input_type) -> Result<#output_type, twirp::ClientError>;
             });
             client_trait_methods.push(quote! {
-                fn #name_request(&self, req: #input_type) -> Result<twirp::RequestBuilder<#input_type, #output_type>, twirp::ClientError>;
-            });
-
-            client_methods.push(quote! {
                 fn #name_request(&self, req: #input_type) -> Result<twirp::RequestBuilder<#input_type, #output_type>, twirp::ClientError> {
                     self.request(#request_path, req)
                 }
             });
+
             client_methods.push(quote! {
                 async fn #name(&self, req: #input_type) -> Result<#output_type, twirp::ClientError> {
                     self.#name_request(req)?.send().await
@@ -191,7 +188,7 @@ impl prost_build::ServiceGenerator for ServiceGenerator {
         }
         let client_trait = quote! {
             #[twirp::async_trait::async_trait]
-            pub trait #client_name: Send + Sync {
+            pub trait #client_name: twirp::TwirpRequest + Send + Sync {
                 #(#client_trait_methods)*
             }
 

crates/twirp/src/client.rs

@@ -146,8 +146,6 @@ impl Client {
         &self.inner.base_url
     }
 
-    // TODO: Move this to the `ClientBuilder`
-    //
     /// Creates a new `twirp::Client` with the same configuration as the current
     /// one, but with a different host in the base URL.
     pub fn with_host(&self, host: &str) -> Self {
@@ -195,9 +193,10 @@ impl Client {
             }),
         }
     }
+}
 
-    // Start building a request...
-    pub fn request<I, O>(&self, path: &str, body: I) -> Result<RequestBuilder<I, O>>
+impl TwirpRequest for Client {
+    fn request<I, O>(&self, path: &str, body: I) -> Result<RequestBuilder<I, O>>
     where
         I: prost::Message,
         O: prost::Message + Default,
@@ -216,6 +215,13 @@ impl Client {
     }
 }
 
+pub trait TwirpRequest {
+    fn request<I, O>(&self, path: &str, body: I) -> Result<RequestBuilder<I, O>>
+    where
+        I: prost::Message,
+        O: prost::Message + Default;
+}
+
 pub struct RequestBuilder<I, O>
 where
     O: prost::Message + Default,
@@ -239,6 +245,7 @@ where
         }
     }
 
+    /// Add a `Header` to this Request.
     pub fn header<K, V>(mut self, key: K, value: V) -> RequestBuilder<I, O>
     where
         HeaderName: TryFrom<K>,

crates/twirp/src/lib.rs

@@ -10,7 +10,9 @@ pub mod test;
 #[doc(hidden)]
 pub mod details;
 
-pub use client::{Client, ClientBuilder, ClientError, Middleware, Next, RequestBuilder, Result};
+pub use client::{
+    Client, ClientBuilder, ClientError, Middleware, Next, RequestBuilder, Result, TwirpRequest,
+};
 pub use context::Context;
 pub use error::*; // many constructors like `invalid_argument()`
 pub use http::Extensions;

crates/twirp/src/test.rs

@@ -13,7 +13,7 @@ use tokio::time::Instant;
 
 use crate::details::TwirpRouterBuilder;
 use crate::server::Timings;
-use crate::{error, Client, Context, Result, TwirpErrorResponse};
+use crate::{error, Client, Context, Result, TwirpErrorResponse, TwirpRequest};
 
 pub async fn run_test_server(port: u16) -> JoinHandle<Result<(), std::io::Error>> {
     let router = test_api_router();

example/src/bin/client.rs

@@ -2,7 +2,7 @@ use twirp::async_trait::async_trait;
 use twirp::client::{Client, ClientBuilder, Middleware, Next};
 use twirp::reqwest::{Request, Response};
 use twirp::url::Url;
-use twirp::GenericError;
+use twirp::{GenericError, RequestBuilder, TwirpRequest};
 
 pub mod service {
     pub mod haberdash {
@@ -85,6 +85,20 @@ impl Middleware for PrintResponseHeaders {
 #[derive(Debug)]
 struct MockHaberdasherApiClient;
 
+impl TwirpRequest for MockHaberdasherApiClient {
+    fn request<I, O>(
+        &self,
+        _path: &str,
+        _body: I,
+    ) -> Result<RequestBuilder<I, O>, twirp::ClientError>
+    where
+        I: prost::Message,
+        O: prost::Message + Default,
+    {
+        todo!()
+    }
+}
+
 #[async_trait]
 impl HaberdasherApiClient for MockHaberdasherApiClient {
     fn make_hat_request(