refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
Conversation
Split tryDoOAuth() into focused helpers: - startOAuthCallbackServer(): HTTP server setup + port scanning - waitForOAuthCallback(): 120s timeout + extended wait + escape-key - exchangeOAuthCode(): authorization code → access token exchange tryDoOAuth() is now a 45-line orchestrator that delegates to each. Agent: complexity-hunter Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
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.
Why:
tryDoOAuth()was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.Changes
Split
tryDoOAuth()inpackages/cli/src/digitalocean/digitalocean.tsinto 3 focused helpers:startOAuthCallbackServer(csrfState)— StartsBun.serveon localhost, scanning ports 5190-5199. Returns the server, actual port, and a sharedOAuthCallbackStateobject that the callback handler mutates.waitForOAuthCallback(cbState, server)— Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome:"code" | "denied" | "manual" | "timeout".exchangeOAuthCode(code, redirectUri)— POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.tryDoOAuth()is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.Verification
bunx @biomejs/biome check src/— 0 errors (193 files)bun test— 2106 pass, 2 fail (same 2 pre-existing failures on main)digitalocean*.test.ts) — 9 pass, 0 fail-- spawn-refactor/complexity-hunter