d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
49 lines
1.4 KiB
Go
49 lines
1.4 KiB
Go
// Command oohelper contains a simple command line
|
|
// client for the Web Connectivity test helper.
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"flag"
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/cmd/oohelper/internal"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/runtimex"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
)
|
|
|
|
var (
|
|
ctx, cancel = context.WithCancel(context.Background())
|
|
debug = flag.Bool("debug", false, "Toggle debug mode")
|
|
httpClient *http.Client
|
|
resolver netx.Resolver
|
|
server = flag.String("server", "https://wcth.ooni.io/", "URL of the test helper")
|
|
target = flag.String("target", "", "Target URL for the test helper")
|
|
)
|
|
|
|
func init() {
|
|
txp := netx.NewHTTPTransport(netx.Config{Logger: log.Log})
|
|
httpClient = &http.Client{Transport: txp}
|
|
resolver = netx.NewResolver(netx.Config{Logger: log.Log})
|
|
}
|
|
|
|
func main() {
|
|
logmap := map[bool]log.Level{
|
|
true: log.DebugLevel,
|
|
false: log.InfoLevel,
|
|
}
|
|
flag.Parse()
|
|
log.SetLevel(logmap[*debug])
|
|
clnt := internal.OOClient{HTTPClient: httpClient, Resolver: resolver}
|
|
config := internal.OOConfig{TargetURL: *target, ServerURL: *server}
|
|
defer cancel()
|
|
cresp, err := clnt.Do(ctx, config)
|
|
runtimex.PanicOnError(err, "client.Do failed")
|
|
data, err := json.MarshalIndent(cresp, "", " ")
|
|
runtimex.PanicOnError(err, "json.MarshalIndent failed")
|
|
fmt.Printf("%s\n", string(data))
|
|
}
|