Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
565 changes: 58 additions & 507 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,15 @@
"test:coverage": "vitest run --coverage"
},
"dependencies": {
"@modelcontextprotocol/sdk": "^1.29.0",
"@modelcontextprotocol/node": "^2.1.1",
"@modelcontextprotocol/server": "^2.3.1",
"cors": "^2.8.5",
"express": "^4.21.2",
"undici": "^6.20.0",
"zod": "^3.25.46"
"zod": "^4.2.0"
},
"devDependencies": {
"@modelcontextprotocol/client": "^2.3.1",
"@types/cors": "^2.8.17",
"@types/express": "^5.0.0",
"@types/node": "^20",
Expand All @@ -77,6 +79,6 @@
"vitest": "^4.0.5"
},
"engines": {
"node": ">=18"
"node": ">=20"
}
}
37 changes: 37 additions & 0 deletions src/http.config.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
import type { Server } from "http";
import { Client, StreamableHTTPClientTransport } from "@modelcontextprotocol/client";
import { createHttpApp, buildAllowedHosts } from "./http.js";

/**
Expand Down Expand Up @@ -105,6 +106,11 @@ describe("HTTP transport configuration", () => {
expect(preflight.headers.get("access-control-allow-origin")).toBe(
"https://app.example",
);
// Browser clients on the 2026-07-28 revision send these on every request.
const allowedHeaders = preflight.headers.get("access-control-allow-headers")?.toLowerCase();
for (const header of ["mcp-protocol-version", "mcp-method", "mcp-name"]) {
expect(allowedHeaders).toContain(header);
}
});

it("does not allow a non-allowlisted origin even when others are allowlisted", async () => {
Expand Down Expand Up @@ -382,6 +388,37 @@ describe("HTTP transport configuration", () => {
expect(data.result.tools).toHaveLength(4);
});

it("serves clients that negotiate the 2026-07-28 revision", async () => {
await start();

const client = new Client(
{ name: "test-client", version: "1.0.0" },
{ versionNegotiation: { mode: "auto" } },
);
await client.connect(new StreamableHTTPClientTransport(new URL(`${baseUrl}/mcp`)));
try {
expect(client.getProtocolEra()).toBe("modern");
const { tools } = await client.listTools();
expect(tools).toHaveLength(4);
} finally {
await client.close();
}
});

it("keeps serving clients that open with initialize", async () => {
await start();

const client = new Client({ name: "test-client", version: "1.0.0" });
await client.connect(new StreamableHTTPClientTransport(new URL(`${baseUrl}/mcp`)));
try {
expect(client.getProtocolEra()).toBe("legacy");
const { tools } = await client.listTools();
expect(tools).toHaveLength(4);
} finally {
await client.close();
}
});

it("serves the health endpoint", async () => {
await start();

Expand Down
33 changes: 30 additions & 3 deletions src/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

import express, { type Express } from "express";
import cors from "cors";
import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
import {
NodeStreamableHTTPServerTransport,
toNodeHandler,
toWebRequest,
} from "@modelcontextprotocol/node";
import { createMcpHandler, isLegacyRequest } from "@modelcontextprotocol/server";
import { createPerplexityServer } from "./server.js";
import { logger } from "./logger.js";

Expand Down Expand Up @@ -91,7 +96,13 @@ export function createHttpApp(options: HttpAppOptions): Express {
return callback(new CorsOriginNotAllowedError(origin));
},
exposedHeaders: ["Mcp-Session-Id", "mcp-protocol-version"],
allowedHeaders: ["Content-Type", "mcp-session-id"],
allowedHeaders: [
"Content-Type",
"mcp-session-id",
"mcp-protocol-version",
"mcp-method",
"mcp-name",
],
}),
);

Expand Down Expand Up @@ -124,11 +135,27 @@ export function createHttpApp(options: HttpAppOptions): Express {

app.use(express.json());

// Requests on the 2026-07-28 revision carry their protocol version per
// request; everything else is a 2025-era client and keeps the stateless
// JSON transport below.
const onerror = (error: Error) => {
logger.error("Error handling MCP request", { error: String(error) });
};
const modern = toNodeHandler(
createMcpHandler(() => createPerplexityServer(), { legacy: "reject", onerror }),
{ onerror },
);

app.all("/mcp", async (req, res) => {
try {
if (!(await isLegacyRequest(await toWebRequest(req, req.body)))) {
await modern(req, res, req.body);
return;
}

// Stateless mode: a Protocol instance supports one transport, so build
// a fresh server + transport pair per request.
const transport = new StreamableHTTPServerTransport({
const transport = new NodeStreamableHTTPServerTransport({
sessionIdGenerator: undefined,
enableJsonResponse: true,
});
Expand Down
21 changes: 6 additions & 15 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node

import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
import { serveStdio } from "@modelcontextprotocol/server/stdio";
import { createPerplexityServer } from "./server.js";

const PERPLEXITY_API_KEY = process.env.PERPLEXITY_API_KEY;
Expand All @@ -9,19 +9,10 @@ if (!PERPLEXITY_API_KEY) {
process.exit(1);
}

async function main() {
try {
const server = createPerplexityServer("local-mcp");
const transport = new StdioServerTransport();
await server.connect(transport);
} catch (error) {
console.error("Fatal error running server:", error);
process.exit(1);
}
}

main().catch((error) => {
try {
// One server per connection; the opening exchange picks the protocol revision.
serveStdio(() => createPerplexityServer("local-mcp"));
} catch (error) {
console.error("Fatal error running server:", error);
process.exit(1);
});

}
4 changes: 2 additions & 2 deletions src/server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ describe("Server Utility Functions", () => {
describe("createPerplexityServer tools/list schemas", () => {
it("advertises JSON Schema 2020-12 on every input and output schema", async () => {
vi.stubEnv("PERPLEXITY_API_KEY", "pplx-test");
const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
const { InMemoryTransport } = await import("@modelcontextprotocol/sdk/inMemory.js");
const { Client } = await import("@modelcontextprotocol/client");
const { InMemoryTransport } = await import("@modelcontextprotocol/server");
const { createPerplexityServer } = await import("./server.js");

const server = createPerplexityServer();
Expand Down
Loading
Loading