Timeout adjustment

Author: Ma233

src/error.rs

@@ -30,8 +30,8 @@ impl<T> From<tokio::sync::mpsc::error::SendError<T>> for Error {
     }
 }
 
-impl From<tokio::sync::oneshot::error::RecvError> for Error {
-    fn from(_: tokio::sync::oneshot::error::RecvError) -> Self {
+impl From<futures::channel::oneshot::Canceled> for Error {
+    fn from(_: futures::channel::oneshot::Canceled) -> Self {
         Error::EssentialTaskClosed
     }
 }

src/lib.rs

@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::time::Duration;
 
+use futures::channel::oneshot;
 use litep2p::crypto::ed25519::SecretKey;
 use litep2p::protocol::request_response::DialOptions;
 use litep2p::protocol::request_response::RequestResponseEvent;
@@ -13,7 +14,6 @@ use tokio::io::AsyncReadExt;
 use tokio::io::AsyncWriteExt;
 use tokio::net::TcpStream;
 use tokio::sync::mpsc;
-use tokio::sync::oneshot;
 use tokio::time::timeout;
 use tracing::warn;
 
@@ -139,7 +139,7 @@ impl PProxy {
                     return Err(Error::IncompleteHttpRequest);
                 }
 
-                let mut stream = tcp_connect_with_timeout(&proxy_addr, 5).await?;
+                let mut stream = tcp_connect_with_timeout(&proxy_addr, 1).await?;
                 stream.write_all(request).await?;
 
                 let mut response = Vec::new();

src/main.rs

@@ -108,9 +108,8 @@ async fn serve(args: &ArgMatches) {
     let (pproxy, pproxy_handle) = PProxy::new(key, server_addr, proxy_addr);
 
     let commander = PProxyCommander::new(pproxy_handle);
-    let commander_server = Server::builder()
-        .accept_http1(true)
-        .add_service(tonic_web::enable(commander.into_tonic_service()));
+    let commander_server =
+        Server::builder().add_service(tonic_web::enable(commander.into_tonic_service()));
 
     futures::join!(
         async move {

src/server.rs

@@ -8,7 +8,7 @@ use litep2p::protocol::request_response::Config as RequestResponseConfig;
 use litep2p::protocol::request_response::ConfigBuilder as RequestResponseConfigBuilder;
 use litep2p::protocol::request_response::RequestResponseEvent;
 use litep2p::protocol::request_response::RequestResponseHandle;
-use litep2p::transport::quic::config::Config as QuicConfig;
+use litep2p::transport::tcp::config::Config as TcpConfig;
 use litep2p::types::protocol::ProtocolName;
 use litep2p::Litep2p;
 use litep2p::Litep2pEvent;
@@ -38,10 +38,8 @@ impl P2pServer {
 
         let litep2p_config = ConfigBuilder::new()
             .with_keypair(secret_key.into())
-            .with_quic(QuicConfig {
-                listen_addresses: vec![format!("/{ip_type}/{ip}/udp/{port}/quic-v1")
-                    .parse()
-                    .unwrap()],
+            .with_tcp(TcpConfig {
+                listen_addresses: vec![format!("/{ip_type}/{ip}/tcp/{port}").parse().unwrap()],
                 ..Default::default()
             })
             .with_request_response_protocol(control_config)
@@ -62,12 +60,14 @@ impl P2pServer {
     fn init_control() -> (RequestResponseConfig, RequestResponseHandle) {
         RequestResponseConfigBuilder::new(ProtocolName::from("/pproxy/control/1"))
             .with_max_size(1024 * 1024)
+            .with_timeout(std::time::Duration::from_secs(120))
             .build()
     }
 
     fn init_tunnel() -> (RequestResponseConfig, RequestResponseHandle) {
         RequestResponseConfigBuilder::new(ProtocolName::from("/pproxy/tunnel/1"))
             .with_max_size(1024 * 1024)
+            .with_timeout(std::time::Duration::from_secs(120))
             .build()
     }