staff-mcp 1.2.0 → 2.0.0

package/dist/src/transports/http.js

@@ -1,80 +1,282 @@
-import express from "express";
-import cors from "cors";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import { randomUUID } from "node:crypto";
-export async function startHttpServer(serverFactory, port, host = "0.0.0.0") {
+import { HttpDataSession } from '../data/HttpDataSession.js';
+import { handleNodeRequest } from '../data/node.js';
+import { configureExtensionData } from '../extensions/runtime.js';
+import { hasServerActivity } from '../utils/server-activity.js';
+import express from 'express';
+import cors from 'cors';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { isInitializeRequest, isJSONRPCRequest, } from '@modelcontextprotocol/sdk/types.js';
+import { randomUUID, timingSafeEqual } from 'node:crypto';
+export function getHttpAuthToken(token) {
+    if (token === undefined)
+        return undefined;
+    if (!token || /\s/.test(token)) {
+        throw new Error('--http-token must be non-empty and contain no whitespace when provided.');
+    }
+    return token;
+}
+export const HTTP_MAX_SESSIONS = 64;
+export const HTTP_SESSION_IDLE_MS = 30 * 60 * 1000;
+export function resolveHttpSessionPolicy(policy = {}) {
+    const maxSessions = policy.maxSessions ?? HTTP_MAX_SESSIONS;
+    const idleTimeoutMs = policy.idleTimeoutMs ?? HTTP_SESSION_IDLE_MS;
+    if (!Number.isSafeInteger(maxSessions) || maxSessions <= 0)
+        throw new Error('HTTP max sessions must be a positive safe integer.');
+    if (!Number.isInteger(idleTimeoutMs) ||
+        idleTimeoutMs <= 0 ||
+        idleTimeoutMs > 2_147_483_647)
+        throw new Error('HTTP session idle timeout must be 1..2147483647 ms.');
+    return { maxSessions, idleTimeoutMs };
+}
+export async function startHttpServer(serverFactory, port, host = '0.0.0.0', token, policy = {}) {
+    const { maxSessions, idleTimeoutMs } = resolveHttpSessionPolicy(policy);
+    const authToken = getHttpAuthToken(token);
     const app = express();
-    // Enable CORS for all origins, including the MCP Inspector
+    let stopping = false;
+    const sessions = new Map();
+    const dataSessions = new Map();
+    const closeSession = (id, session) => {
+        session.closing ??= Promise.resolve()
+            .then(() => session.server.close())
+            .then(() => {
+            if (sessions.get(id) === session)
+                sessions.delete(id);
+        });
+        return session.closing;
+    };
+    const observeClose = (id, session) => {
+        void closeSession(id, session).catch(() => console.error('[staff-mcp] HTTP session cleanup failed.'));
+    };
+    const sweepIdle = () => {
+        const now = performance.now();
+        for (const [id, session] of sessions) {
+            if (session.closing)
+                continue;
+            if (session.initializing || hasServerActivity(session.server)) {
+                session.idleSince = undefined;
+            }
+            else if (session.idleSince === undefined) {
+                session.idleSince = now;
+            }
+            else if (now - session.idleSince >= idleTimeoutMs) {
+                // Fence synchronously; cleanup keeps its slot until it succeeds.
+                observeClose(id, session);
+            }
+        }
+    };
+    const reject = (res, status, message) => {
+        if (!res.headersSent && !res.destroyed) {
+            res.status(status).json({
+                jsonrpc: '2.0',
+                id: null,
+                error: {
+                    code: status === 404
+                        ? -32001
+                        : status === 429
+                            ? -32000
+                            : -32600,
+                    message,
+                },
+            });
+        }
+    };
+    // CORS preflight is public and never reaches MCP session handling.
     app.use(cors());
-    // Necessary for processing JSON-RPC messages (POST).
-    // Large limit required to support MCP File Transfer Extension (FTE)
-    // which sends base64-encoded file chunks up to 2 MiB (~2.67 MiB JSON).
+    app.use((_req, res, next) => {
+        if (stopping)
+            return reject(res, 503, 'Server is stopping');
+        next();
+    });
+    // Session-owned public data endpoints must bypass the MCP JSON parser.
+    app.use((req, res, next) => {
+        const match = /^\/mcp\/data\/([A-Za-z0-9_-]{16,256})(?:\/|$)/.exec(req.url);
+        if (!match)
+            return next();
+        const session = dataSessions.get(match[1]);
+        if (!session) {
+            res.status(404).end();
+            return;
+        }
+        void handleNodeRequest(session, req, res).then((handled) => {
+            if (!handled && !res.headersSent)
+                res.status(404).end();
+        }, () => {
+            console.error('[staff-mcp] HTTP data request failed.');
+            if (!res.headersSent)
+                res.status(500).end();
+            else
+                res.destroy();
+        });
+    });
+    // When configured, authenticate before parsing bodies or accessing sessions.
+    if (authToken !== undefined) {
+        const expectedToken = Buffer.from(authToken);
+        app.use(['/mcp', '/sse', '/messages'], (req, res, next) => {
+            const match = /^Bearer +(\S+)$/i.exec(req.headers.authorization ?? '');
+            const providedToken = Buffer.from(match?.[1] ?? '');
+            if (providedToken.length !== expectedToken.length ||
+                !timingSafeEqual(providedToken, expectedToken)) {
+                res.setHeader('WWW-Authenticate', 'Bearer realm="staff-mcp"');
+                res.status(401).json({ error: 'Unauthorized' });
+                return;
+            }
+            next();
+        });
+    }
+    // Preserve ordinary tool payloads; binary data bypasses this parser.
     app.use(express.json({ limit: '50mb' }));
-    // === Session Pool ===
-    const sessions = new Map();
     const mcpHandler = async (req, res) => {
-        const sessionId = req.headers["mcp-session-id"];
-        // 1. 尝试复用已有会话
-        if (sessionId && sessions.has(sessionId)) {
-            const t = sessions.get(sessionId);
+        const sessionId = req.headers['mcp-session-id'];
+        if (sessionId !== undefined) {
+            if (typeof sessionId !== 'string' || !sessionId) {
+                return reject(res, 400, 'Invalid MCP session ID');
+            }
+            const session = sessions.get(sessionId);
+            if (!session || session.closing) {
+                return reject(res, 404, 'Session not found');
+            }
             try {
-                await t.handleRequest(req, res, req.body);
+                await session.transport.handleRequest(req, res, req.body);
             }
-            catch (error) {
-                console.error("[MCP HTTP Error]:", error);
-                if (!res.headersSent) {
-                    res.status(500).json({
-                        error: "Internal Server Error",
-                        message: error instanceof Error ? error.message : String(error)
-                    });
-                }
+            catch {
+                console.error('[staff-mcp] HTTP control request failed.');
+                reject(res, 500, 'Internal Server Error');
             }
             return;
         }
-        // 2. 没有对应会话，或者是一个新的 GET 请求，创建新的
-        const newSessionId = randomUUID();
-        const server = serverFactory();
-        // 如果客户端带了旧的、已失效的 sessionId 试图重连，
-        // 必须从 headers 中抹除，否则底层 SDK 会因为它与新分配的 newSessionId 不一致而直接报错 400
-        if (sessionId) {
-            delete req.headers["mcp-session-id"];
-            delete req.headers["last-event-id"];
+        // A stale ID, GET, DELETE or malformed request cannot allocate resources.
+        if (req.method !== 'POST' ||
+            !isJSONRPCRequest(req.body) ||
+            !isInitializeRequest(req.body)) {
+            return reject(res, 400, 'A new session requires initialization');
         }
-        const t = new StreamableHTTPServerTransport({
-            sessionIdGenerator: () => newSessionId,
-            enableJsonResponse: true,
-        });
-        // 监听关闭事件，正常触发时清理自身
-        t.onclose = () => {
-            console.log(`[HTTP] Session Closed: ${newSessionId}`);
-            sessions.delete(newSessionId);
+        // JSON body parsing can finish after shutdown has started.
+        if (stopping)
+            return reject(res, 503, 'Server is stopping');
+        sweepIdle();
+        if (sessions.size >= maxSessions)
+            return reject(res, 429, 'HTTP session capacity reached');
+        const id = randomUUID();
+        let session;
+        const disconnected = () => {
+            if (!res.writableFinished && session)
+                observeClose(id, session);
         };
-        await server.connect(t);
-        sessions.set(newSessionId, t);
         try {
-            await t.handleRequest(req, res, req.body);
-        }
-        catch (error) {
-            console.error("[MCP HTTP Error]:", error);
-            if (!res.headersSent) {
-                res.status(500).json({
-                    error: "Internal Server Error",
-                    message: error instanceof Error ? error.message : String(error)
+            const server = serverFactory();
+            const transport = new StreamableHTTPServerTransport({
+                sessionIdGenerator: () => id,
+                enableJsonResponse: true,
+            });
+            session = { server, transport, initializing: true };
+            const owned = session;
+            // The SDK calls this only after parsing/validating the control message.
+            // Neither an idle GET SSE stream nor invalid HTTP/data traffic renews it.
+            transport.onmessage = () => {
+                owned.idleSince = undefined;
+            };
+            // Include starting sessions in shutdown ownership before the first await.
+            sessions.set(id, session);
+            transport.onclose = () => observeClose(id, owned);
+            res.once('close', disconnected);
+            configureExtensionData(server, (binding, accept, signal, origin, supportsPurpose) => {
+                signal.throwIfAborted();
+                if (stopping || owned.closing)
+                    throw new Error('HTTP session is closing.');
+                if (dataSessions.has(binding))
+                    throw new Error('Data binding already exists.');
+                const authority = req.get('host');
+                if (!authority)
+                    throw new Error('MCP HTTP Host header is required.');
+                const endpoint = new URL(`/mcp/data/${binding}`, origin ?? `${req.protocol}://${authority}`).href;
+                const data = new HttpDataSession({
+                    role: 'remote',
+                    binding,
+                    endpoint,
+                    accept,
+                    supportsPurpose,
+                    fetch: async () => {
+                        throw new Error('Outbound data is unavailable in HTTP listener mode');
+                    },
+                    validateEndpoint: () => {
+                        throw new Error('Outbound data endpoint is unavailable in HTTP listener mode');
+                    },
                 });
+                dataSessions.set(binding, data);
+                return {
+                    session: data,
+                    endpoint,
+                    close: () => {
+                        if (dataSessions.get(binding) === data)
+                            dataSessions.delete(binding);
+                    },
+                };
+            });
+            await server.connect(transport);
+            if (stopping || session.closing) {
+                await closeSession(id, session);
+                return reject(res, 503, 'Server is stopping');
+            }
+            await transport.handleRequest(req, res, req.body);
+            if (!transport.sessionId ||
+                res.statusCode >= 400 ||
+                (res.destroyed && !res.writableFinished)) {
+                await closeSession(id, session);
+            }
+        }
+        catch {
+            if (session) {
+                await closeSession(id, session).catch(() => console.error('[staff-mcp] HTTP session cleanup failed.'));
             }
+            console.error('[staff-mcp] HTTP initialization failed.');
+            reject(res, 500, 'Internal Server Error');
+        }
+        finally {
+            if (session) {
+                session.initializing = false;
+                session.idleSince = undefined;
+            }
+            res.removeListener('close', disconnected);
         }
     };
-    // Route for all MCP interactions.
-    app.all("/mcp", mcpHandler);
-    // Standard fallbacks
-    app.get("/sse", mcpHandler);
-    app.post("/messages", mcpHandler);
-    return new Promise((resolve) => {
-        app.listen(port, host, () => {
-            console.error(`[MCP HTTP] Server listening on http://${host}:${port}/mcp`);
-            console.error(`[MCP HTTP] JSON Response enabled: true`);
+    app.all('/mcp', mcpHandler);
+    app.get('/sse', mcpHandler);
+    app.post('/messages', mcpHandler);
+    const listener = app.listen(port, host);
+    await new Promise((resolve, reject) => {
+        listener.once('error', reject);
+        listener.once('listening', () => {
+            listener.removeListener('error', reject);
             resolve();
         });
     });
+    const address = listener.address();
+    console.error(`[MCP HTTP] Server listening on http://${host}:${address.port}/mcp`);
+    // One bounded sweep per listener; no per-session timers or resource lease changes.
+    const idleTimer = setInterval(sweepIdle, Math.min(idleTimeoutMs, 60_000));
+    idleTimer.unref();
+    let stopped;
+    return {
+        port: address.port,
+        stop: () => {
+            if (stopped)
+                return stopped;
+            stopping = true;
+            clearInterval(idleTimer);
+            // Stop accepting first, but keep the listener alive until owned cleanup settles.
+            const listenerClosed = new Promise((resolve, reject) => {
+                listener.close((error) => (error ? reject(error) : resolve()));
+            });
+            stopped = (async () => {
+                const results = await Promise.allSettled([...sessions].map(([id, session]) => closeSession(id, session)));
+                listener.closeAllConnections();
+                await listenerClosed;
+                const failed = results.filter((result) => result.status === 'rejected');
+                if (failed.length)
+                    throw new AggregateError(failed.map((result) => result.reason), 'HTTP session cleanup failed');
+            })();
+            return stopped;
+        },
+    };
 }
 //# sourceMappingURL=http.js.map

package/dist/src/transports/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/transports/http.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,aAA8B,EAAE,IAAY,EAAE,OAAe,SAAS;IAC1G,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,2DAA2D;IAC3D,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhB,qDAAqD;IACrD,oEAAoE;IACpE,uEAAuE;IACvE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAEzC,uBAAuB;IACvB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyC,CAAC;IAElE,MAAM,UAAU,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;QACvE,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAuB,CAAC;QAEtE,cAAc;QACd,IAAI,SAAS,IAAI,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oBACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,KAAK,EAAE,uBAAuB;wBAC9B,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAChE,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QAED,gCAAgC;QAChC,MAAM,YAAY,GAAG,UAAU,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;QAE/B,iCAAiC;QACjC,+DAA+D;QAC/D,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACrC,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,CAAC,GAAG,IAAI,6BAA6B,CAAC;YAC1C,kBAAkB,EAAE,GAAG,EAAE,CAAC,YAAY;YACtC,kBAAkB,EAAE,IAAI;SACzB,CAAC,CAAC;QAEH,mBAAmB;QACnB,CAAC,CAAC,OAAO,GAAG,GAAG,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;YACtD,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC,CAAC;QAEF,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,uBAAuB;oBAC9B,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAChE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,kCAAkC;IAClC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5B,qBAAqB;IACrB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC5B,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAElC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,yCAAyC,IAAI,IAAI,IAAI,MAAM,CAAC,CAAC;YAC3E,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/transports/http.ts"],"names":[],"mappings":"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"}

package/dist/src/transports/reverse.d.ts

@@ -1,23 +1,27 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { Logger, ReconnectOptions, SSEHeartbeatOptions } from "mcp-reverse";
-import { ReverseMCPClient } from "mcp-reverse/client";
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export { reverseProxyUrl, validateReverseUrl } from '../reverse/http.js';
 export interface ReverseServerOptions {
-    /** Timeout for establishing each SSE connection. 0 disables the timeout. */
+    proxy?: string;
     connectTimeout?: number;
-    /** Deadline for MCP initialization after the SSE transport opens. */
     initializationTimeout?: number;
-    /** Override liveness monitoring without changing tool execution timeouts. */
-    heartbeat?: SSEHeartbeatOptions;
-    /** Override the automatic reconnect policy. */
-    reconnect?: ReconnectOptions;
-    /** Override reverse transport and lifecycle logging. */
-    logger?: Logger;
+    heartbeat?: {
+        readTimeout?: number;
+    };
+    reconnect?: {
+        enabled?: boolean;
+        initialDelay?: number;
+        maxDelay?: number;
+        stableConnectionMs?: number;
+    };
+    logger?: {
+        info(message: string): void;
+        warn(message: string): void;
+        error(message: string): void;
+    };
 }
-/**
- * Start a reverse MCP connection to a public gateway.
- *
- * The ReverseMCPClient owns transport lifecycle, reconnection, and MCP
- * protocol re-binding. start() launches the connection loop; readiness is
- * reported asynchronously through the connected event/log.
- */
-export declare function startReverseServer(server: McpServer, url: string, token: string, name: string, options?: ReverseServerOptions): Promise<ReverseMCPClient>;
+export interface ReverseController {
+    stop(): Promise<void>;
+    readonly closed: Promise<void>;
+}
+/** New HTTP pool, SDK transport and data resources per attempt; never replay requests or input. */
+export declare function startReverseServer(serverFactory: () => McpServer, value: string, token: string, name: string, options?: ReverseServerOptions): Promise<ReverseController>;

package/dist/src/transports/reverse.js

@@ -1,78 +1,134 @@
-import { ReverseMCPClient } from "mcp-reverse/client";
-const DEFAULT_CONNECT_TIMEOUT_MS = 15_000;
-/**
- * Render an error with its full `cause` chain. Network failures from
- * Node's fetch surface as a bare "fetch failed" message; the actionable
- * reason (ECONNREFUSED, certificate errors, ...) lives in error.cause.
- */
-function formatErrorChain(error) {
-    const messages = [];
-    let current = error;
-    while (current instanceof Error) {
-        messages.push(current.message);
-        current = current.cause;
-    }
-    return messages.length > 0 ? messages.join("; cause: ") : String(error);
-}
-function createReverseLogger() {
-    const debugEnabled = process.env.STAFF_MCP_REVERSE_DEBUG === "1";
-    return {
-        debug: debugEnabled
-            ? (message, ...args) => console.error(`[staff-mcp][reverse][debug] ${message}`, ...args)
-            : () => { },
-        info: (message, ...args) => console.error(`[staff-mcp][reverse][info] ${message}`, ...args),
-        warn: (message, ...args) => console.error(`[staff-mcp][reverse][warn] ${message}`, ...args),
-        error: (message, ...args) => console.error(`[staff-mcp][reverse][error] ${message}`, ...args),
+import { performance } from 'node:perf_hooks';
+import { setTimeout as delay } from 'node:timers/promises';
+import { configureExtensionData } from '../extensions/runtime.js';
+import { HttpDataSession } from '../data/HttpDataSession.js';
+import { ReverseSseTransport } from '../reverse/SseTransport.js';
+import { createReverseHttp, reverseProxyUrl, validateReverseUrl, } from '../reverse/http.js';
+export { reverseProxyUrl, validateReverseUrl } from '../reverse/http.js';
+/** New HTTP pool, SDK transport and data resources per attempt; never replay requests or input. */
+export async function startReverseServer(serverFactory, value, token, name, options = {}) {
+    const url = validateReverseUrl(value);
+    const proxy = reverseProxyUrl(url, options.proxy);
+    if (!token || /\s/.test(token) || token.length > 4096)
+        throw new Error('Invalid reverse token.');
+    if (!name || name.length > 512 || /[\u0000-\u001f\u007f]/.test(name))
+        throw new Error('Invalid reverse server name.');
+    const log = options.logger ?? {
+        info: (message) => console.error(`[staff-mcp][reverse] ${message}`),
+        warn: (message) => console.error(`[staff-mcp][reverse] ${message}`),
+        error: (message) => console.error(`[staff-mcp][reverse] ${message}`),
     };
-}
-/**
- * Start a reverse MCP connection to a public gateway.
- *
- * The ReverseMCPClient owns transport lifecycle, reconnection, and MCP
- * protocol re-binding. start() launches the connection loop; readiness is
- * reported asynchronously through the connected event/log.
- */
-export async function startReverseServer(server, url, token, name, options = {}) {
-    const reconnectEnabled = options.reconnect?.enabled !== false;
-    const reverseLogger = options.logger ?? createReverseLogger();
-    const client = await ReverseMCPClient.createSSE(server, {
-        url,
-        serverName: name,
-        authToken: token,
-        connectTimeout: options.connectTimeout ?? DEFAULT_CONNECT_TIMEOUT_MS,
-        initializationTimeout: options.initializationTimeout,
-        heartbeat: options.heartbeat,
-        reconnect: {
-            initialDelay: 1000,
-            maxDelay: 30000,
-            multiplier: 2,
-            maxRetries: 0, // 0 = infinite
-            ...options.reconnect,
-        },
-    }, reverseLogger);
-    client.on("connected", () => {
-        reverseLogger.info(`MCP initialized and ready as "${name}"`);
-    });
-    client.on("disconnected", () => {
-        reverseLogger.warn(reconnectEnabled
-            ? "Gateway connection closed; automatic reconnect is enabled"
-            : "Gateway connection closed; automatic reconnect is disabled");
-    });
-    client.on("reconnecting", (completedAttempts) => {
-        if (completedAttempts === 0) {
-            reverseLogger.info("Reconnect cycle started");
-        }
-        else {
-            reverseLogger.info(`Connection lost after ${completedAttempts} attempt(s) in the current retry cycle`);
+    if (url.protocol === 'http:')
+        log.warn('Explicit HTTP reverse control uses plaintext; use HTTPS on untrusted networks.');
+    const abort = new AbortController();
+    let active;
+    let backoff = options.reconnect?.initialDelay ?? 1000;
+    const run = async () => {
+        while (!abort.signal.aborted) {
+            let server;
+            let initializedAt;
+            let previousInitialized;
+            let initializationTimer;
+            const attempt = new AbortController();
+            const stopped = () => {
+                attempt.abort();
+                void active?.close();
+            };
+            abort.signal.addEventListener('abort', stopped, { once: true });
+            const http = createReverseHttp(url, proxy, attempt.signal);
+            const transport = new ReverseSseTransport(url, { Authorization: `Bearer ${token}`, 'X-MCP-Server-Name': name }, http.fetch, options.connectTimeout, options.heartbeat?.readTimeout);
+            active = transport;
+            try {
+                server = serverFactory();
+                configureExtensionData(server, (binding, accept, signal, origin, supportsPurpose) => {
+                    if (origin !== undefined)
+                        throw new Error('Reverse data does not accept an advertised origin');
+                    const sessionId = transport.sessionId;
+                    if (!sessionId ||
+                        attempt.signal.aborted ||
+                        signal.aborted)
+                        throw new Error('Reverse data control session unavailable');
+                    const expected = new URL(url.href);
+                    expected.pathname =
+                        url.pathname.replace(/\/$/, '') +
+                            '/data/' +
+                            sessionId;
+                    return {
+                        session: new HttpDataSession({
+                            role: 'remote',
+                            binding,
+                            accept,
+                            supportsPurpose,
+                            fetch: http.fetch,
+                            validateEndpoint: (endpoint) => {
+                                if (endpoint.origin !== expected.origin ||
+                                    endpoint.pathname !==
+                                        expected.pathname ||
+                                    endpoint.username ||
+                                    endpoint.password ||
+                                    endpoint.search ||
+                                    endpoint.hash)
+                                    throw new Error('Reverse data endpoint rejected');
+                            },
+                        }),
+                    };
+                });
+                previousInitialized = server.server.oninitialized;
+                server.server.oninitialized = () => {
+                    previousInitialized?.();
+                    initializedAt = performance.now();
+                    clearTimeout(initializationTimer);
+                    log.info('MCP initialized on a new SSE session.');
+                };
+                await server.connect(transport);
+                // start() completes once the SSE endpoint is admitted; only then start the initialization deadline.
+                if (initializedAt === undefined) {
+                    initializationTimer = setTimeout(() => {
+                        void transport.close();
+                    }, options.initializationTimeout ?? 15000);
+                    initializationTimer.unref();
+                }
+                await transport.closed;
+            }
+            catch {
+                if (!abort.signal.aborted)
+                    log.warn('Connection attempt ended before readiness or control connection closed.');
+            }
+            finally {
+                clearTimeout(initializationTimer);
+                await transport.close().catch(() => { });
+                attempt.abort();
+                await http.close().catch(() => { });
+                abort.signal.removeEventListener('abort', stopped);
+                await server?.close();
+                if (server)
+                    server.server.oninitialized = previousInitialized;
+                active = undefined;
+            }
+            if (abort.signal.aborted || options.reconnect?.enabled === false)
+                break;
+            if (initializedAt !== undefined &&
+                performance.now() - initializedAt >=
+                    (options.reconnect?.stableConnectionMs ?? 30000))
+                backoff = options.reconnect?.initialDelay ?? 1000;
+            log.info('Disconnected; retrying with a new session and no replay.');
+            try {
+                await delay(backoff, undefined, { signal: abort.signal });
+            }
+            catch {
+                break;
+            }
+            backoff = Math.min(options.reconnect?.maxDelay ?? 30000, backoff * 2);
         }
-    });
-    client.on("error", (error) => {
-        reverseLogger.error(`Transport reported an error: ${formatErrorChain(error)}`);
-    });
-    client.on("failed", (error) => {
-        reverseLogger.error(`Reconnect budget exhausted: ${formatErrorChain(error)}`);
-    });
-    await client.start();
-    return client;
+    };
+    const closed = run();
+    return {
+        closed,
+        stop: async () => {
+            abort.abort();
+            await active?.close().catch(() => { });
+            await closed;
+        },
+    };
 }
 //# sourceMappingURL=reverse.js.map