|
1 | 1 | import { Logger } from '@aws-lambda-powertools/logger'; |
2 | | -import { handler } from './route'; |
3 | | -import { Hono } from 'hono'; |
| 2 | +import { StreamableHTTPTransport } from '@hono/mcp'; |
| 3 | +import { createMcpServer } from './route'; |
| 4 | +import { Context, Hono } from 'hono'; |
| 5 | +import { BlankEnv, BlankInput } from 'hono/types'; |
| 6 | +import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; |
4 | 7 |
|
5 | 8 | const logger = new Logger(); |
6 | 9 |
|
7 | 10 | export const app = new Hono(); |
8 | 11 |
|
| 12 | +const handleError = ( |
| 13 | + c: Context<BlankEnv, '/mcp', BlankInput>, |
| 14 | + reason: unknown, |
| 15 | + logMessage: string, |
| 16 | +) => { |
| 17 | + const errorDetails = reason instanceof Error |
| 18 | + ? { message: reason.message, stack: reason.stack, name: reason.name } |
| 19 | + : { reason }; |
| 20 | + logger.error(logMessage, errorDetails); |
| 21 | + return c.json( |
| 22 | + { |
| 23 | + jsonrpc: '2.0', |
| 24 | + error: { |
| 25 | + code: -32603, |
| 26 | + message: '内部サーバーエラー', |
| 27 | + }, |
| 28 | + id: null, |
| 29 | + }, |
| 30 | + { status: 500 }, |
| 31 | + ); |
| 32 | +}; |
| 33 | + |
| 34 | +const closeResources = async (server: McpServer, transport: StreamableHTTPTransport) => { |
| 35 | + // 両方のクローズを確実に実行（片方が失敗してももう片方を実行） |
| 36 | + const closeResults = await Promise.allSettled([ |
| 37 | + transport.close(), |
| 38 | + server.close(), |
| 39 | + ]); |
| 40 | + |
| 41 | + // クローズエラーをログ出力 |
| 42 | + closeResults.forEach((result, index) => { |
| 43 | + if (result.status === 'rejected') { |
| 44 | + const resourceName = index === 0 ? 'transport' : 'server'; |
| 45 | + const error = result.reason; |
| 46 | + const errorDetails = error instanceof Error |
| 47 | + ? { message: error.message, stack: error.stack } |
| 48 | + : error; |
| 49 | + logger.error(`Error closing ${resourceName}:`, { error: errorDetails }); |
| 50 | + } |
| 51 | + }); |
| 52 | +}; |
| 53 | + |
| 54 | + |
9 | 55 | app.post('/mcp', async (c) => { |
10 | 56 | // In stateless mode, create a new instance of transport and server for each request |
11 | 57 | // to ensure complete isolation. A single instance would cause request ID collisions |
12 | 58 | // when multiple clients connect concurrently. |
13 | 59 |
|
| 60 | + const server = createMcpServer(); |
| 61 | + const transport = new StreamableHTTPTransport({ |
| 62 | + sessionIdGenerator: undefined, // セッションIDを生成しない（ステートレスモード） |
| 63 | + enableJsonResponse: true, |
| 64 | + }); |
| 65 | + transport.onclose = async () => { |
| 66 | + await server.close(); |
| 67 | + logger.trace('MCP transport closed'); |
| 68 | + }; |
14 | 69 | try { |
15 | | - return await handler(c.req.raw); |
| 70 | + await server.connect(transport); |
| 71 | + |
| 72 | + try { |
| 73 | + logger.trace('MCP リクエストを受信'); |
| 74 | + return await transport.handleRequest(c); |
| 75 | + } catch (error) { |
| 76 | + return handleError(c, error, 'MCP リクエスト処理中のエラー:'); |
| 77 | + } finally { |
| 78 | + await closeResources(server, transport); |
| 79 | + } |
16 | 80 | } catch (error) { |
17 | | - console.error('Error handling MCP request:', error); |
18 | | - return c.json( |
19 | | - { |
20 | | - jsonrpc: '2.0', |
21 | | - error: { |
22 | | - code: -32603, |
23 | | - message: 'Internal server error', |
24 | | - }, |
25 | | - id: null, |
26 | | - }, |
27 | | - 500, |
28 | | - ); |
| 81 | + // サーバー接続に失敗した場合、transportのみクローズ（serverは未接続のため） |
| 82 | + // この時点でserver(サーバー)は未接続と考えられる。未接続のサーバーに対してクローズ処理を実行すると予期しないエラーが発生する可能性があるため |
| 83 | + try { |
| 84 | + await transport.close(); |
| 85 | + } catch (closeError) { |
| 86 | + const errorDetails = closeError instanceof Error |
| 87 | + ? { message: closeError.message, stack: closeError.stack } |
| 88 | + : closeError; |
| 89 | + logger.error('Transport close failed after connection error:', { closeError: errorDetails }); |
| 90 | + } |
| 91 | + return handleError(c, error, 'MCP 接続中のエラー:'); |
29 | 92 | } |
30 | 93 | }); |
31 | 94 |
|
|
0 commit comments