@modelcontextprotocol/inspector 2.13.0 → 2.14.0

package/clients/web/build/index.js

@@ -22,7 +22,7 @@ import { createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypt
 import { createSecureContext } from "node:tls";
 import { createServer as createServer$1 } from "vite";
 import react from "@vitejs/plugin-react";
-import { homedir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { Hono } from "hono";
 import { streamSSE } from "hono/streaming";
 import { bodyLimit } from "hono/body-limit";
@@ -556,26 +556,37 @@ function expectedSecretFields(stored) {
 	if (isStdioStored(stored) && stored.env) for (const k of Object.keys(stored.env)) fields.push(envSecretField(k));
 	return fields;
 }
-const DEFAULT_SEED_CONFIG = { mcpServers: {
-	"filesystem-server-default": {
-		type: "stdio",
-		command: "npx",
-		args: [
-			"-y",
-			"@modelcontextprotocol/server-filesystem",
-			"/tmp"
-		]
-	},
-	"everything-server-default": {
-		type: "stdio",
-		command: "npx",
-		args: ["-y", "@modelcontextprotocol/server-everything"]
-	},
-	"example-server-default": {
-		type: "streamable-http",
-		url: "https://example-server.modelcontextprotocol.io/mcp"
+const EXAMPLE_SERVER_URL = "https://example-server.modelcontextprotocol.io/mcp";
+function adHocServerName(config) {
+	if (config.type === "sse" || config.type === "streamable-http") try {
+		return new URL(config.url).host || "server";
+	} catch {
+		return "server";
 	}
-} };
+	return config.command?.split(/[\\/]/).pop() || "server";
+}
+function defaultSeedConfig(tempDir) {
+	return { mcpServers: {
+		"filesystem-server-default": {
+			type: "stdio",
+			command: "npx",
+			args: [
+				"-y",
+				"@modelcontextprotocol/server-filesystem",
+				tempDir
+			]
+		},
+		"everything-server-default": {
+			type: "stdio",
+			command: "npx",
+			args: ["-y", "@modelcontextprotocol/server-everything"]
+		},
+		"example-server-default": {
+			type: "streamable-http",
+			url: EXAMPLE_SERVER_URL
+		}
+	} };
+}
 //#endregion
 //#region ../../core/storage/own-entry.ts
 function setOwnEntry(map, key, value) {
@@ -913,8 +924,103 @@ function resolveBindHostname(env = process.env) {
 	return stripBrackets(host);
 }
 //#endregion
+//#region server/host-allow-list.ts
+const ALLOWED_HOSTS_ENV = "MCP_INSPECTOR_ALLOWED_HOSTS";
+const HOSTNAME_RE = /^[a-z0-9._-]+$/;
+function normalizeHostname(hostname) {
+	return hostname.trim().toLowerCase().replace(/\.$/, "");
+}
+function parseHostHeader(value) {
+	const raw = value.trim().toLowerCase();
+	let hostname;
+	let port;
+	if (raw.startsWith("[")) {
+		const end = raw.indexOf("]");
+		if (end < 0) return null;
+		hostname = raw.slice(0, end + 1);
+		if (!isIPv6(hostname.slice(1, -1))) return null;
+		const rest = raw.slice(end + 1);
+		if (rest !== "") {
+			if (!rest.startsWith(":")) return null;
+			port = rest.slice(1);
+		}
+	} else {
+		const colon = raw.indexOf(":");
+		hostname = colon < 0 ? raw : raw.slice(0, colon);
+		port = colon < 0 ? void 0 : raw.slice(colon + 1);
+	}
+	if (port !== void 0) {
+		if (!/^\d{1,5}$/.test(port) || Number(port) > 65535) return null;
+	}
+	if (hostname.startsWith("[")) return hostname;
+	const name = normalizeHostname(hostname);
+	return HOSTNAME_RE.test(name) ? name : null;
+}
+function parseAllowedHostsEnv(value) {
+	if (!value) return [];
+	const out = [];
+	for (const entry of value.split(",")) {
+		const trimmed = entry.trim();
+		if (trimmed === "") continue;
+		const domain = trimmed.startsWith(".") ? "." : "";
+		const ascii = /[\s/:*@]/.test(trimmed) ? "" : domainToASCII(normalizeHostname(trimmed.slice(domain.length)));
+		if (!HOSTNAME_RE.test(ascii)) {
+			console.warn(`Ignoring invalid ${ALLOWED_HOSTS_ENV} entry: ${trimmed} (list bare hostnames, e.g. inspector.example.com or .example.com)`);
+			continue;
+		}
+		out.push(domain + ascii);
+	}
+	return out;
+}
+function configuredAllowedHosts(options) {
+	const hosts = /* @__PURE__ */ new Set();
+	if (!isAllInterfacesHost(options.bindHost)) hosts.add(normalizeHostname(canonicalUrlHost(options.bindHost)));
+	for (const origin of options.allowedOrigins) try {
+		const { hostname } = new URL(origin);
+		if (hostname !== "") hosts.add(normalizeHostname(hostname));
+	} catch {}
+	for (const extra of options.extraHosts ?? []) hosts.add(normalizeHostname(extra));
+	return [...hosts];
+}
+function createHostAllowList(options) {
+	const configured = configuredAllowedHosts(options);
+	return (hostHeader) => {
+		if (hostHeader === void 0) return false;
+		const hostname = parseHostHeader(hostHeader);
+		if (hostname === null) return false;
+		if (hostname.startsWith("[")) return true;
+		if (isIPv4(hostname)) return true;
+		if (hostname === "localhost" || hostname.endsWith(".localhost")) return true;
+		for (const allowed of configured) {
+			if (allowed === hostname) return true;
+			if (allowed.startsWith(".") && (allowed.slice(1) === hostname || hostname.endsWith(allowed))) return true;
+		}
+		return false;
+	};
+}
+function hostAllowListMiddleware(options) {
+	const isAllowed = createHostAllowList(options);
+	return async (c, next) => {
+		const host = c.req.header("host");
+		if (!isAllowed(host)) return c.text(`Forbidden: Host "${host ?? ""}" is not allowed. To serve the Inspector under this name, add it to ${ALLOWED_HOSTS_ENV} (or to ALLOWED_ORIGINS).`, 403);
+		await next();
+	};
+}
+//#endregion
 //#region server/sandbox-controller.ts
 const __dirname$3 = dirname(fileURLToPath(import.meta.url));
+function isSandboxPath(url) {
+	const path = (url ?? "").split("?", 1)[0];
+	return path === "/sandbox" || path === "/sandbox/";
+}
+function publicUrlHosts(publicUrl) {
+	if (!publicUrl) return [];
+	try {
+		return [new URL(publicUrl).hostname];
+	} catch {
+		return [];
+	}
+}
 const LOOPBACK_FRAME_ANCESTORS = ["http://127.0.0.1:*", "http://localhost:*"];
 const CSP_HOST_SOURCE = /^[a-z][a-z0-9+.-]*:\/\/[^\s;,'"[\]*]+$/i;
 function sandboxFrameAncestors(allowedOrigins) {
@@ -948,7 +1054,12 @@ function resolveSandboxPort() {
 	return fromSandbox ?? parseListenPort$1(process.env.SERVER_PORT) ?? 6275;
 }
 function createSandboxController(options) {
-	const { port, host = DEFAULT_BIND_HOST, allowedOrigins, publicUrl } = options;
+	const { port, host = DEFAULT_BIND_HOST, allowedOrigins, publicUrl, allowedHosts } = options;
+	const isAllowedHost = createHostAllowList({
+		bindHost: host,
+		allowedOrigins: allowedOrigins ?? [],
+		extraHosts: [...allowedHosts ?? [], ...publicUrlHosts(publicUrl)]
+	});
 	let server = null;
 	let sandboxUrl = null;
 	let boundPort = 0;
@@ -977,18 +1088,25 @@ function createSandboxController(options) {
 					resolve(value);
 				};
 				server = createServer((req, res) => {
-					if (req.method !== "GET" || req.url !== "/sandbox" && req.url !== "/sandbox/") {
+					if (!isAllowedHost(req.headers.host)) {
+						res.writeHead(403, { "Content-Type": "text/plain" });
+						res.end(`Forbidden: Host "${req.headers.host ?? ""}" is not allowed. To serve the sandbox under this name, add it to ${ALLOWED_HOSTS_ENV} (or to ALLOWED_ORIGINS).`);
+						return;
+					}
+					const isHead = req.method === "HEAD";
+					if (req.method !== "GET" && !isHead || !isSandboxPath(req.url)) {
 						res.writeHead(404, { "Content-Type": "text/plain" });
 						res.end("Not Found");
 						return;
 					}
 					res.writeHead(200, {
 						"Content-Type": "text/html; charset=utf-8",
+						"Content-Length": Buffer.byteLength(sandboxHtml),
 						"Cache-Control": "no-store, no-cache, must-revalidate",
 						Pragma: "no-cache",
 						"Content-Security-Policy": SANDBOX_PROXY_CSP
 					});
-					res.end(sandboxHtml);
+					res.end(isHead ? void 0 : sandboxHtml);
 				});
 				let retriedDynamic = false;
 				server.on("error", (err) => {
@@ -1318,89 +1436,6 @@ function resolveTlsConfig(env = process.env) {
 	};
 }
 //#endregion
-//#region server/host-allow-list.ts
-const ALLOWED_HOSTS_ENV = "MCP_INSPECTOR_ALLOWED_HOSTS";
-const HOSTNAME_RE = /^[a-z0-9._-]+$/;
-function normalizeHostname(hostname) {
-	return hostname.trim().toLowerCase().replace(/\.$/, "");
-}
-function parseHostHeader(value) {
-	const raw = value.trim().toLowerCase();
-	let hostname;
-	let port;
-	if (raw.startsWith("[")) {
-		const end = raw.indexOf("]");
-		if (end < 0) return null;
-		hostname = raw.slice(0, end + 1);
-		if (!isIPv6(hostname.slice(1, -1))) return null;
-		const rest = raw.slice(end + 1);
-		if (rest !== "") {
-			if (!rest.startsWith(":")) return null;
-			port = rest.slice(1);
-		}
-	} else {
-		const colon = raw.indexOf(":");
-		hostname = colon < 0 ? raw : raw.slice(0, colon);
-		port = colon < 0 ? void 0 : raw.slice(colon + 1);
-	}
-	if (port !== void 0) {
-		if (!/^\d{1,5}$/.test(port) || Number(port) > 65535) return null;
-	}
-	if (hostname.startsWith("[")) return hostname;
-	const name = normalizeHostname(hostname);
-	return HOSTNAME_RE.test(name) ? name : null;
-}
-function parseAllowedHostsEnv(value) {
-	if (!value) return [];
-	const out = [];
-	for (const entry of value.split(",")) {
-		const trimmed = entry.trim();
-		if (trimmed === "") continue;
-		const domain = trimmed.startsWith(".") ? "." : "";
-		const ascii = /[\s/:*@]/.test(trimmed) ? "" : domainToASCII(normalizeHostname(trimmed.slice(domain.length)));
-		if (!HOSTNAME_RE.test(ascii)) {
-			console.warn(`Ignoring invalid ${ALLOWED_HOSTS_ENV} entry: ${trimmed} (list bare hostnames, e.g. inspector.example.com or .example.com)`);
-			continue;
-		}
-		out.push(domain + ascii);
-	}
-	return out;
-}
-function configuredAllowedHosts(options) {
-	const hosts = /* @__PURE__ */ new Set();
-	if (!isAllInterfacesHost(options.bindHost)) hosts.add(normalizeHostname(canonicalUrlHost(options.bindHost)));
-	for (const origin of options.allowedOrigins) try {
-		const { hostname } = new URL(origin);
-		if (hostname !== "") hosts.add(normalizeHostname(hostname));
-	} catch {}
-	for (const extra of options.extraHosts ?? []) hosts.add(normalizeHostname(extra));
-	return [...hosts];
-}
-function createHostAllowList(options) {
-	const configured = configuredAllowedHosts(options);
-	return (hostHeader) => {
-		if (hostHeader === void 0) return false;
-		const hostname = parseHostHeader(hostHeader);
-		if (hostname === null) return false;
-		if (hostname.startsWith("[")) return true;
-		if (isIPv4(hostname)) return true;
-		if (hostname === "localhost" || hostname.endsWith(".localhost")) return true;
-		for (const allowed of configured) {
-			if (allowed === hostname) return true;
-			if (allowed.startsWith(".") && (allowed.slice(1) === hostname || hostname.endsWith(allowed))) return true;
-		}
-		return false;
-	};
-}
-function hostAllowListMiddleware(options) {
-	const isAllowed = createHostAllowList(options);
-	return async (c, next) => {
-		const host = c.req.header("host");
-		if (!isAllowed(host)) return c.text(`Forbidden: Host "${host ?? ""}" is not allowed. To serve the Inspector under this name, add it to ${ALLOWED_HOSTS_ENV} (or to ALLOWED_ORIGINS).`, 403);
-		await next();
-	};
-}
-//#endregion
 //#region server/web-server-config.ts
 const inspectorVersion = readInspectorVersionSafe(import.meta.url);
 function defaultEnvironmentFromProcess(extra) {
@@ -1522,6 +1557,10 @@ function defaultAllowedOrigins(hostname, port, scheme = "http") {
 	];
 	return [webOrigin(scheme, h, port)];
 }
+function weakAuthTokenWarning(token) {
+	if (token === "" || token.length >= 32) return null;
+	return `Warning: the custom API token (${API_SERVER_ENV_VARS.AUTH_TOKEN}) is ${token.length} character${token.length === 1 ? "" : "s"} long; use at least 32 random characters (e.g. \`openssl rand -hex 32\`), or unset it to have one generated.`;
+}
 function buildWebServerConfig(options = {}) {
 	const { initialMcpConfig = null, mcpConfigPath, writable = true, initialServers = null } = options;
 	const rawPort = process.env.CLIENT_PORT?.trim() || "6274";
@@ -1531,6 +1570,8 @@ function buildWebServerConfig(options = {}) {
 	const tls = resolveTlsConfig();
 	const dangerouslyOmitAuth = isEnvFlagEnabled(process.env.DANGEROUSLY_OMIT_AUTH);
 	const authToken = dangerouslyOmitAuth ? "" : process.env[API_SERVER_ENV_VARS.AUTH_TOKEN] ?? process.env["MCP_PROXY_AUTH_TOKEN"] ?? "";
+	const weakToken = weakAuthTokenWarning(authToken);
+	if (weakToken) console.warn(weakToken);
 	const sandboxPort = resolveSandboxPort();
 	const requestedAppOriginPort = resolveAppOriginPort();
 	const appOriginCollidesWith = requestedAppOriginPort !== 0 && (requestedAppOriginPort === port ? "the web server (CLIENT_PORT)" : requestedAppOriginPort === sandboxPort ? "the MCP Apps sandbox (MCP_SANDBOX_PORT)" : null);
@@ -5013,9 +5054,13 @@ function waitForProgressToken(waits, token) {
 //#endregion
 //#region ../../core/mcp/remote/node/remote-session.ts
 var RemoteSession = class RemoteSession {
+	static DEFAULT_DETACH_GRACE_MS = 6e4;
+	static MAX_QUEUED_EVENTS = 1e3;
 	sessionId;
 	transport;
 	eventQueue = [];
+	droppedEventCount = 0;
+	detachTimer;
 	eventConsumer = null;
 	transportDead = false;
 	transportError = null;
@@ -5046,13 +5091,47 @@ var RemoteSession = class RemoteSession {
 		this.transport.setProtocolVersion?.(version);
 	}
 	setEventConsumer(consumer) {
+		this.cancelDetachGrace();
 		this.eventConsumer = consumer;
+		if (this.droppedEventCount > 0) {
+			const dropped = this.droppedEventCount;
+			this.droppedEventCount = 0;
+			consumer({
+				type: "stdio_log",
+				data: {
+					timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+					message: `[inspector] ${dropped} event(s) were dropped while no client was attached (the queue holds at most ${RemoteSession.MAX_QUEUED_EVENTS})`
+				}
+			});
+		}
 		while (this.eventQueue.length > 0) consumer(this.eventQueue.shift());
 	}
 	clearEventConsumer() {
 		this.eventConsumer = null;
 		return this.transportDead;
 	}
+	detachEventConsumer(consumer) {
+		if (this.eventConsumer !== consumer) return false;
+		this.eventConsumer = null;
+		return true;
+	}
+	armDetachGrace(graceMs, onExpire) {
+		this.cancelDetachGrace();
+		this.detachTimer = setTimeout(() => {
+			this.detachTimer = void 0;
+			onExpire();
+		}, graceMs);
+		this.detachTimer.unref();
+	}
+	cancelDetachGrace() {
+		if (this.detachTimer !== void 0) {
+			clearTimeout(this.detachTimer);
+			this.detachTimer = void 0;
+		}
+	}
+	hasPendingDetachGrace() {
+		return this.detachTimer !== void 0;
+	}
 	markTransportDead(error) {
 		this.transportDead = true;
 		this.transportError = error;
@@ -5163,7 +5242,13 @@ var RemoteSession = class RemoteSession {
 	}
 	pushEvent(event) {
 		if (this.eventConsumer) this.eventConsumer(event);
-		else this.eventQueue.push(event);
+		else {
+			if (this.eventQueue.length >= RemoteSession.MAX_QUEUED_EVENTS) {
+				this.eventQueue.shift();
+				this.droppedEventCount++;
+			}
+			this.eventQueue.push(event);
+		}
 	}
 	onMessage(message) {
 		if ("id" in message && message.id !== null && message.id !== void 0 && ("result" in message || "error" in message)) this.settleRequestWait(message.id);
@@ -5640,6 +5725,14 @@ function createRemoteApp(options) {
 	const authToken = dangerouslyOmitAuth ? "" : options.authToken || process.env[API_SERVER_ENV_VARS.AUTH_TOKEN] || randomBytes(32).toString("hex");
 	const app = new Hono();
 	const sessions = /* @__PURE__ */ new Map();
+	const sessionDetachGraceMs = options.sessionDetachGraceMs ?? RemoteSession.DEFAULT_DETACH_GRACE_MS;
+	const armSessionReap = (session) => {
+		session.armDetachGrace(sessionDetachGraceMs, () => {
+			sessions.delete(session.sessionId);
+			session.rejectActiveRequestWaits(/* @__PURE__ */ new Error("Session closed: no client attached"));
+			session.transport.close().catch(() => {});
+		});
+	};
 	const { logger: fileLogger, allowedOrigins } = options;
 	const storageDir = options.storageDir ?? getDefaultStorageDir();
 	const mcpConfigPath = options.mcpConfigPath ?? getDefaultMcpConfigPath();
@@ -5826,6 +5919,7 @@ function createRemoteApp(options) {
 			return c.json({ error: `Failed to start transport: ${msg}` }, is401 ? 401 : 500);
 		}
 		sessions.set(sessionId, session);
+		armSessionReap(session);
 		return c.json({ sessionId });
 	});
 	app.post("/api/mcp/send", async (c) => {
@@ -5916,13 +6010,14 @@ function createRemoteApp(options) {
 		const session = sessions.get(sessionId);
 		if (!session) return c.json({ error: "Session not found" }, 404);
 		return streamSSE(c, async (stream) => {
-			session.setEventConsumer((event) => {
+			const consumer = (event) => {
 				const data = JSON.stringify(event);
 				stream.writeSSE({
 					event: event.type,
 					data
 				});
-			});
+			};
+			session.setEventConsumer(consumer);
 			if (session.isTransportDead()) {
 				await new Promise((resolve) => setTimeout(resolve, 0));
 				session.clearEventConsumer();
@@ -5930,7 +6025,12 @@ function createRemoteApp(options) {
 				return;
 			}
 			await primeAndHoldSseStream(stream, () => {
-				if (session.clearEventConsumer() || session.isTransportDead()) sessions.delete(sessionId);
+				if (!session.detachEventConsumer(consumer)) return;
+				if (session.isTransportDead()) {
+					sessions.delete(sessionId);
+					return;
+				}
+				armSessionReap(session);
 			});
 		});
 	});
@@ -5945,6 +6045,7 @@ function createRemoteApp(options) {
 		if (!sessionId) return c.json({ error: "Missing sessionId" }, 400);
 		const session = sessions.get(sessionId);
 		if (session) {
+			session.cancelDetachGrace();
 			session.clearEventConsumer();
 			await session.transport.close();
 			sessions.delete(sessionId);
@@ -6608,8 +6709,9 @@ function createRemoteApp(options) {
 			const settled = await withWriteLock(async () => {
 				const rawInside = await readStoreFile(mcpConfigPath);
 				if (rawInside === null) {
-					await writeMcpAndTrackMtime(serializeStore(DEFAULT_SEED_CONFIG));
-					return DEFAULT_SEED_CONFIG;
+					const seed = defaultSeedConfig(tmpdir());
+					await writeMcpAndTrackMtime(serializeStore(seed));
+					return seed;
 				}
 				const parsedInside = parseStore(rawInside);
 				const inside = { mcpServers: normalizeMcpServers(parsedInside?.mcpServers) };
@@ -6972,7 +7074,8 @@ function honoMiddlewarePlugin(config) {
 				port: config.sandboxPort,
 				host: config.sandboxHost,
 				allowedOrigins: config.allowedOrigins,
-				publicUrl: config.sandboxPublicUrl
+				publicUrl: config.sandboxPublicUrl,
+				allowedHosts: config.allowedHosts
 			});
 			await sandboxController.start();
 			const appOriginController = createAppOriginController({
@@ -7277,6 +7380,9 @@ async function startViteDevServer(config) {
 }
 //#endregion
 //#region server/server.ts
+function isApiPath(path) {
+	return path === "/api" || path.startsWith("/api/");
+}
 const __filename$1 = fileURLToPath(import.meta.url);
 const __dirname$1 = dirname(__filename$1);
 async function startHonoServer(config) {
@@ -7284,7 +7390,8 @@ async function startHonoServer(config) {
 		port: config.sandboxPort,
 		host: config.sandboxHost,
 		allowedOrigins: config.allowedOrigins,
-		publicUrl: config.sandboxPublicUrl
+		publicUrl: config.sandboxPublicUrl,
+		allowedHosts: config.allowedHosts
 	});
 	await sandboxController.start();
 	const appOriginController = createAppOriginController({
@@ -7337,7 +7444,7 @@ async function startHonoServer(config) {
 	});
 	app.use("/*", serveStatic({ root: rootPath }));
 	app.get("*", async (c) => {
-		if (c.req.path.startsWith("/api")) return c.notFound();
+		if (isApiPath(c.req.path)) return c.notFound();
 		try {
 			return serveIndexHtml(c);
 		} catch (error) {
@@ -7404,14 +7511,6 @@ function ensureStdioCwd(config) {
 	};
 	return config;
 }
-function deriveSeedServerId(config) {
-	if (config.type === "sse" || config.type === "streamable-http") try {
-		return new URL(config.url).host || "server";
-	} catch {
-		return "server";
-	}
-	return config.command?.split(/[\\/]/).pop() || "server";
-}
 async function runWeb(argv) {
 	const program = new Command();
 	const argSeparatorIndex = argv.indexOf("--");
@@ -7487,7 +7586,7 @@ async function runWeb(argv) {
 			headers: opts.header
 		} : { ...config };
 		if (opts.protocolEra !== void 0) entry.protocolEra = opts.protocolEra;
-		initialServers = { mcpServers: { [deriveSeedServerId(config)]: entry } };
+		initialServers = { mcpServers: { [adHocServerName(config)]: entry } };
 		writable = false;
 	} else if (hasHeaders) {
 		console.error("Error: --header requires an ad-hoc --server-url or command target.");