From 3bc1e415f933e157d265a910416d0f9e5958de96 Mon Sep 17 00:00:00 2001
From: saleacy <81482492+saleacy@users.noreply.github.com>
Date: Tue, 17 Mar 2026 01:35:18 +0800
Subject: [PATCH] fix: ensure network.Dial and MakeHTTPClient use socks5 proxy

The package `network/v2/proxy_network.go` does not wrap `network.Dial`
and `network.MakeHTTPClient`, which causes them to bypass the SOCKS5
proxy and initiate TCP connections directly from the local machine.
---
 network/v2/proxy_network.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/network/v2/proxy_network.go b/network/v2/proxy_network.go
index 58d54699c..8597cf5b7 100644
--- a/network/v2/proxy_network.go
+++ b/network/v2/proxy_network.go
@@ -3,6 +3,7 @@ package network
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"net/url"
 
 	"github.com/9seconds/mtg/v2/essentials"
@@ -15,6 +16,10 @@ type proxyNetwork struct {
 	client proxy.ContextDialer
 }
 
+func (p proxyNetwork) Dial(network, address string) (essentials.Conn, error) {
+	return p.DialContext(context.Background(), network, address)
+}
+
 func (p proxyNetwork) DialContext(ctx context.Context, network, address string) (essentials.Conn, error) {
 	conn, err := p.client.DialContext(ctx, network, address)
 	if err != nil {
@@ -24,6 +29,16 @@ func (p proxyNetwork) DialContext(ctx context.Context, network, address string)
 	return essentials.WrapNetConn(conn), nil
 }
 
+func (p proxyNetwork) MakeHTTPClient(
+	dialFunc func(context.Context, string, string) (essentials.Conn, error),
+) *http.Client {
+	if dialFunc == nil {
+		dialFunc = p.DialContext
+	}
+
+	return p.Network.MakeHTTPClient(dialFunc)
+}
+
 func NewProxyNetwork(base mtglib.Network, proxyURL *url.URL) (*proxyNetwork, error) {
 	socks, err := proxy.FromURL(proxyURL, base.NativeDialer())
 	if err != nil {