-
Notifications
You must be signed in to change notification settings - Fork 904
Update chat client handling #1381
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
6 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
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
This file was deleted.
Oops, something went wrong.
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,53 @@ | ||
| const FRIENDLY_MESSAGES: Record<number, string> = { | ||
| 401: "Your session has expired. Please sign in again.", | ||
| 403: "You don't have permission to access this chat.", | ||
| 404: "Chat session not found. It may have been deleted.", | ||
| 429: "Too many requests. Please wait a moment and try again.", | ||
| 500: "Something went wrong on our end. Please try again.", | ||
| 502: "Chat server is temporarily unavailable. Please try again.", | ||
| 503: "Chat server is temporarily unavailable. Please try again.", | ||
| }; | ||
|
|
||
| const NETWORK_MESSAGE = | ||
| "Unable to connect to the chat server. Check your internet connection."; | ||
|
|
||
| export class StreamError extends Error { | ||
| readonly status: number; | ||
| readonly friendlyMessage: string; | ||
|
|
||
| constructor(status: number, detail?: string) { | ||
| const friendly = | ||
| FRIENDLY_MESSAGES[status] ?? `Unexpected error (${status})`; | ||
| super(detail ?? friendly); | ||
| this.name = "StreamError"; | ||
| this.status = status; | ||
| this.friendlyMessage = friendly; | ||
| } | ||
|
|
||
| static fromResponse(response: Response): StreamError { | ||
| return new StreamError(response.status); | ||
| } | ||
|
|
||
| static friendly(error: unknown): { message: string; code: string | null } { | ||
| if (error instanceof StreamError) { | ||
| return { | ||
| message: error.friendlyMessage, | ||
| code: error.status > 0 ? `HTTP ${error.status}` : "NETWORK_ERROR", | ||
| }; | ||
| } | ||
| if (error instanceof TypeError && error.message.includes("fetch")) { | ||
| return { message: NETWORK_MESSAGE, code: "NETWORK_ERROR" }; | ||
| } | ||
| if (error instanceof Error) { | ||
| if (error.message.includes("Content Security Policy")) { | ||
| return { | ||
| message: | ||
| "Connection blocked by security policy. The chat server URL may not be allowed.", | ||
| code: "CSP_VIOLATION", | ||
| }; | ||
| } | ||
| return { message: error.message, code: null }; | ||
| } | ||
| return { message: "An unexpected error occurred.", code: "UNKNOWN" }; | ||
| } | ||
| } |
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.
stop()lacks the connection guard and error-state handling present in other mutation methods.Every other public mutation (
sendMessage,addToolResult,addToolApprovalResponse,addToolAnswerResponse) checksthis._isConnectedbefore proceeding and routes errors throughexecuteAction(which setsthis._errorand callsthis.options.onError).stop()skips both.If
stop()is called on a disconnected client, the fetch will likely fail with an unhelpful network error. And on failure,this._errorwon't be set at the client level (though the React hook does catch it separately).Proposed fix
async stop(): Promise<void> { + if (!this._isConnected) { + throw new Error("Client not connected. Call connect() first."); + } - await this.postToProxy(`/v1/sessions/${this.sessionId}/stop`, { - messageId: null, - }); + try { + await this.postToProxy(`/v1/sessions/${this.sessionId}/stop`, { + messageId: null, + }); + } catch (error) { + this._error = error instanceof Error ? error : new Error(String(error)); + this.options.onError?.(this._error); + throw error; + } }📝 Committable suggestion
🤖 Prompt for AI Agents