mcp-remote 0.1.28 → 0.1.30

package/README.md

@@ -72,6 +72,37 @@ To bypass authentication, or to emit custom headers on all requests to your remo
 },
 ```
 
+### Multiple Instances
+
+To run multiple instances of the same remote server with different configurations (e.g., different Atlassian tenants), use the `--resource` flag to isolate OAuth sessions:
+
+```json
+{
+  "mcpServers": {
+    "atlassian_tenant1": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "https://mcp.atlassian.com/v1/sse",
+        "--resource",
+        "https://tenant1.atlassian.net/"
+      ]
+    },
+    "atlassian_tenant2": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "https://mcp.atlassian.com/v1/sse",
+        "--resource",
+        "https://tenant2.atlassian.net/"
+      ]
+    }
+  }
+}
+```
+
+Each unique combination of server URL, resource, and custom headers will maintain separate OAuth sessions and token storage.
+
 ### Flags
 
 * If `npx` is producing errors, consider adding `-y` as the first argument to auto-accept the installation of the `mcp-remote` package.

package/dist/{chunk-RXOQMFC5.js → chunk-RGTAVJIZ.js}

@@ -11872,7 +11872,7 @@ var Client = class extends Protocol {
 };
 
 // package.json
-var version = "0.1.28";
+var version = "0.1.30";
 
 // node_modules/.pnpm/pkce-challenge@5.0.0/node_modules/pkce-challenge/dist/index.node.js
 var crypto;
@@ -13645,7 +13645,7 @@ import crypto2 from "crypto";
 import fs2 from "fs";
 import { readFile, rm } from "fs/promises";
 import path2 from "path";
-import { fetch as fetch2, setGlobalDispatcher, EnvHttpProxyAgent } from "undici";
+import { EnvHttpProxyAgent, fetch as fetch2, Headers as Headers2, setGlobalDispatcher } from "undici";
 var REASON_AUTH_NEEDED = "authentication-needed";
 var REASON_TRANSPORT_FALLBACK = "falling-back-to-alternate-transport";
 var pid = process.pid;
@@ -13808,7 +13808,7 @@ async function connectToRemoteServer(client, serverUrl, authProvider, headers, a
         (tokens) => fetch2(url2, {
           ...init,
           headers: {
-            ...init?.headers,
+            ...init?.headers instanceof Headers2 ? Object.fromEntries(init?.headers.entries()) : init?.headers || {},
             ...headers,
             ...tokens?.access_token ? { Authorization: `Bearer ${tokens.access_token}` } : {},
             Accept: "text/event-stream"
@@ -14136,7 +14136,7 @@ async function parseCommandLineArgs(args, usage) {
     log(usage);
     process.exit(1);
   }
-  const serverUrlHash = getServerUrlHash(serverUrl);
+  const serverUrlHash = getServerUrlHash(serverUrl, authorizeResource, headers);
   global.currentServerUrlHash = serverUrlHash;
   debugLog(`Starting mcp-remote with server URL: ${serverUrl}`);
   const defaultPort = calculateDefaultPort(serverUrlHash);
@@ -14184,7 +14184,8 @@ async function parseCommandLineArgs(args, usage) {
     staticOAuthClientInfo,
     authorizeResource,
     ignoredTools,
-    authTimeoutMs
+    authTimeoutMs,
+    serverUrlHash
   };
 }
 function setupSignalHandlers(cleanup) {
@@ -14200,8 +14201,14 @@ function setupSignalHandlers(cleanup) {
     process.exit(0);
   });
 }
-function getServerUrlHash(serverUrl) {
-  return crypto2.createHash("md5").update(serverUrl).digest("hex");
+function getServerUrlHash(serverUrl, authorizeResource, headers) {
+  const parts = [serverUrl];
+  if (authorizeResource) parts.push(authorizeResource);
+  if (headers && Object.keys(headers).length > 0) {
+    const sortedKeys = Object.keys(headers).sort();
+    parts.push(JSON.stringify(headers, sortedKeys));
+  }
+  return crypto2.createHash("md5").update(parts.join("|")).digest("hex");
 }
 function patternToRegex(pattern) {
   const parts = pattern.split("*");
@@ -14233,7 +14240,7 @@ var NodeOAuthClientProvider = class {
    */
   constructor(options) {
     this.options = options;
-    this.serverUrlHash = getServerUrlHash(options.serverUrl);
+    this.serverUrlHash = options.serverUrlHash;
     this.callbackPath = options.callbackPath || "/oauth/callback";
     this.clientName = options.clientName || "MCP CLI Client";
     this.clientUri = options.clientUri || "https://github.com/modelcontextprotocol/mcp-cli";
@@ -14612,7 +14619,6 @@ export {
   connectToRemoteServer,
   parseCommandLineArgs,
   setupSignalHandlers,
-  getServerUrlHash,
   NodeOAuthClientProvider,
   createLazyAuthCoordinator
 };

package/dist/client.js

@@ -6,18 +6,16 @@ import {
   NodeOAuthClientProvider,
   connectToRemoteServer,
   createLazyAuthCoordinator,
-  getServerUrlHash,
   log,
   parseCommandLineArgs,
   setupSignalHandlers,
   version
-} from "./chunk-RXOQMFC5.js";
+} from "./chunk-RGTAVJIZ.js";
 
 // src/client.ts
 import { EventEmitter } from "events";
-async function runClient(serverUrl, callbackPort, headers, transportStrategy = "http-first", host, staticOAuthClientMetadata, staticOAuthClientInfo, authTimeoutMs) {
+async function runClient(serverUrl, callbackPort, headers, transportStrategy = "http-first", host, staticOAuthClientMetadata, staticOAuthClientInfo, authTimeoutMs, serverUrlHash) {
   const events = new EventEmitter();
-  const serverUrlHash = getServerUrlHash(serverUrl);
   const authCoordinator = createLazyAuthCoordinator(serverUrlHash, callbackPort, events, authTimeoutMs);
   const authProvider = new NodeOAuthClientProvider({
     serverUrl,
@@ -25,7 +23,8 @@ async function runClient(serverUrl, callbackPort, headers, transportStrategy = "
     host,
     clientName: "MCP CLI Client",
     staticOAuthClientMetadata,
-    staticOAuthClientInfo
+    staticOAuthClientInfo,
+    serverUrlHash
   });
   const client = new Client(
     {
@@ -98,7 +97,17 @@ async function runClient(serverUrl, callbackPort, headers, transportStrategy = "
   }
 }
 parseCommandLineArgs(process.argv.slice(2), "Usage: npx tsx client.ts <https://server-url> [callback-port] [--debug]").then(
-  ({ serverUrl, callbackPort, headers, transportStrategy, host, staticOAuthClientMetadata, staticOAuthClientInfo, authTimeoutMs }) => {
+  ({
+    serverUrl,
+    callbackPort,
+    headers,
+    transportStrategy,
+    host,
+    staticOAuthClientMetadata,
+    staticOAuthClientInfo,
+    authTimeoutMs,
+    serverUrlHash
+  }) => {
     return runClient(
       serverUrl,
       callbackPort,
@@ -107,7 +116,8 @@ parseCommandLineArgs(process.argv.slice(2), "Usage: npx tsx client.ts <https://s
       host,
       staticOAuthClientMetadata,
       staticOAuthClientInfo,
-      authTimeoutMs
+      authTimeoutMs,
+      serverUrlHash
     );
   }
 ).catch((error) => {

package/dist/proxy.js

@@ -4,12 +4,11 @@ import {
   NodeOAuthClientProvider,
   connectToRemoteServer,
   createLazyAuthCoordinator,
-  getServerUrlHash,
   log,
   mcpProxy,
   parseCommandLineArgs,
   setupSignalHandlers
-} from "./chunk-RXOQMFC5.js";
+} from "./chunk-RGTAVJIZ.js";
 
 // src/proxy.ts
 import { EventEmitter } from "events";
@@ -110,9 +109,8 @@ var StdioServerTransport = class {
 };
 
 // src/proxy.ts
-async function runProxy(serverUrl, callbackPort, headers, transportStrategy = "http-first", host, staticOAuthClientMetadata, staticOAuthClientInfo, authorizeResource, ignoredTools, authTimeoutMs) {
+async function runProxy(serverUrl, callbackPort, headers, transportStrategy = "http-first", host, staticOAuthClientMetadata, staticOAuthClientInfo, authorizeResource, ignoredTools, authTimeoutMs, serverUrlHash) {
   const events = new EventEmitter();
-  const serverUrlHash = getServerUrlHash(serverUrl);
   const authCoordinator = createLazyAuthCoordinator(serverUrlHash, callbackPort, events, authTimeoutMs);
   const authProvider = new NodeOAuthClientProvider({
     serverUrl,
@@ -121,7 +119,8 @@ async function runProxy(serverUrl, callbackPort, headers, transportStrategy = "h
     clientName: "MCP CLI Proxy",
     staticOAuthClientMetadata,
     staticOAuthClientInfo,
-    authorizeResource
+    authorizeResource,
+    serverUrlHash
   });
   const localTransport = new StdioServerTransport();
   let server = null;
@@ -198,7 +197,8 @@ parseCommandLineArgs(process.argv.slice(2), "Usage: npx tsx proxy.ts <https://se
     staticOAuthClientInfo,
     authorizeResource,
     ignoredTools,
-    authTimeoutMs
+    authTimeoutMs,
+    serverUrlHash
   }) => {
     return runProxy(
       serverUrl,
@@ -210,7 +210,8 @@ parseCommandLineArgs(process.argv.slice(2), "Usage: npx tsx proxy.ts <https://se
       staticOAuthClientInfo,
       authorizeResource,
       ignoredTools,
-      authTimeoutMs
+      authTimeoutMs,
+      serverUrlHash
     );
   }
 ).catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-remote",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Remote proxy for Model Context Protocol, allowing local-only clients to connect to remote servers using oAuth",
   "keywords": [
     "mcp",
@@ -59,12 +59,5 @@
     "outDir": "dist",
     "external": []
   },
-  "vitest": {
-    "environment": "node",
-    "globals": true,
-    "include": [
-      "src/**/*.test.ts"
-    ]
-  },
   "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
 }