mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-04-13 05:20:28 +08:00
feat: add bytes dependency and optimize buffer handling in test_delay function
This commit is contained in:
parent
6fea76f7e3
commit
20fddc5cff
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -1118,6 +1118,7 @@ dependencies = [
|
|||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"boa_engine",
|
"boa_engine",
|
||||||
|
"bytes",
|
||||||
"chrono",
|
"chrono",
|
||||||
"clash-verge-draft",
|
"clash-verge-draft",
|
||||||
"clash-verge-i18n",
|
"clash-verge-i18n",
|
||||||
|
|||||||
@ -108,6 +108,7 @@ webpki-roots = "1.0"
|
|||||||
rust_iso3166 = "0.1.14"
|
rust_iso3166 = "0.1.14"
|
||||||
# Use the git repo until the next release after v2.0.0.
|
# Use the git repo until the next release after v2.0.0.
|
||||||
dark-light = { git = "https://github.com/rust-dark-light/dark-light" }
|
dark-light = { git = "https://github.com/rust-dark-light/dark-light" }
|
||||||
|
bytes = "1.11.1"
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
objc2 = "0.6"
|
objc2 = "0.6"
|
||||||
|
|||||||
@ -5,6 +5,7 @@ use crate::{
|
|||||||
process::AsyncHandler,
|
process::AsyncHandler,
|
||||||
utils,
|
utils,
|
||||||
};
|
};
|
||||||
|
use bytes::BytesMut;
|
||||||
use clash_verge_logging::{Type, logging};
|
use clash_verge_logging::{Type, logging};
|
||||||
use serde_yaml_ng::{Mapping, Value};
|
use serde_yaml_ng::{Mapping, Value};
|
||||||
use smartstring::alias::String;
|
use smartstring::alias::String;
|
||||||
@ -127,6 +128,7 @@ pub async fn test_delay(url: String) -> anyhow::Result<u32> {
|
|||||||
|
|
||||||
tokio::time::timeout(Duration::from_secs(10), async {
|
tokio::time::timeout(Duration::from_secs(10), async {
|
||||||
let start = Instant::now();
|
let start = Instant::now();
|
||||||
|
let mut buf = BytesMut::with_capacity(1024);
|
||||||
|
|
||||||
if is_https {
|
if is_https {
|
||||||
let stream = match proxy_port {
|
let stream = match proxy_port {
|
||||||
@ -134,9 +136,8 @@ pub async fn test_delay(url: String) -> anyhow::Result<u32> {
|
|||||||
let mut s = TcpStream::connect(format!("127.0.0.1:{pp}")).await?;
|
let mut s = TcpStream::connect(format!("127.0.0.1:{pp}")).await?;
|
||||||
s.write_all(format!("CONNECT {host}:{port} HTTP/1.1\r\nHost: {host}:{port}\r\n\r\n").as_bytes())
|
s.write_all(format!("CONNECT {host}:{port} HTTP/1.1\r\nHost: {host}:{port}\r\n\r\n").as_bytes())
|
||||||
.await?;
|
.await?;
|
||||||
let mut buf = [0u8; 1024];
|
s.read_buf(&mut buf).await?;
|
||||||
let n = s.read(&mut buf).await?;
|
if !buf.windows(3).any(|w| w == b"200") {
|
||||||
if !std::str::from_utf8(&buf[..n]).unwrap_or("").contains("200") {
|
|
||||||
return Err(anyhow::anyhow!("Proxy CONNECT failed"));
|
return Err(anyhow::anyhow!("Proxy CONNECT failed"));
|
||||||
}
|
}
|
||||||
s
|
s
|
||||||
@ -166,7 +167,6 @@ pub async fn test_delay(url: String) -> anyhow::Result<u32> {
|
|||||||
),
|
),
|
||||||
};
|
};
|
||||||
stream.write_all(req.as_bytes()).await?;
|
stream.write_all(req.as_bytes()).await?;
|
||||||
let mut buf = [0u8; 1024];
|
|
||||||
let _ = stream.read(&mut buf).await?;
|
let _ = stream.read(&mut buf).await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user