Updates for grpc

Author: stepancheg

httpbis/src/client/mod.rs

@@ -12,6 +12,7 @@ use futures::future::TryFutureExt;
 use futures::stream::StreamExt;
 use tls_api::TlsConnector;
 use tls_api::TlsConnectorBuilder;
+use tls_api::TlsConnectorType;
 use tokio::runtime::Handle;
 use tokio::runtime::Runtime;
 
@@ -108,21 +109,31 @@ impl ClientBuilder {
 
     /// Configure using given TLS connector with default options
     /// (e.g. no custom server certificates).
-    pub fn set_tls<C: tls_api::TlsConnector>(&mut self, host: &str) -> crate::Result<()> {
-        let mut tls_connector = C::builder()?;
+    pub fn set_tls_dyn(
+        &mut self,
+        host: &str,
+        connector: &'static dyn TlsConnectorType,
+    ) -> crate::Result<()> {
+        let mut tls_connector = connector.builder()?;
 
-        if C::SUPPORTS_ALPN {
+        if connector.supports_alpn() {
             // TODO: check negotiated protocol after connect
             tls_connector.set_alpn_protocols(&[b"h2"])?;
         }
 
         let tls_connector = tls_connector.build()?;
 
-        let tls_connector = Arc::new(tls_connector.into_dyn());
+        let tls_connector = Arc::new(tls_connector);
         self.tls = ClientTlsOption::Tls(host.to_owned(), tls_connector);
         Ok(())
     }
 
+    /// Configure using given TLS connector with default options
+    /// (e.g. no custom server certificates).
+    pub fn set_tls<C: tls_api::TlsConnector>(&mut self, host: &str) -> crate::Result<()> {
+        self.set_tls_dyn(host, C::TYPE_DYN)
+    }
+
     /// Finish the client construction.
     pub fn build(self) -> crate::Result<Client> {
         let client_died_error_holder = SomethingDiedErrorHolder::new();

httpbis/src/client/tls.rs

@@ -23,7 +23,7 @@ impl Clone for ClientTlsOption {
 
 impl ClientTlsOption {
     /// HTTP scheme for the connector.
-    pub(crate) fn http_scheme(&self) -> HttpScheme {
+    pub fn http_scheme(&self) -> HttpScheme {
         match self {
             &ClientTlsOption::Plain => HttpScheme::Http,
             &ClientTlsOption::Tls(..) => HttpScheme::Https,

httpbis/src/lib.rs

@@ -11,6 +11,7 @@
 #[macro_use]
 extern crate log;
 
+pub use bytes_ext::buf_get_bytes::BufGetBytes;
 pub use client::conf::ClientConf;
 pub use client::handler::ClientHandler;
 pub use client::intf::ClientIntf;
@@ -46,6 +47,8 @@ pub use solicit::header::Header;
 pub use solicit::header::Headers;
 pub use solicit::stream_id::StreamId;
 pub use solicit::HttpScheme;
+pub use solicit_async::TryFutureBox;
+pub use solicit_async::TryStreamBox;
 
 mod ascii;
 mod assert_types;

httpbis/src/server/conn.rs

@@ -137,6 +137,7 @@ where
         let mut stream_handler = None;
         let invoke_result = {
             let req = ServerRequest {
+                loop_handle: &self.loop_handle,
                 headers,
                 end_stream,
                 stream_id,

httpbis/src/server/mod.rs

@@ -16,6 +16,7 @@ use rand::thread_rng;
 use rand::Rng;
 use tls_api;
 use tls_api::TlsAcceptor;
+use tls_api::TlsAcceptorBox;
 use tokio::runtime::Handle;
 use tokio::runtime::Runtime;
 
@@ -130,7 +131,12 @@ impl ServerBuilder {
 
     /// Set TLS acceptor for the server. If not called, server will be non-TLS.
     pub fn set_tls<A: TlsAcceptor>(&mut self, acceptor: A) {
-        self.tls = ServerTlsOption::Tls(Arc::new(acceptor.into_dyn()));
+        self.set_tls_dyn(acceptor.into_dyn())
+    }
+
+    /// Set TLS acceptor for the server. If not called, server will be non-TLS.
+    pub fn set_tls_dyn(&mut self, acceptor: TlsAcceptorBox) {
+        self.tls = ServerTlsOption::Tls(Arc::new(acceptor));
     }
 
     /// Construct a server.

httpbis/src/server/req.rs

@@ -15,9 +15,11 @@ use crate::EndStream;
 use crate::Headers;
 use crate::StreamAfterHeaders;
 use crate::StreamId;
+use tokio::runtime::Handle;
 
 /// A request object provided to the server callback.
 pub struct ServerRequest<'a> {
+    pub(crate) loop_handle: &'a Handle,
     /// Request headers.
     pub headers: Headers,
     /// True if requests ends with headers (no body).
@@ -31,6 +33,11 @@ pub struct ServerRequest<'a> {
 }
 
 impl<'a> ServerRequest<'a> {
+    /// Get a loop handle.
+    pub fn loop_handle(&self) -> Handle {
+        self.loop_handle.clone()
+    }
+
     /// Convert a request into a pullable stream.
     pub fn into_stream(self) -> impl StreamAfterHeaders {
         match self.end_stream {

httpbis/src/solicit_async.rs

@@ -24,7 +24,9 @@ use crate::solicit::frame::FRAME_HEADER_LEN;
 
 use crate::misc::BsDebug;
 
+/// Type alias.
 pub type TryFutureBox<T> = Pin<Box<dyn Future<Output = crate::Result<T>> + Send + 'static>>;
+/// Type alias.
 pub type TryStreamBox<T> = Pin<Box<dyn Stream<Item = crate::Result<T>> + Send + 'static>>;
 
 /// Inefficient, but OK because used only in tests