mcp-proxy 5.10.0 → 5.11.1

package/dist/bin/mcp-proxy.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Client, InMemoryEventStore, ReadBuffer, Server, __commonJS, __toESM, proxyServer, serializeMessage, startHTTPServer } from "../stdio-DF5lH8jj.js";
+import { Client, InMemoryEventStore, ReadBuffer, Server, __commonJS, __toESM, proxyServer, serializeMessage, startHTTPServer } from "../stdio-DLSsHME0.js";
 import { createRequire } from "node:module";
 import { basename, dirname, extname, join, normalize, relative, resolve } from "path";
 import { format, inspect } from "util";

package/dist/index.d.ts

@@ -11,15 +11,25 @@ import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 interface AuthConfig {
   apiKey?: string;
   oauth?: {
+    error?: string;
+    error_description?: string;
+    error_uri?: string;
     protectedResource?: {
       resource?: string;
     };
+    realm?: string;
+    scope?: string;
   };
 }
 declare class AuthenticationMiddleware {
   private config;
   constructor(config?: AuthConfig);
-  getUnauthorizedResponse(): {
+  getUnauthorizedResponse(options?: {
+    error?: string;
+    error_description?: string;
+    error_uri?: string;
+    scope?: string;
+  }): {
     body: string;
     headers: Record<string, string>;
   };
@@ -34,6 +44,8 @@ declare class AuthenticationMiddleware {
  */
 declare class InMemoryEventStore implements EventStore {
   private events;
+  private lastTimestamp;
+  private lastTimestampCounter;
   /**
    * Replays events that occurred after a specific event ID
    * Implements EventStore.replayEventsAfter
@@ -49,7 +61,8 @@ declare class InMemoryEventStore implements EventStore {
    */
   storeEvent(streamId: string, message: JSONRPCMessage): Promise<string>;
   /**
-   * Generates a unique event ID for a given stream ID
+   * Generates a monotonic unique event ID in
+   * `${streamId}_${timestamp}_${counter}_${random}` format.
    */
   private generateEventId;
   /**

package/dist/index.js

@@ -1,4 +1,4 @@
-import { AuthenticationMiddleware, Client, InMemoryEventStore, JSONRPCMessageSchema, LATEST_PROTOCOL_VERSION, NEVER, ReadBuffer, Server, ZodIssueCode, anyType, arrayType, booleanType, isInitializedNotification, isJSONRPCRequest, isJSONRPCResponse, numberType, objectType, proxyServer, serializeMessage, startHTTPServer, stringType } from "./stdio-DF5lH8jj.js";
+import { AuthenticationMiddleware, Client, InMemoryEventStore, JSONRPCMessageSchema, LATEST_PROTOCOL_VERSION, NEVER, ReadBuffer, Server, ZodIssueCode, anyType, arrayType, booleanType, isInitializedNotification, isJSONRPCRequest, isJSONRPCResponse, numberType, objectType, proxyServer, serializeMessage, startHTTPServer, stringType } from "./stdio-DLSsHME0.js";
 import process from "node:process";
 
 //#region node_modules/.pnpm/eventsource-parser@3.0.6/node_modules/eventsource-parser/dist/index.js

package/dist/{stdio-DF5lH8jj.js → stdio-DLSsHME0.js}

@@ -35,14 +35,27 @@ var AuthenticationMiddleware = class {
 	constructor(config = {}) {
 		this.config = config;
 	}
-	getUnauthorizedResponse() {
+	getUnauthorizedResponse(options) {
 		const headers = { "Content-Type": "application/json" };
-		if (this.config.oauth?.protectedResource?.resource) headers["WWW-Authenticate"] = `Bearer resource_metadata="${this.config.oauth.protectedResource.resource}/.well-known/oauth-protected-resource"`;
+		if (this.config.oauth) {
+			const params = [];
+			if (this.config.oauth.realm) params.push(`realm="${this.config.oauth.realm}"`);
+			if (this.config.oauth.protectedResource?.resource) params.push(`resource_metadata="${this.config.oauth.protectedResource.resource}/.well-known/oauth-protected-resource"`);
+			const error = options?.error || this.config.oauth.error || "invalid_token";
+			params.push(`error="${error}"`);
+			const escaped = (options?.error_description || this.config.oauth.error_description || "Unauthorized: Invalid or missing API key").replace(/"/g, "\\\"");
+			params.push(`error_description="${escaped}"`);
+			const error_uri = options?.error_uri || this.config.oauth.error_uri;
+			if (error_uri) params.push(`error_uri="${error_uri}"`);
+			const scope = options?.scope || this.config.oauth.scope;
+			if (scope) params.push(`scope="${scope}"`);
+			if (params.length > 0) headers["WWW-Authenticate"] = `Bearer ${params.join(", ")}`;
+		}
 		return {
 			body: JSON.stringify({
 				error: {
 					code: 401,
-					message: "Unauthorized: Invalid or missing API key"
+					message: options?.error_description || "Unauthorized: Invalid or missing API key"
 				},
 				id: null,
 				jsonrpc: "2.0"
@@ -67,6 +80,8 @@ var AuthenticationMiddleware = class {
 */
 var InMemoryEventStore = class {
 	events = /* @__PURE__ */ new Map();
+	lastTimestamp = 0;
+	lastTimestampCounter = 0;
 	/**
 	* Replays events that occurred after a specific event ID
 	* Implements EventStore.replayEventsAfter
@@ -100,10 +115,20 @@ var InMemoryEventStore = class {
 		return eventId;
 	}
 	/**
-	* Generates a unique event ID for a given stream ID
+	* Generates a monotonic unique event ID in 
+	* `${streamId}_${timestamp}_${counter}_${random}` format.
 	*/
 	generateEventId(streamId) {
-		return `${streamId}_${Date.now()}_${Math.random().toString(36).substring(2, 10)}`;
+		const now = Date.now();
+		if (now === this.lastTimestamp) this.lastTimestampCounter++;
+		else {
+			this.lastTimestampCounter = 0;
+			this.lastTimestamp = now;
+		}
+		const timestamp = now.toString();
+		const counter = this.lastTimestampCounter.toString(36).padStart(4, "0");
+		const random = Math.random().toString(36).substring(2, 5);
+		return `${streamId}_${timestamp}_${counter}_${random}`;
 	}
 	/**
 	* Extracts the stream ID from an event ID
@@ -4476,7 +4501,7 @@ const proxyServer = async ({ client, requestTimeout, server, serverCapabilities
 			return client.listTools(args.params, requestTimeout ? { timeout: requestTimeout } : void 0);
 		});
 	}
-	server.setRequestHandler(CompleteRequestSchema, async (args) => {
+	if (serverCapabilities?.completions) server.setRequestHandler(CompleteRequestSchema, async (args) => {
 		return client.complete(args.params, requestTimeout ? { timeout: requestTimeout } : void 0);
 	});
 };
@@ -15026,19 +15051,37 @@ const createJsonRpcErrorResponse = (code, message) => {
 		jsonrpc: "2.0"
 	});
 };
-const getWWWAuthenticateHeader = (oauth) => {
-	if (!oauth?.protectedResource?.resource) return;
-	return `Bearer resource_metadata="${oauth.protectedResource.resource}/.well-known/oauth-protected-resource"`;
+const getWWWAuthenticateHeader = (oauth, options) => {
+	if (!oauth) return;
+	const params = [];
+	if (oauth.realm) params.push(`realm="${oauth.realm}"`);
+	if (oauth.protectedResource?.resource) params.push(`resource_metadata="${oauth.protectedResource.resource}/.well-known/oauth-protected-resource"`);
+	const error = options?.error || oauth.error;
+	if (error) params.push(`error="${error}"`);
+	const error_description = options?.error_description || oauth.error_description;
+	if (error_description) {
+		const escaped = error_description.replace(/"/g, "\\\"");
+		params.push(`error_description="${escaped}"`);
+	}
+	const error_uri = options?.error_uri || oauth.error_uri;
+	if (error_uri) params.push(`error_uri="${error_uri}"`);
+	const scope = options?.scope || oauth.scope;
+	if (scope) params.push(`scope="${scope}"`);
+	if (params.length === 0) return;
+	return `Bearer ${params.join(", ")}`;
 };
-const handleResponseError = (error, res) => {
-	if (error instanceof Response) {
+const handleResponseError = async (error, res) => {
+	if (error && typeof error === "object" && "status" in error && "headers" in error && "statusText" in error || error instanceof Response) {
+		const responseError = error;
 		const fixedHeaders = {};
-		error.headers.forEach((value, key$1) => {
+		responseError.headers.forEach((value, key$1) => {
 			if (fixedHeaders[key$1]) if (Array.isArray(fixedHeaders[key$1])) fixedHeaders[key$1].push(value);
 			else fixedHeaders[key$1] = [fixedHeaders[key$1], value];
 			else fixedHeaders[key$1] = value;
 		});
-		res.writeHead(error.status, error.statusText, fixedHeaders).end(error.statusText);
+		const body = await responseError.text();
+		res.writeHead(responseError.status, responseError.statusText, fixedHeaders);
+		res.end(body);
 		return true;
 	}
 	return false;
@@ -15104,7 +15147,10 @@ const handleStreamRequest = async ({ activeTransports, authenticate, createServe
 				if (!authResult || typeof authResult === "object" && "authenticated" in authResult && !authResult.authenticated) {
 					const errorMessage = authResult && typeof authResult === "object" && "error" in authResult && typeof authResult.error === "string" ? authResult.error : "Unauthorized: Authentication failed";
 					res.setHeader("Content-Type", "application/json");
-					const wwwAuthHeader = getWWWAuthenticateHeader(oauth);
+					const wwwAuthHeader = getWWWAuthenticateHeader(oauth, {
+						error: "invalid_token",
+						error_description: errorMessage
+					});
 					if (wwwAuthHeader) res.setHeader("WWW-Authenticate", wwwAuthHeader);
 					res.writeHead(401).end(JSON.stringify({
 						error: {
@@ -15117,10 +15163,14 @@ const handleStreamRequest = async ({ activeTransports, authenticate, createServe
 					return true;
 				}
 			} catch (error) {
+				if (await handleResponseError(error, res)) return true;
 				const errorMessage = error instanceof Error ? error.message : "Unauthorized: Authentication error";
 				console.error("Authentication error:", error);
 				res.setHeader("Content-Type", "application/json");
-				const wwwAuthHeader = getWWWAuthenticateHeader(oauth);
+				const wwwAuthHeader = getWWWAuthenticateHeader(oauth, {
+					error: "invalid_token",
+					error_description: errorMessage
+				});
 				if (wwwAuthHeader) res.setHeader("WWW-Authenticate", wwwAuthHeader);
 				res.writeHead(401).end(JSON.stringify({
 					error: {
@@ -15166,10 +15216,14 @@ const handleStreamRequest = async ({ activeTransports, authenticate, createServe
 				try {
 					server = await createServer(req);
 				} catch (error) {
+					if (await handleResponseError(error, res)) return true;
 					const errorMessage = error instanceof Error ? error.message : String(error);
 					if (errorMessage.includes("Authentication") || errorMessage.includes("Invalid JWT") || errorMessage.includes("Token") || errorMessage.includes("Unauthorized")) {
 						res.setHeader("Content-Type", "application/json");
-						const wwwAuthHeader = getWWWAuthenticateHeader(oauth);
+						const wwwAuthHeader = getWWWAuthenticateHeader(oauth, {
+							error: "invalid_token",
+							error_description: errorMessage
+						});
 						if (wwwAuthHeader) res.setHeader("WWW-Authenticate", wwwAuthHeader);
 						res.writeHead(401).end(JSON.stringify({
 							error: {
@@ -15181,7 +15235,6 @@ const handleStreamRequest = async ({ activeTransports, authenticate, createServe
 						}));
 						return true;
 					}
-					if (handleResponseError(error, res)) return true;
 					res.writeHead(500).end("Error creating server");
 					return true;
 				}
@@ -15199,10 +15252,14 @@ const handleStreamRequest = async ({ activeTransports, authenticate, createServe
 				try {
 					server = await createServer(req);
 				} catch (error) {
+					if (await handleResponseError(error, res)) return true;
 					const errorMessage = error instanceof Error ? error.message : String(error);
 					if (errorMessage.includes("Authentication") || errorMessage.includes("Invalid JWT") || errorMessage.includes("Token") || errorMessage.includes("Unauthorized")) {
 						res.setHeader("Content-Type", "application/json");
-						const wwwAuthHeader = getWWWAuthenticateHeader(oauth);
+						const wwwAuthHeader = getWWWAuthenticateHeader(oauth, {
+							error: "invalid_token",
+							error_description: errorMessage
+						});
 						if (wwwAuthHeader) res.setHeader("WWW-Authenticate", wwwAuthHeader);
 						res.writeHead(401).end(JSON.stringify({
 							error: {
@@ -15214,7 +15271,6 @@ const handleStreamRequest = async ({ activeTransports, authenticate, createServe
 						}));
 						return true;
 					}
-					if (handleResponseError(error, res)) return true;
 					res.writeHead(500).end("Error creating server");
 					return true;
 				}
@@ -15284,7 +15340,7 @@ const handleSSERequest = async ({ activeTransports, createServer, endpoint, onCl
 		try {
 			server = await createServer(req);
 		} catch (error) {
-			if (handleResponseError(error, res)) return true;
+			if (await handleResponseError(error, res)) return true;
 			res.writeHead(500).end("Error creating server");
 			return true;
 		}
@@ -21589,4 +21645,4 @@ function serializeMessage(message) {
 
 //#endregion
 export { AuthenticationMiddleware, Client, InMemoryEventStore, JSONRPCMessageSchema, LATEST_PROTOCOL_VERSION, NEVER, ReadBuffer, Server, ZodIssueCode, __commonJS, __toESM, anyType, arrayType, booleanType, isInitializedNotification, isJSONRPCRequest, isJSONRPCResponse, numberType, objectType, proxyServer, serializeMessage, startHTTPServer, stringType };
-//# sourceMappingURL=stdio-DF5lH8jj.js.map
+//# sourceMappingURL=stdio-DLSsHME0.js.map