scan: support scanning built-in vpn-gate remotes without a directory - #3
Merged
Conversation
When scan/all are invoked with no directory, materialize every built-in config for the chosen provider + proto into builtin_dir/<provider>/<proto>/ and scan that directory. Adds --provider (default vpn-gate) and --proto (udp|tcp, default udp) to ScanArgs, shared by scan and all via flattening. Geo lookup skips the filename heuristic for built-in paths so a generated file name is never mis-parsed as a country code; country is always resolved from the remote host for built-ins.
codewiththiha
added a commit
that referenced
this pull request
Aug 4, 2026
- #1 builtin identity: BuiltinConfig::from_path + display_name centralize the path-layout parse; export_name and recent route through them (3 inline file_stem parses deleted) - #2 scan pipeline: scan::scan_pipeline shared by scan and all; all.rs keeps only the connect half; report format unified - #3 retry budget: pure RetryBudget type drives the retry/drop rules; ConnectService::run consults it instead of inline counters - #4 settings persist: persist_scan/persist_connect live beside the resolvers in UserSettings; command-layer apply helpers deleted - #5 process teardown: OpenVpnHandle owns kill_graceful; kill_handle deleted; the kill registry becomes a per-session ProcessRegistry threaded through spawn sites (hides the global, fixes cross-test killing) - #6a/6b: journal_mode moves to db::pool; ScanProgress reports deltas Flaky custom_retry_count test fixed (per-session registry + 30s handshake timeout); full suite now stable across repeated runs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Wires the
builtinmodule into scan/discovery:scan/allwith no directory materializes the selected provider's built-in remotes into~/.config/vmate-cli/builtin/<provider>/<proto>/and scans them; explicit directories scan normally.--provider(defaultvpn-gate) and--proto(udp|tcp, defaultudp) flags onscan/all.Follow-up to #1 (builtin module).