refactor(server): extract shared relay-await and sandbox-scan helpers#1495
Merged
TaylorMutch merged 1 commit intoMay 21, 2026
Merged
Conversation
Replace three copy-pasted relay stream await match blocks in sandbox.rs with a single await_relay_stream() helper that handles timeout, drop, and error cases uniformly, varying only the log context string. Replace three copy-pasted paginated sandbox scan loops in provider.rs with a generic scan_sandboxes() helper that accepts a closure for the per-sandbox predicate and projection, eliminating the duplicated pagination arithmetic and decode boilerplate. No behavior changes; all existing tests pass.
ericcurtin
requested review from
a team,
derekwaynecarr,
maxamillion and
mrunalp
as code owners
Collaborator
|
/ok to test 774eb6a |
TaylorMutch
approved these changes
May 21, 2026
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
2 participants
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.
Summary
Removes two sets of copy-pasted code in
openshell-server:matchblocks (one per gRPC streaming handler) replaced by a singleawait_relay_stream()helper insandbox.rs.scan_sandboxes()helper inprovider.rsthat takes a closure for the per-sandbox predicate/projection.Related Issue
N/A — housekeeping refactor.
Changes
grpc/sandbox.rs: addawait_relay_stream<T>()helper; replace the match blocks inhandle_exec_sandbox,handle_forward_tcp, andhandle_exec_sandbox_interactivegrpc/provider.rs: addscan_sandboxes<T, F>()helper; rewritesandboxes_using_provider,sandboxes_using_provider_records, andsandboxes_using_profileto use itTesting
mise run pre-commitpassesChecklist