Revert "http/https proxy (#7600)" (#7801)

This reverts commit da57fcb641.

libs/hbb_common/src/socket_client.rs

@@ -1,13 +1,11 @@
 use crate::{
     config::{Config, NetworkType},
-    proxy::IntoProxyScheme,
     tcp::FramedStream,
     udp::FramedSocket,
     ResultType,
 };
 use anyhow::Context;
 use std::net::SocketAddr;
-use log::info;
 use tokio::net::ToSocketAddrs;
 use tokio_socks::{IntoTargetAddr, TargetAddr};
 
@@ -52,15 +50,19 @@ pub fn increase_port<T: std::string::ToString>(host: T, offset: i32) -> String {
 }
 
 pub fn test_if_valid_server(host: &str) -> String {
-    info!("Testing server validity for host: {}", host);
+    let host = check_port(host, 0);
+
     use std::net::ToSocketAddrs;
-    // Even if the current network type is a proxy type,
-    // the system DNS should be used to resolve the proxy server address.
-    host.into_proxy_scheme()
-        .and_then(|scheme| scheme.get_host_and_port())
-        .and_then(|domain| domain.to_socket_addrs().map_err(Into::into))
-        .map(|_| "".to_owned()) // on success, return an empty string
-        .unwrap_or_else(|e| e.to_string()) // on error, convert the error into a string
+    match Config::get_network_type() {
+        NetworkType::Direct => match host.to_socket_addrs() {
+            Err(err) => err.to_string(),
+            Ok(_) => "".to_owned(),
+        },
+        NetworkType::ProxySocks => match &host.into_target_addr() {
+            Err(err) => err.to_string(),
+            Ok(_) => "".to_owned(),
+        },
+    }
 }
 
 pub trait IsResolvedSocketAddr {
@@ -105,7 +107,15 @@ pub async fn connect_tcp_local<
     ms_timeout: u64,
 ) -> ResultType<FramedStream> {
     if let Some(conf) = Config::get_socks() {
-        return FramedStream::connect(target, local, &conf, ms_timeout).await;
+        return FramedStream::connect(
+            conf.proxy.as_str(),
+            target,
+            local,
+            conf.username.as_str(),
+            conf.password.as_str(),
+            ms_timeout,
+        )
+        .await;
     }
     if let Some(target) = target.resolve() {
         if let Some(local) = local {