c6b3889a33
1. Use the netxlite.NewHTTPTransport factory for creating a new
HTTP2 (and HTTP1) transport;
2. Recognize the netxlite.NewOOHTTPTransport has now become
an implementation detail so make it private;
3. Recognize that netxlite.NewHTTP3Transport should call
netxlite.WrapTransport so it returns the same typechain
returned by netxlite.NewHTTPTransport (modulo, of course,
the real underlying transport), so ensure that we are
calling netxlite.WrapTransport in NewHTTP3Transport;
4. Recognize that the table based constructor inside of
netx needs a logger to create HTTPTransport instances using
either netxlite.NewHTTP{,3}Transport so pass this argument
along and ensure it's not nil using a constructor inside
model that guarantees that;
5. Cleanup netx's tests to avoid type asserting on the
typechains returned by netxlite since we already test
that inside netxlite;
6. Recognize that now we can make more legacy names inside
of netxlite private because we don't need to use them
inside tests anymore (because of previous point).
Reference issue: https://github.com/ooni/probe/issues/2121
31 lines
1.0 KiB
Go
31 lines
1.0 KiB
Go
package netx
|
|
|
|
import (
|
|
"crypto/tls"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
// httpTransportConfig contains the configuration required for constructing an HTTP transport
|
|
type httpTransportConfig struct {
|
|
Dialer model.Dialer
|
|
Logger model.Logger
|
|
QUICDialer model.QUICDialer
|
|
TLSDialer model.TLSDialer
|
|
TLSConfig *tls.Config
|
|
}
|
|
|
|
// newHTTP3Transport creates a new HTTP3Transport instance.
|
|
func newHTTP3Transport(config httpTransportConfig) model.HTTPTransport {
|
|
// Rationale for using NoLogger here: previously this code did
|
|
// not use a logger as well, so it's fine to keep it as is.
|
|
return netxlite.NewHTTP3Transport(config.Logger, config.QUICDialer, config.TLSConfig)
|
|
}
|
|
|
|
// newSystemTransport creates a new "system" HTTP transport. That is a transport
|
|
// using the Go standard library with custom dialer and TLS dialer.
|
|
func newSystemTransport(config httpTransportConfig) model.HTTPTransport {
|
|
return netxlite.NewHTTPTransport(config.Logger, config.Dialer, config.TLSDialer)
|
|
}
|