Merge pull request #116 from ngrok/bob/proxy-write

Make sure Ready is returned on proxy_proto remainder polling
ngrok · Oct 12, 2023 · 56e18cc · 56e18cc
2 parents 44f6f1d + 33545e1
commit 56e18cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/ngrok/Cargo.toml b/ngrok/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ngrok"
-version = "0.14.0-pre.7"
+version = "0.14.0-pre.8"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "The ngrok agent SDK"

diff --git a/ngrok/src/proxy_proto.rs b/ngrok/src/proxy_proto.rs
@@ -284,9 +284,8 @@ where
                 if !remainder.is_empty() {
                     let available = std::cmp::min(remainder.len(), buf.remaining());
                     buf.put_slice(&remainder.split_to(available));
-                    if buf.remaining() == 0 {
-                        return Poll::Ready(Ok(()));
-                    }
+                    // Make sure Ready is returned regardless of inner's state
+                    return Poll::Ready(Ok(()));
                 }
             }
             ReadState::None => {}

diff --git a/ngrok/src/tunnel_ext.rs b/ngrok/src/tunnel_ext.rs
@@ -29,27 +29,29 @@ use hyper::{
 };
 use once_cell::sync::Lazy;
 use proxy_protocol::ProxyHeader;
+#[cfg(feature = "hyper")]
+use tokio::io::{
+    AsyncRead,
+    AsyncWrite,
+};
 #[cfg(target_os = "windows")]
 use tokio::net::windows::named_pipe::ClientOptions;
 #[cfg(not(target_os = "windows"))]
 use tokio::net::UnixStream;
 #[cfg(target_os = "windows")]
 use tokio::time;
 use tokio::{
-    io::{
-        copy_bidirectional,
-        AsyncRead,
-        AsyncWrite,
-    },
+    io::copy_bidirectional,
     net::TcpStream,
     task::JoinHandle,
 };
 use tokio_util::compat::{
     FuturesAsyncReadCompatExt,
     TokioAsyncReadCompatExt,
 };
+#[cfg(feature = "hyper")]
+use tracing::debug;
 use tracing::{
-    debug,
     field,
     warn,
     Instrument,
@@ -160,6 +162,7 @@ impl ConnExt for EndpointConn {
         tokio::spawn(async move {
             let proxy_proto = self.inner.info.proxy_proto;
             let proto_tls = self.proto() == "tls";
+            #[cfg(feature = "hyper")]
             let proto_http = matches!(self.proto(), "http" | "https");
             let passthrough_tls = self.inner.info.passthrough_tls();