Skip to content

Mobile MCP: let AI agents drive your iOS and Android apps. MCP server for simulators, emulators and real devices. Works with Claude Code, Codex, Cursor and any MCP client.

fix: follow-ups to server/discover serving (#463)

Gil Megidish2d5c1fa7538e
diff --git a/src/index.ts b/src/index.ts
index 5f8ea67..9d1165b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,6 +8,10 @@ import { error } from "./logger";
import { Request, Response } from "express";
import { program } from "commander";
+const logMcpError = (err: Error) => {
+ error("Error handling MCP request: " + (err.stack ?? String(err)));
+};
+
const startHttpServer = async (host: string, port: number) => {
// createMcpExpressApp applies express.json() and Host-header DNS rebinding
// protection automatically when binding to localhost / 127.0.0.1 / ::1.
@@ -49,11 +53,10 @@ const startHttpServer = async (host: string, port: number) => {
// from the same factory — the same per-request model as before.
// onerror keeps request-handling and transport failures in the application
// log (the SDK otherwise answers HTTP 500 silently).
- const onerror = (err: Error) => error("Error handling MCP request: " + (err.stack ?? String(err)));
- const handler = createMcpHandler(() => createMcpServer(), { onerror });
- const node = toNodeHandler(handler, { onerror });
+ const handler = createMcpHandler(() => createMcpServer(), { onerror: logMcpError });
+ const node = toNodeHandler(handler, { onerror: logMcpError });
- app.all("/mcp", (req: Request, res: Response) => {
+ app.post("/mcp", (req: Request, res: Response) => {
void node(req, res, req.body);
});
@@ -83,8 +86,10 @@ const startStdioServer = async () => {
// serveStdio owns the transport and the era decision for the
// connection: a `server/discover` probe (revision 2026-07-28) pins
// the connection modern, while an `initialize` handshake keeps
- // serving the 2025-era protocol exactly as before.
- serveStdio(() => createMcpServer());
+ // serving the 2025-era protocol exactly as before. The factory runs
+ // lazily on the first message, so a failing createMcpServer() surfaces
+ // through onerror rather than the catch below.
+ serveStdio(() => createMcpServer(), { onerror: logMcpError });
// Exit cleanly on termination signals so node flushes pending work
// (including NODE_V8_COVERAGE output). Node's default SIGINT/SIGTERM
diff --git a/test/server-discover.test.ts b/test/server-discover.test.ts
index 71da5a9..bdaea03 100644
--- a/test/server-discover.test.ts
+++ b/test/server-discover.test.ts
@@ -1,90 +1,89 @@
import { expect, test } from "@playwright/test";
-import { Client, InMemoryTransport } from "@modelcontextprotocol/client";
import { createMcpHandler } from "@modelcontextprotocol/server";
import { createMcpServer } from "../src/server";
-const discoverRequestBody = (id: string | number) =>
- JSON.stringify({
- jsonrpc: "2.0",
- id,
- method: "server/discover",
- params: {
- _meta: {
- "io.modelcontextprotocol/protocolVersion": "2026-07-28",
- "io.modelcontextprotocol/clientInfo": { name: "discover-test", version: "1.0.0" },
- "io.modelcontextprotocol/clientCapabilities": {},
- },
- },
- });
+process.env.MOBILEMCP_DISABLE_TELEMETRY = "1";
-test("serves server/discover for the 2026-07-28 protocol revision", async () => {
- const previousTelemetrySetting = process.env.MOBILEMCP_DISABLE_TELEMETRY;
- process.env.MOBILEMCP_DISABLE_TELEMETRY = "1";
+// createMcpHandler is the serving entry production uses; it marks each
+// request's instance as serving the 2026-07-28 era, which is what installs
+// the server/discover handler. A hand-constructed McpServer connected
+// straight to a transport never serves server/discover (the era gate
+// answers -32601 instead).
+const handler = createMcpHandler(() => createMcpServer());
+
+const postJsonRpc = async (body: object, extraHeaders: Record<string, string> = {}): Promise<Response> => {
+ return handler.fetch(
+ new Request("http://localhost/mcp", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ "Accept": "application/json, text/event-stream",
+ ...extraHeaders,
+ },
+ body: JSON.stringify(body),
+ }),
+ );
+};
- try {
- // createMcpHandler is the serving entry production uses; it marks
- // each request's instance as serving the 2026-07-28 era, which is
- // what installs the server/discover handler. A hand-constructed
- // McpServer connected straight to a transport never serves
- // server/discover (the era gate answers -32601 instead).
- const handler = createMcpHandler(() => createMcpServer());
+// Legacy (2025-era) answers come back as a single SSE "message" event.
+const readJsonRpcResult = async (response: Response): Promise<any> => {
+ const text = await response.text();
+ const dataLine = text.split("\n").find(line => line.startsWith("data: "));
+ const payload = JSON.parse(dataLine ? dataLine.slice("data: ".length) : text);
+ expect(payload.error).toBeUndefined();
+ return payload.result;
+};
- const response = await handler.fetch(
- new Request("http://localhost/mcp", {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- "Accept": "application/json, text/event-stream",
- "MCP-Protocol-Version": "2026-07-28",
- "Mcp-Method": "server/discover",
+test("serves server/discover for the 2026-07-28 protocol revision", async () => {
+ const response = await postJsonRpc(
+ {
+ jsonrpc: "2.0",
+ id: "discover-1",
+ method: "server/discover",
+ params: {
+ _meta: {
+ "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+ "io.modelcontextprotocol/clientInfo": { name: "discover-test", version: "1.0.0" },
+ "io.modelcontextprotocol/clientCapabilities": {},
},
- body: discoverRequestBody("discover-1"),
- }),
- );
+ },
+ },
+ {
+ "MCP-Protocol-Version": "2026-07-28",
+ "Mcp-Method": "server/discover",
+ },
+ );
- expect(response.status).toBe(200);
- const body = await response.json();
- expect(body.error).toBeUndefined();
- expect(body.result.supportedVersions).toContain("2026-07-28");
- expect(body.result.capabilities.tools).toBeDefined();
- expect(body.result.resultType).toBe("complete");
- expect(body.result._meta?.["io.modelcontextprotocol/serverInfo"]?.name).toBe("mobile-mcp");
- } finally {
- if (previousTelemetrySetting === undefined) {
- delete process.env.MOBILEMCP_DISABLE_TELEMETRY;
- } else {
- process.env.MOBILEMCP_DISABLE_TELEMETRY = previousTelemetrySetting;
- }
- }
+ expect(response.status).toBe(200);
+ const result = await readJsonRpcResult(response);
+ expect(result.supportedVersions).toContain("2026-07-28");
+ expect(result.capabilities.tools).toBeDefined();
+ expect(result.resultType).toBe("complete");
+ expect(result._meta?.["io.modelcontextprotocol/serverInfo"]?.name).toBe("mobile-mcp");
});
-test("still serves the legacy initialize handshake", async () => {
- const previousTelemetrySetting = process.env.MOBILEMCP_DISABLE_TELEMETRY;
- process.env.MOBILEMCP_DISABLE_TELEMETRY = "1";
-
- try {
- const server = createMcpServer();
- const client = new Client({ name: "legacy-test", version: "1.0.0" });
- const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+test("still serves the legacy initialize handshake through the same handler", async () => {
+ const response = await postJsonRpc({
+ jsonrpc: "2.0",
+ id: 1,
+ method: "initialize",
+ params: {
+ protocolVersion: "2025-11-25",
+ capabilities: {},
+ clientInfo: { name: "legacy-test", version: "1.0.0" },
+ },
+ });
- try {
- await server.connect(serverTransport);
- await client.connect(clientTransport);
+ expect(response.status).toBe(200);
+ const result = await readJsonRpcResult(response);
+ expect(result.protocolVersion).toBe("2025-11-25");
+ expect(result.serverInfo.name).toBe("mobile-mcp");
+});
- expect(client.getProtocolEra()).toBe("legacy");
- expect(client.getServerVersion()?.name).toBe("mobile-mcp");
+test("still serves legacy tools/list statelessly", async () => {
+ const response = await postJsonRpc({ jsonrpc: "2.0", id: 2, method: "tools/list" });
- const tools = await client.listTools();
- expect(tools.tools.length).toBeGreaterThan(0);
- } finally {
- await client.close();
- await server.close();
- }
- } finally {
- if (previousTelemetrySetting === undefined) {
- delete process.env.MOBILEMCP_DISABLE_TELEMETRY;
- } else {
- process.env.MOBILEMCP_DISABLE_TELEMETRY = previousTelemetrySetting;
- }
- }
+ expect(response.status).toBe(200);
+ const result = await readJsonRpcResult(response);
+ expect(result.tools.length).toBeGreaterThan(0);
});