-
Notifications
You must be signed in to change notification settings - Fork 462
fix(clerk-js): fail fast when the origin is slow at load #9065
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
nikosdouvlis
wants to merge
1
commit into
main
Choose a base branch
from
nikos/plat-2754-clerkjs-resiliency
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.
+222
−12
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| '@clerk/clerk-js': patch | ||
| '@clerk/shared': patch | ||
| --- | ||
|
|
||
| Fail fast when the Clerk Frontend API (FAPI) is slow or unreachable during load. The client request and the load-recovery token mint are now bounded by a timeout, so a cold `Clerk.load()` renders identity from the session cookie in seconds instead of hanging while retries run. Adds a `timeLimit` utility to `@clerk/shared/utils`. |
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
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,44 @@ | ||
| import { describe, expect, it, vi } from 'vitest'; | ||
|
|
||
| import { timeLimit } from '../timeLimit'; | ||
|
|
||
| describe('timeLimit', () => { | ||
| it('resolves with the value when the promise settles before ms', async () => { | ||
| await expect(timeLimit(Promise.resolve('token'), 10_000)).resolves.toBe('token'); | ||
| }); | ||
|
|
||
| it('resolves cleanly when the value is a non-promise (e.g. undefined)', async () => { | ||
| await expect(timeLimit(undefined, 10_000)).resolves.toBeUndefined(); | ||
| }); | ||
|
|
||
| it('rejects with a plain Error (no status) when ms elapses first', async () => { | ||
| vi.useFakeTimers(); | ||
| try { | ||
| const neverSettles = new Promise<string>(() => {}); | ||
| const result = timeLimit(neverSettles, 50).catch(error => error); | ||
|
|
||
| await vi.advanceTimersByTimeAsync(50); | ||
|
|
||
| const error = await result; | ||
| expect(error).toBeInstanceOf(Error); | ||
| expect((error as { status?: unknown }).status).toBeUndefined(); | ||
| } finally { | ||
| vi.useRealTimers(); | ||
| } | ||
| }); | ||
|
|
||
| it('clears the timeout when the value settles first, leaving no pending timer', async () => { | ||
| vi.useFakeTimers(); | ||
| const clearSpy = vi.spyOn(globalThis, 'clearTimeout'); | ||
| try { | ||
| await timeLimit(Promise.resolve('fast'), 10_000); | ||
|
|
||
| expect(clearSpy).toHaveBeenCalled(); | ||
|
|
||
| await vi.advanceTimersByTimeAsync(10_000); | ||
| } finally { | ||
| clearSpy.mockRestore(); | ||
| vi.useRealTimers(); | ||
| } | ||
| }); | ||
| }); |
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,14 @@ | ||
| export function timeLimit<T>(value: T | PromiseLike<T>, ms: number): Promise<T> { | ||
| let timeoutId: ReturnType<typeof setTimeout>; | ||
|
|
||
| const timeoutPromise = new Promise<never>((_, reject) => { | ||
| timeoutId = setTimeout(() => reject(new Error(`Timed out after ${ms}ms`)), ms); | ||
|
|
||
| // Let a Node process exit while the timeout is still pending; browsers return a number with no unref. | ||
| (timeoutId as { unref?: () => void }).unref?.(); | ||
| }); | ||
|
|
||
| return Promise.race([Promise.resolve(value), timeoutPromise]).finally(() => { | ||
| clearTimeout(timeoutId); | ||
| }); | ||
| } |
Oops, something went wrong.
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.
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.
🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win
Make
pumpUntilSettledfail instead of hanging.If
load()never settles, the loop exits after 20 advances and the finalawait trackedstill waits forever under fake timers. Throw once the budget is exhausted so CI gets a deterministic failure instead of a stuck test.Suggested fail-fast guard
const pumpUntilSettled = async (promise: Promise<unknown>) => { let settled = false; const tracked = promise.then( v => ((settled = true), v), e => ((settled = true), Promise.reject(e)), ); for (let i = 0; i < 20 && !settled; i++) { await vi.advanceTimersByTimeAsync(5000); } + if (!settled) { + throw new Error('Timed out waiting for Clerk.load() to settle in test'); + } await tracked; };📝 Committable suggestion
🤖 Prompt for AI Agents