fix bug

Update Cargo.toml
biliup · Mar 6, 2024 · 998cac5 · 998cac5
1 parent d615e07
commit 998cac5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/crates/biliup/src/client.rs b/crates/biliup/src/client.rs
@@ -7,6 +7,7 @@ use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_retry::RetryTransientMiddleware;
 use std::sync::Arc;
+use std::time::Duration;
 
 #[derive(Debug, Clone)]
 pub struct StatelessClient {
@@ -20,9 +21,8 @@ impl StatelessClient {
         let client = reqwest::Client::builder()
             .user_agent("Mozilla/5.0 (X11; Linux x86_64; rv:60.1) Gecko/20100101 Firefox/60.1")
             .default_headers(headers)
-            // .connect_timeout(std::time::Duration::from_secs(60))
             // .timeout(Duration::new(60, 0))
-            // .connect_timeout()
+            .connect_timeout(Duration::from_secs(60))
             .build()
             .unwrap();
         let retry_policy = ExponentialBackoff::builder().build_with_max_retries(5);
@@ -75,6 +75,7 @@ impl StatefulClient {
                     "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/63.0.3239.108",
                 )
                 .default_headers(headers)
+                .connect_timeout(Duration::from_secs(60))
                 // .timeout(Duration::new(60, 0))
                 .build()
                 .unwrap(),

diff --git a/crates/biliup/src/downloader/httpflv.rs b/crates/biliup/src/downloader/httpflv.rs
@@ -246,7 +246,7 @@ impl Connection {
             // BytesMut::with_capacity(0).deref_mut()
             // tokio::fs::File::open("").read()
             // self.resp.chunk()
-            if let Ok(Some(chunk)) = timeout(Duration::from_millis(30), self.resp.chunk()).await? {
+            if let Ok(Some(chunk)) = timeout(Duration::from_secs(30), self.resp.chunk()).await? {
                 // let n = chunk.len();
                 // println!("Chunk: {:?}", chunk);
                 self.buffer.put(chunk);

diff --git a/crates/biliup/src/uploader/line/upos.rs b/crates/biliup/src/uploader/line/upos.rs
@@ -9,6 +9,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use std::ffi::OsStr;
 use std::path::Path;
+use std::time::Duration;
 
 use crate::client::StatelessClient;
 use crate::retry;
@@ -54,6 +55,7 @@ impl Upos {
             .client_with_middleware
             .post(format!("{url}?uploads&output=json"))
             .header("X-Upos-Auth", header::HeaderValue::from_str(&bucket.auth)?)
+            .timeout(Duration::from_secs(60))
             .send()
             .await?
             .json()
@@ -125,6 +127,7 @@ impl Upos {
                             header::HeaderValue::from_str(&self.bucket.auth)?,
                         )
                         .query(&params)
+                        .timeout(Duration::from_secs(240))
                         .header(CONTENT_LENGTH, len)
                         .body(chunk.clone())
                         .send()
@@ -164,6 +167,7 @@ impl Upos {
             )
             .query(&value)
             .json(&json!({ "parts": parts }))
+            .timeout(Duration::from_secs(60))
             .send()
             .await?
             .json()

diff --git a/crates/stream-gears/Cargo.toml b/crates/stream-gears/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stream-gears"
-version = "0.1.20"
+version = "0.1.21"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html