From 9433741471669d7811dc7de83e1a5a44ba8bd4f6 Mon Sep 17 00:00:00 2001
From: ZacharyZcR <2903735704@qq.com>
Date: Wed, 18 Dec 2024 22:20:45 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96Proxy.go=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=84=E8=8C=83=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/proxy.go | 69 +++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/common/proxy.go b/common/proxy.go
index 69a27e5..f8af40e 100644
--- a/common/proxy.go
+++ b/common/proxy.go
@@ -2,6 +2,7 @@ package Common
 
 import (
 	"errors"
+	"fmt"
 	"golang.org/x/net/proxy"
 	"net"
 	"net/url"
@@ -9,57 +10,69 @@ import (
 	"time"
 )
 
+// WrapperTcpWithTimeout 创建一个带超时的TCP连接
 func WrapperTcpWithTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
 	d := &net.Dialer{Timeout: timeout}
 	return WrapperTCP(network, address, d)
 }
 
+// WrapperTCP 根据配置创建TCP连接
 func WrapperTCP(network, address string, forward *net.Dialer) (net.Conn, error) {
-	//get conn
-	var conn net.Conn
+	// 直连模式
 	if Socks5Proxy == "" {
-		var err error
-		conn, err = forward.Dial(network, address)
+		conn, err := forward.Dial(network, address)
 		if err != nil {
-			return nil, err
-		}
-	} else {
-		dailer, err := Socks5Dailer(forward)
-		if err != nil {
-			return nil, err
-		}
-		conn, err = dailer.Dial(network, address)
-		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("建立TCP连接失败: %v", err)
 		}
+		return conn, nil
 	}
-	return conn, nil
 
+	// Socks5代理模式
+	dialer, err := Socks5Dialer(forward)
+	if err != nil {
+		return nil, fmt.Errorf("创建Socks5代理失败: %v", err)
+	}
+
+	conn, err := dialer.Dial(network, address)
+	if err != nil {
+		return nil, fmt.Errorf("通过Socks5建立连接失败: %v", err)
+	}
+
+	return conn, nil
 }
 
-func Socks5Dailer(forward *net.Dialer) (proxy.Dialer, error) {
+// Socks5Dialer 创建Socks5代理拨号器
+func Socks5Dialer(forward *net.Dialer) (proxy.Dialer, error) {
+	// 解析代理URL
 	u, err := url.Parse(Socks5Proxy)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("解析Socks5代理地址失败: %v", err)
 	}
+
+	// 验证代理类型
 	if strings.ToLower(u.Scheme) != "socks5" {
-		return nil, errors.New("Only support socks5")
+		return nil, errors.New("仅支持socks5代理")
 	}
+
 	address := u.Host
-	var auth proxy.Auth
-	var dailer proxy.Dialer
+	var dialer proxy.Dialer
+
+	// 根据认证信息创建代理
 	if u.User.String() != "" {
-		auth = proxy.Auth{}
-		auth.User = u.User.Username()
-		password, _ := u.User.Password()
-		auth.Password = password
-		dailer, err = proxy.SOCKS5("tcp", address, &auth, forward)
+		// 使用用户名密码认证
+		auth := proxy.Auth{
+			User: u.User.Username(),
+		}
+		auth.Password, _ = u.User.Password()
+		dialer, err = proxy.SOCKS5("tcp", address, &auth, forward)
 	} else {
-		dailer, err = proxy.SOCKS5("tcp", address, nil, forward)
+		// 无认证模式
+		dialer, err = proxy.SOCKS5("tcp", address, nil, forward)
 	}
 
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("创建Socks5代理失败: %v", err)
 	}
-	return dailer, nil
+
+	return dialer, nil
 }