refactor(webconnectivityqa): use httpclientx (#1589)

Part of ooni/probe#2729

internal/experiment/webconnectivity/webconnectivity_test.go

@@ -80,7 +80,7 @@ func TestMeasureWithCancelledContext(t *testing.T) {
 	}
 	tk := measurement.TestKeys.(*webconnectivity.TestKeys)
 	if *tk.ControlFailure != netxlite.FailureInterrupted {
-		t.Fatal("unexpected control_failure")
+		t.Fatal("unexpected control_failure", *tk.ControlFailure)
 	}
 	if *tk.DNSExperimentFailure != netxlite.FailureInterrupted {
 		t.Fatal("unexpected dns_experiment_failure")

internal/webconnectivityalgo/calltesthelpers.go

@@ -3,9 +3,8 @@ package webconnectivityalgo
 import (
 	"context"
 
-	"github.com/ooni/probe-cli/v3/internal/httpapi"
+	"github.com/ooni/probe-cli/v3/internal/httpclientx"
 	"github.com/ooni/probe-cli/v3/internal/model"
-	"github.com/ooni/probe-cli/v3/internal/ooapi"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"
 )
 
@@ -27,14 +26,18 @@ func CallWebConnectivityTestHelper(ctx context.Context, creq *model.THRequest,
 		return nil, 0, model.ErrNoAvailableTestHelpers
 	}
 
-	// initialize a sequence caller for invoking the THs in FIFO order
-	seqCaller := httpapi.NewSequenceCaller(
-		ooapi.NewDescriptorTH(creq),
-		httpapi.NewEndpointList(sess.DefaultHTTPClient(), sess.Logger(), sess.UserAgent(), testhelpers...)...,
+	// create overlapped state for performing overlapped HTTP calls
+	overlapped := httpclientx.NewOverlappedPostJSON[*model.THRequest, *model.THResponse](
+		creq, &httpclientx.Config{
+			Authorization: "", // not needed
+			Client:        sess.DefaultHTTPClient(),
+			Logger:        sess.Logger(),
+			UserAgent:     sess.UserAgent(),
+		},
 	)
 
-	// issue the composed call proper and obtain a response and an index or an error
-	cresp, idx, err := seqCaller.Call(ctx)
+	// perform the overlapped HTTP API calls
+	cresp, idx, err := overlapped.Run(ctx, httpclientx.NewEndpointFromModelOOAPIServices(testhelpers...)...)
 
 	// handle the case where all test helpers failed
 	if err != nil {

internal/webconnectivityqa/control.go

@@ -43,7 +43,7 @@ func controlFailureWithSuccessfulHTTPWebsite() *TestCase {
 		},
 		ExpectErr: false,
 		ExpectTestKeys: &TestKeys{
-			ControlFailure: "unknown_failure: httpapi: all endpoints failed: [ connection_reset; connection_reset; connection_reset; connection_reset;]",
+			ControlFailure: "connection_reset",
 			XStatus:        8, // StatusAnomalyControlUnreachable
 			Accessible:     nil,
 			Blocking:       nil,
@@ -88,7 +88,7 @@ func controlFailureWithSuccessfulHTTPSWebsite() *TestCase {
 		},
 		ExpectErr: false,
 		ExpectTestKeys: &TestKeys{
-			ControlFailure: "unknown_failure: httpapi: all endpoints failed: [ connection_reset; connection_reset; connection_reset; connection_reset;]",
+			ControlFailure: "connection_reset",
 			XStatus:        1,  // StatusSuccessSecure
 			XBlockingFlags: 32, // AnalysisBlockingFlagSuccess
 			XNullNullFlags: 8,  // AnalysisFlagNullNullSuccessfulHTTPS