modelcontextprotocol/inspector
Watch
1
0
Fork
You've already forked inspector
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into inspector/error-popup

Browse source
This commit is contained in:
Cliff Hall 2026-01-09 15:52:22 -05:00 • committed by GitHub
commit 8cb845798e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7119 additions and 2488 deletions
Download patch file Download diff file Expand all files Collapse all files

49
server/src/index.ts
View file

@ -17,7 +17,10 @@ import {
StdioClientTransport,
getDefaultEnvironment,
} from "@modelcontextprotocol/sdk/client/stdio.js";
import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
import {
StreamableHTTPClientTransport,
StreamableHTTPError,
} from "@modelcontextprotocol/sdk/client/streamableHttp.js";
import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
@ -44,6 +47,22 @@ const { values } = parseArgs({
},
});
/**
* Helper function to detect 401 Unauthorized errors from various transport types.
* StreamableHTTPClientTransport throws a generic Error with "HTTP 401" in the message
* when there's no authProvider configured, while SSEClientTransport throws SseError.
*/
const is401Error = (error: unknown): boolean => {
if (error instanceof SseError && error.code === 401) return true;
if (error instanceof StreamableHTTPError && error.code === 401) return true;
if (
error instanceof Error &&
(error.message.includes("HTTP 401") || error.message.includes("(401)"))
)
return true;
return false;
};
// Function to get HTTP headers.
const getHttpHeaders = (req: express.Request): Record<string, string> => {
const headers: Record<string, string> = {};
@ -241,18 +260,31 @@ const authMiddleware = (
* This is necessary for the EventSource polyfill which expects web streams
*/
const createWebReadableStream = (nodeStream: any): ReadableStream => {
let closed = false;
return new ReadableStream({
start(controller) {
nodeStream.on("data", (chunk: any) => {
controller.enqueue(chunk);
if (!closed) {
controller.enqueue(chunk);
}
});
nodeStream.on("end", () => {
controller.close();
if (!closed) {
closed = true;
controller.close();
}
});
nodeStream.on("error", (err: any) => {
controller.error(err);
if (!closed) {
closed = true;
controller.error(err);
}
});
},
cancel() {
closed = true;
nodeStream.destroy();
},
});
};
@ -495,10 +527,10 @@ app.post(
req.body,
);
} catch (error) {
if (error instanceof SseError && error.code === 401) {
if (is401Error(error)) {
console.error(
"Received 401 Unauthorized from MCP server:",
error.message,
error instanceof Error ? error.message : error,
);
res.status(401).json(error);
return;
@ -526,6 +558,7 @@ app.delete(
res.status(404).end("Transport not found for sessionId " + sessionId);
} else {
await serverTransport.terminateSession();
await serverTransport.close();
webAppTransports.delete(sessionId);
serverTransports.delete(sessionId);
sessionHeaderHolders.delete(sessionId);
@ -635,7 +668,7 @@ app.get(
transportToServer: serverTransport,
});
} catch (error) {
if (error instanceof SseError && error.code === 401) {
if (is401Error(error)) {
console.error(
"Received 401 Unauthorized from MCP server. Authentication failure.",
);
@ -681,7 +714,7 @@ app.get(
transportToServer: serverTransport,
});
} catch (error) {
if (error instanceof SseError && error.code === 401) {
if (is401Error(error)) {
console.error(
"Received 401 Unauthorized from MCP server. Authentication failure.",
);