Skip to content

fix(mcp): use configured timeout instead of hardcoded 15s #15

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
h3xxit merged 3 commits into from
Dec 10, 2025
Merged

fix(mcp): use configured timeout instead of hardcoded 15s #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4af55f
Merge pull request #13 from universal-tool-calling-protocol/dev
h3xxit Nov 29, 2025
1840f28
Merge pull request #14 from universal-tool-calling-protocol/dev
h3xxit Nov 30, 2025
9a3a7a5
fix(mcp): use configured timeout instead of hardcoded 15s
pro-vi Dec 9, 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
2 changes: 2 additions & 0 deletions packages/mcp/src/mcp_call_template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface McpStdioServer {
args: string[];
cwd?: string;
env: Record<string, string>;
timeout: number;
}

/**
Expand All @@ -33,6 +34,7 @@ export const McpStdioServerSchema: z.ZodType<McpStdioServer> = z.object({
args: z.array(z.string()).optional().default([]).describe('Arguments to pass to the command.'),
cwd: z.string().optional().describe('Working directory for the command.'),
env: z.record(z.string(), z.string()).optional().default({}).describe('Environment variables for the command.'),
timeout: z.number().optional().default(30).describe('Timeout for MCP operations in seconds.'),
}) as z.ZodType<McpStdioServer>;


Expand Down
12 changes: 7 additions & 5 deletions packages/mcp/src/mcp_communication_protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,26 +169,28 @@ export class McpCommunicationProtocol implements CommunicationProtocol {
operation: (client: McpClient) => Promise<T>
): Promise<T> {
const sessionKey = `${serverName}:${serverConfig.transport}`;
// Use configured timeout (in seconds) or default to 30s
const timeoutMs = (serverConfig.timeout ?? 30) * 1000;
try {
const client = await this._getOrCreateSession(serverName, serverConfig, auth);
return await Promise.race([
operation(client),
new Promise<T>((_, reject) => setTimeout(() => reject(new Error(`MCP operation on '${sessionKey}' timed out after 15s.`)), 15000))
new Promise<T>((_, reject) => setTimeout(() => reject(new Error(`MCP operation on '${sessionKey}' timed out after ${timeoutMs / 1000}s.`)), timeoutMs))
]);
} catch (e: any) {
this._logError(`MCP operation on '${sessionKey}' failed:`, e.message);

const errorMsg = String((e as any)?.message ?? e).toLowerCase();
// Check for connection errors or "already initialized" errors
if (errorMsg.includes('closed') || errorMsg.includes('disconnected') ||
if (errorMsg.includes('closed') || errorMsg.includes('disconnected') ||
errorMsg.includes('econnreset') || errorMsg.includes('etimedout') ||
errorMsg.includes('already initialized')) {
this._logInfo(`Connection/initialization error detected on '${sessionKey}'. Cleaning up and retrying once...`);
await this._cleanupSession(sessionKey);
const newClient = await this._getOrCreateSession(serverName, serverConfig, auth);
return await Promise.race([operation(newClient), new Promise<T>((_, reject) => setTimeout(() => reject(new Error(`MCP operation on '${sessionKey}' timed out after 15s.`)), 15000))]);
return await Promise.race([operation(newClient), new Promise<T>((_, reject) => setTimeout(() => reject(new Error(`MCP operation on '${sessionKey}' timed out after ${timeoutMs / 1000}s.`)), timeoutMs))]);
}

throw e;
}
}
Expand Down