Use nyquest

Cargo.toml

@@ -38,9 +38,10 @@ enum_dispatch = "0.3"
 thiserror = "2"
 
 compio = "0.16"
-cyper = { version = "0.5", default-features = false }
+cyper = { version = "0.6", default-features = false }
+nyquest = "0.3"
+nyquest-preset = "0.3"
 winio = { version = "0.9", default-features = false }
-flume = "0.11"
 
 chrono = { version = "0.4", default-features = false, features = [
     "clock",
@@ -51,6 +52,7 @@ dirs = "6"
 log = "0.4"
 base64 = "0.22"
 
+flume = "0.11"
 futures-util = "0.3"
 
 keyring = { version = "3", features = [

azure-pipelines.yml

@@ -100,7 +100,7 @@ jobs:
   steps:
   - script: |
       sudo apt-get update
-      sudo apt-get install qt6-base-dev
+      sudo apt-get install qt6-base-dev libcurl4-openssl-dev
     displayName: 'Install qt6'
 
   - script: cargo install cargo-deb

tunet-flutter/native/src/api.rs

@@ -1,5 +1,4 @@
 use crate::frb_generated::StreamSink;
-use anyhow::Result;
 use flutter_rust_bridge::{frb, setup_default_user_utils};
 
 pub use netstatus::NetStatus;
@@ -69,7 +68,7 @@ pub struct Runtime {
 
 impl Runtime {
     #[frb(sync)]
-    pub fn new() -> Result<Runtime> {
+    pub fn new() -> Runtime {
         #[cfg(target_os = "android")]
         android_logger::init_once(
             android_logger::Config::default()
@@ -84,12 +83,12 @@ impl Runtime {
 
         let (atx, arx) = flume::unbounded();
         let (utx, urx) = flume::unbounded();
-        let model = Model::new(atx, utx)?;
-        Ok(Self {
+        let model = Model::new(atx, utx);
+        Self {
             arx: Arc::new(Mutex::new(Some(arx))),
             urx: Arc::new(Mutex::new(Some(urx))),
             model: Arc::new(Mutex::new(model)),
-        })
+        }
     }
 
     #[frb(sync)]

tunet-gui/src/main.rs

@@ -64,7 +64,7 @@ impl Component for MainModel {
 
         let (action_sender, action_receiver) = flume::unbounded();
         let (update_sender, update_receiver) = flume::unbounded();
-        let model = Model::new(action_sender, update_sender).unwrap();
+        let model = Model::new(action_sender, update_sender);
         {
             let sender = sender.clone();
             spawn(async move {

tunet-helper/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 [dependencies]
 authtea = { workspace = true }
 netstatus = { workspace = true }
-cyper = { workspace = true, default-features = false, features = ["json"] }
+nyquest = { workspace = true, features = ["async"] }
 url = "2"
 md-5 = "0.10"
 sha-1 = "0.10"
@@ -23,13 +23,14 @@ thiserror = { workspace = true }
 allo-isolate = { version = "0.1", features = ["chrono"], optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
-cyper = { workspace = true, default-features = false, features = ["rustls"] }
+cyper = { workspace = true, default-features = false, features = [
+    "rustls",
+    "nyquest-async",
+] }
 rustls = { workspace = true, default-features = false, features = ["ring"] }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-cyper = { workspace = true, default-features = false, features = [
-    "native-tls",
-] }
+nyquest-preset = { workspace = true, features = ["async"] }
 
 [features]
 default = []

tunet-helper/src/auth.rs

@@ -8,9 +8,11 @@ use base64::{
 use data_encoding::HEXLOWER;
 use hmac::{Hmac, Mac};
 use md5::Md5;
+use nyquest::Request;
 use regex::Regex;
 use serde_json::{json, Value as JsonValue};
 use sha1::{Digest, Sha1};
+use std::borrow::Cow;
 use std::marker::PhantomData;
 use std::sync::LazyLock;
 use url::Url;
@@ -51,7 +53,7 @@ impl<U: AuthConnectUri + Send + Sync> AuthConnect<U> {
             ],
         )
         .unwrap();
-        let res = self.client.get(uri)?.send().await?;
+        let res = self.client.request(Request::get(uri.to_string())).await?;
         let t = res.text().await?;
         let mut json: JsonValue = serde_json::from_str(&t[9..t.len() - 1])?;
         Ok(json
@@ -61,7 +63,7 @@ impl<U: AuthConnectUri + Send + Sync> AuthConnect<U> {
     }
 
     async fn get_ac_id(&self) -> Option<i32> {
-        let res = self.client.get(REDIRECT_URI).ok()?.send().await.ok()?;
+        let res = self.client.request(Request::get(REDIRECT_URI)).await.ok()?;
         let t = res.text().await.ok()?;
         let cap = AC_ID_REGEX.captures(&t)?;
         cap[1].parse::<i32>().ok()
@@ -95,22 +97,22 @@ impl<U: AuthConnectUri + Send + Sync> AuthConnect<U> {
             sha1.finalize()
         };
         let params = [
-            ("action", "login"),
-            ("ac_id", &ac_id.to_string()),
-            ("double_stack", "1"),
-            ("n", "200"),
-            ("type", "1"),
-            ("username", u),
-            ("password", &format!("{{MD5}}{password_md5}")),
-            ("info", &info),
-            ("chksum", &HEXLOWER.encode(&chksum)),
-            ("callback", "callback"),
+            ("action", Cow::Borrowed("login")),
+            ("ac_id", Cow::Owned(ac_id.to_string())),
+            ("double_stack", Cow::Borrowed("1")),
+            ("n", Cow::Borrowed("200")),
+            ("type", Cow::Borrowed("1")),
+            ("username", Cow::Owned(u.to_string())),
+            ("password", Cow::Owned(format!("{{MD5}}{password_md5}"))),
+            ("info", Cow::Owned(info)),
+            ("chksum", Cow::Owned(HEXLOWER.encode(&chksum))),
+            ("callback", Cow::Borrowed("callback")),
         ];
         let res = self
             .client
-            .post(U::log_uri())?
-            .form(&params)?
-            .send()
+            .request(Request::post(U::log_uri()).with_body(nyquest::Body::form(
+                params.map(|(k, v)| (Cow::Borrowed(k), v)),
+            )))
             .await?;
         let t = res.text().await?;
         Self::parse_response(&t)
@@ -145,24 +147,24 @@ impl<U: AuthConnectUri + Send + Sync> TUNetHelper for AuthConnect<U> {
 
     async fn logout(&self, u: &str) -> NetHelperResult<String> {
         let params = [
-            ("action", "logout"),
-            ("ac_id", "1"),
-            ("double_stack", "1"),
-            ("username", u),
-            ("callback", "callback"),
+            ("action", Cow::Borrowed("logout")),
+            ("ac_id", Cow::Borrowed("1")),
+            ("double_stack", Cow::Borrowed("1")),
+            ("username", Cow::Owned(u.to_string())),
+            ("callback", Cow::Borrowed("callback")),
         ];
         let res = self
             .client
-            .post(U::log_uri())?
-            .form(&params)?
-            .send()
+            .request(Request::post(U::log_uri()).with_body(nyquest::Body::form(
+                params.map(|(k, v)| (Cow::Borrowed(k), v)),
+            )))
             .await?;
         let t = res.text().await?;
         Self::parse_response(&t)
     }
 
     async fn flux(&self) -> NetHelperResult<NetFlux> {
-        let res = self.client.get(U::flux_uri())?.send().await?;
+        let res = self.client.request(Request::get(U::flux_uri())).await?;
         res.text().await?.parse()
     }
 }

tunet-helper/src/lib.rs

@@ -2,13 +2,14 @@
 
 use std::fmt::{Display, Formatter};
 use std::future::Future;
+use std::sync::Once;
 use thiserror::Error;
 
 pub use chrono::{
     DateTime, Datelike, Duration as NaiveDuration, FixedOffset, Local, NaiveDate, NaiveDateTime,
     Timelike,
 };
-pub use cyper::Client as HttpClient;
+pub use nyquest::AsyncClient as HttpClient;
 
 mod auth;
 pub mod suggest;
@@ -28,7 +29,7 @@ pub enum NetHelperError {
     #[error("无法确定登录方式")]
     InvalidHost,
     #[error("网络请求错误：{0}")]
-    Reqwest(#[from] cyper::Error),
+    Nyquest(#[from] nyquest::Error),
     #[error("JSON 解析错误：{0}")]
     Json(#[from] serde_json::Error),
 }
@@ -234,8 +235,27 @@ impl TUNetConnect {
     }
 }
 
-pub fn create_http_client() -> HttpClient {
-    cyper::ClientBuilder::new().build()
+pub async fn create_http_client() -> NetHelperResult<HttpClient> {
+    static ONCE: Once = Once::new();
+
+    #[cfg(not(target_os = "android"))]
+    ONCE.call_once(|| {
+        nyquest_preset::register();
+    });
+
+    #[cfg(target_os = "android")]
+    ONCE.call_once(|| {
+        cyper::nyquest::register();
+    });
+
+    Ok(nyquest::ClientBuilder::default()
+        .no_caching()
+        .no_cookies()
+        .no_proxy()
+        .no_redirects()
+        .user_agent(format!("tunet-helper/{}", env!("CARGO_PKG_VERSION")))
+        .build_async()
+        .await?)
 }
 
 #[cfg(feature = "dart")]

tunet-helper/src/suggest/ping.rs

@@ -1,11 +1,13 @@
+use nyquest::Request;
+
 use crate::*;
 
-async fn can_connect_impl(client: &HttpClient, uri: &str) -> cyper::Result<()> {
-    client.head(uri)?.send().await?;
+async fn can_connect_impl(client: &HttpClient, uri: &'static str) -> nyquest::Result<()> {
+    client.request(Request::head(uri)).await?;
     Ok(())
 }
 
-async fn can_connect(client: &HttpClient, uri: &str) -> bool {
+async fn can_connect(client: &HttpClient, uri: &'static str) -> bool {
     can_connect_impl(client, uri).await.is_ok()
 }
 

tunet-model/Cargo.toml

@@ -11,6 +11,7 @@ flume = { workspace = true }
 tunet-helper = { workspace = true }
 netstatus = { workspace = true }
 futures-util = { workspace = true }
-compio = { workspace = true }
+compio = { workspace = true, features = ["time"] }
 anyhow = { workspace = true }
 drop_guard = "0.3"
+async-once-cell = "0.5"