Skip to content
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

Jump to bottom

refactor(netxlite): use *Netx for creating HTTP transports #1253

Merged
merged 2 commits into from
Sep 12, 2023
Merged

refactor(netxlite): use *Netx for creating HTTP transports #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac81ada
refactor(netxlite): use *Netx for creating HTTP transports
bassosimone Sep 12, 2023
8d4004c
x
bassosimone Sep 12, 2023
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
1 change: 1 addition & 0 deletions internal/netxlite/dialer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func TestDialerSystem(t *testing.T) {
defaultTp := &DefaultTProxy{}
tp := &mocks.UnderlyingNetwork{
MockDialTimeout: func() time.Duration {
// Note: this test is notoriously flaky on Windows
return time.Nanosecond
},
MockDialContext: defaultTp.DialContext,
Expand Down
13 changes: 10 additions & 3 deletions internal/netxlite/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,19 @@ func (c *httpTLSConnWithReadTimeout) Read(b []byte) (int, error) {
//
// This factory and NewHTTPTransport are the recommended
// ways of creating a new HTTPTransport.
func NewHTTPTransportStdlib(logger model.DebugLogger) model.HTTPTransport {
dialer := NewDialerWithResolver(logger, NewStdlibResolver(logger))
tlsDialer := NewTLSDialer(dialer, NewTLSHandshakerStdlib(logger))
func (netx *Netx) NewHTTPTransportStdlib(logger model.DebugLogger) model.HTTPTransport {
dialer := netx.NewDialerWithResolver(logger, netx.NewStdlibResolver(logger))
tlsDialer := NewTLSDialer(dialer, netx.NewTLSHandshakerStdlib(logger))
return NewHTTPTransport(logger, dialer, tlsDialer)
}

// NewHTTPTransportStdlib is equivalent to creating an empty [*Netx]
// and calling its NewHTTPTransportStdlib method.
func NewHTTPTransportStdlib(logger model.DebugLogger) model.HTTPTransport {
netx := &Netx{Underlying: nil}
return netx.NewHTTPTransportStdlib(logger)
}

// NewHTTPClientStdlib creates a new HTTPClient that uses the
// standard library for TLS and DNS resolutions.
func NewHTTPClientStdlib(logger model.DebugLogger) model.HTTPClient {
Expand Down
8 changes: 0 additions & 8 deletions internal/netxlite/netx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ func (netx *Netx) maybeCustomUnderlyingNetwork() *MaybeCustomUnderlyingNetwork {
return &MaybeCustomUnderlyingNetwork{netx.Underlying}
}

// NewHTTPTransportStdlib is like [netxlite.NewHTTPTransportStdlib] but the constructed [model.HTTPTransport]
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
func (n *Netx) NewHTTPTransportStdlib(logger model.DebugLogger) model.HTTPTransport {
dialer := n.NewDialerWithResolver(logger, n.NewStdlibResolver(logger))
tlsDialer := NewTLSDialer(dialer, n.NewTLSHandshakerStdlib(logger))
return NewHTTPTransport(logger, dialer, tlsDialer)
}

// NewHTTP3TransportStdlib is like [netxlite.NewHTTP3TransportStdlib] but the constructed [model.HTTPTransport]
// uses the [model.UnderlyingNetwork] configured inside the [Netx] structure.
func (n *Netx) NewHTTP3TransportStdlib(logger model.DebugLogger) model.HTTPTransport {
Expand Down