Skip to content

fix: ensure network.Dial and MakeHTTPClient use socks5 proxy #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
9seconds merged 1 commit into from
Mar 16, 2026
+15 −0
Merged

fix: ensure network.Dial and MakeHTTPClient use socks5 proxy #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions network/v2/proxy_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package network
import (
"context"
"fmt"
"net/http"
"net/url"

"github.com/9seconds/mtg/v2/essentials"
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
Loading