@ai-ecoverse/mcpcat 0.10.0 → 0.11.0

package/dist/host/mcpcat.mjs

@@ -7773,6 +7773,14 @@ var McpAuthError = class extends Error {
     this.target = target;
   }
 };
+var AuthRetryableError = class extends Error {
+  response;
+  constructor(response) {
+    super(`HTTP ${response.status}: auth retry`);
+    this.name = "AuthRetryableError";
+    this.response = response;
+  }
+};
 function selectSseFrame(body, targetId) {
   const text = new TextDecoder().decode(body);
   const blocks = text.replace(/\r\n/g, "\n").split(/\n\n/);
@@ -7797,6 +7805,42 @@ function mcpNameForMethod(method, params) {
   if (method === "resources/read") return params.uri;
   return void 0;
 }
+function makeAbort(timeoutMs, externalSignal) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  if (externalSignal) {
+    if (externalSignal.aborted) {
+      clearTimeout(timer);
+      controller.abort();
+    } else {
+      externalSignal.addEventListener(
+        "abort",
+        () => {
+          clearTimeout(timer);
+          controller.abort();
+        },
+        { once: true }
+      );
+    }
+  }
+  return { controller, timer };
+}
+function logHeaders(verbose, dir, entries) {
+  for (const [k, v] of entries) {
+    if (dir === ">") verbose.headerOut(k, v);
+    else verbose.headerIn(k, v);
+  }
+}
+function buildServerInfo(discoverResult2) {
+  return {
+    name: discoverResult2?.serverInfo?.name,
+    version: discoverResult2?.serverInfo?.version,
+    title: discoverResult2?.serverInfo?.title,
+    protocolVersion: STATELESS_PROTOCOL_VERSION,
+    capabilities: discoverResult2?.capabilities ?? {},
+    instructions: discoverResult2?.instructions
+  };
+}
 async function createStatelessConnection(options) {
   const {
     url,
@@ -7805,11 +7849,12 @@ async function createStatelessConnection(options) {
     timeoutMs = 6e4,
     clientInfo = { name: "mcpcat", version: "0.0.0" },
     signal: externalSignal,
-    verbose
+    verbose,
+    authProvider
   } = options;
   let nextId2 = 1;
   let negotiatedVersion;
-  function buildHeaders(method, params) {
+  function buildHeaders(method, params, token) {
     const h = {
       "Content-Type": "application/json",
       Accept: "application/json, text/event-stream",
@@ -7819,36 +7864,12 @@ async function createStatelessConnection(options) {
     const n = mcpNameForMethod(method, params);
     if (n) h["Mcp-Name"] = n;
     if (negotiatedVersion) h["Mcp-Protocol-Version"] = negotiatedVersion;
+    if (token) h["Authorization"] = `Bearer ${token}`;
     return h;
   }
-  function makeAbort() {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    if (externalSignal) {
-      if (externalSignal.aborted) {
-        clearTimeout(timer);
-        controller.abort();
-      } else {
-        externalSignal.addEventListener(
-          "abort",
-          () => {
-            clearTimeout(timer);
-            controller.abort();
-          },
-          { once: true }
-        );
-      }
-    }
-    return { controller, timer };
-  }
-  function logHeaders(dir, entries) {
-    if (!verbose?.enabled) return;
-    for (const [k, v] of entries) {
-      if (dir === ">") verbose.headerOut(k, v);
-      else verbose.headerIn(k, v);
-    }
-  }
   async function handleErrorStatus(res, method) {
+    if ((res.status === 401 || res.status === 403) && authProvider)
+      throw new AuthRetryableError(res);
     if (res.status === 401 || res.status === 403) throw new McpAuthError(res.status, url);
     const text = await res.text();
     let rpc;
@@ -7860,34 +7881,27 @@ async function createStatelessConnection(options) {
     if (rpc) throw new StatelessRpcError(rpc.code, rpc.message, rpc.data);
     throw new StatelessHttpError(res.status, res.statusText, method, text.slice(0, 512));
   }
-  async function request(method, params) {
-    const id = nextId2++;
-    const headers = buildHeaders(method, params);
-    const meta = {
-      protocolVersion: negotiatedVersion ?? STATELESS_PROTOCOL_VERSION,
-      clientInfo
-    };
-    const body = JSON.stringify({
-      jsonrpc: "2.0",
-      id,
-      method,
-      params: { ...params, _meta: meta }
-    });
+  async function doFetch(method, params, body) {
+    const token = await authProvider?.token();
+    const headers = buildHeaders(method, params, token);
     if (verbose?.enabled) {
       verbose.request(method, body);
-      logHeaders(">", Object.entries(headers));
+      logHeaders(verbose, ">", Object.entries(headers));
     }
-    const { controller, timer } = makeAbort();
-    let res;
+    const { controller, timer } = makeAbort(timeoutMs, externalSignal);
     try {
-      res = await fetchImpl(url, {
+      const res = await fetchImpl(url, {
         method: "POST",
         headers,
         body,
         signal: controller.signal
       });
+      if (verbose?.enabled) {
+        verbose.http("<", `HTTP/1.1 ${res.status} ${res.statusText}`);
+        logHeaders(verbose, "<", res.headers.entries());
+      }
+      return { res, token };
     } catch (err) {
-      clearTimeout(timer);
       if (controller.signal.aborted && !externalSignal?.aborted) {
         throw new McpTimeoutError2(method, timeoutMs);
       }
@@ -7895,11 +7909,8 @@ async function createStatelessConnection(options) {
     } finally {
       clearTimeout(timer);
     }
-    if (verbose?.enabled) {
-      verbose.http("<", `HTTP/1.1 ${res.status} ${res.statusText}`);
-      logHeaders("<", res.headers.entries());
-    }
-    if (res.status >= 400) await handleErrorStatus(res, method);
+  }
+  async function parseResponse(res, id) {
     const ct = res.headers.get("content-type") ?? "";
     let frame;
     if (ct.toLowerCase().includes("text/event-stream")) {
@@ -7913,10 +7924,53 @@ async function createStatelessConnection(options) {
     }
     return frame.result;
   }
+  async function handleAuthError(err, token) {
+    if (!authProvider?.onUnauthorized) throw new McpAuthError(err.response.status, url);
+    try {
+      await authProvider.onUnauthorized({
+        response: err.response,
+        serverUrl: new URL(url),
+        fetch: fetchImpl,
+        token
+      });
+    } catch (authErr) {
+      if (authErr instanceof AuthStepUpError) throw authErr;
+      throw new McpAuthError(err.response.status, url);
+    }
+  }
+  async function request(method, params) {
+    const id = nextId2++;
+    const meta = {
+      protocolVersion: negotiatedVersion ?? STATELESS_PROTOCOL_VERSION,
+      clientInfo
+    };
+    const body = JSON.stringify({
+      jsonrpc: "2.0",
+      id,
+      method,
+      params: { ...params, _meta: meta }
+    });
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const { res, token } = await doFetch(method, params, body);
+      if (res.status >= 400) {
+        try {
+          await handleErrorStatus(res, method);
+        } catch (err) {
+          if (err instanceof AuthRetryableError && attempt === 0) {
+            await handleAuthError(err, token);
+            continue;
+          }
+          throw err;
+        }
+      }
+      return parseResponse(res, id);
+    }
+    throw new McpAuthError(401, url);
+  }
   const discoverResult2 = await request("server/discover", {
     protocolVersion: STATELESS_PROTOCOL_VERSION
   });
-  const supported = Array.isArray(discoverResult2?.supportedVersions) ? discoverResult2.supportedVersions.filter((v) => typeof v === "string") : [];
+  const supported = discoverResult2?.supportedVersions?.filter((v) => typeof v === "string") ?? [];
   if (!supported.includes(STATELESS_PROTOCOL_VERSION)) {
     throw new Error(
       `Server does not support ${STATELESS_PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
@@ -7927,15 +7981,7 @@ async function createStatelessConnection(options) {
   return {
     async info() {
       if (serverInfoCache) return serverInfoCache;
-      const r = discoverResult2;
-      serverInfoCache = {
-        name: r?.serverInfo?.name,
-        version: r?.serverInfo?.version,
-        title: r?.serverInfo?.title,
-        protocolVersion: STATELESS_PROTOCOL_VERSION,
-        capabilities: r?.capabilities ?? {},
-        instructions: r?.instructions
-      };
+      serverInfoCache = buildServerInfo(discoverResult2);
       return serverInfoCache;
     },
     async listTools() {
@@ -8085,23 +8131,12 @@ async function connect(platform2, options) {
     });
   }
   if (!options.url) throw new Error("connect requires either a url or a command");
-  if (options.authProvider) {
-    const token = await options.authProvider.token();
-    if (token) {
-      return createPiConnection({
-        url: options.url,
-        headers: options.headers,
-        fetchImpl: platform2.fetch,
-        authProvider: options.authProvider,
-        ...shared
-      });
-    }
-  }
   if (options.protocolVersion && !options.protocolVersion.startsWith("2026")) {
     return createPiConnection({
       url: options.url,
       headers: options.headers,
       fetchImpl: platform2.fetch,
+      authProvider: options.authProvider,
       ...shared
     });
   }
@@ -8113,11 +8148,14 @@ async function connect(platform2, options) {
       clientInfo: { name: "mcpcat", version: options.version ?? "0.0.0" },
       timeoutMs: options.timeoutMs,
       signal: options.signal,
-      verbose: options.verbose
+      verbose: options.verbose,
+      authProvider: options.authProvider
     });
   } catch (err) {
     const isMethodNotFound = err instanceof StatelessRpcError && err.code === -32601 || err instanceof StatelessHttpError && err.status >= 400 && err.status < 500;
     if (options.protocolVersion?.startsWith("2026")) throw err;
+    if (err instanceof McpAuthError || err instanceof AuthStepUpError) throw err;
+    if (err.name === "McpOAuthAuthorizationRequiredError") throw err;
     if (isMethodNotFound) {
       return createPiConnection({
         url: options.url,
@@ -14277,5 +14315,5 @@ function createHostPlatform() {
 // src/host.ts
 var platform = createHostPlatform();
 var args = process.argv.slice(2);
-var code = await run(platform, "0.10.0", args);
+var code = await run(platform, "0.11.0", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -7386,6 +7386,14 @@ var McpAuthError = class extends Error {
     this.target = target;
   }
 };
+var AuthRetryableError = class extends Error {
+  response;
+  constructor(response) {
+    super(`HTTP ${response.status}: auth retry`);
+    this.name = "AuthRetryableError";
+    this.response = response;
+  }
+};
 function selectSseFrame(body, targetId) {
   const text = new TextDecoder().decode(body);
   const blocks = text.replace(/\r\n/g, "\n").split(/\n\n/);
@@ -7410,6 +7418,42 @@ function mcpNameForMethod(method, params) {
   if (method === "resources/read") return params.uri;
   return void 0;
 }
+function makeAbort(timeoutMs, externalSignal) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  if (externalSignal) {
+    if (externalSignal.aborted) {
+      clearTimeout(timer);
+      controller.abort();
+    } else {
+      externalSignal.addEventListener(
+        "abort",
+        () => {
+          clearTimeout(timer);
+          controller.abort();
+        },
+        { once: true }
+      );
+    }
+  }
+  return { controller, timer };
+}
+function logHeaders(verbose, dir, entries) {
+  for (const [k, v] of entries) {
+    if (dir === ">") verbose.headerOut(k, v);
+    else verbose.headerIn(k, v);
+  }
+}
+function buildServerInfo(discoverResult2) {
+  return {
+    name: discoverResult2?.serverInfo?.name,
+    version: discoverResult2?.serverInfo?.version,
+    title: discoverResult2?.serverInfo?.title,
+    protocolVersion: STATELESS_PROTOCOL_VERSION,
+    capabilities: discoverResult2?.capabilities ?? {},
+    instructions: discoverResult2?.instructions
+  };
+}
 async function createStatelessConnection(options) {
   const {
     url,
@@ -7418,11 +7462,12 @@ async function createStatelessConnection(options) {
     timeoutMs = 6e4,
     clientInfo = { name: "mcpcat", version: "0.0.0" },
     signal: externalSignal,
-    verbose
+    verbose,
+    authProvider
   } = options;
   let nextId2 = 1;
   let negotiatedVersion;
-  function buildHeaders(method, params) {
+  function buildHeaders(method, params, token) {
     const h = {
       "Content-Type": "application/json",
       Accept: "application/json, text/event-stream",
@@ -7432,36 +7477,12 @@ async function createStatelessConnection(options) {
     const n = mcpNameForMethod(method, params);
     if (n) h["Mcp-Name"] = n;
     if (negotiatedVersion) h["Mcp-Protocol-Version"] = negotiatedVersion;
+    if (token) h["Authorization"] = `Bearer ${token}`;
     return h;
   }
-  function makeAbort() {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    if (externalSignal) {
-      if (externalSignal.aborted) {
-        clearTimeout(timer);
-        controller.abort();
-      } else {
-        externalSignal.addEventListener(
-          "abort",
-          () => {
-            clearTimeout(timer);
-            controller.abort();
-          },
-          { once: true }
-        );
-      }
-    }
-    return { controller, timer };
-  }
-  function logHeaders(dir, entries) {
-    if (!verbose?.enabled) return;
-    for (const [k, v] of entries) {
-      if (dir === ">") verbose.headerOut(k, v);
-      else verbose.headerIn(k, v);
-    }
-  }
   async function handleErrorStatus(res, method) {
+    if ((res.status === 401 || res.status === 403) && authProvider)
+      throw new AuthRetryableError(res);
     if (res.status === 401 || res.status === 403) throw new McpAuthError(res.status, url);
     const text = await res.text();
     let rpc;
@@ -7473,34 +7494,27 @@ async function createStatelessConnection(options) {
     if (rpc) throw new StatelessRpcError(rpc.code, rpc.message, rpc.data);
     throw new StatelessHttpError(res.status, res.statusText, method, text.slice(0, 512));
   }
-  async function request(method, params) {
-    const id = nextId2++;
-    const headers = buildHeaders(method, params);
-    const meta = {
-      protocolVersion: negotiatedVersion ?? STATELESS_PROTOCOL_VERSION,
-      clientInfo
-    };
-    const body = JSON.stringify({
-      jsonrpc: "2.0",
-      id,
-      method,
-      params: { ...params, _meta: meta }
-    });
+  async function doFetch(method, params, body) {
+    const token = await authProvider?.token();
+    const headers = buildHeaders(method, params, token);
     if (verbose?.enabled) {
       verbose.request(method, body);
-      logHeaders(">", Object.entries(headers));
+      logHeaders(verbose, ">", Object.entries(headers));
     }
-    const { controller, timer } = makeAbort();
-    let res;
+    const { controller, timer } = makeAbort(timeoutMs, externalSignal);
     try {
-      res = await fetchImpl(url, {
+      const res = await fetchImpl(url, {
         method: "POST",
         headers,
         body,
         signal: controller.signal
       });
+      if (verbose?.enabled) {
+        verbose.http("<", `HTTP/1.1 ${res.status} ${res.statusText}`);
+        logHeaders(verbose, "<", res.headers.entries());
+      }
+      return { res, token };
     } catch (err) {
-      clearTimeout(timer);
       if (controller.signal.aborted && !externalSignal?.aborted) {
         throw new McpTimeoutError2(method, timeoutMs);
       }
@@ -7508,11 +7522,8 @@ async function createStatelessConnection(options) {
     } finally {
       clearTimeout(timer);
     }
-    if (verbose?.enabled) {
-      verbose.http("<", `HTTP/1.1 ${res.status} ${res.statusText}`);
-      logHeaders("<", res.headers.entries());
-    }
-    if (res.status >= 400) await handleErrorStatus(res, method);
+  }
+  async function parseResponse(res, id) {
     const ct = res.headers.get("content-type") ?? "";
     let frame;
     if (ct.toLowerCase().includes("text/event-stream")) {
@@ -7526,10 +7537,53 @@ async function createStatelessConnection(options) {
     }
     return frame.result;
   }
+  async function handleAuthError(err, token) {
+    if (!authProvider?.onUnauthorized) throw new McpAuthError(err.response.status, url);
+    try {
+      await authProvider.onUnauthorized({
+        response: err.response,
+        serverUrl: new URL(url),
+        fetch: fetchImpl,
+        token
+      });
+    } catch (authErr) {
+      if (authErr instanceof AuthStepUpError) throw authErr;
+      throw new McpAuthError(err.response.status, url);
+    }
+  }
+  async function request(method, params) {
+    const id = nextId2++;
+    const meta = {
+      protocolVersion: negotiatedVersion ?? STATELESS_PROTOCOL_VERSION,
+      clientInfo
+    };
+    const body = JSON.stringify({
+      jsonrpc: "2.0",
+      id,
+      method,
+      params: { ...params, _meta: meta }
+    });
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const { res, token } = await doFetch(method, params, body);
+      if (res.status >= 400) {
+        try {
+          await handleErrorStatus(res, method);
+        } catch (err) {
+          if (err instanceof AuthRetryableError && attempt === 0) {
+            await handleAuthError(err, token);
+            continue;
+          }
+          throw err;
+        }
+      }
+      return parseResponse(res, id);
+    }
+    throw new McpAuthError(401, url);
+  }
   const discoverResult2 = await request("server/discover", {
     protocolVersion: STATELESS_PROTOCOL_VERSION
   });
-  const supported = Array.isArray(discoverResult2?.supportedVersions) ? discoverResult2.supportedVersions.filter((v) => typeof v === "string") : [];
+  const supported = discoverResult2?.supportedVersions?.filter((v) => typeof v === "string") ?? [];
   if (!supported.includes(STATELESS_PROTOCOL_VERSION)) {
     throw new Error(
       `Server does not support ${STATELESS_PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
@@ -7540,15 +7594,7 @@ async function createStatelessConnection(options) {
   return {
     async info() {
       if (serverInfoCache) return serverInfoCache;
-      const r = discoverResult2;
-      serverInfoCache = {
-        name: r?.serverInfo?.name,
-        version: r?.serverInfo?.version,
-        title: r?.serverInfo?.title,
-        protocolVersion: STATELESS_PROTOCOL_VERSION,
-        capabilities: r?.capabilities ?? {},
-        instructions: r?.instructions
-      };
+      serverInfoCache = buildServerInfo(discoverResult2);
       return serverInfoCache;
     },
     async listTools() {
@@ -7698,23 +7744,12 @@ async function connect(platform2, options) {
     });
   }
   if (!options.url) throw new Error("connect requires either a url or a command");
-  if (options.authProvider) {
-    const token = await options.authProvider.token();
-    if (token) {
-      return createPiConnection({
-        url: options.url,
-        headers: options.headers,
-        fetchImpl: platform2.fetch,
-        authProvider: options.authProvider,
-        ...shared
-      });
-    }
-  }
   if (options.protocolVersion && !options.protocolVersion.startsWith("2026")) {
     return createPiConnection({
       url: options.url,
       headers: options.headers,
       fetchImpl: platform2.fetch,
+      authProvider: options.authProvider,
       ...shared
     });
   }
@@ -7726,11 +7761,14 @@ async function connect(platform2, options) {
       clientInfo: { name: "mcpcat", version: options.version ?? "0.0.0" },
       timeoutMs: options.timeoutMs,
       signal: options.signal,
-      verbose: options.verbose
+      verbose: options.verbose,
+      authProvider: options.authProvider
     });
   } catch (err) {
     const isMethodNotFound = err instanceof StatelessRpcError && err.code === -32601 || err instanceof StatelessHttpError && err.status >= 400 && err.status < 500;
     if (options.protocolVersion?.startsWith("2026")) throw err;
+    if (err instanceof McpAuthError || err instanceof AuthStepUpError) throw err;
+    if (err.name === "McpOAuthAuthorizationRequiredError") throw err;
     if (isMethodNotFound) {
       return createPiConnection({
         url: options.url,
@@ -13805,7 +13843,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.10.0", args);
+  return run(platform2, "0.11.0", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",