Skip to content

fix: stream mcp wait #319

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
akitaSummer merged 2 commits into from
May 13, 2025
Merged

fix: stream mcp wait #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2c877a
fix: stream mcp wait
akitaSummer May 13, 2025
0edc4c9
fix: add ut
akitaSummer May 13, 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
16 changes: 4 additions & 12 deletions plugin/controller/lib/impl/mcp/MCPControllerRegister.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
import { isInitializeRequest, isJSONRPCRequest, JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
import { MCPProtocols } from '@eggjs/mcp-proxy/types';
import awaitEvent from 'await-event';

import getRawBody from 'raw-body';
import contentType from 'content-type';
Expand Down Expand Up @@ -167,13 +168,8 @@ export class MCPControllerRegister implements ControllerRegister {

await ctx.app.ctxStorage.run(ctx, async () => {
await mw(ctx, async () => {
const wait = new Promise<null>(resolve => {
ctx.res.once('close', () => {
resolve(null);
});
});
await self.statelessTransport.handleRequest(ctx.req, ctx.res);
await wait;
await awaitEvent(ctx.res, 'close');
});
});
return;
Expand Down Expand Up @@ -274,13 +270,8 @@ export class MCPControllerRegister implements ControllerRegister {

await ctx.app.ctxStorage.run(ctx, async () => {
await mw(ctx, async () => {
const wait = new Promise<null>(resolve => {
ctx.res.once('close', () => {
resolve(null);
});
});
await transport.handleRequest(ctx.req, ctx.res, body);
await wait;
await awaitEvent(ctx.res, 'close');
});
});
} else {
Expand Down Expand Up @@ -311,6 +302,7 @@ export class MCPControllerRegister implements ControllerRegister {
await ctx.app.ctxStorage.run(ctx, async () => {
await mw(ctx, async () => {
await transport.handleRequest(ctx.req, ctx.res);
await awaitEvent(ctx.res, 'close');
});
});
return;
Expand Down
1 change: 1 addition & 0 deletions plugin/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"@eggjs/tegg-metadata": "^3.57.1",
"@eggjs/tegg-runtime": "^3.57.1",
"@modelcontextprotocol/sdk": "^1.10.0",
"await-event": "^2.1.0",
"content-type": "^1.0.5",
"egg-errors": "^2.3.0",
"globby": "^10.0.2",
Expand Down
12 changes: 1 addition & 11 deletions plugin/controller/test/mcp/mcp.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,9 @@ describe('plugin/controller/test/mcp/mcp.test.ts', () => {
mm(process, 'cwd', () => {
return path.join(__dirname, '../..');
});
app = mm.cluster({
app = mm.app({
baseDir: path.join(__dirname, '../fixtures/apps/mcp-app'),
framework: path.dirname(require.resolve('egg')),
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
workers: 3,
sticky: false,
opt: {
env: {
...process.env,
NODE_OPTIONS: '--require ts-node/register tsconfig-paths/register',
},
},
});
await app.ready();
});
Expand Down
Loading
Loading