83440cf110
The legacy part for now is internal/errorsx. It will stay there until I figure out whether it also needs some extra bug fixing. The good part is now in internal/netxlite/errorsx and contains all the logic for mapping errors. We need to further improve upon this logic by writing more thorough integration tests for QUIC. We also need to copy the various dialer, conn, etc adapters that set errors. We will put them inside netxlite and we will generate errors in a way that is less crazy with respect to the major operation. (The idea is to always wrap, given that now we measure in an incremental way and we don't measure every operation together.) Part of https://github.com/ooni/probe/issues/1591
28 lines
807 B
Go
28 lines
807 B
Go
package websteps
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
errorsxlegacy "github.com/ooni/probe-cli/v3/internal/errorsx"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/errorsx"
|
|
)
|
|
|
|
// Control performs the control request and returns the response.
|
|
func Control(
|
|
ctx context.Context, sess model.ExperimentSession,
|
|
thAddr string, resourcePath string, creq CtrlRequest) (out CtrlResponse, err error) {
|
|
clnt := httpx.Client{
|
|
BaseURL: thAddr,
|
|
HTTPClient: sess.DefaultHTTPClient(),
|
|
Logger: sess.Logger(),
|
|
}
|
|
// make sure error is wrapped
|
|
err = errorsxlegacy.SafeErrWrapperBuilder{
|
|
Error: clnt.PostJSON(ctx, resourcePath, creq, &out),
|
|
Operation: errorsx.TopLevelOperation,
|
|
}.MaybeBuild()
|
|
return
|
|
}
|