-
Notifications
You must be signed in to change notification settings - Fork 33
fix: add 30s request timeout to withSpinner to prevent hanging CLI commands #237
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bukinoshita
wants to merge
6
commits into
main
Choose a base branch
from
fix/spinner-request-timeout-839b
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6d98a55
fix: add 30s request timeout to withSpinner to prevent hanging CLI co…
cursoragent b1f6996
Merge branch 'main' into fix/spinner-request-timeout-839b
bukinoshita 60eff6c
fix: test
bukinoshita 29f3535
Merge branch 'main' into fix/spinner-request-timeout-839b
felipefreitag d867564
Merge branch 'main' into fix/spinner-request-timeout-839b
felipefreitag 4403b49
fix: use `it` instead of `test` in spinner timeout test
felipefreitag File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| const REQUEST_TIMEOUT_MS = 30_000; | ||
|
|
||
| const withTimeout = <T>(promise: Promise<T>, ms: number): Promise<T> => | ||
| new Promise<T>((resolve, reject) => { | ||
| const timer = setTimeout(() => { | ||
| reject(new Error(`Request timed out after ${ms / 1000}s`)); | ||
| }, ms); | ||
| timer.unref(); | ||
| promise.then( | ||
| (val) => { | ||
| clearTimeout(timer); | ||
| resolve(val); | ||
| }, | ||
| (err) => { | ||
| clearTimeout(timer); | ||
| reject(err); | ||
| }, | ||
| ); | ||
| }); | ||
|
|
||
| export { REQUEST_TIMEOUT_MS, withTimeout }; |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { describe, expect, it } from 'vitest'; | ||
| import { withTimeout } from '../../src/lib/with-timeout'; | ||
|
|
||
| describe('withTimeout', () => { | ||
| it('resolves when the promise completes before the deadline', async () => { | ||
| const result = await withTimeout(Promise.resolve(42), 1000); | ||
| expect(result).toBe(42); | ||
| }); | ||
|
|
||
| it('rejects when the promise exceeds the deadline', async () => { | ||
| const slow = new Promise<string>((resolve) => | ||
| setTimeout(() => resolve('late'), 5000), | ||
| ); | ||
| await expect(withTimeout(slow, 50)).rejects.toThrow( | ||
| 'Request timed out after 0.05s', | ||
| ); | ||
| }); | ||
|
|
||
| it('forwards the original rejection when the promise fails before the deadline', async () => { | ||
| const failing = Promise.reject(new Error('boom')); | ||
| await expect(withTimeout(failing, 1000)).rejects.toThrow('boom'); | ||
| }); | ||
| }); |
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P1: Timeout handling does not cancel the underlying SDK request, so timed-out commands may still complete remotely.
Prompt for AI agents