diff --git a/.github/workflows/browerstack.yml b/.github/workflows/browerstack.yml index 2da8b7f40..f28cccd32 100644 --- a/.github/workflows/browerstack.yml +++ b/.github/workflows/browerstack.yml @@ -30,7 +30,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - name: Granting private modules access run: | diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 74355fd60..5ec8ff34c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,11 +20,13 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - name: Granting private modules access run: | git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/" - name: Run Unit tests + env: + GOPRIVATE: github.com/getlantern run: | go mod tidy go test -failfast -coverprofile=profile.cov ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6cb7682ee..51c04c035 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,10 @@ name: Publish releases on: - workflow_dispatch: + push: + branches: [ android-migrate ] + tags: + - '*' permissions: contents: read @@ -60,7 +63,7 @@ jobs: runs-on: group: large-runners steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: lfs: true @@ -70,14 +73,17 @@ jobs: # Install Flutter - uses: subosito/flutter-action@v2 with: - flutter-version: "3.10.5" + flutter-version: "3.16.9" channel: "stable" - run: flutter --version - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" + + - name: Install latest protoc-gen-go + run: go install github.com/golang/protobuf/protoc-gen-go@latest - name: Granting private modules access run: | @@ -125,10 +131,13 @@ jobs: fileDir: './android/app' encodedString: ${{ secrets.KEYSTORE }} + - run: touch app.env + - name: Build Android installers run: make package-android env: INTERSTITIAL_AD_UNIT: "${{ secrets.INTERSTITIAL_AD_UNIT_ID }}" + SENTRY_AUTH_TOKEN: "${{ secrets.SENTRY_AUTH_TOKEN }}" VERSION: "${{ env.version }}" - uses: actions/upload-artifact@v3 diff --git a/.gitignore b/.gitignore index e47fba771..be3476446 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ appium_kotlin/app/src/test/resources/local/local_config.json ios/internalsdk/Internalsdk.xcframework/ android/app/libs/liblantern-all.aar +*.env diff --git a/Makefile b/Makefile index 0a039de59..939f1f458 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,15 @@ lib/messaging/protos_flutteronly/messaging.pb.dart: protos_flutteronly/messaging lib/vpn/protos_shared/vpn.pb.dart: protos_shared/vpn.proto @protoc --dart_out=./lib/vpn --plugin=protoc-gen-dart=$$HOME/.pub-cache/bin/protoc-gen-dart protos_shared/vpn.proto -internalsdk/protos/%.pb.go: protos_shared/%.proto - @echo "Generating Go protobuf for $<" - @protoc --plugin=protoc-gen-go=build/protoc-gen-go \ - --go_out=internalsdk \ - $< +#internalsdk/protos/%.pb.go: protos_shared/%.proto +# @echo "Generating Go protobuf for $<" +# @protoc --plugin=protoc-gen-go=build/protoc-gen-go \ +# --go_out=internalsdk \ +# $< -#internalsdk/protos/vpn.pb.go: protos_shared/vpn.proto -# @protoc --go_out=internalsdk protos_shared/vpn.proto +internalsdk/protos/vpn.pb.go: protos_shared/vpn.proto + @protoc --go_out=internalsdk protos_shared/vpn.proto # Compiles autorouter routes routes: lib/core/router/router.gr.dart @@ -42,8 +42,6 @@ TEST ?= *_test # integration-test: # @flutter drive --driver test_driver/integration_driver.dart --debug --flavor prod --target `ls integration_test/$(TEST).dart` -GO_VERSION := 1.19 - TAG ?= $$VERSION TAG_HEAD := $(shell git rev-parse HEAD) INSTALLER_NAME ?= lantern-installer @@ -205,12 +203,6 @@ tag: require-version git commit -m "Updated changelog for $$VERSION" && \ git push -define check-go-version - if [ -z '${IGNORE_GO_VERSION}' ] && go version | grep -q -v $(GO_VERSION); then \ - echo "go $(GO_VERSION) is required." && exit 1; \ - fi -endef - guard-%: @ if [ -z '${${*}}' ]; then echo 'Environment variable $* not set' && exit 1; fi @@ -220,6 +212,9 @@ require-app: guard-APP .PHONY: require-version require-version: guard-VERSION +.PHONY: require-sentry-auth-token +require-secrets-dir: guard-SENTRY_AUTH_TOKEN + .PHONY: require-secrets-dir require-secrets-dir: guard-SECRETS_DIR @@ -271,8 +266,7 @@ release-autoupdate: require-version release: require-version require-s3cmd require-wget require-lantern-binaries require-release-track release-prod copy-beta-installers-to-mirrors invalidate-getlantern-dot-org upload-aab-to-play -$(ANDROID_LIB): - $(call check-go-version) && \ +$(ANDROID_LIB): $(GO_SOURCES) go env -w 'GOPRIVATE=github.com/getlantern/*' && \ go install golang.org/x/mobile/cmd/gomobile && \ gomobile init && \ @@ -327,11 +321,10 @@ pubget: @flutter pub get $(MOBILE_DEBUG_APK): $(MOBILE_SOURCES) $(GO_SOURCES) - @$(call check-go-version) && \ make do-android-debug && \ cp $(MOBILE_ANDROID_DEBUG) $(MOBILE_DEBUG_APK) -$(MOBILE_RELEASE_APK): $(MOBILE_SOURCES) $(GO_SOURCES) $(MOBILE_ANDROID_LIB) require-sentry +$(MOBILE_RELEASE_APK): $(MOBILE_SOURCES) $(GO_SOURCES) $(MOBILE_ANDROID_LIB) require-sentry require-sentry-auth-token echo $(MOBILE_ANDROID_LIB) && \ mkdir -p ~/.gradle && \ ln -fs $(MOBILE_DIR)/gradle.properties . && \ @@ -358,7 +351,7 @@ $(MOBILE_BUNDLE): $(MOBILE_SOURCES) $(GO_SOURCES) $(MOBILE_ANDROID_LIB) require- STICKY_CONFIG="$$STICKY_CONFIG" && \ PAYMENT_PROVIDER="$$PAYMENT_PROVIDER" && \ $(GRADLE) -PlanternVersion=$$VERSION -PlanternRevisionDate=$(REVISION_DATE) -PandroidArch=$(ANDROID_ARCH) -PandroidArchJava="$(ANDROID_ARCH_JAVA)" \ - -PddClientToken=$(DD_CLIENT_TOKEN) -PddApplicationID=$(DD_APPLICATION_ID) -PproServerUrl=$(PRO_SERVER_URL) -PpaymentProvider=$(PAYMENT_PROVIDER) \ + -PproServerUrl=$(PRO_SERVER_URL) -PpaymentProvider=$(PAYMENT_PROVIDER) \ -Pcountry=$(COUNTRY) -PplayVersion=true -PuseStaging=$(STAGING) -PstickyConfig=$(STICKY_CONFIG) -b $(MOBILE_DIR)/app/build.gradle bundlePlay && \ sentry-cli upload-dif --wait -o getlantern -p android build/app/intermediates/merged_native_libs/prodPlay/out/lib && \ cp $(MOBILE_ANDROID_BUNDLE) $(MOBILE_BUNDLE) @@ -399,7 +392,7 @@ android-release-install: $(MOBILE_RELEASE_APK) $(ADB) install -r $(MOBILE_RELEASE_APK) package-android: pubget require-version - @ANDROID_ARCH=arm32 make android-release && \ + @ANDROID_ARCH=all make android-release && \ ANDROID_ARCH=all make android-bundle && \ echo "-> $(MOBILE_RELEASE_APK)" @@ -442,7 +435,7 @@ build-framework: assert-go-version install-gomobile go env -w 'GOPRIVATE=github.com/getlantern/*' && \ gomobile init && \ gomobile bind -target=ios,iossimulator \ - -tags='headless lantern ios' \ + -tags='headless lantern ios netgo' \ -ldflags="$(LDFLAGS)" \ $(GOMOBILE_EXTRA_BUILD_FLAGS) \ github.com/getlantern/android-lantern/internalsdk github.com/getlantern/pathdb/testsupport github.com/getlantern/pathdb/minisql github.com/getlantern/flashlight/v7/ios diff --git a/android/app/build.gradle b/android/app/build.gradle index 94cad54f4..48407fa79 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,7 +6,7 @@ plugins { id 'kotlin-parcelize' id 'kotlin-kapt' id 'com.google.protobuf' - id "io.sentry.android.gradle" version "3.13.0" + id "io.sentry.android.gradle" version "4.2.0" } def localProperties = new Properties() @@ -395,7 +395,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:4.9.2' - implementation "androidx.webkit:webkit:1.7.0" + implementation "androidx.webkit:webkit:1.9.0" implementation 'com.kyleduo.switchbutton:library:2.1.0' implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' @@ -415,7 +415,8 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Google Play libraries - implementation 'com.android.billingclient:billing:6.0.1' + implementation 'com.android.billingclient:billing:6.1.0' +// implementation 'com.android.billingclient:billing-ktx:6.1.0' implementation 'com.google.android.gms:play-services-base:18.2.0' implementation 'com.google.android.gms:play-services-ads:22.4.0' @@ -446,6 +447,7 @@ dependencies { androidTestImplementation 'com.squareup.okhttp3:okhttp:4.9.2' testImplementation 'junit:junit:4.13.2' + testImplementation "io.mockk:mockk:1.13.5" implementation "com.github.YarikSOffice:lingver:1.3.0" // from https://github.com/getlantern/opus_android @@ -460,6 +462,25 @@ apply plugin: 'com.google.gms.google-services' sentry { + // Disables or enables debug log output, e.g. for for sentry-cli. + // Default is disabled. + debug = false + + // The slug of the Sentry organization to use for uploading proguard mappings/source contexts. + org = "getlantern" + + // The slug of the Sentry project to use for uploading proguard mappings/source contexts. + projectName = "android" + + // The authentication token to use for uploading proguard mappings/source contexts. + // WARNING: Do not expose this token in your build.gradle files, but rather set an environment + // variable and read it into this property. + authToken = System.getenv("SENTRY_AUTH_TOKEN") + + // The url of your Sentry instance. If you're using SAAS (not self hosting) you do not have to + // set this. If you are self hosting you can set your URL here + url = null + // Disables or enables the handling of Proguard mapping for Sentry. // If enabled the plugin will generate a UUID and will take care of // uploading the mapping to Sentry. If disabled, all the logic diff --git a/android/app/libs/liblantern-all.aar b/android/app/libs/liblantern-all.aar index 687cb15d3..97cf10f47 100644 --- a/android/app/libs/liblantern-all.aar +++ b/android/app/libs/liblantern-all.aar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcc19bfe34f4e22d0cfa8b70365fdea09461a30437b02c321aebfd73097b7757 -size 79879184 +oid sha256:ba02d66cad4c82257df848c01eb9f2b3bb9562cb1ef2edb674cce5f438cef4c3 +size 82901087 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f95e8b487..f8f0010eb 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -10,13 +10,17 @@ + + + - + diff --git a/android/app/src/main/java/org/getlantern/lantern/model/LanternHttpClient.java b/android/app/src/main/java/org/getlantern/lantern/model/LanternHttpClient.java deleted file mode 100644 index c6e8cd789..000000000 --- a/android/app/src/main/java/org/getlantern/lantern/model/LanternHttpClient.java +++ /dev/null @@ -1,495 +0,0 @@ -package org.getlantern.lantern.model; - -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.reflect.TypeToken; - -import org.getlantern.lantern.LanternApp; -import org.getlantern.lantern.util.Json; -import org.getlantern.mobilesdk.Logger; -import org.getlantern.mobilesdk.util.HttpClient; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import okhttp3.CacheControl; -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.FormBody; -import okhttp3.Headers; -import okhttp3.HttpUrl; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; -import okhttp3.ResponseBody; -import okio.Buffer; - -/** - * An OkHttp-based HTTP client. - */ -public class LanternHttpClient extends HttpClient { - private static final String TAG = LanternHttpClient.class.getName(); - - // the standard user headers sent with most Pro requests - private static final String DEVICE_ID_HEADER = "X-Lantern-Device-Id"; - private static final String USER_ID_HEADER = "X-Lantern-User-Id"; - private static final String PRO_TOKEN_HEADER = "X-Lantern-Pro-Token"; - private static final String APP_VERSION_HEADER = "X-Lantern-Version"; - private static final String PLATFORM_HEADER = "X-Lantern-Platform"; - - private static final MediaType JSON - = MediaType.parse("application/json; charset=utf-8"); - - /** - * Creates a new HTTP client - */ - public LanternHttpClient() { - super(); - } - - /** - * Creates a new HTTP client - * - * @param httpClient The HTTP client to use. - */ - public LanternHttpClient(final OkHttpClient httpClient) { - super(httpClient); - } - - public static HttpUrl createProUrl(final String uri) { - return createProUrl(uri, null); - } - - /** - * Constructs a url for a request to the pro server - * - * @param uri the requested resource - * @param params any query params to include with the url - * @return a URL - */ - public static HttpUrl createProUrl(final String uri, final Map params) { - final String url = String.format("http://localhost/pro%s", uri); - HttpUrl.Builder builder = HttpUrl.parse(url).newBuilder(); - if (params != null) { - for (Map.Entry param : params.entrySet()) { - builder.addQueryParameter(param.getKey(), param.getValue()); - } - } - return builder.build(); - } - - /** - * The HTTP headers expected with Pro requests for a user - */ - private Map userHeaders() { - final Map headers = new HashMap(); - headers.put(DEVICE_ID_HEADER, LanternApp.getSession().getDeviceID()); - headers.put(PRO_TOKEN_HEADER, LanternApp.getSession().getToken()); - headers.put(USER_ID_HEADER, String.valueOf(LanternApp.getSession().getUserID())); - headers.put(PLATFORM_HEADER, "android"); - headers.put(APP_VERSION_HEADER, Utils.appVersion(LanternApp.getAppContext())); - headers.putAll(LanternApp.getSession().getInternalHeaders()); - Logger.d(TAG, "User headers " + headers); - return headers; - } - - public void request(@NonNull final String method, @NonNull final HttpUrl url, - final HttpCallback cb) { - request(method, url, null, null, cb); - } - - public void request(@NonNull final String method, @NonNull final HttpUrl url, - final ProCallback cb) { - proRequest(method, url, null, null, cb); - } - - public void request(@NonNull final String method, @NonNull final HttpUrl url, - final boolean addProHeaders, - RequestBody body, final HttpCallback cb) { - if (addProHeaders) { - request(method, url, userHeaders(), body, cb); - } else { - request(method, url, null, body, cb); - } - } - - public void request(@NonNull final String method, @NonNull final HttpUrl url, - RequestBody body, final ProCallback cb) { - proRequest(method, url, userHeaders(), body, cb); - } - - /** - * GET request. - * - * @param url request URL - * @param cb for notifying the caller of an HTTP response or failure - */ - public void get(@NonNull final HttpUrl url, final ProCallback cb) { - proRequest("GET", url, userHeaders(), null, cb); - } - - /** - * POST request. - * - * @param url request URL - * @param body the data enclosed with the HTTP message - * @param cb the callback responded with an HTTP response or failure - */ - public void post(@NonNull final HttpUrl url, - final RequestBody body, @NonNull final ProCallback cb) { - proRequest("POST", url, userHeaders(), body, cb); - } - - private void processPlans(List fetched, final PlansCallback cb, InAppBilling inAppBilling) { - Map plans = new HashMap(); - Logger.debug(TAG, "Pro plans: " + fetched); - for (ProPlan plan : fetched) { - if (plan != null) { - plan.formatCost(); - Logger.debug(TAG, "New plan is " + plan); - plans.put(plan.getId(), plan); - } - } - if (inAppBilling != null) { - // this means we're in the play store, use the configured plans from there but with the - // renewal bonus from the server side plans - Map regularPlans = new HashMap<>(); - for (Map.Entry entry : plans.entrySet()) { - // Plans from the pro server have a version suffix, like '1y-usd-9' but plans from - // the Play Store don't, like '1y-usd'. So we normalize by dropping the version - // suffix. - regularPlans.put(entry.getKey().substring(0, entry.getKey().lastIndexOf("-")), entry.getValue()); - } - plans = inAppBilling.getPlans(); - for (Map.Entry entry : plans.entrySet()) { - ProPlan regularPlan = regularPlans.get(entry.getKey()); - if (regularPlan != null) { - entry.getValue().updateRenewalBonusExpected(regularPlan.getRenewalBonusExpected()); - } - } - } - cb.onSuccess(plans); - } - - private void processPlansV1(final JsonObject result, final PlansCallback cb, InAppBilling inAppBilling) { - String stripePubKey = result.get("providers").getAsJsonObject().get("stripe").getAsJsonObject().get("pubKey").getAsString(); - LanternApp.getSession().setStripePubKey(stripePubKey); - Type listType = new TypeToken>() { - }.getType(); - Logger.debug(TAG, "Plans: " + result.get("plans")); - final List fetched = Json.gson.fromJson(result.get("plans"), listType); - processPlans(fetched, cb, inAppBilling); - } - - private void processPlansV3(final JsonObject result, final PlansV3Callback cb, InAppBilling inAppBilling) { - Type mapType = new TypeToken>>() { - }.getType(); - Map> response = Json.gson.fromJson(result.get("providers"), mapType); - List providers = response.get("android"); - Type listType = new TypeToken>() { - }.getType(); - final List fetched = Json.gson.fromJson(result.get("plans"), listType); - Logger.debug(TAG, "Payment providers: " + providers); - Map plans = new HashMap(); - for (ProPlan plan : fetched) { - if (plan != null) { - plan.formatCost(); - plans.put(plan.getId(), plan); - } - } - cb.onSuccess(plans, providers); - } - - public void sendLinkRequest(final ProCallback cb) { - final HttpUrl url = createProUrl("/user-link-request"); - final RequestBody formBody = new FormBody.Builder() - .add("email", LanternApp.getSession().email()) - .add("deviceName", LanternApp.getSession().deviceName()) - .build(); - - post(url, formBody, - new LanternHttpClient.ProCallback() { - @Override - public void onFailure(final Throwable throwable, final ProError error) { - if (cb != null) { - cb.onFailure(throwable, error); - } - } - - @Override - public void onSuccess(final Response response, final JsonObject result) { - if (result.get("error") != null) { - onFailure(null, new ProError(result)); - } else if (cb != null) { - cb.onSuccess(response, result); - } - } - }); - } - - /** - * Returns all user data, including payments, referrals, and all available - * fields. - * - * @param cb for notifying the caller of an HTTP response or failure - */ - public void userData(final ProUserCallback cb) { - final Map params = new HashMap(); - params.put("locale", LanternApp.getSession().getLanguage()); - final HttpUrl url = createProUrl("/user-data", params); - get(url, new ProCallback() { - @Override - public void onFailure(final Throwable throwable, final ProError error) { - Logger.error(TAG, "Unable to fetch user data", throwable); - if (cb != null) { - cb.onFailure(throwable, error); - } - } - - @Override - public void onSuccess(final Response response, final JsonObject result) { - try { - Logger.debug(TAG, "JSON response" + result.toString()); - final ProUser user = Json.gson.fromJson(result, ProUser.class); - if (user != null) { - Logger.debug(TAG, "User ID is " + user.getUserId()); - LanternApp.getSession().storeUserData(user); - } - if (cb != null) { - cb.onSuccess(response, user); - } - } catch (Exception e) { - Logger.error(TAG, "Unable to fetch user data: " + e.getMessage(), e); - } - } - }); - } - - public void plans(final PlansCallback cb, InAppBilling inAppBilling) { - final Map params = new HashMap(); - params.put("locale", LanternApp.getSession().getLanguage()); - params.put("countrycode", LanternApp.getSession().getCountryCode()); - final HttpUrl url = createProUrl("/plans", params); - final Map plans = new HashMap(); - get(url, new ProCallback() { - @Override - public void onFailure(final Throwable throwable, final ProError error) { - Logger.error(TAG, "Unable to fetch plans", throwable); - cb.onFailure(throwable, error); - } - - @Override - public void onSuccess(final Response response, final JsonObject result) { - try { - Logger.debug(TAG, "JSON response for " + url + ":" + result.toString()); - processPlansV1(result, cb, inAppBilling); - } catch (Exception e) { - Logger.error(TAG, "Unable to fetch plans: " + e.getMessage(), e); - } - } - }); - } - - public void plansV3(final PlansV3Callback cb, InAppBilling inAppBilling) { - final Map params = new HashMap(); - params.put("locale", LanternApp.getSession().getLanguage()); - params.put("countrycode", LanternApp.getSession().getCountryCode()); - final HttpUrl url = createProUrl("/plans-v3", params); - final Map plans = new HashMap(); - get(url, new ProCallback() { - @Override - public void onFailure(final Throwable throwable, final ProError error) { - Logger.error(TAG, "Unable to fetch plans", throwable); - cb.onFailure(throwable, error); - } - - @Override - public void onSuccess(final Response response, final JsonObject result) { - try { - Logger.debug(TAG, "JSON response for " + url + ":" + result.toString()); - processPlansV3(result, cb, inAppBilling); - } catch (Exception e) { - Logger.error(TAG, "Unable to fetch plans: " + e.getMessage(), e); - } - } - }); - } - - - public void plansV3(final PlansCallback cb, InAppBilling inAppBilling) { - plansV3(cb, inAppBilling); - } - - public void getPlans(final PlansCallback cb, InAppBilling inAppBilling) { - plans(cb, inAppBilling); - } - - /** - * Convert a JsonObject json into a RequestBody that transmits content - * - * @param json the JsonObject to be converted - */ - public static RequestBody createJsonBody(final JsonObject json) { - return RequestBody.create(JSON, json.toString()); - } - - public void request(@NonNull final String method, @NonNull final HttpUrl url, - final Map headers, - RequestBody body, final HttpCallback cb) { - Request.Builder builder = new Request.Builder() - .cacheControl(CacheControl.FORCE_NETWORK); - if (headers != null) { - builder = builder.headers(Headers.of(headers)); - } - builder = builder.url(url); - - if (method != null && method.equals("POST")) { - if (body == null) { - body = RequestBody.create(null, new byte[0]); - } - builder = builder.post(body); - } - final Request request = builder.build(); - httpClient.newCall(request).enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException e) { - if (cb != null) - cb.onFailure(e); - } - - @Override - public void onResponse(Call call, Response response) throws IOException { - if (!response.isSuccessful()) { - Logger.error(TAG, "Request to " + url + " failed"); - Logger.error(TAG, "Response: " + response); - final ResponseBody body = response.body(); - if (body != null) { - Logger.error(TAG, "Body: " + body.string()); - } - cb.onFailure(null); - return; - } - cb.onSuccess(response); - } - }); - } - - /** - * Creates a new HTTP request to be enqueued for later execution - * - * @param method the HTTP method - * @param url the URL target of this request - * @param headers the HTTP header fields to add to the request - * @param body the body of a POST request - * @param cb to notify the caller of an HTTP response or failure - */ - private void proRequest(@NonNull final String method, @NonNull final HttpUrl url, - final Map headers, - RequestBody body, final ProCallback cb) { - Request.Builder builder = new Request.Builder() - .cacheControl(CacheControl.FORCE_NETWORK); - if (headers != null) { - builder = builder.headers(Headers.of(headers)); - } - builder = builder.url(url); - - if (method != null && method.equals("POST")) { - if (body == null) { - body = RequestBody.create(null, new byte[0]); - } - builder = builder.post(body); - } - final Request request = builder.build(); - httpClient.newCall(request).enqueue(new Callback() { - @Override - public void onFailure(Call call, IOException e) { - if (e != null) { - final ProError error = new ProError("", e.getMessage()); - cb.onFailure(e, error); - } - } - - @Override - public void onResponse(Call call, Response response) throws IOException { - if (!response.isSuccessful()) { - Logger.error(TAG, "Request to " + url + " failed"); - Logger.error(TAG, "Response: " + response); - final ResponseBody body = response.body(); - if (body != null) { - Logger.error(TAG, "Body: " + body.string()); - } - final ProError error = new ProError("", "Unexpected response code from server"); - cb.onFailure(null, error); - return; - } - final String responseData = response.body().string(); - JsonObject result; - if (responseData == null) { - Logger.error(TAG, String.format("Invalid response body for %s request", url)); - return; - } - try { - result = (new JsonParser()).parse(responseData).getAsJsonObject(); - } catch (Throwable t) { - Logger.debug(TAG, "Not a JSON response"); - final ResponseBody body = ResponseBody.create(null, responseData); - cb.onSuccess(response.newBuilder().body(body).build(), null); - return; - } - if (result.get("error") != null) { - final String error = result.get("error").getAsString(); - Logger.error(TAG, "Error making request to " + url + ":" + result + " error:" + error); - cb.onFailure(null, new ProError(result)); - } else if (cb != null) { - cb.onSuccess(response, result); - } - } - }); - } - - public interface ProCallback { - public void onFailure(@Nullable Throwable throwable, @Nullable final ProError error); - - public void onSuccess(Response response, JsonObject result); - } - - public interface ProUserCallback { - public void onFailure(@Nullable Throwable throwable, @Nullable final ProError error); - - public void onSuccess(Response response, final ProUser userData); - } - - public interface HttpCallback { - public void onFailure(@Nullable Throwable throwable); - - public void onSuccess(Response response); - } - - public interface PlansCallback { - public void onFailure(@Nullable Throwable throwable, @Nullable final ProError error); - - public void onSuccess(Map plans); - } - - public interface PlansV3Callback { - public void onFailure(@Nullable Throwable throwable, @Nullable final ProError error); - - public void onSuccess(Map plans, List methods); - } - - public interface YuansferCallback { - public void onFailure(@Nullable Throwable throwable, @Nullable final ProError error); - - public void onSuccess(String paymentInfo); - } -} diff --git a/android/app/src/main/java/org/getlantern/lantern/model/ProError.java b/android/app/src/main/java/org/getlantern/lantern/model/ProError.java deleted file mode 100644 index 438ce1a38..000000000 --- a/android/app/src/main/java/org/getlantern/lantern/model/ProError.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.getlantern.lantern.model; - -import androidx.annotation.NonNull; - -import com.google.gson.JsonObject; - -public class ProError { - - private String id; - private String message; - private JsonObject details; - - public ProError(@NonNull final String id, @NonNull final String message) { - this.id = id; - this.message = message; - } - - public ProError(@NonNull final JsonObject result) { - if (result.get("errorId") != null) { - this.id = result.get("errorId").getAsString(); - } - if (result.get("error") != null) { - this.message = result.get("error").getAsString(); - } - if (result.get("details") != null) { - this.details = result.get("details").getAsJsonObject(); - } - } - - public String getMessage() { - return message; - } - - public String getId() { - return id; - } - - public JsonObject getDetails() { - return details; - } - - public String toString() { - return String.format("Error; id=%s message=%s", id, message); - } -} diff --git a/android/app/src/main/java/org/getlantern/lantern/model/ProUser.java b/android/app/src/main/java/org/getlantern/lantern/model/ProUser.java deleted file mode 100644 index 0c6fc74f2..000000000 --- a/android/app/src/main/java/org/getlantern/lantern/model/ProUser.java +++ /dev/null @@ -1,164 +0,0 @@ -package org.getlantern.lantern.model; - -import com.google.gson.annotations.SerializedName; - -import org.joda.time.Days; -import org.joda.time.Months; -import org.joda.time.LocalDateTime; - -import java.util.List; - -import org.getlantern.mobilesdk.Logger; - -public class ProUser { - - private static final String TAG = ProUser.class.getName(); - - public ProUser() { - - } - - @SerializedName("userId") - private Long userId; - - @SerializedName("token") - private String token; - - @SerializedName("referral") - private String referral; - - @SerializedName("email") - private String email; - - @SerializedName("userStatus") - private String userStatus; - - @SerializedName("code") - private String code; - - @SerializedName("subscription") - private String subscription; - - @SerializedName("expiration") - private Long expiration; - - @SerializedName("devices") - private List devices; - - - @SerializedName("userLevel") - public String userLevel; - - public void setUserId(final Long userId) { - this.userId = userId; - } - - public Long getUserId() { - return userId; - } - - public void setToken(final String token) { - this.token = token; - } - - public String getToken() { - return token; - } - - public String getUserLevel() { - return this.userLevel; - } - - public void setUserLevel(final String level) { this.userLevel = level; } - - public void setReferral(final String referral) { - this.referral = referral; - } - - public String getReferral() { - return referral; - } - - public void setEmail(final String email) { - this.email = email; - } - - public String getEmail() { - return email; - } - - public void setUserStatus(final String userStatus) { - this.userStatus = userStatus; - } - - public String getUserStatus() { - return userStatus; - } - - public Boolean isProUser() { - return userStatus != null && userStatus.equals("active"); - } - - public void setCode(final String code) { - this.code = code; - } - - public String getCode() { - return code; - } - - public void setExpiration(final Long expiration) { - this.expiration = expiration; - } - - public Long getExpiration() { - return expiration; - } - - public LocalDateTime getExpirationDate() { - final Long expiration = getExpiration(); - if (expiration == null) { - return null; - } - return new LocalDateTime(expiration * 1000); - } - - public Integer monthsLeft() { - final LocalDateTime expDate = getExpirationDate(); - if (expDate != null) { - final int months = Months.monthsBetween(LocalDateTime.now(), expDate).getMonths(); - return months; - } - return null; - } - - public Integer daysLeft() { - final LocalDateTime expDate = getExpirationDate(); - if (expiration != null) { - final int days = Days.daysBetween(LocalDateTime.now(), expDate).getDays(); - Logger.debug(TAG, "Number of days until Pro account expires " + days); - return days; - } - return null; - } - - public Boolean isActive() { - return userStatus != null && userStatus.equals("active"); - } - - public Boolean isExpired() { - return userStatus != null && userStatus.equals("expired"); - } - - public List getDevices() { - return devices; - } - - public String toString() { - return String.format("User ID %d status %s expiration %d Pro user %b", userId, userStatus, expiration, isProUser()); - } - - public String newUserDetails() { - return String.format("User ID %d referral", userId, referral); - } -} diff --git a/android/app/src/main/java/org/getlantern/mobilesdk/model/IssueReporter.kt b/android/app/src/main/java/org/getlantern/mobilesdk/model/IssueReporter.kt index 1d2267a05..fc441566d 100644 --- a/android/app/src/main/java/org/getlantern/mobilesdk/model/IssueReporter.kt +++ b/android/app/src/main/java/org/getlantern/mobilesdk/model/IssueReporter.kt @@ -1,25 +1,27 @@ package org.getlantern.mobilesdk.model -import android.app.Activity -import android.app.ProgressDialog import android.content.Context -import android.os.AsyncTask import android.os.Build +import io.flutter.plugin.common.MethodChannel +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import org.getlantern.lantern.LanternApp import org.getlantern.lantern.R -import org.getlantern.lantern.util.showAlertDialog import org.getlantern.mobilesdk.Logger // IssueReporter calls Go's `internalsdk/issue.go:SendIssueReport` method to // submit issue reports. If successful, onSuccess() callback would trigger, // else onError(). -class IssueReporter @JvmOverloads constructor( +class IssueReporter( private val context: Context, private val issue: String, private val description: String?, -) : AsyncTask() { - private var dialog: ProgressDialog? = null - + private val methodCallResult: MethodChannel.Result +) { + companion object { + private val TAG = IssueReporter::class.java.name + } // The below maps indexes of issues in the drop-down to indexes of the corresponding issue type // as understood by internalsdk.SendIssueReport @@ -36,67 +38,6 @@ class IssueReporter @JvmOverloads constructor( 9 to 9, // OTHER ) - fun onError(message: String) { - dialog?.let { dialog -> - if (dialog.isShowing) { - dialog.dismiss() - } - } - (context as Activity).showAlertDialog( - context.getString(R.string.unable_to_submit_issue), - message, - // Don't close the dialog if there's an error. This'll remove the - // user's input. Let the user close the dialog or try again if they - // want. - finish = false, - ) - } - - fun onSuccess() { - dialog?.let { dialog -> - if (dialog.isShowing) { - dialog.dismiss() - } - } - (context as Activity).showAlertDialog( - context.getString(R.string.report_sent), - context.getString(R.string.thank_you_for_reporting_your_issue), - // Close the dialog after a successful send. - finish = true, - ) - } - - override fun onPreExecute() { - dialog?.let { dialog -> - dialog.setMessage(context.resources.getString(R.string.sending_request)) - dialog.show() - } - } - - override fun doInBackground(vararg params: String): Boolean { - val session = LanternApp.getSession() - try { - val issueType = issueTypeIndexes[issues().indexOf(issue)] ?: 9 // default to OTHER - internalsdk.Internalsdk.sendIssueReport( - session, - issueType.toString(), - description, - if (session.isProUser) "pro" else "free", - session.email(), - Build.DEVICE, - Build.MODEL, - "" + Build.VERSION.SDK_INT + " (" + Build.VERSION.RELEASE + ")" - ) - onSuccess() - Logger.e(TAG, "Report sent successfully:") - return true - } catch (e: Exception) { - Logger.error(TAG, "Error submitting issue report: ", e) - onError(e.localizedMessage) - return false - } - } - private fun issues() = arrayOf( context.resources.getString(R.string.common_issue_list_0), context.resources.getString(R.string.common_issue_list_1), @@ -110,13 +51,31 @@ class IssueReporter @JvmOverloads constructor( context.resources.getString(R.string.common_issue_list_9), ) - companion object { - private val TAG = IssueReporter::class.java.name + + fun reportIssue() { + CoroutineScope(Dispatchers.IO).launch { + try { + sendIssueReport() + methodCallResult.success("Report sent successfully") + } catch (e: Exception) { + Logger.e(TAG, "Error while sending report issue :$e") + methodCallResult.error("report_issue_fail", "Error while report issue :$e", e) + } + } } - init { - dialog = ProgressDialog(context) - dialog!!.setCancelable(false) - dialog!!.setCanceledOnTouchOutside(false) + private fun sendIssueReport() { + val session = LanternApp.getSession() + val issueType = issueTypeIndexes[issues().indexOf(issue)] ?: 9 // default to OTHER + internalsdk.Internalsdk.sendIssueReport( + session, + issueType.toString(), + description, + if (session.isProUser) "pro" else "free", + session.email(), + Build.DEVICE, + Build.MODEL, + Build.VERSION.SDK_INT.toString() + " (" + Build.VERSION.RELEASE + ")" + ) } } diff --git a/android/app/src/main/java/org/getlantern/mobilesdk/model/SessionManager.kt b/android/app/src/main/java/org/getlantern/mobilesdk/model/SessionManager.kt index 574a9a8f5..716ad96b5 100644 --- a/android/app/src/main/java/org/getlantern/mobilesdk/model/SessionManager.kt +++ b/android/app/src/main/java/org/getlantern/mobilesdk/model/SessionManager.kt @@ -31,6 +31,7 @@ import org.getlantern.mobilesdk.Logger import org.getlantern.mobilesdk.Settings import org.getlantern.mobilesdk.StartResult import org.getlantern.mobilesdk.util.DnsDetector +import org.getlantern.mobilesdk.util.LanguageHelper import org.greenrobot.eventbus.EventBus import java.io.PrintWriter import java.io.StringWriter @@ -199,6 +200,9 @@ abstract class SessionManager(application: Application) : Session { val serverCountry: String? get() = prefs.getString(SERVER_COUNTRY, "") + val ipAddress: String? + get() = prefs.getString(IP_ADDRESS, "") + override fun getCountryCode(): String { val forceCountry = forcedCountryCode return if (forceCountry.isNotEmpty()) { @@ -383,6 +387,10 @@ abstract class SessionManager(application: Application) : Session { return staging } + override fun setIP(ipAddress: String) { + prefs.edit().putString(IP_ADDRESS, ipAddress).apply() + } + override fun setCountry(country: String) { prefs.edit().putString(GEO_COUNTRY_CODE, country).apply() } @@ -397,6 +405,7 @@ abstract class SessionManager(application: Application) : Session { adsBlocked: Long, hasSucceedingProxy: Boolean, ) { + Logger.debug("updateStats", "city $city, country $country, countryCode $countryCode") if (hasUpdatedStats.compareAndSet(false, true)) { // The first time that we get the stats, hasSucceedingProxy is always false because we // haven't hit any proxies yet. So, we just ignore the stats. @@ -502,6 +511,7 @@ abstract class SessionManager(application: Application) : Session { protected const val PREF_NAME = "LanternSession" protected const val LATEST_BANDWIDTH = "latest_bandwidth" protected const val GEO_COUNTRY_CODE = "geo_country_code" + protected const val IP_ADDRESS = "ip_address" protected const val SERVER_COUNTRY = "server_country" protected const val SERVER_COUNTRY_CODE = "server_country_code" protected const val SERVER_CITY = "server_city" @@ -570,6 +580,8 @@ abstract class SessionManager(application: Application) : Session { db.registerType(2004, Vpn.PaymentProviders::class.java) db.registerType(2005, Vpn.PaymentMethod::class.java) db.registerType(2006, Vpn.AppData::class.java) + db.registerType(2007, Vpn.ServerInfo::class.java) + Logger.debug(TAG, "register types finished at ${System.currentTimeMillis() - start}") val prefsAdapter = db.asSharedPreferences( context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE), @@ -585,7 +597,8 @@ abstract class SessionManager(application: Application) : Session { // this condition is unnecessary // Todo remove this soon - if (prefs.getInt(ACCEPTED_TERMS_VERSION, 0) == 0) prefs.edit().putInt(ACCEPTED_TERMS_VERSION, 0).apply() + if (prefs.getInt(ACCEPTED_TERMS_VERSION, 0) == 0) prefs.edit() + .putInt(ACCEPTED_TERMS_VERSION, 0).apply() Logger.debug(TAG, "prefs.edit() finished at ${System.currentTimeMillis() - start}") internalHeaders = context.getSharedPreferences( @@ -607,6 +620,15 @@ abstract class SessionManager(application: Application) : Session { Logger.debug(TAG, "Lingver.init() finished at ${System.currentTimeMillis() - start}") } else { locale = Lingver.init(application).getLocale() + // Here check if we support device language localization + // if not then set default language to English + locale = + if (LanguageHelper.supportLanguages.contains("${locale!!.language}_${locale!!.country}")) { + locale + } else { + // Default language is English + Locale("en", "US") + } Logger.debug(TAG, "Lingver.init() finished at ${System.currentTimeMillis() - start}") Logger.debug(TAG, "Configured language was empty, using %1\$s", locale) setLocale(locale) diff --git a/android/app/src/main/java/org/getlantern/mobilesdk/util/LanguageHelper.kt b/android/app/src/main/java/org/getlantern/mobilesdk/util/LanguageHelper.kt new file mode 100644 index 000000000..211659563 --- /dev/null +++ b/android/app/src/main/java/org/getlantern/mobilesdk/util/LanguageHelper.kt @@ -0,0 +1,26 @@ +package org.getlantern.mobilesdk.util + +class LanguageHelper { + + companion object { + val supportLanguages = arrayListOf( + "en_US", + "fa_IR", + "zh_CN", + "zh_HK", + "ms_MY", + "my_MM", + "ru_RU", + "tr_TR", + "hi_IN", + "ur_IN", + "ar_EG", + "vi_VN", + "th_TH", + "es_ES", + "fr_FR", + "bn_BD", + ) + } + +} \ No newline at end of file diff --git a/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt b/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt index ce64ceeec..fb997241e 100644 --- a/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt +++ b/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt @@ -2,8 +2,6 @@ package io.lantern.model import android.app.Activity import android.content.Intent -import android.os.AsyncTask -import android.os.Build import androidx.core.content.ContextCompat import com.google.gson.JsonObject import com.google.protobuf.ByteString @@ -29,11 +27,11 @@ import org.getlantern.lantern.model.LanternHttpClient.ProUserCallback import org.getlantern.lantern.model.ProError import org.getlantern.lantern.model.ProUser import org.getlantern.lantern.model.Utils +import org.getlantern.lantern.plausible.Plausible import org.getlantern.lantern.util.AutoUpdater import org.getlantern.lantern.util.PaymentsUtil import org.getlantern.lantern.util.PermissionUtil import org.getlantern.lantern.util.castToBoolean -import org.getlantern.lantern.util.openHome import org.getlantern.lantern.util.restartApp import org.getlantern.lantern.util.showAlertDialog import org.getlantern.lantern.util.showErrorDialog @@ -59,7 +57,9 @@ class SessionModel( companion object { private const val TAG = "SessionModel" const val PATH_PRO_USER = "prouser" + const val PATH_SELECTED_TAB = "/selectedTab" const val PATH_PLAY_VERSION = "playVersion" + const val PATH_SERVER_INFO = "/server_info" const val PATH_SDK_VERSION = "sdkVersion" const val PATH_USER_LEVEL = "userLevel" @@ -79,6 +79,10 @@ class SessionModel( PATH_PRO_USER, castToBoolean(tx.get(PATH_PRO_USER), false), ) + tx.put( + PATH_SELECTED_TAB, + tx.get(PATH_SELECTED_TAB) ?: "vpn", + ) tx.put( PATH_USER_LEVEL, tx.get(PATH_USER_LEVEL) ?: "", @@ -90,7 +94,9 @@ class SessionModel( // hard disable chat tx.put(SessionManager.CHAT_ENABLED, false) tx.put(PATH_SDK_VERSION, Internalsdk.sdkVersion()) + } + updateAppsData() checkAdsAvailability() } @@ -98,7 +104,7 @@ class SessionModel( fun checkAdsAvailability() { //This check is just safe guard //So if something goes wrong in backend we should not show ads to pro users at any case - if(LanternApp.getSession().isProUser){ + if (LanternApp.getSession().isProUser) { db.mutate { tx -> tx.put(SHOULD_SHOW_GOOGLE_ADS, false) tx.put(SHOULD_SHOW_CAS_ADS, false) @@ -107,9 +113,19 @@ class SessionModel( } Logger.debug(TAG, "checkAdsAvailability called") val googleAds = shouldShowAdsBasedRegion { LanternApp.getSession().shouldShowAdsEnabled() } - Logger.debug(TAG, "checkAdsAvailability with googleAds values $googleAds enable ${LanternApp.getSession().shouldShowAdsEnabled()}") + Logger.debug( + TAG, + "checkAdsAvailability with googleAds values $googleAds enable ${ + LanternApp.getSession().shouldShowAdsEnabled() + }" + ) val casAds = shouldShowAdsBasedRegion { LanternApp.getSession().shouldCASShowAdsEnabled() } - Logger.debug(TAG, "checkAdsAvailability with cas values $googleAds enable ${LanternApp.getSession().shouldCASShowAdsEnabled()}") + Logger.debug( + TAG, + "checkAdsAvailability with cas values $googleAds enable ${ + LanternApp.getSession().shouldCASShowAdsEnabled() + }" + ) db.mutate { tx -> tx.put(SHOULD_SHOW_GOOGLE_ADS, googleAds) tx.put(SHOULD_SHOW_CAS_ADS, casAds) @@ -119,9 +135,10 @@ class SessionModel( override fun doOnMethodCall(call: MethodCall, result: MethodChannel.Result) { when (call.method) { - "authorizeViaEmail" -> authorizeViaEmail(call.argument("emailAddress")!!, result) + "authorizeViaEmail" -> requestRecoveryEmail(call.argument("emailAddress")!!, result) "checkEmailExists" -> checkEmailExists(call.argument("emailAddress")!!, result) "requestLinkCode" -> requestLinkCode(result) + "redeemLinkCode" -> redeemLinkCode(result) "resendRecoveryCode" -> sendRecoveryCode(result) "validateRecoveryCode" -> validateRecoveryCode(call.argument("code")!!, result) "approveDevice" -> approveDevice(call.argument("code")!!, result) @@ -152,6 +169,7 @@ class SessionModel( ) "submitGooglePlayPayment" -> paymentsUtil.submitGooglePlayPayment( + call.argument("email")!!, call.argument("planID")!!, result, ) @@ -181,6 +199,11 @@ class SessionModel( } } + "trackUserAction" -> { + val props: Map = mapOf("title" to call.argument("title")!!) + Plausible.event(call.argument("name")!!, url = call.argument("url")!!, props = props) + } + "acceptTerms" -> { LanternApp.getSession().acceptTerms() } @@ -206,7 +229,7 @@ class SessionModel( "setSelectedTab" -> { db.mutate { tx -> - tx.put("/selectedTab", call.argument("tab")!!) + tx.put(PATH_SELECTED_TAB, call.argument("tab")!!) } } @@ -295,31 +318,31 @@ class SessionModel( tx.put( path, Vpn.AppData.newBuilder() - .setPackageName(it.packageName).setName(it.name) + .setPackageName(it.packageName).setName(it.name).setIcon(ByteString.copyFrom(it.icon)) .build() ) } } } - // Then add icons - db.mutate { tx -> - appsList.forEach { - val path = PATH_APPS_DATA + it.packageName - tx.get(path)?.let { existing -> - if (existing.icon.isEmpty) { - it.icon.let { icon -> - tx.put( - path, - existing.toBuilder() - .setIcon(ByteString.copyFrom(icon)) - .build(), - ) - } - } - } - } - } +// // Then add icons +// db.mutate { tx -> +// appsList.forEach { +// val path = PATH_APPS_DATA + it.packageName +// tx.get(path)?.let { existing -> +// if (existing.icon.isEmpty) { +// it.icon.let { icon -> +// tx.put( +// path, +// existing.toBuilder() +// .setIcon(ByteString.copyFrom(icon)) +// .build(), +// ) +// } +// } +// } +// } +// } } } @@ -360,27 +383,38 @@ class SessionModel( val code = result["code"].asString val expireAt = result["expireAt"].asLong LanternApp.getSession().setDeviceCode(code, expireAt) - methodCallResult.success(null) + methodCallResult.success(code) } } }, ) } - private fun redeemLinkCode() { + private fun redeemLinkCode(methodCallResult: MethodChannel.Result) { val formBody = FormBody.Builder() .add("code", LanternApp.getSession().deviceCode()!!) .add("deviceName", LanternApp.getSession().deviceName()) .build() + Logger.info(TAG, "Redeeming link code") lanternClient.post( - LanternHttpClient.createProUrl("/link-code-request"), + LanternHttpClient.createProUrl("/link-code-redeem"), formBody, object : ProCallback { override fun onFailure(t: Throwable?, error: ProError?) { Logger.error(TAG, "Error making link redeem request..", t) + if (error == null) { + activity.runOnUiThread { + methodCallResult.error("unknownError", null, null) + } + return + } + activity.runOnUiThread { + methodCallResult.error("linkCodeError", error.id, null) + } } override fun onSuccess(response: Response?, result: JsonObject?) { + Logger.debug(TAG, "redeem link code response: $result") if (result == null || result["token"] == null || result["userID"] == null) return Logger.debug(TAG, "Successfully redeemed link code") val userID = result["userID"].asLong @@ -392,6 +426,7 @@ class SessionModel( addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) } activity.startActivity(intent) + // methodCallResult.success(null) } }, ) @@ -416,63 +451,29 @@ class SessionModel( ) } - private fun authorizeViaEmail(emailAddress: String, methodCallResult: MethodChannel.Result) { - Logger.debug(TAG, "Start Account recovery with email $emailAddress") - - LanternApp.getSession().setEmail(emailAddress) + private fun requestRecoveryEmail(emailAddress: String, methodCallResult: MethodChannel.Result) { + val session = LanternApp.getSession() + session.setEmail(emailAddress) val formBody = FormBody.Builder() .add("email", emailAddress) + .add("deviceName", session.deviceName()) + .add("locale", session.locale()) .build() lanternClient.post( - LanternHttpClient.createProUrl("/user-recover"), + LanternHttpClient.createProUrl("/user-link-request"), formBody, object : ProCallback { override fun onSuccess(response: Response?, result: JsonObject?) { - Logger.debug(TAG, "Account recovery response: $result") - if (result!!["token"] != null && result["userID"] != null) { - Logger.debug(TAG, "Successfully recovered account") - // update token and user ID with those returned by the pro server - LanternApp.getSession() - .setUserIdAndToken(result["userID"].asLong, result["token"].asString) - LanternApp.getSession().linkDevice() - LanternApp.getSession().setIsProUser(true) - activity.showAlertDialog( - activity.getString(R.string.device_added), - activity.getString(R.string.device_authorized_pro), - ContextCompat.getDrawable(activity, R.drawable.ic_filled_check), - { - activity.openHome() - }, - ) - } else { - Logger.error(TAG, "Got empty recovery result, can't continue") - activity.runOnUiThread { - methodCallResult.error("unknownError", null, null) - } - return + activity.runOnUiThread { + methodCallResult.success("Recovery code sent") } } override fun onFailure(t: Throwable?, error: ProError?) { - if (error == null) { - Logger.error(TAG, "Unable to recover account and no error to show") - activity.runOnUiThread { - methodCallResult.error("unknownError", t?.message, null) - } - return - } - - val errorId = error.id - if (errorId == "wrong-device") { - sendRecoveryCode(methodCallResult) - } else if (errorId == "wrong-email" || errorId == "cannot-recover-user") { - activity.runOnUiThread { - methodCallResult.error("unableToRecover", errorId, null) - } - activity.showErrorDialog(activity.resources.getString(R.string.cannot_find_email)) - } else { - Logger.error(TAG, "Unknown error recovering account:$error") + Logger.error(TAG, "Failure on requestRecoveryEmail", error) + activity.runOnUiThread { + methodCallResult.error("unknownError", t?.message, null) } } }, @@ -527,9 +528,8 @@ class SessionModel( } } - override fun onSuccess(response: Response, result: JsonObject) { - Logger.debug(TAG, "Response: $result") - if (result["token"] != null && result["userID"] != null) { + override fun onSuccess(response: Response?, result: JsonObject?) { + if (result != null && result["token"] != null && result["userID"] != null) { Logger.debug(TAG, "Successfully validated recovery code") // update token and user ID with those returned by the pro server // update token and user ID with those returned by the pro server @@ -537,11 +537,11 @@ class SessionModel( .setUserIdAndToken(result["userID"].asLong, result["token"].asString) LanternApp.getSession().linkDevice() LanternApp.getSession().setIsProUser(true) - activity.showAlertDialog( - activity.getString(R.string.device_added), - activity.getString(R.string.device_authorized_pro), - ContextCompat.getDrawable(activity, R.drawable.ic_filled_check), - { activity.openHome() }) + activity.runOnUiThread { + methodCallResult.success( + activity.getString(R.string.device_added), + ) + } } } }, @@ -565,7 +565,7 @@ class SessionModel( activity.showErrorDialog(activity.resources.getString(R.string.invalid_verification_code)) } - override fun onSuccess(response: Response, result: JsonObject) { + override fun onSuccess(response: Response?, result: JsonObject?) { lanternClient.userData(object : ProUserCallback { override fun onSuccess(response: Response, userData: ProUser) { Logger.debug(TAG, "Successfully updated userData") @@ -613,12 +613,9 @@ class SessionModel( activity, issue, description, + methodCallResult, ) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - issueReporter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) - } else { - issueReporter.execute() - } + issueReporter.reportIssue() } private fun removeDevice(deviceId: String, methodCallResult: MethodChannel.Result) { @@ -642,7 +639,7 @@ class SessionModel( activity.showErrorDialog(activity.resources.getString(R.string.unable_remove_device)) } - override fun onSuccess(response: Response, result: JsonObject) { + override fun onSuccess(response: Response?, result: JsonObject?) { Logger.debug(TAG, "Successfully removed device") val isLogout = deviceId == LanternApp.getSession().deviceID @@ -706,4 +703,10 @@ class SessionModel( ) // This will be localized Flutter-side } } + + fun saveServerInfo(serverInfo: Vpn.ServerInfo) { + db.mutate { tx -> + tx.put(PATH_SERVER_INFO, serverInfo) + } + } } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt b/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt index eae34557c..56cebcd71 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt @@ -8,6 +8,7 @@ import androidx.multidex.MultiDex import org.getlantern.lantern.model.InAppBilling import org.getlantern.lantern.model.LanternHttpClient import org.getlantern.lantern.model.LanternSessionManager +import org.getlantern.lantern.plausible.Plausible import org.getlantern.lantern.util.debugOnly import org.getlantern.lantern.util.LanternProxySelector //import org.getlantern.lantern.util.SentryUtil @@ -49,7 +50,7 @@ open class LanternApp : Application() { LanternProxySelector(session) - if (session.isStoreVersion) inAppBilling = InAppBilling(this) + inAppBilling = InAppBilling(this) lanternHttpClient = LanternHttpClient() @@ -94,14 +95,6 @@ open class LanternApp : Application() { return lanternHttpClient } - @JvmStatic - fun getPlans(cb: LanternHttpClient.PlansCallback) { - lanternHttpClient.getPlans( - cb, - if (session.isStoreVersion && !session.isRussianUser) inAppBilling else null - ) - } - @JvmStatic fun getSession(): LanternSessionManager { return session diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt b/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt index f81e11429..09321d225 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt @@ -1,7 +1,6 @@ package org.getlantern.lantern import android.annotation.SuppressLint -import android.content.Context import android.content.Intent import android.content.IntentFilter import android.content.pm.PackageManager @@ -17,7 +16,6 @@ import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.engine.FlutterEngine -import io.flutter.embedding.engine.FlutterEngineCache import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel import io.lantern.model.MessagingModel @@ -31,7 +29,6 @@ import org.getlantern.lantern.activity.WebViewActivity_ import org.getlantern.lantern.event.EventManager import org.getlantern.lantern.model.AccountInitializationStatus import org.getlantern.lantern.model.Bandwidth -import org.getlantern.lantern.model.LanternHttpClient.PlansCallback import org.getlantern.lantern.model.LanternHttpClient.PlansV3Callback import org.getlantern.lantern.model.LanternHttpClient.ProUserCallback import org.getlantern.lantern.model.LanternStatus @@ -44,6 +41,7 @@ import org.getlantern.lantern.model.Utils import org.getlantern.lantern.model.VpnState import org.getlantern.lantern.notification.NotificationHelper import org.getlantern.lantern.notification.NotificationReceiver +import org.getlantern.lantern.plausible.Plausible import org.getlantern.lantern.service.LanternService_ import org.getlantern.lantern.util.PermissionUtil import org.getlantern.lantern.util.PlansUtil @@ -61,9 +59,7 @@ import org.greenrobot.eventbus.ThreadMode import java.util.Locale import java.util.concurrent.* -class MainActivity : - FlutterActivity(), - MethodChannel.MethodCallHandler, +class MainActivity : FlutterActivity(), MethodChannel.MethodCallHandler, CoroutineScope by MainScope() { private lateinit var messagingModel: MessagingModel private lateinit var vpnModel: VpnModel @@ -71,13 +67,15 @@ class MainActivity : private lateinit var replicaModel: ReplicaModel private lateinit var eventManager: EventManager private lateinit var flutterNavigation: MethodChannel - private lateinit var accountInitDialog: AlertDialog private lateinit var notifications: NotificationHelper private lateinit var receiver: NotificationReceiver + private var accountInitDialog: AlertDialog? = null private var autoUpdateJob: Job? = null private val lanternClient = LanternApp.getLanternHttpClient() - override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { + override fun configureFlutterEngine( + @NonNull flutterEngine: FlutterEngine, + ) { val start = System.currentTimeMillis() super.configureFlutterEngine(flutterEngine) messagingModel = MessagingModel(this, flutterEngine) @@ -89,6 +87,9 @@ class MainActivity : eventManager = object : EventManager("lantern_event_channel", flutterEngine) { override fun onListen(event: Event) { if (LanternApp.getSession().lanternDidStart()) { + Plausible.init(applicationContext) + Logger.debug(TAG, "Plausible initialized") + Plausible.enable(true) fetchLoConf() Logger.debug( TAG, @@ -128,7 +129,6 @@ class MainActivity : override fun onCreate(savedInstanceState: Bundle?) { val start = System.currentTimeMillis() super.onCreate(savedInstanceState) - Logger.debug(TAG, "Default Locale is %1\$s", Locale.getDefault()) if (!EventBus.getDefault().isRegistered(this)) { EventBus.getDefault().register(this) @@ -164,7 +164,8 @@ class MainActivity : this@MainActivity, receiver, it, - ContextCompat.RECEIVER_NOT_EXPORTED) + ContextCompat.RECEIVER_NOT_EXPORTED, + ) } } @@ -194,13 +195,17 @@ class MainActivity : override fun onDestroy() { super.onDestroy() + accountInitDialog?.let { it.dismiss() } vpnModel.destroy() sessionModel.destroy() replicaModel.destroy() EventBus.getDefault().unregister(this) } - override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + override fun onMethodCall( + call: MethodCall, + result: MethodChannel.Result, + ) { when (call.method) { "showLastSurvey" -> { showSurvey(lastSurvey) @@ -226,33 +231,29 @@ class MainActivity : when (status.status) { AccountInitializationStatus.Status.PROCESSING -> { accountInitDialog = AlertDialog.Builder(this).create() - accountInitDialog.setCancelable(false) + accountInitDialog?.setCancelable(false) val inflater: LayoutInflater = this.layoutInflater val dialogView = inflater.inflate(R.layout.init_account_dialog, null) - accountInitDialog.setView(dialogView) + accountInitDialog?.setView(dialogView) val tvMessage: TextView = dialogView.findViewById(R.id.tvMessage) tvMessage.text = getString(R.string.init_account, appName) - dialogView.findViewById(R.id.btnCancel) - .setOnClickListener { - EventBus.getDefault().removeStickyEvent(status) - accountInitDialog.dismiss() - finish() - } - accountInitDialog.show() + dialogView.findViewById(R.id.btnCancel).setOnClickListener { + EventBus.getDefault().removeStickyEvent(status) + accountInitDialog?.dismiss() + finish() + } + accountInitDialog?.show() } AccountInitializationStatus.Status.SUCCESS -> { EventBus.getDefault().removeStickyEvent(status) - if (accountInitDialog != null) { - accountInitDialog.dismiss() - } + accountInitDialog?.let { it.dismiss() } } AccountInitializationStatus.Status.FAILURE -> { EventBus.getDefault().removeStickyEvent(status) - if (accountInitDialog != null) { - accountInitDialog.dismiss() - } + accountInitDialog?.let { it.dismiss() } + Utils.showAlertDialog( this, getString(R.string.connection_error), @@ -274,7 +275,6 @@ class MainActivity : @Subscribe(threadMode = ThreadMode.MAIN) fun lanternStarted(status: LanternStatus) { updateUserData() - updatePlans() updatePaymentMethods() } @@ -283,63 +283,81 @@ class MainActivity : eventManager.onNewEvent(event = event) } + @Subscribe(threadMode = ThreadMode.MAIN) + fun statsUpdated(stats: Stats) { + Logger.debug("Stats updated", stats.toString()) + sessionModel.saveServerInfo( + Vpn.ServerInfo.newBuilder().setCity(stats.city).setCountry(stats.country) + .setCountryCode(stats.countryCode).build(), + ) + } + private fun updateUserData() { - lanternClient.userData(object : ProUserCallback { - override fun onFailure(throwable: Throwable?, error: ProError?) { - Logger.error(TAG, "Unable to fetch user data: $error", throwable) - } + lanternClient.userData( + object : ProUserCallback { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { + Logger.error(TAG, "Unable to fetch user data: $error", throwable) + } - override fun onSuccess(response: Response, user: ProUser?) { - val devices = user?.getDevices() - val deviceID = LanternApp.getSession().deviceID() - // if the payment test mode is enabled - // then do nothing To avoid restarting app while debugging - // we are setting static user for payment mode - if (user?.isProUser == false || LanternApp.getSession().isPaymentTestMode) return - - // Switch to free account if device it not linked - devices?.filter { it.id == deviceID }?.run { - if (isEmpty()) { - LanternApp.getSession().logout() - restartApp() + override fun onSuccess( + response: Response, + user: ProUser, + ) { + val devices = user?.devices + val deviceID = LanternApp.getSession().deviceID() + // if the payment test mode is enabled + // then do nothing To avoid restarting app while debugging + // we are setting static user for payment mode + if (user?.isProUser == false || LanternApp.getSession().isPaymentTestMode) return + + // Switch to free account if device it not linked + devices?.filter { it.id == deviceID }?.run { + if (isEmpty()) { + LanternApp.getSession().logout() + restartApp() + } } } - } - }) + }, + ) } - private fun updatePlans() { - lanternClient.getPlans(object : PlansCallback { - override fun onFailure(throwable: Throwable?, error: ProError?) { - Logger.error(TAG, "Unable to fetch user plans: $error", throwable) - } - - override fun onSuccess(proPlans: Map) { - Logger.debug(TAG, "Successfully fetched plans") - for (planId in proPlans.keys) { - proPlans[planId]?.let { PlansUtil.updatePrice(activity, it) } + private fun updatePaymentMethods() { + lanternClient.plansV3( + object : PlansV3Callback { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { + Logger.error(TAG, "Unable to fetch payment methods: $error", throwable) } - LanternApp.getSession().setUserPlans(proPlans) + override fun onSuccess( + proPlans: Map, + paymentMethods: List, + + ) { + Logger.debug(TAG, "Successfully fetched payment methods") + processPaymentMethods(proPlans, paymentMethods) + } } - }, null) + ) } - private fun updatePaymentMethods() { - lanternClient.plansV3(object : PlansV3Callback { - override fun onFailure(throwable: Throwable?, error: ProError?) { - Logger.error(TAG, "Unable to fetch payment methods: $error", throwable) - } - override fun onSuccess( - proPlans: Map, - paymentMethods: List - ) { - Logger.debug(TAG, "Successfully fetched payment methods") - LanternApp.getSession().setPaymentMethods(paymentMethods) + fun processPaymentMethods( + proPlans: Map, + paymentMethods: List, - } - }, null) + ) { + for (planId in proPlans.keys) { + proPlans[planId]?.let { PlansUtil.updatePrice(activity, it) } + } + LanternApp.getSession().setUserPlans(proPlans) + LanternApp.getSession().setPaymentMethods(paymentMethods) } @Subscribe(threadMode = ThreadMode.MAIN) @@ -523,7 +541,7 @@ class MainActivity : TAG, "VPN enabled, starting Lantern...", ) - //If user come here it mean user has all permissions needed + // If user come here it mean user has all permissions needed // Also user given permission for VPN service dialog as well LanternApp.getSession().setHasFirstSessionCompleted(true) sessionModel.checkAdsAvailability() @@ -535,7 +553,6 @@ class MainActivity : } } - override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, @@ -579,20 +596,23 @@ class MainActivity : } } - override fun onActivityResult(request: Int, response: Int, data: Intent?) { + override fun onActivityResult( + request: Int, + response: Int, + data: Intent?, + ) { super.onActivityResult(request, response, data) if (request == REQUEST_VPN) { val useVpn = response == RESULT_OK updateStatus(useVpn) if (useVpn) { startVpnService() - //This check is for new user that will start app first time + // This check is for new user that will start app first time // this mean user has already given // system permissions LanternApp.getSession().setHasFirstSessionCompleted(true) sessionModel.checkAdsAvailability() } - } } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt index 375a3f420..2934f5d91 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt @@ -7,6 +7,7 @@ import android.os.Looper import androidx.annotation.UiThread import com.android.billingclient.api.BillingClient import com.android.billingclient.api.BillingClient.SkuType +import com.android.billingclient.api.BillingClient.SkuType.* import com.android.billingclient.api.BillingClientStateListener import com.android.billingclient.api.BillingFlowParams import com.android.billingclient.api.BillingResult @@ -16,9 +17,9 @@ import com.android.billingclient.api.Purchase import com.android.billingclient.api.PurchasesUpdatedListener import com.android.billingclient.api.SkuDetails import com.android.billingclient.api.SkuDetailsParams +import com.android.billingclient.api.SkuDetailsParams.* import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailability -import org.getlantern.lantern.LanternApp import org.getlantern.mobilesdk.Logger import java.util.concurrent.ConcurrentHashMap @@ -27,7 +28,6 @@ class InAppBilling( private val builder: BillingClient.Builder = BillingClient.newBuilder(context).enablePendingPurchases(), private val googleApiAvailability: GoogleApiAvailability = GoogleApiAvailability.getInstance(), ) : PurchasesUpdatedListener, InAppBillingInterface { - companion object { private val TAG = InAppBilling::class.java.simpleName } @@ -78,8 +78,8 @@ class InAppBilling( initConnection() } } - override fun onBillingServiceDisconnected() = - Logger.d(TAG, "onBillingServiceDisconnected") + + override fun onBillingServiceDisconnected() = Logger.d(TAG, "onBillingServiceDisconnected") }, ) } @@ -99,11 +99,12 @@ class InAppBilling( private fun BillingResult.responseCodeOK() = responseCode == BillingClient.BillingResponseCode.OK @Synchronized - fun startPurchase(activity: Activity, id: String, cb: PurchasesUpdatedListener) { + fun startPurchase( + activity: Activity, + planID: String, + cb: PurchasesUpdatedListener, + ) { this.purchasesUpdated = cb - var planID = id - val currency = LanternApp.getSession().getCurrency() - if (currency != null) planID += "-$currency" val skuDetails = skus.get(planID.lowercase()) if (skuDetails == null) { Logger.e(TAG, "Unable to find sku details for plan: $planID") @@ -119,7 +120,10 @@ class InAppBilling( } @UiThread - private fun launchBillingFlow(activity: Activity, params: BillingFlowParams) { + private fun launchBillingFlow( + activity: Activity, + params: BillingFlowParams, + ) { ensureConnected { launchBillingFlow(activity, params) .takeIf { billingResult -> !billingResult.responseCodeOK() } @@ -129,7 +133,10 @@ class InAppBilling( } } - override fun onPurchasesUpdated(billingResult: BillingResult, purchases: List?) { + override fun onPurchasesUpdated( + billingResult: BillingResult, + purchases: List?, + ) { Logger.d(TAG, "Purchases updated") purchasesUpdated?.let { it.onPurchasesUpdated(billingResult, purchases) @@ -140,9 +147,10 @@ class InAppBilling( private fun updateSkus() { Logger.d(TAG, "Updating SKUs") val skuList = listOf("1y", "2y") - val params = SkuDetailsParams.newBuilder() - .setType(SkuType.INAPP) - .setSkusList(skuList) + val params = + newBuilder() + .setType(INAPP) + .setSkusList(skuList) ensureConnected { querySkuDetailsAsync( params.build(), @@ -157,7 +165,7 @@ class InAppBilling( skus.clear() skuDetailsList?.forEach { val currency = it.getPriceCurrencyCode().lowercase() - val id = "${it.getSku()}-$currency" + val id = it.getSku() val years = it.getSku().substring(0, 1) val price = it.getPriceAmountMicros() / 10000 val priceWithoutTax = it.getOriginalPriceAmountMicros() / 10000 @@ -204,7 +212,7 @@ class InAppBilling( Logger.d(TAG, "Checking for pending purchases") ensureConnected { queryPurchasesAsync( - SkuType.INAPP, + INAPP, ) { billingResult: BillingResult, purchases: List? -> if (!billingResult.responseCodeOK()) { isRetriable(billingResult).then { handlePendingPurchases() } @@ -224,8 +232,9 @@ class InAppBilling( private fun handleAcknowledgedPurchases(purchases: List) { for (purchase in purchases) { ensureConnected { - val consumeParams = ConsumeParams.newBuilder().setPurchaseToken(purchase.purchaseToken) - .build() + val consumeParams = + ConsumeParams.newBuilder().setPurchaseToken(purchase.purchaseToken) + .build() val listener = ConsumeResponseListener { billingResult: BillingResult, outToken: String? -> if (!billingResult.responseCodeOK()) { diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt index bc8de3b7d..04a6995b0 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt @@ -1,21 +1,18 @@ package org.getlantern.lantern.model import android.app.Application -import android.content.res.Resources import android.text.TextUtils import io.lantern.model.Vpn -import org.getlantern.lantern.BuildConfig -import org.getlantern.lantern.R import org.getlantern.lantern.activity.WelcomeActivity_ import org.getlantern.mobilesdk.Logger import org.getlantern.mobilesdk.model.SessionManager import org.greenrobot.eventbus.EventBus import org.joda.time.LocalDateTime import java.text.SimpleDateFormat -import java.util.concurrent.ConcurrentHashMap import java.util.Currency import java.util.Date import java.util.Locale +import java.util.concurrent.ConcurrentHashMap class LanternSessionManager(application: Application) : SessionManager(application) { private var plans: ConcurrentHashMap = ConcurrentHashMap() @@ -130,7 +127,10 @@ class LanternSessionManager(application: Application) : SessionManager(applicati } private fun setExpiration(expiration: Long?) { - if (expiration == null) { + if (expiration == null || expiration == 0L) { + prefs.edit().putLong(EXPIRY_DATE, 0) + .putString(EXPIRY_DATE_STR, "") + .apply() return } val expiry = Date(expiration * 1000) @@ -277,6 +277,7 @@ class LanternSessionManager(application: Application) : SessionManager(applicati linkDevice() } + setExpiration(user.expiration) setExpired(user.isExpired) setIsProUser(user.isProUser) @@ -293,8 +294,8 @@ class LanternSessionManager(application: Application) : SessionManager(applicati if (user.isProUser) { EventBus.getDefault().post(UserStatus(user.isActive, user.monthsLeft().toLong())) - prefs.edit().putInt(PRO_MONTHS_LEFT, user.monthsLeft()) - .putInt(PRO_DAYS_LEFT, user.daysLeft()) + prefs.edit().putInt(PRO_MONTHS_LEFT, user.monthsLeft() ?: 0) + .putInt(PRO_DAYS_LEFT, user.daysLeft() ?: 0) .apply() } } @@ -316,23 +317,43 @@ class LanternSessionManager(application: Application) : SessionManager(applicati tx.put( path, Vpn.Plan.newBuilder().setId(it.id) - .setDescription(it.description).setBestValue(it.bestValue).setUsdPrice(it.usdEquivalentPrice) - .putAllPrice(it.price).setTotalCostBilledOneTime(it.totalCostBilledOneTime).setOneMonthCost(it.oneMonthCost) - .setTotalCost(it.totalCost).setFormattedBonus(it.formattedBonus).setRenewalText(it.renewalText).build(), + .setDescription(it.description).setBestValue(it.bestValue) + .setUsdPrice(it.usdEquivalentPrice) + .putAllPrice(it.price).setTotalCostBilledOneTime(it.totalCostBilledOneTime) + .setOneMonthCost(it.oneMonthCost) + .setTotalCost(it.totalCost).setFormattedBonus(it.formattedBonus) + .setRenewalText(it.renewalText).build(), ) } } } fun setPaymentMethods(paymentMethods: List) { + if (paymentMethods.isEmpty()) { + return + } + db.mutate { tx -> - paymentMethods.forEachIndexed { index, it -> + paymentMethods.forEachIndexed { index, methods -> + // Check if payment method or provider is empty then return + if (methods.providers.isEmpty()) { + return@forEachIndexed + } val path = PAYMENT_METHODS + index + val planItem = + Vpn.PaymentMethod.newBuilder().setMethod(methods.method.toString().lowercase()) + .addAllProviders( + methods.providers.map { + Vpn.PaymentProviders.newBuilder() + .setName(it.name.toString().lowercase()) + .addAllLogoUrls(it.logoUrl) + .build() + }, + ).build() + tx.put( path, - Vpn.PaymentMethod.newBuilder().setMethod(it.method.toString().lowercase()).addAllProviders( - it.providers.map { Vpn.PaymentProviders.newBuilder().setName(it.name.toString().lowercase()).build() }, - ).build(), + planItem, ) } } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/PaymentMethod.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/PaymentMethod.kt index d852064e0..202ca4361 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/PaymentMethod.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/PaymentMethod.kt @@ -2,6 +2,7 @@ package org.getlantern.lantern.model import com.google.gson.annotations.SerializedName + enum class PaymentMethod(val method: String) { @SerializedName("credit-card") CreditCard("credit-card"), @@ -26,3 +27,8 @@ data class PaymentMethods( @SerializedName("method") var method: PaymentMethod, @SerializedName("providers") var providers: List, ) + +data class Icons( + @SerializedName("paymentwall") val paymentwall: List, + @SerializedName("stripe") val stripe: List +) diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt new file mode 100644 index 000000000..31a63a8e1 --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt @@ -0,0 +1,17 @@ +package org.getlantern.lantern.model + +import com.google.gson.JsonObject + +data class ProError( + val id: String, + val message: String, + val details: JsonObject? = null +) { + constructor(result: JsonObject) : this( + result.get("errorId").asString, + result.get("error").asString, + result.get("details").asJsonObject, + ) { + + } +} \ No newline at end of file diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt new file mode 100644 index 000000000..1c3e72cce --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt @@ -0,0 +1,47 @@ +package org.getlantern.lantern.model + +import org.joda.time.Days +import org.joda.time.LocalDateTime +import org.joda.time.Months + +data class ProUser( + val userId: Long, + val token: String, + val referral: String, + val email: String, + val userStatus: String, + val code: String, + val subscription: String, + val expiration: Long, + val devices: List, + val userLevel: String, +) { + private fun isUserStatus(status: String) = userStatus == status + + private fun expirationDate() = if (expiration == null) null else LocalDateTime(expiration * 1000) + + fun monthsLeft(): Int { + val expDate = expirationDate() + if (expDate == null) return 0 + return Months.monthsBetween(LocalDateTime.now(), expDate).getMonths() + } + + fun daysLeft(): Int { + val expDate = expirationDate() + if (expDate == null) return 0 + return Days.daysBetween(LocalDateTime.now(), expDate).getDays() + } + + fun newUserDetails(): String { + return "User ID $userId referral $referral" + } + + val isProUser: Boolean + get() = isUserStatus("active") + + val isActive: Boolean + get() = isProUser + + val isExpired: Boolean + get() = isUserStatus("expired") +} diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProviderInfo.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProviderInfo.kt index c5725b8e4..0b87d3283 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProviderInfo.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProviderInfo.kt @@ -17,5 +17,7 @@ enum class PaymentProvider(val provider: String) { data class ProviderInfo( @SerializedName("name") var name: PaymentProvider, - @SerializedName("data") var data: Map -) \ No newline at end of file + @SerializedName("data") var data: Map, + var logoUrl: List +) + diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/plausible/Event.kt b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/Event.kt new file mode 100644 index 000000000..074086112 --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/Event.kt @@ -0,0 +1,22 @@ +package org.getlantern.lantern.plausible + +import org.getlantern.lantern.util.Json + +internal data class Event( + val domain: String, + val name: String, + val url: String, + val referrer: String, + val screenWidth: Int, + val props: Map? +) { + companion object { + fun fromJson(json: String): Event? = try { + Json.gson.fromJson(json, Event::class.java) + } catch (ignored: Exception) { + null + } + } +} + +internal fun Event.toJson(): String = Json.gson.toJson(this) diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/plausible/Plausible.kt b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/Plausible.kt new file mode 100644 index 000000000..c6e9a5302 --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/Plausible.kt @@ -0,0 +1,107 @@ +package org.getlantern.lantern.plausible + +import android.content.Context +import java.util.concurrent.atomic.AtomicReference +import org.getlantern.mobilesdk.Logger + +// Singleton for sending events to Plausible. +object Plausible { + private val client: AtomicReference = AtomicReference(null) + private val config: AtomicReference = AtomicReference(null) + + fun init(context: Context) { + val config = AndroidResourcePlausibleConfig(context) + val client = NetworkFirstPlausibleClient(config) + init(client, config) + } + + internal fun init(client: PlausibleClient, config: PlausibleConfig) { + this.client.set(client) + this.config.set(config) + } + + // Enable or disable event sending + @Suppress("unused") + fun enable(enable: Boolean) { + config.get() + ?.let { + it.enable = enable + } + ?: Logger.d("Plausible", "Ignoring call to enable(). Did you forget to call Plausible.init()?") + } + + /** + * The raw value of User-Agent is used to calculate the user_id which identifies a unique + * visitor in Plausible. + * User-Agent is also used to populate the Devices report in your + * Plausible dashboard. The device data is derived from the open source database + * device-detector. If your User-Agent is not showing up in your dashboard, it's probably + * because it is not recognized as one in the device-detector database. + */ + @Suppress("unused") + fun setUserAgent(userAgent: String) { + config.get() + ?.let { + it.userAgent = userAgent + } + ?: Logger.d("Plausible", "Ignoring call to setUserAgent(). Did you forget to call Plausible.init()?") + } + + /** + * Send a `pageview` event. + * + * @param url URL of the page where the event was triggered. If the URL contains UTM parameters, + * they will be extracted and stored. + * The URL parameter will feel strange in a mobile app but you can manufacture something that looks + * like a web URL. If you name your mobile app screens like page URLs, Plausible will know how to + * handle it. So for example, on your login screen you could send something like + * `app://localhost/login`. The pathname (/login) is what will be shown as the page value in the + * Plausible dashboard. + * @param referrer Referrer for this event. + * Plausible uses the open source referer-parser database to parse referrers and assign these + */ + fun pageView( + url: String, + referrer: String = "", + props: Map? = null + ) = event( + name = "pageview", + url = url, + referrer = referrer, + props = props + ) + + /** + * Send a custom event. To send a `pageview` event, consider using [pageView] instead. + * + * @param name Name of the event. Can specify `pageview` which is a special type of event in + * Plausible. All other names will be treated as custom events. + * @param url URL of the page where the event was triggered. If the URL contains UTM parameters, + * they will be extracted and stored. + * The URL parameter will feel strange in a mobile app but you can manufacture something that looks + * like a web URL. If you name your mobile app screens like page URLs, Plausible will know how to + * handle it. So for example, on your login screen you could send something like + * `app://localhost/login`. The pathname (/login) is what will be shown as the page value in the + * Plausible dashboard. + * @param referrer Referrer for this event. + * Plausible uses the open source referer-parser database to parse referrers and assign these + * source categories. + */ + @Suppress("MemberVisibilityCanBePrivate") + fun event( + name: String, + url: String = "", + referrer: String = "", + props: Map? = null + ) { + client.get() + ?.let { client -> + config.get() + ?.let { config -> + client.event(config.domain, name, url, referrer, config.screenWidth, props) + } + ?: Logger.d("Plausible", "Ignoring call to event(). Did you forget to call Plausible.init()?") + } + ?: Logger.d("Plausible", "Ignoring call to event(). Did you forget to call Plausible.init()?") + } +} \ No newline at end of file diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt new file mode 100644 index 000000000..0f73811bf --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt @@ -0,0 +1,214 @@ +package org.getlantern.lantern.plausible + +import android.net.Uri +import androidx.annotation.VisibleForTesting +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.suspendCancellableCoroutine +import okhttp3.Call +import okhttp3.Callback +import okhttp3.HttpUrl.Companion.toHttpUrl +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody.Companion.toRequestBody +import okhttp3.Response +import org.getlantern.lantern.LanternApp +import org.getlantern.mobilesdk.Logger +import java.io.File +import java.io.FileNotFoundException +import java.io.IOException +import java.net.InetSocketAddress +import java.net.Proxy +import java.net.URI +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.resume +import kotlin.coroutines.resumeWithException + +internal interface PlausibleClient { + // See [Plausible.event] for details on parameters. + // @return true if the event was successfully processed and false if not + fun event( + domain: String, + name: String, + url: String, + referrer: String, + screenWidth: Int, + props: Map? = null, + ) { + var correctedUrl = Uri.parse(url) + if (correctedUrl.scheme.isNullOrBlank()) { + correctedUrl = correctedUrl.buildUpon().scheme("app").build() + } + if (correctedUrl.authority.isNullOrBlank()) { + correctedUrl = correctedUrl.buildUpon().authority("localhost").build() + } + return event( + Event( + domain, + name, + correctedUrl.toString(), + referrer, + screenWidth, + props?.mapValues { (_, v) -> v.toString() }, + ), + ) + } + + fun event(event: Event) +} + +// The primary client for sending events to Plausible. It will attempt to send events immediately, +// caching them to disk to send later upon failure. +internal class NetworkFirstPlausibleClient( + private val config: PlausibleConfig, + coroutineContext: CoroutineContext = Dispatchers.IO, +) : PlausibleClient { + private val coroutineScope = CoroutineScope(coroutineContext) + + init { + coroutineScope.launch { + config.eventDir.mkdirs() + config.eventDir.listFiles()?.forEach { + if (!it.exists()) return@forEach + try { + val event = Event.fromJson(it.readText()) + if (event == null) { + Logger.e(TAG, "Failed to decode event JSON, discarding") + it.delete() + return@forEach + } + postEvent(event) + } catch (e: FileNotFoundException) { + Logger.e(TAG, "Could not open event file", e) + return@forEach + } catch (e: IOException) { + return@forEach + } + it.delete() + } + } + } + + override fun event(event: Event) { + coroutineScope.launch { + suspendEvent(event) + } + } + + @VisibleForTesting + internal suspend fun suspendEvent(event: Event) { + try { + postEvent(event) + } catch (e: IOException) { + if (!config.retryOnFailure) return + val file = File(config.eventDir, "event_${System.currentTimeMillis()}.json") + file.writeText(event.toJson()) + var retryAttempts = 0 + var retryDelay = 1000L + while (retryAttempts < 5) { + delay(retryDelay) + retryDelay = + when (retryDelay) { + 1000L -> 60_000L + 60_000L -> 360_000L + 360_000L -> 600_000L + else -> break + } + try { + postEvent(event) + file.delete() + break + } catch (e: IOException) { + retryAttempts++ + } + } + } + } + + // postEvent sends an event directly to the Plausible API. The X-Forwarded-For header is used to explicitly set the + // IP address of the client. Since we are sending events from our proxies, we have to make sure to override this header + // with the correct IP address of the client. Plausible does not store the raw value of the IP address: it is only used + // to calculate a unique user_id and to fill in the Location report with the country, region and city data of the visitor. + private suspend fun postEvent(event: Event) { + if (!config.enable) { + Logger.e("Plausible", "Plausible disabled, not sending event: $event") + return + } + val session = LanternApp.getSession() + Logger.d(TAG, "Sending event ${event.toJson()}") + val body = event.toJson().toRequestBody("application/json".toMediaType()) + val url = + config.host + .toHttpUrl() + .newBuilder() + .addPathSegments("api/event") + .build() + + val request = + Request.Builder() + .url(url) + .addHeader("User-Agent", config.userAgent) + .addHeader("X-Forwarded-For", session.ipAddress ?: "127.0.0.1") + .addHeader("Content-Type", "application/json") + .post(body) + .build() + suspendCancellableCoroutine { continuation -> + val call = okHttpClient.newCall(request) + continuation.invokeOnCancellation { + call.cancel() + } + + call.enqueue( + object : Callback { + override fun onFailure( + call: Call, + e: IOException, + ) { + Logger.e(TAG, "Failed to send event to backend $e") + continuation.resumeWithException(e) + } + + override fun onResponse( + call: Call, + response: Response, + ) { + response.use { res -> + if (res.isSuccessful) { + continuation.resume(Unit) + } else { + val e = + IOException( + "Received unexpected response: ${res.code} ${res.body?.string()}", + ) + onFailure(call, e) + } + } + } + }, + ) + } + } + + val okHttpClient: OkHttpClient by lazy { + val session = LanternApp.getSession() + val hTTPAddr = session.hTTPAddr + val uri = URI("http://" + hTTPAddr) + Logger.d(TAG, "Setting http proxy address to $uri") + val proxy = + Proxy( + Proxy.Type.HTTP, + InetSocketAddress( + "127.0.0.1", + uri.getPort(), + ), + ) + OkHttpClient.Builder().proxy(proxy).build() + } + + companion object { + private val TAG = NetworkFirstPlausibleClient::class.java.simpleName + } +} diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleConfig.kt b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleConfig.kt new file mode 100644 index 000000000..98528106d --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleConfig.kt @@ -0,0 +1,88 @@ +package org.getlantern.lantern.plausible + +import android.content.Context +import android.content.res.Resources +import android.os.Build +import org.getlantern.lantern.R +import java.io.File +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicReference +import kotlin.math.roundToInt + +private val DEFAULT_USER_AGENT = + "Android ${Build.VERSION.RELEASE} ${Build.MANUFACTURER} ${Build.PRODUCT} ${Build.FINGERPRINT.hashCode()}" +private const val DEFAULT_PLAUSIBLE_HOST = "https://plausible.io" + +// Configuration options for the Plausible SDK. See the [Events API reference](https://plausible.io/docs/events-api) for more details +interface PlausibleConfig { + // Domain name of the site in Plausible + var domain: String + + // Whether or not events should be sent. Use this to allow users to opt-in or opt-out for + // example. + var enable: Boolean + + // Directory to persist events upon upload failure. + val eventDir: File + + // The host for the Plausible backend server. Defaults to `https://plausible.io` + var host: String + + // Whether or not to attempt to resend events upon failure. If true, events will be serialized + // to disk in [eventDir] and the upload will be retried later. + var retryOnFailure: Boolean + + // Width of the screen in dp. + val screenWidth: Int + + // The raw value of User-Agent is used to calculate the user_id which identifies a unique + // visitor in Plausible. + var userAgent: String +} + +open class ThreadSafePlausibleConfig( + override val eventDir: File, + override val screenWidth: Int, +) : PlausibleConfig { + private val enableRef = AtomicBoolean(true) + override var enable: Boolean + get() = enableRef.get() + set(value) = enableRef.set(value) + + private val domainRef = AtomicReference("") + override var domain: String + get() = domainRef.get() + set(value) = domainRef.set(value) + + private val hostRef = AtomicReference(DEFAULT_PLAUSIBLE_HOST) + override var host: String + get() = hostRef.get() ?: "" + set(value) = hostRef.set(value.ifBlank { DEFAULT_PLAUSIBLE_HOST }) + + private val retryRef = AtomicBoolean(true) + override var retryOnFailure: Boolean + get() = retryRef.get() + set(value) = retryRef.set(value) + + private val userAgentRef = AtomicReference(DEFAULT_USER_AGENT) + override var userAgent: String + get() = userAgentRef.get() + set(value) = userAgentRef.set(value.ifBlank { DEFAULT_USER_AGENT }) +} + +class AndroidResourcePlausibleConfig(context: Context) : ThreadSafePlausibleConfig( + eventDir = File(context.applicationContext.filesDir, "events"), + screenWidth = + with(Resources.getSystem().displayMetrics) { + widthPixels / density + }.roundToInt(), +) { + init { + domain = context.resources.getString(R.string.plausible_domain) + host = context.resources.getString(R.string.plausible_host) + context.resources.getString(R.string.plausible_enable_startup).toBooleanStrictOrNull() + ?.let { + enable = it + } + } +} diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt b/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt index ac39595ae..a55cd84b1 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt @@ -55,7 +55,8 @@ open class LanternService : Service(), Runnable { private val started: AtomicBoolean = AtomicBoolean() private lateinit var autoUpdater: AutoUpdater - override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + if (intent == null) return START_NOT_STICKY autoUpdater = AutoUpdater(this) val autoBooted = intent.getBooleanExtra(AUTO_BOOTED, false) Logger.d(TAG, "Called onStartCommand, autoBooted?: $autoBooted") @@ -155,7 +156,7 @@ open class LanternService : Service(), Runnable { service.createUser(attempts) } - override fun onSuccess(response: Response, result: JsonObject) { + override fun onSuccess(response: Response?, result: JsonObject?) { val user: ProUser? = Json.gson.fromJson(result, ProUser::class.java) if (user == null) { Logger.error(TAG, "Unable to parse user from JSON") @@ -163,8 +164,8 @@ open class LanternService : Service(), Runnable { } service.createUserHandler.removeCallbacks(service.createUserRunnable) Logger.debug(TAG, "Created new Lantern user: ${user.newUserDetails()}") - LanternApp.getSession().setUserIdAndToken(user.getUserId(), user.getToken()) - val referral = user.getReferral() + LanternApp.getSession().setUserIdAndToken(user.userId, user.token) + val referral = user.referral if (!referral.isEmpty()) { LanternApp.getSession().setCode(referral) } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt new file mode 100644 index 000000000..c1ece03b2 --- /dev/null +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt @@ -0,0 +1,306 @@ +package org.getlantern.lantern.model + +import com.google.gson.Gson +import com.google.gson.JsonObject +import com.google.gson.JsonParser +import com.google.gson.reflect.TypeToken +import okhttp3.CacheControl +import okhttp3.Call +import okhttp3.Callback +import okhttp3.FormBody +import okhttp3.Headers.Companion.toHeaders +import okhttp3.HttpUrl +import okhttp3.HttpUrl.Companion.toHttpUrl +import okhttp3.MediaType +import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.Request +import okhttp3.RequestBody +import okhttp3.Response +import org.getlantern.lantern.LanternApp +import org.getlantern.mobilesdk.Logger +import org.getlantern.mobilesdk.util.HttpClient +import java.io.IOException + +// An OkHttp-Based HTTP client for communicating with the Pro server +open class LanternHttpClient : HttpClient() { + private fun userHeaders(): MutableMap { + val headers = mutableMapOf() + headers.put(DEVICE_ID_HEADER, LanternApp.getSession().deviceID) + headers.put(PRO_TOKEN_HEADER, LanternApp.getSession().token) + headers.put(USER_ID_HEADER, LanternApp.getSession().userID.toString()) + headers.put(PLATFORM_HEADER, "android") + headers.put(APP_VERSION_HEADER, Utils.appVersion(LanternApp.getAppContext())) + headers.putAll(LanternApp.getSession().getInternalHeaders()) + return headers + } + + fun get( + url: HttpUrl, + cb: ProCallback, + ) { + proRequest("GET", url, userHeaders(), null, cb) + } + + fun post( + url: HttpUrl, + body: RequestBody, + cb: ProCallback, + ) { + proRequest("POST", url, userHeaders(), body, cb) + } + + inline fun parseData(row: String): T { + return Gson().fromJson(row, object : TypeToken() {}.type) + } + + fun userData(cb: ProUserCallback) { + val params = mapOf("locale" to LanternApp.getSession().language) + val url = createProUrl("/user-data", params) + get( + url, + object : ProCallback { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { + cb.onFailure(throwable, error) + } + + override fun onSuccess( + response: Response?, + result: JsonObject?, + ) { + Logger.debug(TAG, "JSON response" + result.toString()) + result?.let { + val user = parseData(result.toString()) + Logger.debug(TAG, "User ID is ${user.userId}") + LanternApp.getSession().storeUserData(user) + cb.onSuccess(response!!, user) + } + } + }, + ) + } + + fun sendLinkRequest(cb: ProCallback?) { + val url = createProUrl("/user-link-request") + val formBody = + FormBody.Builder() + .add("email", LanternApp.getSession().email()) + .add("deviceName", LanternApp.getSession().deviceName()) + .build() + post( + url, + formBody, + object : ProCallback { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { + if (cb != null) cb.onFailure(throwable, error) + } + + override fun onSuccess( + response: Response?, + result: JsonObject?, + ) { + result?.get("error")?.let { + onFailure(null, ProError(result)) + } + } + }, + ) + } + + private fun plansMap(fetched: List): Map { + val plans = mutableMapOf() + for (plan in fetched) { + plan.formatCost() + plans.put(plan.id, plan) + } + return plans + } + + + fun plansV3( + cb: PlansV3Callback, + ) { + val params = + mapOf( + "locale" to LanternApp.getSession().language, + "countrycode" to LanternApp.getSession().getCountryCode(), + ) + get( + createProUrl("/plans-v3", params), + object : ProCallback { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { + Logger.error(TAG, "Unable to fetch plans", throwable) + cb.onFailure(throwable, error) + } + + override fun onSuccess( + response: Response?, + result: JsonObject?, + ) { + Logger.d(TAG, "Plans v3 Response body $result") + val methods = + parseData>>( + result?.get("providers").toString(), + ) + val icons = parseData(result?.get("icons").toString()) + Logger.d(TAG, "Plans v3 Icons Response body $icons") + val providers = methods.get("android") + // Due to API limitations + // We need loop all the provider and info since we can multiple provider with multiple methods + providers?.let { + providers.forEach { it -> + it.providers.forEach { provider -> + val icons = result?.get("icons")?.asJsonObject + val logoJson = icons?.get( + provider.name.toString().lowercase() + )!!.asJsonArray + val logoUrlsList: List = + logoJson?.map { it.asString } ?: emptyList() + provider.logoUrl = logoUrlsList + } + } + } + val fetched = parseData>(result?.get("plans").toString()) + val plans = plansMap(fetched) + if (providers != null) cb.onSuccess(plans, providers) + } + }, + ) + } + + private fun proRequest( + method: String, + url: HttpUrl, + headers: Map, + body: RequestBody?, + cb: ProCallback, + ) { + var builder = + Request.Builder().cacheControl(CacheControl.FORCE_NETWORK) + .headers(headers.toHeaders()) + .url(url) + if (method == "POST") { + var requestBody = if (body != null) body else RequestBody.create(null, ByteArray(0)) + builder = builder.post(requestBody) + } + + val request = builder.build() + httpClient.newCall(request).enqueue( + object : Callback { + override fun onFailure( + call: Call, + e: IOException, + ) { + cb.onFailure(e, ProError("", e.message ?: "")) + } + + override fun onResponse( + call: Call, + response: Response, + ) { + response.use { + if (!response.isSuccessful) { + val error = + ProError("", "Unexpected response code from server $response") + cb.onFailure(null, error) + return + } + val responseData = response.body!!.string() + Logger.d(TAG, "Response body " + responseData) + val result = JsonParser().parse(responseData).asJsonObject + if (result == null) { + return + } else if (result.get("error") != null) { + var error = result.get("error").asString + error = "Error making request to $url: $result error: $error" + Logger.error(TAG, error) + cb.onFailure(null, ProError("", error)) + return + } + cb.onSuccess(response, result) + } + } + }, + ) + } + + interface ProCallback { + fun onFailure( + throwable: Throwable?, + error: ProError?, + ) + + abstract fun onSuccess( + response: Response?, + result: JsonObject?, + ) + } + + interface ProUserCallback { + fun onFailure( + throwable: Throwable?, + error: ProError?, + ) + + fun onSuccess( + response: Response, + userData: ProUser, + ) + } + + interface PlansCallback { + fun onFailure( + throwable: Throwable?, + error: ProError?, + ) + + fun onSuccess(plans: Map) + } + + interface PlansV3Callback { + fun onFailure( + throwable: Throwable?, + error: ProError?, + ) + + fun onSuccess( + plans: Map, + methods: List, + ) + } + + companion object { + private const val DEVICE_ID_HEADER = "X-Lantern-Device-Id" + private const val USER_ID_HEADER = "X-Lantern-User-Id" + private const val PRO_TOKEN_HEADER = "X-Lantern-Pro-Token" + private const val APP_VERSION_HEADER = "X-Lantern-Version" + private const val PLATFORM_HEADER = "X-Lantern-Platform" + private val TAG = LanternHttpClient::class.java.name + + private var JSON: MediaType? = "application/json; charset=utf-8".toMediaTypeOrNull() + + fun createProUrl( + uri: String, + params: Map = mutableMapOf(), + ): HttpUrl { + val url = "http://localhost/pro$uri" + var builder = url.toHttpUrl().newBuilder() + for ((key, value) in params) { + builder.addQueryParameter(key, value) + } + return builder.build() + } + + fun createJsonBody(json: JsonObject): RequestBody { + return RequestBody.create(JSON, json.toString()) + } + } +} diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/PaymentsUtil.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/PaymentsUtil.kt index 02d20db40..0a248d795 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/PaymentsUtil.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/PaymentsUtil.kt @@ -1,8 +1,6 @@ package org.getlantern.lantern.util import android.app.Activity -import android.app.ProgressDialog -import androidx.annotation.NonNull import com.android.billingclient.api.BillingClient import com.android.billingclient.api.BillingResult import com.android.billingclient.api.Purchase @@ -22,16 +20,13 @@ import org.getlantern.lantern.model.LanternHttpClient.ProCallback import org.getlantern.lantern.model.LanternSessionManager import org.getlantern.lantern.model.PaymentProvider import org.getlantern.lantern.model.ProError +import org.getlantern.lantern.model.ProUser import org.getlantern.mobilesdk.Logger class PaymentsUtil(private val activity: Activity) { - private val session: LanternSessionManager = LanternApp.getSession() - @JvmField - protected var dialog: ProgressDialog? = null - - public fun submitStripePayment( + fun submitStripePayment( planID: String, email: String, cardNumber: String, @@ -41,40 +36,45 @@ class PaymentsUtil(private val activity: Activity) { ) { try { val date = expirationDate.split("/").toTypedArray() - val card: CardParams = CardParams( - cardNumber.replace("[\\s]", ""), - date[0].toInt(), // expMonth - date[1].toInt(), // expYear - cvc, - ) + val card: CardParams = + CardParams( + cardNumber.replace("[\\s]", ""), + date[0].toInt(), // expMonth + date[1].toInt(), // expYear + cvc, + ) val stripe: Stripe = Stripe(activity, session.stripePubKey()!!) - dialog = createDialog(activity.resources.getString(R.string.processing_payment)) stripe.createCardToken( card, - callback = object : ApiResultCallback { - override fun onSuccess(@NonNull token: Token) { + callback = + object : ApiResultCallback { + override fun onSuccess( + result: Token, + ) { + Logger.debug(TAG, "Stripe Card Token Success: $result") + sendPurchaseRequest( planID, email, - token.id, + result.id, PaymentProvider.Stripe, methodCallResult, ) } - override fun onError(@NonNull error: Exception) { - dialog?.dismiss() - Logger.error(TAG, "Error submitting to Stripe: $error") + override fun onError( + e: Exception, + ) { + Logger.error(TAG, "Error submitting to Stripe: $e") methodCallResult.error( "errorSubmittingToStripe", - error.getLocalizedMessage(), + e.localizedMessage, null, ) } }, ) } catch (t: Throwable) { - dialog?.dismiss() Logger.error(TAG, "Error submitting to Stripe", t) methodCallResult.error( "errorSubmittingToStripe", @@ -92,16 +92,20 @@ class PaymentsUtil(private val activity: Activity) { ) { try { val provider = PaymentProvider.BTCPay.toString().lowercase() - val params = mutableMapOf( - "email" to email, - "plan" to planID, - "provider" to provider, - "deviceName" to session.deviceName(), - ) + val params = + mutableMapOf( + "email" to email, + "plan" to planID, + "provider" to provider, + "deviceName" to session.deviceName(), + ) lanternClient.get( LanternHttpClient.createProUrl("/payment-redirect", params), object : ProCallback { - override fun onFailure(throwable: Throwable?, error: ProError?) { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { Logger.error(TAG, "BTCPay is unavailable", throwable) methodCallResult.error( "unknownError", @@ -111,7 +115,10 @@ class PaymentsUtil(private val activity: Activity) { return } - override fun onSuccess(response: Response?, result: JsonObject?) { + override fun onSuccess( + response: Response?, + result: JsonObject?, + ) { Logger.debug( TAG, "Email successfully validated $email", @@ -129,22 +136,33 @@ class PaymentsUtil(private val activity: Activity) { } } + // getPlanYear splits the given plan ID by hyphen and returns the year the given startas with + private fun getPlanYear(planID: String): String { + var plan = planID + val parts = planID.split("-").toTypedArray() + if (parts.isNotEmpty()) { + plan = parts[0] + Logger.debug(TAG, "Updated plan to have ID $plan") + } + return plan + } + // Handles Google Play transactions - fun submitGooglePlayPayment(planID: String, methodCallResult: MethodChannel.Result) { + fun submitGooglePlayPayment( + email: String, + planID: String, + methodCallResult: MethodChannel.Result, + ) { val inAppBilling = LanternApp.getInAppBilling() - - if (inAppBilling == null) { - Logger.error(TAG, "Missing inAppBilling") - methodCallResult.error( - "unknownError", - activity.resources.getString(R.string.error_making_purchase), - null, - ) - return - } + val currency = + LanternApp.getSession().planByID(planID)?.let { + it.currency + } ?: "usd" + val plan = getPlanYear(planID) + Logger.debug(TAG, "Starting in-app purchase for plan with ID $plan") inAppBilling.startPurchase( activity, - planID, + plan, object : PurchasesUpdatedListener { override fun onPurchasesUpdated( billingResult: BillingResult, @@ -178,8 +196,8 @@ class PaymentsUtil(private val activity: Activity) { } sendPurchaseRequest( - planID, - "", + plan + "-" + currency, + email, tokens[0], PaymentProvider.GooglePlay, methodCallResult, @@ -190,15 +208,22 @@ class PaymentsUtil(private val activity: Activity) { } // Applies referral code (before the user has initiated a transaction) - fun applyRefCode(refCode: String, methodCallResult: MethodChannel.Result) { + fun applyRefCode( + refCode: String, + methodCallResult: MethodChannel.Result, + ) { try { - val formBody: FormBody = FormBody.Builder() - .add("code", refCode).build() + val formBody: FormBody = + FormBody.Builder() + .add("code", refCode).build() lanternClient.post( LanternHttpClient.createProUrl("/referral-attach"), formBody, object : ProCallback { - override fun onFailure(throwable: Throwable?, error: ProError?) { + override fun onFailure( + throwable: Throwable?, + error: ProError?, + ) { if (error != null && error.message != null) { methodCallResult.error( "unknownError", @@ -209,7 +234,10 @@ class PaymentsUtil(private val activity: Activity) { } } - override fun onSuccess(response: Response, result: JsonObject) { + override fun onSuccess( + response: Response?, + result: JsonObject?, + ) { Logger.debug( TAG, "Successfully redeemed referral code: $refCode", @@ -228,7 +256,11 @@ class PaymentsUtil(private val activity: Activity) { } } - fun redeemResellerCode(email: String, resellerCode: String, result: MethodChannel.Result) { + fun redeemResellerCode( + email: String, + resellerCode: String, + result: MethodChannel.Result, + ) { try { session.setEmail(email) session.setResellerCode(resellerCode) @@ -243,16 +275,6 @@ class PaymentsUtil(private val activity: Activity) { } } - private fun createDialog(message: String): ProgressDialog { - return ProgressDialog.show( - activity, - message, - "", - true, - false, - ) - } - private fun sendPurchaseRequest( planID: String, email: String, @@ -260,12 +282,16 @@ class PaymentsUtil(private val activity: Activity) { provider: PaymentProvider, methodCallResult: MethodChannel.Result, ) { - val currency = LanternApp.getSession().planByID(planID)?.let { - it.currency - } ?: "usd" - Logger.d(TAG, "Sending purchase request: provider $provider; plan ID: $planID; currency: $currency") + val currency = + LanternApp.getSession().planByID(planID)?.let { + it.currency + } ?: "usd" + Logger.d( + TAG, + "Sending purchase request: provider $provider; plan ID: $planID; currency: $currency" + ) val session = session - val json: JsonObject = JsonObject() + val json = JsonObject() json.addProperty("idempotencyKey", System.currentTimeMillis().toString()) json.addProperty("provider", provider.toString().lowercase()) json.addProperty("email", email) @@ -300,19 +326,39 @@ class PaymentsUtil(private val activity: Activity) { LanternHttpClient.createProUrl("/purchase"), LanternHttpClient.createJsonBody(json), object : ProCallback { - - override fun onSuccess(response: Response?, result: JsonObject?) { - dialog?.dismiss() - session.linkDevice() - session.setIsProUser(true) + override fun onSuccess( + response: Response?, + result: JsonObject?, + ) { Logger.e(TAG, "Purchase Completed: $response") - methodCallResult.success("purchaseSuccessful") + session.linkDevice() + lanternClient.userData(object : LanternHttpClient.ProUserCallback { + override fun onSuccess(response: Response, userData: ProUser) { + Logger.e(TAG, "User detail : $userData") + session.setIsProUser(true) + activity.runOnUiThread { + methodCallResult.success("purchaseSuccessful") + } + + } + + override fun onFailure(throwable: Throwable?, error: ProError?) { + Logger.error(TAG, "Unable to fetch user data: $throwable.message") + activity.runOnUiThread { + methodCallResult.success("purchaseSuccessful") + } + + } + }) + Logger.d(TAG, "Successful purchase response: $result") } - override fun onFailure(t: Throwable?, error: ProError?) { + override fun onFailure( + t: Throwable?, + error: ProError?, + ) { Logger.e(TAG, "Error with purchase request: $error") - dialog?.dismiss() methodCallResult.error( "errorMakingPurchase", activity.getString( diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/vpn/GoTun2SocksProvider.kt b/android/app/src/main/kotlin/org/getlantern/lantern/vpn/GoTun2SocksProvider.kt index 5c62def0d..c8351a78e 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/vpn/GoTun2SocksProvider.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/vpn/GoTun2SocksProvider.kt @@ -65,6 +65,7 @@ class GoTun2SocksProvider( } catch (e: PackageManager.NameNotFoundException) { throw RuntimeException("Unable to exclude Lantern from routes", e) } + // don't currently route IPv6 through VPN because our proxies don't currently support IPv6 // see https://github.com/getlantern/lantern-internal/issues/4961 // Note - if someone performs a DNS lookup for an IPv6 only host like ipv6.google.com, dnsgrab diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/vpn/LanternVpnService.kt b/android/app/src/main/kotlin/org/getlantern/lantern/vpn/LanternVpnService.kt index 70f551a93..0ac6cbfb3 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/vpn/LanternVpnService.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/vpn/LanternVpnService.kt @@ -7,8 +7,10 @@ import android.content.ServiceConnection import android.net.VpnService import android.os.IBinder import org.getlantern.lantern.LanternApp +import org.getlantern.lantern.plausible.Plausible import org.getlantern.lantern.service.LanternService_ import org.getlantern.mobilesdk.Logger +import internalsdk.Internalsdk class LanternVpnService : VpnService(), Runnable { @@ -50,7 +52,7 @@ class LanternVpnService : VpnService(), Runnable { stop() } - override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { // Somehow we are getting null here when running on Android 5.0 // Handling null intent scenario if (intent == null) { diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml index e029ef59b..6f406d2a6 100644 --- a/android/app/src/main/res/values-ar/strings.xml +++ b/android/app/src/main/res/values-ar/strings.xml @@ -497,4 +497,7 @@ مكالمات خدمة تنزيل النسخة المتماثلة + + + diff --git a/android/app/src/main/res/values-bn/strings.xml b/android/app/src/main/res/values-bn/strings.xml index c20c7b77b..720ffbf81 100644 --- a/android/app/src/main/res/values-bn/strings.xml +++ b/android/app/src/main/res/values-bn/strings.xml @@ -501,4 +501,7 @@ কলসমূহ Lantern পরিষেবা রিপ্লিকা ডাউনলোড + + + diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml index baaf6df64..b5bbd70c8 100644 --- a/android/app/src/main/res/values-es/strings.xml +++ b/android/app/src/main/res/values-es/strings.xml @@ -498,4 +498,7 @@ iOS. Llamadas Servicio de Lantern Descarga de la réplica + + + diff --git a/android/app/src/main/res/values-fa-rIR/strings.xml b/android/app/src/main/res/values-fa-rIR/strings.xml index a38be1749..b4a07a071 100644 --- a/android/app/src/main/res/values-fa-rIR/strings.xml +++ b/android/app/src/main/res/values-fa-rIR/strings.xml @@ -497,4 +497,7 @@ https://bit.ly/lanternapk تماس‌ها سرویس دانلود Replica + + + diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index 9d02a9067..9ef23e91f 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -494,4 +494,7 @@ Télécharger Lantern https://bit.ly/lanternapk Appels Service Lantern Téléchargement de la réplique + + + diff --git a/android/app/src/main/res/values-hi-rIN/strings.xml b/android/app/src/main/res/values-hi-rIN/strings.xml index 3f1771ad0..5ff2d2b27 100644 --- a/android/app/src/main/res/values-hi-rIN/strings.xml +++ b/android/app/src/main/res/values-hi-rIN/strings.xml @@ -497,4 +497,7 @@ कॉल Lantern सर्विस रेप्लिका डाउनलोड + + + diff --git a/android/app/src/main/res/values-ms/strings.xml b/android/app/src/main/res/values-ms/strings.xml index d7c8810b4..3ab19e724 100644 --- a/android/app/src/main/res/values-ms/strings.xml +++ b/android/app/src/main/res/values-ms/strings.xml @@ -498,4 +498,7 @@ Panggilan Perkhidmatan Lantern Muat Turun Replika + + + diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml index 780426592..4336f3b55 100644 --- a/android/app/src/main/res/values-my/strings.xml +++ b/android/app/src/main/res/values-my/strings.xml @@ -483,4 +483,7 @@ ခေါ်ဆိုမှုများ Lantern ဝန်ဆောင်မှု Lantern ဝန်ဆောင်မှု + + + diff --git a/android/app/src/main/res/values-ru-rRU/strings.xml b/android/app/src/main/res/values-ru-rRU/strings.xml index 1643ee78d..8abe9def7 100644 --- a/android/app/src/main/res/values-ru-rRU/strings.xml +++ b/android/app/src/main/res/values-ru-rRU/strings.xml @@ -498,4 +498,7 @@ Звонки Сервис Lantern Загрузка файла + + + diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml index 214b0ecba..a88578c08 100644 --- a/android/app/src/main/res/values-th/strings.xml +++ b/android/app/src/main/res/values-th/strings.xml @@ -497,4 +497,7 @@ โทร บริการ Lantern สำเนาดาวน์โหลด + + + diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml index eaec394c7..1866a3736 100644 --- a/android/app/src/main/res/values-tr/strings.xml +++ b/android/app/src/main/res/values-tr/strings.xml @@ -497,4 +497,7 @@ Aramalar Lantern Hizmeti Çoğaltma İndirme + + + diff --git a/android/app/src/main/res/values-ur/strings.xml b/android/app/src/main/res/values-ur/strings.xml index 406303f4c..561fdad14 100644 --- a/android/app/src/main/res/values-ur/strings.xml +++ b/android/app/src/main/res/values-ur/strings.xml @@ -497,4 +497,7 @@ کالز Lantern سروس ریپلیکا ڈاؤن لوڈ + + + diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml index 6b318d120..720e66e78 100644 --- a/android/app/src/main/res/values-vi/strings.xml +++ b/android/app/src/main/res/values-vi/strings.xml @@ -497,4 +497,7 @@ Gọi Dịch vụ Lantern Tải xuống bản sao + + + diff --git a/android/app/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml index 420547174..f5ddfe303 100644 --- a/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/android/app/src/main/res/values-zh-rCN/strings.xml @@ -497,4 +497,7 @@ 来电 Lantern 服务 Replica 下载 + + + diff --git a/android/app/src/main/res/values-zh-rHK/strings.xml b/android/app/src/main/res/values-zh-rHK/strings.xml index 8df6a08ec..295b7441d 100644 --- a/android/app/src/main/res/values-zh-rHK/strings.xml +++ b/android/app/src/main/res/values-zh-rHK/strings.xml @@ -497,4 +497,7 @@ 通話 Lantern 服務 複本下載 + + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 4ebb652bd..e121c1dcb 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -499,4 +499,10 @@ Calls Lantern Service Replica Download + + true + + https://plausible.io + + android.lantern.io diff --git a/android/app/src/test/kotlin/org/getlantern/lantern/notification/NotificationHelperTest.kt b/android/app/src/test/kotlin/org/getlantern/lantern/notification/NotificationHelperTest.kt new file mode 100644 index 000000000..3e3e25c0b --- /dev/null +++ b/android/app/src/test/kotlin/org/getlantern/lantern/notification/NotificationHelperTest.kt @@ -0,0 +1,62 @@ +package org.getlantern.lantern.notification + +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import io.mockk.MockKAnnotations +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.mockk +import io.mockk.slot +import io.mockk.verify +import org.junit.After +import org.junit.Before +import org.junit.Test + +class NotificationHelperTest { + + @MockK + lateinit var notificationHelper: NotificationHelper + + var receiverSlot = slot() + + val appContext : Context = mockk(relaxed = true) { + every { + getSystemService(Context.NOTIFICATION_SERVICE) + } returns mockk() + } + + @Before + fun setUp() { + MockKAnnotations.init(this, relaxUnitFun = true) + val receiverIntent = mockk() + every { appContext.registerReceiver(capture(receiverSlot), any()) } returns receiverIntent + notificationHelper = NotificationHelper(appContext, receiverSlot.captured) + } + + @After + fun tearDown() { + verify(exactly = 1) { appContext.unregisterReceiver(receiverSlot.captured) } + } + + @Test + fun `Disconnect broadcast resolves to pending intent`() { + val receiverIntent = mockk() + every { appContext.registerReceiver(capture(receiverSlot), any()) } returns receiverIntent + + notificationHelper = NotificationHelper(appContext, receiverSlot.captured) + val intent = Intent("org.getlantern.lantern.intent.VPN_DISCONNECTED") + val pendingIntent = + PendingIntent.getBroadcast(appContext, 0, intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + + every { notificationHelper.disconnectBroadcast() } returns pendingIntent + } + + @Test + fun `VPN connected notification`() { + notificationHelper.vpnConnectedNotification() + } +} diff --git a/android/app/src/test/kotlin/org/getlantern/lantern/util/LanternHttpClientTest.kt b/android/app/src/test/kotlin/org/getlantern/lantern/util/LanternHttpClientTest.kt new file mode 100644 index 000000000..3df494da6 --- /dev/null +++ b/android/app/src/test/kotlin/org/getlantern/lantern/util/LanternHttpClientTest.kt @@ -0,0 +1,57 @@ +package org.getlantern.lantern.util + +import android.content.Context +import android.content.Intent +import io.mockk.MockKAnnotations +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.mockk +import io.mockk.slot +import io.mockk.verify +import okhttp3.HttpUrl.Companion.toHttpUrl +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.Protocol +import okhttp3.Request +import okhttp3.RequestBody.Companion.toRequestBody +import okhttp3.Response +import okhttp3.ResponseBody.Companion.toResponseBody +import org.junit.After +import org.junit.Before +import org.junit.Test + +class LanternHttpClientTest { + @Test + fun `from raw http - normal`() { + val statusOK = "HTTP/1.1 200 OK\r\n" + + "Content-Type: application/json;charset=utf-8\r\n" + + "X-Lantern-Device-Id: abc\r\n" + + "X-Lantern-User-Id: 12345\r\n" + + "\r\n" + + "Some Content" + + statusOK.toVauInnerHttpResponse(mockk()).let { + assertEquals(Protocol.HTTP_1_1, it.protocol) + assertEquals(200, it.code) + assertEquals("abc", it.headers["X-Lantern-Device-Id"]) + assertEquals("12345", it.headers["X-Lantern-User-Id"]) + assertEquals("application/json;charset=utf-8", it.body!!.contentType().toString()) + assertEquals("Some Content", it.body!!.string()) + } + + val notFound = "HTTP/1.1 400 NOT FOUND\r\n" + + "Content-Type: application/json;charset=utf-8\r\n" + + "X-Header: abc\r\n" + + "Y-Header: 12345\r\n" + + "\r\n" + + "Some Content" + + notFound.toVauInnerHttpResponse(mockk()).let { + assertEquals(Protocol.HTTP_1_1, it.protocol) + assertEquals(400, it.code) + assertEquals("abc", it.headers["X-Lantern-Device-Id"]) + assertEquals("12345", it.headers["X-Lantern-User-Id"]) + assertEquals("application/json;charset=utf-8", it.body!!.contentType().toString()) + assertEquals("Some Content", it.body!!.string()) + } + } +} diff --git a/android/app/src/testPlay/kotlin/org/getlantern/lantern/model/InAppBillingTest.kt b/android/app/src/testPlay/kotlin/org/getlantern/lantern/model/InAppBillingTest.kt new file mode 100644 index 000000000..6157b18ae --- /dev/null +++ b/android/app/src/testPlay/kotlin/org/getlantern/lantern/model/InAppBillingTest.kt @@ -0,0 +1,148 @@ +package org.getlantern.lantern.model + +import android.content.Context +import androidx.test.platform.app.InstrumentationRegistry +import com.android.billingclient.api.AcknowledgePurchaseParams +import com.android.billingclient.api.AcknowledgePurchaseResponseListener +import com.android.billingclient.api.BillingClient +import com.android.billingclient.api.BillingClientStateListener +import com.android.billingclient.api.BillingFlowParams +import com.android.billingclient.api.BillingResult +import com.android.billingclient.api.ConsumeParams +import com.android.billingclient.api.ConsumeResponseListener +import com.android.billingclient.api.Purchase +import com.android.billingclient.api.PurchaseHistoryRecord +import com.android.billingclient.api.PurchaseHistoryResponseListener +import com.android.billingclient.api.PurchasesResponseListener +import com.android.billingclient.api.PurchasesUpdatedListener +import com.android.billingclient.api.SkuDetails +import com.android.billingclient.api.SkuDetailsParams +import com.android.billingclient.api.SkuDetailsResponseListener +import com.google.android.gms.common.ConnectionResult +import com.google.android.gms.common.GoogleApiAvailability +import io.mockk.MockKAnnotations +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.just +import io.mockk.mockk +import io.mockk.mockkStatic +import io.mockk.runs +import io.mockk.slot +import io.mockk.verify +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test + +class InAppBillingTest { + + @MockK + lateinit var builder: BillingClient.Builder + + @MockK + lateinit var billingClient: BillingClient + + @MockK + lateinit var availability: GoogleApiAvailability + + private lateinit var inAppBilling: InAppBilling + + @Before + fun setUp() { + val context = mockk(relaxed = true) + MockKAnnotations.init(this, relaxUnitFun = true) + every { builder.setListener(any()) } returns builder + every { builder.build() } returns billingClient + inAppBilling = InAppBilling(context, builder, availability) + } + + private fun playServicesAvailable() = + every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS + + @Test + fun `initConnection new connection succeeds`() { + every { billingClient.isReady } returns false + val listener = slot() + every { billingClient.startConnection(capture(listener)) } answers { + listener.captured.onBillingSetupFinished( + BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK) + .build() + ) + } + playServicesAvailable() + inAppBilling.initConnection() + } + + @Test + fun `initConnection new connection fails`() { + every { billingClient.isReady } returns false + val listener = slot() + every { billingClient.startConnection(capture(listener)) } answers { + listener.captured.onBillingSetupFinished( + BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ERROR) + .build() + ) + } + playServicesAvailable() + + inAppBilling.initConnection() + } + + @Test + fun `endConnection resolves`() { + playServicesAvailable() + + inAppBilling.initConnection() + inAppBilling.endConnection() + + verify { billingClient.endConnection() } + } + + @Test + fun `ensureConnection should attempt to reconnect, if not in ready state`() { + playServicesAvailable() + var callbackCalled = false + every { billingClient.isReady } returns true + val listener = slot() + every { billingClient.startConnection(capture(listener)) } answers { + listener.captured.onBillingSetupFinished( + BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK) + .build() + ) + } + inAppBilling.billingClient = billingClient + inAppBilling.ensureConnected { + callbackCalled = true + } + assertTrue("Callback should be called", callbackCalled) + } + + @Test + fun `handlePendingPurchases successfully handles pending purchases`() { + playServicesAvailable() + every { billingClient.isReady } returns true + val listener = slot() + every { billingClient.queryPurchasesAsync(any(), capture(listener)) } answers { + listener.captured.onQueryPurchasesResponse( + BillingResult.newBuilder().build(), + listOf( + mockk { + every { purchaseState } returns 2 + every { purchaseToken } returns "token" + }, + ) + ) + } + val consumeListener = slot() + every { billingClient.consumeAsync(any(), capture(consumeListener)) } answers { + consumeListener.captured.onConsumeResponse( + BillingResult.newBuilder() + .setResponseCode(BillingClient.BillingResponseCode.ITEM_NOT_OWNED).build(), + "" + ) + } + inAppBilling.billingClient = billingClient + inAppBilling.initConnection() + verify { inAppBilling.handlePendingPurchases() } + } +} diff --git a/android/sentry.properties b/android/sentry.properties deleted file mode 100644 index 6a7d71a78..000000000 --- a/android/sentry.properties +++ /dev/null @@ -1,3 +0,0 @@ -defaults.project=android -defaults.org=getlantern -auth.token=80a6ecf6b8e3400c93a1702fdffae4420f687c5c81354a39b9d00483fb4011a5 diff --git a/android/settings.gradle b/android/settings.gradle index 31a9ce0ec..32344b562 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,3 +1,11 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} + include ':app' def localPropertiesFile = new File(rootProject.projectDir, "local.properties") diff --git a/assets/images/search_app.svg b/assets/images/search_app.svg new file mode 100644 index 000000000..ae62e4c0f --- /dev/null +++ b/assets/images/search_app.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/locales/en.po b/assets/locales/en.po index 10cda3ce3..eae5d9545 100644 --- a/assets/locales/en.po +++ b/assets/locales/en.po @@ -1,4 +1,5 @@ # + msgid "" msgstr "" @@ -286,6 +287,9 @@ msgstr "months" msgid "enter_email" msgstr "Enter Email" +msgid "enter_email_to_complete_purchase" +msgstr "Enter email to complete purchase" + msgid "error_fetching_plans" msgstr "Error fetching plans, please restart Lantern and try again." @@ -1391,7 +1395,7 @@ msgid "test_text" msgstr "I want to eat some pizza 🍕 😊" msgid "test_hello" -msgstr "Hi how are you?" +msgstr "Hi how are you?" msgid "test_reply" msgstr "Actually no, I think I am in the mood for sushi today!" @@ -1420,4 +1424,16 @@ msgstr "FAQ" msgid "add_device" msgstr "Add Device" +msgid "recovery_code_sent" +msgstr "Recovery Code Sent" + +msgid "device_added" +msgstr "Device Added" + +msgid "device_added_message" +msgstr "Your device has been successfully added. If you do not see the device connected, please restart the app on both devices" + +msgid "search_apps" +msgstr "Search Apps" + diff --git a/go.mod b/go.mod index 5a6499955..dcdb9d967 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,26 @@ module github.com/getlantern/android-lantern -go 1.19 +go 1.21.4 -//replace github.com/getlantern/flashlight/v7 => ../flashlight +// replace github.com/getlantern/flashlight/v7 => ../flashlight // replace github.com/getlantern/fronted => ../fronted -// replace github.com/getlantern/pathdb => ../pathDb/pathDb + +// replace github.com/getlantern/ipproxy => ../ipproxy + +// replace github.com/getlantern/dnsgrab => ../dnsgrab + +// v0.5.6 has a security issue and using require leaves a reference to it in go.sum +replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.8 replace github.com/elazarl/goproxy => github.com/getlantern/goproxy v0.0.0-20220805074304-4a43a9ed4ec6 replace github.com/lucas-clemente/quic-go => github.com/getlantern/quic-go v0.31.1-0.20230104154904-d810c964a217 -replace github.com/keighl/mandrill => github.com/getlantern/mandrill v0.0.0-20221004112352-e7c04248adcb +// git.apache.org isn't working at the moment, use mirror (should probably switch back once we can) +replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -// For https://github.com/crawshaw/sqlite/pull/112 and https://github.com/crawshaw/sqlite/pull/103. -replace crawshaw.io/sqlite => github.com/getlantern/sqlite v0.0.0-20220301112206-cb2f8bc7cb56 +replace github.com/keighl/mandrill => github.com/getlantern/mandrill v0.0.0-20221004112352-e7c04248adcb replace github.com/Jigsaw-Code/outline-ss-server => github.com/getlantern/lantern-shadowsocks v1.3.6-0.20230301223223-150b18ac427d @@ -24,101 +30,98 @@ replace github.com/eycorsican/go-tun2socks => github.com/getlantern/go-tun2socks require ( github.com/getlantern/appdir v0.0.0-20200615192800-a0ef1968f4da - github.com/getlantern/autoupdate v0.0.0-20231030193554-30131726a6d9 - github.com/getlantern/dnsgrab v0.0.0-20230822102054-7ff232ec3148 + github.com/getlantern/autoupdate v0.0.0-20211217175350-d0b211f39ba7 + github.com/getlantern/dnsgrab v0.0.0-20240124035712-497ccf435858 github.com/getlantern/errors v1.0.3 github.com/getlantern/eventual/v2 v2.0.2 - github.com/getlantern/flashlight/v7 v7.6.20-0.20240214054258-31d0c5809e94 + github.com/getlantern/flashlight/v7 v7.6.56 github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db - github.com/getlantern/ipproxy v0.0.0-20230511223023-ee52513fd782 + github.com/getlantern/ipproxy v0.0.0-20240129182103-533871131d16 github.com/getlantern/mtime v0.0.0-20200417132445-23682092d1f7 + github.com/getlantern/netx v0.0.0-20240124040039-163b1628a66b github.com/getlantern/pathdb v0.0.0-20231026090702-54ee1ddd99eb - github.com/getlantern/replica v0.14.2 + github.com/getlantern/replica v0.14.3 github.com/gorilla/mux v1.8.0 + github.com/shirou/gopsutil/v3 v3.22.9 github.com/stretchr/testify v1.8.4 - golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe - golang.org/x/net v0.17.0 - google.golang.org/protobuf v1.31.0 + golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a + golang.org/x/net v0.20.0 + google.golang.org/protobuf v1.32.0 nhooyr.io/websocket v1.8.10 ) require ( - crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect - filippo.io/edwards25519 v1.0.0 // indirect - git.torproject.org/pluggable-transports/goptlib.git v1.3.0 // indirect + github.com/Jigsaw-Code/outline-sdk v0.0.12 // indirect github.com/Jigsaw-Code/outline-ss-server v1.4.0 // indirect github.com/OperatorFoundation/Replicant-go/Replicant/v3 v3.0.23 // indirect github.com/OperatorFoundation/Starbridge-go/Starbridge/v3 v3.0.17 // indirect github.com/OperatorFoundation/ghostwriter-go v1.0.6 // indirect github.com/OperatorFoundation/go-bloom v1.0.1 // indirect - github.com/OperatorFoundation/go-shadowsocks2 v1.2.1 // indirect - github.com/PuerkitoBio/goquery v1.8.1 // indirect + github.com/OperatorFoundation/go-shadowsocks2 v1.2.8 // indirect github.com/RoaringBitmap/roaring v1.2.3 // indirect github.com/Yawning/chacha20 v0.0.0-20170904085104-e3b1f968fc63 // indirect github.com/aead/ecdh v0.2.0 // indirect github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect + github.com/alextanhongpin/go-bandit v0.0.0-20191125130111-30de60d69bae // indirect github.com/anacrolix/chansync v0.3.0 // indirect - github.com/anacrolix/confluence v1.12.0 // indirect - github.com/anacrolix/dht/v2 v2.20.0 // indirect - github.com/anacrolix/envpprof v1.2.1 // indirect - github.com/anacrolix/generics v0.0.0-20230816103846-fe11fdc0e0e3 // indirect + github.com/anacrolix/confluence v1.15.0 // indirect + github.com/anacrolix/dht/v2 v2.21.0 // indirect + github.com/anacrolix/envpprof v1.3.0 // indirect + github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45 // indirect github.com/anacrolix/go-libutp v1.3.1 // indirect - github.com/anacrolix/log v0.14.0 // indirect + github.com/anacrolix/log v0.14.6-0.20231202035202-ed7a02cad0b4 // indirect github.com/anacrolix/missinggo v1.3.0 // indirect github.com/anacrolix/missinggo/perf v1.0.0 // indirect - github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9 // indirect + github.com/anacrolix/missinggo/v2 v2.7.3 // indirect github.com/anacrolix/mmsg v1.0.0 // indirect github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect - github.com/anacrolix/squirrel v0.4.1 // indirect - github.com/anacrolix/stm v0.4.1-0.20221221005312-96d17df0e496 // indirect - github.com/anacrolix/sync v0.4.0 // indirect - github.com/anacrolix/torrent v1.52.6 // indirect + github.com/anacrolix/squirrel v0.6.3 // indirect + github.com/anacrolix/stm v0.5.0 // indirect + github.com/anacrolix/sync v0.5.1 // indirect + github.com/anacrolix/torrent v1.53.3 // indirect github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 // indirect github.com/anacrolix/utp v0.1.0 // indirect - github.com/andybalholm/brotli v1.0.5 // indirect - github.com/andybalholm/cascadia v1.3.1 // indirect + github.com/andybalholm/brotli v1.0.6 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect - github.com/benbjohnson/immutable v0.4.1-0.20221220213129-8932b999621d // indirect + github.com/benbjohnson/immutable v0.4.3 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.3.0 // indirect + github.com/bits-and-blooms/bitset v1.7.0 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dchest/siphash v1.2.3 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect - github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4 // indirect - github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d // indirect - github.com/dsoprea/go-png-image-structure v0.0.0-20200615034826-4cfc78940228 // indirect - github.com/dsoprea/go-utility v0.0.0-20200512094054-1abbbc781176 // indirect + github.com/dsoprea/go-exif/v2 v2.0.0-20221012082141-d21ac8e2de85 // indirect + github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect + github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d // indirect + github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72 // indirect + github.com/dvyukov/go-fuzz v0.0.0-20231214143802-7955ebc9f2de // indirect github.com/edsrzf/mmap-go v1.1.0 // indirect github.com/enobufs/go-nats v0.0.1 // indirect - github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/frankban/quicktest v1.14.6 // indirect github.com/gaukas/godicttls v0.0.4 // indirect - github.com/getlantern/borda v0.0.0-20230421223744-4e208135f082 // indirect - github.com/getlantern/broflake v0.0.0-20231016221059-9c3632502cae // indirect + github.com/getlantern/broflake v0.0.0-20240104003636-455141a52cb3 // indirect github.com/getlantern/bufconn v0.0.0-20210901195825-fd7c0267b493 // indirect github.com/getlantern/byteexec v0.0.0-20220903142956-e6ed20032cfd // indirect github.com/getlantern/cmux v0.0.0-20230301223233-dac79088a4c0 // indirect github.com/getlantern/cmux/v2 v2.0.0-20230301223233-dac79088a4c0 // indirect - github.com/getlantern/cmuxprivate v0.0.0-20211216020409-d29d0d38be54 // indirect + github.com/getlantern/cmuxprivate v0.0.0-20231025143958-503c5330c30b // indirect github.com/getlantern/common v1.2.1-0.20230427204521-6ac18c21db39 // indirect github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201 // indirect github.com/getlantern/detour v0.0.0-20230503144615-d3106a68f79e // indirect github.com/getlantern/dhtup v0.0.0-20230218071625-e78bcd432e4b // indirect - github.com/getlantern/dns v0.0.0-20210120185712-8d005533efa0 // indirect + github.com/getlantern/dns v0.0.0-20240124032733-9a3302908228 // indirect github.com/getlantern/domains v0.0.0-20220311111720-94f59a903271 // indirect github.com/getlantern/elevate v0.0.0-20220903142053-479ab992b264 // indirect github.com/getlantern/ema v0.0.0-20190620044903-5943d28f40e4 // indirect github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033 // indirect - github.com/getlantern/enproxy v0.0.0-20180913191734-002212d417a4 // indirect github.com/getlantern/event v0.0.0-20210901195647-a7e3145142e6 // indirect github.com/getlantern/eventual v1.0.0 // indirect github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731 // indirect @@ -135,7 +138,7 @@ require ( github.com/getlantern/hellosplitter v0.1.1 // indirect github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect - github.com/getlantern/http-proxy-lantern/v2 v2.10.0 // indirect + github.com/getlantern/http-proxy-lantern/v2 v2.10.1-0.20231118011407-9f16767b92eb // indirect github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca // indirect github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c // indirect github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 // indirect @@ -148,18 +151,14 @@ require ( github.com/getlantern/measured v0.0.0-20230919230611-3d9e3776a6cd // indirect github.com/getlantern/meta-scrubber v0.0.1 // indirect github.com/getlantern/mitm v0.0.0-20231025115752-54d3e43899b7 // indirect - github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848 // indirect - github.com/getlantern/msgpack v3.1.4+incompatible // indirect github.com/getlantern/multipath v0.0.0-20230510135141-717ed305ef50 // indirect - github.com/getlantern/netx v0.0.0-20211206143627-7ccfeb739cbd // indirect - github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c // indirect + github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534 // indirect github.com/getlantern/osversion v0.0.0-20230401075644-c2a30e73c451 // indirect github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360 // indirect github.com/getlantern/preconn v1.0.0 // indirect github.com/getlantern/proxy/v3 v3.0.0-20231031142453-252ab678e6b7 // indirect - github.com/getlantern/proxybench v0.0.0-20220404140110-f49055cb86de // indirect github.com/getlantern/psmux v1.5.15 // indirect - github.com/getlantern/quicwrapper v0.0.0-20230523101504-1ec066b7f869 // indirect + github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970 // indirect github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7 // indirect github.com/getlantern/reconn v0.0.0-20161128113912-7053d017511c // indirect github.com/getlantern/rot13 v0.0.0-20220822172233-370767b2f782 // indirect @@ -175,131 +174,144 @@ require ( github.com/getlantern/tlsutil v0.5.3 // indirect github.com/getlantern/uuid v1.2.0 // indirect github.com/getlantern/waitforserver v1.0.1 // indirect - github.com/getlantern/withtimeout v0.0.0-20160829163843-511f017cd913 // indirect github.com/getlantern/yaml v0.0.0-20190801163808-0c9bb1ebf426 // indirect - github.com/getsentry/sentry-go v0.20.0 // indirect - github.com/go-errors/errors v1.4.2 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/getsentry/sentry-go v0.25.0 // indirect + github.com/go-errors/errors v1.5.1 // indirect + github.com/go-llsqlite/adapter v0.0.0-20230927005056-7f5ce7f0c916 // indirect + github.com/go-llsqlite/crawshaw v0.5.1 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect - github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721 // indirect - github.com/golang/geo v0.0.0-20200319012246-673a6f80352d // indirect + github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f // indirect + github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/netstack v0.0.0-00010101000000-000000000000 // indirect - github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect - github.com/google/uuid v1.3.1 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 // indirect + github.com/google/uuid v1.5.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/huandu/xstrings v1.3.2 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/huandu/xstrings v1.4.0 // indirect github.com/jaffee/commandeer v0.6.0 // indirect github.com/keighl/mandrill v0.0.0-20170605120353-1775dd4b3b41 // indirect github.com/kennygrant/sanitize v1.2.4 // indirect - github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid v1.3.1 // indirect + github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/klauspost/pgzip v1.2.5 // indirect - github.com/klauspost/reedsolomon v1.9.9 // indirect + github.com/klauspost/reedsolomon v1.12.0 // indirect github.com/kr/binarydist v0.1.0 // indirect - github.com/libp2p/go-buffer-pool v0.0.2 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-sqlite3 v2.0.2+incompatible // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mdlayher/netlink v1.1.0 // indirect github.com/mholt/archiver/v3 v3.5.1 // indirect + github.com/miekg/dns v1.1.58 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-ps v1.0.0 // indirect github.com/mitchellh/go-server-timing v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104 // indirect github.com/mschoch/smat v0.2.0 // indirect github.com/nwaples/rardecode v1.1.2 // indirect - github.com/onsi/ginkgo/v2 v2.12.0 // indirect + github.com/onsi/ginkgo/v2 v2.13.2 // indirect github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect github.com/oschwald/geoip2-golang v1.8.0 // indirect github.com/oschwald/maxminddb-golang v1.10.0 // indirect github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect - github.com/pborman/uuid v1.2.1 // indirect github.com/pierrec/lz4/v4 v4.1.12 // indirect github.com/pion/datachannel v1.5.5 // indirect - github.com/pion/dtls/v2 v2.2.7 // indirect - github.com/pion/ice/v2 v2.3.5 // indirect - github.com/pion/interceptor v0.1.17 // indirect + github.com/pion/dtls/v2 v2.2.9 // indirect + github.com/pion/ice/v2 v2.3.11 // indirect + github.com/pion/interceptor v0.1.25 // indirect github.com/pion/logging v0.2.2 // indirect - github.com/pion/mdns v0.0.7 // indirect + github.com/pion/mdns v0.0.9 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtcp v1.2.10 // indirect - github.com/pion/rtp v1.7.13 // indirect - github.com/pion/sctp v1.8.7 // indirect + github.com/pion/rtcp v1.2.13 // indirect + github.com/pion/rtp v1.8.3 // indirect + github.com/pion/sctp v1.8.9 // indirect github.com/pion/sdp/v3 v3.0.6 // indirect - github.com/pion/srtp/v2 v2.0.15 // indirect - github.com/pion/stun v0.6.0 // indirect + github.com/pion/srtp/v2 v2.0.18 // indirect + github.com/pion/stun v0.6.1 // indirect github.com/pion/transport v0.14.1 // indirect - github.com/pion/transport/v2 v2.2.1 // indirect - github.com/pion/turn v1.3.7 // indirect - github.com/pion/turn/v2 v2.1.0 // indirect - github.com/pion/webrtc/v3 v3.2.6 // indirect + github.com/pion/transport/v2 v2.2.4 // indirect + github.com/pion/turn v1.4.0 // indirect + github.com/pion/turn/v2 v2.1.4 // indirect + github.com/pion/webrtc/v3 v3.2.24 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.15.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect - github.com/quic-go/qtls-go1-19 v0.3.2 // indirect - github.com/quic-go/qtls-go1-20 v0.2.2 // indirect - github.com/quic-go/quic-go v0.34.0 // indirect + github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/quic-go/quic-go v0.41.0 // indirect github.com/refraction-networking/utls v1.3.3 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect - github.com/samber/lo v1.38.1 // indirect + github.com/samber/lo v1.39.0 // indirect github.com/shadowsocks/go-shadowsocks2 v0.1.5 // indirect github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 // indirect github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/tchap/go-patricia/v2 v2.3.1 // indirect - github.com/templexxx/cpu v0.0.8 // indirect - github.com/templexxx/xorsimd v0.4.1 // indirect + github.com/templexxx/cpu v0.1.0 // indirect + github.com/templexxx/xorsimd v0.4.2 // indirect github.com/ti-mo/conntrack v0.3.0 // indirect github.com/ti-mo/netfilter v0.3.1 // indirect github.com/tidwall/btree v1.6.0 // indirect - github.com/tjfoc/gmsm v1.3.2 // indirect - github.com/tkuchiki/go-timezone v0.2.0 // indirect + github.com/tjfoc/gmsm v1.4.1 // indirect + github.com/tklauser/go-sysconf v0.3.10 // indirect + github.com/tklauser/numcpus v0.5.0 // indirect + github.com/tkuchiki/go-timezone v0.2.2 // indirect github.com/ulikunitz/xz v0.5.10 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/xtaci/smux v1.5.24 // indirect - gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb // indirect - gitlab.com/yawning/obfs4.git v0.0.0-20220904064028-336a71d6e4cf // indirect - go.etcd.io/bbolt v1.3.6 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect - go.opentelemetry.io/otel v1.19.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect - go.opentelemetry.io/otel/metric v1.19.0 // indirect - go.opentelemetry.io/otel/sdk v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.22.0 // indirect + go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect - go.opentelemetry.io/otel/trace v1.19.0 // indirect + go.opentelemetry.io/otel/trace v1.22.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect - go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.21.0 // indirect - golang.org/x/crypto v0.14.0 // indirect - golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect - golang.org/x/mod v0.13.0 // indirect - golang.org/x/sync v0.4.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.14.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect - google.golang.org/grpc v1.58.3 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/mock v0.4.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.26.0 // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.17.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/grpc v1.60.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - howett.net/plist v1.0.0 // indirect + gvisor.dev/gvisor v0.0.0-20240111192755-20d559651a70 // indirect + howett.net/plist v1.0.1 // indirect + modernc.org/libc v1.22.3 // indirect + modernc.org/mathutil v1.5.0 // indirect + modernc.org/memory v1.5.0 // indirect + modernc.org/sqlite v1.21.1 // indirect + zombiezen.com/go/sqlite v0.13.1 // indirect ) diff --git a/go.sum b/go.sum index 77bdd5611..a40393820 100644 --- a/go.sum +++ b/go.sum @@ -1,45 +1,13 @@ +cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797 h1:yDf7ARQc637HoxDho7xjqdvO5ZA2Yb+xzv/fOnnvZzw= crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797/go.mod h1:sXBiorCo8c46JlQV3oXPKINnZ8mcqnye1EkVkqsectk= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +crawshaw.io/sqlite v0.3.2/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= -git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q= -git.torproject.org/pluggable-transports/goptlib.git v1.3.0 h1:G+iuRUblCCC2xnO+0ag1/4+aaM98D5mjWP1M0v9s8a0= -git.torproject.org/pluggable-transports/goptlib.git v1.3.0/go.mod h1:4PBMl1dg7/3vMWSoWb46eGWlrxkUyn/CAJmxhDLAlDs= -github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/FZambia/sentinel v1.0.0/go.mod h1:ytL1Am/RLlAoAXG6Kj5LNuw/TRRQrv2rt2FT26vP5gI= -github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/Jigsaw-Code/outline-sdk v0.0.12 h1:6s4OK26M0M70KHGGm++eapP/fNauJRQ8KNFbS+MuMTA= +github.com/Jigsaw-Code/outline-sdk v0.0.12/go.mod h1:9cEaF6sWWMzY8orcUI9pV5D0oFp2FZArTSyJiYtMQQs= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OperatorFoundation/Replicant-go/Replicant/v3 v3.0.23 h1:g0kC1BDonLwNse78HRsudElKEDfXHusLQ9Nfekl/l0o= github.com/OperatorFoundation/Replicant-go/Replicant/v3 v3.0.23/go.mod h1:QVlygHzbNc/fX+OHurCRC0AFwISJAUQbPaqdEfAkUio= @@ -49,10 +17,8 @@ github.com/OperatorFoundation/ghostwriter-go v1.0.6 h1:2E5D4qDKwsV+LQoKGtgIyjq5J github.com/OperatorFoundation/ghostwriter-go v1.0.6/go.mod h1:+uejzC1RRxZwngnCArqZX3d7i6ZX4Si8jNG8G6oCIKQ= github.com/OperatorFoundation/go-bloom v1.0.1 h1:8q/rfgfG7OvwGkmzusIuV8PlS8MvA/T0kQ2MXm9371g= github.com/OperatorFoundation/go-bloom v1.0.1/go.mod h1:b6bJWAnYIhwDgFIIolHyeuTYbPWAYj1Lnnwvcoa7P38= -github.com/OperatorFoundation/go-shadowsocks2 v1.2.1 h1:hyf+kZq2rb/Kjw440hZUuedV0UG4DeB4irW6c0cPpOE= -github.com/OperatorFoundation/go-shadowsocks2 v1.2.1/go.mod h1:lH6+PiEc2/aDpMqZrLzMz+o2dlE1rPME6GYZN1j4Bsg= -github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= -github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= +github.com/OperatorFoundation/go-shadowsocks2 v1.2.8 h1:tp1+fr25pdTxgyKt1VVqqZDRTB/jZBQdRktdKzAP5dk= +github.com/OperatorFoundation/go-shadowsocks2 v1.2.8/go.mod h1:lH6+PiEc2/aDpMqZrLzMz+o2dlE1rPME6GYZN1j4Bsg= github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w= github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI= github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= @@ -60,49 +26,45 @@ github.com/RoaringBitmap/roaring v1.2.3 h1:yqreLINqIrX22ErkKI0vY47/ivtJr6n+kMhVO github.com/RoaringBitmap/roaring v1.2.3/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/Yawning/chacha20 v0.0.0-20170904085104-e3b1f968fc63 h1:I6/SJSN9wJMJ+ZyQaCHUlzoTA4ypU5Bb44YWR1wTY/0= github.com/Yawning/chacha20 v0.0.0-20170904085104-e3b1f968fc63/go.mod h1:nf+Komq6fVP4SwmKEaVGxHTyQGKREVlwjQKpvOV39yE= github.com/aead/ecdh v0.2.0 h1:pYop54xVaq/CEREFEcukHRZfTdjiWvYIsZDXXrBapQQ= github.com/aead/ecdh v0.2.0/go.mod h1:a9HHtXuSo8J1Js1MwLQx2mBhkXMT6YwUmVVEY4tTB8U= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 h1:byYvvbfSo3+9efR4IeReh77gVs4PnNDR3AMOE9NJ7a0= github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0/go.mod h1:q37NoqncT41qKc048STsifIt69LfUJ8SrWWcz/yam5k= github.com/alecthomas/assert/v2 v2.0.0-alpha3 h1:pcHeMvQ3OMstAWgaeaXIAL8uzB9xMm2zlxt+/4ml8lk= +github.com/alecthomas/assert/v2 v2.0.0-alpha3/go.mod h1:+zD0lmDXTeQj7TgDgCt0ePWxb0hMC1G+PGTsTCv1B9o= github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELkLb3MNdlH8= github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48= +github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= -github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= -github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= -github.com/alicebob/miniredis/v2 v2.15.1/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I= +github.com/alextanhongpin/go-bandit v0.0.0-20191125130111-30de60d69bae h1:ZrWHh+wXI877HHdIHLWCtQmL0u4CW6GPqTBOvYlO6Ts= +github.com/alextanhongpin/go-bandit v0.0.0-20191125130111-30de60d69bae/go.mod h1:FaUXXpw8d7DBpg3M5wrQAj6RAGuVVoV35hvKKguVyNc= github.com/anacrolix/chansync v0.3.0 h1:lRu9tbeuw3wl+PhMu/r+JJCRu5ArFXIluOgdF0ao6/U= github.com/anacrolix/chansync v0.3.0/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k= -github.com/anacrolix/confluence v1.12.0 h1:NgrsfhebrJUiZgFfFCqPvV3L23k3kOJdkLXhNhlrnAs= -github.com/anacrolix/confluence v1.12.0/go.mod h1:u0JTZ8Et0hC6MwSySOeYy11cUC0qGA7ntKvlIjOkfYI= -github.com/anacrolix/dht/v2 v2.20.0 h1:eDx9lfE9iCSf5sPK0290GToHURNhEFuUGN8iyvhvJDk= -github.com/anacrolix/dht/v2 v2.20.0/go.mod h1:SDGC+sEs1pnO2sJGYuhvIis7T8749dDHNfcjtdH4e3g= +github.com/anacrolix/confluence v1.15.0 h1:4BcfG2ZqLSSsShbDgwhC/ynW2ulkg0PebPuHe97Rqi4= +github.com/anacrolix/confluence v1.15.0/go.mod h1:F9zxbVe5fczVZRMa9XcuwDOfQNdL0VVAbi04ahdKVYQ= +github.com/anacrolix/dht/v2 v2.21.0 h1:8nzI+faaynY9jOKmVgdmBZVrTo8B7ZE/LKEgN3Vl/Bs= +github.com/anacrolix/dht/v2 v2.21.0/go.mod h1:SDGC+sEs1pnO2sJGYuhvIis7T8749dDHNfcjtdH4e3g= github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c= github.com/anacrolix/envpprof v1.0.0/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c= github.com/anacrolix/envpprof v1.1.0/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4= -github.com/anacrolix/envpprof v1.2.1 h1:25TJe6t/i0AfzzldiGFKCpD+s+dk8lONBcacJZB2rdE= -github.com/anacrolix/envpprof v1.2.1/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4= -github.com/anacrolix/generics v0.0.0-20230816103846-fe11fdc0e0e3 h1:O5xBrk97JnkTZdTsxsnQOBfD22/4L5rJXrBZrKUhJOY= -github.com/anacrolix/generics v0.0.0-20230816103846-fe11fdc0e0e3/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= +github.com/anacrolix/envpprof v1.3.0 h1:WJt9bpuT7A/CDCxPOv/eeZqHWlle/Y0keJUvc6tcJDk= +github.com/anacrolix/envpprof v1.3.0/go.mod h1:7QIG4CaX1uexQ3tqd5+BRa/9e2D02Wcertl6Yh0jCB0= +github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45 h1:Kmcl3I9K2+5AdnnR7hvrnVT0TLeFWWMa9bxnm55aVIg= +github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= github.com/anacrolix/go-libutp v1.3.1 h1:idJzreNLl+hNjGC3ZnUOjujEaryeOGgkwHLqSGoige0= github.com/anacrolix/go-libutp v1.3.1/go.mod h1:heF41EC8kN0qCLMokLBVkB8NXiLwx3t8R8810MTNI5o= github.com/anacrolix/log v0.3.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU= github.com/anacrolix/log v0.6.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU= github.com/anacrolix/log v0.10.1-0.20220123034749-3920702c17f8/go.mod h1:GmnE2c0nvz8pOIPUSC9Rawgefy1sDXqposC2wgtBZE4= github.com/anacrolix/log v0.13.1/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68= -github.com/anacrolix/log v0.14.0 h1:mYhTSemILe/Z8tIxbGdTIWWpPspI8W/fhZHpoFbDaL0= -github.com/anacrolix/log v0.14.0/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY= +github.com/anacrolix/log v0.14.6-0.20231202035202-ed7a02cad0b4 h1:CdVK9IoqoqklXQQ4+L2aew64xsz14KdOD+rnKdTQajg= +github.com/anacrolix/log v0.14.6-0.20231202035202-ed7a02cad0b4/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY= github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62 h1:P04VG6Td13FHMgS5ZBcJX23NPC/fiC4cp9bXwYujdYM= github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62/go.mod h1:66cFKPCO7Sl4vbFnAaSq7e4OXtdMhRSBagJGWgmpJbM= github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s= @@ -116,77 +78,57 @@ github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5ur github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY= github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA= github.com/anacrolix/missinggo/v2 v2.5.2/go.mod h1:yNvsLrtZYRYCOI+KRH/JM8TodHjtIE/bjOGhQaLOWIE= -github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9 h1:W/oGeHhYwxueeiDjQfmK9G+X9M2xJgfTtow62v0TWAs= -github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9/go.mod h1:mIEtp9pgaXqt8VQ3NQxFOod/eQ1H0D1XsZzKUQfwtac= +github.com/anacrolix/missinggo/v2 v2.7.3 h1:Ee//CmZBMadeNiYB/hHo9ly2PFOEZ4Fhsbnug3rDAIE= +github.com/anacrolix/missinggo/v2 v2.7.3/go.mod h1:mIEtp9pgaXqt8VQ3NQxFOod/eQ1H0D1XsZzKUQfwtac= github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb/go.mod h1:x2/ErsYUmT77kezS63+wzZp8E3byYB0gzirM/WMBLfw= github.com/anacrolix/mmsg v1.0.0 h1:btC7YLjOn29aTUAExJiVUhQOuf/8rhm+/nWCMAnL3Hg= github.com/anacrolix/mmsg v1.0.0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc= github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 h1:lOtCD+LzoD1g7bowhYJNR++uV+FyY5bTZXKwnPex9S8= github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7/go.mod h1:zJv1JF9AqdZiHwxqPgjuOZDGWER6nyE48WBCi/OOrMM= -github.com/anacrolix/squirrel v0.4.1 h1:AmyXOEADG24keqgzutp+ioxJInpWHvVqeWOiHTbkeXk= -github.com/anacrolix/squirrel v0.4.1/go.mod h1:YzgVvikMdFD441oTWlNG189bpKabO9Sbf3uCSVgca04= +github.com/anacrolix/squirrel v0.6.0 h1:ovfWW42wcGzrVYYI9s56pEYzfeTwtXxCCvSd+KwvUEA= +github.com/anacrolix/squirrel v0.6.0/go.mod h1:60vdNPUbK1jYWePp39Wqn9whHm12Yb9JEuwOXzLMDuY= +github.com/anacrolix/squirrel v0.6.3 h1:AcetAb8I8PhYn8g0mCir24a9CdL8xGUVpESrCeV3WlE= +github.com/anacrolix/squirrel v0.6.3/go.mod h1:iM4irn/z3HbsU9PEzo4UNvy4Vr4fPwx6XUw0rBI7wNk= github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg= -github.com/anacrolix/stm v0.4.1-0.20221221005312-96d17df0e496 h1:aMiRi2kOOd+nG64suAmFMVnNK2E6GsnLif7ia9tI3cA= -github.com/anacrolix/stm v0.4.1-0.20221221005312-96d17df0e496/go.mod h1:DBm8/1OXm4A4RZ6Xa9u/eOsjeAXCaoRYvd2JzlskXeM= +github.com/anacrolix/stm v0.5.0 h1:9df1KBpttF0TzLgDq51Z+TEabZKMythqgx89f1FQJt8= +github.com/anacrolix/stm v0.5.0/go.mod h1:MOwrSy+jCm8Y7HYfMAwPj7qWVu7XoVvjOiYwJmpeB/M= github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778/go.mod h1:s735Etp3joe/voe2sdaXLcqDdJSay1O0OPnM0ystjqk= github.com/anacrolix/sync v0.3.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g= -github.com/anacrolix/sync v0.4.0 h1:T+MdO/u87ir/ijWsTFsPYw5jVm0SMm4kVpg8t4KF38o= -github.com/anacrolix/sync v0.4.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g= +github.com/anacrolix/sync v0.5.1 h1:FbGju6GqSjzVoTgcXTUKkF041lnZkG5P0C3T5RL3SGc= +github.com/anacrolix/sync v0.5.1/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g= github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8= -github.com/anacrolix/torrent v1.52.6 h1:QRLte7x68cXvAmG6WpBqInl0ayCxBYaG1bOP5busnaI= -github.com/anacrolix/torrent v1.52.6/go.mod h1:dA7tlQGWx1oCogZcnvjTCU2pQaNOyY2YgyG2kumC1H0= +github.com/anacrolix/torrent v1.53.3 h1:Abb3J8p/JWUjOzHaii8kixuDOGMXz+Oh8+hwc/zA2lA= +github.com/anacrolix/torrent v1.53.3/go.mod h1:is8GNob5qDeZ5Kq+pKPiE2xqYUi1ms7IgSB+CftZETk= github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA= github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs= github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4= github.com/anacrolix/utp v0.1.0/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= -github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= -github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= -github.com/apache/arrow/go/arrow v0.0.0-20200730104253-651201b0f516/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0= -github.com/apache/thrift v0.0.0-20181112125854-24918abba929/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= +github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.14.2/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/aristanetworks/goarista v0.0.0-20190429220743-799535f6f364/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/aristanetworks/goarista v0.0.0-20190502180301-283422fc1708/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/aristanetworks/goarista v0.0.0-20190628000427-15fc8b0bfcde/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.30.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go-v2 v1.7.1/go.mod h1:L5LuPC1ZgDr2xQS7AmIec/Jlc7O/Y1u2KxJyNVab250= -github.com/aws/aws-sdk-go-v2/config v1.5.0/go.mod h1:RWlPOAW3E3tbtNAqTwvSW54Of/yP3oiZXMI0xfUdjyA= -github.com/aws/aws-sdk-go-v2/credentials v1.3.1/go.mod h1:r0n73xwsIVagq8RsxmZbGSRQFj9As3je72C2WzUIToc= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.3.0/go.mod h1:2LAuqPx1I6jNfaGDucWfA2zqQCYCOMCDHiCOciALyNw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.3.2/go.mod h1:qaqQiHSrOUVOfKe6fhgQ6UzhxjwqVW8aHNegd6Ws4w4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.1.1/go.mod h1:Zy8smImhTdOETZqfyn01iNOe0CNggVbPjCajyaz6Gvg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.1/go.mod h1:v33JQ57i2nekYTA70Mb+O18KeH4KqhdqxTJZNK1zdRE= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.1/go.mod h1:zceowr5Z1Nh2WVP8bf/3ikB41IZW59E4yIYbg+pC6mw= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.1/go.mod h1:6EQZIwNNvHpq/2/QSJnp4+ECvqIy55w95Ofs0ze+nGQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.11.1/go.mod h1:XLAGFrEjbvMCLvAtWLLP32yTv8GpBquCApZEycDLunI= -github.com/aws/aws-sdk-go-v2/service/sso v1.3.1/go.mod h1:J3A3RGUvuCZjvSuZEcOpHDnzZP/sKbhDWV2T1EOzFIM= -github.com/aws/aws-sdk-go-v2/service/sts v1.6.0/go.mod h1:q7o0j7d7HrJk/vr9uUt3BVRASvcU7gYZB9PUgPiByXg= -github.com/aws/smithy-go v1.6.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI= -github.com/benbjohnson/immutable v0.4.1-0.20221220213129-8932b999621d h1:2qVb9bsAMtmAfnxXltm+6eBzrrS7SZ52c3SedsulaMI= -github.com/benbjohnson/immutable v0.4.1-0.20221220213129-8932b999621d/go.mod h1:iAr8OjJGLnLmVUr9MZ/rz4PWUy6Ouc2JLYuMArmvAJM= +github.com/benbjohnson/immutable v0.4.3 h1:GYHcksoJ9K6HyAUpGxwZURrbTkXA0Dh4otXGqbhdrjA= +github.com/benbjohnson/immutable v0.4.3/go.mod h1:qJIKKSmdqz1tVzNtst1DZzvaqOU1onk1rc03IeM3Owk= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.3.0 h1:h7mv5q31cthBTd7V4kLAZaIThj1e8vPGcSqpPue9KVI= -github.com/bits-and-blooms/bitset v1.3.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bits-and-blooms/bitset v1.7.0 h1:YjAGVd3XmtK9ktAbX8Zg2g2PwLIMjGREZJHlV4j7NEo= +github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 h1:GKTyiRCL6zVf5wWaqKnf+7Qs6GbEPfd4iMOitWzXJx8= @@ -198,27 +140,17 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudfoundry/gosigar v1.1.0/go.mod h1:3qLfc2GlfmwOx2+ZDaRGH3Y9fwQ0sQeaAleo2GV5pH0= -github.com/cloudfoundry/gosigar v1.2.0/go.mod h1:3qLfc2GlfmwOx2+ZDaRGH3Y9fwQ0sQeaAleo2GV5pH0= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= -github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA= -github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= @@ -228,55 +160,60 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E= -github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4 h1:Mg7pY7kxDQD2Bkvr1N+XW4BESSIQ7tTTR7Vv+Gi2CsM= github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4/go.mod h1:9EXlPeHfblFFnwu5UOqmP2eoZfJyAZ2Ri/Vki33ajO0= +github.com/dsoprea/go-exif/v2 v2.0.0-20221012082141-d21ac8e2de85 h1:sgMOHQHMiddteUitH9QYgaRTwAcqqr5X9z5j4yNXDuY= +github.com/dsoprea/go-exif/v2 v2.0.0-20221012082141-d21ac8e2de85/go.mod h1:oKrjk2kb3rAR5NbtSTLUMvMSbc+k8ZosI3MaVH47noc= +github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8= +github.com/dsoprea/go-exif/v3 v3.0.0-20210512043655-120bcdb2a55e/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk= github.com/dsoprea/go-logging v0.0.0-20190624164917-c4f10aab7696/go.mod h1:Nm/x2ZUNRW6Fe5C3LxdY1PyZY5wmDv/s5dkPJ/VB3iA= -github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d h1:F/7L5wr/fP/SKeO5HuMlNEX9Ipyx2MbH2rV9G4zJRpk= github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8= -github.com/dsoprea/go-png-image-structure v0.0.0-20200615034826-4cfc78940228 h1:GKAdOrszPH3mQ44eRg2kw9zBW0hi2L78ZNjkTx+cte0= +github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd h1:l+vLbuxptsC6VQyQsfD7NnEC8BZuFpz45PgY+pH8YTg= +github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8= github.com/dsoprea/go-png-image-structure v0.0.0-20200615034826-4cfc78940228/go.mod h1:aDYQkL/5gfRNZkoxiLTSWU4Y8/gV/4MVsy/MU9uwTak= -github.com/dsoprea/go-utility v0.0.0-20200512094054-1abbbc781176 h1:CfXezFYb2STGOd1+n1HshvE191zVx+QX3A1nML5xxME= +github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d h1:8+qI8ant/vZkNSsbwSjIR6XJfWcDVTg/qx/3pRUUZNA= +github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d/go.mod h1:yTR3tKgyk20phAFg6IE9ulMA5NjEDD2wyx+okRFLVtw= github.com/dsoprea/go-utility v0.0.0-20200512094054-1abbbc781176/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8= +github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8= +github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 h1:/py11NlxDaOxkT9OKN+gXgT+QOH5xj1ZRoyusfRIlo4= +github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/Hul09ujXAGq+42UBgCTnXkiJZRnLYdURGjQUwo= +github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU= github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72 h1:XiR1YwcWcRFzxjAhWK29HQL4nocj0QWJjpeRi/YASV0= github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= +github.com/dvyukov/go-fuzz v0.0.0-20231214143802-7955ebc9f2de h1:Vykr/CwlrpBFV9Ck2F4wuBNFJxza7XJdYPTFU/cjQM0= +github.com/dvyukov/go-fuzz v0.0.0-20231214143802-7955ebc9f2de/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/enobufs/go-nats v0.0.1 h1:uzC0mxan4hyGzUFG7cShFmk6c+XYgfoT8yTBgF5CJYw= github.com/enobufs/go-nats v0.0.1/go.mod h1:ZF0vpSk02ALIMFsHkIO4MHXUN1v3nLZssTaG+fgX/io= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/felixge/httpsnoop v1.0.0/go.mod h1:3+D9sFq0ahK/JeJPhCBUV1xlf4/eIYrUQaxulT0VzX8= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.9.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk= github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI= -github.com/getlantern/appdir v0.0.0-20180320102544-7c0f9d241ea7/go.mod h1:3vR6+jQdWfWojZ77w+htCqEF5MO/Y2twJOpAvFuM9po= github.com/getlantern/appdir v0.0.0-20200615192800-a0ef1968f4da h1:T/pxF37Z9SIQCHhMMUITZ3rhKRL0Noi9XxNwxKdBNw0= github.com/getlantern/appdir v0.0.0-20200615192800-a0ef1968f4da/go.mod h1:3vR6+jQdWfWojZ77w+htCqEF5MO/Y2twJOpAvFuM9po= -github.com/getlantern/autoupdate v0.0.0-20231030193554-30131726a6d9 h1:ZPiaHwoOv3V7aEB9Ia+2deqHJCdrjs773YWYG2CVKZ8= -github.com/getlantern/autoupdate v0.0.0-20231030193554-30131726a6d9/go.mod h1:ohIVs2H6Wb58ZaCw/OAP+z6RPFVaRokAnldy+ATGwdQ= -github.com/getlantern/borda v0.0.0-20230421223744-4e208135f082 h1:Ka9rIAgef8zYhBr/VgLrt5+Qs7zE33g0OButzpIGcSs= -github.com/getlantern/borda v0.0.0-20230421223744-4e208135f082/go.mod h1:oCpQojhSaK0F/6rWMrDvN8/QFHQhTC9Gb3uf7GcqPQQ= -github.com/getlantern/broflake v0.0.0-20231016221059-9c3632502cae h1:8kLpvusHkHGjuW4f2y/OIF+vIbbpp1wM/UE4pOu9694= -github.com/getlantern/broflake v0.0.0-20231016221059-9c3632502cae/go.mod h1:Ehdl8IASN5rJi9brldVuCjTDcSU25nvaGRlzNprgeQo= +github.com/getlantern/autoupdate v0.0.0-20211217175350-d0b211f39ba7 h1:/efTOJpxXC/DglC3qTt3P7kQZA7jPO3+1PLsfH+mc7k= +github.com/getlantern/autoupdate v0.0.0-20211217175350-d0b211f39ba7/go.mod h1:+X8pAviVhThDBjPEqLUB0iO7EPxhpWk7Q9VYxvz6rCY= +github.com/getlantern/broflake v0.0.0-20240104003636-455141a52cb3 h1:ON+e5j9mP9L1haHplWwyJOQQ5KOur3CZWo6s49Rt4Cw= +github.com/getlantern/broflake v0.0.0-20240104003636-455141a52cb3/go.mod h1:brzUHh6XfkSMv+K72nrfCbrPbumeHJFlZZLIUG/UMjI= github.com/getlantern/bufconn v0.0.0-20190625204133-a08544339f8d/go.mod h1:d6O4RY+V87kIt4o9wru4SaNo7C2NAkD3YnmJFXEpODo= github.com/getlantern/bufconn v0.0.0-20210901195825-fd7c0267b493 h1:8WjDNmpDLFVsAfcnHxqF4pfVKkdAQxyJ9iCHB4LxSfc= github.com/getlantern/bufconn v0.0.0-20210901195825-fd7c0267b493/go.mod h1:d6O4RY+V87kIt4o9wru4SaNo7C2NAkD3YnmJFXEpODo= @@ -285,14 +222,13 @@ github.com/getlantern/bytecounting v0.0.0-20190530140808-3b3f10d3b9ab/go.mod h1: github.com/getlantern/byteexec v0.0.0-20170405023437-4cfb26ec74f4/go.mod h1:4WCQkaCIwta0KlF9bQZA1jYqp8bzIS2PeCqjnef8nZ8= github.com/getlantern/byteexec v0.0.0-20220903142956-e6ed20032cfd h1:0xt9OTbV50a/+ZarMcr86ybWiN1v+bbwzdnVuXHzR/o= github.com/getlantern/byteexec v0.0.0-20220903142956-e6ed20032cfd/go.mod h1:oD9q9NB1LNBLHk3WAwza4tivxV7tm7jKFlCNCAv3+M8= -github.com/getlantern/bytemap v0.0.0-20210122162547-b07440a617f0/go.mod h1:o01y9zxAVkFLqhZjC+mFXsN4NdxQG44Ff/nH1W4SuvI= github.com/getlantern/cmux v0.0.0-20230301223233-dac79088a4c0 h1:JlVdpDQThkcqlMoqpn89ZfNUpxNTUNqUrTFacBJvIqU= github.com/getlantern/cmux v0.0.0-20230301223233-dac79088a4c0/go.mod h1:48COjs7jITfhkdw82LeMDQtrISx0CQG3/W0Ycr2UafM= github.com/getlantern/cmux/v2 v2.0.0-20200905031936-c55b16ee8462/go.mod h1:oJz1ghfzM796DpGP0et6Gbc3si2Zn3/7l7KxxK/KXQ0= github.com/getlantern/cmux/v2 v2.0.0-20230301223233-dac79088a4c0 h1:Yn5u/vwIC0iIKyI7OqhD4R74vzhaMCEaFHei9AJXS3c= github.com/getlantern/cmux/v2 v2.0.0-20230301223233-dac79088a4c0/go.mod h1:oJz1ghfzM796DpGP0et6Gbc3si2Zn3/7l7KxxK/KXQ0= -github.com/getlantern/cmuxprivate v0.0.0-20211216020409-d29d0d38be54 h1:aqzgkWfjRLDSIpTKU3x4a8MtqpRi5Jr2pt81Ga0moJQ= -github.com/getlantern/cmuxprivate v0.0.0-20211216020409-d29d0d38be54/go.mod h1:WIunQ/nFvkQAP89tY2CX4R5kj9A1OJhjA3KmP6nj4o4= +github.com/getlantern/cmuxprivate v0.0.0-20231025143958-503c5330c30b h1:QBjkczmb3tWbgQN4g4VUCBTK2jw/1ex+DCqdPlraGGc= +github.com/getlantern/cmuxprivate v0.0.0-20231025143958-503c5330c30b/go.mod h1:WIunQ/nFvkQAP89tY2CX4R5kj9A1OJhjA3KmP6nj4o4= github.com/getlantern/common v1.2.1-0.20230427204521-6ac18c21db39 h1:jMVok8jOJRTz13GbCcemOry0CGmFA/xFvkcMNXaHxkY= github.com/getlantern/common v1.2.1-0.20230427204521-6ac18c21db39/go.mod h1:0SEJgqSudY1N0PP012aNY2raInQVUeXOp08VGrjtuOU= github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY= @@ -302,22 +238,19 @@ github.com/getlantern/detour v0.0.0-20230503144615-d3106a68f79e h1:ah9RgyL8S76l/ github.com/getlantern/detour v0.0.0-20230503144615-d3106a68f79e/go.mod h1:BndJgV9V8+iLA35NIVqk7u0VTLUGgkc1jmVI+gWJAtI= github.com/getlantern/dhtup v0.0.0-20230218071625-e78bcd432e4b h1:s6hIG0ssf0ixxDl2L/yl4pLr1hE3i+pkMPwJJzCKAB8= github.com/getlantern/dhtup v0.0.0-20230218071625-e78bcd432e4b/go.mod h1:vHmyGO0tz9xO4rxi7rZCUjnI3GJ/26u6YHwdeamd3Bs= -github.com/getlantern/dns v0.0.0-20210120185712-8d005533efa0 h1:8DQSmWtwBy8Z0Zr/kiRJRhBPQO4LMN0mziCJd+8edhw= -github.com/getlantern/dns v0.0.0-20210120185712-8d005533efa0/go.mod h1:nd1wZuSxVB7DZVqZT1hCFkdWcMqbuO5XQSd+1Duk/fs= -github.com/getlantern/dnsgrab v0.0.0-20230822102054-7ff232ec3148 h1:3RwZlptbVTFP+F/o+FlwD8HURN/L6R+CDRpS8mzoOpE= -github.com/getlantern/dnsgrab v0.0.0-20230822102054-7ff232ec3148/go.mod h1:5GwF/pPObuqMzWoCQ26QDowRMysQ61Sa1Gbc/9mQUZM= +github.com/getlantern/dns v0.0.0-20240124032733-9a3302908228 h1:Zrk/I7nlM9vOc9CyHFzCSCS8yZ6ZgHPZK/7klNKndZw= +github.com/getlantern/dns v0.0.0-20240124032733-9a3302908228/go.mod h1:zaFhzOF3ndksog07db0DZNIzTVeuAirjwWeuam1Azo8= +github.com/getlantern/dnsgrab v0.0.0-20240124035712-497ccf435858 h1:UEIFfuSnxvJ8Th8U2LC0l1aaHVD/RsMJBzORGgO/vWU= +github.com/getlantern/dnsgrab v0.0.0-20240124035712-497ccf435858/go.mod h1:ePI+zSVo2xev/S5+c5kmCaGO+Ry5/cXLmDHx5cvIieU= github.com/getlantern/domains v0.0.0-20220311111720-94f59a903271 h1:LPjvyUPESE32YBbM1JtwOhfDlLv1gub52mPqKcim77Q= github.com/getlantern/domains v0.0.0-20220311111720-94f59a903271/go.mod h1:ij0uyo1HGrb17vCYGonZBb9tWh+Ba3kgNhLrOghME/I= github.com/getlantern/elevate v0.0.0-20180207094634-c2e2e4901072/go.mod h1:T4VB2POK13lsPLFV98WJQrL7gAXYD9TyJxBU2P8c8p4= -github.com/getlantern/elevate v0.0.0-20200430163644-2881a121236d/go.mod h1:+nYKXAqGigcDHB3as7WikMzg3eIHzGUbLnBKOCBJeUE= github.com/getlantern/elevate v0.0.0-20220903142053-479ab992b264 h1:q50MSzoIIKotG7apUYaDME/bNGhOJMjG33Fpfc7KPWM= github.com/getlantern/elevate v0.0.0-20220903142053-479ab992b264/go.mod h1:2VB8zy/kMNX347i5fdusJbPNAZE26u8qoHJDy7CWP9A= github.com/getlantern/ema v0.0.0-20190620044903-5943d28f40e4 h1:PMK8QQn9GLTQXdHnqoNhyToOa8snagaZVt9Xb36NEUc= github.com/getlantern/ema v0.0.0-20190620044903-5943d28f40e4/go.mod h1:tzRwT19aDrWSr6yRDs8iOvaXXCau96EgWsgGT9wIpoQ= github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033 h1:HbjEpFFiRYcySVkFMdn3kl3OUU0UZwMdcXzY5gXUEQo= github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033/go.mod h1:kHP/nfmHj9HJVN5Cb+1RFNRLR0O0nx40YENc4wKIe6s= -github.com/getlantern/enproxy v0.0.0-20180913191734-002212d417a4 h1:PNbh29DNRJF7KTZi1h85KDR0x4vYiRrXq7lews4xe6o= -github.com/getlantern/enproxy v0.0.0-20180913191734-002212d417a4/go.mod h1:Gg8JT6crCL+8vd1+KPtLIC2+KHGiaB0l+Q8bDbj7B30= github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A= github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A= github.com/getlantern/errors v1.0.3 h1:Ne4Ycj7NI1BtSyAfVeAT/DNoxz7/S2BUc3L2Ht1YSHE= @@ -336,8 +269,11 @@ github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731/go.mod h1:XZwE+ github.com/getlantern/filepersist v0.0.0-20160317154340-c5f0cd24e799/go.mod h1:8DGAx0LNUfXNnEH+fXI0s3OCBA/351kZCiz/8YSK3i8= github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c h1:mcz27xtAkb1OuOLBct/uFfL1p3XxAIcFct82GbT+UZM= github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c/go.mod h1:8DGAx0LNUfXNnEH+fXI0s3OCBA/351kZCiz/8YSK3i8= -github.com/getlantern/flashlight/v7 v7.6.20-0.20240214054258-31d0c5809e94 h1:kMLTj0/w+VqaC7/SSptSpP3IHY1ZZBlJ4FbBbIzfTvk= -github.com/getlantern/flashlight/v7 v7.6.20-0.20240214054258-31d0c5809e94/go.mod h1:8u89uF47eIpauHgx3pbsVtSUUOgpgZKJkSQdz2tImyI= +github.com/getlantern/flashlight v0.0.0-20230403092335-5f84ae10c585 h1:lVu4HyDAxXkX4kJEJQWpJJz+Poprb0crUGW5zhoh3GU= +github.com/getlantern/flashlight/v7 v7.6.51 h1:EvE+7SvLD4jNIrf/PqLJQzAcDxKwcERftpHPNMHh7y4= +github.com/getlantern/flashlight/v7 v7.6.51/go.mod h1:WmAJVBcdfEpio/cggjs12QhyrAaGCoemE5lfnVwPilk= +github.com/getlantern/flashlight/v7 v7.6.56 h1:bGlOiB2Jr7X0207gXWOhLycSZimoqisTuQBIzEpiKg0= +github.com/getlantern/flashlight/v7 v7.6.56/go.mod h1:I90ekr9DZ5NyDWyR3HYQFCy1Vdt3EI1MciRBMdRyJfc= github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede h1:yrU6Px3ZkvCsDLPryPGi6FN+2iqFPq+JeCb7EFoDBhw= github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede/go.mod h1:nhnoiS6DE6zfe+BaCMU4YI01UpsuiXnDqM5S8jxHuuI= github.com/getlantern/fronted v0.0.0-20230601004823-7fec719639d8 h1:r/Z/SPPIfLXDI3QA7/tE6nOfPncrqeUPDjiFjnNGP50= @@ -352,7 +288,6 @@ github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5 h1:RBKofGGMt2 github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5/go.mod h1:kGHRXch95rnGLHjER/GhhFiHvfnqNz7KqWD9kGfATHY= github.com/getlantern/go-update v0.0.0-20230221120840-8d795213a8bc h1:qZ/HlURAOgGRKtqDGimPwL2w5PkvW7Ap+c1bGRK0pzU= github.com/getlantern/go-update v0.0.0-20230221120840-8d795213a8bc/go.mod h1:DQAFBxfQlSru9Loud3pLM+rF//qf0FQBtB//grF89IA= -github.com/getlantern/goexpr v0.0.0-20211215215226-4cdd4fd2847b/go.mod h1:ZaY9C4jtM37dI+XfwuKqKIdVQAdeQPIiFtwBMN/TSY4= github.com/getlantern/golog v0.0.0-20190809085441-26e09e6dd330/go.mod h1:zx/1xUUeYPy3Pcmet8OSXLbF47l+3y6hIPpyLWoR9oc= github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7/go.mod h1:zx/1xUUeYPy3Pcmet8OSXLbF47l+3y6hIPpyLWoR9oc= github.com/getlantern/golog v0.0.0-20200929154820-62107891371a/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA= @@ -372,11 +307,10 @@ github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwl github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc h1:sue+aeVx7JF5v36H1HfvcGFImLpSD5goj8d+MitovDU= github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc/go.mod h1:D9RWpXy/EFPYxiKUURo2TB8UBosbqkiLhttRrZYtvqM= github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA= -github.com/getlantern/hidden v0.0.0-20201229170000-e66e7f878730/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA= github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 h1:cSrD9ryDfTV2yaur9Qk3rHYD414j3Q1rl7+L0AylxrE= github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770/go.mod h1:GOQsoDnEHl6ZmNIL+5uVo+JWRFWozMEp18Izcb++H+A= -github.com/getlantern/http-proxy-lantern/v2 v2.10.0 h1:cnKPteRz1xE1iAZMCuTpQX5cQXUPMOoLq+FdhFAfIyQ= -github.com/getlantern/http-proxy-lantern/v2 v2.10.0/go.mod h1:bY0Uxqvojq1Uj6R7DwyqGh+YxNeZ4vF/N+TtwXVjALg= +github.com/getlantern/http-proxy-lantern/v2 v2.10.1-0.20231118011407-9f16767b92eb h1:pR+bEMoHwZPzIrJp/Q8O/00Mbi09s7cH3FxhykNGAbw= +github.com/getlantern/http-proxy-lantern/v2 v2.10.1-0.20231118011407-9f16767b92eb/go.mod h1:UkN8RlXXnSSmLIupSmXB06gdcm9rbsz7IGT15D/D1MQ= github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca h1:Of3VwFEfKbVnK5/VGy05XUbi6QvTs5Y2eLDfPv3O50E= github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca/go.mod h1:TNC/xJFmctsSGyXqcnVWwCRCPD/4zGQP7yBVnLDRa/U= github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c h1:+JnT+Rwa/3rksc4Zi0u6fJ/WX+tPK58GtsrcXWVUU2U= @@ -385,8 +319,8 @@ github.com/getlantern/idletiming v0.0.0-20190529182719-d2fbc83372a5/go.mod h1:MG github.com/getlantern/idletiming v0.0.0-20200228204104-10036786eac5/go.mod h1:McaLC6faRlxJ9QjjqSjpEeYIjKnKA8+dzjoR+eYXCio= github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db h1:w/Br8vclvX3RlHV+VFkuNkcm3hwEXTtqXMoOqKPUicg= github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db/go.mod h1:kW4RHAFReMopujQCzcYxjOAg4XZOeuSrybIcM9FNGto= -github.com/getlantern/ipproxy v0.0.0-20230511223023-ee52513fd782 h1:4sHN5V47QX8+t0AiCAecDLfnVGW8VM0w5OhI2VHLGyQ= -github.com/getlantern/ipproxy v0.0.0-20230511223023-ee52513fd782/go.mod h1:n2pvzFBL6JmhwaBOUQa7eM45kInmrVq/b78qdKh5BUk= +github.com/getlantern/ipproxy v0.0.0-20240129182103-533871131d16 h1:rjo3GMWgj/mdxYBPEwRdA0I0a8sqYdKkjN1c6JaBZI4= +github.com/getlantern/ipproxy v0.0.0-20240129182103-533871131d16/go.mod h1:bljuiaoLDaNhXndW62VVpxetwkUiWStMzEYOaf4jmm8= github.com/getlantern/iptool v0.0.0-20210721034953-519bf8ce0147/go.mod h1:hfspzdRcvJ130tpTPL53/L92gG0pFtvQ6ln35ppwhHE= github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 h1:D7wbL2Ww6QN5SblEDMiQcFulqz2jgcvawKaNBTzHLvQ= github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696/go.mod h1:hfspzdRcvJ130tpTPL53/L92gG0pFtvQ6ln35ppwhHE= @@ -400,7 +334,6 @@ github.com/getlantern/keepcurrent v0.0.0-20221014183517-fcee77376b89 h1:gjlTAADW github.com/getlantern/keepcurrent v0.0.0-20221014183517-fcee77376b89/go.mod h1:EtJEobtQH/HiQsZLyRjlrnq/fu7vfgnTMzhbmUqkZ3M= github.com/getlantern/keyman v0.0.0-20180207174507-f55e7280e93a/go.mod h1:FMf0g72BHs14jVcD8i8ubEk4sMB6JdidBn67d44i3ws= github.com/getlantern/keyman v0.0.0-20200819205636-76fef27c39f1/go.mod h1:FMf0g72BHs14jVcD8i8ubEk4sMB6JdidBn67d44i3ws= -github.com/getlantern/keyman v0.0.0-20210622061955-aa0d47d4932c/go.mod h1:lzCwzxjE8ciu+2bZku7kcCKfOYAXUs4stPn3elouYNI= github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b h1:iyEuk8ARQC9HfraqC4r3leBhU55R1TV7bAiyPYE54kA= github.com/getlantern/keyman v0.0.0-20230503155501-4e864ca2175b/go.mod h1:ZJ+yDaZkJ/JU9j7EQa3UUh6ouedrNDDLA5OiowS1Iuk= github.com/getlantern/lampshade v0.0.0-20201109225444-b06082e15f3a h1:z7G1v79GB1qRrkcbzF0nrLzV/+dwdGmamEZAp0ff+z0= @@ -419,26 +352,23 @@ github.com/getlantern/mockconn v0.0.0-20190708122800-637bd46d8034/go.mod h1:+F5G github.com/getlantern/mockconn v0.0.0-20191023022503-481dbcceeb58/go.mod h1:+F5GJ7qGpQ03DBtcOEyQpM30ix4BLswdaojecFtsdy8= github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848 h1:2MhMMVBTnaHrst6HyWFDhwQCaJ05PZuOv1bE2gN8WFY= github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848/go.mod h1:+F5GJ7qGpQ03DBtcOEyQpM30ix4BLswdaojecFtsdy8= -github.com/getlantern/msgpack v3.1.4+incompatible h1:/XyJ9HTt8W31F6DjgOv+Nk+qKeKcv9kxp6hOww4pj1k= -github.com/getlantern/msgpack v3.1.4+incompatible/go.mod h1:mUNR5C/x5E/8Jb8gU/lQd/ytwpKDhUvmGUj0STqInhc= github.com/getlantern/mtime v0.0.0-20170117193331-ba114e4a82b0/go.mod h1:u537FS7ld4Whf7h7/0ql/myAudWWBNgeRhgE9XXH4Pk= github.com/getlantern/mtime v0.0.0-20200228202836-084e1d8282b0/go.mod h1:GfzwugvtH7YcmNIrHHizeyImsgEdyL88YkdnK28B14c= github.com/getlantern/mtime v0.0.0-20200417132445-23682092d1f7 h1:03J6Cb42EG06lHgpOFGm5BOax4qFqlSbSeKO2RGrj2g= github.com/getlantern/mtime v0.0.0-20200417132445-23682092d1f7/go.mod h1:GfzwugvtH7YcmNIrHHizeyImsgEdyL88YkdnK28B14c= github.com/getlantern/multipath v0.0.0-20230510135141-717ed305ef50 h1:+3K4Zk0NuXGHdPOL6uqchUUFyLUIl0CIdlp6ksgZxDM= github.com/getlantern/multipath v0.0.0-20230510135141-717ed305ef50/go.mod h1:uzxEbpNdIj+Iw9lEVuY1HF3OdAJ4RJykQHSL8lPee4M= -github.com/getlantern/netstack v0.0.0-20220824143118-037ff0cd9c33 h1:xRYz3XSG5NFKM2PtxfJd5c8m16GpHN0YXF2PZAMaHP8= -github.com/getlantern/netstack v0.0.0-20220824143118-037ff0cd9c33/go.mod h1:Cqo5uZK3k9SmJcFVvRlBKQPY/2NB2NkdBPP9sn3qnHI= github.com/getlantern/nettest v1.0.0 h1:xg8vq9JrGzrFGFkFGwZwIJ5+kwtvyqNDIADwrANvhQg= github.com/getlantern/nettest v1.0.0/go.mod h1:8wY0QwrdpkayCBQXjhZoJuwu2IHfp4UErrxgwaJ2UM4= github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd/go.mod h1:wKdY0ikOgzrWSeB9UyBVKPRhjXQ+vTb+BPeJuypUuNE= -github.com/getlantern/netx v0.0.0-20211206143627-7ccfeb739cbd h1:z5IehLDMqMwJ0oeFIaMHhySRU8r1lRMh7WQ0Wn0LioA= github.com/getlantern/netx v0.0.0-20211206143627-7ccfeb739cbd/go.mod h1:WEXF4pfIfnHBUAKwLa4DW7kcEINtG6wjUkbL2btwXZQ= +github.com/getlantern/netx v0.0.0-20240124040039-163b1628a66b h1:PD3SpvkPDevU1eNXdN0DgPq3tMtXScBseftntHezDuY= +github.com/getlantern/netx v0.0.0-20240124040039-163b1628a66b/go.mod h1:of3zrQoL7Av3VzWiRXz4vSbnnUyJLMr5lIQ1vPRA4FA= github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= github.com/getlantern/ops v0.0.0-20220713155959-1315d978fff7/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= -github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c h1:qcPAzA1ZDnwx618jAgQmxo6UvJkw2SkM1L4ofncmEhI= -github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c/go.mod h1:g2ueCncOwWenlAr56Fh90FwsACkelqqtFUDLAHg1mng= +github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534 h1:3BwvWj0JZzFEvNNiMhCu4bf60nqcIuQpTYb00Ezm1ag= +github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534/go.mod h1:ZsLfOY6gKQOTyEcPYNA9ws5/XHZQFroxqCOhHjGcs9Y= github.com/getlantern/osversion v0.0.0-20230401075644-c2a30e73c451 h1:3Nn0AqIlImbb0TE4oFhr4BETBZhRUPo9GuebHvMzWB4= github.com/getlantern/osversion v0.0.0-20230401075644-c2a30e73c451/go.mod h1:kaUdXyKE1Y8bwPnlN7ChFXWnkADpL0zZrk8F0XbpKcc= github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360 h1:pijUoofaQcAM/8zbDzZM2LQ90kGVbKfnSAkFnQwLZZU= @@ -449,38 +379,33 @@ github.com/getlantern/preconn v1.0.0 h1:DsY3l/y/BJUj86WyaxXylbJnCC9QbKcc3D6js6rF github.com/getlantern/preconn v1.0.0/go.mod h1:i/AnXvx715Fq7HgZLlmQlw3sGfEkku8BQT5hLHMK4+k= github.com/getlantern/probe v0.0.0-20191107230642-ed284e08029a/go.mod h1:EPE0nd9YNS2FTIz+2EOkqojCuqaQlJ+fTiLPklsqe/E= github.com/getlantern/probe v0.0.0-20211216020459-69afa01c1c5c h1:bWusw8SYvl/iq+nHzSIe4oC7HdwaCN0KQEZkIHimamM= +github.com/getlantern/probe v0.0.0-20211216020459-69afa01c1c5c/go.mod h1:ditYj5obTW66F7c2nOTFUONMADmbzkzOsnkWfFWH3jk= github.com/getlantern/probednet v0.0.0-20190725133252-1cfdb2354b4d/go.mod h1:7sl7hPjPDAqXyxVx7mhrKfvb4oCX/ROhcs16w2EhWX8= github.com/getlantern/probednet v0.0.0-20211216020507-22fd9c1d3bf6 h1:8jg6OehdQr90Ybmyc68raXEqM/1hk8E7F2YAUfmcvzE= +github.com/getlantern/probednet v0.0.0-20211216020507-22fd9c1d3bf6/go.mod h1:noglym51kFdkZEV/WjiIzRKV6qwwTI9/vSAjeOI/zCU= github.com/getlantern/proxy/v3 v3.0.0-20231031142453-252ab678e6b7 h1:r6lDJ9gea/mIvI5QGQm6rzp/iEV/IpqdH+lSL3r0fgk= github.com/getlantern/proxy/v3 v3.0.0-20231031142453-252ab678e6b7/go.mod h1:SUQ8fQ0ImT7N7taLLU21HI7i9VR8j/bSxG/OiwSZM4s= -github.com/getlantern/proxybench v0.0.0-20220404140110-f49055cb86de h1:328hcuyQi8KGZr4GV2EtWllwBmS10oVGevwZEOk2dDE= -github.com/getlantern/proxybench v0.0.0-20220404140110-f49055cb86de/go.mod h1:kF5QcNhyCA0tpZ+MLVdeJb0bZpgXyMjR/CnPtaltlFU= github.com/getlantern/psmux v1.5.15-0.20200903210100-947ca5d91683/go.mod h1:GtXRvtMItoflWGLPE7GNq+AdL7BnmpaaNLtDQVD1XHU= github.com/getlantern/psmux v1.5.15 h1:VUCEk8MIsvAj90wNYRyY2fE9ZL4LIRhi1W5V9aycA9A= github.com/getlantern/psmux v1.5.15/go.mod h1:nyp/sr4uTbWpUh7Q2WovRb07LeLNUxDg8kAdS726FIw= -github.com/getlantern/quicwrapper v0.0.0-20230523101504-1ec066b7f869 h1:nx0sr8jXoEBbI0jHDOHIkM0z5dXotQRUSsE/e7lUGXw= -github.com/getlantern/quicwrapper v0.0.0-20230523101504-1ec066b7f869/go.mod h1:0k08ZBlQon93TrW6KmBLhLSz89qHQFR2LstGlIRgYo8= +github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970 h1:ekTCi+m1TvUceBCT/6qz3/7fnljyytGW8waUW7dGQD4= +github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970/go.mod h1:PEDykM1SIU8PTVRrShJ9/WVb/uBpGyl4XBgT+LKw+X4= github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7 h1:47FJ5kTeXc3I1VPpi2hWW9I16/Y3K0cpUq/B7oWJGF8= github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7/go.mod h1:OOqKCIkspqXtIWEex4uhH1H9l7NGekT9i3Hs591ZDk4= github.com/getlantern/reconn v0.0.0-20161128113912-7053d017511c h1:IkjF+RwRs8B/RsuD638eUFO2K/227OO2B1FLXGp17Ro= github.com/getlantern/reconn v0.0.0-20161128113912-7053d017511c/go.mod h1:kExwbqTx1krUnT9ohmXG3jayDTEBfxUKeoRzU6XucLw= -github.com/getlantern/redis-utils v0.0.0-20210823133122-d4f0e525e095/go.mod h1:1X9DhzvePQ89WjJRzY2DA5Xpgi7jI0i5E0rFjYxgPWI= -github.com/getlantern/replica v0.14.2 h1:Ajnpvr4n5QUwudqYbZaf3GamONmr6L44bVxVomoGbtU= -github.com/getlantern/replica v0.14.2/go.mod h1:nl+185Mu8FGrTosLNZ/9S1IDAxHdPDXnJQUJ7mAV37k= +github.com/getlantern/replica v0.14.3 h1:vYsUKFAK1RyCjsD3JzotC1teYmaFa936FVZTARnzQjg= +github.com/getlantern/replica v0.14.3/go.mod h1:Zv4JqQVpIXfHxNDD8QWj0W+GtuwlfZbYnZoahWDt4iA= github.com/getlantern/rot13 v0.0.0-20220822172233-370767b2f782 h1:A1+qM0Dqm0no8A5qvWoTCFKME9Sa67xsJ1fcV13PvEY= github.com/getlantern/rot13 v0.0.0-20220822172233-370767b2f782/go.mod h1:O0dNqH9hbXlOa9OpVdbACmTBfDPD+ENjbY0cPkzBd9g= github.com/getlantern/rotator v0.0.0-20160829164113-013d4f8e36a2 h1:smFR/kESUKlcdyatoOO3HngBzzrUU6S0LRw2vCBYQPg= github.com/getlantern/rotator v0.0.0-20160829164113-013d4f8e36a2/go.mod h1:Ap+QTDJeA24+0jjPHReq/LyP3ugEEDYvncluEgsm60A= github.com/getlantern/shortcut v0.0.0-20211026183428-bf59a137fdec h1:8TfjIMydnhBs4edmXu2Nz1f2P0QOcXfol2rR1cxfrSs= github.com/getlantern/shortcut v0.0.0-20211026183428-bf59a137fdec/go.mod h1:3VQ6qvEBehqDBNbEKfNtSjK6MR5ydOdjMPgKjKay7vo= -github.com/getlantern/sqlite v0.0.0-20220301112206-cb2f8bc7cb56 h1:sAXnWKv8c28+G9fTitNopAYbIUswIWnOIOPXY+c/kGA= -github.com/getlantern/sqlite v0.0.0-20220301112206-cb2f8bc7cb56/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4= -github.com/getlantern/sqlparser v0.0.0-20171012210704-a879d8035f3c/go.mod h1:wGjYYh1vSkRes1bNy+zio7cmmI9cLbST+H8eqnt5Mg4= github.com/getlantern/telemetry v0.0.0-20230523155019-be7c1d8cd8cb h1:6XZ3Q4oD6A1Tjq6QLgzzQrdQ8FvulzW16HhNQOSECAM= github.com/getlantern/telemetry v0.0.0-20230523155019-be7c1d8cd8cb/go.mod h1:nGOdDc0aD/LRTaY2SGKQ7nsYcWFXrhgkrhIhJuYN614= github.com/getlantern/testify v0.0.0-20160317154340-2eeb3906e78f h1:R6iv+VzCrbxlBm2TcgyJi9c7tQguNXi9JmIvuUJKrdc= github.com/getlantern/testify v0.0.0-20160317154340-2eeb3906e78f/go.mod h1:uKKI9HSwZ4C8tx1vV+ovbG32Lw9LixtzPLNiS8U/ddA= -github.com/getlantern/testredis v0.0.0-20210610142259-c0995d455766/go.mod h1:f57SFFLkB+WLz10IoqovqksV6fTK91SuweVS21OEkdc= github.com/getlantern/timezone v0.0.0-20210901200113-3f9de9d360c9 h1:VTNjZxSuAHUzu13lYpEVB8gc3xz5hZePGNHG5enHYLY= github.com/getlantern/timezone v0.0.0-20210901200113-3f9de9d360c9/go.mod h1:7uvbzuoOr3uYGHZx5QWlI8/C52XEf/aTb/tJFEe41Ak= github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461 h1:3HOWV/uUGde6whvG7aoxIQlL43jHkmPupJsDCA569u0= @@ -499,19 +424,15 @@ github.com/getlantern/tlsutil v0.5.3/go.mod h1:lVgvr4nxuQ1ocOho90UB6LnHFlpP16TXA github.com/getlantern/uuid v1.1.2-0.20190507182000-5c9436b8c718/go.mod h1:uX10hOzZUUDR+oYNSIks+RcozOEiwTNC/K2rw9SUi1k= github.com/getlantern/uuid v1.2.0 h1:pGrGaCV7XEaG6lvjWkwf8Y92BjB/9yFmkKsNFpRQ7rc= github.com/getlantern/uuid v1.2.0/go.mod h1:uX10hOzZUUDR+oYNSIks+RcozOEiwTNC/K2rw9SUi1k= -github.com/getlantern/vtime v0.0.0-20160810174823-dc1e573cf991/go.mod h1:Sfa815JjnYX/fxcE/nHKxyanK/2Iy+6FbMO4/ou3gWw= github.com/getlantern/waitforserver v1.0.1 h1:xBjqJ3GgEk9JMWnDgRSiNHXINi6Lv2tGNjJR0hCkHFY= github.com/getlantern/waitforserver v1.0.1/go.mod h1:K1oSA8lNKgQ9iC00OFpMfMNm4UMrsxoGCdHf0NT9LGs= -github.com/getlantern/wal v0.0.0-20220217194315-e4eac848dbd1/go.mod h1:emAPVd2NRdPkbqAInyWVD6s/AltbTRvKdHXlEhDXX4M= github.com/getlantern/withtimeout v0.0.0-20160829163843-511f017cd913 h1:YK3YNyTsa+1BPWOoN0F79rrjHyfNx4MAoFEvzwQU+dY= github.com/getlantern/withtimeout v0.0.0-20160829163843-511f017cd913/go.mod h1:bwttrA0oacoHdL476F60prypY1oC++WLtVexumgZozY= github.com/getlantern/yaml v0.0.0-20190801163808-0c9bb1ebf426 h1:lb2OElfhZzfgvNQym79ONvv4yvDh/gShHkLQI6qzriA= github.com/getlantern/yaml v0.0.0-20190801163808-0c9bb1ebf426/go.mod h1:SoTXbOvaDC1bH3QrlkU5kz/h12tU/hN54wSMUCdgEXs= -github.com/getlantern/zenodb v0.0.0-20220217194355-df46cc148a8c/go.mod h1:711qYcNux6PYvLgAG/YxKSlaTgASfgXkAhaSgvOKbW8= -github.com/getsentry/sentry-go v0.20.0 h1:bwXW98iMRIWxn+4FgPW7vMrjmbym6HblXALmhjHmQaQ= -github.com/getsentry/sentry-go v0.20.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= +github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= @@ -520,28 +441,28 @@ github.com/glycerine/goconvey v0.0.0-20190315024820-982ee783a72e/go.mod h1:Ogl1T github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs= -github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= -github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs= +github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= +github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-llsqlite/adapter v0.0.0-20230927005056-7f5ce7f0c916 h1:OyQmpAN302wAopDgwVjgs2HkFawP9ahIEqkUYz7V7CA= +github.com/go-llsqlite/adapter v0.0.0-20230927005056-7f5ce7f0c916/go.mod h1:DADrR88ONKPPeSGjFp5iEN55Arx3fi2qXZeKCYDpbmU= +github.com/go-llsqlite/crawshaw v0.5.1 h1:dIYQG2qHrGjWXVXvl00JxIHBuwD+h8VXgNubLiMoPNU= +github.com/go-llsqlite/crawshaw v0.5.1/go.mod h1:/YJdV7uBQaYDE0fwe4z3wwJIZBJxdYzd38ICggWqtaE= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1ZfnOtKOaiM= -github.com/go-redis/redis/v8 v8.11.3/go.mod h1:xNJ9xDG09FsIPwh3bWdk+0oDWHbtF9rPN0F/oD9XeKc= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= @@ -551,40 +472,30 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= -github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721 h1:KRMr9A3qfbVM7iV/WcLY/rL5LICqwMHLhwRXKu99fXw= -github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= +github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f h1:16RtHeWGkJMc80Etb8RPCcKevXGldr57+LOyZt8zOlg= +github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f/go.mod h1:ijRvpgDJDI262hYq/IQVYgf8hd8IHUs93Ol0kvMBAx4= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= -github.com/golang/geo v0.0.0-20200319012246-673a6f80352d h1:C/hKUcHT483btRbeGkrRjJz+Zbcj8audldIi9tRJDCc= github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= +github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I= +github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -594,168 +505,149 @@ github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v1.8.5/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= -github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f h1:pDhu5sgp8yJlEF/g6osliIIpF9K4F5jvkULXa4daRDQ= -github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 h1:dHLYa5D8/Ta0aLR2XcPsrkpAgGeFs6thhMcQK0oQ0n8= +github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190309154008-847fc94819f9/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20170920190843-316c5e0ff04e/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= -github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v0.0.0-20170914154624-68e816d1c783/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= +github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/inconshreveable/log15 v0.0.0-20170622235902-74a0988b5f80/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jaffee/commandeer v0.6.0 h1:YI44XLWcJN21euhh32sZW8vM/tljPYxhsXIfEPkQKcs= github.com/jaffee/commandeer v0.6.0/go.mod h1:kCwfuSvZ2T0NVEr3LDSo6fDUgi0xSBnAVDdkOKTtpLQ= github.com/jawher/mow.cli v1.1.0/go.mod h1:aNaQlc7ozF3vw6IJ2dHjp2ZFiA4ozMIYY6PyuRJwlUg= -github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff/go.mod h1:ddfPX8Z28YMjiqoaJhNBzWHapTHXejnB5cDCUWDwriw= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4 h1:nwOc1YaOrYJ37sEBrtWZrdqzK22hiJs3GpDmP3sR2Yw= github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kataras/golog v0.1.9 h1:vLvSDpP7kihFGKFAvBSofYo7qZNULYSHOH2D7rPTKJk= +github.com/kataras/golog v0.1.9/go.mod h1:jlpk/bOaYCyqDqH18pgDHdaJab72yBE6i0O3s30hpWY= github.com/kataras/pio v0.0.12 h1:o52SfVYauS3J5X08fNjlGS5arXHjW/ItLkyLcKjoH6w= +github.com/kataras/pio v0.0.12/go.mod h1:ODK/8XBhhQ5WqrAhKy+9lTPS7sBf6O3KcLhc9klfRcY= github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o= github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= -github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= -github.com/klauspost/reedsolomon v1.9.9 h1:qCL7LZlv17xMixl55nq2/Oa1Y86nfO8EqDfv2GHND54= -github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo= +github.com/klauspost/reedsolomon v1.12.0 h1:I5FEp3xSwVCcEh3F5A7dofEfhXdF/bWhQWPH+XwBFno= +github.com/klauspost/reedsolomon v1.12.0/go.mod h1:EPLZJeh4l27pUGC3aXOjheaoh1I9yut7xTURiW3LQ9Y= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/binarydist v0.1.0 h1:6kAoLA9FMMnNGSehX0s1PdjbEaACznAv/W219j2uvyo= github.com/kr/binarydist v0.1.0/go.mod h1:DY7S//GCoz1BCd0B0EVrinCKAZN3pXe+MDaIZbXQVgM= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ= -github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY= +github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= +github.com/magiconair/properties v1.7.4-0.20170902060319-8d7837e64d3c/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= -github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= -github.com/mattn/go-sqlite3 v1.14.11 h1:gt+cp9c0XGqe9S/wAHTL3n/7MqY+siPWgWJgqdsFrzQ= +github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-sqlite3 v2.0.2+incompatible h1:qzw9c2GNT8UFrgWNDhCTqRqYUSmu/Dav/9Z58LGpk7U= +github.com/mattn/go-sqlite3 v2.0.2+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= github.com/mdlayher/netlink v1.1.0 h1:mpdLgm+brq10nI9zM1BpX1kpDbh3NLl3RSnVq6ZSkfg= github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo= github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= -github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= +github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= +github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-server-timing v1.0.1 h1:f00/aIe8T3MrnLhQHu3tSWvnwc5GV/p5eutuu3hF/tE= github.com/mitchellh/go-server-timing v1.0.1/go.mod h1:Mo6GKi9FSLwWFAMn3bqVPWe20y5ri5QGQuO9D9MCOxk= +github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104 h1:ULR/QWMgcgRiZLUjSSJMU+fW+RDMstRdmnDWj9Q+AsA= -github.com/mmcloughlin/avo v0.0.0-20200803215136-443f81d77104/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -766,8 +658,6 @@ github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/ncw/swift v1.0.52/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/nwaples/rardecode v1.1.2 h1:Cj0yZY6T1Zx1R7AhTbyGSALm44/Mmq+BAPc4B/p/d3M= github.com/nwaples/rardecode v1.1.2/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= @@ -777,100 +667,97 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI= -github.com/onsi/ginkgo/v2 v2.12.0/go.mod h1:ZNEzXISYlqpb8S36iN71ifqLi3vVD1rVJGvWRCJOUpQ= +github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs= +github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s= github.com/oschwald/geoip2-golang v1.8.0 h1:KfjYB8ojCEn/QLqsDU0AzrJ3R5Qa9vFlx3z6SLNcKTs= github.com/oschwald/geoip2-golang v1.8.0/go.mod h1:R7bRvYjOeaoenAp9sKRS8GX5bJWcZ0laWO5+DauEktw= -github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/oschwald/maxminddb-golang v1.10.0 h1:Xp1u0ZhqkSuopaKmk1WwHtjF0H9Hd9181uj2MQ5Vndg= github.com/oschwald/maxminddb-golang v1.10.0/go.mod h1:Y2ELenReaLAZ0b400URyGwvYxHV1dLIxBuyOsyYjHK0= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= -github.com/oxtoacart/emsort v0.0.0-20160911032127-e467347e3354/go.mod h1:IQ2AliaPIeFz7bCSZl4NkBSh+JKdYqrjoSkE+tTH7P4= -github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.0.1-0.20170904195809-1d6b12b7cb29/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.2/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.12 h1:44l88ehTZAUGW4VlO1QC4zkilL99M6Y9MXNwEs0uzP8= github.com/pierrec/lz4/v4 v4.1.12/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= -github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY= -github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= -github.com/pion/ice/v2 v2.3.5 h1:Y8D/ZT+H4mo2DOl3YbCz5+FoXlYSYnziSJWWcvy4oOU= -github.com/pion/ice/v2 v2.3.5/go.mod h1:MloU1ypbcE3WBbETCkGw6rx9RcfeHdaBqsaB08R2tlI= -github.com/pion/interceptor v0.1.17 h1:prJtgwFh/gB8zMqGZoOgJPHivOwVAp61i2aG61Du/1w= -github.com/pion/interceptor v0.1.17/go.mod h1:SY8kpmfVBvrbUzvj2bsXz7OJt5JvmVNZ+4Kjq7FcwrI= +github.com/pion/dtls/v2 v2.2.9 h1:K+D/aVf9/REahQvqk6G5JavdrD8W1PWDKC11UlwN7ts= +github.com/pion/dtls/v2 v2.2.9/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= +github.com/pion/ice/v2 v2.3.11 h1:rZjVmUwyT55cmN8ySMpL7rsS8KYsJERsrxJLLxpKhdw= +github.com/pion/ice/v2 v2.3.11/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E= +github.com/pion/interceptor v0.1.25 h1:pwY9r7P6ToQ3+IF0bajN0xmk/fNw/suTgaTdlwTDmhc= +github.com/pion/interceptor v0.1.25/go.mod h1:wkbPYAak5zKsfpVDYMtEfWEy8D4zL+rpxCxPImLOg3Y= github.com/pion/logging v0.2.1/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U= -github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8= +github.com/pion/mdns v0.0.8/go.mod h1:hYE72WX8WDveIhg7fmXgMKivD3Puklk0Ymzog0lSyaI= +github.com/pion/mdns v0.0.9 h1:7Ue5KZsqq8EuqStnpPWV33vYYEH0+skdDN5L7EiEsI4= +github.com/pion/mdns v0.0.9/go.mod h1:2JA5exfxwzXiCihmxpTKgFUpiQws2MnipoPK09vecIc= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc= github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I= -github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= -github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= +github.com/pion/rtcp v1.2.13 h1:+EQijuisKwm/8VBs8nWllr0bIndR7Lf7cZG200mpbNo= +github.com/pion/rtcp v1.2.13/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= +github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/rtp v1.8.3 h1:VEHxqzSVQxCkKDSHro5/4IUUG1ea+MFdqR2R3xSpNU8= +github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0= -github.com/pion/sctp v1.8.7 h1:JnABvFakZueGAn4KU/4PSKg+GWbF6QWbKTWZOSGJjXw= -github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU= +github.com/pion/sctp v1.8.8/go.mod h1:igF9nZBrjh5AtmKc7U30jXltsFHicFCXSmWA2GWRaWs= +github.com/pion/sctp v1.8.9 h1:TP5ZVxV5J7rz7uZmbyvnUvsn7EJ2x/5q9uhsTtXbI3g= +github.com/pion/sctp v1.8.9/go.mod h1:cMLT45jqw3+jiJCrtHVwfQLnfR0MGZ4rgOJwUOIqLkI= github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw= github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= -github.com/pion/srtp/v2 v2.0.15 h1:+tqRtXGsGwHC0G0IUIAzRmdkHvriF79IHVfZGfHrQoA= -github.com/pion/srtp/v2 v2.0.15/go.mod h1:b/pQOlDrbB0HEH5EUAQXzSYxikFbNcNuKmF8tM0hCtw= +github.com/pion/srtp/v2 v2.0.18 h1:vKpAXfawO9RtTRKZJbG4y0v1b11NZxQnxRl85kGuUlo= +github.com/pion/srtp/v2 v2.0.18/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA= github.com/pion/stun v0.3.1/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= github.com/pion/stun v0.3.2/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= -github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw= -github.com/pion/stun v0.5.2/go.mod h1:TNo1HjyjaFVpMZsvowqPeV8TfwRytympQC0//neaksA= -github.com/pion/stun v0.6.0 h1:JHT/2iyGDPrFWE8NNC15wnddBN8KifsEDw8swQmrEmU= -github.com/pion/stun v0.6.0/go.mod h1:HPqcfoeqQn9cuaet7AOmB5e5xkObu9DwBdurwLKO9oA= +github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= +github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= +github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= github.com/pion/transport v0.8.6/go.mod h1:nAmRRnn+ArVtsoNuwktvAD+jrjSD7pA+H3iRmZwdUno= github.com/pion/transport v0.8.8/go.mod h1:lpeSM6KJFejVtZf8k0fgeN7zE73APQpTF83WvA1FVP8= +github.com/pion/transport v0.8.9/go.mod h1:lpeSM6KJFejVtZf8k0fgeN7zE73APQpTF83WvA1FVP8= github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40= github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI= -github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= -github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0= -github.com/pion/transport/v2 v2.1.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= -github.com/pion/transport/v2 v2.2.0/go.mod h1:AdSw4YBZVDkZm8fpoz+fclXyQwANWmZAlDuQdctTThQ= -github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c= github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= +github.com/pion/transport/v2 v2.2.2/go.mod h1:OJg3ojoBJopjEeECq2yJdXH9YVrUJ1uQ++NjXLOUorc= +github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= +github.com/pion/transport/v2 v2.2.4 h1:41JJK6DZQYSeVLxILA2+F4ZkKb4Xd/tFJZRFZQ9QAlo= +github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= +github.com/pion/transport/v3 v3.0.1 h1:gDTlPJwROfSfz6QfSi0ZmeCSkFcnWWiiR9ES0ouANiM= +github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0= github.com/pion/turn v1.3.5/go.mod h1:zGPB7YYB/HTE9MWn0Sbznz8NtyfeVeanZ834cG/MXu0= -github.com/pion/turn v1.3.7 h1:/nyM2XrlZILD7KKfnh0oYEBTRG5JlbH21ibjluRoCeo= -github.com/pion/turn v1.3.7/go.mod h1:js0LBFqMcKAlaWAXoYqNjefGI7kfJCrkCBfHGuTToXE= -github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI= -github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs= -github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8= -github.com/pion/webrtc/v3 v3.2.6 h1:6pHQacytdvCbWSJT1IHMi6d67FuAEu9jEQ98GqKNgJU= -github.com/pion/webrtc/v3 v3.2.6/go.mod h1:+//AwYJLlhHRyoNyuRUBs7Pw1jyZHCxQCuu2ZUNSBaw= +github.com/pion/turn v1.4.0 h1:7NUMRehQz4fIo53Qv9ui1kJ0Kr1CA82I81RHKHCeM80= +github.com/pion/turn v1.4.0/go.mod h1:aDSi6hWX/hd1+gKia9cExZOR0MU95O7zX9p3Gw/P2aU= +github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= +github.com/pion/turn/v2 v2.1.4 h1:2xn8rduI5W6sCZQkEnIUDAkrBQNl2eYIBCHMZ3QMmP8= +github.com/pion/turn/v2 v2.1.4/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY= +github.com/pion/webrtc/v3 v3.2.24 h1:MiFL5DMo2bDaaIFWr0DDpwiV/L4EGbLZb+xoRvfEo1Y= +github.com/pion/webrtc/v3 v3.2.24/go.mod h1:1CaT2fcZzZ6VZA+O1i9yK2DU4EOcXVvSbWG9pr5jefs= github.com/pivotal-cf-experimental/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:AbOpFa7UXCGaV+aq9tvFdSHEhmcb8uO6nKZdYhKsT1I= +github.com/pivotal-cf-experimental/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:4+wzrM70C+Ky5iZiA6lNV5J48jnGmu8YcbmuVWdlt5s= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -878,103 +765,102 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI= +github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM= -github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U= -github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= -github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= -github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= -github.com/quic-go/quic-go v0.34.0 h1:OvOJ9LFjTySgwOTYUZmNoq0FzVicP8YujpV0kB7m2lU= -github.com/quic-go/quic-go v0.34.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g= +github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k= +github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/reflog/minisentinel v0.0.0-20210817104530-e0dd88cb8bc6/go.mod h1:UdPuN3+X0Rvf3yJ++7j0zj4P8EaI6YwQJS+JbBk2o8k= github.com/refraction-networking/utls v0.0.0-20190415193640-32987941ebd3/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0= github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0= github.com/refraction-networking/utls v1.3.3 h1:f/TBLX7KBciRyFH3bwupp+CE4fzoYKCirhdRcC490sw= github.com/refraction-networking/utls v1.3.3/go.mod h1:DlecWW1LMlMJu+9qpzzQqdHDT/C2LAe03EdpLUz/RL8= -github.com/retailnext/hllpp v1.0.0/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= -github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037/go.mod h1:F1p8BNM4IXv2UcptwSp8HJOapKurodd/PYu1D6Gtn9Y= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 h1:Lt9DzQALzHoDwMBGJ6v8ObDPR0dzr2a6sXTB1Fq7IHs= github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= -github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= -github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= +github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= +github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/shadowsocks/go-shadowsocks2 v0.1.5 h1:PDSQv9y2S85Fl7VBeOMF9StzeXZyK1HakRm86CUbr28= github.com/shadowsocks/go-shadowsocks2 v0.1.5/go.mod h1:AGGpIoek4HRno4xzyFiAtLHkOpcoznZEkAccaI/rplM= -github.com/shirou/gopsutil v2.18.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= -github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw= +github.com/shirou/gopsutil/v3 v3.22.9 h1:yibtJhIVEMcdw+tCTbOPiF1VcsuDeTE4utJ8Dm4c5eA= +github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A= github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 h1:xT+JlYxNGqyT+XcU8iUrN18JYed2TvG9yN5ULG2jATM= github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw= -github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s= -github.com/siddontang/goredis v0.0.0-20180423163523-0b4019cbd7b7/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s= -github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff/go.mod h1:KSQcGKpxUMHk3nbYzs/tIBAM2iDooCn0BmttHOJEbLs= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b/go.mod h1:P5HUIBuIWKbyjl083/loAegFkfbFNx5i2qEP4CNbm7E= github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 h1:TG/diQgUe0pntT/2D9tmUCz4VNwm9MfrtPr0SU2qSX8= github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8/go.mod h1:P5HUIBuIWKbyjl083/loAegFkfbFNx5i2qEP4CNbm7E= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.1.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v0.0.0-20170901151539-12bd96e66386/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.1-0.20170901120850-7aff26db30c1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -985,19 +871,15 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= -github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes= github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= -github.com/templexxx/cpu v0.0.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= -github.com/templexxx/cpu v0.0.8 h1:va6GebSxedVdR5XEyPJD49t94p5ZsjWO6Wh/PfbmZnc= -github.com/templexxx/cpu v0.0.8/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= -github.com/templexxx/xorsimd v0.4.1 h1:iUZcywbOYDRAZUasAs2eSCUW8eobuZDy0I9FJiORkVg= -github.com/templexxx/xorsimd v0.4.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo= +github.com/templexxx/cpu v0.1.0 h1:wVM+WIJP2nYaxVxqgHPD4wGA2aJ9rvrQRV8CvFzNb40= +github.com/templexxx/cpu v0.1.0/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= +github.com/templexxx/xorsimd v0.4.2 h1:ocZZ+Nvu65LGHmCLZ7OoCtg8Fx8jnHKK37SjvngUoVI= +github.com/templexxx/xorsimd v0.4.2/go.mod h1:HgwaPoDREdi6OnULpSfxhzaiiSUY4Fi3JPn1wpt28NI= github.com/ti-mo/conntrack v0.3.0 h1:572/72R9la2FVvO6CbsLiCmR48U3pgCvIlLKoUrExDU= github.com/ti-mo/conntrack v0.3.0/go.mod h1:tPSYNx21TnjxGz99pLD/lAN4fuEViaJZz+pliMqnovk= github.com/ti-mo/netfilter v0.3.1 h1:+ZTmeTx+64Jw2N/1gmqm42kruDWjQ90SMjWEB1e6VDs= @@ -1007,174 +889,123 @@ github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EU github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= -github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= -github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= -github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= -github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tkuchiki/go-timezone v0.2.0 h1:yyZVHtQRVZ+wvlte5HXvSpBkR0dPYnPEIgq9qqAqltk= +github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= +github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= +github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A= +github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo= github.com/tkuchiki/go-timezone v0.2.0/go.mod h1:b1Ean9v2UXtxSq4TZF0i/TU9NuoWa9hOzOKoGCV2zqY= +github.com/tkuchiki/go-timezone v0.2.2 h1:MdHR65KwgVTwWFQrota4SKzc4L5EfuH5SdZZGtk/P2Q= +github.com/tkuchiki/go-timezone v0.2.2/go.mod h1:oFweWxYl35C/s7HMVZXiA19Jr9Y0qJHMaG/J2TES4LY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= -github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0= -github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw= +github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= -github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/vharitonsky/iniflags v0.0.0-20180513140207-a33cd0b5f3de/go.mod h1:irMhzlTz8+fVFj6CH2AN2i+WI5S6wWFtK3MBCIxIpyI= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vulcand/oxy v1.4.2 h1:KibUVdKrwy7eXR3uHS2pYoZ9dCzKVcgDNHD2jkPZmxU= +github.com/vulcand/oxy v1.4.2/go.mod h1:Yq8OBb0XWU/7nPSglwUH5LS2Pcp4yvad8SVayobZbSo= github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xitongsys/parquet-go v1.5.1/go.mod h1:xUxwM8ELydxh4edHGegYq1pA8NnMKDx0K/GyB0o2bww= -github.com/xitongsys/parquet-go v1.6.2/go.mod h1:IulAQyalCm0rPiZVNnCgm/PCL64X2tdSVGMQ/UeKqWA= -github.com/xitongsys/parquet-go-source v0.0.0-20190524061010-2b72cbee77d5/go.mod h1:xxCx7Wpym/3QCo6JhujJX51dzSXrwmb0oH6FQb39SEA= -github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0/go.mod h1:HYhIKsdns7xz80OgkbgJYrtQY7FjHWHKH6cvN7+czGE= -github.com/xitongsys/parquet-go-source v0.0.0-20211228015320-b4f792c43cd0/go.mod h1:qLb2Itmdcp7KPa5KZKvhE9U1q5bYSOmgeOckF/H2rQA= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM= +github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 h1:EWU6Pktpas0n8lLQwDsRyZfmkPeRbdgPtW609es+/9E= +github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37/go.mod h1:HpMP7DB2CyokmAh4lp0EQnnWhmycP/TvwBGzvuie+H0= github.com/xtaci/smux v1.5.10/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY= github.com/xtaci/smux v1.5.24 h1:77emW9dtnOxxOQ5ltR+8BbsX1kzcOxQ5gB+aaV9hXOY= github.com/xtaci/smux v1.5.24/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY= -github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= -github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= -github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= -gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb h1:qRSZHsODmAP5qDvb3YsO7Qnf3TRiVbGxNG/WYnlM4/o= -gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb/go.mod h1:gvdJuZuO/tPZyhEV8K3Hmoxv/DWud5L4qEQxfYjEUTo= -gitlab.com/yawning/obfs4.git v0.0.0-20220904064028-336a71d6e4cf h1:k9czJST0Jvc6fnz4Jp1sxRmA4dSuiWFq+DVpxLZP5yM= -gitlab.com/yawning/obfs4.git v0.0.0-20220904064028-336a71d6e4cf/go.mod h1:9GcM8QNU9/wXtEEH2q8bVOnPI7FtIF6VVLzZ1l6Hgf8= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU= go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 h1:wNMDy/LVGLj2h3p6zg4d0gypKfWKSWI14E1C4smOgl8= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod h1:YfbDdXAAkemWJK3H/DshvlrxqFB2rtW4rY6ky/3x/H0= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= -go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -golang.org/x/arch v0.0.0-20190909030613-46d78d1859ac/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= -golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= -golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= +golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe h1:lrXv4yHeD9FA8PSJATWowP1QvexpyAPWmPia+Kbzql8= -golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe/go.mod h1:BrnXpEObnFxpaT75Jo9hsCazwOWcp7nVIa8NNuH5cuA= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a h1:sYbmY3FwUWCBTodZL1S3JUuOvaW6kM2o+clDzzDNBWg= +golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a/go.mod h1:Ede7gF0KGoHlj822RtphAHK1jLdrcuRBZg0sF1Q+SPc= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= -golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1185,52 +1016,42 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= +golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1241,15 +1062,14 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1257,228 +1077,141 @@ golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190516110030-61b9204099cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210608053332-aa57babbf139/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= +google.golang.org/api v0.0.0-20170921000349-586095a6e407/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a h1:a2MQQVoTo96JC9PMGtGBymLp7+/RzpFc2yX/9WfFg1c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= +google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos= +google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY= +google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:rcS6EyEaoCO52hQDupoSfrxI3R6C2Tq741is7X8OvnM= +google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= +google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= -gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= -gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/vmihailenco/msgpack.v2 v2.9.1 h1:kb0VV7NuIojvRfzwslQeP3yArBqJHW9tOl4t38VS1jM= -gopkg.in/vmihailenco/msgpack.v2 v2.9.1/go.mod h1:/3Dn1Npt9+MYyLpYYXjInO/5jvMLamn+AEGwNEOatn8= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1494,18 +1227,22 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gvisor.dev/gvisor v0.0.0-20240111192755-20d559651a70 h1:8t/JdpK4Zn4a2sf/68wIMNYXNi6uhb3Pr030ImV2AUQ= +gvisor.dev/gvisor v0.0.0-20240111192755-20d559651a70/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= -howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= +howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= +howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= +modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY= +modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw= +modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= +modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= +modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU= +modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +zombiezen.com/go/sqlite v0.13.1 h1:qDzxyWWmMtSSEH5qxamqBFmqA2BLSSbtODi3ojaE02o= +zombiezen.com/go/sqlite v0.13.1/go.mod h1:Ht/5Rg3Ae2hoyh1I7gbWtWAl89CNocfqeb/aAMTkJr4= diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 000000000..bea0e2ca5 --- /dev/null +++ b/go.work.sum @@ -0,0 +1,887 @@ +cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.103.0/go.mod h1:vwLx1nqLrzLX/fpwSMOXmFIqBOyHsvHbnAdbGSJ+mKk= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= +cloud.google.com/go/accessapproval v1.7.3/go.mod h1:4l8+pwIxGTNqSf4T3ds8nLO94NQf0W/KnMNuQ9PbnP8= +cloud.google.com/go/accesscontextmanager v1.8.3/go.mod h1:4i/JkF2JiFbhLnnpnfoTX5vRXfhf9ukhU1ANOTALTOQ= +cloud.google.com/go/aiplatform v1.51.2/go.mod h1:hCqVYB3mY45w99TmetEoe8eCQEwZEp9WHxeZdcv9phw= +cloud.google.com/go/analytics v0.21.5/go.mod h1:BQtOBHWTlJ96axpPPnw5CvGJ6i3Ve/qX2fTxR8qWyr8= +cloud.google.com/go/apigateway v1.6.3/go.mod h1:k68PXWpEs6BVDTtnLQAyG606Q3mz8pshItwPXjgv44Y= +cloud.google.com/go/apigeeconnect v1.6.3/go.mod h1:peG0HFQ0si2bN15M6QSjEW/W7Gy3NYkWGz7pFz13cbo= +cloud.google.com/go/apigeeregistry v0.8.1/go.mod h1:MW4ig1N4JZQsXmBSwH4rwpgDonocz7FPBSw6XPGHmYw= +cloud.google.com/go/appengine v1.8.3/go.mod h1:2oUPZ1LVZ5EXi+AF1ihNAF+S8JrzQ3till5m9VQkrsk= +cloud.google.com/go/area120 v0.8.3/go.mod h1:5zj6pMzVTH+SVHljdSKC35sriR/CVvQZzG/Icdyriw0= +cloud.google.com/go/artifactregistry v1.14.4/go.mod h1:SJJcZTMv6ce0LDMUnihCN7WSrI+kBSFV0KIKo8S8aYU= +cloud.google.com/go/asset v1.15.2/go.mod h1:B6H5tclkXvXz7PD22qCA2TDxSVQfasa3iDlM89O2NXs= +cloud.google.com/go/assuredworkloads v1.11.3/go.mod h1:vEjfTKYyRUaIeA0bsGJceFV2JKpVRgyG2op3jfa59Zs= +cloud.google.com/go/automl v1.13.3/go.mod h1:Y8KwvyAZFOsMAPqUCfNu1AyclbC6ivCUF/MTwORymyY= +cloud.google.com/go/baremetalsolution v1.2.2/go.mod h1:O5V6Uu1vzVelYahKfwEWRMaS3AbCkeYHy3145s1FkhM= +cloud.google.com/go/batch v1.6.1/go.mod h1:urdpD13zPe6YOK+6iZs/8/x2VBRofvblLpx0t57vM98= +cloud.google.com/go/beyondcorp v1.0.2/go.mod h1:m8cpG7caD+5su+1eZr+TSvF6r21NdLJk4f9u4SP2Ntc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/bigquery v1.56.0/go.mod h1:KDcsploXTEY7XT3fDQzMUZlpQLHzE4itubHrnmhUrZA= +cloud.google.com/go/billing v1.17.3/go.mod h1:z83AkoZ7mZwBGT3yTnt6rSGI1OOsHSIi6a5M3mJ8NaU= +cloud.google.com/go/binaryauthorization v1.7.2/go.mod h1:kFK5fQtxEp97m92ziy+hbu+uKocka1qRRL8MVJIgjv0= +cloud.google.com/go/certificatemanager v1.7.3/go.mod h1:T/sZYuC30PTag0TLo28VedIRIj1KPGcOQzjWAptHa00= +cloud.google.com/go/channel v1.17.2/go.mod h1:aT2LhnftnyfQceFql5I/mP8mIbiiJS4lWqgXA815zMk= +cloud.google.com/go/cloudbuild v1.14.2/go.mod h1:Bn6RO0mBYk8Vlrt+8NLrru7WXlQ9/RDWz2uo5KG1/sg= +cloud.google.com/go/clouddms v1.7.2/go.mod h1:Rk32TmWmHo64XqDvW7jgkFQet1tUKNVzs7oajtJT3jU= +cloud.google.com/go/cloudtasks v1.12.3/go.mod h1:GPVXhIOSGEaR+3xT4Fp72ScI+HjHffSS4B8+BaBB5Ys= +cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= +cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/contactcenterinsights v1.11.2/go.mod h1:A9PIR5ov5cRcd28KlDbmmXE8Aay+Gccer2h4wzkYFso= +cloud.google.com/go/container v1.26.2/go.mod h1:YlO84xCt5xupVbLaMY4s3XNE79MUJ+49VmkInr6HvF4= +cloud.google.com/go/containeranalysis v0.11.2/go.mod h1:xibioGBC1MD2j4reTyV1xY1/MvKaz+fyM9ENWhmIeP8= +cloud.google.com/go/datacatalog v1.18.2/go.mod h1:SPVgWW2WEMuWHA+fHodYjmxPiMqcOiWfhc9OD5msigk= +cloud.google.com/go/dataflow v0.9.3/go.mod h1:HI4kMVjcHGTs3jTHW/kv3501YW+eloiJSLxkJa/vqFE= +cloud.google.com/go/dataform v0.8.3/go.mod h1:8nI/tvv5Fso0drO3pEjtowz58lodx8MVkdV2q0aPlqg= +cloud.google.com/go/datafusion v1.7.3/go.mod h1:eoLt1uFXKGBq48jy9LZ+Is8EAVLnmn50lNncLzwYokE= +cloud.google.com/go/datalabeling v0.8.3/go.mod h1:tvPhpGyS/V7lqjmb3V0TaDdGvhzgR1JoW7G2bpi2UTI= +cloud.google.com/go/dataplex v1.10.2/go.mod h1:xdC8URdTrCrZMW6keY779ZT1cTOfV8KEPNsw+LTRT1Y= +cloud.google.com/go/dataproc/v2 v2.2.2/go.mod h1:aocQywVmQVF4i8CL740rNI/ZRpsaaC1Wh2++BJ7HEJ4= +cloud.google.com/go/dataqna v0.8.3/go.mod h1:wXNBW2uvc9e7Gl5k8adyAMnLush1KVV6lZUhB+rqNu4= +cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= +cloud.google.com/go/datastream v1.10.2/go.mod h1:W42TFgKAs/om6x/CdXX5E4oiAsKlH+e8MTGy81zdYt0= +cloud.google.com/go/deploy v1.14.1/go.mod h1:N8S0b+aIHSEeSr5ORVoC0+/mOPUysVt8ae4QkZYolAw= +cloud.google.com/go/dialogflow v1.44.2/go.mod h1:QzFYndeJhpVPElnFkUXxdlptx0wPnBWLCBT9BvtC3/c= +cloud.google.com/go/dlp v1.10.3/go.mod h1:iUaTc/ln8I+QT6Ai5vmuwfw8fqTk2kaz0FvCwhLCom0= +cloud.google.com/go/documentai v1.23.4/go.mod h1:4MYAaEMnADPN1LPN5xboDR5QVB6AgsaxgFdJhitlE2Y= +cloud.google.com/go/domains v0.9.3/go.mod h1:29k66YNDLDY9LCFKpGFeh6Nj9r62ZKm5EsUJxAl84KU= +cloud.google.com/go/edgecontainer v1.1.3/go.mod h1:Ll2DtIABzEfaxaVSbwj3QHFaOOovlDFiWVDu349jSsA= +cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= +cloud.google.com/go/essentialcontacts v1.6.4/go.mod h1:iju5Vy3d9tJUg0PYMd1nHhjV7xoCXaOAVabrwLaPBEM= +cloud.google.com/go/eventarc v1.13.2/go.mod h1:X9A80ShVu19fb4e5sc/OLV7mpFUKZMwfJFeeWhcIObM= +cloud.google.com/go/filestore v1.7.3/go.mod h1:Qp8WaEERR3cSkxToxFPHh/b8AACkSut+4qlCjAmKTV0= +cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ= +cloud.google.com/go/functions v1.15.3/go.mod h1:r/AMHwBheapkkySEhiZYLDBwVJCdlRwsm4ieJu35/Ug= +cloud.google.com/go/gkebackup v1.3.3/go.mod h1:eMk7/wVV5P22KBakhQnJxWSVftL1p4VBFLpv0kIft7I= +cloud.google.com/go/gkeconnect v0.8.3/go.mod h1:i9GDTrfzBSUZGCe98qSu1B8YB8qfapT57PenIb820Jo= +cloud.google.com/go/gkehub v0.14.3/go.mod h1:jAl6WafkHHW18qgq7kqcrXYzN08hXeK/Va3utN8VKg8= +cloud.google.com/go/gkemulticloud v1.0.2/go.mod h1:+ee5VXxKb3H1l4LZAcgWB/rvI16VTNTrInWxDjAGsGo= +cloud.google.com/go/gsuiteaddons v1.6.3/go.mod h1:sCFJkZoMrLZT3JTb8uJqgKPNshH2tfXeCwTFRebTq48= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= +cloud.google.com/go/iap v1.9.2/go.mod h1:GwDTOs047PPSnwRD0Us5FKf4WDRcVvHg1q9WVkKBhdI= +cloud.google.com/go/ids v1.4.3/go.mod h1:9CXPqI3GedjmkjbMWCUhMZ2P2N7TUMzAkVXYEH2orYU= +cloud.google.com/go/iot v1.7.3/go.mod h1:t8itFchkol4VgNbHnIq9lXoOOtHNR3uAACQMYbN9N4I= +cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= +cloud.google.com/go/kms v1.15.4/go.mod h1:L3Sdj6QTHK8dfwK5D1JLsAyELsNMnd3tAIwGS4ltKpc= +cloud.google.com/go/language v1.12.1/go.mod h1:zQhalE2QlQIxbKIZt54IASBzmZpN/aDASea5zl1l+J4= +cloud.google.com/go/lifesciences v0.9.3/go.mod h1:gNGBOJV80IWZdkd+xz4GQj4mbqaz737SCLHn2aRhQKM= +cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= +cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= +cloud.google.com/go/longrunning v0.5.3/go.mod h1:y/0ga59EYu58J6SHmmQOvekvND2qODbu8ywBBW7EK7Y= +cloud.google.com/go/managedidentities v1.6.3/go.mod h1:tewiat9WLyFN0Fi7q1fDD5+0N4VUoL0SCX0OTCthZq4= +cloud.google.com/go/maps v1.5.1/go.mod h1:NPMZw1LJwQZYCfz4y+EIw+SI+24A4bpdFJqdKVr0lt4= +cloud.google.com/go/mediatranslation v0.8.3/go.mod h1:F9OnXTy336rteOEywtY7FOqCk+J43o2RF638hkOQl4Y= +cloud.google.com/go/memcache v1.10.3/go.mod h1:6z89A41MT2DVAW0P4iIRdu5cmRTsbsFn4cyiIx8gbwo= +cloud.google.com/go/metastore v1.13.2/go.mod h1:KS59dD+unBji/kFebVp8XU/quNSyo8b6N6tPGspKszA= +cloud.google.com/go/monitoring v1.16.2/go.mod h1:B44KGwi4ZCF8Rk/5n+FWeispDXoKSk9oss2QNlXJBgc= +cloud.google.com/go/networkconnectivity v1.14.2/go.mod h1:5UFlwIisZylSkGG1AdwK/WZUaoz12PKu6wODwIbFzJo= +cloud.google.com/go/networkmanagement v1.9.2/go.mod h1:iDGvGzAoYRghhp4j2Cji7sF899GnfGQcQRQwgVOWnDw= +cloud.google.com/go/networksecurity v0.9.3/go.mod h1:l+C0ynM6P+KV9YjOnx+kk5IZqMSLccdBqW6GUoF4p/0= +cloud.google.com/go/notebooks v1.11.1/go.mod h1:V2Zkv8wX9kDCGRJqYoI+bQAaoVeE5kSiz4yYHd2yJwQ= +cloud.google.com/go/optimization v1.6.1/go.mod h1:hH2RYPTTM9e9zOiTaYPTiGPcGdNZVnBSBxjIAJzUkqo= +cloud.google.com/go/orchestration v1.8.3/go.mod h1:xhgWAYqlbYjlz2ftbFghdyqENYW+JXuhBx9KsjMoGHs= +cloud.google.com/go/orgpolicy v1.11.3/go.mod h1:oKAtJ/gkMjum5icv2aujkP4CxROxPXsBbYGCDbPO8MM= +cloud.google.com/go/osconfig v1.12.3/go.mod h1:L/fPS8LL6bEYUi1au832WtMnPeQNT94Zo3FwwV1/xGM= +cloud.google.com/go/oslogin v1.12.1/go.mod h1:VfwTeFJGbnakxAY236eN8fsnglLiVXndlbcNomY4iZU= +cloud.google.com/go/phishingprotection v0.8.3/go.mod h1:3B01yO7T2Ra/TMojifn8EoGd4G9jts/6cIO0DgDY9J8= +cloud.google.com/go/policytroubleshooter v1.10.1/go.mod h1:5C0rhT3TDZVxAu8813bwmTvd57Phbl8mr9F4ipOsxEs= +cloud.google.com/go/privatecatalog v0.9.3/go.mod h1:K5pn2GrVmOPjXz3T26mzwXLcKivfIJ9R5N79AFCF9UE= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= +cloud.google.com/go/pubsublite v1.8.1/go.mod h1:fOLdU4f5xldK4RGJrBMm+J7zMWNj/k4PxwEZXy39QS0= +cloud.google.com/go/recaptchaenterprise/v2 v2.8.2/go.mod h1:kpaDBOpkwD4G0GVMzG1W6Doy1tFFC97XAV3xy+Rd/pw= +cloud.google.com/go/recommendationengine v0.8.3/go.mod h1:m3b0RZV02BnODE9FeSvGv1qibFo8g0OnmB/RMwYy4V8= +cloud.google.com/go/recommender v1.11.2/go.mod h1:AeoJuzOvFR/emIcXdVFkspVXVTYpliRCmKNYDnyBv6Y= +cloud.google.com/go/redis v1.13.3/go.mod h1:vbUpCKUAZSYzFcWKmICnYgRAhTFg9r+djWqFxDYXi4U= +cloud.google.com/go/resourcemanager v1.9.3/go.mod h1:IqrY+g0ZgLsihcfcmqSe+RKp1hzjXwG904B92AwBz6U= +cloud.google.com/go/resourcesettings v1.6.3/go.mod h1:pno5D+7oDYkMWZ5BpPsb4SO0ewg3IXcmmrUZaMJrFic= +cloud.google.com/go/retail v1.14.3/go.mod h1:Omz2akDHeSlfCq8ArPKiBxlnRpKEBjUH386JYFLUvXo= +cloud.google.com/go/run v1.3.2/go.mod h1:SIhmqArbjdU/D9M6JoHaAqnAMKLFtXaVdNeq04NjnVE= +cloud.google.com/go/scheduler v1.10.3/go.mod h1:8ANskEM33+sIbpJ+R4xRfw/jzOG+ZFE8WVLy7/yGvbc= +cloud.google.com/go/secretmanager v1.11.3/go.mod h1:0bA2o6FabmShrEy328i67aV+65XoUFFSmVeLBn/51jI= +cloud.google.com/go/security v1.15.3/go.mod h1:gQ/7Q2JYUZZgOzqKtw9McShH+MjNvtDpL40J1cT+vBs= +cloud.google.com/go/securitycenter v1.24.1/go.mod h1:3h9IdjjHhVMXdQnmqzVnM7b0wMn/1O/U20eWVpMpZjI= +cloud.google.com/go/servicedirectory v1.11.2/go.mod h1:KD9hCLhncWRV5jJphwIpugKwM5bn1x0GyVVD4NO8mGg= +cloud.google.com/go/shell v1.7.3/go.mod h1:cTTEz/JdaBsQAeTQ3B6HHldZudFoYBOqjteev07FbIc= +cloud.google.com/go/spanner v1.51.0/go.mod h1:c5KNo5LQ1X5tJwma9rSQZsXNBDNvj4/n8BVc3LNahq0= +cloud.google.com/go/speech v1.19.2/go.mod h1:2OYFfj+Ch5LWjsaSINuCZsre/789zlcCI3SY4oAi2oI= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.24.0/go.mod h1:3xrJEFMXBsQLgxwThyjuD3aYlroL0TMRec1ypGUQ0KE= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= +cloud.google.com/go/storagetransfer v1.10.2/go.mod h1:meIhYQup5rg9juQJdyppnA/WLQCOguxtk1pr3/vBWzA= +cloud.google.com/go/talent v1.6.4/go.mod h1:QsWvi5eKeh6gG2DlBkpMaFYZYrYUnIpo34f6/V5QykY= +cloud.google.com/go/texttospeech v1.7.3/go.mod h1:Av/zpkcgWfXlDLRYob17lqMstGZ3GqlvJXqKMp2u8so= +cloud.google.com/go/tpu v1.6.3/go.mod h1:lxiueqfVMlSToZY1151IaZqp89ELPSrk+3HIQ5HRkbY= +cloud.google.com/go/trace v1.10.3/go.mod h1:Ke1bgfc73RV3wUFml+uQp7EsDw4dGaETLxB7Iq/r4CY= +cloud.google.com/go/translate v1.9.2/go.mod h1:E3Tc6rUTsQkVrXW6avbUhKJSr7ZE3j7zNmqzXKHqRrY= +cloud.google.com/go/video v1.20.2/go.mod h1:lrixr5JeKNThsgfM9gqtwb6Okuqzfo4VrY2xynaViTA= +cloud.google.com/go/videointelligence v1.11.3/go.mod h1:tf0NUaGTjU1iS2KEkGWvO5hRHeCkFK3nPo0/cOZhZAo= +cloud.google.com/go/vision/v2 v2.7.4/go.mod h1:ynDKnsDN/0RtqkKxQZ2iatv3Dm9O+HfRb5djl7l4Vvw= +cloud.google.com/go/vmmigration v1.7.3/go.mod h1:ZCQC7cENwmSWlwyTrZcWivchn78YnFniEQYRWQ65tBo= +cloud.google.com/go/vmwareengine v1.0.2/go.mod h1:xMSNjIk8/itYrz1JA8nV3Ajg4L4n3N+ugP8JKzk3OaA= +cloud.google.com/go/vpcaccess v1.7.3/go.mod h1:YX4skyfW3NC8vI3Fk+EegJnlYFatA+dXK4o236EUCUc= +cloud.google.com/go/webrisk v1.9.3/go.mod h1:RUYXe9X/wBDXhVilss7EDLW9ZNa06aowPuinUOPCXH8= +cloud.google.com/go/websecurityscanner v1.6.3/go.mod h1:x9XANObUFR+83Cya3g/B9M/yoHVqzxPnFtgF8yYGAXw= +cloud.google.com/go/workflows v1.12.2/go.mod h1:+OmBIgNqYJPVggnMo9nqmizW0qEXHhmnAzK/CnBqsHc= +code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= +dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= +dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= +dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= +github.com/Azure/azure-sdk-for-go v66.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1/go.mod h1:eZ4g6GUvXiGulfIbbhh1Xr4XwUYaYaWMqzGD/284wCA= +github.com/Azure/go-autorest/autorest v0.11.28/go.mod h1:MrkzG3Y3AH668QyF9KRk5neJnGgmhQ6krbhR8Q5eMvA= +github.com/Azure/go-autorest/autorest/adal v0.9.21/go.mod h1:zua7mBUaCc5YnSLKYgGJR/w5ePdMDA6H56upLsHzA9U= +github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg= +github.com/Azure/go-autorest/autorest/azure/cli v0.4.6/go.mod h1:piCfgPho7BiIDdEQ1+g4VmKyD5y+p/XtSNqE6Hc4QD0= +github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= +github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= +github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= +github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/ProtonMail/go-crypto v0.0.0-20210512092938-c05353c2d58c/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= +github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/alexflint/go-arg v1.4.2/go.mod h1:9iRbDxne7LcR/GSvEr7ma++GLpdIU1zrghf2y2768kM= +github.com/alexflint/go-arg v1.4.3/go.mod h1:3PZ/wp/8HuqRZMUUgu7I+e1qcpUbvmS258mRXkFH4IA= +github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw= +github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o= +github.com/anacrolix/args v0.5.1-0.20220509024600-c3b77d0b61ac/go.mod h1:Fj/N2PehEwTBE5t/V/9xgTcxDkuYQ+5IBoFw/8gkldI= +github.com/anacrolix/bargle v0.0.0-20220630015206-d7a4d433886a/go.mod h1:9xUiZbkh+94FbiIAL1HXpAIBa832f3Mp07rRPl5c5RQ= +github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444/go.mod h1:MctKM1HS5YYDb3F30NGJxLE+QPuqWoT5ReW/4jt8xew= +github.com/anacrolix/fuse v0.2.0/go.mod h1:Kfu02xBwnySDpH3N23BmrP3MDfwAQGRLUCj6XyeOvBQ= +github.com/anacrolix/generics v0.0.0-20221221005542-ac1d5b02b8a3/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= +github.com/anacrolix/generics v0.0.0-20230113004304-d6428d516633/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= +github.com/anacrolix/generics v0.0.0-20230428105757-683593396d68/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= +github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= +github.com/anacrolix/go-libutp v1.2.0/go.mod h1:RrJ3KcaDcf9Jqp33YL5V/5CBEc6xMc7aJL8wXfuWL50= +github.com/anacrolix/log v0.10.0/go.mod h1:s5yBP/j046fm9odtUTbHOfDUq/zh1W8OkPpJtnX0oQI= +github.com/anacrolix/log v0.13.2-0.20221123232138-02e2764801c3/go.mod h1:MD4fn2pYcyhUAQg9SxoGOpTnV/VIdiKVYKZdCbDC97k= +github.com/anacrolix/missinggo/v2 v2.7.1/go.mod h1:2IZIvmRTizALNYFYXsPR7ofXPzJgyBpKZ4kMqMEICkI= +github.com/anacrolix/multiless v0.3.0/go.mod h1:TrCLEZfIDbMVfLoQt5tOoiBS/uq4y8+ojuEVVvTNPX4= +github.com/anacrolix/publicip v0.2.0/go.mod h1:67G1lVkLo8UjdEcJkwScWVTvlJ35OCDsRJoWXl/wi4g= +github.com/anacrolix/squirrel v0.4.1-0.20220122230132-14b040773bac/go.mod h1:YzgVvikMdFD441oTWlNG189bpKabO9Sbf3uCSVgca04= +github.com/anacrolix/stm v0.4.0/go.mod h1:GCkwqWoAsP7RfLW+jw+Z0ovrt2OO7wRzcTtFYMYY5t8= +github.com/anacrolix/sync v0.4.1-0.20230926072150-b8cd7cfb92d0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g= +github.com/anacrolix/tagflag v1.3.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8= +github.com/anacrolix/torrent v1.48.1-0.20230103142631-c20f73d53e9f/go.mod h1:PwdFzmApEr96LcqogJhuw41XOdd1oHGkp+qE9hhXyDc= +github.com/anacrolix/torrent v1.52.0/go.mod h1:+XzcWXQU97PPEWSvpC85MJyqzP1vz47M5BYGno4vIHg= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/arl/statsviz v0.4.0/go.mod h1:+5inUy/dxy11x/KSmicG3ZrEEy0Yr81AFm3dn4QC04M= +github.com/atc0005/go-teams-notify/v2 v2.6.1/go.mod h1:xo6GejLDHn3tWBA181F8LrllIL0xC1uRsRxq7YNXaaY= +github.com/aws/aws-sdk-go v1.44.68/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go-v2 v1.16.8/go.mod h1:6CpKuLXg2w7If3ABZCl/qZ6rEgwtjZTn4eAf4RcEyuw= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3/go.mod h1:gNsR5CaXKmQSSzrmGxmwmct/r+ZBfbxorAuXYsj/M5Y= +github.com/aws/aws-sdk-go-v2/config v1.15.15/go.mod h1:A1Lzyy/o21I5/s2FbyX5AevQfSVXpvvIDCoVFD0BC4E= +github.com/aws/aws-sdk-go-v2/credentials v1.12.10/go.mod h1:g5eIM5XRs/OzIIK81QMBl+dAuDyoLN0VYaLP+tBqEOk= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.9/go.mod h1:KDCCm4ONIdHtUloDcFvK2+vshZvx4Zmj7UMDfusuz5s= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.21/go.mod h1:iIYPrQ2rYfZiB/iADYlhj9HHZ9TTi6PqKQPAqygohbE= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.15/go.mod h1:pWrr2OoHlT7M/Pd2y4HV3gJyPb3qj5qMmnPkKSNPYK4= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.9/go.mod h1:08tUpeSGN33QKSO7fwxXczNfiwCpbj+GxK6XKwqWVv0= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.16/go.mod h1:CYmI+7x03jjJih8kBEEFKRQc40UjUokT0k7GbvrhhTc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.6/go.mod h1:O7Oc4peGZDEKlddivslfYFvAbgzvl/GH3J8j3JIGBXc= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.3/go.mod h1:gkb2qADY+OHaGLKNTYxMaQNacfeyQpZ4csDTQMeFmcw= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.10/go.mod h1:Qks+dxK3O+Z2deAhNo6cJ8ls1bam3tUGUAcgxQP1c70= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.9/go.mod h1:yQowTpvdZkFVuHrLBXmczat4W+WJKg/PafBZnGBLga0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.9/go.mod h1:Rc5+wn2k8gFSi3V1Ch4mhxOzjMh+bYSXVFfVaqowQOY= +github.com/aws/aws-sdk-go-v2/service/kms v1.18.1/go.mod h1:4PZMUkc9rXHWGVB5J9vKaZy3D7Nai79ORworQ3ASMiM= +github.com/aws/aws-sdk-go-v2/service/s3 v1.27.2/go.mod h1:u+566cosFI+d+motIz3USXEh6sN8Nq4GrNXSg2RXVMo= +github.com/aws/aws-sdk-go-v2/service/sso v1.11.13/go.mod h1:d7ptRksDDgvXaUvxyHZ9SYh+iMDymm94JbVcgvSYSzU= +github.com/aws/aws-sdk-go-v2/service/sts v1.16.10/go.mod h1:cftkHYN6tCDNfkSasAmclSfl4l7cySoay8vz7p/ce0E= +github.com/aws/smithy-go v1.12.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/badoux/checkmail v1.2.1/go.mod h1:XroCOBU5zzZJcLvgwU15I+2xXyCdTWXyR9MGfRhBYy0= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/benbjohnson/immutable v0.3.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI= +github.com/bits-and-blooms/bitset v1.2.2/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= +github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw= +github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= +github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/caarlos0/ctrlc v1.2.0/go.mod h1:n3gDlSjsXZ7rbD9/RprIR040b7oaLfNStikPd4gFago= +github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc= +github.com/caarlos0/go-reddit/v3 v3.0.1/go.mod h1:QlwgmG5SAqxMeQvg/A2dD1x9cIZCO56BMnMdjXLoisI= +github.com/caarlos0/go-shellwords v1.0.12/go.mod h1:bYeeX1GrTLPl5cAMYEzdm272qdsQAZiaHgeF0KTk1Gw= +github.com/caarlos0/log v0.1.10/go.mod h1:BLxpdZKXvWBjB6fshua4c8d7ApdYjypEDok6ibt+pXk= +github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI16PX4xejRQc= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk= +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= +github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= +github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= +github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= +github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= +github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb/go.mod h1:qhZBgV9e4WyB1JNjHpcXVkUe3knWUwYuAPB1hITdm50= +github.com/dghubble/oauth1 v0.7.1/go.mod h1:0eEzON0UY/OLACQrmnjgJjmvCGXzjBCsZqL1kWDXtF0= +github.com/dghubble/sling v1.4.0/go.mod h1:0r40aNsU9EdDUVBNhfCstAtFgutjgJGYbO1oNzkMoM8= +github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= +github.com/disgoorg/disgo v0.13.21/go.mod h1:VpRp9ifKNcQ05mgIx9l5oU4TADysXUGmNx9iHM9/DpA= +github.com/disgoorg/log v1.2.0/go.mod h1:3x1KDG6DI1CE2pDwi3qlwT3wlXpeHW/5rVay+1qDqOo= +github.com/disgoorg/snowflake/v2 v2.0.1/go.mod h1:SPU9c2CNn5DSyb86QcKtdZgix9osEtKrHLW4rMhfLCs= +github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= +github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= +github.com/elliotchance/orderedmap v1.4.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/getlantern/auth-server v0.0.0-20210715135948-a18963cba916/go.mod h1:chyWFPxBmdBvl0hfPCz7U3wilbc8qtrjfQ45879+/qE= +github.com/getlantern/authipc v0.2.0/go.mod h1:nDXd7xyGPMbPwEi4QAL3PPMzvwSFYbQxzk4ipANL25M= +github.com/getlantern/autoupdate v0.0.0-20211217175350-d0b211f39ba7/go.mod h1:+X8pAviVhThDBjPEqLUB0iO7EPxhpWk7Q9VYxvz6rCY= +github.com/getlantern/byteexec v0.0.0-20220903141943-7db46f110fbc/go.mod h1:oD9q9NB1LNBLHk3WAwza4tivxV7tm7jKFlCNCAv3+M8= +github.com/getlantern/dhtup v0.0.0-20230218063409-258bc7570a27/go.mod h1:vHmyGO0tz9xO4rxi7rZCUjnI3GJ/26u6YHwdeamd3Bs= +github.com/getlantern/diagnostics v0.0.0-20230503185158-c2fc28ed22fe/go.mod h1:B82GdSnu6Ex9Ir1PaChox3TirdZbVt4Zad3Al/YtdgE= +github.com/getlantern/dnsgrab v0.0.0-20211216020425-5d5e155a01a8/go.mod h1:5GwF/pPObuqMzWoCQ26QDowRMysQ61Sa1Gbc/9mQUZM= +github.com/getlantern/flashlight v0.0.0-20230403092335-5f84ae10c585 h1:q8vlnsq3a/wF3fBE85+Dg4nCIiDWacS1WnisPnxVU0w= +github.com/getlantern/flashlight v0.0.0-20230403092335-5f84ae10c585/go.mod h1:e4fn/dZB7jV0nze4uMbEWKjo04JLrq/877gYIYTawLI= +github.com/getlantern/go-tun2socks v1.16.12-0.20201218023150-b68f09e5ae93/go.mod h1:wgB2BFT8ZaPKyKOQ/5dljMG/YIow+AIXyq4KBwJ5sGQ= +github.com/getlantern/golog v0.0.0-20211223150227-d4d95a44d873/go.mod h1:+ZU1h+iOVqWReBpky6d5Y2WL0sF2Llxu+QcxJFs2+OU= +github.com/getlantern/goproxy v0.0.0-20220805074304-4a43a9ed4ec6/go.mod h1:96OPoioYRaknNbHjFa4+itGZIJMnJ7wiQB2nz2q1h5Y= +github.com/getlantern/idletiming v0.0.0-20201229174729-33d04d220c4e/go.mod h1:McaLC6faRlxJ9QjjqSjpEeYIjKnKA8+dzjoR+eYXCio= +github.com/getlantern/lantern-server v0.0.0-20210705231439-ee03cbeb9b11/go.mod h1:RMm/z/7AdoJZkGYysYZIizRM93j/FzQlcrkeOmqaaI0= +github.com/getlantern/probednet v0.0.0-20200930023717-dd97fef56a97/go.mod h1:noglym51kFdkZEV/WjiIzRKV6qwwTI9/vSAjeOI/zCU= +github.com/getlantern/safechannels v0.0.0-20201218194342-b4e5383e9627/go.mod h1:QJUudepmTj/KQXnReV6DZSJY/xO05fnfcZf3t8zkNLg= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= +github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-github/v48 v48.1.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl2LcDiajkYi89Y= +github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/goreleaser/chglog v0.2.2/go.mod h1:2s5JwtCOWjZa8AIneL+xdUl9SRuigCjRHNHsX30dupE= +github.com/goreleaser/fileglob v1.3.0/go.mod h1:Jx6BoXv3mbYkEzwm9THo7xbr5egkAraxkGorbJb4RxU= +github.com/goreleaser/goreleaser v1.13.1/go.mod h1:JFjB/kuTGFwpL3o9ix09K1ctGpABCk/xGIdoVDr0AJw= +github.com/goreleaser/nfpm/v2 v2.22.1/go.mod h1:c5/coiBdrKNdXXgKnSCrqSk8OtltpGwJ2woU/8EtHD4= +github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.9.0 h1:bM6ZAFZmc/wPFaRDi0d5L7hGEZEx/2u+Tmr2evNHDiI= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= +github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0= +github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ= +github.com/jackpal/gateway v1.0.6/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= +github.com/kataras/golog v0.1.8/go.mod h1:rGPAin4hYROfk1qT9wZP6VY2rsb4zzc37QpdPjdkqVw= +github.com/kataras/iris/v12 v12.2.0/go.mod h1:BLzBpEunc41GbE68OUaQlqX4jzi791mx5HU04uPb90Y= +github.com/kataras/pio v0.0.11/go.mod h1:38hH6SWH6m4DKSYmRhlrCJ5WItwWgCVrTNU62XZyUvI= +github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= +github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/kevinburke/ssh_config v1.1.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.1.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ= +github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= +github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= +github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/lib/pq v1.10.5/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lispad/go-generics-tools v1.1.0/go.mod h1:2csd1EJljo/gy5qG4khXol7ivCPptNjG5Uv2X8MgK84= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= +github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-mastodon v0.0.6/go.mod h1:cg7RFk2pcUfHZw/IvKe1FUzmlq5KnLFqs7eV2PHplV8= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/panicwrap v1.0.0/go.mod h1:pKvZHwWrZowLUzftuFq7coarnxbBXU4aQh3N0BJOeeA= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/muesli/mango v0.1.0/go.mod h1:5XFpbC8jY5UUv89YQciiXNlbi+iJgt29VDC5xbzrLL4= +github.com/muesli/mango-cobra v1.2.0/go.mod h1:vMJL54QytZAJhCT13LPVDfkvCUJ5/4jNUKF/8NC2UjA= +github.com/muesli/mango-pflag v0.1.0/go.mod h1:YEQomTxaCUp8PrbhFh10UfbhbQrM/xJ4i2PB8VTLLW0= +github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= +github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= +github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc= +github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/opencoff/go-srp v0.6.0/go.mod h1:+laSpBW9vj6Cf0LQpedVSigjjbqw6Xasrrsg788zfCQ= +github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= +github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= +github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= +github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= +github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= +github.com/pion/dtls/v2 v2.2.4/go.mod h1:WGKfxqhrddne4Kg3p11FUMJrynkOY4lb25zHNO49wuw= +github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE= +github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8= +github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= +github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= +github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= +github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= +github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= +github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4= +github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= +github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= +github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= +github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= +github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg= +github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= +github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= +github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us= +github.com/pion/webrtc/v3 v3.1.42/go.mod h1:ffD9DulDrPxyWvDPUIPAOSAWx9GUlOExiJPf7cCcMLA= +github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= +github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/quic-go/webtransport-go v0.6.0/go.mod h1:9KjU4AEBqEQidGHNDkZrb8CAa1abRaosM2yGOyiikEc= +github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= +github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b/go.mod h1:/pA7k3zsXKdjjAiUhB5CjuKib9KJGCaLvZwtxGC8U0s= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= +github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= +github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= +github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= +github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= +github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= +github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= +github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= +github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= +github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= +github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= +github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= +github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= +github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= +github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/slack-go/slack v0.11.4/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= +github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= +github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= +github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk= +github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= +github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog= +github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFyPdL66DjUD96XmzVL3ZntbzcflLnznH0fr99w5VqE= +github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= +github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1/go.mod h1:nmuySobZb4kFgFy6BptpXp/BBw+xFSyvVPP6auoJB4k= +github.com/xanzy/go-gitlab v0.74.0/go.mod h1:d/a0vswScO7Agg1CZNz15Ic6SSvBG9vfw8egL99t4kA= +github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= +github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= +github.com/xtaci/kcp-go/v5 v5.6.1/go.mod h1:W3kVPyNYwZ06p79dNwFWQOVFrdcBpDBsdyvK8moQrYo= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= +gitlab.com/digitalxero/go-conventional-commit v1.0.7/go.mod h1:05Xc2BFsSyC5tKhK0y+P3bs0AwUtNuTp+mTpbCU/DZ0= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= +go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= +go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.8.0/go.mod h1:78XhIg8Ht9vR4tbLNUhXsiOnE2HOuSeKAiAcoVQEpOY= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0/go.mod h1:xY111jIZtWb+pUUgT4UiiSonAaY2cD2Ts5zvuKLki3o= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.8.0/go.mod h1:w8aZL87GMOvOBa2lU/JlVXE1q4chk/0FX+8ai4513bw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.8.0/go.mod h1:twhIvtDQW2sWP1O2cT1N8nkSBgKCRZv2z6COTTBrf8Q= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= +go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c= +go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= +go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +gocloud.dev v0.27.0/go.mod h1:YlYKhYsY5/1JdHGWQDkAuqkezVKowu7qbe9aIeUF6p0= +golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= +golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/exp v0.0.0-20220428152302-39d4317da171/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf/go.mod h1:yh0Ynu2b5ZUe3MQfp2nM0ecK7wsgouWTDN0FNeJuIys= +golang.org/x/exp v0.0.0-20221026004748-78e5e7837ae6/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= +golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0= +golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20221110043201-43a038452099/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= +golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= +golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200423201157-2723c5de0d66/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.91.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= +google.golang.org/api v0.148.0/go.mod h1:8/TBgwaKjfqTdacOJrOv2+2Q6fBDU1uHKK06oGSkxzU= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= +google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:+34luvCflYKiKylNwGJfn9cFBbcL/WrkciMmDmsTQ/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= +gopkg.in/validator.v2 v2.0.0-20210331031555-b37d688a7fb0/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gorm.io/driver/postgres v1.1.0/go.mod h1:hXQIwafeRjJvUm+OMxcFWyswJ/vevcpPLlGocwAwuqw= +gorm.io/gorm v1.21.13/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= +grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= +modernc.org/cc/v3 v3.38.1/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= +modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0= +modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI= +modernc.org/ccgo/v3 v3.0.0-20220910160915-348f15de615a/go.mod h1:8p47QxPkdugex9J4n9P2tLZ9bK01yngIVp00g4nomW0= +modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g= +modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= +modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= +modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA= +modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0= +modernc.org/libc v1.19.0/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= +modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= +modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= +modernc.org/libc v1.21.5/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= +modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/sqlite v1.20.0/go.mod h1:EsYz8rfOvLCiYTy5ZFsOYzoCcRMu98YYkwAcCw5YIYw= +modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= +modernc.org/tcl v1.15.0/go.mod h1:xRoGotBZ6dU+Zo2tca+2EqVEeMmOUBzHnhIwq4YrVnE= +modernc.org/tcl v1.15.1/go.mod h1:aEjeGJX2gz1oWKOLDVZ2tnEWLUrIn8H+GFu+akoDhqs= +modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ= +nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= +zombiezen.com/go/sqlite v0.12.0/go.mod h1:RKdRR9xoQDSnB47yy7G4PtrjGZJtupb/SyEbJZLaRes= diff --git a/internalsdk/android.go b/internalsdk/android.go index 9a50b656e..93eccaec8 100644 --- a/internalsdk/android.go +++ b/internalsdk/android.go @@ -19,7 +19,6 @@ import ( "github.com/getlantern/errors" "github.com/getlantern/eventual/v2" "github.com/getlantern/flashlight/v7" - "github.com/getlantern/flashlight/v7/balancer" "github.com/getlantern/flashlight/v7/bandwidth" "github.com/getlantern/flashlight/v7/client" "github.com/getlantern/flashlight/v7/common" @@ -68,6 +67,7 @@ type Session interface { GetUserID() (int64, error) GetToken() (string, error) SetCountry(string) error + SetIP(string) error UpdateAdSettings(AdSettings) error UpdateStats(serverCity string, serverCountry string, serverCountryCode string, p3 int, p4 int, hasSucceedingProxy bool) error SetStaging(bool) error @@ -118,6 +118,7 @@ type panickingSession interface { DeviceOS() string IsProUser() bool SetChatEnabled(bool) + SetIP(string) SplitTunnelingEnabled() bool SetShowInterstitialAdsEnabled(bool) SetCASShowInterstitialAdsEnabled(bool) @@ -164,6 +165,10 @@ func (s *panickingSessionImpl) SetCountry(country string) { panicIfNecessary(s.wrapped.SetCountry(country)) } +func (s *panickingSessionImpl) SetIP(ipAddress string) { + panicIfNecessary(s.wrapped.SetIP(ipAddress)) +} + func (s *panickingSessionImpl) UpdateAdSettings(settings AdSettings) { panicIfNecessary(s.wrapped.UpdateAdSettings(settings)) } @@ -311,17 +316,6 @@ func newUserConfig(session panickingSession) *userConfig { return &userConfig{session: session} } -func getBalancer(timeout time.Duration) *balancer.Balancer { - ctx, cancel := context.WithTimeout(context.Background(), timeout) - defer cancel() - - cl := getClient(ctx) - if cl == nil { - return nil - } - return cl.GetBalancer() -} - func getClient(ctx context.Context) *client.Client { _cl, _ := clEventual.Get(ctx) if _cl == nil { @@ -435,12 +429,14 @@ func Start(configDir string, da.(string)}, nil } -func newAnalyticsSession(deviceID string) analytics.Session { - session := analytics.Start(deviceID, ApplicationVersion) +func newAnalyticsSession(session panickingSession) analytics.Session { + analyticsSession := analytics.Start(session.GetDeviceID(), ApplicationVersion) go func() { - session.SetIP(geolookup.GetIP(forever)) + ipAddress := geolookup.GetIP(forever) + analyticsSession.SetIP(ipAddress) + session.SetIP(ipAddress) }() - return session + return analyticsSession } func run(configDir, locale string, @@ -577,7 +573,7 @@ func run(configDir, locale string, replicaServer := &ReplicaServer{ ConfigDir: configDir, Flashlight: runner, - analyticsSession: newAnalyticsSession(session.GetDeviceID()), + analyticsSession: newAnalyticsSession(session), Session: session.Wrapped(), UserConfig: userConfig, } @@ -604,6 +600,8 @@ func run(configDir, locale string, //Check for CAS ads for Russia and Iran user showCASAdsEnabled := runner.FeatureEnabled("casinterstitialads", ApplicationVersion) session.SetCASShowInterstitialAdsEnabled(showCASAdsEnabled) + log.Debugf("Show ads enabled casinterstitialads ? %v", showCASAdsEnabled) + } else { // Explicitly disable ads for Pro users. session.SetShowInterstitialAdsEnabled(false) diff --git a/internalsdk/android_test.go b/internalsdk/android_test.go index c83885f23..6c795eab7 100644 --- a/internalsdk/android_test.go +++ b/internalsdk/android_test.go @@ -46,6 +46,7 @@ func (c testSession) GetForcedCountryCode() (string, error) { func (c testSession) GetDNSServer() (string, error) { return "8.8.8.8", nil } func (c testSession) SetStaging(bool) error { return nil } func (c testSession) SetCountry(string) error { return nil } +func (c testSession) SetIP(string) error { return nil } func (c testSession) ProxyAll() (bool, error) { return true, nil } func (c testSession) GetDeviceID() (string, error) { return "123456789", nil } func (c testSession) AccountId() (string, error) { return "1234", nil } diff --git a/internalsdk/protos/vpn.pb.go b/internalsdk/protos/vpn.pb.go index f4bd18172..a88d79665 100644 --- a/internalsdk/protos/vpn.pb.go +++ b/internalsdk/protos/vpn.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v4.23.3 +// protoc-gen-go v1.26.0 +// protoc v4.24.3 // source: protos_shared/vpn.proto package protos diff --git a/internalsdk/replica.go b/internalsdk/replica.go index ad7abc696..62513ec43 100644 --- a/internalsdk/replica.go +++ b/internalsdk/replica.go @@ -15,7 +15,6 @@ import ( "github.com/getlantern/flashlight/v7/common" "github.com/getlantern/flashlight/v7/config" "github.com/getlantern/flashlight/v7/geolookup" - "github.com/getlantern/flashlight/v7/ops" "github.com/getlantern/flashlight/v7/proxied" replicaConfig "github.com/getlantern/replica/config" replicaServer "github.com/getlantern/replica/server" @@ -150,10 +149,6 @@ func (s *ReplicaServer) newHandler() (*replicaServer.HttpHandler, error) { input.GlobalConfig = optsFunc input.HttpClient.Transport = proxied.ParallelForIdempotent() input.ProcessCORSHeaders = common.ProcessCORS - input.InstrumentResponseWriter = func(w http.ResponseWriter, - label string) replicaServer.InstrumentedResponseWriter { - return ops.InitInstrumentedResponseWriter(w, label) - } input.HttpClient = &http.Client{ Transport: proxied.AsRoundTripper( func(req *http.Request) (*http.Response, error) { diff --git a/internalsdk/session_model.go b/internalsdk/session_model.go index 724bf9d98..89db075d9 100644 --- a/internalsdk/session_model.go +++ b/internalsdk/session_model.go @@ -22,43 +22,46 @@ type SessionModel struct { // List of we are using for Session Model const ( - pathDeviceID = "deviceid" - pathDevice = "device" - pathDevices = "devices" - pathModel = "model" - pathOSVersion = "os_version" - pathPaymentTestMode = "paymentTestMode" - pathUserID = "userid" - pathToken = "token" - pathProUser = "prouser" - pathSDKVersion = "sdkVersion" - pathUserLevel = "userLevel" - pathChatEnabled = "chatEnabled" - pathDevelopmentMode = "developmentMode" - pathGeoCountryCode = "geo_country_code" - pathServerCountry = "server_country" - pathServerCountryCode = "server_country_code" - pathServerCity = "server_city" - pathHasSucceedingProxy = "hasSucceedingProxy" - pathLatestBandwith = "latest_bandwidth" - pathTimezoneID = "timezone_id" - pathReferralCode = "referral" - pathForceCountry = "forceCountry" - pathDNSDetector = "dns_detector" - pathProvider = "provider" - pathEmailAddress = "emailAddress" - pathCurrencyCode = "currency_Code" - pathReplicaAddr = "replicaAddr" - pathSplitTunneling = "splitTunneling" - pathLang = "lang" - pathAcceptedTermsVersion = "accepted_terms_version" - pathAdsEnabled = "adsEnabled" - pathCASAdsEnabled = "casAsEnabled" - pathStoreVersion = "storeVersion" - pathSelectedTab = "/selectedTab" - pathServerInfo = "/server_info" - - currentTermsVersion = 1 + pathDeviceID = "deviceid" + pathDevice = "device" + pathDevices = "devices" + pathModel = "model" + pathOSVersion = "os_version" + pathPaymentTestMode = "paymentTestMode" + pathUserID = "userid" + pathToken = "token" + pathProUser = "prouser" + pathSDKVersion = "sdkVersion" + pathUserLevel = "userLevel" + pathChatEnabled = "chatEnabled" + pathDevelopmentMode = "developmentMode" + pathGeoCountryCode = "geo_country_code" + pathIPAddress = "ip_address" + pathServerCountry = "server_country" + pathServerCountryCode = "server_country_code" + pathServerCity = "server_city" + pathHasSucceedingProxy = "hasSucceedingProxy" + pathLatestBandwith = "latest_bandwidth" + pathTimezoneID = "timezone_id" + pathReferralCode = "referral" + pathForceCountry = "forceCountry" + pathDNSDetector = "dns_detector" + pathProvider = "provider" + pathEmailAddress = "emailAddress" + pathCurrencyCode = "currency_Code" + pathReplicaAddr = "replicaAddr" + pathSplitTunneling = "splitTunneling" + pathLang = "lang" + pathAcceptedTermsVersion = "accepted_terms_version" + pathAdsEnabled = "adsEnabled" + pathCASAdsEnabled = "casAsEnabled" + pathStoreVersion = "storeVersion" + pathSelectedTab = "/selectedTab" + pathServerInfo = "/server_info" + pathHasAllNetworkPermssion = "/hasAllNetworkPermssion" + pathShouldShowCasAds = "shouldShowCASAds" + pathShouldShowGoogleAds = "shouldShowGoogleAds" + currentTermsVersion = 1 ) type SessionModelOpts struct { @@ -72,6 +75,7 @@ type SessionModelOpts struct { Lang string TimeZone string PaymentTestMode bool + Platform string } // NewSessionModel initializes a new SessionModel instance. @@ -80,8 +84,10 @@ func NewSessionModel(mdb minisql.DB, opts *SessionModelOpts) (*SessionModel, err if err != nil { return nil, err } - base.db.RegisterType(1000, &protos.ServerInfo{}) - base.db.RegisterType(2000, &protos.Devices{}) + if opts.Platform == "ios" { + base.db.RegisterType(1000, &protos.ServerInfo{}) + base.db.RegisterType(2000, &protos.Devices{}) + } m := &SessionModel{baseModel: base} m.baseModel.doInvokeMethod = m.doInvokeMethod return m, m.initSessionModel(opts) @@ -163,6 +169,15 @@ func (m *SessionModel) doInvokeMethod(method string, arguments Arguments) (inter return nil, err } return true, nil + case "hasAllNetworkPermssion": + err := pathdb.Mutate(m.db, func(tx pathdb.TX) error { + return pathdb.Put[bool](tx, pathHasAllNetworkPermssion, true, "") + }) + if err != nil { + return nil, err + } + checkAdsEnabled(m) + return true, nil default: return m.methodNotImplemented(method) } @@ -256,7 +271,7 @@ func (m *SessionModel) initSessionModel(opts *SessionModelOpts) error { if err != nil { return err } - return nil + return checkAdsEnabled(m) } func (m *SessionModel) GetAppName() string { @@ -310,6 +325,13 @@ func (m *SessionModel) SetCountry(country string) error { }) } +// SetIP stores the IP address of the client after a successful geolookup +func (m *SessionModel) SetIP(ipAddress string) error { + return pathdb.Mutate(m.db, func(tx pathdb.TX) error { + return pathdb.Put(tx, pathIPAddress, ipAddress, "") + }) +} + func (m *SessionModel) UpdateAdSettings(adsetting AdSettings) error { // Not using these ads anymore return nil @@ -518,12 +540,14 @@ func (m *SessionModel) SplitTunnelingEnabled() (bool, error) { } func (m *SessionModel) SetShowInterstitialAdsEnabled(adsEnable bool) { + log.Debugf("SetShowInterstitialAdsEnabled %v", adsEnable) panicIfNecessary(pathdb.Mutate(m.db, func(tx pathdb.TX) error { return pathdb.Put(tx, pathAdsEnabled, adsEnable, "") })) } func (m *SessionModel) SetCASShowInterstitialAdsEnabled(casEnable bool) { + log.Debugf("SetCASShowInterstitialAdsEnabled %v", casEnable) panicIfNecessary(pathdb.Mutate(m.db, func(tx pathdb.TX) error { return pathdb.Put(tx, pathCASAdsEnabled, casEnable, "") })) @@ -674,3 +698,57 @@ func reportIssue(session *SessionModel, email string, issue string, description log.Debugf("Report an issue index %v desc %v level %v email %v, device %v model %v version %v ", issueKey, description, level, email, device, model, osVersion) return SendIssueReport(session, issueKey, description, level, email, device, model, osVersion) } + +func checkAdsEnabled(session *SessionModel) error { + log.Debugf("Check ads enabled") + hasAllPermisson, err := pathdb.Get[bool](session.db, pathHasAllNetworkPermssion) + if err != nil { + return err + } + if !hasAllPermisson { + log.Debugf("User has not given all permission") + return pathdb.Mutate(session.db, func(tx pathdb.TX) error { + return pathdb.PutAll(tx, map[string]interface{}{ + pathShouldShowGoogleAds: false, + pathShouldShowCasAds: false, + }) + }) + } + log.Debugf("User has given all permission") + isPro, err := session.IsProUser() + if err != nil { + return err + } + log.Debugf("Is user pro %v", isPro) + if isPro { + err := pathdb.Mutate(session.db, func(tx pathdb.TX) error { + err = pathdb.Put(tx, pathShouldShowCasAds, false, "") + if err != nil { + return err + } + return pathdb.Put(tx, pathShouldShowCasAds, false, "") + }) + if err != nil { + return err + } + return nil + } + isGoogleAdsEnable, err := pathdb.Get[bool](session.db, pathAdsEnabled) + if err != nil { + log.Debugf("Error while getting google ads value %v", err) + return err + } + + isCasAdsEnable, err := pathdb.Get[bool](session.db, pathCASAdsEnabled) + if err != nil { + log.Debugf("Error while getting cas ads value %v", err) + return err + } + + return pathdb.Mutate(session.db, func(tx pathdb.TX) error { + return pathdb.PutAll(tx, map[string]interface{}{ + pathAdsEnabled: isGoogleAdsEnable, + pathCASAdsEnabled: isCasAdsEnable, + }) + }) +} diff --git a/internalsdk/tun.go b/internalsdk/tun.go index 65c5204f1..977239143 100644 --- a/internalsdk/tun.go +++ b/internalsdk/tun.go @@ -13,6 +13,7 @@ import ( "github.com/getlantern/errors" "github.com/getlantern/idletiming" "github.com/getlantern/ipproxy" + "github.com/getlantern/netx" "golang.org/x/net/proxy" ) @@ -62,18 +63,10 @@ func Tun2Socks(fd int, socksAddr, dnsGrabAddr string, mtu int, wrappedSession Se _, port, _ := net.SplitHostPort(addr) isDNS := port == "53" if isDNS { - // reroute DNS requests to dnsgrab + // intercept and reroute DNS traffic to dnsgrab addr = dnsGrabAddr - } else if port == "853" { - // This is usually DNS over DTLS, we blackhole this to force DNS through dnsgrab. - return nil, errors.New("blackholing DNS over TLS traffic to %v", addr) - } else if port == "443" { - // This is likely QUIC traffic. This should really be proxied, but since we don't proxy UDP, - // we blackhole this traffic. - return nil, errors.New("blackholing QUIC UDP traffic to %v", addr) } - var d net.Dialer - conn, err := d.DialContext(ctx, network, addr) + conn, err := netx.DialContext(ctx, network, addr) if isDNS && err == nil { // wrap our DNS requests in a connection that closes immediately to avoid piling up file descriptors for DNS requests conn = idletiming.Conn(conn, 10*time.Second, nil) diff --git a/internalsdk/vpn_model.go b/internalsdk/vpn_model.go index 3f2010ede..de541013b 100644 --- a/internalsdk/vpn_model.go +++ b/internalsdk/vpn_model.go @@ -47,6 +47,14 @@ func (s *VPNModel) doInvokeMethod(method string, arguments Arguments) (interface return true, nil case "getVpnStatus": return s.GetVPNStatus() + case "connectingDelay": + on := arguments.Get("on").Bool() + if on { + s.SaveVPNStatus("connecting") + } else { + s.SaveVPNStatus("disconnecting") + } + return true, nil default: return s.methodNotImplemented(method) } diff --git a/ios/Podfile b/ios/Podfile index 405881d20..ab43886d3 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,8 +1,12 @@ +source 'https://github.com/CocoaPods/Specs.git' +source 'https://github.com/cleveradssolutions/CAS-Specs.git' # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '13.0' +use_frameworks! :linkage => :static +$casVersion = '~> 3.5.1' inhibit_all_warnings! # CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' +ENV['COCOAPODS_DISABLE_STATS'] = 'false' project 'Runner', { 'Debug' => :debug, @@ -28,22 +32,22 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup target 'Runner' do - use_frameworks! + use_frameworks! :linkage => :static use_modular_headers! - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) - pod 'SQLite.swift', '~> 0.12.2' +# pod 'SQLite.swift', '~> 0.12.2' pod 'Toast-Swift', '~> 5.0.1' + pod 'CleverAdsSolutions-Base', $casVersion end -target 'LanternTests' do - use_frameworks! - use_modular_headers! - - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) - pod 'SQLite.swift', '~> 0.12.2' - pod 'Toast-Swift', '~> 5.0.1' -end +# target 'LanternTests' do +# use_frameworks! +# use_modular_headers! +# +# flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +# pod 'SQLite.swift', '~> 0.12.2' +# pod 'Toast-Swift', '~> 5.0.1' +# end #post_install do |installer| # installer.pods_project.targets.each do |target| diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a1ca35c35..3765e48bf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,6 +2,10 @@ PODS: - Alamofire (5.2.2) - audioplayers_darwin (0.0.1): - Flutter + - clever_ads_solutions (0.0.1): + - CleverAdsSolutions-Base (~> 3.5.2) + - Flutter + - CleverAdsSolutions-Base (3.5.2) - device_info_plus (0.0.1): - Flutter - DKImagePickerController/Core (4.3.4): @@ -65,12 +69,12 @@ PODS: - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - Google-Mobile-Ads-SDK (10.4.0): + - Google-Mobile-Ads-SDK (10.11.0): - GoogleAppMeasurement (< 11.0, >= 7.0) - GoogleUserMessagingPlatform (>= 1.1) - google_mobile_ads (1.0.0): - Flutter - - Google-Mobile-Ads-SDK (~> 10.4.0) + - Google-Mobile-Ads-SDK (~> 10.11.0) - webview_flutter_wkwebview - GoogleAppMeasurement (10.21.0): - GoogleAppMeasurement/AdIdSupport (= 10.21.0) @@ -145,13 +149,13 @@ PODS: - SDWebImage (5.18.10): - SDWebImage/Core (= 5.18.10) - SDWebImage/Core (5.18.10) - - Sentry/HybridSDK (8.11.0): - - SentryPrivate (= 8.11.0) + - Sentry/HybridSDK (8.19.0): + - SentryPrivate (= 8.19.0) - sentry_flutter (0.0.1): - Flutter - FlutterMacOS - - Sentry/HybridSDK (= 8.11.0) - - SentryPrivate (8.11.0) + - Sentry/HybridSDK (= 8.19.0) + - SentryPrivate (8.19.0) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -160,9 +164,6 @@ PODS: - sqflite (0.0.3): - Flutter - FMDB (>= 2.7.5) - - SQLite.swift (0.12.2): - - SQLite.swift/standard (= 0.12.2) - - SQLite.swift/standard (0.12.2) - SwiftyGif (5.4.4) - Toast (4.1.0) - Toast-Swift (5.0.1) @@ -180,6 +181,8 @@ PODS: DEPENDENCIES: - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`) + - clever_ads_solutions (from `.symlinks/plugins/clever_ads_solutions/ios`) + - CleverAdsSolutions-Base (~> 3.5.1) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) @@ -201,7 +204,6 @@ DEPENDENCIES: - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - - SQLite.swift (~> 0.12.2) - Toast-Swift (~> 5.0.1) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) @@ -210,7 +212,9 @@ DEPENDENCIES: - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) SPEC REPOS: - trunk: + https://github.com/cleveradssolutions/CAS-Specs.git: + - CleverAdsSolutions-Base + https://github.com/CocoaPods/Specs.git: - Alamofire - DKImagePickerController - DKPhotoGallery @@ -227,7 +231,6 @@ SPEC REPOS: - SDWebImage - Sentry - SentryPrivate - - SQLite.swift - SwiftyGif - Toast - Toast-Swift @@ -235,6 +238,8 @@ SPEC REPOS: EXTERNAL SOURCES: audioplayers_darwin: :path: ".symlinks/plugins/audioplayers_darwin/ios" + clever_ads_solutions: + :path: ".symlinks/plugins/clever_ads_solutions/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" emoji_picker_flutter: @@ -291,6 +296,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Alamofire: 814429acc853c6c54ff123fc3d2ef66803823ce0 audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 + clever_ads_solutions: 4329310a15fd616aee3de8f208018fa1621e7c66 + CleverAdsSolutions-Base: 13965d236b27ec6ad7b994fedd57c0e5e585adb8 device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 @@ -321,13 +328,12 @@ SPEC CHECKSUMS: PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec - Sentry: 39d57e691e311bdb73bc1ab5bbebbd6bc890050d - sentry_flutter: b2feefdad5b0f06602347172bc7257e8e9da5562 - SentryPrivate: 48712023cdfd523735c2edb6b06bedf26c4730a3 + Sentry: 1ebcaef678a27c8ac515f974cb5425dd1bbdec2f + sentry_flutter: ecdfbedee55337205561cfa782ee02d31ec83e1f + SentryPrivate: 765c9b4ebe9ac1a5fcdc067c5a1cfbf3f10e1677 share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a - SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Toast: ec33c32b8688982cecc6348adeae667c1b9938da Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711 @@ -337,6 +343,6 @@ SPEC CHECKSUMS: wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a -PODFILE CHECKSUM: beba84bf7a16e5102ffe84a69c98791b9a1df870 +PODFILE CHECKSUM: f41df053e13795ca3bec060038c249ef06910792 COCOAPODS: 1.14.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 518272c88..206da089f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -56,7 +56,6 @@ ECA871BD2AC59104007C400D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 351BB463FD77FC724A8E233C /* Pods_Runner.framework */; }; ECA871BF2AC59109007C400D /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03A1AB312AA890AB00FB41B2 /* NetworkExtension.framework */; }; ECCA8C672ABD16D20037BF9B /* LanternTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCA8C662ABD16D20037BF9B /* LanternTests.swift */; }; - F309D8C575359E6D35A75E9D /* Pods_LanternTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49496710B5388EA1D58F0B15 /* Pods_LanternTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -132,18 +131,14 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 2F26DCD30807EDF6F82D2EED /* Pods-LanternTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug.xcconfig"; sourceTree = ""; }; - 30DF6BEFA10048D85A5D591C /* Pods-LanternTests.debug-runner-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug-runner-appiumtest.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug-runner-appiumtest.xcconfig"; sourceTree = ""; }; 351BB463FD77FC724A8E233C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 396FEB6CBABC81283ED3D57B /* Pods-Runner.debug-runner-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-runner-appiumtest.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-runner-appiumtest.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 40CA215A5360960236859E29 /* Pods-Runner.debug-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-prod.xcconfig"; sourceTree = ""; }; 41DDE2A6029CFDB93A269403 /* Pods-LanternTests.debug-runner-appium-test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug-runner-appium-test.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug-runner-appium-test.xcconfig"; sourceTree = ""; }; - 49496710B5388EA1D58F0B15 /* Pods_LanternTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LanternTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4C199F107C36A050FA0BD82A /* Pods-Runner.debug-appium-test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-appium-test.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-appium-test.xcconfig"; sourceTree = ""; }; - 4E220F815FF1885F1AD81468 /* Pods-LanternTests.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.profile-prod.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.profile-prod.xcconfig"; sourceTree = ""; }; 607A0530FA4F0B857B847CC5 /* Pods-Runner.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-prod.xcconfig"; sourceTree = ""; }; 639C2FD1FB8C2B8BA0BC8FA2 /* Pods-LanternTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.profile.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.profile.xcconfig"; sourceTree = ""; }; - 63E38F7B897E48D9E0C76849 /* Pods-LanternTests.debug-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug-prod.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug-prod.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -160,17 +155,13 @@ 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A1D1D08921025322CCFB6C84 /* Pods-Runner.debug-runner.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-runner.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-runner.xcconfig"; sourceTree = ""; }; ACBF9AE98933CA5116DE99A0 /* Pods-Runner.profile-appium-test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-appium-test.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-appium-test.xcconfig"; sourceTree = ""; }; - B2E004602DF0312A50F25931 /* Pods-LanternTests.debug-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug-appiumtest.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug-appiumtest.xcconfig"; sourceTree = ""; }; B46B369A5464387549F24A61 /* Pods-Runner.release-appium-test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-appium-test.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-appium-test.xcconfig"; sourceTree = ""; }; B58A42198AC0EFAE0D4E6746 /* Pods-LanternTests.debug-runner.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug-runner.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug-runner.xcconfig"; sourceTree = ""; }; - BFCAAF3323435A7B93BE16CF /* Pods-LanternTests.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.release-prod.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.release-prod.xcconfig"; sourceTree = ""; }; C349B34DF143131F23D50A82 /* Pods-Runner.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-prod.xcconfig"; sourceTree = ""; }; CA815533D3563C2353745CE2 /* Pods-LanternTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.release.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.release.xcconfig"; sourceTree = ""; }; CEB7F9B85A061FF5AAA50EA5 /* Pods-Runner.debug-runner-appium-test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-runner-appium-test.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-runner-appium-test.xcconfig"; sourceTree = ""; }; - D7B5DC6AAB834374B62A50C3 /* Pods-LanternTests.debug-runner-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.debug-runner-prod.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.debug-runner-prod.xcconfig"; sourceTree = ""; }; E33BD5976CBD307AC6B17F23 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; EC27DE8E2AC44F4300B840F2 /* DBModule */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = DBModule; path = ../DBModule; sourceTree = ""; }; - EC56304E90CE9EEEAAC8BF57 /* Pods-LanternTests.profile-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.profile-appiumtest.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.profile-appiumtest.xcconfig"; sourceTree = ""; }; EC595B332ACCB69000A927E1 /* MessagingModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MessagingModel.swift; path = Models/MessagingModel.swift; sourceTree = ""; }; EC6155E62ACC8FF70015527E /* NavigationModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NavigationModel.swift; path = Models/NavigationModel.swift; sourceTree = ""; }; EC6155E72ACC8FF70015527E /* LanternModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LanternModel.swift; path = Models/LanternModel.swift; sourceTree = ""; }; @@ -178,7 +169,6 @@ ECCA8C662ABD16D20037BF9B /* LanternTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanternTests.swift; sourceTree = ""; }; F013DC57CB643B0D1261542A /* Pods-Runner.profile-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-appiumtest.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-appiumtest.xcconfig"; sourceTree = ""; }; F1A7E2E5A6E917B99BD6D831 /* Pods-Runner.release-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-appiumtest.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-appiumtest.xcconfig"; sourceTree = ""; }; - FDC0AB2E551C702D11BC84C4 /* Pods-LanternTests.release-appiumtest.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LanternTests.release-appiumtest.xcconfig"; path = "Target Support Files/Pods-LanternTests/Pods-LanternTests.release-appiumtest.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -205,7 +195,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F309D8C575359E6D35A75E9D /* Pods_LanternTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -385,13 +374,9 @@ 639C2FD1FB8C2B8BA0BC8FA2 /* Pods-LanternTests.profile.xcconfig */, B58A42198AC0EFAE0D4E6746 /* Pods-LanternTests.debug-runner.xcconfig */, A1D1D08921025322CCFB6C84 /* Pods-Runner.debug-runner.xcconfig */, - 63E38F7B897E48D9E0C76849 /* Pods-LanternTests.debug-prod.xcconfig */, 7FD4483498CD189315299C90 /* Pods-LanternTests.debug-appium-test.xcconfig */, - D7B5DC6AAB834374B62A50C3 /* Pods-LanternTests.debug-runner-prod.xcconfig */, 41DDE2A6029CFDB93A269403 /* Pods-LanternTests.debug-runner-appium-test.xcconfig */, - BFCAAF3323435A7B93BE16CF /* Pods-LanternTests.release-prod.xcconfig */, 038EBA8F187F39DA9C6ED912 /* Pods-LanternTests.release-appium-test.xcconfig */, - 4E220F815FF1885F1AD81468 /* Pods-LanternTests.profile-prod.xcconfig */, 9753BB60D225669C9C23CDCF /* Pods-LanternTests.profile-appium-test.xcconfig */, 40CA215A5360960236859E29 /* Pods-Runner.debug-prod.xcconfig */, 4C199F107C36A050FA0BD82A /* Pods-Runner.debug-appium-test.xcconfig */, @@ -401,10 +386,6 @@ B46B369A5464387549F24A61 /* Pods-Runner.release-appium-test.xcconfig */, 607A0530FA4F0B857B847CC5 /* Pods-Runner.profile-prod.xcconfig */, ACBF9AE98933CA5116DE99A0 /* Pods-Runner.profile-appium-test.xcconfig */, - B2E004602DF0312A50F25931 /* Pods-LanternTests.debug-appiumtest.xcconfig */, - 30DF6BEFA10048D85A5D591C /* Pods-LanternTests.debug-runner-appiumtest.xcconfig */, - FDC0AB2E551C702D11BC84C4 /* Pods-LanternTests.release-appiumtest.xcconfig */, - EC56304E90CE9EEEAAC8BF57 /* Pods-LanternTests.profile-appiumtest.xcconfig */, 9402228550A9E720957DF6C9 /* Pods-Runner.debug-appiumtest.xcconfig */, 396FEB6CBABC81283ED3D57B /* Pods-Runner.debug-runner-appiumtest.xcconfig */, F1A7E2E5A6E917B99BD6D831 /* Pods-Runner.release-appiumtest.xcconfig */, @@ -437,7 +418,6 @@ 03C58B082AC18BE7003C9788 /* DatabaseFramework.framework */, 351BB463FD77FC724A8E233C /* Pods_Runner.framework */, 03A1AB312AA890AB00FB41B2 /* NetworkExtension.framework */, - 49496710B5388EA1D58F0B15 /* Pods_LanternTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -505,12 +485,9 @@ isa = PBXNativeTarget; buildConfigurationList = ECCA8C6D2ABD16D20037BF9B /* Build configuration list for PBXNativeTarget "LanternTests" */; buildPhases = ( - 4E451C14EEC79D30CB4B7946 /* [CP] Check Pods Manifest.lock */, ECCA8C602ABD16D20037BF9B /* Sources */, ECCA8C612ABD16D20037BF9B /* Frameworks */, ECCA8C622ABD16D20037BF9B /* Resources */, - 6CBDC5B399303E3AF83CFF31 /* [CP] Embed Pods Frameworks */, - BE89F0204C2A5649490D586B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -627,23 +604,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 3F72706DAEB45E756D135F84 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 46164C762D3E5DACEA5EB7F0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -666,45 +626,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 4E451C14EEC79D30CB4B7946 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-LanternTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 6CBDC5B399303E3AF83CFF31 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LanternTests/Pods-LanternTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LanternTests/Pods-LanternTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LanternTests/Pods-LanternTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 8CFC94838D10599DD335E9EC /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -737,23 +658,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; - BE89F0204C2A5649490D586B /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LanternTests/Pods-LanternTests-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LanternTests/Pods-LanternTests-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LanternTests/Pods-LanternTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -900,7 +804,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -925,11 +829,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -981,7 +886,6 @@ }; 0390FE9C2AD533C100D2818A /* Debug-appiumTest */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B2E004602DF0312A50F25931 /* Pods-LanternTests.debug-appiumtest.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1055,7 +959,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -1082,11 +986,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1136,7 +1041,6 @@ }; 0390FEA02AD533CF00D2818A /* Release-appiumTest */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FDC0AB2E551C702D11BC84C4 /* Pods-LanternTests.release-appiumtest.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1209,7 +1113,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -1235,11 +1139,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1289,7 +1194,6 @@ }; 0390FEA42AD533D900D2818A /* Profile-appiumTest */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EC56304E90CE9EEEAAC8BF57 /* Pods-LanternTests.profile-appiumtest.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1368,7 +1272,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1393,11 +1297,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1449,7 +1354,6 @@ }; 0390FEA82AD533E600D2818A /* Debug-Runner-appiumTest */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 30DF6BEFA10048D85A5D591C /* Pods-LanternTests.debug-runner-appiumtest.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1638,7 +1542,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -1664,11 +1568,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1726,7 +1631,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1776,7 +1681,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -1803,11 +1708,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1835,11 +1741,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1897,7 +1804,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1922,11 +1829,12 @@ ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Lantern; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + LINK_WITH_STANDARD_LIBRARIES = YES; MARKETING_VERSION = 7.5.0; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1978,7 +1886,6 @@ }; EC595B382ACCB79100A927E1 /* Debug-Runner-prod */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D7B5DC6AAB834374B62A50C3 /* Pods-LanternTests.debug-runner-prod.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2012,7 +1919,6 @@ }; ECCA8C6A2ABD16D20037BF9B /* Debug-prod */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 63E38F7B897E48D9E0C76849 /* Pods-LanternTests.debug-prod.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2046,7 +1952,6 @@ }; ECCA8C6B2ABD16D20037BF9B /* Release-prod */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BFCAAF3323435A7B93BE16CF /* Pods-LanternTests.release-prod.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2079,7 +1984,6 @@ }; ECCA8C6C2ABD16D20037BF9B /* Profile-prod */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4E220F815FF1885F1AD81468 /* Pods-LanternTests.profile-prod.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index a68f0d9f2..a544c5741 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -64,9 +64,11 @@ import UIKit // Init all the models private func setupModels() throws { logger.log("setupModels method called") - vpnModel = try VpnModel(flutterBinary: flutterbinaryMessenger, vpnBase: VPNManager.appDefault) sessionModel = try SessionModel(flutterBinary: flutterbinaryMessenger) lanternModel = LanternModel(flutterBinary: flutterbinaryMessenger) + vpnModel = try VpnModel( + flutterBinary: flutterbinaryMessenger, vpnBase: VPNManager.appDefault, + sessionModel: sessionModel) // navigationModel = NavigationModel(flutterBinary: flutterbinaryMessenger) messagingModel = try MessagingModel(flutterBinary: flutterbinaryMessenger) } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 55da2e20a..bb4b7ab00 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -19,7 +19,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 7.5.1 + $(FLUTTER_BUILD_NAME) + NSUserTrackingUsageDescription + This identifier will be used to deliver personalized ads to you. CFBundleSignature ???? CFBundleVersion diff --git a/ios/Runner/Lantern/Models/SessionModel.swift b/ios/Runner/Lantern/Models/SessionModel.swift index 6157e9d2c..1cac33004 100644 --- a/ios/Runner/Lantern/Models/SessionModel.swift +++ b/ios/Runner/Lantern/Models/SessionModel.swift @@ -33,6 +33,7 @@ class SessionModel: BaseModel { opts.model = systemName opts.osVersion = systemVersion opts.paymentTestMode = AppEnvironment.current == AppEnvironment.appiumTest + opts.platform = "ios" var error: NSError? guard @@ -54,6 +55,16 @@ class SessionModel: BaseModel { logger.error("Service Started successfully") } + func hasAllPermssion() { + do { + let result = try invoke("hasAllNetworkPermssion") + logger.log("Sucessfully given all permssion") + } catch { + logger.log("Error while setting hasAllPermssion") + SentryUtils.caputure(error: error as NSError) + } + } + func getBandwidth() { // TODO: we should do this reactively by subscribing do { diff --git a/ios/Runner/Lantern/Models/VpnModel.swift b/ios/Runner/Lantern/Models/VpnModel.swift index a8581b9de..e6b86677e 100644 --- a/ios/Runner/Lantern/Models/VpnModel.swift +++ b/ios/Runner/Lantern/Models/VpnModel.swift @@ -11,8 +11,9 @@ import Sentry class VpnModel: BaseModel, InternalsdkVPNManagerProtocol { let vpnManager: VPNBase let vpnHelper = VpnHelper.shared + var sessionModel: SessionModel! - init(flutterBinary: FlutterBinaryMessenger, vpnBase: VPNBase) throws { + init(flutterBinary: FlutterBinaryMessenger, vpnBase: VPNBase, sessionModel: SessionModel) throws { logger.log("Initializing VPNModel") self.vpnManager = vpnBase var error: NSError? @@ -21,6 +22,7 @@ class VpnModel: BaseModel, InternalsdkVPNManagerProtocol { else { throw error! } + self.sessionModel = sessionModel try super.init(flutterBinary, model) model.setManager(self) } @@ -44,6 +46,7 @@ class VpnModel: BaseModel, InternalsdkVPNManagerProtocol { }, onSuccess: { logger.debug("VPN started") + self.sessionModel.hasAllPermssion() self.saveVPNStatus(status: "connected") }) } diff --git a/lib/account/account_management.dart b/lib/account/account_management.dart index fdeb2fb2f..059a9ab89 100644 --- a/lib/account/account_management.dart +++ b/lib/account/account_management.dart @@ -2,7 +2,7 @@ import 'package:lantern/messaging/messaging.dart'; @RoutePage(name: 'AccountManagement') class AccountManagement extends StatefulWidget { - AccountManagement({Key? key, required this.isPro}) : super(key: key); + const AccountManagement({Key? key, required this.isPro}) : super(key: key); final bool isPro; @override @@ -143,18 +143,20 @@ class _AccountManagementState extends State String expirationDate, Widget? child, ) { - return ListItemFactory.settingsItem( - key: AppKeys.account_renew, - header: 'Pro Account Expiration'.i18n, - icon: ImagePaths.clock, - content: expirationDate, - onTap: () async { - await context.pushRoute(const PlansPage()); - }, - trailingArray: [ - CText('Renew'.i18n.toUpperCase(), style: tsButtonPink) - ], - ); + return expirationDate == "" + ? const SizedBox.shrink() + : ListItemFactory.settingsItem( + key: AppKeys.account_renew, + header: 'Pro Account Expiration'.i18n, + icon: ImagePaths.clock, + content: expirationDate, + onTap: () async { + await context.pushRoute(const PlansPage()); + }, + trailingArray: [ + CText('Renew'.i18n.toUpperCase(), style: tsButtonPink) + ], + ); }), ]; return BaseScreen( @@ -273,7 +275,7 @@ class _AccountManagementState extends State ); } // If chat is enabled and hasBeenOnboarded then only show chat settings - return chatEnabled && hasBeenOnboarded ==true + return chatEnabled && hasBeenOnboarded == true // * has been onboarded ? Column( children: [ diff --git a/lib/account/device_linking/authorize_device_via_email.dart b/lib/account/device_linking/authorize_device_via_email.dart index 3eb10cfb4..b65d494e5 100644 --- a/lib/account/device_linking/authorize_device_via_email.dart +++ b/lib/account/device_linking/authorize_device_via_email.dart @@ -1,7 +1,8 @@ +// ignore_for_file: use_build_context_synchronously + import 'package:email_validator/email_validator.dart'; import 'package:lantern/common/common.dart'; - @RoutePage(name: 'AuthorizeDeviceEmail') class AuthorizeDeviceViaEmail extends StatelessWidget { AuthorizeDeviceViaEmail({Key? key}) : super(key: key); @@ -41,19 +42,7 @@ class AuthorizeDeviceViaEmail extends StatelessWidget { margin: const EdgeInsetsDirectional.only(bottom: 32), child: Button( text: 'Submit'.i18n, - onPressed: () { - if (formKey.currentState!.validate()) { - context.loaderOverlay.show(widget: spinner); - sessionModel - .authorizeViaEmail(emailController.value.text) - .then((result) async { - context.loaderOverlay.hide(); - await context.pushRoute(AuthorizeDeviceEmailPin()); - }).onError((error, stackTrace) { - context.loaderOverlay.hide(); - }); - } - }, + onPressed: () => onSubmit(context), ), ), ], @@ -61,4 +50,18 @@ class AuthorizeDeviceViaEmail extends StatelessWidget { ), ); } + + Future onSubmit(BuildContext context) async { + try { + if (!formKey.currentState!.validate()) { + return; + } + context.loaderOverlay.show(widget: spinner); + await sessionModel.authorizeViaEmail(emailController.value.text); + context.loaderOverlay.hide(); + context.pushRoute(AuthorizeDeviceEmailPin(email: emailController.value.text)); + } catch (e) { + context.loaderOverlay.hide(); + } + } } diff --git a/lib/account/device_linking/authorize_device_via_email_pin.dart b/lib/account/device_linking/authorize_device_via_email_pin.dart index 41525721d..4774b3bcc 100644 --- a/lib/account/device_linking/authorize_device_via_email_pin.dart +++ b/lib/account/device_linking/authorize_device_via_email_pin.dart @@ -1,105 +1,115 @@ +// ignore_for_file: use_build_context_synchronously + import 'package:lantern/common/common.dart'; import 'package:styled_text/styled_text.dart'; @RoutePage(name: 'AuthorizeDeviceEmailPin') class AuthorizeDeviceViaEmailPin extends StatelessWidget { - AuthorizeDeviceViaEmailPin({Key? key}) : super(key: key); + final String email; + + AuthorizeDeviceViaEmailPin({ + Key? key, + required this.email, + }) : super(key: key); final pinCodeController = TextEditingController(); - final formKey = GlobalKey(); @override Widget build(BuildContext context) { - Widget emailSentMessage(String emailAddress) { - return StyledText( - text: 'recovery_email_sent' - .i18n - .replaceFirst('%s', '$emailAddress'), - style: tsBody1, - tags: { - 'highlight': StyledTextTag( - style: TextStyle(color: blue4, fontWeight: FontWeight.bold)), + return BaseScreen( + title: 'Authorize Device via Email'.i18n, + body: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + margin: const EdgeInsetsDirectional.only(top: 32, bottom: 6), + alignment: Alignment.center, + child: CText( + 'Enter or paste linking code'.i18n.toUpperCase(), + style: tsOverline, + ), + ), + PinField( + length: 6, + controller: pinCodeController, + onDone: (text) => onDone(text, context), + ), + LabeledDivider( + padding: const EdgeInsetsDirectional.only(top: 10, bottom: 10), + ), + emailDesc(), + const Spacer(), + Container( + margin: const EdgeInsetsDirectional.only(bottom: 32), + child: TextButton( + onPressed: () => onResendCode(context), + child: CText( + 'Re-send Email'.i18n.toUpperCase(), + style: tsButtonPink, + ), + ), + ), + ], + ), + ); + } + + Widget emailDesc() { + return StyledText( + text: 'recovery_email_sent' + .i18n + .replaceFirst('%s', '$email'), + style: tsBody1, + tags: { + 'highlight': StyledTextTag( + style: TextStyle(color: blue4, fontWeight: FontWeight.bold)), + }, + ); + } + + /// widget method + + Future onDone(String code, BuildContext context) async { + try { + FocusManager.instance.primaryFocus?.unfocus(); + context.loaderOverlay.show(); + await sessionModel.validateRecoveryCode(code); + pinCodeController.clear(); + context.loaderOverlay.hide(); + CDialog.showInfo( + context, + title: "device_added".i18n, + description: "device_added_message".i18n, + agreeAction: () async { + Future.delayed( + const Duration(milliseconds: 400), + () { + context.router.popUntilRoot(); + }, + ); + + return true; }, ); + } catch (e) { + pinCodeController.clear(); + context.loaderOverlay.hide(); + // CDialog.showError(context, description: e.toString()); } + } - return sessionModel.emailAddress( - (BuildContext context, String emailAddress, Widget? child) { - return BaseScreen( - title: 'Authorize Device via Email'.i18n, - body: Form( - key: formKey, - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - margin: const EdgeInsetsDirectional.only(top: 32, bottom: 6), - alignment: Alignment.center, - child: CText( - 'Enter or paste linking code'.i18n.toUpperCase(), - style: tsOverline, - ), - ), - PinField( - length: 6, - controller: pinCodeController, - onDone: (code) { - context.loaderOverlay.show(widget: spinner); - sessionModel.validateRecoveryCode(code).then((value) { - pinCodeController.clear(); - context.loaderOverlay.hide(); - }).onError((error, stackTrace) { - pinCodeController.clear(); - context.loaderOverlay.hide(); - }); - }, - ), - LabeledDivider( - padding: const EdgeInsetsDirectional.only(top: 10, bottom: 10), - ), - emailSentMessage(emailAddress), - const Spacer(), - Container( - margin: const EdgeInsetsDirectional.only(bottom: 32), - child: TextButton( - onPressed: () { - context.loaderOverlay.show(widget: spinner); - sessionModel.resendRecoveryCode().then((value) { - context.loaderOverlay.hide(); - showDialog( - context: context, - builder: (context) { - return AlertDialog( - content: emailSentMessage(emailAddress), - actions: [ - TextButton( - onPressed: () { - Navigator.pop(context); - }, - child: CText( - 'Okay'.i18n, - style: tsButtonPink, - ), - ), - ], - ); - }, - ); - }).onError((error, stackTrace) { - context.loaderOverlay.hide(); - }); - }, - child: CText( - 'Re-send Email'.i18n.toUpperCase(), - style: tsButtonPink, - ), - ), - ), - ], - ), - ), - ); - }); + Future onResendCode(BuildContext context) async { + try { + context.loaderOverlay.show(); + await sessionModel.authorizeViaEmail(email); + context.loaderOverlay.hide(); + CDialog.showInfo(context, + title: "recovery_code_sent".i18n, + description: "recovery_email_sent".i18n.replaceAll('%s', email)); + } catch (e) { + context.loaderOverlay.hide(); + CDialog.showError(context, description: e.toString()); + } } } diff --git a/lib/account/device_linking/link_device.dart b/lib/account/device_linking/link_device.dart index bdd0dd8ba..9f8a7a044 100644 --- a/lib/account/device_linking/link_device.dart +++ b/lib/account/device_linking/link_device.dart @@ -1,4 +1,6 @@ import 'package:lantern/common/common.dart'; +import 'package:retry/retry.dart'; + import 'explanation_step.dart'; @RoutePage(name: 'LinkDevice') @@ -12,11 +14,25 @@ class LinkDevice extends StatefulWidget { } class _LinkDeviceState extends State { - @override void initState() { super.initState(); - sessionModel.requestLinkCode(); + sessionModel.requestLinkCode().then( + (code) => { + print("requestLinkCode success code is $code"), + retry( + // Make a GET request + () => sessionModel + .redeemLinkCode() + .timeout(const Duration(hours: 1)), + onRetry: (e) => print("error , retry: $e"), + ).then( + (x) => { + print("redeemLinkCode success"), + }, + ) + }, + ); } @override @@ -24,7 +40,7 @@ class _LinkDeviceState extends State { return BaseScreen( title: 'Authorize Device for Pro'.i18n, body: sessionModel.deviceLinkingCode((BuildContext context, - String deviceCode, Widget? child) => + String deviceCode, Widget? child) => Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ diff --git a/lib/account/report_issue.dart b/lib/account/report_issue.dart index 4bcbc7651..bcad5dd6f 100644 --- a/lib/account/report_issue.dart +++ b/lib/account/report_issue.dart @@ -1,9 +1,9 @@ +// ignore_for_file: use_build_context_synchronously + import 'package:email_validator/email_validator.dart'; import 'package:lantern/common/common.dart'; import 'package:lantern/common/ui/app_loading_dialog.dart'; -bool isEmpty(value) => value == null || value == ''; - @RoutePage(name: 'ReportIssue') class ReportIssue extends StatefulWidget { ReportIssue({ @@ -18,35 +18,35 @@ class _ReportIssueState extends State { final emailFieldKey = GlobalKey(); late final emailController = CustomTextEditingController( formKey: emailFieldKey, - validator: (value) => EmailValidator.validate(value ?? '') - ? null - : 'please_enter_a_valid_email_address'.i18n, + validator: (value) { + if (value == null || value.isEmpty) { + return null; + } + return EmailValidator.validate(value ?? '') + ? null + : 'please_enter_a_valid_email_address'.i18n; + }, ); final issueFieldKey = GlobalKey(); late final issueController = CustomTextEditingController( formKey: issueFieldKey, - validator: (value) => !isEmpty(value) ? null : 'select_an_issue'.i18n, + validator: (value) { + if (value!.isEmpty) { + return 'select_an_issue'.i18n; + } + return null; + }, ); final descFieldKey = GlobalKey(); late final descController = CustomTextEditingController( - formKey: descFieldKey, - validator: (value) => !isEmpty(value) ? null : 'enter_description'.i18n, - ); - - @override - void initState() { - WidgetsBinding.instance.addPostFrameCallback((timeStamp) { - const String flavor = String.fromEnvironment('app.flavor'); - if (flavor == 'appiumTest') { - // Set email - emailController.text ='jigar@getlantern.org'; - // Set issue type - issueController.text = 'other'.i18n; - } - }); - super.initState(); - } + formKey: descFieldKey, + validator: (value) { + if (value!.isEmpty) { + return 'enter_description'.i18n; + } + return null; + }); @override void dispose() { @@ -63,130 +63,140 @@ class _ReportIssueState extends State { String emailAddress, Widget? child, ) { - return sessionModel - .proUser((BuildContext context, bool proUser, Widget? child) { - return BaseScreen( - title: 'report_an_issue'.i18n, - resizeToAvoidBottomInset: false, - body: Padding( - padding: const EdgeInsetsDirectional.only( - start: 25, - end: 23, + return BaseScreen( + title: 'report_an_issue'.i18n, + resizeToAvoidBottomInset: false, + body: Padding( + padding: const EdgeInsetsDirectional.only( + start: 25, + end: 23, + ), + child: Column( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // * Email field + Container( + margin: const EdgeInsetsDirectional.only( + top: 24, + bottom: 8, + ), + child: Form( + key: emailFieldKey, + child: CTextField( + initialValue: emailAddress, + controller: emailController, + autovalidateMode: AutovalidateMode.disabled, + label: 'email'.i18n, + onChanged: (value) { + setState(() {}); + }, + keyboardType: TextInputType.emailAddress, + prefixIcon: const CAssetImage(path: ImagePaths.email), + ), + ), ), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - // * Email field - Container( - margin: const EdgeInsetsDirectional.only( - top: 24, - bottom: 8, - ), - child: Form( - key: emailFieldKey, - child: CTextField( - initialValue: proUser ? emailAddress : '', - controller: emailController, - autovalidateMode: proUser - ? AutovalidateMode.always - : AutovalidateMode.disabled, - label: 'email'.i18n, - keyboardType: TextInputType.emailAddress, - prefixIcon: const CAssetImage(path: ImagePaths.email), - ), - ), - ), - Container( - margin: const EdgeInsetsDirectional.only( - top: 8, - bottom: 8, - ), - child: Form( - key: issueFieldKey, - child: DropdownButtonFormField( - decoration: InputDecoration( - border: OutlineInputBorder( - borderSide: BorderSide( - width: 1, - color: grey3, - ), - ), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide( - width: 2, - color: blue4, - ), - ), - prefixIcon: Transform.scale( - scale: 0.4, - child: const CAssetImage( - path: ImagePaths.alert))), - hint: - CText('select_an_issue'.i18n, style: tsBody1), - value: issueController.text != '' - ? issueController.text - : null, - icon: const CAssetImage( - path: ImagePaths.arrow_down), - //iconSize: iconSize, - elevation: 16, - onChanged: (String? newValue) { - issueController.text = newValue!; - }, - items: [ - 'cannot_access_blocked_sites'.i18n, - 'cannot_complete_purchase'.i18n, - 'cannot_sign_in'.i18n, - 'spinner_loads_endlessly'.i18n, - 'other'.i18n - ].map>((String value) { - return DropdownMenuItem( - value: value, - child: CText(value, style: tsBody1), - ); - }).toList(), - ))), - Container( - margin: const EdgeInsetsDirectional.only( - top: 8, - ), - child: Form( - key: descFieldKey, - child: CTextField( - tooltipMessage: AppKeys.reportDescription, - controller: descController, - contentPadding: EdgeInsetsDirectional.all(8.0), - label: '', - hintText: 'issue_description'.i18n, - autovalidateMode: AutovalidateMode.disabled, - maxLines: 8, - keyboardType: TextInputType.multiline, - ), - )), - const Spacer(), - Container( - padding: const EdgeInsetsDirectional.only(bottom: 56), - child: Tooltip( - message: AppKeys.sendReport, - child: Button( - width: 200, - disabled: emailFieldKey.currentState - ?.validate() == - false || - issueFieldKey.currentState?.validate() == - false || - descFieldKey.currentState?.validate() == - false, - text: 'send_report'.i18n, - onPressed: onSendReportTap, - ))), - ])), - ); - }); + Container( + margin: const EdgeInsetsDirectional.only( + top: 8, + bottom: 8, + ), + child: Form( + key: issueFieldKey, + child: DropdownButtonFormField( + decoration: InputDecoration( + border: OutlineInputBorder( + borderSide: BorderSide( + width: 1, + color: grey3, + ), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + width: 2, + color: blue4, + ), + ), + prefixIcon: Transform.scale( + scale: 0.4, + child: + const CAssetImage(path: ImagePaths.alert))), + hint: CText('select_an_issue'.i18n, style: tsBody1), + value: issueController.text != '' + ? issueController.text + : null, + icon: const CAssetImage(path: ImagePaths.arrow_down), + //iconSize: iconSize, + elevation: 16, + onChanged: (String? newValue) { + setState(() { + issueController.text = newValue!; + }); + }, + items: [ + 'cannot_access_blocked_sites'.i18n, + 'cannot_complete_purchase'.i18n, + 'cannot_sign_in'.i18n, + 'spinner_loads_endlessly'.i18n, + 'other'.i18n + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: CText(value, style: tsBody1), + ); + }).toList(), + ))), + const SizedBox(height: 8), + Form( + key: descFieldKey, + child: CTextField( + tooltipMessage: AppKeys.reportDescription, + controller: descController, + contentPadding: const EdgeInsetsDirectional.all(8.0), + label: '', + hintText: 'issue_description'.i18n, + autovalidateMode: AutovalidateMode.disabled, + maxLines: 8, + keyboardType: TextInputType.multiline, + onChanged: (value) { + setState(() {}); + }, + ), + ), + const Spacer(), + Tooltip( + message: AppKeys.sendReport, + child: Button( + width: 200, + disabled: isButtonDisabled(), + text: 'send_report'.i18n, + onPressed: onSendReportTap, + )), + const SizedBox( + height: 56.0, + ), + ], + ), + ), + ); }); } + bool isButtonDisabled() { + if (emailController.text.isNotEmpty) { + if (!EmailValidator.validate(emailController.text)) { + return true; + } + } + if (issueController.text.isEmpty) { + return true; + } + if (descController.text.isEmpty) { + return true; + } + return false; + } + Future onSendReportTap() async { try { AppLoadingDialog.showLoadingDialog( @@ -194,9 +204,6 @@ class _ReportIssueState extends State { ); await sessionModel.reportIssue(emailController.value.text, issueController.value.text, descController.value.text); - - // For Android we have native dialog - // Todo need to remove native dialog and use this one for Android & IOS if (Platform.isIOS) { AppLoadingDialog.dismissLoadingDialog(context); } @@ -206,7 +213,7 @@ class _ReportIssueState extends State { description: 'thank_you_for_reporting_your_issue'.i18n, actionLabel: 'continue'.i18n, agreeAction: () async { - await context.popRoute(); + resetController(); return true; }, ); @@ -214,13 +221,22 @@ class _ReportIssueState extends State { if (Platform.isIOS) { AppLoadingDialog.dismissLoadingDialog(context); } - CDialog.showError( context, error: error, stackTrace: stackTrace, - description: (error as PlatformException).message.toString(), + description: (error as PlatformException) + .message + .toString(), // This is coming localized ); } } + + void resetController() { + setState(() { + issueController.clear(); + descController.clear(); + emailController.clear(); + }); + } } diff --git a/lib/account/split_tunneling.dart b/lib/account/split_tunneling.dart index 63844c95b..e14f114ee 100644 --- a/lib/account/split_tunneling.dart +++ b/lib/account/split_tunneling.dart @@ -1,3 +1,5 @@ +// ignore_for_file: use_build_context_synchronously + import 'package:flutter/cupertino.dart'; import 'package:intl/intl.dart'; import 'package:lantern/common/common.dart'; @@ -5,7 +7,7 @@ import 'package:lantern/vpn/vpn.dart'; @RoutePage(name: 'SplitTunneling') class SplitTunneling extends StatefulWidget { - SplitTunneling({Key? key}); + const SplitTunneling({super.key}); @override State createState() => _SplitTunnelingState(); @@ -37,49 +39,39 @@ class _SplitTunnelingState extends State { title: 'split_tunneling'.i18n, body: sessionModel.splitTunneling( (BuildContext context, bool splitTunnelingEnabled, Widget? child) { - return sessionModel.appsData( - builder: ( - context, - Iterable> _appsData, - Widget? child, - ) { - return Column( - children: [ - ListItemFactory.settingsItem( - icon: ImagePaths.split_tunneling, - content: 'split_tunneling'.i18n, - trailingArray: [ - SizedBox( - width: 44.0, - height: 24.0, - child: CupertinoSwitch( - value: splitTunnelingEnabled, - activeColor: CupertinoColors.activeGreen, - onChanged: (bool? value) { - var newValue = value ?? false; - sessionModel.setSplitTunneling(newValue); - showRestartVPNSnackBar(context); - }, - ), - ), - ], - ), - Padding( - padding: const EdgeInsetsDirectional.only(top: 16), - child: CText( - splitTunnelingEnabled - ? 'apps_to_unblock'.i18n - : 'split_tunneling_info'.i18n, - style: tsBody3, + return Column( + children: [ + ListItemFactory.settingsItem( + icon: ImagePaths.split_tunneling, + content: 'split_tunneling'.i18n, + trailingArray: [ + SizedBox( + width: 44.0, + height: 24.0, + child: CupertinoSwitch( + value: splitTunnelingEnabled, + activeColor: CupertinoColors.activeGreen, + onChanged: (bool? value) { + var newValue = value ?? false; + sessionModel.setSplitTunneling(newValue); + showRestartVPNSnackBar(context); + }, ), ), - // if split tunneling is enabled, include the installed apps - // in the column - if (splitTunnelingEnabled) - Expanded(child: buildAppsList(_appsData)), ], - ); - }, + ), + Padding( + padding: const EdgeInsetsDirectional.only(top: 12), + child: CText( + splitTunnelingEnabled + ? 'apps_to_unblock'.i18n + : 'split_tunneling_info'.i18n, + style: tsBody3, + ), + ), + const SizedBox(height: 10), + if (splitTunnelingEnabled) _splitTunnelEnable() + ], ); }), ); @@ -87,41 +79,149 @@ class _SplitTunnelingState extends State { // buildAppsLists builds lists for apps allowed access to the VPN connection // and installed apps. It returns both along with their associated headers. - ListView buildAppsList(Iterable> appsData) { - var allowedApps = appsData.where((app) => app.value.allowedAccess).toList(); - var excludedApps = - appsData.where((app) => !app.value.allowedAccess).toList(); - allowedApps.sort((a, b) => a.value.name.compareTo(b.value.name)); - excludedApps.sort((a, b) => a.value.name.compareTo(b.value.name)); + // showRestartVPNSnackBar shows a snackbar with a message indicating that + // settings will be applied when the VPN is restarted (and only if the + // snackbar hasn't already been shown) + void showRestartVPNSnackBar(BuildContext context) async { + if (vpnConnected || snackbarShown) { + return; + } + showSnackbar( + context: context, + content: CText( + 'applied_next_time'.i18n, + style: tsSubtitle3.copiedWith(color: Colors.white), + ), + duration: const Duration(seconds: 7), + ); + setState(() { + snackbarShown = true; + }); + } - return ListView.builder( - itemCount: appsData.isEmpty ? 0 : appsData.length + 2, - itemBuilder: (BuildContext context, int index) { - if (index == 0) { - return ListSectionHeader( - 'apps_routed_through_lantern'.i18n.toUpperCase(), - ); - } - if (index == allowedApps.length + 1) { - return ListSectionHeader('your_installed_apps'.i18n.toUpperCase()); - } - late PathAndValue appData; - if (index <= allowedApps.length) { - appData = allowedApps[index - 1]; - } else { - appData = excludedApps[index - allowedApps.length - 2]; - } - return buildAppItem(appData.value); + Widget _splitTunnelEnable() { + return sessionModel.appsData( + builder: ( + context, + Iterable> _appsData, + Widget? child, + ) { + return Expanded( + child: SplitTunnelingAppsList(appsList: _appsData.toList())); }, ); } +} + +class SplitTunnelingAppsList extends StatefulWidget { + final List> appsList; + + const SplitTunnelingAppsList({ + super.key, + required this.appsList, + }); + + @override + State createState() => _SplitTunnelingAppsListState(); +} + +class _SplitTunnelingAppsListState extends State { + final formKey = GlobalKey(); + late final _searchTextController = CustomTextEditingController( + formKey: formKey, + ); + List> list = []; + bool snackbarShown = false; + + @override + void didUpdateWidget(covariant SplitTunnelingAppsList oldWidget) { + super.didUpdateWidget(oldWidget); + onChangeSearch(_searchTextController.text); + } + + @override + Widget build(BuildContext context) { + return Expanded( + child: Column( + children: [ + CTextField( + controller: _searchTextController, + contentPadding: const EdgeInsetsDirectional.symmetric( + vertical: 15.0, + horizontal: 5.0, + ), + prefixIcon: const CAssetImage(path: ImagePaths.searchApp), + label: 'search_apps'.i18n, + textInputAction: TextInputAction.done, + onChanged: onChangeSearch, + ), + buildAppsList( + _searchTextController.text.isEmpty ? widget.appsList : list), + + ], + ), + ); + } + + Widget buildAppsList(Iterable> appsData) { + var sortedAppsData = appsData.toList() + ..sort((a, b) => a.value.name.compareTo(b.value.name)); + + var allowedApps = + sortedAppsData.where((app) => app.value.allowedAccess).toList(); + var excludedApps = + sortedAppsData.where((app) => !app.value.allowedAccess).toList(); + + return Expanded( + child: ListView.builder( + padding: const EdgeInsets.only(bottom: 30), + itemCount: appsData.isEmpty ? 0 : appsData.length + 2, + itemBuilder: (BuildContext context, int index) { + if (index == 0) { + return ListSectionHeader( + 'apps_routed_through_lantern'.i18n.toUpperCase(), + ); + } + if (index == allowedApps.length + 1) { + return ListSectionHeader('your_installed_apps'.i18n.toUpperCase()); + } + late PathAndValue appData; + if (index <= allowedApps.length) { + appData = allowedApps[index - 1]; + } else { + appData = excludedApps[index - allowedApps.length - 2]; + } + return buildAppItem(appData.value); + }, + ), + ); + } + + void onChangeSearch(String search) { + list.clear(); + if (search == "") { + setState(() { + list.clear(); + }); + return; + } + for (final apps in widget.appsList) { + if (apps.value.name.toLowerCase().contains(search.toLowerCase())) { + list.add(apps); + } + } + setState(() {}); + } + + // buildAppsLists builds lists for apps allowed access to the VPN connection + // and installed apps. It returns both along with their associated headers. // showRestartVPNSnackBar shows a snackbar with a message indicating that // settings will be applied when the VPN is restarted (and only if the // snackbar hasn't already been shown) void showRestartVPNSnackBar(BuildContext context) async { - if (!vpnConnected || snackbarShown) { + if (!await vpnModel.isVpnConnected() || snackbarShown) { return; } showSnackbar( @@ -138,17 +238,6 @@ class _SplitTunnelingState extends State { } Widget buildAppItem(AppData appData) { - var iconBytes = appData.icon; - var packageName = appData.packageName; - - var allowOrDenyAppAccess = () { - if (appData.allowedAccess) { - sessionModel.denyAppAccess(packageName); - } else { - sessionModel.allowAppAccess(packageName); - } - showRestartVPNSnackBar(context); - }; return Container( height: 72, padding: EdgeInsets.zero, @@ -168,11 +257,16 @@ class _SplitTunnelingState extends State { maxWidth: 24, maxHeight: 24, ), - child: iconBytes.isNotEmpty - ? Image.memory(Uint8List.fromList(iconBytes), fit: BoxFit.cover) + child: appData.icon.isNotEmpty + ? Image.memory( + Uint8List.fromList(appData.icon), + fit: BoxFit.cover, + width: 24, + height: 24, + ) : null, ), - onTap: () => allowOrDenyAppAccess(), + onTap: () => allowOrDenyAppAccess(appData), trailing: SizedBox( height: 24.0, width: 24.0, @@ -181,7 +275,7 @@ class _SplitTunnelingState extends State { shape: const CircleBorder(), activeColor: Colors.black, side: const BorderSide(color: Colors.black), - onChanged: (bool? value) => allowOrDenyAppAccess(), + onChanged: (bool? value) => allowOrDenyAppAccess(appData), value: appData.allowedAccess, ), ), @@ -194,6 +288,15 @@ class _SplitTunnelingState extends State { ), ); } + + void allowOrDenyAppAccess(AppData appData) { + if (appData.allowedAccess) { + sessionModel.denyAppAccess(appData.packageName); + } else { + sessionModel.allowAppAccess(appData.packageName); + } + showRestartVPNSnackBar(context); + } } // SplitTunnelingWidget is the split tunneling widget that appears on the main VPN screen diff --git a/lib/ad_helper.dart b/lib/ad_helper.dart index c2589384e..518da6a6f 100644 --- a/lib/ad_helper.dart +++ b/lib/ad_helper.dart @@ -1,303 +1,333 @@ -// import 'dart:io'; - -// import 'package:clever_ads_solutions/CAS.dart'; -// import 'package:clever_ads_solutions/public/AdCallback.dart'; -// import 'package:clever_ads_solutions/public/AdImpression.dart'; -// import 'package:clever_ads_solutions/public/AdTypes.dart'; -// import 'package:clever_ads_solutions/public/Audience.dart'; -// import 'package:clever_ads_solutions/public/InitConfig.dart'; -// import 'package:clever_ads_solutions/public/InitializationListener.dart'; -// import 'package:clever_ads_solutions/public/MediationManager.dart'; -// import 'package:flutter/foundation.dart'; -// import 'package:google_mobile_ads/google_mobile_ads.dart'; -// import 'package:logger/logger.dart'; -// import 'package:lantern/replica/common.dart'; - -// import 'common/session_model.dart'; - -// enum AdType { Google, CAS } - -// const privacyPolicy = 'https://lantern.io/privacy'; - -// class AdHelper { -// static final AdHelper _instance = AdHelper._internal(); - -// AdHelper._internal(); - -// factory AdHelper() { -// return _instance; -// } - -// AdType? _currentAdType; -// MediationManager? casMediationManager; -// InterstitialAd? _interstitialAd; -// int _failedLoadAttempts = 0; -// int _failedCASLoadAttempts = 0; - -// //If ads are getting failed to load we want to make lot of calls -// // Just try 5 times -// final int _maxFailAttempts = 5; - -// //Google Test ID if needed to test -// // return 'ca-app-pub-3940256099942544/1033173712'; -// String get interstitialAdUnitId { -// if (Platform.isAndroid) { -// return const String.fromEnvironment('INTERSTITIAL_AD_UNIT_ID'); -// } else { -// throw UnsupportedError('Unsupported platform'); -// } -// } - -// // Private methods to decide whether to load or show Google Ads or CAS ads based on conditions -// Future _decideAndLoadAds() async { -// final shouldShowGoogleAds = await sessionModel.shouldShowAds(); -// final shouldShowCASAds = await sessionModel.shouldCASShowAds(); - -// logger.d( -// '[Ads Manager] Google Ads enable $shouldShowGoogleAds: CAS Ads $shouldShowCASAds'); -// if (shouldShowGoogleAds) { -// _currentAdType = AdType.Google; -// logger.i('[Ads Manager] Decision: Loading Google Ads.'); -// await _loadInterstitialAd(); -// } else if (shouldShowCASAds) { -// _currentAdType = AdType.CAS; -// logger.i('[Ads Manager] Decision: Loading CAS Ads.'); -// if (casMediationManager == null) { -// await _initializeCAS(); -// } -// await _loadCASInterstitial(); -// } -// } - -// Future _decideAndShowAds() async { -// if (_currentAdType == AdType.Google && _interstitialAd != null) { -// await _showInterstitialAd(); -// } else if (_currentAdType == AdType.CAS) { -// final isCASReady = (await casMediationManager!.isInterstitialReady()); -// if (isCASReady) { -// await _showCASInterstitial(); -// logger.i('[Ads Manager] Request: Showing CAS Ad .'); -// } else { -// logger.i('[Ads Manager] CAS: Ad is not yet ready to show.'); -// } -// } -// } - -// Future _loadInterstitialAd() async { -// //To avoid calling multiple ads request repeatedly -// if (_interstitialAd == null && _failedLoadAttempts < _maxFailAttempts) { -// logger.i('[Ads Manager] Request: Making Google Ad request.'); -// await InterstitialAd.load( -// adUnitId: interstitialAdUnitId, -// request: const AdRequest(), -// adLoadCallback: InterstitialAdLoadCallback( -// onAdLoaded: (ad) { -// ad.fullScreenContentCallback = FullScreenContentCallback( -// onAdClicked: (ad) { -// logger.i('[Ads Manager] onAdClicked callback'); -// }, -// onAdShowedFullScreenContent: (ad) { -// logger.i('[Ads Manager] Showing Ads'); -// }, -// onAdFailedToShowFullScreenContent: (ad, error) { -// logger.i( -// '[Ads Manager] onAdFailedToShowFullScreenContent callback'); -// //if ads fail to load let user turn on VPN -// _postShowingAds(); -// }, -// onAdDismissedFullScreenContent: (ad) { -// logger.i('[Ads Manager] fullScreenContentCallback callback'); -// _postShowingAds(); -// }, -// ); -// _interstitialAd = ad; -// logger.i('[Ads Manager] to loaded $ad'); -// }, -// onAdFailedToLoad: (err) { -// _failedLoadAttempts++; // increment the count on failure -// logger.i('[Ads Manager] failed to load $err'); -// _postShowingAds(); -// }, -// ), -// ); -// } -// } - - // Future _loadInterstitialAd() async { - // //To avoid calling multiple ads request repeatedly - // assert(interstitialAdUnitId!="","interstitialAdUnitId should not be null or empty"); - // if (_interstitialAd == null && _failedLoadAttempts < _maxFailAttempts) { - // logger.i('[Ads Manager] Request: Making Google Ad request.'); - // await InterstitialAd.load( - // adUnitId: interstitialAdUnitId, - // request: const AdRequest(), - // adLoadCallback: InterstitialAdLoadCallback( - // onAdLoaded: (ad) { - // _failedLoadAttempts = 0; - // ad.fullScreenContentCallback = FullScreenContentCallback( - // onAdClicked: (ad) { - // logger.i('[Ads Manager] onAdClicked callback'); - // }, - // onAdShowedFullScreenContent: (ad) { - // logger.i('[Ads Manager] Showing Ads'); - // }, - // onAdFailedToShowFullScreenContent: (ad, error) { - // logger.i( - // '[Ads Manager] onAdFailedToShowFullScreenContent callback'); - // //if ads fail to load let user turn on VPN - // _postShowingAds(); - // }, - // onAdDismissedFullScreenContent: (ad) { - // logger.i('[Ads Manager] fullScreenContentCallback callback'); - // _postShowingAds(); - // }, - // ); - // _interstitialAd = ad; - // logger.i('[Ads Manager] to loaded $ad'); - // }, - // onAdFailedToLoad: (err) { - // _failedLoadAttempts++; // increment the count on failure - // logger.i('[Ads Manager] failed to load $err'); - // _postShowingAds(); - // }, - // ), - // ); - // } - // } - -// Future _showInterstitialAd() async { -// if (_interstitialAd != null) { -// await _interstitialAd?.show(); -// } -// } - -// // Public methods -// Future loadAds() async { -// await _decideAndLoadAds(); -// } - -// Future showAds() async { -// await _decideAndShowAds(); -// } - -// ///CAS initialization and method and listeners -// /// -// Future _initializeCAS() async { -// await CAS.setDebugMode(kDebugMode); -// await CAS.setAnalyticsCollectionEnabled(true); -// // CAS.setFlutterVersion("1.20.0"); -// // await CAS.validateIntegration(); - -// var builder = CAS -// .buildManager() -// .withCasId('org.getlantern.lantern') -// .withAdTypes(AdTypeFlags.Interstitial) -// .withInitializationListener(InitializationListenerWrapper()) -// .withTestMode(false); - -// CAS.buildConsentFlow().withPrivacyPolicy(privacyPolicy); -// casMediationManager = builder.initialize(); -// // This can be useful when you need to improve application performance by turning off unused formats. -// await casMediationManager!.setEnabled(AdTypeFlags.Interstitial, true); -// await CAS.setTaggedAudience(Audience.NOT_CHILDREN); -// // await CAS.setTestDeviceIds(['D79728264130CE0918737B5A2178D362']); -// logger.i('[Ads Manager] Initialization: CAS completed.'); -// } - -// Future _loadCASInterstitial() async { -// if (casMediationManager != null) { -// await casMediationManager!.loadInterstitial(); -// logger.i('[Ads Manager] Request: Initiating CAS Interstitial loading.'); -// } -// } - - // Future _loadCASInterstitial() async { - // if (casMediationManager != null) { - // await casMediationManager!.loadInterstitial(); - // logger.i('[Ads Manager] Request: Initiating CAS Interstitial loading.'); - // } - // } - -// void _onCASAdShowFailed() { -// logger.e('[Ads Manager] Error: CAS Interstitial failed to display.'); -// _failedCASLoadAttempts++; -// _postShowingAds(); // Reload or decide the next action -// } - - // void _onCASAdShowFailed() { - // logger.e('[Ads Manager] Error: CAS Interstitial failed to display.'); - // _failedCASLoadAttempts++; - // _postShowingAds(); // Reload or decide the next action - // } - - // void _onCASAdClosedOrComplete() { - // logger.i('[Ads Manager] Completion: CAS Interstitial closed or completed.'); - // // Reset the counter when the ad successfully shows and closes/completes - // _failedCASLoadAttempts = 0; - // _postShowingAds(); - // } - -// class InitializationListenerWrapper extends InitializationListener { -// @override -// void onCASInitialized(InitConfig initialConfig) { -// logger.i('[CASIntegrationHelper] - onCASInitialized $initialConfig'); -// } -// } - -// class InterstitialListenerWrapper extends AdCallback { -// final VoidCallback onFailed; -// final VoidCallback onClosedOrComplete; - -// InterstitialListenerWrapper({ -// required this.onFailed, -// required this.onClosedOrComplete, -// }); - -// @override -// void onClicked() { -// logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onClicked'); -// } - -// @override -// void onClosed() { -// // Called when ad is clicked -// onClosedOrComplete(); -// logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onClosed'); -// } - -// @override -// void onComplete() { -// // Called when ad is dismissed -// onClosedOrComplete(); -// logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onComplete'); -// } - -// @override -// void onImpression(AdImpression? adImpression) { -// // Called when ad is paid. -// logger.i( -// '[CASIntegrationHelper] - InterstitialListenerWrapper onImpression-:$adImpression'); -// } - -// @override -// void onShowFailed(String? message) { -// // Called when ad fails to show. -// onFailed.call(); -// logger.i( -// '[CASIntegrationHelper] - InterstitialListenerWrapper onShowFailed-:$message'); -// } - -// @override -// void onShowFailed(String? message) { -// // Called when ad fails to show. -// onFailed.call(); -// logger.i( -// '[CASIntegrationHelper] - InterstitialListenerWrapper onShowFailed-:$message'); -// } - -// @override -// void onShown() { -// // Called when ad is shown. -// logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onShown'); -// } -// } +import 'package:clever_ads_solutions/CAS.dart'; +import 'package:clever_ads_solutions/public/AdCallback.dart'; +import 'package:clever_ads_solutions/public/AdImpression.dart'; +import 'package:clever_ads_solutions/public/AdTypes.dart'; +import 'package:clever_ads_solutions/public/Audience.dart'; +import 'package:clever_ads_solutions/public/InitConfig.dart'; +import 'package:clever_ads_solutions/public/InitializationListener.dart'; +import 'package:clever_ads_solutions/public/MediationManager.dart'; +import 'package:google_mobile_ads/google_mobile_ads.dart'; +import 'package:lantern/common/app_secret.dart'; +import 'package:lantern/common/common.dart'; +import 'package:lantern/replica/common.dart'; +import 'package:logger/logger.dart'; + +enum AdType { Google, CAS } + +const privacyPolicy = 'https://lantern.io/privacy'; + +const googleAttributes = { + 'provider': "Google", +}; + +const casAttributes = { + 'provider': "CAS", +}; + +var logger = Logger(printer: PrettyPrinter(), level: Level.debug); + +class AdHelper { + static final AdHelper _instance = AdHelper._internal(); + + AdHelper._internal(); + + factory AdHelper() { + return _instance; + } + + AdType? _currentAdType; + MediationManager? casMediationManager; + InterstitialAd? _interstitialAd; + int _failedLoadAttempts = 0; + int _failedCASLoadAttempts = 0; + + //If ads are getting failed to load we want to make lot of calls + // Just try 5 times + final int _maxFailAttempts = 5; + + //Google Test ID if needed to test + // return 'ca-app-pub-3940256099942544/1033173712'; + String get interstitialAdUnitId { + if (Platform.isAndroid) { + return AppSecret.androidAdsAppId; + } else { + return AppSecret.iOSAdsAppId; + } + } + + // Private methods to decide whether to load or show Google Ads or CAS ads based on conditions + Future _decideAndLoadAds( + {required bool shouldShowGoogleAds, + required bool shouldShowCASAds}) async { + checkForConsent(); + logger.d( + '[Ads Manager] Google Ads enable $shouldShowGoogleAds: CAS Ads $shouldShowCASAds'); + if (shouldShowGoogleAds) { + _currentAdType = AdType.Google; + logger.i('[Ads Manager] Decision: Loading Google Ads.'); + await _loadInterstitialAd(); + } else if (shouldShowCASAds) { + _currentAdType = AdType.CAS; + logger.i('[Ads Manager] Decision: Loading CAS Ads.'); + if (casMediationManager == null) { + await _initializeCAS(); + } + await _loadCASInterstitial(); + } + } + + Future isAdsReadyToShow() async { + if (_currentAdType == AdType.Google) { + return _interstitialAd != null; + } else if (_currentAdType == AdType.CAS) { + return (casMediationManager != null && + (await casMediationManager!.isInterstitialReady())); + } + return false; + } + + Future _decideAndShowAds() async { + if (_currentAdType == AdType.Google && _interstitialAd != null) { + await _showInterstitialAd(); + } else if (_currentAdType == AdType.CAS) { + final isCASReady = (await casMediationManager!.isInterstitialReady()); + if (isCASReady) { + await _showCASInterstitial(); + logger.i('[Ads Manager] Request: Showing CAS Ad .'); + } else { + logger.i('[Ads Manager] CAS: Ad is not yet ready to show.'); + } + } + } + + Future _loadInterstitialAd() async { + //To avoid calling multiple ads request repeatedly + assert(interstitialAdUnitId != "", + "interstitialAdUnitId should not be null or empty"); + if (_interstitialAd == null && _failedLoadAttempts < _maxFailAttempts) { + logger.i('[Ads Manager] Request: Making Google Ad request.'); + await InterstitialAd.load( + adUnitId: interstitialAdUnitId, + request: const AdRequest(), + adLoadCallback: InterstitialAdLoadCallback( + onAdLoaded: (ad) { + _failedLoadAttempts = 0; + ad.fullScreenContentCallback = FullScreenContentCallback( + onAdClicked: (ad) { + logger.i('[Ads Manager] onAdClicked callback'); + }, + onAdShowedFullScreenContent: (ad) { + logger.i('[Ads Manager] Showing Ads'); + sessionModel.trackUserAction('User shown interstitial ad', + 'http://google.com', 'google'); + }, + onAdFailedToShowFullScreenContent: (ad, error) { + logger.i( + '[Ads Manager] onAdFailedToShowFullScreenContent callback'); + //if ads fail to load let user turn on VPN + _postShowingAds(); + }, + onAdDismissedFullScreenContent: (ad) { + logger.i('[Ads Manager] fullScreenContentCallback callback'); + _postShowingAds(); + }, + ); + _interstitialAd = ad; + logger.i('[Ads Manager] to loaded $ad'); + sessionModel.trackUserAction( + 'Interstitial ad loaded', 'http://google.com', 'google'); + }, + onAdFailedToLoad: (err) { + _failedLoadAttempts++; // increment the count on failure + logger.i('[Ads Manager] failed to load $err'); + sessionModel.trackUserAction('Interstitial ad failed to load', + 'http://google.com', 'google'); + _postShowingAds(); + }, + ), + ); + } + } + + void _postShowingAds() { + if (_currentAdType == AdType.Google) { + _interstitialAd?.dispose(); + _interstitialAd = null; + logger.i( + '[Ads Manager] Post-show: Google Ad displayed. Resetting failed load attempts and requesting a new ad.'); + _loadInterstitialAd(); + } else if (_currentAdType == AdType.CAS) { + logger.i( + '[Ads Manager] Post-show: CAS Ad displayed. Resetting failed load attempts and requesting a new ad.'); + _loadCASInterstitial(); + } + } + + Future _showInterstitialAd() async { + if (_interstitialAd != null) { + await _interstitialAd?.show(); + } + } + + // Public methods + Future loadAds( + {required bool shouldShowGoogleAds, + required bool shouldShowCASAds}) async { + await _decideAndLoadAds( + shouldShowCASAds: shouldShowCASAds, + shouldShowGoogleAds: shouldShowGoogleAds, + ); + } + + Future checkForConsent() async { + logger.d('[Ads Manager] Checking for consent'); + final consentStatus = await ConsentInformation.instance.getConsentStatus(); + if (consentStatus == ConsentStatus.required) { + logger.d('[Ads Manager] Consent Required'); + _loadConsentForm(); + return; + } + logger.d('[Ads Manager] consent not needed'); + } + + void _loadConsentForm() { + final params = ConsentRequestParameters(); + ConsentInformation.instance.requestConsentInfoUpdate(params, () async { + // success + if (await ConsentInformation.instance.isConsentFormAvailable()) { + logger.d('[Ads Manager] Consent Form is available '); + ConsentForm.loadConsentForm((consentForm) { + logger.d('[Ads Manager] Consent Form Loaded '); + //Form is loaded successfully + // Ready to display the consent + consentForm.show((formError) { + logger.d('[Ads Manager] Consent form dismissed'); + }); + }, (formError) { + logger.d('[Ads Manager] Failed to load consent form'); + //Error while loading form + }); + } + }, (error) { + // failure + logger.d('[Ads Manager] Failed to request consent form'); + }); + } + + Future showAds() async { + await _decideAndShowAds(); + } + + ///CAS initialization and method and listeners + /// + Future _initializeCAS() async { + await CAS.setDebugMode(kDebugMode); + // await CAS.setAnalyticsCollectionEnabled(true); + // CAS.setFlutterVersion("1.20.0"); + // await CAS.validateIntegration(); + + var builder = CAS + .buildManager() + .withCasId('org.getlantern.lantern') + .withAdTypes(AdTypeFlags.Interstitial) + .withInitializationListener(InitializationListenerWrapper()) + .withTestMode(false); + + CAS.buildConsentFlow().withPrivacyPolicy(privacyPolicy); + casMediationManager = builder.initialize(); + // This can be useful when you need to improve application performance by turning off unused formats. + await casMediationManager!.setEnabled(AdTypeFlags.Interstitial, true); + await CAS.setTaggedAudience(Audience.NOT_CHILDREN); + // await CAS.setTestDeviceIds(['D79728264130CE0918737B5A2178D362']); + logger.i('[Ads Manager] Initialization: CAS completed.'); + } + + Future _loadCASInterstitial() async { + if (casMediationManager != null) { + await casMediationManager!.loadInterstitial(); + logger.i('[Ads Manager] Request: Initiating CAS Interstitial loading.'); + } + } + + Future _showCASInterstitial() async { + logger.i('[Ads Manager] Show: Attempting to display CAS Interstitial.'); + await casMediationManager!.showInterstitial(InterstitialListenerWrapper( + onFailed: _onCASAdShowFailed, + onClosedOrComplete: _onCASAdClosedOrComplete)); + } + + void _onCASAdShowFailed() { + logger.e('[Ads Manager] Error: CAS Interstitial failed to display.'); + _failedCASLoadAttempts++; + _postShowingAds(); // Reload or decide the next action + } + + void _onCASAdClosedOrComplete() { + logger.i('[Ads Manager] Completion: CAS Interstitial closed or completed.'); + // Reset the counter when the ad successfully shows and closes/completes + _failedCASLoadAttempts = 0; + _postShowingAds(); + } + + //This method will use used when free user buy Pro version + Future turnOffCASInterstitial() async { + await casMediationManager!.setEnabled(AdTypeFlags.Interstitial, false); + } +} + +class InitializationListenerWrapper extends InitializationListener { + @override + void onCASInitialized(InitConfig initialConfig) { + logger.i('[CASIntegrationHelper] - onCASInitialized $initialConfig'); + } +} + +class InterstitialListenerWrapper extends AdCallback { + final VoidCallback onFailed; + final VoidCallback onClosedOrComplete; + + InterstitialListenerWrapper({ + required this.onFailed, + required this.onClosedOrComplete, + }); + + @override + void onClicked() { + logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onClicked'); + } + + @override + void onClosed() { + // Called when ad is clicked + onClosedOrComplete(); + logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onClosed'); + } + + @override + void onComplete() { + // Called when ad is dismissed + onClosedOrComplete(); + logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onComplete'); + } + + @override + void onImpression(AdImpression? adImpression) { + // Called when ad is paid. + logger.i( + '[CASIntegrationHelper] - InterstitialListenerWrapper onImpression-:$adImpression'); + } + + @override + void onShowFailed(String? message) { + // Called when ad fails to show. + onFailed.call(); + logger.i( + '[CASIntegrationHelper] - InterstitialListenerWrapper onShowFailed-:$message'); + } + + @override + void onShown() { + // Called when ad is shown. + logger.i('[CASIntegrationHelper] - InterstitialListenerWrapper onShown'); + } +} diff --git a/lib/common/app_secret.dart b/lib/common/app_secret.dart new file mode 100644 index 000000000..7ed2d6ec1 --- /dev/null +++ b/lib/common/app_secret.dart @@ -0,0 +1,6 @@ +import 'package:flutter_dotenv/flutter_dotenv.dart'; + +class AppSecret { + static String androidAdsAppId = dotenv.get('Android_interstitialAd'); + static String iOSAdsAppId = dotenv.get('IOS_interstitialAd'); +} diff --git a/lib/common/session_model.dart b/lib/common/session_model.dart index b1e162063..7397ebeae 100644 --- a/lib/common/session_model.dart +++ b/lib/common/session_model.dart @@ -347,10 +347,26 @@ class SessionModel extends Model { ); } + Future trackUserAction( + String name, + String url, + String title, + ) async { + return methodChannel.invokeMethod('trackUserAction', { + 'name': name, + 'url': url, + 'title': title, + }); + } + Future requestLinkCode() { return methodChannel .invokeMethod('requestLinkCode') - .then((value) => value as String); + .then((value) => value.toString()); + } + + Future redeemLinkCode() { + return methodChannel.invokeMethod('redeemLinkCode'); } Widget deviceLinkingCode(ValueWidgetBuilder builder) { @@ -368,7 +384,9 @@ class SessionModel extends Model { return methodChannel.invokeMethod('redeemResellerCode', { 'email': email, 'resellerCode': resellerCode, - }).then((value) => value as String); + }).then((value) { + print('value $value'); + }); } Future submitBitcoinPayment( @@ -383,9 +401,13 @@ class SessionModel extends Model { }).then((value) => value as String); } - Future submitGooglePlay(String planID) async { + Future submitPlayPayment( + String planID, + String email, + ) async { return methodChannel .invokeMethod('submitGooglePlayPayment', { + 'email': email, 'planID': planID, }).then((value) => value as String); } diff --git a/lib/common/single_value_subscriber.dart b/lib/common/single_value_subscriber.dart index cde00b827..ce5dc0717 100644 --- a/lib/common/single_value_subscriber.dart +++ b/lib/common/single_value_subscriber.dart @@ -12,7 +12,6 @@ class SubscribedSingleValueNotifier extends SubscribedNotifier { T Function(Uint8List serialized)? deserialize, }) : super(defaultValue, removeFromCache) { void onChanges(Map updates, Iterable deletions) { - var thePath = path; if (deletions.isNotEmpty) { value = null; } else { diff --git a/lib/common/ui/custom/dialog.dart b/lib/common/ui/custom/dialog.dart index 0ce00d864..9aaa7dbf1 100644 --- a/lib/common/ui/custom/dialog.dart +++ b/lib/common/ui/custom/dialog.dart @@ -93,6 +93,8 @@ class CDialog extends StatefulWidget { void close(BuildContext context) { closeOnce(() { + // See https://dart.dev/tools/linter-rules/use_build_context_synchronously + if (!context.mounted) return; Navigator.pop(context); }); } @@ -158,11 +160,11 @@ class CDialogState extends State { child: widget.description is Widget ? widget.description : CText( - widget.description as String, - style: tsBody1.copiedWith( - color: grey5, - ), - ), + widget.description as String, + style: tsBody1.copiedWith( + color: grey5, + ), + ), ), ), ), @@ -217,6 +219,8 @@ class CDialogState extends State { if (widget.dismissAction != null) { await widget.dismissAction!(); } + // See https://dart.dev/tools/linter-rules/use_build_context_synchronously + if (!context.mounted) return; widget.close(context); }, child: CText( @@ -231,11 +235,15 @@ class CDialogState extends State { onPressed: () async { if (widget.maybeAgreeAction != null) { if (await widget.maybeAgreeAction!(checkboxChecked)) { + // See https://dart.dev/tools/linter-rules/use_build_context_synchronously + if (!context.mounted) return; widget.close(context); } } else if (widget.agreeAction != null) { if ((widget.checkboxLabel == null || checkboxChecked) && await widget.agreeAction!()) { + // See https://dart.dev/tools/linter-rules/use_build_context_synchronously + if (!context.mounted) return; widget.close(context); } } else { diff --git a/lib/common/ui/custom/text_field.dart b/lib/common/ui/custom/text_field.dart index c6d881e5d..cc0a6a1f4 100644 --- a/lib/common/ui/custom/text_field.dart +++ b/lib/common/ui/custom/text_field.dart @@ -118,7 +118,7 @@ class _CTextFieldState extends State { // thumbVisibility: true, trackVisibility: true, child: Tooltip( - message: widget.tooltipMessage??'', + message: widget.tooltipMessage ?? '', child: TextFormField( key: fieldKey, autofocus: widget.autofocus!, @@ -190,7 +190,7 @@ class _CTextFieldState extends State { // There seems to be a problem with TextField and custom SVGs sizing so I had to size down manually widget.prefixIcon != null ? Transform.scale( - scale: 0.4, child: widget.prefixIcon) + scale: 0.5, child: widget.prefixIcon) : null, suffixIcon: renderSuffixRow(), // forcibly remove if removeBorder == true diff --git a/lib/common/ui/image_paths.dart b/lib/common/ui/image_paths.dart index df539d739..21bf0b1d6 100644 --- a/lib/common/ui/image_paths.dart +++ b/lib/common/ui/image_paths.dart @@ -103,6 +103,7 @@ class ImagePaths { static const mode_edit = 'assets/images/mode_edit.svg'; static const fullscreen_icon = 'assets/images/fullscreen_icon.svg'; static const newspaper = 'assets/images/newspaper.svg'; + static const searchApp = 'assets/images/search_app.svg'; // Commonly used static const arrow_down = 'assets/images/arrow_down.svg'; @@ -125,6 +126,7 @@ class ImagePaths { static const user = 'assets/images/user.svg'; static const image_inactive = 'assets/images/image_inactive.svg'; + // illustrations static const welcome_illustration = 'assets/images/welcome_illustration.svg'; static const introducing_illustration_bubble = diff --git a/lib/core/router/router.dart b/lib/core/router/router.dart index 69924f8bb..45aa263ff 100644 --- a/lib/core/router/router.dart +++ b/lib/core/router/router.dart @@ -133,6 +133,12 @@ class AppRouter extends $AppRouter { transitionsBuilder: defaultTransition, durationInMilliseconds: defaultTransitionMillis, reverseDurationInMilliseconds: defaultTransitionMillis), + CustomRoute( + page: PlayCheckout.page, + path: '/playcheckout', + transitionsBuilder: defaultTransition, + durationInMilliseconds: defaultTransitionMillis, + reverseDurationInMilliseconds: defaultTransitionMillis), CustomRoute( page: Checkout.page, path: '/checkout', diff --git a/lib/core/router/router.gr.dart b/lib/core/router/router.gr.dart index a7af9a6d8..6d078f41d 100644 --- a/lib/core/router/router.gr.dart +++ b/lib/core/router/router.gr.dart @@ -8,10 +8,10 @@ // coverage:ignore-file // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'dart:io' as _i45; +import 'dart:io' as _i46; -import 'package:auto_route/auto_route.dart' as _i41; -import 'package:flutter/cupertino.dart' as _i46; +import 'package:auto_route/auto_route.dart' as _i42; +import 'package:flutter/cupertino.dart' as _i47; import 'package:lantern/account/account.dart' as _i2; import 'package:lantern/account/account_management.dart' as _i1; import 'package:lantern/account/blocked_users.dart' as _i9; @@ -27,12 +27,12 @@ import 'package:lantern/account/device_linking/link_device.dart' as _i23; import 'package:lantern/account/invite_friends.dart' as _i20; import 'package:lantern/account/language.dart' as _i21; import 'package:lantern/account/lantern_desktop.dart' as _i22; -import 'package:lantern/account/recovery_key.dart' as _i26; -import 'package:lantern/account/report_issue.dart' as _i35; -import 'package:lantern/account/settings.dart' as _i37; -import 'package:lantern/account/split_tunneling.dart' as _i38; -import 'package:lantern/account/support.dart' as _i40; -import 'package:lantern/common/common.dart' as _i43; +import 'package:lantern/account/recovery_key.dart' as _i27; +import 'package:lantern/account/report_issue.dart' as _i36; +import 'package:lantern/account/settings.dart' as _i38; +import 'package:lantern/account/split_tunneling.dart' as _i39; +import 'package:lantern/account/support.dart' as _i41; +import 'package:lantern/common/common.dart' as _i44; import 'package:lantern/common/ui/app_webview.dart' as _i4; import 'package:lantern/common/ui/full_screen_dialog.dart' as _i16; import 'package:lantern/home.dart' as _i17; @@ -42,32 +42,33 @@ import 'package:lantern/messaging/contacts/new_chat.dart' as _i24; import 'package:lantern/messaging/conversation/conversation.dart' as _i15; import 'package:lantern/messaging/introductions/introduce.dart' as _i18; import 'package:lantern/messaging/introductions/introductions.dart' as _i19; -import 'package:lantern/messaging/messaging.dart' as _i42; +import 'package:lantern/messaging/messaging.dart' as _i43; import 'package:lantern/messaging/onboarding/chat_number_messaging.dart' as _i11; import 'package:lantern/messaging/onboarding/chat_number_recovery.dart' as _i12; import 'package:lantern/plans/checkout.dart' as _i13; import 'package:lantern/plans/plans.dart' as _i25; -import 'package:lantern/plans/reseller_checkout.dart' as _i36; -import 'package:lantern/plans/stripe_checkout.dart' as _i39; -import 'package:lantern/replica/common.dart' as _i44; -import 'package:lantern/replica/link_handler.dart' as _i29; -import 'package:lantern/replica/ui/viewers/audio.dart' as _i27; -import 'package:lantern/replica/ui/viewers/image.dart' as _i28; -import 'package:lantern/replica/ui/viewers/misc.dart' as _i30; -import 'package:lantern/replica/ui/viewers/video.dart' as _i34; -import 'package:lantern/replica/upload/description.dart' as _i31; -import 'package:lantern/replica/upload/review.dart' as _i32; -import 'package:lantern/replica/upload/title.dart' as _i33; - -abstract class $AppRouter extends _i41.RootStackRouter { +import 'package:lantern/plans/play_checkout.dart' as _i26; +import 'package:lantern/plans/reseller_checkout.dart' as _i37; +import 'package:lantern/plans/stripe_checkout.dart' as _i40; +import 'package:lantern/replica/common.dart' as _i45; +import 'package:lantern/replica/link_handler.dart' as _i30; +import 'package:lantern/replica/ui/viewers/audio.dart' as _i28; +import 'package:lantern/replica/ui/viewers/image.dart' as _i29; +import 'package:lantern/replica/ui/viewers/misc.dart' as _i31; +import 'package:lantern/replica/ui/viewers/video.dart' as _i35; +import 'package:lantern/replica/upload/description.dart' as _i32; +import 'package:lantern/replica/upload/review.dart' as _i33; +import 'package:lantern/replica/upload/title.dart' as _i34; + +abstract class $AppRouter extends _i42.RootStackRouter { $AppRouter({super.navigatorKey}); @override - final Map pagesMap = { + final Map pagesMap = { AccountManagement.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i1.AccountManagement( key: args.key, @@ -76,22 +77,20 @@ abstract class $AppRouter extends _i41.RootStackRouter { ); }, Account.name: (routeData) { - final args = - routeData.argsAs(orElse: () => const AccountArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i2.AccountMenu(key: args.key), + child: const _i2.AccountMenu(), ); }, AddViaChatNumber.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i3.AddViaChatNumber(), ); }, AppWebview.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i4.AppWebView( key: args.key, @@ -102,7 +101,7 @@ abstract class $AppRouter extends _i41.RootStackRouter { ApproveDevice.name: (routeData) { final args = routeData.argsAs( orElse: () => const ApproveDeviceArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i5.ApproveDevice(key: args.key), ); @@ -110,7 +109,7 @@ abstract class $AppRouter extends _i41.RootStackRouter { AuthorizePro.name: (routeData) { final args = routeData.argsAs( orElse: () => const AuthorizeProArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i6.AuthorizeDeviceForPro(key: args.key), ); @@ -118,48 +117,50 @@ abstract class $AppRouter extends _i41.RootStackRouter { AuthorizeDeviceEmail.name: (routeData) { final args = routeData.argsAs( orElse: () => const AuthorizeDeviceEmailArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i7.AuthorizeDeviceViaEmail(key: args.key), ); }, AuthorizeDeviceEmailPin.name: (routeData) { - final args = routeData.argsAs( - orElse: () => const AuthorizeDeviceEmailPinArgs()); - return _i41.AutoRoutePage( + final args = routeData.argsAs(); + return _i42.AutoRoutePage( routeData: routeData, - child: _i8.AuthorizeDeviceViaEmailPin(key: args.key), + child: _i8.AuthorizeDeviceViaEmailPin( + key: args.key, + email: args.email, + ), ); }, BlockedUsers.name: (routeData) { final args = routeData.argsAs( orElse: () => const BlockedUsersArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i9.BlockedUsers(key: args.key), ); }, ChatNumberAccount.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i10.ChatNumberAccount(), ); }, ChatNumberMessaging.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i11.ChatNumberMessaging(), ); }, ChatNumberRecovery.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i12.ChatNumberRecovery(), ); }, Checkout.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i13.Checkout( plan: args.plan, @@ -170,14 +171,14 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ContactInfo.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i14.ContactInfo(contact: args.contact), ); }, Conversation.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i15.Conversation( contactId: args.contactId, @@ -188,7 +189,7 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, FullScreenDialogPage.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i16.FullScreenDialog( widget: args.widget, @@ -197,14 +198,14 @@ abstract class $AppRouter extends _i41.RootStackRouter { ); }, Home.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: const _i17.HomePage(), ); }, Introduce.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i18.Introduce( singleIntro: args.singleIntro, @@ -213,13 +214,13 @@ abstract class $AppRouter extends _i41.RootStackRouter { ); }, Introductions.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i19.Introductions(), ); }, InviteFriends.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i20.InviteFriends(), ); @@ -227,13 +228,13 @@ abstract class $AppRouter extends _i41.RootStackRouter { Language.name: (routeData) { final args = routeData.argsAs(orElse: () => const LanguageArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i21.Language(key: args.key), ); }, LanternDesktop.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: const _i22.LanternDesktop(), ); @@ -241,36 +242,47 @@ abstract class $AppRouter extends _i41.RootStackRouter { LinkDevice.name: (routeData) { final args = routeData.argsAs( orElse: () => const LinkDeviceArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i23.LinkDevice(key: args.key), ); }, NewChat.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, child: _i24.NewChat(), ); }, PlansPage.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i25.PlansPage(), + child: const _i25.PlansPage(), + ); + }, + PlayCheckout.name: (routeData) { + final args = routeData.argsAs(); + return _i42.AutoRoutePage( + routeData: routeData, + child: _i26.PlayCheckout( + plan: args.plan, + isPro: args.isPro, + key: args.key, + ), ); }, RecoveryKey.name: (routeData) { final args = routeData.argsAs( orElse: () => const RecoveryKeyArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i26.RecoveryKey(key: args.key), + child: _i27.RecoveryKey(key: args.key), ); }, ReplicaAudioViewer.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i27.ReplicaAudioViewer( + child: _i28.ReplicaAudioViewer( replicaApi: args.replicaApi, item: args.item, category: args.category, @@ -279,9 +291,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaImageViewer.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i28.ReplicaImageViewer( + child: _i29.ReplicaImageViewer( replicaApi: args.replicaApi, item: args.item, category: args.category, @@ -290,9 +302,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaLinkHandler.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i29.ReplicaLinkHandler( + child: _i30.ReplicaLinkHandler( key: args.key, replicaApi: args.replicaApi, replicaLink: args.replicaLink, @@ -301,9 +313,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaMiscViewer.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i30.ReplicaMiscViewer( + child: _i31.ReplicaMiscViewer( replicaApi: args.replicaApi, item: args.item, category: args.category, @@ -312,9 +324,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaUploadDescription.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i31.ReplicaUploadDescription( + child: _i32.ReplicaUploadDescription( key: args.key, fileToUpload: args.fileToUpload, fileTitle: args.fileTitle, @@ -324,9 +336,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaUploadReview.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i32.ReplicaUploadReview( + child: _i33.ReplicaUploadReview( key: args.key, fileToUpload: args.fileToUpload, fileTitle: args.fileTitle, @@ -336,9 +348,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaUploadTitle.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i33.ReplicaUploadTitle( + child: _i34.ReplicaUploadTitle( key: args.key, fileToUpload: args.fileToUpload, fileTitle: args.fileTitle, @@ -348,9 +360,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { }, ReplicaVideoViewer.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i34.ReplicaVideoViewer( + child: _i35.ReplicaVideoViewer( replicaApi: args.replicaApi, item: args.item, category: args.category, @@ -360,16 +372,16 @@ abstract class $AppRouter extends _i41.RootStackRouter { ReportIssue.name: (routeData) { final args = routeData.argsAs( orElse: () => const ReportIssueArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i35.ReportIssue(key: args.key), + child: _i36.ReportIssue(key: args.key), ); }, ResellerCodeCheckout.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i36.ResellerCodeCheckout( + child: _i37.ResellerCodeCheckout( isPro: args.isPro, key: args.key, ), @@ -378,24 +390,24 @@ abstract class $AppRouter extends _i41.RootStackRouter { Settings.name: (routeData) { final args = routeData.argsAs(orElse: () => const SettingsArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i37.Settings(key: args.key), + child: _i38.Settings(key: args.key), ); }, SplitTunneling.name: (routeData) { final args = routeData.argsAs( orElse: () => const SplitTunnelingArgs()); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i38.SplitTunneling(key: args.key), + child: _i39.SplitTunneling(key: args.key), ); }, StripeCheckout.name: (routeData) { final args = routeData.argsAs(); - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: _i39.StripeCheckout( + child: _i40.StripeCheckout( plan: args.plan, email: args.email, refCode: args.refCode, @@ -405,9 +417,9 @@ abstract class $AppRouter extends _i41.RootStackRouter { ); }, Support.name: (routeData) { - return _i41.AutoRoutePage( + return _i42.AutoRoutePage( routeData: routeData, - child: const _i40.Support(), + child: const _i41.Support(), ); }, }; @@ -415,11 +427,11 @@ abstract class $AppRouter extends _i41.RootStackRouter { /// generated route for /// [_i1.AccountManagement] -class AccountManagement extends _i41.PageRouteInfo { +class AccountManagement extends _i42.PageRouteInfo { AccountManagement({ - _i42.Key? key, + _i43.Key? key, required bool isPro, - List<_i41.PageRouteInfo>? children, + List<_i42.PageRouteInfo>? children, }) : super( AccountManagement.name, args: AccountManagementArgs( @@ -431,8 +443,8 @@ class AccountManagement extends _i41.PageRouteInfo { static const String name = 'AccountManagement'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class AccountManagementArgs { @@ -441,7 +453,7 @@ class AccountManagementArgs { required this.isPro, }); - final _i42.Key? key; + final _i43.Key? key; final bool isPro; @@ -453,37 +465,22 @@ class AccountManagementArgs { /// generated route for /// [_i2.AccountMenu] -class Account extends _i41.PageRouteInfo { - Account({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, - }) : super( +class Account extends _i42.PageRouteInfo { + const Account({List<_i42.PageRouteInfo>? children}) + : super( Account.name, - args: AccountArgs(key: key), initialChildren: children, ); static const String name = 'Account'; - static const _i41.PageInfo page = - _i41.PageInfo(name); -} - -class AccountArgs { - const AccountArgs({this.key}); - - final _i43.Key? key; - - @override - String toString() { - return 'AccountArgs{key: $key}'; - } + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i3.AddViaChatNumber] -class AddViaChatNumber extends _i41.PageRouteInfo { - const AddViaChatNumber({List<_i41.PageRouteInfo>? children}) +class AddViaChatNumber extends _i42.PageRouteInfo { + const AddViaChatNumber({List<_i42.PageRouteInfo>? children}) : super( AddViaChatNumber.name, initialChildren: children, @@ -491,16 +488,16 @@ class AddViaChatNumber extends _i41.PageRouteInfo { static const String name = 'AddViaChatNumber'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i4.AppWebView] -class AppWebview extends _i41.PageRouteInfo { +class AppWebview extends _i42.PageRouteInfo { AppWebview({ - _i43.Key? key, + _i44.Key? key, required String url, - List<_i41.PageRouteInfo>? children, + List<_i42.PageRouteInfo>? children, }) : super( AppWebview.name, args: AppWebviewArgs( @@ -512,8 +509,8 @@ class AppWebview extends _i41.PageRouteInfo { static const String name = 'AppWebview'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class AppWebviewArgs { @@ -522,7 +519,7 @@ class AppWebviewArgs { required this.url, }); - final _i43.Key? key; + final _i44.Key? key; final String url; @@ -534,10 +531,10 @@ class AppWebviewArgs { /// generated route for /// [_i5.ApproveDevice] -class ApproveDevice extends _i41.PageRouteInfo { +class ApproveDevice extends _i42.PageRouteInfo { ApproveDevice({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( ApproveDevice.name, args: ApproveDeviceArgs(key: key), @@ -546,14 +543,14 @@ class ApproveDevice extends _i41.PageRouteInfo { static const String name = 'ApproveDevice'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ApproveDeviceArgs { const ApproveDeviceArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -563,10 +560,10 @@ class ApproveDeviceArgs { /// generated route for /// [_i6.AuthorizeDeviceForPro] -class AuthorizePro extends _i41.PageRouteInfo { +class AuthorizePro extends _i42.PageRouteInfo { AuthorizePro({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( AuthorizePro.name, args: AuthorizeProArgs(key: key), @@ -575,14 +572,14 @@ class AuthorizePro extends _i41.PageRouteInfo { static const String name = 'AuthorizePro'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class AuthorizeProArgs { const AuthorizeProArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -593,10 +590,10 @@ class AuthorizeProArgs { /// generated route for /// [_i7.AuthorizeDeviceViaEmail] class AuthorizeDeviceEmail - extends _i41.PageRouteInfo { + extends _i42.PageRouteInfo { AuthorizeDeviceEmail({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( AuthorizeDeviceEmail.name, args: AuthorizeDeviceEmailArgs(key: key), @@ -605,14 +602,14 @@ class AuthorizeDeviceEmail static const String name = 'AuthorizeDeviceEmail'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class AuthorizeDeviceEmailArgs { const AuthorizeDeviceEmailArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -623,39 +620,48 @@ class AuthorizeDeviceEmailArgs { /// generated route for /// [_i8.AuthorizeDeviceViaEmailPin] class AuthorizeDeviceEmailPin - extends _i41.PageRouteInfo { + extends _i42.PageRouteInfo { AuthorizeDeviceEmailPin({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + required String email, + List<_i42.PageRouteInfo>? children, }) : super( AuthorizeDeviceEmailPin.name, - args: AuthorizeDeviceEmailPinArgs(key: key), + args: AuthorizeDeviceEmailPinArgs( + key: key, + email: email, + ), initialChildren: children, ); static const String name = 'AuthorizeDeviceEmailPin'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class AuthorizeDeviceEmailPinArgs { - const AuthorizeDeviceEmailPinArgs({this.key}); + const AuthorizeDeviceEmailPinArgs({ + this.key, + required this.email, + }); - final _i43.Key? key; + final _i44.Key? key; + + final String email; @override String toString() { - return 'AuthorizeDeviceEmailPinArgs{key: $key}'; + return 'AuthorizeDeviceEmailPinArgs{key: $key, email: $email}'; } } /// generated route for /// [_i9.BlockedUsers] -class BlockedUsers extends _i41.PageRouteInfo { +class BlockedUsers extends _i42.PageRouteInfo { BlockedUsers({ - _i42.Key? key, - List<_i41.PageRouteInfo>? children, + _i43.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( BlockedUsers.name, args: BlockedUsersArgs(key: key), @@ -664,14 +670,14 @@ class BlockedUsers extends _i41.PageRouteInfo { static const String name = 'BlockedUsers'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class BlockedUsersArgs { const BlockedUsersArgs({this.key}); - final _i42.Key? key; + final _i43.Key? key; @override String toString() { @@ -681,8 +687,8 @@ class BlockedUsersArgs { /// generated route for /// [_i10.ChatNumberAccount] -class ChatNumberAccount extends _i41.PageRouteInfo { - const ChatNumberAccount({List<_i41.PageRouteInfo>? children}) +class ChatNumberAccount extends _i42.PageRouteInfo { + const ChatNumberAccount({List<_i42.PageRouteInfo>? children}) : super( ChatNumberAccount.name, initialChildren: children, @@ -690,13 +696,13 @@ class ChatNumberAccount extends _i41.PageRouteInfo { static const String name = 'ChatNumberAccount'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i11.ChatNumberMessaging] -class ChatNumberMessaging extends _i41.PageRouteInfo { - const ChatNumberMessaging({List<_i41.PageRouteInfo>? children}) +class ChatNumberMessaging extends _i42.PageRouteInfo { + const ChatNumberMessaging({List<_i42.PageRouteInfo>? children}) : super( ChatNumberMessaging.name, initialChildren: children, @@ -704,13 +710,13 @@ class ChatNumberMessaging extends _i41.PageRouteInfo { static const String name = 'ChatNumberMessaging'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i12.ChatNumberRecovery] -class ChatNumberRecovery extends _i41.PageRouteInfo { - const ChatNumberRecovery({List<_i41.PageRouteInfo>? children}) +class ChatNumberRecovery extends _i42.PageRouteInfo { + const ChatNumberRecovery({List<_i42.PageRouteInfo>? children}) : super( ChatNumberRecovery.name, initialChildren: children, @@ -718,17 +724,17 @@ class ChatNumberRecovery extends _i41.PageRouteInfo { static const String name = 'ChatNumberRecovery'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i13.Checkout] -class Checkout extends _i41.PageRouteInfo { +class Checkout extends _i42.PageRouteInfo { Checkout({ - required _i43.Plan plan, + required _i44.Plan plan, required bool isPro, - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( Checkout.name, args: CheckoutArgs( @@ -741,8 +747,8 @@ class Checkout extends _i41.PageRouteInfo { static const String name = 'Checkout'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class CheckoutArgs { @@ -752,11 +758,11 @@ class CheckoutArgs { this.key, }); - final _i43.Plan plan; + final _i44.Plan plan; final bool isPro; - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -766,10 +772,10 @@ class CheckoutArgs { /// generated route for /// [_i14.ContactInfo] -class ContactInfo extends _i41.PageRouteInfo { +class ContactInfo extends _i42.PageRouteInfo { ContactInfo({ - required _i42.Contact contact, - List<_i41.PageRouteInfo>? children, + required _i43.Contact contact, + List<_i42.PageRouteInfo>? children, }) : super( ContactInfo.name, args: ContactInfoArgs(contact: contact), @@ -778,14 +784,14 @@ class ContactInfo extends _i41.PageRouteInfo { static const String name = 'ContactInfo'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ContactInfoArgs { const ContactInfoArgs({required this.contact}); - final _i42.Contact contact; + final _i43.Contact contact; @override String toString() { @@ -795,12 +801,12 @@ class ContactInfoArgs { /// generated route for /// [_i15.Conversation] -class Conversation extends _i41.PageRouteInfo { +class Conversation extends _i42.PageRouteInfo { Conversation({ - required _i42.ContactId contactId, + required _i43.ContactId contactId, int? initialScrollIndex, bool showContactEditingDialog = false, - List<_i41.PageRouteInfo>? children, + List<_i42.PageRouteInfo>? children, }) : super( Conversation.name, args: ConversationArgs( @@ -813,8 +819,8 @@ class Conversation extends _i41.PageRouteInfo { static const String name = 'Conversation'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ConversationArgs { @@ -824,7 +830,7 @@ class ConversationArgs { this.showContactEditingDialog = false, }); - final _i42.ContactId contactId; + final _i43.ContactId contactId; final int? initialScrollIndex; @@ -839,11 +845,11 @@ class ConversationArgs { /// generated route for /// [_i16.FullScreenDialog] class FullScreenDialogPage - extends _i41.PageRouteInfo { + extends _i42.PageRouteInfo { FullScreenDialogPage({ - required _i43.Widget widget, - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + required _i44.Widget widget, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( FullScreenDialogPage.name, args: FullScreenDialogPageArgs( @@ -855,8 +861,8 @@ class FullScreenDialogPage static const String name = 'FullScreenDialogPage'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class FullScreenDialogPageArgs { @@ -865,9 +871,9 @@ class FullScreenDialogPageArgs { this.key, }); - final _i43.Widget widget; + final _i44.Widget widget; - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -877,8 +883,8 @@ class FullScreenDialogPageArgs { /// generated route for /// [_i17.HomePage] -class Home extends _i41.PageRouteInfo { - const Home({List<_i41.PageRouteInfo>? children}) +class Home extends _i42.PageRouteInfo { + const Home({List<_i42.PageRouteInfo>? children}) : super( Home.name, initialChildren: children, @@ -886,16 +892,16 @@ class Home extends _i41.PageRouteInfo { static const String name = 'Home'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i18.Introduce] -class Introduce extends _i41.PageRouteInfo { +class Introduce extends _i42.PageRouteInfo { Introduce({ required bool singleIntro, - _i42.Contact? contactToIntro, - List<_i41.PageRouteInfo>? children, + _i43.Contact? contactToIntro, + List<_i42.PageRouteInfo>? children, }) : super( Introduce.name, args: IntroduceArgs( @@ -907,8 +913,8 @@ class Introduce extends _i41.PageRouteInfo { static const String name = 'Introduce'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class IntroduceArgs { @@ -919,7 +925,7 @@ class IntroduceArgs { final bool singleIntro; - final _i42.Contact? contactToIntro; + final _i43.Contact? contactToIntro; @override String toString() { @@ -929,8 +935,8 @@ class IntroduceArgs { /// generated route for /// [_i19.Introductions] -class Introductions extends _i41.PageRouteInfo { - const Introductions({List<_i41.PageRouteInfo>? children}) +class Introductions extends _i42.PageRouteInfo { + const Introductions({List<_i42.PageRouteInfo>? children}) : super( Introductions.name, initialChildren: children, @@ -938,13 +944,13 @@ class Introductions extends _i41.PageRouteInfo { static const String name = 'Introductions'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i20.InviteFriends] -class InviteFriends extends _i41.PageRouteInfo { - const InviteFriends({List<_i41.PageRouteInfo>? children}) +class InviteFriends extends _i42.PageRouteInfo { + const InviteFriends({List<_i42.PageRouteInfo>? children}) : super( InviteFriends.name, initialChildren: children, @@ -952,15 +958,15 @@ class InviteFriends extends _i41.PageRouteInfo { static const String name = 'InviteFriends'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i21.Language] -class Language extends _i41.PageRouteInfo { +class Language extends _i42.PageRouteInfo { Language({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( Language.name, args: LanguageArgs(key: key), @@ -969,14 +975,14 @@ class Language extends _i41.PageRouteInfo { static const String name = 'Language'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class LanguageArgs { const LanguageArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -986,8 +992,8 @@ class LanguageArgs { /// generated route for /// [_i22.LanternDesktop] -class LanternDesktop extends _i41.PageRouteInfo { - const LanternDesktop({List<_i41.PageRouteInfo>? children}) +class LanternDesktop extends _i42.PageRouteInfo { + const LanternDesktop({List<_i42.PageRouteInfo>? children}) : super( LanternDesktop.name, initialChildren: children, @@ -995,15 +1001,15 @@ class LanternDesktop extends _i41.PageRouteInfo { static const String name = 'LanternDesktop'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i23.LinkDevice] -class LinkDevice extends _i41.PageRouteInfo { +class LinkDevice extends _i42.PageRouteInfo { LinkDevice({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( LinkDevice.name, args: LinkDeviceArgs(key: key), @@ -1012,14 +1018,14 @@ class LinkDevice extends _i41.PageRouteInfo { static const String name = 'LinkDevice'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class LinkDeviceArgs { const LinkDeviceArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -1029,8 +1035,8 @@ class LinkDeviceArgs { /// generated route for /// [_i24.NewChat] -class NewChat extends _i41.PageRouteInfo { - const NewChat({List<_i41.PageRouteInfo>? children}) +class NewChat extends _i42.PageRouteInfo { + const NewChat({List<_i42.PageRouteInfo>? children}) : super( NewChat.name, initialChildren: children, @@ -1038,13 +1044,13 @@ class NewChat extends _i41.PageRouteInfo { static const String name = 'NewChat'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for /// [_i25.PlansPage] -class PlansPage extends _i41.PageRouteInfo { - const PlansPage({List<_i41.PageRouteInfo>? children}) +class PlansPage extends _i42.PageRouteInfo { + const PlansPage({List<_i42.PageRouteInfo>? children}) : super( PlansPage.name, initialChildren: children, @@ -1052,15 +1058,58 @@ class PlansPage extends _i41.PageRouteInfo { static const String name = 'PlansPage'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } /// generated route for -/// [_i26.RecoveryKey] -class RecoveryKey extends _i41.PageRouteInfo { +/// [_i26.PlayCheckout] +class PlayCheckout extends _i42.PageRouteInfo { + PlayCheckout({ + required _i44.Plan plan, + required bool isPro, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, + }) : super( + PlayCheckout.name, + args: PlayCheckoutArgs( + plan: plan, + isPro: isPro, + key: key, + ), + initialChildren: children, + ); + + static const String name = 'PlayCheckout'; + + static const _i42.PageInfo page = + _i42.PageInfo(name); +} + +class PlayCheckoutArgs { + const PlayCheckoutArgs({ + required this.plan, + required this.isPro, + this.key, + }); + + final _i44.Plan plan; + + final bool isPro; + + final _i44.Key? key; + + @override + String toString() { + return 'PlayCheckoutArgs{plan: $plan, isPro: $isPro, key: $key}'; + } +} + +/// generated route for +/// [_i27.RecoveryKey] +class RecoveryKey extends _i42.PageRouteInfo { RecoveryKey({ - _i42.Key? key, - List<_i41.PageRouteInfo>? children, + _i43.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( RecoveryKey.name, args: RecoveryKeyArgs(key: key), @@ -1069,14 +1118,14 @@ class RecoveryKey extends _i41.PageRouteInfo { static const String name = 'RecoveryKey'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class RecoveryKeyArgs { const RecoveryKeyArgs({this.key}); - final _i42.Key? key; + final _i43.Key? key; @override String toString() { @@ -1085,13 +1134,13 @@ class RecoveryKeyArgs { } /// generated route for -/// [_i27.ReplicaAudioViewer] -class ReplicaAudioViewer extends _i41.PageRouteInfo { +/// [_i28.ReplicaAudioViewer] +class ReplicaAudioViewer extends _i42.PageRouteInfo { ReplicaAudioViewer({ - required _i44.ReplicaApi replicaApi, - required _i44.ReplicaSearchItem item, - required _i44.SearchCategory category, - List<_i41.PageRouteInfo>? children, + required _i45.ReplicaApi replicaApi, + required _i45.ReplicaSearchItem item, + required _i45.SearchCategory category, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaAudioViewer.name, args: ReplicaAudioViewerArgs( @@ -1104,8 +1153,8 @@ class ReplicaAudioViewer extends _i41.PageRouteInfo { static const String name = 'ReplicaAudioViewer'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaAudioViewerArgs { @@ -1115,11 +1164,11 @@ class ReplicaAudioViewerArgs { required this.category, }); - final _i44.ReplicaApi replicaApi; + final _i45.ReplicaApi replicaApi; - final _i44.ReplicaSearchItem item; + final _i45.ReplicaSearchItem item; - final _i44.SearchCategory category; + final _i45.SearchCategory category; @override String toString() { @@ -1128,13 +1177,13 @@ class ReplicaAudioViewerArgs { } /// generated route for -/// [_i28.ReplicaImageViewer] -class ReplicaImageViewer extends _i41.PageRouteInfo { +/// [_i29.ReplicaImageViewer] +class ReplicaImageViewer extends _i42.PageRouteInfo { ReplicaImageViewer({ - required _i44.ReplicaApi replicaApi, - required _i44.ReplicaSearchItem item, - required _i44.SearchCategory category, - List<_i41.PageRouteInfo>? children, + required _i45.ReplicaApi replicaApi, + required _i45.ReplicaSearchItem item, + required _i45.SearchCategory category, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaImageViewer.name, args: ReplicaImageViewerArgs( @@ -1147,8 +1196,8 @@ class ReplicaImageViewer extends _i41.PageRouteInfo { static const String name = 'ReplicaImageViewer'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaImageViewerArgs { @@ -1158,11 +1207,11 @@ class ReplicaImageViewerArgs { required this.category, }); - final _i44.ReplicaApi replicaApi; + final _i45.ReplicaApi replicaApi; - final _i44.ReplicaSearchItem item; + final _i45.ReplicaSearchItem item; - final _i44.SearchCategory category; + final _i45.SearchCategory category; @override String toString() { @@ -1171,13 +1220,13 @@ class ReplicaImageViewerArgs { } /// generated route for -/// [_i29.ReplicaLinkHandler] -class ReplicaLinkHandler extends _i41.PageRouteInfo { +/// [_i30.ReplicaLinkHandler] +class ReplicaLinkHandler extends _i42.PageRouteInfo { ReplicaLinkHandler({ - _i43.Key? key, - required _i44.ReplicaApi replicaApi, - required _i44.ReplicaLink replicaLink, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + required _i45.ReplicaApi replicaApi, + required _i45.ReplicaLink replicaLink, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaLinkHandler.name, args: ReplicaLinkHandlerArgs( @@ -1190,8 +1239,8 @@ class ReplicaLinkHandler extends _i41.PageRouteInfo { static const String name = 'ReplicaLinkHandler'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaLinkHandlerArgs { @@ -1201,11 +1250,11 @@ class ReplicaLinkHandlerArgs { required this.replicaLink, }); - final _i43.Key? key; + final _i44.Key? key; - final _i44.ReplicaApi replicaApi; + final _i45.ReplicaApi replicaApi; - final _i44.ReplicaLink replicaLink; + final _i45.ReplicaLink replicaLink; @override String toString() { @@ -1214,13 +1263,13 @@ class ReplicaLinkHandlerArgs { } /// generated route for -/// [_i30.ReplicaMiscViewer] -class ReplicaMiscViewer extends _i41.PageRouteInfo { +/// [_i31.ReplicaMiscViewer] +class ReplicaMiscViewer extends _i42.PageRouteInfo { ReplicaMiscViewer({ - required _i44.ReplicaApi replicaApi, - required _i44.ReplicaSearchItem item, - required _i44.SearchCategory category, - List<_i41.PageRouteInfo>? children, + required _i45.ReplicaApi replicaApi, + required _i45.ReplicaSearchItem item, + required _i45.SearchCategory category, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaMiscViewer.name, args: ReplicaMiscViewerArgs( @@ -1233,8 +1282,8 @@ class ReplicaMiscViewer extends _i41.PageRouteInfo { static const String name = 'ReplicaMiscViewer'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaMiscViewerArgs { @@ -1244,11 +1293,11 @@ class ReplicaMiscViewerArgs { required this.category, }); - final _i44.ReplicaApi replicaApi; + final _i45.ReplicaApi replicaApi; - final _i44.ReplicaSearchItem item; + final _i45.ReplicaSearchItem item; - final _i44.SearchCategory category; + final _i45.SearchCategory category; @override String toString() { @@ -1257,15 +1306,15 @@ class ReplicaMiscViewerArgs { } /// generated route for -/// [_i31.ReplicaUploadDescription] +/// [_i32.ReplicaUploadDescription] class ReplicaUploadDescription - extends _i41.PageRouteInfo { + extends _i42.PageRouteInfo { ReplicaUploadDescription({ - _i43.Key? key, - required _i45.File fileToUpload, + _i44.Key? key, + required _i46.File fileToUpload, required String fileTitle, String? fileDescription, - List<_i41.PageRouteInfo>? children, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaUploadDescription.name, args: ReplicaUploadDescriptionArgs( @@ -1279,8 +1328,8 @@ class ReplicaUploadDescription static const String name = 'ReplicaUploadDescription'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaUploadDescriptionArgs { @@ -1291,9 +1340,9 @@ class ReplicaUploadDescriptionArgs { this.fileDescription, }); - final _i43.Key? key; + final _i44.Key? key; - final _i45.File fileToUpload; + final _i46.File fileToUpload; final String fileTitle; @@ -1306,14 +1355,14 @@ class ReplicaUploadDescriptionArgs { } /// generated route for -/// [_i32.ReplicaUploadReview] -class ReplicaUploadReview extends _i41.PageRouteInfo { +/// [_i33.ReplicaUploadReview] +class ReplicaUploadReview extends _i42.PageRouteInfo { ReplicaUploadReview({ - _i43.Key? key, - required _i45.File fileToUpload, + _i44.Key? key, + required _i46.File fileToUpload, required String fileTitle, String? fileDescription, - List<_i41.PageRouteInfo>? children, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaUploadReview.name, args: ReplicaUploadReviewArgs( @@ -1327,8 +1376,8 @@ class ReplicaUploadReview extends _i41.PageRouteInfo { static const String name = 'ReplicaUploadReview'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaUploadReviewArgs { @@ -1339,9 +1388,9 @@ class ReplicaUploadReviewArgs { this.fileDescription, }); - final _i43.Key? key; + final _i44.Key? key; - final _i45.File fileToUpload; + final _i46.File fileToUpload; final String fileTitle; @@ -1354,14 +1403,14 @@ class ReplicaUploadReviewArgs { } /// generated route for -/// [_i33.ReplicaUploadTitle] -class ReplicaUploadTitle extends _i41.PageRouteInfo { +/// [_i34.ReplicaUploadTitle] +class ReplicaUploadTitle extends _i42.PageRouteInfo { ReplicaUploadTitle({ - _i43.Key? key, - required _i45.File fileToUpload, + _i44.Key? key, + required _i46.File fileToUpload, String? fileTitle, String? fileDescription, - List<_i41.PageRouteInfo>? children, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaUploadTitle.name, args: ReplicaUploadTitleArgs( @@ -1375,8 +1424,8 @@ class ReplicaUploadTitle extends _i41.PageRouteInfo { static const String name = 'ReplicaUploadTitle'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaUploadTitleArgs { @@ -1387,9 +1436,9 @@ class ReplicaUploadTitleArgs { this.fileDescription, }); - final _i43.Key? key; + final _i44.Key? key; - final _i45.File fileToUpload; + final _i46.File fileToUpload; final String? fileTitle; @@ -1402,13 +1451,13 @@ class ReplicaUploadTitleArgs { } /// generated route for -/// [_i34.ReplicaVideoViewer] -class ReplicaVideoViewer extends _i41.PageRouteInfo { +/// [_i35.ReplicaVideoViewer] +class ReplicaVideoViewer extends _i42.PageRouteInfo { ReplicaVideoViewer({ - required _i44.ReplicaApi replicaApi, - required _i44.ReplicaSearchItem item, - required _i44.SearchCategory category, - List<_i41.PageRouteInfo>? children, + required _i45.ReplicaApi replicaApi, + required _i45.ReplicaSearchItem item, + required _i45.SearchCategory category, + List<_i42.PageRouteInfo>? children, }) : super( ReplicaVideoViewer.name, args: ReplicaVideoViewerArgs( @@ -1421,8 +1470,8 @@ class ReplicaVideoViewer extends _i41.PageRouteInfo { static const String name = 'ReplicaVideoViewer'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReplicaVideoViewerArgs { @@ -1432,11 +1481,11 @@ class ReplicaVideoViewerArgs { required this.category, }); - final _i44.ReplicaApi replicaApi; + final _i45.ReplicaApi replicaApi; - final _i44.ReplicaSearchItem item; + final _i45.ReplicaSearchItem item; - final _i44.SearchCategory category; + final _i45.SearchCategory category; @override String toString() { @@ -1445,11 +1494,11 @@ class ReplicaVideoViewerArgs { } /// generated route for -/// [_i35.ReportIssue] -class ReportIssue extends _i41.PageRouteInfo { +/// [_i36.ReportIssue] +class ReportIssue extends _i42.PageRouteInfo { ReportIssue({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( ReportIssue.name, args: ReportIssueArgs(key: key), @@ -1458,14 +1507,14 @@ class ReportIssue extends _i41.PageRouteInfo { static const String name = 'ReportIssue'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ReportIssueArgs { const ReportIssueArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -1474,13 +1523,13 @@ class ReportIssueArgs { } /// generated route for -/// [_i36.ResellerCodeCheckout] +/// [_i37.ResellerCodeCheckout] class ResellerCodeCheckout - extends _i41.PageRouteInfo { + extends _i42.PageRouteInfo { ResellerCodeCheckout({ required bool isPro, - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( ResellerCodeCheckout.name, args: ResellerCodeCheckoutArgs( @@ -1492,8 +1541,8 @@ class ResellerCodeCheckout static const String name = 'ResellerCodeCheckout'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class ResellerCodeCheckoutArgs { @@ -1504,7 +1553,7 @@ class ResellerCodeCheckoutArgs { final bool isPro; - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -1513,11 +1562,11 @@ class ResellerCodeCheckoutArgs { } /// generated route for -/// [_i37.Settings] -class Settings extends _i41.PageRouteInfo { +/// [_i38.Settings] +class Settings extends _i42.PageRouteInfo { Settings({ - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( Settings.name, args: SettingsArgs(key: key), @@ -1526,14 +1575,14 @@ class Settings extends _i41.PageRouteInfo { static const String name = 'Settings'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class SettingsArgs { const SettingsArgs({this.key}); - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -1542,11 +1591,11 @@ class SettingsArgs { } /// generated route for -/// [_i38.SplitTunneling] -class SplitTunneling extends _i41.PageRouteInfo { +/// [_i39.SplitTunneling] +class SplitTunneling extends _i42.PageRouteInfo { SplitTunneling({ - _i46.Key? key, - List<_i41.PageRouteInfo>? children, + _i47.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( SplitTunneling.name, args: SplitTunnelingArgs(key: key), @@ -1555,14 +1604,14 @@ class SplitTunneling extends _i41.PageRouteInfo { static const String name = 'SplitTunneling'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class SplitTunnelingArgs { const SplitTunnelingArgs({this.key}); - final _i46.Key? key; + final _i47.Key? key; @override String toString() { @@ -1571,15 +1620,15 @@ class SplitTunnelingArgs { } /// generated route for -/// [_i39.StripeCheckout] -class StripeCheckout extends _i41.PageRouteInfo { +/// [_i40.StripeCheckout] +class StripeCheckout extends _i42.PageRouteInfo { StripeCheckout({ - required _i43.Plan plan, + required _i44.Plan plan, required String email, String? refCode, required bool isPro, - _i43.Key? key, - List<_i41.PageRouteInfo>? children, + _i44.Key? key, + List<_i42.PageRouteInfo>? children, }) : super( StripeCheckout.name, args: StripeCheckoutArgs( @@ -1594,8 +1643,8 @@ class StripeCheckout extends _i41.PageRouteInfo { static const String name = 'StripeCheckout'; - static const _i41.PageInfo page = - _i41.PageInfo(name); + static const _i42.PageInfo page = + _i42.PageInfo(name); } class StripeCheckoutArgs { @@ -1607,7 +1656,7 @@ class StripeCheckoutArgs { this.key, }); - final _i43.Plan plan; + final _i44.Plan plan; final String email; @@ -1615,7 +1664,7 @@ class StripeCheckoutArgs { final bool isPro; - final _i43.Key? key; + final _i44.Key? key; @override String toString() { @@ -1624,9 +1673,9 @@ class StripeCheckoutArgs { } /// generated route for -/// [_i40.Support] -class Support extends _i41.PageRouteInfo { - const Support({List<_i41.PageRouteInfo>? children}) +/// [_i41.Support] +class Support extends _i42.PageRouteInfo { + const Support({List<_i42.PageRouteInfo>? children}) : super( Support.name, initialChildren: children, @@ -1634,5 +1683,5 @@ class Support extends _i41.PageRouteInfo { static const String name = 'Support'; - static const _i41.PageInfo page = _i41.PageInfo(name); + static const _i42.PageInfo page = _i42.PageInfo(name); } diff --git a/lib/main.dart b/lib/main.dart index 55337f4eb..38a77d299 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,12 @@ +import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_driver/driver_extension.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:lantern/app.dart'; import 'package:lantern/common/common.dart'; import 'catcher_setup.dart'; +// IOS issue +// https://github.com/flutter/flutter/issues/133465 Future main() async { // CI will be true only when running appium test const String flavor = String.fromEnvironment('app.flavor'); @@ -14,6 +17,8 @@ Future main() async { } WidgetsFlutterBinding.ensureInitialized(); + // To load the .env file contents into dotenv. + await dotenv.load(fileName: "app.env"); await _initGoogleMobileAds(); await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); @@ -34,7 +39,7 @@ Future main() async { Future _initGoogleMobileAds() async { await MobileAds.instance.initialize(); await MobileAds.instance.setAppMuted(true); - // await MobileAds.instance.updateRequestConfiguration(RequestConfiguration(testDeviceIds: ['D79728264130CE0918737B5A2178D362'])); + // await MobileAds.instance.updateRequestConfiguration(RequestConfiguration(testDeviceIds: ['b7574600c8a2fa26a110699cc2ae83d3'])); // MobileAds.instance.openAdInspector((p0) { // print('ad error $p0'); // }); diff --git a/lib/plans/checkout.dart b/lib/plans/checkout.dart index a62109a64..8a4aef264 100644 --- a/lib/plans/checkout.dart +++ b/lib/plans/checkout.dart @@ -22,7 +22,6 @@ class Checkout extends StatefulWidget { class _CheckoutState extends State with SingleTickerProviderStateMixin { bool showMoreOptions = false; - final _formKey = GlobalKey(); final emailFieldKey = GlobalKey(); late final emailController = CustomTextEditingController( formKey: emailFieldKey, @@ -72,27 +71,6 @@ class _CheckoutState extends State super.dispose(); } - static void showError( - BuildContext context, { - Object? error, - StackTrace? stackTrace, - String description = '', - }) { - if (description.isEmpty) { - if (error is PlatformException) { - description = (error).message.toString().i18n; - } else { - description = error.toString(); - } - } - CDialog.showError( - context, - error: e, - stackTrace: stackTrace, - description: description, - ); - } - Widget options() => CInkWell( onTap: () { setState(() { @@ -136,47 +114,15 @@ class _CheckoutState extends State if (!showMoreOptions) break; } for (final provider in paymentMethod.value.providers) { - switch (provider.name) { - case 'stripe': - widgets.add( - PaymentProvider( - logoPaths: [ - ImagePaths.visa, - ImagePaths.mastercard, - ImagePaths.unionpay - ], - onChanged: () => selectPaymentProvider(Providers.stripe), - selectedPaymentProvider: selectedPaymentProvider!, - paymentType: Providers.stripe, - ), - ); - break; - case 'freekassa': - widgets.add( - PaymentProvider( - logoPaths: const [ - ImagePaths.mnp, - ImagePaths.qiwi, - ImagePaths.webMoney, - ImagePaths.bitcoin - ], - onChanged: () => selectPaymentProvider(Providers.freekassa), - selectedPaymentProvider: selectedPaymentProvider!, - paymentType: Providers.freekassa, - ), - ); - break; - case 'btcpay': - widgets.add( - PaymentProvider( - logoPaths: [ImagePaths.btc], - onChanged: () => selectPaymentProvider(Providers.btcpay), - selectedPaymentProvider: selectedPaymentProvider!, - paymentType: Providers.btcpay, - ), - ); - break; - } + widgets.add( + PaymentProvider( + logoPaths: provider.logoUrls, + onChanged: () => selectPaymentProvider(Providers.stripe), + selectedPaymentProvider: selectedPaymentProvider!, + paymentType: provider.name.toPaymentEnum(), + useNetwork: true, + ), + ); } } return widgets; @@ -217,7 +163,7 @@ class _CheckoutState extends State await sessionModel.openWebview(btcPayURL); }).onError((error, stackTrace) { context.loaderOverlay.hide(); - showError(context, error: e, stackTrace: stackTrace); + showError(context, error: error, stackTrace: stackTrace); }); break; case Providers.freekassa: @@ -240,164 +186,160 @@ class _CheckoutState extends State return BaseScreen( resizeToAvoidBottomInset: false, title: 'lantern_pro_checkout'.i18n, - body: sessionModel.countryCode((context, countryCode, child) { - defaultProviderIfNecessary(countryCode); - return sessionModel.paymentMethods( - builder: ( - context, - Iterable> paymentMethods, + body: sessionModel.paymentMethods( + builder: ( + context, + Iterable> paymentMethods, + Widget? child, + ) { + defaultProviderIfNecessary(paymentMethods.toList()); + return sessionModel.emailAddress(( + BuildContext context, + String emailAddress, Widget? child, ) { - return sessionModel.emailAddress(( - BuildContext context, - String emailAddress, - Widget? child, - ) { - return Container( - padding: const EdgeInsetsDirectional.only( - start: 16, - end: 16, - top: 24, - bottom: 32, - ), - child: Column( - children: [ - // * Step 2 - PlanStep( - stepNum: '2', - description: 'enter_email'.i18n, + return Container( + padding: const EdgeInsetsDirectional.only( + start: 16, + end: 16, + top: 24, + bottom: 32, + ), + child: Column( + children: [ + // * Step 2 + PlanStep( + stepNum: '2', + description: 'enter_email'.i18n, + ), + // * Email field + Container( + padding: const EdgeInsetsDirectional.only( + top: 8, + bottom: 8, ), - // * Email field - Container( + child: Form( + key: emailFieldKey, + child: CTextField( + initialValue: widget.isPro ? emailAddress : '', + controller: emailController, + autovalidateMode: widget.isPro + ? AutovalidateMode.always + : AutovalidateMode.disabled, + label: 'email'.i18n, + keyboardType: TextInputType.emailAddress, + prefixIcon: const CAssetImage(path: ImagePaths.email), + ), + ), + ), + // * Referral Code field - initially hidden + Visibility( + visible: isRefCodeFieldShowing, + child: Container( padding: const EdgeInsetsDirectional.only( top: 8, - bottom: 8, + bottom: 16, ), - child: Form( - key: emailFieldKey, - child: CTextField( - initialValue: widget.isPro ? emailAddress : '', - controller: emailController, - autovalidateMode: widget.isPro - ? AutovalidateMode.always - : AutovalidateMode.disabled, - label: 'email'.i18n, - keyboardType: TextInputType.emailAddress, - prefixIcon: - const CAssetImage(path: ImagePaths.email), - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Flexible( + flex: 2, + child: Form( + key: refCodeFieldKey, + child: CTextField( + controller: refCodeController, + autovalidateMode: AutovalidateMode.disabled, + textCapitalization: + TextCapitalization.characters, + label: 'referral_code'.i18n, + keyboardType: TextInputType.text, + prefixIcon: + const CAssetImage(path: ImagePaths.star), + ), + ), + ), + ], ), ), - // * Referral Code field - initially hidden - Visibility( - visible: isRefCodeFieldShowing, + ), + // * Add Referral code + Visibility( + visible: !isRefCodeFieldShowing, + child: GestureDetector( + onTap: () async => + setState(() => isRefCodeFieldShowing = true), child: Container( + width: MediaQuery.of(context).size.width, padding: const EdgeInsetsDirectional.only( top: 8, bottom: 16, ), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, children: [ - Flexible( - flex: 2, - child: Form( - key: refCodeFieldKey, - child: CTextField( - controller: refCodeController, - autovalidateMode: AutovalidateMode.disabled, - textCapitalization: - TextCapitalization.characters, - label: 'referral_code'.i18n, - keyboardType: TextInputType.text, - prefixIcon: const CAssetImage( - path: ImagePaths.star), - ), + const CAssetImage(path: ImagePaths.add), + Padding( + padding: const EdgeInsetsDirectional.only( + start: 8.0, + ), + child: CText( + 'add_referral_code'.i18n, + style: tsBody1, ), ), ], ), ), ), - // * Add Referral code - Visibility( - visible: !isRefCodeFieldShowing, - child: GestureDetector( - onTap: () async => - setState(() => isRefCodeFieldShowing = true), - child: Container( - width: MediaQuery.of(context).size.width, - padding: const EdgeInsetsDirectional.only( - top: 8, - bottom: 16, - ), - child: Row( - children: [ - const CAssetImage(path: ImagePaths.add), - Padding( - padding: const EdgeInsetsDirectional.only( - start: 8.0, - ), - child: CText( - 'add_referral_code'.i18n, - style: tsBody1, - ), - ), - ], - ), - ), - ), - ), - // * Step 3 - PlanStep( - stepNum: '3', - description: 'choose_payment_method'.i18n, - ), - //* Payment options - Container( - padding: const EdgeInsetsDirectional.only( - top: 16, bottom: 16), - width: MediaQuery.of(context).size.width, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: paymentOptions(paymentMethods), - ), + ), + // * Step 3 + PlanStep( + stepNum: '3', + description: 'choose_payment_method'.i18n, + ), + //* Payment options + Container( + padding: + const EdgeInsetsDirectional.only(top: 16, bottom: 16), + width: MediaQuery.of(context).size.width, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: paymentOptions(paymentMethods), ), - // * Price summary, unused pro time disclaimer, Continue button + ), + // * Price summary, unused pro time disclaimer, Continue button - Center( - child: Tooltip( - message: AppKeys.continueCheckout, - child: Button( - text: 'continue'.i18n, - disabled: emailController.value.text.isEmpty || - emailFieldKey.currentState?.validate() == - false || - refCodeFieldKey.currentState?.validate() == - false, - onPressed: onContinueTapped, - ), + Center( + child: Tooltip( + message: AppKeys.continueCheckout, + child: Button( + text: 'continue'.i18n, + disabled: emailController.value.text.isEmpty || + emailFieldKey.currentState?.validate() == false || + refCodeFieldKey.currentState?.validate() == false, + onPressed: onContinueTapped, ), ), - ], - ), - ); - }); - }, - ); - })); + ), + ], + ), + ); + }); + }, + )); } - void defaultProviderIfNecessary(String countryCode) { + void defaultProviderIfNecessary(List> list) { if (selectedPaymentProvider != null) { return; } - if (countryCode.toLowerCase() == 'ir') { - selectedPaymentProvider = Providers.freekassa; - } else { - selectedPaymentProvider = Providers.stripe; + if (list.isEmpty) { + return; } + //By default zero value is default + //If needed to change default value changing to from server + selectedPaymentProvider = list[0].value.providers[0].name.toPaymentEnum(); } void onContinueTapped() { @@ -411,7 +353,7 @@ class _CheckoutState extends State .onError((error, stackTrace) { showError( context, - error: e, + error: error, stackTrace: stackTrace, ); }), diff --git a/lib/plans/feature_list.dart b/lib/plans/feature_list.dart new file mode 100644 index 000000000..6b47cba9d --- /dev/null +++ b/lib/plans/feature_list.dart @@ -0,0 +1,48 @@ +import '../common/common.dart'; + +class FeatureList extends StatelessWidget { + FeatureList({super.key}); + + final featuresList = [ + 'unlimited_data'.i18n, + 'faster_data_centers'.i18n, + 'no_logs'.i18n, + 'connect_up_to_3_devices'.i18n, + 'no_ads'.i18n, + ]; + + @override + Widget build(BuildContext context) { + return Column( + children: featuresList + .map( + (feature) => Container( + padding: const EdgeInsetsDirectional.only( + start: 8, + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + const CAssetImage( + path: ImagePaths.check_green_large, + size: 24, + ), + Padding( + padding: const EdgeInsetsDirectional.only( + start: 4.0, + bottom: 4.0, + ), + child: CText( + feature, + textAlign: TextAlign.center, + style: tsBody1, + ), + ), + ], + ), + ), + ) + .toList()); + } +} diff --git a/lib/plans/payment_provider.dart b/lib/plans/payment_provider.dart index 8a17e9461..66d9b4947 100644 --- a/lib/plans/payment_provider.dart +++ b/lib/plans/payment_provider.dart @@ -1,12 +1,12 @@ import 'package:lantern/common/common.dart'; - -enum Providers { stripe, btcpay, freekassa } +import 'package:lantern/plans/utils.dart'; class PaymentProvider extends StatelessWidget { final List logoPaths; final Function onChanged; final Providers selectedPaymentProvider; final Providers paymentType; + final bool useNetwork; const PaymentProvider({ Key? key, @@ -14,6 +14,7 @@ class PaymentProvider extends StatelessWidget { required this.onChanged, required this.selectedPaymentProvider, required this.paymentType, + this.useNetwork = false, }) : super(key: key); BorderSide borderSide() => BorderSide( @@ -64,9 +65,11 @@ class PaymentProvider extends StatelessWidget { bottom: borderSide(), ), ), - child: CAssetImage( - path: p, - ), + child: useNetwork + ? SvgPicture.network(p) + : CAssetImage( + path: p, + ), )), ), Radio( diff --git a/lib/plans/plan_details.dart b/lib/plans/plan_details.dart index 51654359a..b9786bf9b 100644 --- a/lib/plans/plan_details.dart +++ b/lib/plans/plan_details.dart @@ -23,21 +23,14 @@ class PlanCard extends StatelessWidget { onTap: () async { final isPlayVersion = sessionModel.isPlayVersion.value ?? false; final inRussia = sessionModel.country.value == 'RU'; - // * Play version if (isPlayVersion && !inRussia) { - await sessionModel - .submitGooglePlay(planName) - .onError((error, stackTrace) { - // on failure - CDialog.showError( - context, - error: e, - stackTrace: stackTrace, - description: - (error as PlatformException).message ?? error.toString(), - ); - }); + await context.pushRoute( + PlayCheckout( + plan: plan, + isPro: isPro, + ), + ); } else { // * Proceed to our own Checkout await context.pushRoute( diff --git a/lib/plans/plans.dart b/lib/plans/plans.dart index 6ab9f3268..d6d1e5f01 100644 --- a/lib/plans/plans.dart +++ b/lib/plans/plans.dart @@ -1,16 +1,11 @@ import 'package:lantern/common/common.dart'; +import 'package:lantern/plans/feature_list.dart'; import 'package:lantern/plans/plan_details.dart'; -final featuresList = [ - 'unlimited_data'.i18n, - 'faster_data_centers'.i18n, - 'no_logs'.i18n, - 'connect_up_to_3_devices'.i18n, - 'no_ads'.i18n, -]; - @RoutePage(name: "PlansPage") class PlansPage extends StatelessWidget { + const PlansPage({super.key}); + @override Widget build(BuildContext context) { return FullScreenDialog( @@ -43,169 +38,131 @@ class PlansPage extends StatelessWidget { ), ); } - return StatefulBuilder( - builder: (context, setState) => Container( - color: white, - child: Column( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Expanded( - child: ListView( - shrinkWrap: true, - children: [ - Container( - padding: const EdgeInsetsDirectional.only( - top: 10, - bottom: 10, - start: 32, - end: 16, - ), - color: white, - child: Row( - children: [ - Container( - child: const CAssetImage( - path: ImagePaths.lantern_pro_logotype, - size: 20, - ), - ), - const Spacer(), - IconButton( - icon: mirrorLTR( - context: context, - child: CAssetImage( - path: ImagePaths.cancel, - color: black, - ), - ), - onPressed: () => Navigator.pop(context, null), - ), - ], - ), + return Container( + color: white, + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Expanded( + child: ListView( + shrinkWrap: true, + children: [ + Container( + padding: const EdgeInsetsDirectional.only( + top: 10, + bottom: 10, + start: 32, + end: 16, ), - Container( - color: white, - padding: const EdgeInsetsDirectional.only( - start: 24, - end: 24, - ), - child: Column( - children: [ - // * Renewal text or upsell - if (proUser && - plans.last.value.renewalText != '') - Padding( - padding: const EdgeInsetsDirectional.only( - bottom: 12.0, - ), - child: CText( - plans.last.value.renewalText, - style: tsBody1, - ), - ), - const Padding( - padding: EdgeInsetsDirectional.only( - bottom: 8.0, - ), - child: CDivider(), - ), - ...featuresList.map( - (feature) => Container( - padding: const EdgeInsetsDirectional.only( - start: 8, - ), - child: Row( - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - const CAssetImage( - path: ImagePaths.check_green_large, - size: 24, - ), - Padding( - padding: - const EdgeInsetsDirectional.only( - start: 4.0, - bottom: 4.0, - ), - child: CText( - feature, - textAlign: TextAlign.center, - style: tsBody1, - ), - ), - ], - ), + color: white, + child: Row( + children: [ + const CAssetImage( + path: ImagePaths.lantern_pro_logotype, + size: 20, + ), + const Spacer(), + IconButton( + icon: mirrorLTR( + context: context, + child: CAssetImage( + path: ImagePaths.cancel, + color: black, ), ), - const CDivider(height: 24), - ], - ), - ), - // * Step - Container( - color: white, - padding: const EdgeInsetsDirectional.only( - top: 16.0, - bottom: 16.0, - start: 32.0, - end: 32.0, - ), - child: Container( - margin: - const EdgeInsetsDirectional.only(start: 4.0), - child: PlanStep( - stepNum: '1', - description: 'choose_plan'.i18n, + onPressed: () => Navigator.pop(context, null), ), - ), + ], ), - // * Card - ...plans.toList().reversed.map( - (plan) => Container( - color: white, + ), + Container( + color: white, + padding: const EdgeInsetsDirectional.only( + start: 24, + end: 24, + ), + child: Column( + children: [ + // * Renewal text or upsell + if (proUser && plans.last.value.renewalText != '') + Padding( padding: const EdgeInsetsDirectional.only( - start: 32.0, - end: 32.0, + bottom: 12.0, ), - child: PlanCard( - plan: plan.value, - isPro: proUser, + child: CText( + plans.last.value.renewalText, + style: tsBody1, ), ), + const Padding( + padding: EdgeInsetsDirectional.only( + bottom: 8.0, + ), + child: CDivider(), ), - ], - ), - ), - // * Footer - Padding( - padding: const EdgeInsetsDirectional.only(top: 24.0), - child: Container( - height: 40, - alignment: Alignment.center, - width: MediaQuery.of(context).size.width, - decoration: BoxDecoration( - border: Border( - top: BorderSide(width: 1.0, color: grey3), + FeatureList(), + const CDivider(height: 24), + ], ), - color: grey1, ), - child: GestureDetector( - onTap: () async => await context.pushRoute( - ResellerCodeCheckout(isPro: proUser), + // * Step + Container( + color: white, + padding: const EdgeInsetsDirectional.only( + top: 16.0, + bottom: 16.0, + start: 32.0, + end: 32.0, ), - child: CText( - 'Have a Lantern Pro activation code? Click here.', - style: tsBody1.copiedWith(color: grey5), + child: Container( + margin: + const EdgeInsetsDirectional.only(start: 4.0), + child: PlanStep( + stepNum: '1', + description: 'choose_plan'.i18n, + ), ), - ), // Translations + ), + // * Card + ...plans.toList().reversed.map( + (plan) => Container( + color: white, + padding: const EdgeInsetsDirectional.only( + start: 32.0, + end: 32.0, + ), + child: PlanCard( + plan: plan.value, + isPro: proUser, + ), + ), + ), + ], + ), + ), + // * Footer + Container( + height: 45, + alignment: Alignment.center, + width: double.infinity, + decoration: BoxDecoration( + border: Border( + top: BorderSide(width: 1.0, color: grey3), ), + color: grey1, ), - ], - ), + child: GestureDetector( + onTap: () async => await context.pushRoute( + ResellerCodeCheckout(isPro: proUser), + ), + child: CText( + 'Have a Lantern Pro activation code? Click here.', + style: tsBody1.copiedWith(color: grey5), + ), + ), // Translations + ), + ], ), ); }, diff --git a/lib/plans/play_checkout.dart b/lib/plans/play_checkout.dart new file mode 100644 index 000000000..078f65629 --- /dev/null +++ b/lib/plans/play_checkout.dart @@ -0,0 +1,129 @@ +import 'package:email_validator/email_validator.dart'; +import 'package:lantern/common/common.dart'; +import 'package:lantern/plans/plan_details.dart'; +import 'package:lantern/plans/price_summary.dart'; +import 'package:lantern/plans/utils.dart'; + +@RoutePage(name: 'PlayCheckout') +class PlayCheckout extends StatefulWidget { + final Plan plan; + final bool isPro; + + PlayCheckout({ + required this.plan, + required this.isPro, + Key? key, + }) : super(key: key); + + @override + State createState() => _PlayCheckoutState(); +} + +class _PlayCheckoutState extends State + with SingleTickerProviderStateMixin { + final _formKey = GlobalKey(); + final emailFieldKey = GlobalKey(); + late final emailController = CustomTextEditingController( + formKey: emailFieldKey, + validator: (value) => EmailValidator.validate(value ?? '') + ? null + : 'please_enter_a_valid_email_address'.i18n, + ); + + @override + void dispose() { + emailController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return BaseScreen( + resizeToAvoidBottomInset: false, + title: 'lantern_pro_checkout'.i18n, + body: sessionModel.emailAddress(( + BuildContext context, + String emailAddress, + Widget? child, + ) { + return Container( + padding: const EdgeInsetsDirectional.only( + start: 16, + end: 16, + top: 24, + bottom: 32, + ), + child: Column( + children: [ + PlanStep( + stepNum: '2', + description: 'enter_email_to_complete_purchase'.i18n, + ), + Container( + padding: const EdgeInsetsDirectional.only( + top: 8, + bottom: 8, + ), + child: Form( + key: emailFieldKey, + child: CTextField( + initialValue: widget.isPro ? emailAddress : '', + controller: emailController, + autovalidateMode: widget.isPro + ? AutovalidateMode.always + : AutovalidateMode.disabled, + label: 'email'.i18n, + keyboardType: TextInputType.emailAddress, + prefixIcon: const CAssetImage(path: ImagePaths.email), + onChanged: (value) { + setState(() {}); + }, + ), + ), + ), + Flexible( + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + PriceSummary( + plan: widget.plan, + isPro: widget.isPro, + ), + Tooltip( + message: AppKeys.continueCheckout, + child: Button( + text: 'Complete Purchase'.i18n, + disabled: emailController.value.text.isEmpty, + onPressed: submitPayment, + ), + ) + ]), + ), + ], + ), + ); + })); + } + + void submitPayment() async { + try { + if (emailFieldKey.currentState?.validate() == false) { + showError(context, error: 'please_enter_a_valid_email_address'.i18n); + } else { + // Show the loader overlay at the beginning. + context.loaderOverlay.show(); + // Await the result of the payment submission. + await sessionModel.submitPlayPayment( + widget.plan.id, emailController.value.text); + // ignore: use_build_context_synchronously + context.loaderOverlay.hide(); + showSuccessDialog(context, widget.isPro); + } + } catch (error, stackTrace) { + // In case of an error, hide the loader and show the error message. + context.loaderOverlay.hide(); + showError(context, error: error, stackTrace: stackTrace); + } + } +} diff --git a/lib/plans/reseller_checkout.dart b/lib/plans/reseller_checkout.dart index 19d1ca04f..bce365548 100644 --- a/lib/plans/reseller_checkout.dart +++ b/lib/plans/reseller_checkout.dart @@ -152,40 +152,12 @@ class _ResellerCodeCheckoutState extends State { TOS(copy: copy), // * resellerCodeCheckout Button( - disabled: emailController.value.text.isEmpty || - emailFieldKey.currentState?.validate() == false || - resellerCodeFieldKey.currentState?.validate() == false, - text: copy, - onPressed: () async { - context.loaderOverlay.show(); - await sessionModel - .redeemResellerCode( - emailController.text, - resellerCodeController.text, - ) - .timeout( - defaultTimeoutDuration, - onTimeout: () => onAPIcallTimeout( - code: 'redeemresellerCodeTimeout', - message: 'reseller_timeout'.i18n, - ), - ) - .then((value) { - context.loaderOverlay.hide(); - showSuccessDialog(context, widget.isPro, true); - }).onError((error, stackTrace) { - context.loaderOverlay.hide(); - CDialog.showError( - context, - error: e, - stackTrace: stackTrace, - description: (error as PlatformException) - .message - .toString(), // This is coming localized - ); - }); - }, - ), + disabled: emailController.value.text.isEmpty || + emailFieldKey.currentState?.validate() == false || + resellerCodeFieldKey.currentState?.validate() == + false, + text: copy, + onPressed: onRegisterPro), ], ) ], @@ -194,4 +166,40 @@ class _ResellerCodeCheckoutState extends State { ); }); } + + Future onRegisterPro() async { + try { + context.loaderOverlay.show(); + await sessionModel.redeemResellerCode( + emailController.text, + resellerCodeController.text, + ); + context.loaderOverlay.hide(); + showSuccessDialog(context, widget.isPro, true); + } catch (error, stackTrace) { + context.loaderOverlay.hide(); + CDialog.showError( + context, + error: error, + stackTrace: stackTrace, + description: (error as PlatformException) + .message + .toString(), // This is coming localized + ); + } + + // .timeout( + // const Duration(seconds: 20), + // onTimeout: () => onAPIcallTimeout( + // code: 'redeemresellerCodeTimeout', + // message: 'reseller_timeout'.i18n, + // ), + // ) + // .then((value) { + // context.loaderOverlay.hide(); + // showSuccessDialog(context, widget.isPro, true); + // }).onError((error, stackTrace) { + // + // }); + } } diff --git a/lib/plans/stripe_checkout.dart b/lib/plans/stripe_checkout.dart index ce6b89102..fc76ab649 100644 --- a/lib/plans/stripe_checkout.dart +++ b/lib/plans/stripe_checkout.dart @@ -1,37 +1,11 @@ import 'package:credit_card_validator/credit_card_validator.dart'; +import 'package:flutter_multi_formatter/flutter_multi_formatter.dart'; import 'package:lantern/common/common.dart'; import 'package:lantern/plans/plan_details.dart'; import 'package:lantern/plans/price_summary.dart'; import 'package:lantern/plans/tos.dart'; import 'package:lantern/plans/utils.dart'; -class CardExpirationFormatter extends TextInputFormatter { - @override - TextEditingValue formatEditUpdate( - TextEditingValue oldValue, - TextEditingValue value, - ) { - final newValue = value.text; - var formattedValue = ''; - - for (var i = 0; i < newValue.length; i++) { - if (newValue[i] != '/') formattedValue += newValue[i]; - var index = i + 1; - if (index % 2 == 0 && - index != newValue.length && - !(formattedValue.contains(RegExp(r'\/')))) { - formattedValue += '/'; - } - } - return value.copyWith( - text: formattedValue, - selection: TextSelection.fromPosition( - TextPosition(offset: formattedValue.length), - ), - ); - } -} - @RoutePage(name: 'StripeCheckout') class StripeCheckout extends StatefulWidget { final Plan plan; @@ -87,12 +61,6 @@ class _StripeCheckoutState extends State { var formIsValid = false; - @override - void initState() { - WidgetsFlutterBinding.ensureInitialized(); - super.initState(); - } - @override void dispose() { creditCardController.dispose(); @@ -110,36 +78,28 @@ class _StripeCheckoutState extends State { } Future onCheckoutButtonTap() async { - context.loaderOverlay.show(); - await sessionModel - .submitStripePayment( - widget.plan.id, - widget.email, - creditCardController.text, - expDateController.text, - cvcFieldController.text, - ) - .timeout( - const Duration(seconds: 10), - onTimeout: () => onAPIcallTimeout( - code: 'submitStripeTimeout', - message: 'stripe_timeout'.i18n, - ), - ) - .then((value) async { + try { + context.loaderOverlay.show(widget: spinner); + await sessionModel.submitStripePayment( + widget.plan.id, + widget.email, + creditCardController.text, + expDateController.text, + cvcFieldController.text, + ); context.loaderOverlay.hide(); showSuccessDialog(context, widget.isPro); - }).onError((error, stackTrace) { + } catch (error, stackTrace) { context.loaderOverlay.hide(); CDialog.showError( context, - error: e, + error: error, stackTrace: stackTrace, description: (error as PlatformException) .message .toString(), // This is coming localized ); - }); + } } @override @@ -177,11 +137,12 @@ class _StripeCheckoutState extends State { child: CTextField( tooltipMessage: AppKeys.cardNumberKey, controller: creditCardController, - autovalidateMode: AutovalidateMode.disabled, + // autovalidateMode: AutovalidateMode.disabled, label: 'card_number'.i18n, keyboardType: TextInputType.number, maxLines: 1, prefixIcon: const CAssetImage(path: ImagePaths.credit_card), + inputFormatters: [CreditCardNumberInputFormatter()], ), ), // * Credit card month and expiration @@ -194,11 +155,7 @@ class _StripeCheckoutState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ //* Expiration - Container( - width: 144, - padding: const EdgeInsetsDirectional.only( - end: 16, - ), + Expanded( child: CTextField( tooltipMessage: AppKeys.mmYYKey, maxLines: 1, @@ -206,15 +163,15 @@ class _StripeCheckoutState extends State { controller: expDateController, autovalidateMode: AutovalidateMode.disabled, label: 'card_expiration'.i18n, - inputFormatters: [CardExpirationFormatter()], + inputFormatters: [CreditCardExpirationDateFormatter()], keyboardType: TextInputType.datetime, prefixIcon: const CAssetImage(path: ImagePaths.calendar), ), ), + const SizedBox(width: 45), //* CVV - Container( - width: 144, + Expanded( child: CTextField( tooltipMessage: AppKeys.cvcKey, maxLines: 1, diff --git a/lib/plans/tos.dart b/lib/plans/tos.dart index 86df2c984..51b6067bb 100644 --- a/lib/plans/tos.dart +++ b/lib/plans/tos.dart @@ -11,29 +11,15 @@ class TOS extends StatelessWidget { @override Widget build(BuildContext context) { - const href = 'https://s3.amazonaws.com/lantern/Lantern-TOS.pdf'; return GestureDetector( - onTap: () async { - if (await canLaunch(href)) { - CDialog( - title: 'open_url'.i18n, - description: 'are_you_sure_you_want_to_open'.i18n.fill([href]), - agreeText: 'continue'.i18n, - agreeAction: () async { - await launch(href); - return true; - }, - ).show(context); - } - ; - }, + onTap: () => onUrlTap(context), child: Container( padding: const EdgeInsetsDirectional.only(bottom: 24.0), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ CText( - 'by_clicking_tos'.i18n.fill([copy]), + "${'by_clicking_tos'.i18n.fill([copy])} ", style: tsOverline, ), CText( @@ -47,4 +33,19 @@ class TOS extends StatelessWidget { ), ); } + + Future onUrlTap(BuildContext context) async { + const href = 'https://s3.amazonaws.com/lantern/Lantern-TOS.pdf'; + if (await canLaunchUrl(Uri.parse(href))) { + CDialog( + title: 'open_url'.i18n, + description: 'are_you_sure_you_want_to_open'.i18n.fill([href]), + agreeText: 'continue'.i18n, + agreeAction: () async { + await launchUrl(Uri.parse(href)); + return true; + }, + ).show(context); + } + } } diff --git a/lib/plans/utils.dart b/lib/plans/utils.dart index 204213adf..8757d0bb3 100644 --- a/lib/plans/utils.dart +++ b/lib/plans/utils.dart @@ -14,6 +14,27 @@ void onAPIcallTimeout({code, message}) { ); } +void showError( + BuildContext context, { + Object? error, + StackTrace? stackTrace, + String description = '', +}) { + if (description.isEmpty) { + if (error is PlatformException) { + description = (error).message.toString().i18n; + } else { + description = error.toString(); + } + } + CDialog.showError( + context, + error: error, + stackTrace: stackTrace, + description: description, + ); +} + void showSuccessDialog(BuildContext context, bool isPro, [bool? isReseller]) { String description, title; if (isReseller != null && isReseller) { @@ -33,8 +54,25 @@ void showSuccessDialog(BuildContext context, bool isPro, [bool? isReseller]) { description: description, actionLabel: 'continue_to_pro'.i18n, agreeAction: () async { - await context.pushRoute(Home()); + // Note: whatever page you need to popUtil + // it will pop that page + context.router.popUntil((route) => route.settings.name == PlansPage.name); return true; }, ); } + +enum Providers { stripe, btcpay, freekassa } + +extension ProviderExtension on String { + Providers toPaymentEnum() { + if (this == "stripe") { + return Providers.stripe; + } + if (this == "freekassa") { + return Providers.freekassa; + } + + return Providers.btcpay; + } +} diff --git a/lib/replica/logic/api.dart b/lib/replica/logic/api.dart index aa7759eb9..5fab42da1 100644 --- a/lib/replica/logic/api.dart +++ b/lib/replica/logic/api.dart @@ -61,11 +61,12 @@ class ReplicaApi { break; } logger.v('_search(): uri: ${Uri.parse(s)}'); - final resp = await dio.get(s); if (resp.statusCode == 200) { logger .v('Statuscode: ${resp.statusCode} || body: ${resp.data.toString()}'); + sessionModel.trackUserAction( + 'User searched for Replica content', s, 'search'); return ReplicaSearchItem.fromJson(category, resp.data); } else { logger.e( diff --git a/lib/replica/logic/uploader.dart b/lib/replica/logic/uploader.dart index a0013621a..43d4d961f 100644 --- a/lib/replica/logic/uploader.dart +++ b/lib/replica/logic/uploader.dart @@ -60,6 +60,8 @@ class ReplicaUploader { method: UploadMethod.POST, ), ); + sessionModel.trackUserAction( + 'User uploaded Replica content', uploadUrl, fileTitle); } // TODO <08-10-22, kalli> Figure out how to query endpoint with infohash (for rendering preview after uploading a file) diff --git a/lib/replica/ui/viewers/layout.dart b/lib/replica/ui/viewers/layout.dart index 1fd54a841..6069ade21 100644 --- a/lib/replica/ui/viewers/layout.dart +++ b/lib/replica/ui/viewers/layout.dart @@ -54,6 +54,8 @@ abstract class ReplicaViewerLayoutState extends State { : 'empty_description'.i18n; infoCreationDate = value.infoCreationDate; }); + sessionModel.trackUserAction('User viewed Replica content', + widget.item.replicaLink.toMagnetLink(), infoTitle); }).onError((error, stackTrace) { logger.v('Could not fetch object_info: $error , $stackTrace'); setState(() { diff --git a/lib/vpn/protos_shared/vpn.pb.dart b/lib/vpn/protos_shared/vpn.pb.dart index f64f79410..f63c4e507 100644 --- a/lib/vpn/protos_shared/vpn.pb.dart +++ b/lib/vpn/protos_shared/vpn.pb.dart @@ -571,11 +571,15 @@ class Plan extends $pb.GeneratedMessage { class PaymentProviders extends $pb.GeneratedMessage { factory PaymentProviders({ $core.String? name, + $core.Iterable<$core.String>? logoUrls, }) { final $result = create(); if (name != null) { $result.name = name; } + if (logoUrls != null) { + $result.logoUrls.addAll(logoUrls); + } return $result; } PaymentProviders._() : super(); @@ -584,6 +588,7 @@ class PaymentProviders extends $pb.GeneratedMessage { static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PaymentProviders', createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'name') + ..pPS(2, _omitFieldNames ? '' : 'logoUrls', protoName: 'logoUrls') ..hasRequiredFields = false ; @@ -616,6 +621,9 @@ class PaymentProviders extends $pb.GeneratedMessage { $core.bool hasName() => $_has(0); @$pb.TagNumber(1) void clearName() => clearField(1); + + @$pb.TagNumber(2) + $core.List<$core.String> get logoUrls => $_getList(1); } class PaymentMethod extends $pb.GeneratedMessage { diff --git a/lib/vpn/protos_shared/vpn.pbjson.dart b/lib/vpn/protos_shared/vpn.pbjson.dart index 4a4fd740b..090990722 100644 --- a/lib/vpn/protos_shared/vpn.pbjson.dart +++ b/lib/vpn/protos_shared/vpn.pbjson.dart @@ -133,12 +133,14 @@ const PaymentProviders$json = { '1': 'PaymentProviders', '2': [ {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'}, + {'1': 'logoUrls', '3': 2, '4': 3, '5': 9, '10': 'logoUrls'}, ], }; /// Descriptor for `PaymentProviders`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List paymentProvidersDescriptor = $convert.base64Decode( - 'ChBQYXltZW50UHJvdmlkZXJzEhIKBG5hbWUYASABKAlSBG5hbWU='); + 'ChBQYXltZW50UHJvdmlkZXJzEhIKBG5hbWUYASABKAlSBG5hbWUSGgoIbG9nb1VybHMYAiADKA' + 'lSCGxvZ29Vcmxz'); @$core.Deprecated('Use paymentMethodDescriptor instead') const PaymentMethod$json = { diff --git a/lib/vpn/vpn_model.dart b/lib/vpn/vpn_model.dart index f5a0d2add..d1704a939 100644 --- a/lib/vpn/vpn_model.dart +++ b/lib/vpn/vpn_model.dart @@ -11,6 +11,14 @@ class VpnModel extends Model { }); } + //This method will create artificial delay in connecting VPN + // So we can show ads to user + Future connectingDelay(bool on) async { + return methodChannel.invokeMethod('connectingDelay', { + 'on': on, + }); + } + Widget vpnStatus(ValueWidgetBuilder builder) { return subscribedSingleValueBuilder( '/vpn_status', @@ -19,7 +27,7 @@ class VpnModel extends Model { } Future isVpnConnected() async { - final vpnStatus = await methodChannel.invokeMethod('get', '/vpn_status'); + final vpnStatus = await methodChannel.invokeMethod('getVpnStatus'); return vpnStatus == 'connected'; } diff --git a/lib/vpn/vpn_switch.dart b/lib/vpn/vpn_switch.dart index 9f906e107..9ac23b8f5 100644 --- a/lib/vpn/vpn_switch.dart +++ b/lib/vpn/vpn_switch.dart @@ -1,3 +1,4 @@ +import 'package:lantern/ad_helper.dart'; import 'package:lantern/vpn/vpn.dart'; class VPNSwitch extends StatefulWidget { @@ -8,20 +9,24 @@ class VPNSwitch extends StatefulWidget { } class _VPNSwitchState extends State { - // final adHelper = AdHelper(); - - @override - void initState() { - super.initState(); - // adHelper.loadAds(); - } + final adHelper = AdHelper(); bool isIdle(String vpnStatus) => vpnStatus != 'connecting' && vpnStatus != 'disconnecting'; - Future onSwitchTap(bool newValue, String vpnStatus) async { + Future onSwitchTap( + bool newValue, String vpnStatus, bool userHasPermission) async { unawaited(HapticFeedback.lightImpact()); + // Make sure user has permission all the permission + // if ads is not ready then wait for at least 5 seconds and then show ads + // if ads is ready then show ads immediately + if (vpnStatus != 'connected' && userHasPermission) { + if (!await adHelper.isAdsReadyToShow()) { + await vpnModel.connectingDelay(newValue); + await Future.delayed(const Duration(seconds: 5)); + } + } if (isIdle(vpnStatus)) { await vpnModel.switchVPN(newValue); } @@ -31,7 +36,7 @@ class _VPNSwitchState extends State { Future.delayed( const Duration(seconds: 1), () async { - // await adHelper.showAds(); + await adHelper.showAds(); }, ); } @@ -39,37 +44,25 @@ class _VPNSwitchState extends State { @override Widget build(BuildContext context) { - // Still working on ads feature - return Transform.scale( - scale: 2, - child: vpnModel - .vpnStatus((BuildContext context, String vpnStatus, Widget? child) { - return FlutterSwitch( - value: vpnStatus == 'connected' || vpnStatus == 'disconnecting', - activeColor: onSwitchColor, - inactiveColor: offSwitchColor, - onToggle: (bool newValue) => onSwitchTap(newValue, vpnStatus), - ); - }), - ); - // return sessionModel - // .shouldShowGoogleAds((context, isGoogleAdsEnable, child) { - // return sessionModel.shouldShowCASAds((context, isCasAdsEnable, child) { - // // adHelper.loadAds( - // // shouldShowGoogleAds: isGoogleAdsEnable, - // // shouldShowCASAds: isCasAdsEnable); - // return Transform.scale( - // scale: 2, - // child: vpnModel.vpnStatus( - // (BuildContext context, String vpnStatus, Widget? child) { - // return FlutterSwitch( - // value: vpnStatus == 'connected' || vpnStatus == 'disconnecting', - // activeColor: onSwitchColor, - // inactiveColor: offSwitchColor, - // onToggle: (bool newValue) => onSwitchTap(newValue, vpnStatus), - // ); - // })); - // }); - // }); + return sessionModel + .shouldShowGoogleAds((context, isGoogleAdsEnable, child) { + return sessionModel.shouldShowCASAds((context, isCasAdsEnable, child) { + adHelper.loadAds( + shouldShowGoogleAds: isGoogleAdsEnable, + shouldShowCASAds: isCasAdsEnable); + return Transform.scale( + scale: 2, + child: vpnModel.vpnStatus( + (BuildContext context, String vpnStatus, Widget? child) { + return FlutterSwitch( + value: + vpnStatus == 'connected' || vpnStatus == 'disconnecting', + activeColor: onSwitchColor, + inactiveColor: offSwitchColor, + onToggle: (bool newValue) => onSwitchTap(newValue, vpnStatus, + (isGoogleAdsEnable || isCasAdsEnable))); + })); + }); + }); } } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..60e4cb424 --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,27 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) audioplayers_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "AudioplayersLinuxPlugin"); + audioplayers_linux_plugin_register_with_registrar(audioplayers_linux_registrar); + g_autoptr(FlPluginRegistrar) emoji_picker_flutter_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "EmojiPickerFlutterPlugin"); + emoji_picker_flutter_plugin_register_with_registrar(emoji_picker_flutter_registrar); + g_autoptr(FlPluginRegistrar) sentry_flutter_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin"); + sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..e0f0a47bc --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 000000000..dd33dbf77 --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,27 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + audioplayers_linux + emoji_picker_flutter + sentry_flutter + url_launcher_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/protos_shared/vpn.proto b/protos_shared/vpn.proto index c6d3a7bdc..f890bbb1b 100644 --- a/protos_shared/vpn.proto +++ b/protos_shared/vpn.proto @@ -47,6 +47,7 @@ message Plan { message PaymentProviders { string name = 1; + repeated string logoUrls = 2; } message PaymentMethod { diff --git a/pubspec.lock b/pubspec.lock index b5747190d..3dd36b06f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,58 +37,58 @@ packages: dependency: "direct main" description: name: audioplayers - sha256: "8e94499b5c123df14cf17c16639de5ff3373e57e537f727e367487fbb7491363" + sha256: c05c6147124cd63e725e861335a8b4d57300b80e6e92cea7c145c739223bbaef url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.2.1" audioplayers_android: dependency: transitive description: name: audioplayers_android - sha256: "1c12b60cc10a3b8617ca3f88b927e7e03768f470d9b4f747efd3d58a8a07ee1b" + sha256: b00e1a0e11365d88576320ec2d8c192bc21f1afb6c0e5995d1c57ae63156acb5 url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.3" audioplayers_darwin: dependency: transitive description: name: audioplayers_darwin - sha256: "2fb6133ffcf28fb3f9d3e11f8a3ef190e5fedb2b7b95ea865b56a21d1163e670" + sha256: "3034e99a6df8d101da0f5082dcca0a2a99db62ab1d4ddb3277bed3f6f81afe08" url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.0.2" audioplayers_linux: dependency: transitive description: name: audioplayers_linux - sha256: cca3f272c7186dd2e0025b8864e1413ac5e081d74b17e28b02ceb2df4c110235 + sha256: "60787e73fefc4d2e0b9c02c69885402177e818e4e27ef087074cf27c02246c9e" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" audioplayers_platform_interface: dependency: transitive description: name: audioplayers_platform_interface - sha256: "47eae55e99ced11589998cf27e4eaabf5b475a7bd8bea7516ee6c2536a2e1abf" + sha256: "365c547f1bb9e77d94dd1687903a668d8f7ac3409e48e6e6a3668a1ac2982adb" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "6.1.0" audioplayers_web: dependency: transitive description: name: audioplayers_web - sha256: "9f155590c6ba9ba469df637f4729264e4234dc3941ece4690dad63ffac19b5af" + sha256: "22cd0173e54d92bd9b2c80b1204eb1eb159ece87475ab58c9788a70ec43c2a62" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" audioplayers_windows: dependency: transitive description: name: audioplayers_windows - sha256: "8813b712ba919bb324bde5e3ba97edc81bface945953a54a3dea70b5608bcc70" + sha256: "9536812c9103563644ada2ef45ae523806b0745f7a78e89d1b5fb1951de90e1a" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" auto_route: dependency: "direct main" description: @@ -121,6 +121,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + base58check: + dependency: transitive + description: + name: base58check + sha256: "6c300dfc33e598d2fe26319e13f6243fea81eaf8204cb4c6b69ef20a625319a5" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + bech32: + dependency: transitive + description: + name: bech32 + sha256: "156cbace936f7720c79a79d16a03efad343b1ef17106716e04b8b8e39f99f7f7" + url: "https://pub.dev" + source: hosted + version: "0.2.2" boolean_selector: dependency: transitive description: @@ -241,6 +257,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + clever_ads_solutions: + dependency: "direct main" + description: + name: clever_ads_solutions + sha256: "2e5ad684a2c105ffd296cf47c19c589e2385854fc9674810834776deec62d19e" + url: "https://pub.dev" + source: hosted + version: "0.2.4" clock: dependency: transitive description: @@ -277,10 +301,10 @@ packages: dependency: transitive description: name: coverage - sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76" url: "https://pub.dev" source: hosted - version: "1.6.3" + version: "1.7.2" credit_card_type_detector: dependency: transitive description: @@ -329,6 +353,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" + dartz: + dependency: transitive + description: + name: dartz + sha256: e6acf34ad2e31b1eb00948692468c30ab48ac8250e0f0df661e29f12dd252168 + url: "https://pub.dev" + source: hosted + version: "0.10.1" dbus: dependency: transitive description: @@ -421,10 +453,10 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" file_picker: dependency: "direct main" description: @@ -470,6 +502,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.1" + flutter_dotenv: + dependency: "direct main" + description: + name: flutter_dotenv + sha256: "9357883bdd153ab78cbf9ffa07656e336b8bbb2b5a3ca596b0b27e119f7c7d77" + url: "https://pub.dev" + source: hosted + version: "5.1.0" flutter_driver: dependency: "direct dev" description: flutter @@ -592,6 +632,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.17+1" + flutter_multi_formatter: + dependency: "direct main" + description: + name: flutter_multi_formatter + sha256: "4798b3ee8a3c00271565e77dc8886f02b52354c3ac0d845e07d1715d159959f6" + url: "https://pub.dev" + source: hosted + version: "2.12.4" flutter_pdfview: dependency: "direct main" description: @@ -691,10 +739,10 @@ packages: dependency: "direct main" description: name: google_mobile_ads - sha256: "24ee4e9546866cc15ebe565dabf6a6c485ce5fbec0645fde22799800532000f0" + sha256: d2ef5ec1e1f31137fc241bdeab3037c31062d387dd221fd884fb1160444c788b url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" graphs: dependency: transitive description: @@ -796,6 +844,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -848,26 +920,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: "direct main" description: @@ -936,10 +1008,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_drawing: dependency: transitive description: @@ -1064,10 +1136,10 @@ packages: dependency: transitive description: name: platform - sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: @@ -1088,10 +1160,10 @@ packages: dependency: transitive description: name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "5.0.2" protobuf: dependency: "direct main" description: @@ -1148,6 +1220,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.0" + retry: + dependency: "direct main" + description: + name: retry + sha256: "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc" + url: "https://pub.dev" + source: hosted + version: "3.1.2" rxdart: dependency: transitive description: @@ -1168,18 +1248,18 @@ packages: dependency: transitive description: name: sentry - sha256: "830667eadc0398fea3a3424ed1b74568e2db603a42758d0922e2f2974ce55a60" + sha256: a7946f4a90b0feb47214981d881b98149e05f6c576da9f2a2f33945bf561de25 url: "https://pub.dev" source: hosted - version: "7.10.1" + version: "7.16.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "6730f41b304c6fb0fa590dacccaf73ba11082fc64b274cfe8a79776f2b95309c" + sha256: "6db7fa1b076faf2f5dd77d8cc9ef206171f32a290cc638842d78e5d62b441a27" url: "https://pub.dev" source: hosted - version: "7.10.1" + version: "7.16.0" share_plus: dependency: "direct main" description: @@ -1224,18 +1304,18 @@ packages: dependency: transitive description: name: shared_preferences_linux - sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa" + sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: fb5cf25c0235df2d0640ac1b1174f6466bd311f621574997ac59018a6664548d + sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" shared_preferences_web: dependency: transitive description: @@ -1248,10 +1328,10 @@ packages: dependency: transitive description: name: shared_preferences_windows - sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173" + sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.2" shelf: dependency: transitive description: @@ -1633,22 +1713,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.3" - visibility_detector: - dependency: transitive - description: - name: visibility_detector - sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d" - url: "https://pub.dev" - source: hosted - version: "0.3.3" vm_service: dependency: transitive description: name: vm_service - sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "11.10.0" + version: "13.0.0" wakelock: dependency: "direct main" description: @@ -1697,14 +1769,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 - url: "https://pub.dev" - source: hosted - version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1717,10 +1781,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webkit_inspection_protocol: dependency: transitive description: @@ -1781,10 +1845,10 @@ packages: dependency: transitive description: name: xdg_directories - sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86 + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "0.2.0+3" + version: "1.0.4" xml: dependency: transitive description: @@ -1810,5 +1874,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 832fdb2b4..97ef1fba7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: #Loogs and crash reporting catcher_2: ^1.0.0 - sentry_flutter: ^7.10.1 + sentry_flutter: ^7.16.0 badges: ^3.1.1 dotted_border: ^2.0.0+3 @@ -54,9 +54,10 @@ dependencies: wakelock: ^0.6.2 email_validator: ^2.1.17 credit_card_validator: ^2.1.0 + flutter_multi_formatter: ^2.12.4 # Media & File handling - audioplayers: ^5.1.0 + audioplayers: ^5.2.1 video_player: ^2.7.0 video_thumbnail: ^0.5.3 file_picker: ^5.3.3 @@ -92,7 +93,7 @@ dependencies: url_launcher: ^6.1.12 share_plus: ^7.1.0 flutter_inappwebview: ^6.0.0-beta.25 - + flutter_dotenv: ^5.1.0 # Notifications & Logging @@ -113,8 +114,9 @@ dependencies: flutter_markdown: ^0.6.17+1 # Ads - google_mobile_ads: ^3.0.0 - # clever_ads_solutions: ^0.1.0 + google_mobile_ads: ^4.0.0 + clever_ads_solutions: ^0.2.4 + retry: ^3.1.2 # wakelock ^0.6.2 requires win32 ^2.0.0 or ^3.0.0 @@ -163,6 +165,7 @@ flutter: - assets/locales/ - assets/fonts/ - assets/sounds/ + - app.env # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware.