mcp-proxy 5.12.5 → 6.1.9

package/.github/workflows/main.yaml

@@ -7,14 +7,11 @@ jobs:
   test:
     environment: release
     name: Test
-    strategy:
-      fail-fast: true
-      matrix:
-        node:
-          - 22
     runs-on: ubuntu-latest
     permissions:
       contents: write
+      issues: write
+      pull-requests: write
       id-token: write
     steps:
       - name: setup repository
@@ -24,15 +21,10 @@ jobs:
       - uses: pnpm/action-setup@v4
         with:
           version: 9
-      - name: setup node.js
+      - name: Setup NodeJS
         uses: actions/setup-node@v4
         with:
-          cache: "pnpm"
-          node-version: ${{ matrix.node }}
-      - name: Setup NodeJS ${{ matrix.node }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
+          node-version: 24
           cache: "pnpm"
           cache-dependency-path: "**/pnpm-lock.yaml"
       - name: Install dependencies
@@ -45,4 +37,3 @@ jobs:
         run: pnpm semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

package/README.md

@@ -21,12 +21,29 @@ npm install mcp-proxy
 
 ### Command-line
 
+MCP Proxy supports two invocation patterns:
+
+**Simple usage (no mcp-proxy options):**
+
+```bash
+npx mcp-proxy npx -y @anthropic/mcp-server-filesystem /path
+```
+
+**With mcp-proxy options:**
+
 ```bash
-npx mcp-proxy --port 8080 --shell tsx server.js
+npx mcp-proxy --port 8080 --shell -- tsx server.js
 ```
 
 This starts a server and `stdio` server (`tsx server.js`). The server listens on port 8080 and `/mcp` (streamable HTTP) and `/sse` (SSE) endpoints, and forwards messages to the `stdio` server.
 
+> [!NOTE]
+> **About the `--` separator:**
+> - The `--` separator is **optional** when you don't need to pass options to mcp-proxy
+> - Use `--` when you need to pass options to mcp-proxy (like `--port`, `--shell`, etc.) to clearly separate them from the command
+> - Without `--`, the first positional argument is treated as the command, and all subsequent arguments are passed to that command
+> - The `--` separator is also useful when the command itself has flags that might conflict with mcp-proxy options
+
 options:
 
 - `--server`: Set to `sse` or `stream` to only enable the respective transport (default: both)
@@ -39,20 +56,9 @@ options:
 - `--debug`: Enable debug logging
 - `--shell`: Spawn the server via the user's shell
 - `--apiKey`: API key for authenticating requests (uses X-API-Key header)
-
-### Passing arguments to the wrapped command
-
-When wrapping a command that takes arguments starting with `-`, you must use `--` to prevent `mcp-proxy` from interpreting them as its own options. Everything after `--` is passed directly to the wrapped command.
-
-For example, to wrap a command that uses the `-v` flag:
-
-```bash
-# Wrong: mcp-proxy will try to parse -v as its own option
-npx mcp-proxy --port 8080 my-command -v
-
-# Correct: use -- to pass -v to my-command
-npx mcp-proxy --port 8080 -- my-command -v
-```
+- `--sslCa`: Filename to override the trusted CA certificates
+- `--sslCert`: Cert chains filename in PEM format
+- `--sslKey`: Private keys filename in PEM format
 
 ### Stateless Mode
 
@@ -68,10 +74,10 @@ Example usage:
 
 ```bash
 # Enable stateless mode
-npx mcp-proxy --port 8080 --stateless tsx server.js
+npx mcp-proxy --port 8080 --stateless -- tsx server.js
 
 # Stateless mode with stream-only transport
-npx mcp-proxy --port 8080 --stateless --server stream tsx server.js
+npx mcp-proxy --port 8080 --stateless --server stream -- tsx server.js
 ```
 
 > [!NOTE]
@@ -96,14 +102,14 @@ Authentication is disabled by default for backward compatibility. To enable it,
 **Command-line:**
 
 ```bash
-npx mcp-proxy --port 8080 --apiKey "your-secret-key" tsx server.js
+npx mcp-proxy --port 8080 --apiKey "your-secret-key" -- tsx server.js
 ```
 
 **Environment variable:**
 
 ```bash
 export MCP_PROXY_API_KEY="your-secret-key"
-npx mcp-proxy --port 8080 tsx server.js
+npx mcp-proxy --port 8080 -- tsx server.js
 ```
 
 #### Client Configuration
@@ -401,5 +407,5 @@ const transport = tapTransport(new StdioClientTransport(), (event) => {
 ### Running MCP Proxy with a local server
 
 ```bash
-tsx src/bin/mcp-proxy.ts --debug tsx src/fixtures/simple-stdio-server.ts
+tsx src/bin/mcp-proxy.ts --debug -- tsx src/fixtures/simple-stdio-server.ts
 ```

package/dist/bin/mcp-proxy.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { D as __toESM, E as __commonJSMin, a as startHTTPServer, i as Client, n as serializeMessage, o as proxyServer, r as Server, t as ReadBuffer, w as InMemoryEventStore } from "../stdio-DBuYn6eo.mjs";
+import { D as __toESM, E as __commonJSMin, a as startHTTPServer, i as Client, n as serializeMessage, o as proxyServer, r as Server, t as ReadBuffer, w as InMemoryEventStore } from "../stdio-BArgKxoc.mjs";
 import { createRequire } from "node:module";
 import { basename, dirname, extname, join, normalize, relative, resolve } from "path";
 import { format, inspect } from "util";
+import { readFileSync, readdirSync, statSync, writeFile } from "fs";
 import { setTimeout as setTimeout$1 } from "node:timers";
 import util from "node:util";
 import { notStrictEqual, strictEqual } from "assert";
-import { readFileSync, readdirSync, statSync, writeFile } from "fs";
 import { fileURLToPath } from "url";
 import { readFileSync as readFileSync$1, readdirSync as readdirSync$1 } from "node:fs";
 import { spawn } from "node:child_process";
@@ -5012,15 +5012,14 @@ var StdioClientTransport = class {
 //#region src/bin/mcp-proxy.ts
 util.inspect.defaultOptions.depth = 8;
 if (!("EventSource" in global)) global.EventSource = EventSource;
-const argv = await yargs_default(hideBin(process.argv)).scriptName("mcp-proxy").command("$0 <command> [args...]", "Run a command with MCP arguments").positional("command", {
-	demandOption: true,
+const argv = await yargs_default(hideBin(process.argv)).scriptName("mcp-proxy").command("$0 [command] [args...]", "Proxy an MCP stdio server over HTTP").positional("command", {
 	describe: "The command to run",
 	type: "string"
 }).positional("args", {
 	array: true,
 	describe: "The arguments to pass to the command",
 	type: "string"
-}).env("MCP_PROXY").parserConfiguration({ "populate--": true }).options({
+}).usage("$0 [options] -- <command> [args...]\n       $0 <command> [args...]").env("MCP_PROXY").parserConfiguration({ "populate--": true }).options({
 	apiKey: {
 		describe: "API key for authenticating requests (uses X-API-Key header)",
 		type: "string"
@@ -5069,6 +5068,18 @@ const argv = await yargs_default(hideBin(process.argv)).scriptName("mcp-proxy").
 		describe: "The SSE endpoint to listen on",
 		type: "string"
 	},
+	sslCa: {
+		describe: "Filename to override the trusted CA certificates",
+		type: "string"
+	},
+	sslCert: {
+		describe: "Cert chains filename in PEM format",
+		type: "string"
+	},
+	sslKey: {
+		describe: "Private keys filename in PEM format",
+		type: "string"
+	},
 	stateless: {
 		default: false,
 		describe: "Enable stateless mode for HTTP streamable transport (no session management)",
@@ -5080,9 +5091,23 @@ const argv = await yargs_default(hideBin(process.argv)).scriptName("mcp-proxy").
 		type: "string"
 	}
 }).help().parseAsync();
-if (!argv.command) throw new Error("No command specified");
-const finalCommand = argv.command;
-const finalArgs = argv["--"] || argv.args;
+const dashDashArgs = argv["--"];
+let finalCommand;
+let finalArgs;
+if (dashDashArgs && dashDashArgs.length > 0) [finalCommand, ...finalArgs] = dashDashArgs;
+else if (argv.command) {
+	finalCommand = argv.command;
+	finalArgs = argv.args || [];
+} else {
+	console.error("Error: No command specified.");
+	console.error("Usage: mcp-proxy [options] -- <command> [args...]");
+	console.error("   or: mcp-proxy <command> [args...]");
+	console.error("");
+	console.error("Examples:");
+	console.error("  mcp-proxy --port 8080 -- node server.js --port 3000");
+	console.error("  mcp-proxy node server.js");
+	process.exit(1);
+}
 const connect = async (client) => {
 	const transport = new StdioClientTransport({
 		args: finalArgs,
@@ -5122,6 +5147,9 @@ const proxy = async () => {
 		host: argv.host,
 		port: argv.port,
 		sseEndpoint: argv.server && argv.server !== "sse" ? null : argv.sseEndpoint ?? argv.endpoint,
+		sslCa: argv.sslCa,
+		sslCert: argv.sslCert,
+		sslKey: argv.sslKey,
 		stateless: argv.stateless,
 		streamEndpoint: argv.server && argv.server !== "stream" ? null : argv.streamEndpoint ?? argv.endpoint
 	});