Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-05 04:19:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refactor: simplify error type annotations from Error | any to any

Browse Source 
The change standardizes error handling by using 'any' type instead of union types with Error | any, making the code more consistent and reducing unnecessary type complexity.
This commit is contained in:
icarus 2025-09-15 06:38:54 +08:00
parent 4a8d77c1a3
commit 178ab1b6ee
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/services/MCPService.ts
View File

@ -235,7 +235,7 @@ class McpService {
try { try {
await inMemoryServer.connect(serverTransport) await inMemoryServer.connect(serverTransport)
getServerLogger(server).debug(`In-memory server started`) getServerLogger(server).debug(`In-memory server started`)
} catch (error: Error | any) { } catch (error: any) {
getServerLogger(server).error(`Error starting in-memory server`, error as Error) getServerLogger(server).error(`Error starting in-memory server`, error as Error)
throw new Error(`Failed to start in-memory server: ${error.message}`) throw new Error(`Failed to start in-memory server: ${error.message}`)
} }
@ -419,7 +419,7 @@ class McpService {
const transport = await initTransport() const transport = await initTransport()
try { try {
await client.connect(transport) await client.connect(transport)
} catch (error: Error | any) { } catch (error: any) {
if ( if (
error instanceof Error && error instanceof Error &&
(error.name === 'UnauthorizedError' || error.message.includes('Unauthorized')) (error.name === 'UnauthorizedError' || error.message.includes('Unauthorized'))
@ -852,7 +852,7 @@ class McpService {
return { return {
contents: contents contents: contents
} }
} catch (error: Error | any) { } catch (error: any) {
getServerLogger(server, { uri }).error(`Failed to get resource`, error as Error) getServerLogger(server, { uri }).error(`Failed to get resource`, error as Error)
throw new Error(`Failed to get resource ${uri} from server: ${server.name}: ${error.message}`) throw new Error(`Failed to get resource ${uri} from server: ${server.name}: ${error.message}`)
} }

11
src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx
View File

@ -289,9 +289,8 @@ const MCPToolsButton: FC<Props> = ({ ref, setInputValue, resizeTextArea, Toolbar
name={arg.name} name={arg.name}
label={`${arg.name}${arg.required ? ' *' : ''}`} label={`${arg.name}${arg.required ? ' *' : ''}`}
tooltip={arg.description} tooltip={arg.description}
rules={ rules={arg.required ? [{ required: true, message: t('settings.mcp.prompts.requiredField') }] : []}
arg.required ? [{ required: true, message: t('settings.mcp.prompts.requiredField') }] : [] >
}>
<Input placeholder={arg.description || arg.name} /> <Input placeholder={arg.description || arg.name} />
</Form.Item> </Form.Item>
))} ))}
@ -318,7 +317,7 @@ const MCPToolsButton: FC<Props> = ({ ref, setInputValue, resizeTextArea, Toolbar
}) })
await handlePromptResponse(response) await handlePromptResponse(response)
} catch (error: Error | any) { } catch (error: any) {
if (error.message !== 'cancelled') { if (error.message !== 'cancelled') {
window.modal.error({ window.modal.error({
title: t('common.error'), title: t('common.error'),
@ -335,7 +334,7 @@ const MCPToolsButton: FC<Props> = ({ ref, setInputValue, resizeTextArea, Toolbar
name: prompt.name name: prompt.name
}) })
await handlePromptResponse(response) await handlePromptResponse(response)
} catch (error: Error | any) { } catch (error: any) {
window.modal.error({ window.modal.error({
title: t('common.error'), title: t('common.error'),
content: error.message || t('settings.mcp.prompts.genericError') content: error.message || t('settings.mcp.prompts.genericError')
@ -416,7 +415,7 @@ const MCPToolsButton: FC<Props> = ({ ref, setInputValue, resizeTextArea, Toolbar
} else { } else {
processResourceContent(response as ResourceData) processResourceContent(response as ResourceData)
} }
} catch (error: Error | any) { } catch (error: any) {
window.modal.error({ window.modal.error({
title: t('common.error'), title: t('common.error'),
content: error.message || t('settings.mcp.resources.genericError') content: error.message || t('settings.mcp.resources.genericError')