0.1.11

Author: lz1998

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "pbbot-rq"
-version = "0.1.10"
+name = "pbrq"
+version = "0.1.11"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/bin/main.rs

@@ -13,7 +13,7 @@ use tracing::Level;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 
-use pbbot_rq::handler::{bot, password, plugins, qrcode};
+use pbrq::handler::{bot, password, plugins, qrcode};
 
 /// Simple program to greet a person
 #[derive(Parser, Debug)]

src/lib.rs

@@ -1,3 +1,4 @@
+#![feature(result_flattening)]
 pub mod api_handler;
 pub mod bot;
 pub mod error;

src/plugin/conn.rs

@@ -5,7 +5,6 @@ use std::time::Duration;
 use futures::{SinkExt, StreamExt};
 use rand::seq::SliceRandom;
 use rand::thread_rng;
-use tokio::net::TcpStream;
 use tokio::sync::broadcast;
 use tokio::task::JoinHandle;
 use tokio_tungstenite::tungstenite::http::{Request, Uri};
@@ -68,7 +67,13 @@ impl PluginConnection {
                 .map(|p| p.to_string())
                 .unwrap_or_else(|| "8081".into())
         );
-        let stream = TcpStream::connect(addr).await.map_err(RCError::IO)?;
+        let stream = tokio::time::timeout(
+            Duration::from_secs(10),
+            tokio::net::TcpStream::connect(addr),
+        )
+        .await
+        .map_err(tokio::io::Error::from)
+        .flatten()?;
         tracing::info!("succeed to connect plugin [{}]", self.plugin.name);
         let req = Request::builder()
             .uri(uri)