@chatpanel/events 0.101.0 → 0.103.1

package/mcp-manager.js

@@ -1,127 +1 @@
-// Holds live MCP client connections so we don't re-handshake every message, and
-// turns the user's configured servers into tool providers for the registry.
-// Never throws — a server that won't connect is skipped so it can't break a chat.
-
-import { McpClient, mcpProvider } from './mcp-client.js';
-
-const clients = new Map(); // key -> { client, sig, name }
-
-const keyOf = (s) => s.id || s.url || s.command;
-const sigOf = (s) => JSON.stringify([s.url, s.headers || {}, s.command, s.args, s.env || {}, s.remoteMode || 'auto']);
-
-// Should this remote (http) server be reached via the bridge (server-side fetch,
-// no browser Origin) rather than a direct fetch? mode: 'auto' (bridge when the
-// bridge is running, else direct), 'bridge' (always), 'direct' (never).
-const remoteViaBridge = (s, bridgeAvailable) =>
-  !s.command && ((s.remoteMode || 'auto') === 'bridge' || ((s.remoteMode || 'auto') === 'auto' && !!bridgeAvailable));
-
-// Build an McpClient from a server config: stdio (local command, via the bridge),
-// or http (Streamable HTTP) connected directly OR proxied through the bridge.
-// `bridgeToken` and `fetchImpl` ride through to the client: the desktop authenticates to the
-// bridge with the per-install token (an extension is authorized by its origin), and a test
-// hands in a fetch.
-function clientFor(s, bridgeUrl, bridgeAvailable, { bridgeToken = '', fetchImpl = null } = {}) {
-  if (s.command) {
-    return new McpClient({ transport: 'stdio', id: s.id, command: s.command, args: s.args, env: s.env, bridgeUrl, bridgeToken, fetchImpl });
-  }
-  return new McpClient({ url: s.url, headers: s.headers || {}, bridgeUrl, viaBridge: remoteViaBridge(s, bridgeAvailable), bridgeToken, fetchImpl });
-}
-
-async function withTimeout(fn, ms) {
-  const ctrl = new AbortController();
-  const t = setTimeout(() => ctrl.abort(), ms);
-  try {
-    return await fn(ctrl.signal);
-  } finally {
-    clearTimeout(t);
-  }
-}
-
-// A connect that is still running is not started again. Without this, every turn during a
-// slow first connect launches another one, and the slow server gets slower.
-const inflight = new Map();
-
-/**
- * Connect (or reuse) one server. Never rejects — a broken server is reported and skipped,
- * because one bad entry must not take the others down.
- */
-function connectTask(s, { onError, timeoutMs, bridgeUrl, bridgeAvailable, bridgeToken, fetchImpl }) {
-  const key = keyOf(s);
-  const sig = sigOf(s);
-  let entry = clients.get(key);
-  if (entry && entry.sig !== sig) { clients.delete(key); entry = null; } // config edited → reconnect
-  if (entry) return Promise.resolve(entry.client.tools.length ? mcpProvider(entry.client, entry.name) : null);
-  if (inflight.has(key)) return inflight.get(key);
-
-  const task = (async () => {
-    try {
-      const client = clientFor(s, bridgeUrl, bridgeAvailable);
-      // stdio servers spawn a process on the bridge (often `npx`, which may download on
-      // first run) — give them much longer than HTTP servers. Bridge-proxied http adds a
-      // hop (and may front a slow upstream) → a bit more.
-      const ms = s.command ? 45000 : (remoteViaBridge(s, bridgeAvailable) ? 20000 : timeoutMs);
-      await withTimeout((signal) => client.connect(signal), ms);
-      const fresh = { client, sig, name: s.name || s.url || s.command };
-      clients.set(key, fresh);
-      return client.tools.length ? mcpProvider(client, fresh.name) : null;
-    } catch (e) {
-      clients.delete(key);
-      onError?.(s, e);
-      return null;
-    } finally {
-      inflight.delete(key);
-    }
-  })();
-  inflight.set(key, task);
-  return task;
-}
-
-/**
- * The tool providers available NOW, waiting at most `budgetMs` for connections.
- *
- * A turn used to await every connect, and an stdio server is allowed 45 seconds because
- * `npx` may download on first run. So one cold server held the whole first message for
- * forty-five seconds before the model saw a single byte — measured, twice, in a user's
- * exported log (mcpMs 45002).
- *
- * The connect timeout was never the problem: a server that legitimately takes 45s to start
- * should still be allowed to. What was wrong is that the USER waited for it. The connect
- * now continues in the background and the turn proceeds without that server, which arrives
- * for the next turn. A tool that shows up a message late is a far smaller cost than a
- * product that appears frozen on first use.
- */
-export async function getMcpProviders(servers, { onError, timeoutMs = 8000, bridgeUrl, bridgeAvailable = false, budgetMs = 4000, bridgeToken = '', fetchImpl = null } = {}) {
-  const enabled = (servers || []).filter((s) => s && s.enabled !== false && (s.url || s.command));
-  if (!enabled.length) return [];
-
-  // Record each result as it lands, so when the budget expires we can take whatever is
-  // ready without cancelling anything still in flight.
-  const ready = new Array(enabled.length).fill(null);
-  const tasks = enabled.map((s, i) => connectTask(s, { onError, timeoutMs, bridgeUrl, bridgeAvailable, bridgeToken, fetchImpl })
-    .then((p) => { ready[i] = p; return p; }));
-
-  if (budgetMs > 0) {
-    let timer;
-    await Promise.race([
-      Promise.all(tasks),
-      new Promise((res) => { timer = setTimeout(res, budgetMs); }),
-    ]);
-    clearTimeout(timer);
-  } else {
-    await Promise.all(tasks);
-  }
-  return ready.filter(Boolean);
-}
-
-// Test a single server config (used by Settings "Test" button). Returns the
-// tool list on success; throws on failure.
-export async function testMcpServer(server, { timeoutMs = 8000, bridgeUrl, bridgeAvailable = false, bridgeToken = '', fetchImpl = null } = {}) {
-  const client = clientFor(server, bridgeUrl, bridgeAvailable, { bridgeToken, fetchImpl });
-  const ms = server.command ? 45000 : (remoteViaBridge(server, bridgeAvailable) ? 20000 : timeoutMs);
-  await withTimeout((signal) => client.connect(signal), ms);
-  return client.tools;
-}
-
-export function resetMcp() {
-  clients.clear();
-}
+import{McpClient as w,mcpProvider as p}from"./mcp-client.js";const g=new Map,k=e=>e.id||e.url||e.command,v=e=>JSON.stringify([e.url,e.headers||{},e.command,e.args,e.env||{},e.remoteMode||"auto"]),h=(e,n)=>!e.command&&((e.remoteMode||"auto")==="bridge"||(e.remoteMode||"auto")==="auto"&&!!n);function M(e,n,l,{bridgeToken:r="",fetchImpl:c=null}={}){return e.command?new w({transport:"stdio",id:e.id,command:e.command,args:e.args,env:e.env,bridgeUrl:n,bridgeToken:r,fetchImpl:c}):new w({url:e.url,headers:e.headers||{},bridgeUrl:n,viaBridge:h(e,l),bridgeToken:r,fetchImpl:c})}async function P(e,n){const l=new AbortController,r=setTimeout(()=>l.abort(),n);try{return await e(l.signal)}finally{clearTimeout(r)}}const y=new Map;function x(e,{onError:n,timeoutMs:l,bridgeUrl:r,bridgeAvailable:c,bridgeToken:m,fetchImpl:u}){const o=k(e),i=v(e);let a=g.get(o);if(a&&a.sig!==i&&(g.delete(o),a=null),a)return Promise.resolve(a.client.tools.length?p(a.client,a.name):null);if(y.has(o))return y.get(o);const s=(async()=>{try{const t=M(e,r,c),d=e.command?45e3:h(e,c)?2e4:l;await P(T=>t.connect(T),d);const f={client:t,sig:i,name:e.name||e.url||e.command};return g.set(o,f),t.tools.length?p(t,f.name):null}catch(t){return g.delete(o),n?.(e,t),null}finally{y.delete(o)}})();return y.set(o,s),s}async function O(e,{onError:n,timeoutMs:l=8e3,bridgeUrl:r,bridgeAvailable:c=!1,budgetMs:m=4e3,bridgeToken:u="",fetchImpl:o=null}={}){const i=(e||[]).filter(t=>t&&t.enabled!==!1&&(t.url||t.command));if(!i.length)return[];const a=new Array(i.length).fill(null),s=i.map((t,d)=>x(t,{onError:n,timeoutMs:l,bridgeUrl:r,bridgeAvailable:c,bridgeToken:u,fetchImpl:o}).then(f=>(a[d]=f,f)));if(m>0){let t;await Promise.race([Promise.all(s),new Promise(d=>{t=setTimeout(d,m)})]),clearTimeout(t)}else await Promise.all(s);return a.filter(Boolean)}async function C(e,{timeoutMs:n=8e3,bridgeUrl:l,bridgeAvailable:r=!1,bridgeToken:c="",fetchImpl:m=null}={}){const u=M(e,l,r,{bridgeToken:c,fetchImpl:m}),o=e.command?45e3:h(e,r)?2e4:n;return await P(i=>u.connect(i),o),u.tools}function S(){g.clear()}export{O as getMcpProviders,S as resetMcp,C as testMcpServer};