Skip to content

fix: simplify error handling and return the error message for all errors #306

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.

Sign up for GitHub

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 2 commits into from
Oct 8, 2025
Merged

fix: simplify error handling and return the error message for all errors #306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c5af46
fix: simplify error handling and return the error message for all errors
MQ37 Oct 7, 2025
10cb514
lint
MQ37 Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions src/mcp/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
SetLevelRequestSchema,
} from '@modelcontextprotocol/sdk/types.js';
import type { ValidateFunction } from 'ajv';
import { type ActorCallOptions, ApifyApiError } from 'apify-client';
import { type ActorCallOptions } from 'apify-client';

import log from '@apify/log';

Expand All @@ -39,6 +39,7 @@ import { callActorGetDataset, defaultTools, getActorsAsTools, toolCategories } f
import { decodeDotPropertyNames } from '../tools/utils.js';
import type { ActorMcpTool, ActorTool, HelperTool, ToolEntry } from '../types.js';
import { buildActorResponseContent } from '../utils/actor-response.js';
import { buildMCPResponse } from '../utils/mcp.js';
import { createProgressTracker } from '../utils/progress.js';
import { getToolPublicFieldOnly } from '../utils/tools.js';
import { connectMCPClient } from './client.js';
Expand Down Expand Up @@ -654,19 +655,11 @@ export class ActorsMcpServer {
}
}
} catch (error) {
if (error instanceof ApifyApiError) {
log.error('Apify API error calling tool', { toolName: name, error });
return {
content: [
{ type: 'text', text: `Apify API error calling tool ${name}: ${error.message}` },
],
};
}
log.error('Error calling tool', { toolName: name, error });
throw new McpError(
ErrorCode.InternalError,
`An error occurred while calling the tool.`,
);
log.error('Error occurred while calling tool', { toolName: name, error });
const errorMessage = (error instanceof Error) ? error.message : 'Unknown error';
return buildMCPResponse([
`Error calling tool ${name}: ${errorMessage}`,
]);
}

const msg = `Unknown tool: ${name}`;
Expand Down