06ee0e55a9
* refactor(netx/dialer): hide implementation complexity This follows the blueprint of `module.Config` and `nodule.New` described at https://github.com/ooni/probe/issues/1591. * fix: ndt7 bug where we were not using the right resolver * fix(legacy/netx): clarify irrelevant implementation change * fix: improve comments * fix(hhfm): do not use dialer.New b/c it breaks it Unclear to me why this is happening. Still, improve upon the previous situation by adding a timeout. It does not seem a priority to look into this issue now.
62 lines
1.4 KiB
Go
62 lines
1.4 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
)
|
|
|
|
// errorWrapperDialer is a dialer that performs err wrapping
|
|
type errorWrapperDialer struct {
|
|
Dialer
|
|
}
|
|
|
|
// DialContext implements Dialer.DialContext
|
|
func (d *errorWrapperDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
conn, err := d.Dialer.DialContext(ctx, network, address)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: errorx.ConnectOperation,
|
|
}.MaybeBuild()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &errorWrapperConn{Conn: conn}, nil
|
|
}
|
|
|
|
// errorWrapperConn is a net.Conn that performs error wrapping.
|
|
type errorWrapperConn struct {
|
|
net.Conn
|
|
}
|
|
|
|
// Read implements net.Conn.Read
|
|
func (c *errorWrapperConn) Read(b []byte) (n int, err error) {
|
|
n, err = c.Conn.Read(b)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: errorx.ReadOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|
|
|
|
// Write implements net.Conn.Write
|
|
func (c *errorWrapperConn) Write(b []byte) (n int, err error) {
|
|
n, err = c.Conn.Write(b)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: errorx.WriteOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|
|
|
|
// Close implements net.Conn.Close
|
|
func (c *errorWrapperConn) Close() (err error) {
|
|
err = c.Conn.Close()
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
Error: err,
|
|
Operation: errorx.CloseOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|