From 178ab1b6eeb0c08665f361b0a0eeab4f4c9d20cb Mon Sep 17 00:00:00 2001 From: icarus Date: Mon, 15 Sep 2025 06:38:54 +0800 Subject: [PATCH] refactor: simplify error type annotations from Error | any to any 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. --- src/main/services/MCPService.ts | 6 +++--- .../src/pages/home/Inputbar/MCPToolsButton.tsx | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/services/MCPService.ts b/src/main/services/MCPService.ts index 710867da88..073a7f3435 100644 --- a/src/main/services/MCPService.ts +++ b/src/main/services/MCPService.ts @@ -235,7 +235,7 @@ class McpService { try { await inMemoryServer.connect(serverTransport) 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) throw new Error(`Failed to start in-memory server: ${error.message}`) } @@ -419,7 +419,7 @@ class McpService { const transport = await initTransport() try { await client.connect(transport) - } catch (error: Error | any) { + } catch (error: any) { if ( error instanceof Error && (error.name === 'UnauthorizedError' || error.message.includes('Unauthorized')) @@ -852,7 +852,7 @@ class McpService { return { contents: contents } - } catch (error: Error | any) { + } catch (error: any) { 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}`) } diff --git a/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx b/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx index d6ba841e6d..a3aad17c30 100644 --- a/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx +++ b/src/renderer/src/pages/home/Inputbar/MCPToolsButton.tsx @@ -289,9 +289,8 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar name={arg.name} label={`${arg.name}${arg.required ? ' *' : ''}`} tooltip={arg.description} - rules={ - arg.required ? [{ required: true, message: t('settings.mcp.prompts.requiredField') }] : [] - }> + rules={arg.required ? [{ required: true, message: t('settings.mcp.prompts.requiredField') }] : []} + > ))} @@ -318,7 +317,7 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar }) await handlePromptResponse(response) - } catch (error: Error | any) { + } catch (error: any) { if (error.message !== 'cancelled') { window.modal.error({ title: t('common.error'), @@ -335,7 +334,7 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar name: prompt.name }) await handlePromptResponse(response) - } catch (error: Error | any) { + } catch (error: any) { window.modal.error({ title: t('common.error'), content: error.message || t('settings.mcp.prompts.genericError') @@ -416,7 +415,7 @@ const MCPToolsButton: FC = ({ ref, setInputValue, resizeTextArea, Toolbar } else { processResourceContent(response as ResourceData) } - } catch (error: Error | any) { + } catch (error: any) { window.modal.error({ title: t('common.error'), content: error.message || t('settings.mcp.resources.genericError')