@yawlabs/mcp-connect 0.2.0 → 0.2.1

package/dist/index.js

@@ -118,9 +118,10 @@ async function shutdownAnalytics() {
     clearInterval(flushTimer);
     flushTimer = null;
   }
-  while (buffer.length > 0) {
+  for (let i = 0; i < 3 && buffer.length > 0; i++) {
     await flush();
   }
+  buffer.length = 0;
 }
 
 // src/meta-tools.ts
@@ -433,11 +434,21 @@ async function connectToUpstream(config, onDisconnect) {
     }
     transport = new StreamableHTTPClientTransport(new URL(config.url));
   }
-  const connectPromise = client.connect(transport);
-  const timeoutPromise = new Promise(
-    (_, reject) => setTimeout(() => reject(new Error("Connection timeout after " + CONNECT_TIMEOUT + "ms")), CONNECT_TIMEOUT)
-  );
-  await Promise.race([connectPromise, timeoutPromise]);
+  let timer;
+  const timeoutPromise = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error("Connection timeout after " + CONNECT_TIMEOUT + "ms")), CONNECT_TIMEOUT);
+  });
+  try {
+    await Promise.race([client.connect(transport), timeoutPromise]);
+    clearTimeout(timer);
+  } catch (err) {
+    clearTimeout(timer);
+    try {
+      await client.close();
+    } catch {
+    }
+    throw err;
+  }
   log("info", "Connected to upstream", { name: config.name, namespace: config.namespace, type: config.type });
   const connection = {};
   client.onclose = () => {
@@ -647,6 +658,7 @@ var ConnectServer = class _ConnectServer {
             const newConn = await connectToUpstream(serverConfig, (ns) => this.handleUpstreamDisconnect(ns));
             this.connections.set(route.namespace, newConn);
             this.rebuildRoutes();
+            await this.notifyAllListsChanged();
             log("info", "Auto-reconnected to upstream", { namespace: route.namespace });
           } catch (err) {
             log("error", "Auto-reconnect failed", { namespace: route.namespace, error: err.message });
@@ -858,6 +870,7 @@ var ConnectServer = class _ConnectServer {
         log("info", "Server removed or disabled in config, deactivating", { namespace });
         await disconnectFromUpstream(connection);
         this.connections.delete(namespace);
+        this.idleCallCounts.delete(namespace);
         changed = true;
         continue;
       }
@@ -866,6 +879,7 @@ var ConnectServer = class _ConnectServer {
         log("info", "Server config changed, deactivating stale connection", { namespace });
         await disconnectFromUpstream(connection);
         this.connections.delete(namespace);
+        this.idleCallCounts.delete(namespace);
         changed = true;
       }
     }
@@ -890,11 +904,30 @@ var ConnectServer = class _ConnectServer {
     if (!filepath) {
       return { content: [{ type: "text", text: "filepath is required." }], isError: true };
     }
+    const ALLOWED_FILENAMES = ["claude_desktop_config.json", "mcp.json", "settings.json", "mcp_config.json"];
+    const basename = filepath.split(/[/\\]/).pop() || "";
+    if (!ALLOWED_FILENAMES.includes(basename)) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: "Only MCP config files are allowed: " + ALLOWED_FILENAMES.join(", ") + ". Got: " + basename
+          }
+        ],
+        isError: true
+      };
+    }
     try {
-      const resolved = filepath.startsWith("~") ? resolve(homedir(), filepath.slice(2)) : resolve(filepath);
+      const resolved = filepath.startsWith("~/") ? resolve(homedir(), filepath.slice(2)) : resolve(filepath);
       const raw = await readFile(resolved, "utf-8");
       const parsed = JSON.parse(raw);
-      const mcpServers = parsed.mcpServers || parsed;
+      if (!parsed.mcpServers || typeof parsed.mcpServers !== "object") {
+        return {
+          content: [{ type: "text", text: "No mcpServers object found in " + resolved }],
+          isError: true
+        };
+      }
+      const mcpServers = parsed.mcpServers;
       if (typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
         return { content: [{ type: "text", text: "No mcpServers object found in " + resolved }], isError: true };
       }
@@ -911,7 +944,6 @@ var ConnectServer = class _ConnectServer {
         };
         if (value.command) entry.command = value.command;
         if (value.args) entry.args = value.args;
-        if (value.env) entry.env = value.env;
         if (value.url) entry.url = value.url;
         servers.push(entry);
       }
@@ -941,7 +973,7 @@ var ConnectServer = class _ConnectServer {
         content: [
           {
             type: "text",
-            text: "Imported " + (body.imported || 0) + " servers" + (body.skipped ? ", " + body.skipped + " skipped (already exist)" : "") + " from " + resolved + ". Use mcp_connect_discover to see them."
+            text: "Imported " + (body.imported || 0) + " servers" + (body.skipped ? ", " + body.skipped + " skipped (already exist)" : "") + " from " + resolved + ". Note: environment variables (API keys, tokens) were NOT imported for security \u2014 set them at mcp.hosting. Use mcp_connect_discover to see imported servers."
           }
         ]
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/mcp-connect",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "MCP orchestrator — one install, all your MCP servers, managed from the cloud",
   "license": "MIT",
   "author": "Yaw Labs <contact@yaw.sh> (https://yaw.sh)",