mcp-use 1.5.1-canary.0 → 1.5.1-canary.1

package/dist/src/server/index.cjs

@@ -301,15 +301,46 @@ async function adaptConnectMiddleware(connectMiddleware, middlewarePath) {
 __name(adaptConnectMiddleware, "adaptConnectMiddleware");
 
 // src/server/logging.ts
+var isDeno = typeof globalThis.Deno !== "undefined";
+function getEnv(key) {
+  if (isDeno) {
+    return globalThis.Deno.env.get(key);
+  }
+  return typeof process !== "undefined" && process.env ? process.env[key] : void 0;
+}
+__name(getEnv, "getEnv");
+function isDebugMode() {
+  const debugEnv = getEnv("DEBUG");
+  return debugEnv !== void 0 && debugEnv !== "" && debugEnv !== "0" && debugEnv.toLowerCase() !== "false";
+}
+__name(isDebugMode, "isDebugMode");
+function formatForLogging(obj) {
+  try {
+    return JSON.stringify(obj, null, 2);
+  } catch {
+    return String(obj);
+  }
+}
+__name(formatForLogging, "formatForLogging");
 async function requestLogger(c, next) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().substring(11, 23);
   const method = c.req.method;
   const url = c.req.url;
-  let body = null;
-  if (method === "POST" && url.includes("/mcp")) {
+  const debugMode = isDebugMode();
+  let requestBody = null;
+  let requestHeaders = {};
+  if (debugMode) {
+    const allHeaders = c.req.header();
+    if (allHeaders) {
+      requestHeaders = allHeaders;
+    }
+  }
+  if (method !== "GET" && method !== "HEAD") {
     try {
       const clonedRequest = c.req.raw.clone();
-      body = await clonedRequest.json().catch(() => null);
+      requestBody = await clonedRequest.json().catch(() => {
+        return clonedRequest.text().catch(() => null);
+      });
     } catch {
     }
   }
@@ -326,11 +357,70 @@ async function requestLogger(c, next) {
     statusColor = "\x1B[35m";
   }
   let logMessage = `[${timestamp}] ${method} \x1B[1m${new URL(url).pathname}\x1B[0m`;
-  if (method === "POST" && url.includes("/mcp") && body?.method) {
-    logMessage += ` \x1B[1m[${body.method}]\x1B[0m`;
+  if (method === "POST" && url.includes("/mcp") && requestBody?.method) {
+    logMessage += ` \x1B[1m[${requestBody.method}]\x1B[0m`;
   }
   logMessage += ` ${statusColor}${statusCode}\x1B[0m`;
   console.log(logMessage);
+  if (debugMode) {
+    console.log("\n\x1B[36m" + "=".repeat(80) + "\x1B[0m");
+    console.log("\x1B[1m\x1B[36m[DEBUG] Request Details\x1B[0m");
+    console.log("\x1B[36m" + "-".repeat(80) + "\x1B[0m");
+    if (Object.keys(requestHeaders).length > 0) {
+      console.log("\x1B[33mRequest Headers:\x1B[0m");
+      console.log(formatForLogging(requestHeaders));
+    }
+    if (requestBody !== null) {
+      console.log("\x1B[33mRequest Body:\x1B[0m");
+      if (typeof requestBody === "string") {
+        console.log(requestBody);
+      } else {
+        console.log(formatForLogging(requestBody));
+      }
+    }
+    const responseHeaders = {};
+    c.res.headers.forEach((value, key) => {
+      responseHeaders[key] = value;
+    });
+    if (Object.keys(responseHeaders).length > 0) {
+      console.log("\x1B[33mResponse Headers:\x1B[0m");
+      console.log(formatForLogging(responseHeaders));
+    }
+    try {
+      if (c.res.body !== null && c.res.body !== void 0) {
+        try {
+          const clonedResponse = c.res.clone();
+          const responseBody = await clonedResponse.text().catch(() => null);
+          if (responseBody !== null && responseBody.length > 0) {
+            console.log("\x1B[33mResponse Body:\x1B[0m");
+            try {
+              const jsonBody = JSON.parse(responseBody);
+              console.log(formatForLogging(jsonBody));
+            } catch {
+              const maxLength = 1e4;
+              if (responseBody.length > maxLength) {
+                console.log(
+                  responseBody.substring(0, maxLength) + `
+... (truncated, ${responseBody.length - maxLength} more characters)`
+                );
+              } else {
+                console.log(responseBody);
+              }
+            }
+          } else {
+            console.log("\x1B[33mResponse Body:\x1B[0m (empty)");
+          }
+        } catch (cloneError) {
+          console.log("\x1B[33mResponse Body:\x1B[0m (unable to clone/read)");
+        }
+      } else {
+        console.log("\x1B[33mResponse Body:\x1B[0m (no body)");
+      }
+    } catch (error) {
+      console.log("\x1B[33mResponse Body:\x1B[0m (unable to read)");
+    }
+    console.log("\x1B[36m" + "=".repeat(80) + "\x1B[0m\n");
+  }
 }
 __name(requestLogger, "requestLogger");
 
@@ -340,16 +430,16 @@ function generateUUID() {
 }
 __name(generateUUID, "generateUUID");
 var TMP_MCP_USE_DIR = ".mcp-use";
-var isDeno = typeof globalThis.Deno !== "undefined";
-function getEnv(key) {
-  if (isDeno) {
+var isDeno2 = typeof globalThis.Deno !== "undefined";
+function getEnv2(key) {
+  if (isDeno2) {
     return globalThis.Deno.env.get(key);
   }
   return process.env[key];
 }
-__name(getEnv, "getEnv");
+__name(getEnv2, "getEnv");
 function getCwd() {
-  if (isDeno) {
+  if (isDeno2) {
     return globalThis.Deno.cwd();
   }
   return process.cwd();
@@ -357,7 +447,7 @@ function getCwd() {
 __name(getCwd, "getCwd");
 var fsHelpers = {
   async readFileSync(path, encoding = "utf8") {
-    if (isDeno) {
+    if (isDeno2) {
       return await globalThis.Deno.readTextFile(path);
     }
     const { readFileSync } = await import("fs");
@@ -365,7 +455,7 @@ var fsHelpers = {
     return typeof result === "string" ? result : result.toString(encoding);
   },
   async readFile(path) {
-    if (isDeno) {
+    if (isDeno2) {
       const data = await globalThis.Deno.readFile(path);
       return data.buffer;
     }
@@ -377,7 +467,7 @@ var fsHelpers = {
     );
   },
   async existsSync(path) {
-    if (isDeno) {
+    if (isDeno2) {
       try {
         await globalThis.Deno.stat(path);
         return true;
@@ -389,7 +479,7 @@ var fsHelpers = {
     return existsSync(path);
   },
   async readdirSync(path) {
-    if (isDeno) {
+    if (isDeno2) {
       const entries = [];
       for await (const entry of globalThis.Deno.readDir(path)) {
         entries.push(entry.name);
@@ -402,7 +492,7 @@ var fsHelpers = {
 };
 var pathHelpers = {
   join(...paths) {
-    if (isDeno) {
+    if (isDeno2) {
       return paths.join("/").replace(/\/+/g, "/");
     }
     return paths.join("/").replace(/\/+/g, "/");
@@ -534,7 +624,7 @@ var McpServer = class {
     if (this.serverBaseUrl) {
       return this.serverBaseUrl;
     }
-    const mcpUrl = getEnv("MCP_URL");
+    const mcpUrl = getEnv2("MCP_URL");
     if (mcpUrl) {
       return mcpUrl;
     }
@@ -1156,7 +1246,7 @@ var McpServer = class {
    * @returns true if in production mode, false otherwise
    */
   isProductionMode() {
-    return getEnv("NODE_ENV") === "production";
+    return getEnv2("NODE_ENV") === "production";
   }
   /**
    * Read build manifest file
@@ -1167,7 +1257,7 @@ var McpServer = class {
   async readBuildManifest() {
     try {
       const manifestPath = pathHelpers.join(
-        isDeno ? "." : getCwd(),
+        isDeno2 ? "." : getCwd(),
         "dist",
         "mcp-use.json"
       );
@@ -1189,7 +1279,7 @@ var McpServer = class {
    * @returns Promise that resolves when all widgets are mounted
    */
   async mountWidgets(options) {
-    if (this.isProductionMode() || isDeno) {
+    if (this.isProductionMode() || isDeno2) {
       console.log("[WIDGETS] Mounting widgets in production mode");
       await this.mountWidgetsProduction(options);
     } else {
@@ -1609,7 +1699,7 @@ if (container && Component) {
   async mountWidgetsProduction(options) {
     const baseRoute = options?.baseRoute || "/mcp-use/widgets";
     const widgetsDir = pathHelpers.join(
-      isDeno ? "." : getCwd(),
+      isDeno2 ? "." : getCwd(),
       "dist",
       "resources",
       "widgets"
@@ -1816,47 +1906,50 @@ if (container && Component) {
     if (this.mcpMounted) return;
     const { StreamableHTTPServerTransport } = await import("@modelcontextprotocol/sdk/server/streamableHttp.js");
     const idleTimeoutMs = this.config.sessionIdleTimeoutMs ?? 3e5;
-    const getOrCreateTransport = /* @__PURE__ */ __name(async (sessionId, isInit = false) => {
-      if (isInit) {
-        if (sessionId && this.sessions.has(sessionId)) {
-          try {
-            this.sessions.get(sessionId).transport.close();
-          } catch (error) {
-          }
-          this.sessions.delete(sessionId);
+    const createNewTransport = /* @__PURE__ */ __name(async (closeOldSessionId) => {
+      if (closeOldSessionId && this.sessions.has(closeOldSessionId)) {
+        try {
+          this.sessions.get(closeOldSessionId).transport.close();
+        } catch (error) {
         }
-        const isProduction = this.isProductionMode();
-        let allowedOrigins = this.config.allowedOrigins;
-        let enableDnsRebindingProtection = false;
-        if (isProduction) {
-          if (allowedOrigins !== void 0) {
-            enableDnsRebindingProtection = allowedOrigins.length > 0;
-          }
-        } else {
-          allowedOrigins = void 0;
-          enableDnsRebindingProtection = false;
+        this.sessions.delete(closeOldSessionId);
+      }
+      const isProduction = this.isProductionMode();
+      let allowedOrigins = this.config.allowedOrigins;
+      let enableDnsRebindingProtection = false;
+      if (isProduction) {
+        if (allowedOrigins !== void 0) {
+          enableDnsRebindingProtection = allowedOrigins.length > 0;
         }
-        const transport = new StreamableHTTPServerTransport({
-          sessionIdGenerator: /* @__PURE__ */ __name(() => generateUUID(), "sessionIdGenerator"),
-          enableJsonResponse: true,
-          allowedOrigins,
-          enableDnsRebindingProtection,
-          onsessioninitialized: /* @__PURE__ */ __name((id) => {
-            if (id) {
-              this.sessions.set(id, {
-                transport,
-                lastAccessedAt: Date.now()
-              });
-            }
-          }, "onsessioninitialized"),
-          onsessionclosed: /* @__PURE__ */ __name((id) => {
-            if (id) {
-              this.sessions.delete(id);
-            }
-          }, "onsessionclosed")
-        });
-        await this.server.connect(transport);
-        return transport;
+      } else {
+        allowedOrigins = void 0;
+        enableDnsRebindingProtection = false;
+      }
+      const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: /* @__PURE__ */ __name(() => generateUUID(), "sessionIdGenerator"),
+        enableJsonResponse: true,
+        allowedOrigins,
+        enableDnsRebindingProtection,
+        onsessioninitialized: /* @__PURE__ */ __name((id) => {
+          if (id) {
+            this.sessions.set(id, {
+              transport,
+              lastAccessedAt: Date.now()
+            });
+          }
+        }, "onsessioninitialized"),
+        onsessionclosed: /* @__PURE__ */ __name((id) => {
+          if (id) {
+            this.sessions.delete(id);
+          }
+        }, "onsessionclosed")
+      });
+      await this.server.connect(transport);
+      return transport;
+    }, "createNewTransport");
+    const getOrCreateTransport = /* @__PURE__ */ __name(async (sessionId, isInit = false) => {
+      if (isInit) {
+        return await createNewTransport(sessionId);
       }
       if (sessionId && this.sessions.has(sessionId)) {
         const session = this.sessions.get(sessionId);
@@ -1864,7 +1957,15 @@ if (container && Component) {
         return session.transport;
       }
       if (sessionId) {
-        return null;
+        const autoCreate = this.config.autoCreateSessionOnInvalidId ?? true;
+        if (autoCreate) {
+          console.warn(
+            `[MCP] Session ${sessionId} not found (expired or invalid), auto-creating new session for seamless reconnection`
+          );
+          return await createNewTransport(sessionId);
+        } else {
+          return null;
+        }
       }
       return null;
     }, "getOrCreateTransport");
@@ -1973,7 +2074,7 @@ if (container && Component) {
         getResponse: /* @__PURE__ */ __name(() => {
           if (ended) {
             if (responseBody.length > 0) {
-              const body = isDeno ? Buffer.concat(responseBody) : Buffer.concat(responseBody);
+              const body = isDeno2 ? Buffer.concat(responseBody) : Buffer.concat(responseBody);
               return new Response(body, {
                 status: statusCode,
                 headers
@@ -2281,9 +2382,9 @@ if (container && Component) {
     console.log("");
   }
   async listen(port) {
-    const portEnv = getEnv("PORT");
+    const portEnv = getEnv2("PORT");
     this.serverPort = port || (portEnv ? parseInt(portEnv, 10) : 3001);
-    const hostEnv = getEnv("HOST");
+    const hostEnv = getEnv2("HOST");
     if (hostEnv) {
       this.serverHost = hostEnv;
     }
@@ -2294,7 +2395,7 @@ if (container && Component) {
     await this.mountMcp();
     await this.mountInspector();
     this.logRegisteredItems();
-    if (isDeno) {
+    if (isDeno2) {
       const corsHeaders = {
         "Access-Control-Allow-Origin": "*",
         "Access-Control-Allow-Headers": "authorization, x-client-info, apikey, content-type"