Skip to content

chore: address more comments from #361 #389

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 7 commits into from
Jul 22, 2025
Merged

chore: address more comments from #361 #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
502ddf7
chore: address more comments from #361
fmenezes Jul 22, 2025
444cb43
chore: address more comments
fmenezes Jul 22, 2025
2844c40
chore: address more comments
fmenezes Jul 22, 2025
07de8a5
fix: error in index
fmenezes Jul 22, 2025
5c9582d
fix
fmenezes Jul 22, 2025
0f9a874
fix
fmenezes Jul 22, 2025
759d120
fix
fmenezes Jul 22, 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
7 changes: 3 additions & 4 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ async function main() {
try {
await transportRunner.start();
} catch (error: unknown) {
logger.emergency(LogId.serverStartFailure, "server", `Fatal error running server: ${error as string}`);
logger.info(LogId.serverCloseRequested, "server", "Closing server");
try {
await transportRunner.close();
logger.error(LogId.serverClosed, "server", "Server closed");
logger.info(LogId.serverClosed, "server", "Server closed");
} catch (error: unknown) {
logger.error(LogId.serverCloseFailure, "server", `Error closing server: ${error as string}`);
} finally {
process.exit(1);
}
throw error;
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/transports/streamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const JSON_RPC_ERROR_CODE_SESSION_ID_INVALID = -32002;
const JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND = -32003;
const JSON_RPC_ERROR_CODE_INVALID_REQUEST = -32004;

function promiseHandler(
function withErrorHandling(
fn: (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>
) {
return (req: express.Request, res: express.Response, next: express.NextFunction) => {
Expand Down Expand Up @@ -50,7 +50,7 @@ export class StreamableHttpRunner extends TransportRunnerBase {
app.enable("trust proxy"); // needed for reverse proxy support
app.use(express.json());

const handleRequest = async (req: express.Request, res: express.Response) => {
const handleSessionRequest = async (req: express.Request, res: express.Response) => {
const sessionId = req.headers["mcp-session-id"];
if (!sessionId) {
res.status(400).json({
Expand Down Expand Up @@ -88,10 +88,10 @@ export class StreamableHttpRunner extends TransportRunnerBase {

app.post(
"/mcp",
promiseHandler(async (req: express.Request, res: express.Response) => {
withErrorHandling(async (req: express.Request, res: express.Response) => {
const sessionId = req.headers["mcp-session-id"];
if (sessionId) {
await handleRequest(req, res);
await handleSessionRequest(req, res);
return;
}

Expand Down Expand Up @@ -141,8 +141,8 @@ export class StreamableHttpRunner extends TransportRunnerBase {
})
);

app.get("/mcp", promiseHandler(handleRequest));
app.delete("/mcp", promiseHandler(handleRequest));
app.get("/mcp", withErrorHandling(handleSessionRequest));
app.delete("/mcp", withErrorHandling(handleSessionRequest));

this.httpServer = await new Promise<http.Server>((resolve, reject) => {
const result = app.listen(this.userConfig.httpPort, this.userConfig.httpHost, (err?: Error) => {
Expand Down
Loading