-
Notifications
You must be signed in to change notification settings - Fork 926
Fix startup chat history recovery for Issue #816 #821
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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,79 @@ | ||
| import type { GatewayStatus } from '@/types/gateway'; | ||
|
|
||
| export const CHAT_HISTORY_RPC_TIMEOUT_MS = 35_000; | ||
| export const CHAT_HISTORY_STARTUP_RETRY_DELAYS_MS = [600] as const; | ||
| export const CHAT_HISTORY_STARTUP_CONNECTION_GRACE_MS = 15_000; | ||
| export const CHAT_HISTORY_STARTUP_RUNNING_WINDOW_MS = | ||
| CHAT_HISTORY_RPC_TIMEOUT_MS + CHAT_HISTORY_STARTUP_CONNECTION_GRACE_MS; | ||
| export const CHAT_HISTORY_DEFAULT_LOADING_SAFETY_TIMEOUT_MS = 15_000; | ||
| export const CHAT_HISTORY_LOADING_SAFETY_TIMEOUT_MS = | ||
| CHAT_HISTORY_RPC_TIMEOUT_MS * (CHAT_HISTORY_STARTUP_RETRY_DELAYS_MS.length + 1) | ||
| + CHAT_HISTORY_STARTUP_RETRY_DELAYS_MS.reduce((sum, delay) => sum + delay, 0) | ||
| + 2_000; | ||
|
|
||
| export type HistoryRetryErrorKind = 'timeout' | 'gateway_unavailable'; | ||
|
|
||
| export function classifyHistoryStartupRetryError(error: unknown): HistoryRetryErrorKind | null { | ||
| const message = String(error).toLowerCase(); | ||
|
|
||
| if ( | ||
| message.includes('rpc timeout: chat.history') | ||
| || message.includes('gateway rpc timeout: chat.history') | ||
| || message.includes('gateway ws timeout: chat.history') | ||
| || message.includes('request timed out') | ||
| ) { | ||
| return 'timeout'; | ||
| } | ||
|
|
||
| if ( | ||
| message.includes('gateway not connected') | ||
| || message.includes('gateway socket is not connected') | ||
| || message.includes('gateway is unavailable') | ||
| || message.includes('service channel unavailable') | ||
| || message.includes('websocket closed before handshake') | ||
| || message.includes('connect handshake timeout') | ||
| || message.includes('gateway ws connect timeout') | ||
| || message.includes('gateway connection closed') | ||
| ) { | ||
| return 'gateway_unavailable'; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| export function shouldRetryStartupHistoryLoad( | ||
| gatewayStatus: GatewayStatus | undefined, | ||
| errorKind: HistoryRetryErrorKind | null, | ||
| ): boolean { | ||
| if (!gatewayStatus || !errorKind) return false; | ||
|
|
||
| if (gatewayStatus.state === 'starting') { | ||
| return true; | ||
| } | ||
|
|
||
| if (gatewayStatus.state !== 'running') { | ||
| return false; | ||
| } | ||
|
|
||
| if (gatewayStatus.connectedAt == null) { | ||
| return true; | ||
| } | ||
|
|
||
| return Date.now() - gatewayStatus.connectedAt <= CHAT_HISTORY_STARTUP_RUNNING_WINDOW_MS; | ||
ashione marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| export async function sleep(ms: number): Promise<void> { | ||
| await new Promise((resolve) => setTimeout(resolve, ms)); | ||
| } | ||
|
|
||
| export function getStartupHistoryTimeoutOverride( | ||
| isInitialForegroundLoad: boolean, | ||
| ): number | undefined { | ||
| return isInitialForegroundLoad ? CHAT_HISTORY_RPC_TIMEOUT_MS : undefined; | ||
| } | ||
|
|
||
| export function getHistoryLoadingSafetyTimeout(isInitialForegroundLoad: boolean): number { | ||
| return isInitialForegroundLoad | ||
| ? CHAT_HISTORY_LOADING_SAFETY_TIMEOUT_MS | ||
| : CHAT_HISTORY_DEFAULT_LOADING_SAFETY_TIMEOUT_MS; | ||
| } | ||
Oops, something went wrong.
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.
isInitialForegroundLoadis keyed only by whether this session has ever been foreground-loaded, so a session opened much later in a long-running app still gets startup settings (35_000RPC timeout and the extended loading safety timeout) even when gateway startup has long passed. Because retry eligibility is separately gated byconnectedAt, this can produce the worst of both worlds for late session switches: no retry, but a much longer stall before surfacing failure ifchat.historyhangs. Please gate the startup timeout path on gateway startup recency as well (not just per-session first foreground load).Useful? React with 👍 / 👎.