-
Notifications
You must be signed in to change notification settings - Fork 67
chore: disable-beta-feature #35
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
3 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
140 changes: 74 additions & 66 deletions
140
webapp/_webapp/src/components/message-entry-container/tools/utils/common.tsx
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 |
|---|---|---|
| @@ -1,83 +1,91 @@ | ||
| export type JsonRpcResult = { | ||
| jsonrpc: string; | ||
| id: number; | ||
| result?: { | ||
| content: Array<{ | ||
| type: string; | ||
| text: string; | ||
| }>; | ||
| }; | ||
| error?: { | ||
| code: number; | ||
| message: string; | ||
| } | ||
| } | ||
| jsonrpc: string; | ||
| id: number; | ||
| result?: { | ||
| content: Array<{ | ||
| type: string; | ||
| text: string; | ||
| }>; | ||
| }; | ||
| error?: { | ||
| code: number; | ||
| message: string; | ||
| }; | ||
| }; | ||
|
|
||
| export const UNKNOWN_JSONRPC_RESULT: JsonRpcResult = { | ||
| jsonrpc: "2.0", | ||
| id: -1, | ||
| error: { | ||
| code: -1, | ||
| message: "Unknown JSONRPC result", | ||
| }, | ||
| } | ||
| jsonrpc: "2.0", | ||
| id: -1, | ||
| error: { | ||
| code: -1, | ||
| message: "Unknown JSONRPC result", | ||
| }, | ||
| }; | ||
|
|
||
| const isValidJsonRpcResult = (obj: any): obj is JsonRpcResult => { | ||
| // Check if obj is an object and not null | ||
| if (typeof obj !== 'object' || obj === null) { | ||
| return false; | ||
| } | ||
| // Check if obj is an object and not null | ||
| if (typeof obj !== "object" || obj === null) { | ||
| return false; | ||
| } | ||
|
|
||
| // Check required properties | ||
| if (typeof obj.jsonrpc !== 'string' || typeof obj.id !== 'number') { | ||
| return false; | ||
| } | ||
| // Check required properties | ||
| if (typeof obj.jsonrpc !== "string" || typeof obj.id !== "number") { | ||
| return false; | ||
| } | ||
|
|
||
| // Check that either result or error is present (but not both required) | ||
| const hasResult = obj.result !== undefined; | ||
| const hasError = obj.error !== undefined; | ||
| // Check that either result or error is present (but not both required) | ||
| const hasResult = obj.result !== undefined; | ||
| const hasError = obj.error !== undefined; | ||
|
|
||
| // Validate result structure if present | ||
| if (hasResult) { | ||
| if (typeof obj.result !== 'object' || obj.result === null) { | ||
| return false; | ||
| } | ||
| if (obj.result.content !== undefined) { | ||
| if (!Array.isArray(obj.result.content)) { | ||
| return false; | ||
| } | ||
| // Validate each content item | ||
| for (const item of obj.result.content) { | ||
| if (typeof item !== 'object' || item === null || | ||
| typeof item.type !== 'string' || typeof item.text !== 'string') { | ||
| return false; | ||
| } | ||
| } | ||
| // Validate result structure if present | ||
| if (hasResult) { | ||
| if (typeof obj.result !== "object" || obj.result === null) { | ||
| return false; | ||
| } | ||
| if (obj.result.content !== undefined) { | ||
| if (!Array.isArray(obj.result.content)) { | ||
| return false; | ||
| } | ||
| // Validate each content item | ||
| for (const item of obj.result.content) { | ||
| if ( | ||
| typeof item !== "object" || | ||
| item === null || | ||
| typeof item.type !== "string" || | ||
| typeof item.text !== "string" | ||
| ) { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Validate error structure if present | ||
| if (hasError) { | ||
| if (typeof obj.error !== 'object' || obj.error === null || | ||
| typeof obj.error.code !== 'number' || typeof obj.error.message !== 'string') { | ||
| return false; | ||
| } | ||
| // Validate error structure if present | ||
| if (hasError) { | ||
| if ( | ||
| typeof obj.error !== "object" || | ||
| obj.error === null || | ||
| typeof obj.error.code !== "number" || | ||
| typeof obj.error.message !== "string" | ||
| ) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| return true; | ||
| }; | ||
|
|
||
| export const parseJsonRpcResult = (message: string): JsonRpcResult | undefined => { | ||
| try { | ||
| const json = JSON.parse(message); | ||
|
|
||
| // Validate the structure before casting | ||
| if (isValidJsonRpcResult(json)) { | ||
| return json; | ||
| } | ||
|
|
||
| return undefined; | ||
| } catch (error) { | ||
| return undefined; | ||
| try { | ||
| const json = JSON.parse(message); | ||
|
|
||
| // Validate the structure before casting | ||
| if (isValidJsonRpcResult(json)) { | ||
| return json; | ||
| } | ||
| } | ||
|
|
||
| return undefined; | ||
| } catch (error) { | ||
| return undefined; | ||
| } | ||
| }; |
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
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.
[nitpick] Inconsistent JSX formatting: This line should be formatted across multiple lines like the similar JSX element above (lines 49-56) for consistency.