scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-12 23:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Safe JSON parse in ChatRow (#2666)

Browse source
This commit is contained in:
Matt Rubens 2025-04-15 19:49:25 -04:00 • committed by GitHub
parent 7fab2f7738
commit 75a6bc100e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
webview-ui/src/components/chat/ChatRow.tsx
View file

@ -4,6 +4,7 @@ import React, { memo, useEffect, useMemo, useRef, useState } from "react"
import { useSize } from "react-use"
import { useCopyToClipboard } from "../../utils/clipboard"
import { useTranslation, Trans } from "react-i18next"
import { safeJsonParse } from "../../utils/json"
import {
ClineApiReqInfo,
ClineAskUseMcpServer,
@ -92,8 +93,8 @@ export const ChatRowContent = ({
const [cost, apiReqCancelReason, apiReqStreamingFailedMessage] = useMemo(() => {
if (message.text !== null && message.text !== undefined && message.say === "api_req_started") {
const info: ClineApiReqInfo = JSON.parse(message.text)
return [info.cost, info.cancelReason, info.streamingFailedMessage]
const info = safeJsonParse<ClineApiReqInfo>(message.text)
return [info?.cost, info?.cancelReason, info?.streamingFailedMessage]
}
return [undefined, undefined, undefined]
@ -147,7 +148,10 @@ export const ChatRowContent = ({
<span style={{ color: normalColor, fontWeight: "bold" }}>{t("chat:runCommand.title")}:</span>,
]
case "use_mcp_server":
const mcpServerUse = JSON.parse(message.text || "{}") as ClineAskUseMcpServer
const mcpServerUse = safeJsonParse<ClineAskUseMcpServer>(message.text)
if (mcpServerUse === undefined) {
return [null, null]
}
return [
isMcpServerResponding ? (
<ProgressIndicator />
@ -250,14 +254,14 @@ export const ChatRowContent = ({
const tool = useMemo(() => {
if (message.ask === "tool" || message.say === "tool") {
return JSON.parse(message.text || "{}") as ClineSayTool
return safeJsonParse<ClineSayTool>(message.text)
}
return null
}, [message.ask, message.say, message.text])
const followUpData = useMemo(() => {
if (message.type === "ask" && message.ask === "followup" && !message.partial) {
return JSON.parse(message.text || "{}")
return safeJsonParse<any>(message.text)
}
return null
}, [message.type, message.ask, message.partial, message.text])
@ -830,7 +834,7 @@ export const ChatRowContent = ({
{isExpanded && (
<div style={{ marginTop: "10px" }}>
<CodeAccordian
code={JSON.parse(message.text || "{}").request}
code={safeJsonParse<any>(message.text)?.request}
language="markdown"
isExpanded={true}
onToggleExpand={onToggleExpand}
@ -897,7 +901,7 @@ export const ChatRowContent = ({
</div>
)
case "user_feedback_diff":
const tool = JSON.parse(message.text || "{}") as ClineSayTool
const tool = safeJsonParse<ClineSayTool>(message.text)
return (
<div
style={{
@ -905,7 +909,7 @@ export const ChatRowContent = ({
width: "100%",
}}>
<CodeAccordian
diff={tool.diff!}
diff={tool?.diff!}
isFeedback={true}
isExpanded={isExpanded}
onToggleExpand={onToggleExpand}
@ -1113,7 +1117,10 @@ export const ChatRowContent = ({
</>
)
case "use_mcp_server":
const useMcpServer = JSON.parse(message.text || "{}") as ClineAskUseMcpServer
const useMcpServer = safeJsonParse<ClineAskUseMcpServer>(message.text)
if (!useMcpServer) {
return null
}
const server = mcpServers.find((server) => server.name === useMcpServer.serverName)
return (
<>

17
webview-ui/src/utils/json.ts Normal file
View file

@ -0,0 +1,17 @@
/**
* Safely parses JSON without crashing on invalid input
* @param jsonString The string to parse
* @param defaultValue Value to return if parsing fails
* @returns Parsed JSON object or defaultValue if parsing fails
*/
export function safeJsonParse<T>(jsonString: string | null | undefined, defaultValue?: T): T | undefined {
if (!jsonString) return defaultValue
try {
return JSON.parse(jsonString) as T
} catch (error) {
// Log the error to the console for debugging
console.error("Error parsing JSON:", error)
return defaultValue
}
}