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
37 lines
985 B
Go
37 lines
985 B
Go
package probeservices
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
)
|
|
|
|
type urlListResult struct {
|
|
Results []model.URLInfo `json:"results"`
|
|
}
|
|
|
|
// FetchURLList fetches the list of URLs used by WebConnectivity. The config
|
|
// argument contains the optional settings. Returns the list of URLs, on success,
|
|
// or an explanatory error, in case of failure.
|
|
func (c Client) FetchURLList(ctx context.Context, config model.URLListConfig) ([]model.URLInfo, error) {
|
|
query := url.Values{}
|
|
if config.CountryCode != "" {
|
|
query.Set("country_code", config.CountryCode)
|
|
}
|
|
if config.Limit > 0 {
|
|
query.Set("limit", fmt.Sprintf("%d", config.Limit))
|
|
}
|
|
if len(config.Categories) > 0 {
|
|
query.Set("category_codes", strings.Join(config.Categories, ","))
|
|
}
|
|
var response urlListResult
|
|
err := c.Client.GetJSONWithQuery(ctx, "/api/v1/test-list/urls", query, &response)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return response.Results, nil
|
|
}
|