SCToolBox/app
1
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/StarCitizenToolBox/app.git synced 2024-10-23 06:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: merge to reqwest:0.12.0

Browse Source 
remove hyper
This commit is contained in:
xkeyC 2024-03-21 20:04:42 +08:00
parent 6c8c7a0273
commit 8622a5068b
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rust/Cargo.toml
View File

@ -12,14 +12,13 @@ crate-type = ["cdylib", "staticlib"]
[dependencies] [dependencies]
flutter_rust_bridge = "=2.0.0-dev.28" flutter_rust_bridge = "=2.0.0-dev.28"
tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros","process"] } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "process"] }
url = "2.5.0" url = "2.5"
async-std = "1.12.0" async-std = "1.12"
hyper = { version = "0.14.28"} once_cell = "1.19"
once_cell = "1.19.0" reqwest = { version = "0.12", features = ["rustls-tls-webpki-roots", "cookies", "gzip", "json", "stream"] }
reqwest = { version = "0.11", features = ["rustls-tls-webpki-roots", "cookies", "gzip", "json","stream"] } hickory-resolver = { version = "0.24" }
hickory-resolver = {version = "0.24.0"}
anyhow = "1.0" anyhow = "1.0"
win32job = "2" win32job = "2"
lazy_static = "1.4.0" lazy_static = "1.4"
scopeguard = "1.2.0" scopeguard = "1.2"

2
rust/src/api/http_api.rs
View File

@ -1,5 +1,5 @@
use std::collections::HashMap; use std::collections::HashMap;
use hyper::Method; use reqwest::Method;
use crate::http_package; use crate::http_package;
use crate::http_package::RustHttpResponse; use crate::http_package::RustHttpResponse;

9
rust/src/http_package/dns.rs
View File

@ -1,8 +1,7 @@
use hickory_resolver::config::{NameServerConfigGroup, ResolverConfig, ResolverOpts}; use hickory_resolver::config::{NameServerConfigGroup, ResolverConfig, ResolverOpts};
use hickory_resolver::{lookup_ip::LookupIpIntoIter, TokioAsyncResolver}; use hickory_resolver::{lookup_ip::LookupIpIntoIter, TokioAsyncResolver};
use hyper::client::connect::dns::Name;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use reqwest::dns::{Addrs, Resolve, Resolving}; use reqwest::dns::{Addrs, Name, Resolve, Resolving};
use std::collections::HashMap; use std::collections::HashMap;
use std::io; use std::io;
use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@ -29,8 +28,8 @@ struct SocketAddrs {
impl Resolve for MyHickoryDnsResolver { impl Resolve for MyHickoryDnsResolver {
fn resolve(&self, name: Name) -> Resolving { fn resolve(&self, name: Name) -> Resolving {
let my_hosts = MY_HOSTS_MAP.read().unwrap(); let my_hosts = MY_HOSTS_MAP.read().unwrap();
let name_str = name.to_string(); let name_str = name.as_str();
if let Some(ip) = my_hosts.get(name_str.as_str()) { if let Some(ip) = my_hosts.get(name_str) {
let addrs: Addrs = Box::new(std::iter::once(SocketAddr::new(*ip, 0))); let addrs: Addrs = Box::new(std::iter::once(SocketAddr::new(*ip, 0)));
println!("using host map === {:?}", name_str); println!("using host map === {:?}", name_str);
return Box::pin(async move { Ok(addrs) }); return Box::pin(async move { Ok(addrs) });
@ -89,7 +88,7 @@ fn new_resolver() -> io::Result<TokioAsyncResolver> {
IpAddr::V4(Ipv4Addr::new(166, 111, 8, 28)), IpAddr::V4(Ipv4Addr::new(166, 111, 8, 28)),
IpAddr::V4(Ipv4Addr::new(101, 226, 4, 6)), IpAddr::V4(Ipv4Addr::new(101, 226, 4, 6)),
IpAddr::V4(Ipv4Addr::new(114, 114, 114, 114)), IpAddr::V4(Ipv4Addr::new(114, 114, 114, 114)),
], 53, true, ], 53, false,
); );
let cfg = ResolverConfig::from_parts(None, vec![], group); let cfg = ResolverConfig::from_parts(None, vec![], group);
let mut opts = ResolverOpts::default(); let mut opts = ResolverOpts::default();

4
rust/src/http_package/mod.rs
View File

@ -2,13 +2,13 @@ pub mod dns;
use scopeguard::defer; use scopeguard::defer;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use hyper::Uri;
use reqwest::header::{HeaderMap, HeaderName, HeaderValue}; use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
use reqwest::{Method, RequestBuilder}; use reqwest::{Method, RequestBuilder};
use std::collections::HashMap; use std::collections::HashMap;
use std::str::FromStr; use std::str::FromStr;
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use std::time::Duration; use std::time::Duration;
use url::Url;
#[derive(Debug)] #[derive(Debug)]
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
@ -88,7 +88,7 @@ pub async fn fetch(
if address_clone.is_some() { if address_clone.is_some() {
let addr = std::net::IpAddr::from_str(with_ip_address.unwrap().as_str()).unwrap(); let addr = std::net::IpAddr::from_str(with_ip_address.unwrap().as_str()).unwrap();
let mut hosts = dns::MY_HOSTS_MAP.write().unwrap(); let mut hosts = dns::MY_HOSTS_MAP.write().unwrap();
let url_host = Uri::from_str(url.as_str()).unwrap().host().unwrap().to_string(); let url_host = Url::from_str(url.as_str()).unwrap().host().unwrap().to_string();
hosts.insert(url_host, addr); hosts.insert(url_host, addr);
} }