@assistant-ui/react-mcp 0.1.15 → 0.1.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/createOAuthProvider.d.ts +7 -1
- package/dist/auth/createOAuthProvider.d.ts.map +1 -1
- package/dist/auth/createOAuthProvider.js +115 -31
- package/dist/auth/createOAuthProvider.js.map +1 -1
- package/dist/auth/types.d.ts +1 -0
- package/dist/auth/types.d.ts.map +1 -1
- package/dist/hooks/useMcpOAuthCallback.d.ts.map +1 -1
- package/dist/hooks/useMcpOAuthCallback.js +5 -6
- package/dist/hooks/useMcpOAuthCallback.js.map +1 -1
- package/dist/resources/McpManagerResource.d.ts.map +1 -1
- package/dist/resources/McpManagerResource.js +2 -1
- package/dist/resources/McpManagerResource.js.map +1 -1
- package/dist/resources/McpServerResource.d.ts +2 -1
- package/dist/resources/McpServerResource.d.ts.map +1 -1
- package/dist/resources/McpServerResource.js +50 -11
- package/dist/resources/McpServerResource.js.map +1 -1
- package/dist/resources/storage/McpLocalStorage.d.ts +7 -0
- package/dist/resources/storage/McpLocalStorage.d.ts.map +1 -1
- package/dist/resources/storage/McpLocalStorage.js +132 -37
- package/dist/resources/storage/McpLocalStorage.js.map +1 -1
- package/dist/resources/storage/McpMemoryStorage.d.ts.map +1 -1
- package/dist/resources/storage/McpMemoryStorage.js +9 -6
- package/dist/resources/storage/McpMemoryStorage.js.map +1 -1
- package/dist/resources/storage/types.d.ts +12 -0
- package/dist/resources/storage/types.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/auth/createOAuthProvider.test.ts +407 -2
- package/src/auth/createOAuthProvider.ts +171 -40
- package/src/auth/types.ts +1 -0
- package/src/hooks/useMcpOAuthCallback.test.ts +74 -1
- package/src/hooks/useMcpOAuthCallback.tsx +11 -8
- package/src/resources/McpManagerResource.ts +2 -1
- package/src/resources/McpServerResource.test.ts +377 -16
- package/src/resources/McpServerResource.ts +61 -10
- package/src/resources/storage/McpLocalStorage.test.ts +71 -1
- package/src/resources/storage/McpLocalStorage.ts +69 -47
- package/src/resources/storage/McpMemoryStorage.test.ts +99 -0
- package/src/resources/storage/McpMemoryStorage.ts +23 -17
- package/src/resources/storage/types.ts +12 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { assertValidServerId } from "../utils/serverId.js";
|
|
2
2
|
import { createMcpId } from "../utils/createMcpId.js";
|
|
3
|
-
import { createOAuthProvider } from "../auth/createOAuthProvider.js";
|
|
3
|
+
import { clearOAuthProviderAuthState, createOAuthProvider } from "../auth/createOAuthProvider.js";
|
|
4
4
|
import { buildHeaders } from "../auth/buildHeaders.js";
|
|
5
5
|
import { validateElicitationContent } from "./validateElicitationContent.js";
|
|
6
6
|
import { useEffect, useEffectEvent, useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
|
|
@@ -9,7 +9,11 @@ import { Client, StreamableHTTPClientTransport, UnauthorizedError } from "@model
|
|
|
9
9
|
//#region src/resources/McpServerResource.ts
|
|
10
10
|
const getConnectionDependencies = (props) => {
|
|
11
11
|
const auth = props.auth;
|
|
12
|
-
const authDependencies = auth.type === "bearer" ? [
|
|
12
|
+
const authDependencies = auth.type === "bearer" ? [
|
|
13
|
+
auth.type,
|
|
14
|
+
auth.token,
|
|
15
|
+
props.storage.scopeId
|
|
16
|
+
] : auth.type === "oauth" ? [
|
|
13
17
|
auth.type,
|
|
14
18
|
auth.scopes?.length,
|
|
15
19
|
...auth.scopes ?? [],
|
|
@@ -17,7 +21,8 @@ const getConnectionDependencies = (props) => {
|
|
|
17
21
|
auth.tokenEndpoint,
|
|
18
22
|
auth.registrationEndpoint,
|
|
19
23
|
auth.clientId,
|
|
20
|
-
auth.clientSecret
|
|
24
|
+
auth.clientSecret,
|
|
25
|
+
props.storage.scopeId
|
|
21
26
|
] : [auth.type];
|
|
22
27
|
return [
|
|
23
28
|
props.id,
|
|
@@ -40,6 +45,7 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
40
45
|
const transportRef = useRef(null);
|
|
41
46
|
const pendingTransportRef = useRef(null);
|
|
42
47
|
const connectionGenerationRef = useRef(0);
|
|
48
|
+
const pendingAuthValidationRef = useRef(null);
|
|
43
49
|
const elicitationResolversRef = useRef(/* @__PURE__ */ new Map());
|
|
44
50
|
const pendingDisposalRef = useRef(null);
|
|
45
51
|
const mountedRef = useRef(true);
|
|
@@ -249,6 +255,36 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
249
255
|
await closeTransports();
|
|
250
256
|
});
|
|
251
257
|
const doCompleteAuth = useEffectEvent(async (callbackUrl) => {
|
|
258
|
+
const validationGeneration = connectionGenerationRef.current;
|
|
259
|
+
const url_0 = new URL(callbackUrl);
|
|
260
|
+
const state = url_0.searchParams.get("state");
|
|
261
|
+
if (!state) throw new Error("missing \"state\" parameter");
|
|
262
|
+
let pendingAuthValidation = pendingAuthValidationRef.current;
|
|
263
|
+
if (!pendingAuthValidation) {
|
|
264
|
+
let resolve_0;
|
|
265
|
+
pendingAuthValidation = {
|
|
266
|
+
count: 0,
|
|
267
|
+
promise: new Promise((resolvePromise) => {
|
|
268
|
+
resolve_0 = resolvePromise;
|
|
269
|
+
}),
|
|
270
|
+
resolve: resolve_0
|
|
271
|
+
};
|
|
272
|
+
pendingAuthValidationRef.current = pendingAuthValidation;
|
|
273
|
+
}
|
|
274
|
+
pendingAuthValidation.count += 1;
|
|
275
|
+
try {
|
|
276
|
+
const persisted = await props.storage.loadAuthState(props.id);
|
|
277
|
+
if (!isCurrentConnection(validationGeneration)) throw createInterruptedAuthError();
|
|
278
|
+
if (!persisted?.state) throw new Error("no pending OAuth authorization request for this server");
|
|
279
|
+
if (persisted.state !== state) throw new Error("OAuth state does not match the authorization request");
|
|
280
|
+
if (!url_0.searchParams.get("code") && !url_0.searchParams.get("error")) throw new Error("missing authorization code in callback URL");
|
|
281
|
+
} finally {
|
|
282
|
+
pendingAuthValidation.count -= 1;
|
|
283
|
+
if (pendingAuthValidation.count === 0) {
|
|
284
|
+
pendingAuthValidationRef.current = null;
|
|
285
|
+
pendingAuthValidation.resolve();
|
|
286
|
+
}
|
|
287
|
+
}
|
|
252
288
|
const generation_3 = ++connectionGenerationRef.current;
|
|
253
289
|
cancelPendingElicitations();
|
|
254
290
|
await closePendingTransport();
|
|
@@ -256,8 +292,6 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
256
292
|
setConnectionState("authPending");
|
|
257
293
|
setLastError(null);
|
|
258
294
|
try {
|
|
259
|
-
const code = new URL(callbackUrl).searchParams.get("code");
|
|
260
|
-
if (!code) throw new Error("missing authorization code in callback URL");
|
|
261
295
|
let transport_4 = transportRef.current;
|
|
262
296
|
if (!transport_4) {
|
|
263
297
|
transport_4 = await buildTransport();
|
|
@@ -269,7 +303,7 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
269
303
|
transportRef.current = null;
|
|
270
304
|
clientRef.current = null;
|
|
271
305
|
pendingTransportRef.current = transport_4;
|
|
272
|
-
await transport_4.finishAuth(
|
|
306
|
+
await transport_4.finishAuth(url_0.searchParams);
|
|
273
307
|
if (!isCurrentConnection(generation_3)) throw createInterruptedAuthError();
|
|
274
308
|
setAuthorizationUrl(null);
|
|
275
309
|
if (!await finalizeConnect(transport_4, generation_3)) throw createInterruptedAuthError();
|
|
@@ -307,6 +341,11 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
307
341
|
if (props.auth.type === "oauth") {
|
|
308
342
|
if (!persisted_0?.tokens) return;
|
|
309
343
|
} else if (!persisted_0?.token) return;
|
|
344
|
+
const pendingAuthValidation_0 = pendingAuthValidationRef.current;
|
|
345
|
+
if (pendingAuthValidation_0) {
|
|
346
|
+
await pendingAuthValidation_0.promise;
|
|
347
|
+
if (signal.cancelled || !isCurrentConnection(generation_4)) return;
|
|
348
|
+
}
|
|
310
349
|
doConnect();
|
|
311
350
|
});
|
|
312
351
|
useEffect(() => {
|
|
@@ -322,7 +361,7 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
322
361
|
mountedRef.current = false;
|
|
323
362
|
signal_0.cancelled = true;
|
|
324
363
|
const task_0 = transportCloseQueueRef.current.then(async () => {
|
|
325
|
-
await new Promise((
|
|
364
|
+
await new Promise((resolve_1) => queueMicrotask(resolve_1));
|
|
326
365
|
if (pendingDisposal.cancelled) return;
|
|
327
366
|
connectionGenerationRef.current += 1;
|
|
328
367
|
await Promise.all(detachTransports().map(closeTransportSafely));
|
|
@@ -330,7 +369,7 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
330
369
|
transportCloseQueueRef.current = task_0;
|
|
331
370
|
};
|
|
332
371
|
}, [props.transportCloseQueueRef]);
|
|
333
|
-
const
|
|
372
|
+
const state_0 = useMemo(() => ({
|
|
334
373
|
id: props.id,
|
|
335
374
|
kind: props.kind,
|
|
336
375
|
name: props.name,
|
|
@@ -354,13 +393,13 @@ const useMcpServerResourceInstance = (props) => {
|
|
|
354
393
|
pendingElicitations
|
|
355
394
|
]);
|
|
356
395
|
return {
|
|
357
|
-
getState: () =>
|
|
396
|
+
getState: () => state_0,
|
|
358
397
|
connect: doConnect,
|
|
359
398
|
disconnect: doDisconnect,
|
|
360
399
|
remove: async () => {
|
|
361
400
|
await doDisconnect();
|
|
362
401
|
try {
|
|
363
|
-
await props.storage
|
|
402
|
+
await clearOAuthProviderAuthState(props.storage, props.id);
|
|
364
403
|
await props.onRemove();
|
|
365
404
|
} catch (err_1) {
|
|
366
405
|
setLastError({ message: err_1 instanceof Error ? err_1.message : String(err_1) });
|
|
@@ -443,6 +482,6 @@ const McpServerResource = resource(function useMcpServerResource(props) {
|
|
|
443
482
|
})));
|
|
444
483
|
});
|
|
445
484
|
//#endregion
|
|
446
|
-
export { McpServerResource };
|
|
485
|
+
export { McpServerResource, getConnectionDependencies };
|
|
447
486
|
|
|
448
487
|
//# sourceMappingURL=McpServerResource.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","useResource","withKey","ClientOutput","Client","StreamableHTTPClientTransport","UnauthorizedError","ClientOptions","ElicitRequest","ElicitResult","StreamableHTTPClientTransportOptions","createOAuthProvider","buildHeaders","assertValidServerId","validateElicitationContent","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPElicitation","MCPElicitationResponse","MCPServerKind","MCPServerState","MCPToolInfo","createMcpId","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","cache","defaultTtlMs","elicitation","onRemove","Promise","McpServerResourceInstanceProps","transportCloseQueueRef","current","getConnectionDependencies","props","authDependencies","type","token","scopes","length","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","areConnectionDependenciesEqual","left","right","every","value","index","Object","is","useMcpServerResourceInstance","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","pendingElicitations","setPendingElicitations","clientRef","transportRef","pendingTransportRef","connectionGenerationRef","elicitationResolversRef","Map","resolve","result","signal","AbortSignal","onAbort","requestedSchema","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","then","all","map","closePendingTransport","resolvePendingElicitation","entry","get","delete","removeEventListener","filter","setPendingElicitationError","error","NonNullable","has","cancelPendingElicitations","action","detachTransports","pendingTransport","activeTransport","Set","closeTransports","isCurrentConnection","generation","createInterruptedAuthError","cause","Error","undefined","withConnectionTimeout","promise","T","phase","startedAt","timeoutMs","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","buildTransport","authProvider","serverId","config","onAuthorizationUrl","toString","URL","persisted","loadAuthState","headers","transportOpts","requestInit","applyToolsList","list","Array","description","inputSchema","t","info","syncTools","client","options","listPromise","listTools","finalizeConnect","clientOptions","capabilities","listChanged","autoRefresh","debounceMs","onChanged","items","defaultCacheTtlMs","version","setRequestHandler","request","context","params","set","aborted","addEventListener","once","connect","synced","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","code","searchParams","finishAuth","connected","tryAutoConnect","Awaited","tokens","previousDisposal","pendingDisposal","queueMicrotask","state","getState","disconnect","remove","clearAuthState","callTool","args","arguments","Record","listResources","readResource","uri","completeAuth","answerElicitation","response","property","content","isArray","errors","properties","join","McpServerResourceInstance","McpServerResource","useMcpServerResource","dependencies","connection","setConnection","currentConnection"],"sources":["../../src/resources/McpServerResource.ts"],"sourcesContent":["import { useState, useRef, useEffect, useMemo, useEffectEvent } from \"react\";\nimport { resource, useResource, withKey } from \"@assistant-ui/tap\";\nimport type { ClientOutput } from \"@assistant-ui/store\";\nimport {\n Client,\n StreamableHTTPClientTransport,\n UnauthorizedError,\n type ClientOptions,\n type ElicitRequest,\n type ElicitResult,\n type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/client\";\nimport { createOAuthProvider } from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\nimport { validateElicitationContent } from \"./validateElicitationContent\";\nimport type { MCPStorage } from \"./storage/types\";\nimport type {\n MCPAuthConfig,\n MCPConnectionState,\n MCPElicitation,\n MCPElicitationResponse,\n MCPServerKind,\n MCPServerState,\n MCPToolInfo,\n} from \"../mcp-scope\";\nimport { createMcpId } from \"../utils/createMcpId\";\n\nexport type McpServerResourceProps = {\n id: string;\n kind: MCPServerKind;\n name: string;\n url: string;\n icon?: string | undefined;\n auth: MCPAuthConfig;\n storage: MCPStorage;\n redirectUri: string;\n autoConnect: boolean;\n connectionTimeout?: number | undefined;\n cache?: { readonly defaultTtlMs?: number } | undefined;\n readonly elicitation?: boolean;\n onRemove: () => Promise<void>;\n};\n\ntype McpServerResourceInstanceProps = McpServerResourceProps & {\n transportCloseQueueRef: { current: Promise<void> };\n};\n\nconst getConnectionDependencies = (\n props: McpServerResourceProps,\n): readonly unknown[] => {\n const auth = props.auth;\n const authDependencies =\n auth.type === \"bearer\"\n ? [auth.type, auth.token]\n : auth.type === \"oauth\"\n ? [\n auth.type,\n auth.scopes?.length,\n ...(auth.scopes ?? []),\n auth.authorizationEndpoint,\n auth.tokenEndpoint,\n auth.registrationEndpoint,\n auth.clientId,\n auth.clientSecret,\n ]\n : [auth.type];\n\n return [\n props.id,\n props.url,\n ...authDependencies,\n props.redirectUri,\n props.cache?.defaultTtlMs,\n props.elicitation !== false,\n ];\n};\n\nconst areConnectionDependenciesEqual = (\n left: readonly unknown[],\n right: readonly unknown[],\n) =>\n left.length === right.length &&\n left.every((value, index) => Object.is(value, right[index]));\n\nconst useMcpServerResourceInstance = (\n props: McpServerResourceInstanceProps,\n): ClientOutput<\"mcpServer\"> => {\n assertValidServerId(props.id);\n const [connectionState, setConnectionState] =\n useState<MCPConnectionState>(\"disconnected\");\n const [tools, setTools] = useState<MCPToolInfo[]>([]);\n const [lastError, setLastError] = useState<{ message: string } | null>(null);\n const [authorizationUrl, setAuthorizationUrl] = useState<string | null>(null);\n const [pendingElicitations, setPendingElicitations] = useState<\n MCPElicitation[]\n >([]);\n\n const clientRef = useRef<Client | null>(null);\n const transportRef = useRef<StreamableHTTPClientTransport | null>(null);\n const pendingTransportRef = useRef<StreamableHTTPClientTransport | null>(\n null,\n );\n const connectionGenerationRef = useRef(0);\n const elicitationResolversRef = useRef(\n new Map<\n string,\n {\n resolve: (result: ElicitResult) => void;\n signal: AbortSignal;\n onAbort: () => void;\n requestedSchema: unknown;\n }\n >(),\n );\n const pendingDisposalRef = useRef<{ cancelled: boolean } | null>(null);\n const mountedRef = useRef(true);\n\n const closeTransportSafely = async (\n transport: StreamableHTTPClientTransport,\n ): Promise<void> => {\n try {\n await transport.close();\n } catch {\n // ignore close errors\n }\n };\n\n const closeQueuedTransports = (\n transports: StreamableHTTPClientTransport[],\n ): Promise<void> => {\n const task = props.transportCloseQueueRef.current.then(async () => {\n await Promise.all(transports.map(closeTransportSafely));\n });\n props.transportCloseQueueRef.current = task;\n return task;\n };\n\n const closePendingTransport = async () => {\n const transport = pendingTransportRef.current;\n pendingTransportRef.current = null;\n await closeQueuedTransports(transport ? [transport] : []);\n };\n\n const resolvePendingElicitation = (id: string, result: ElicitResult) => {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return false;\n elicitationResolversRef.current.delete(id);\n entry.signal.removeEventListener(\"abort\", entry.onAbort);\n setPendingElicitations((current) =>\n current.filter((elicitation) => elicitation.id !== id),\n );\n entry.resolve(result);\n return true;\n };\n\n const setPendingElicitationError = (\n id: string,\n error: NonNullable<MCPElicitation[\"error\"]>,\n ) => {\n if (!elicitationResolversRef.current.has(id)) return false;\n setPendingElicitations((current) =>\n current.map((elicitation) =>\n elicitation.id === id ? { ...elicitation, error } : elicitation,\n ),\n );\n return true;\n };\n\n const cancelPendingElicitations = () => {\n for (const [id] of elicitationResolversRef.current) {\n resolvePendingElicitation(id, { action: \"cancel\" });\n }\n };\n\n const detachTransports = () => {\n cancelPendingElicitations();\n const pendingTransport = pendingTransportRef.current;\n const activeTransport = transportRef.current;\n pendingTransportRef.current = null;\n transportRef.current = null;\n clientRef.current = null;\n\n return [\n ...new Set(\n [pendingTransport, activeTransport].filter(\n (transport): transport is StreamableHTTPClientTransport =>\n transport !== null,\n ),\n ),\n ];\n };\n\n const closeTransports = async () => {\n await closeQueuedTransports(detachTransports());\n };\n\n const isCurrentConnection = (generation: number) =>\n mountedRef.current && generation === connectionGenerationRef.current;\n\n const createInterruptedAuthError = (cause?: unknown) =>\n new Error(\n `MCP server \"${props.id}\" authorization was interrupted before completion.`,\n cause === undefined ? undefined : { cause },\n );\n\n const withConnectionTimeout = useEffectEvent(\n async <T>(\n promise: Promise<T>,\n phase: \"connecting\" | \"listing tools\",\n startedAt: number,\n ): Promise<T> => {\n const timeoutMs = props.connectionTimeout;\n if (timeoutMs === undefined) return await promise;\n const remainingMs = timeoutMs - (Date.now() - startedAt);\n const timeoutError = () =>\n new Error(\n `MCP server \"${props.id}\" timed out while ${phase} after ${timeoutMs}ms.`,\n );\n if (remainingMs <= 0) throw timeoutError();\n\n let timeout: ReturnType<typeof setTimeout> | undefined;\n try {\n return await Promise.race([\n promise,\n new Promise<never>((_, reject) => {\n timeout = setTimeout(() => reject(timeoutError()), remainingMs);\n }),\n ]);\n } finally {\n if (timeout !== undefined) clearTimeout(timeout);\n }\n },\n );\n\n const buildTransport = useEffectEvent(\n async (): Promise<StreamableHTTPClientTransport> => {\n if (props.auth.type === \"oauth\") {\n const authProvider = createOAuthProvider({\n serverId: props.id,\n config: props.auth,\n storage: props.storage,\n redirectUri: props.redirectUri,\n onAuthorizationUrl: (url) => setAuthorizationUrl(url.toString()),\n });\n return new StreamableHTTPClientTransport(new URL(props.url), {\n authProvider,\n });\n }\n if (props.auth.type === \"bearer\") {\n const persisted = await props.storage.loadAuthState(props.id);\n const headers = buildHeaders(props.auth, persisted);\n const transportOpts: StreamableHTTPClientTransportOptions = {};\n if (headers) transportOpts.requestInit = { headers };\n return new StreamableHTTPClientTransport(\n new URL(props.url),\n transportOpts,\n );\n }\n return new StreamableHTTPClientTransport(new URL(props.url));\n },\n );\n\n const applyToolsList = useEffectEvent(\n (list: {\n tools: Array<{\n name: string;\n description?: string | undefined;\n inputSchema: unknown;\n }>;\n }) => {\n setTools(\n list.tools.map((t) => {\n const info: MCPToolInfo = {\n name: t.name,\n inputSchema: t.inputSchema,\n };\n if (t.description !== undefined) info.description = t.description;\n return info;\n }),\n );\n },\n );\n\n const syncTools = useEffectEvent(\n async (\n client: Client,\n generation: number,\n options?: { startedAt?: number | undefined },\n ): Promise<boolean> => {\n const listPromise = client.listTools();\n const list =\n options?.startedAt === undefined\n ? await listPromise\n : await withConnectionTimeout(\n listPromise,\n \"listing tools\",\n options.startedAt,\n );\n if (!isCurrentConnection(generation)) return false;\n applyToolsList(list);\n return true;\n },\n );\n\n const finalizeConnect = useEffectEvent(\n async (\n transport: StreamableHTTPClientTransport,\n generation: number,\n ): Promise<boolean> => {\n const clientOptions: ClientOptions = {\n ...(props.elicitation === false\n ? {}\n : { capabilities: { elicitation: {} } }),\n listChanged: {\n tools: {\n autoRefresh: true,\n debounceMs: 300,\n onChanged: (error, items) => {\n if (!isCurrentConnection(generation)) return;\n if (error !== null) {\n setLastError({ message: error.message });\n return;\n }\n if (items === null) return;\n setLastError(null);\n applyToolsList({ tools: items });\n },\n },\n },\n };\n if (props.cache?.defaultTtlMs !== undefined) {\n clientOptions.defaultCacheTtlMs = props.cache.defaultTtlMs;\n }\n const client = new Client(\n {\n name: \"assistant-ui-mcp\",\n version: \"0.0.0\",\n },\n clientOptions,\n );\n if (props.elicitation !== false) {\n client.setRequestHandler(\n \"elicitation/create\",\n (request: ElicitRequest, context): Promise<ElicitResult> => {\n if (!isCurrentConnection(generation)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n if (!(\"requestedSchema\" in request.params)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n const { message, requestedSchema } = request.params;\n\n const id = createMcpId();\n const promise = new Promise<ElicitResult>((resolve) => {\n const onAbort = () => {\n resolvePendingElicitation(id, { action: \"cancel\" });\n };\n elicitationResolversRef.current.set(id, {\n resolve,\n signal: context.signal,\n onAbort,\n requestedSchema,\n });\n });\n setPendingElicitations((current) => [\n ...current,\n {\n id,\n message,\n requestedSchema,\n },\n ]);\n const entry = elicitationResolversRef.current.get(id);\n if (entry) {\n if (context.signal.aborted) {\n entry.onAbort();\n } else {\n context.signal.addEventListener(\"abort\", entry.onAbort, {\n once: true,\n });\n }\n }\n return promise;\n },\n );\n }\n const startedAt = Date.now();\n await withConnectionTimeout(\n client.connect(transport),\n \"connecting\",\n startedAt,\n );\n if (!isCurrentConnection(generation)) return false;\n // Defer ref assignment until listTools() also succeeds — otherwise a\n // post-connect failure leaves stale refs that `callTool()` would\n // happily walk into, producing confusing SDK errors instead of\n // \"not connected\".\n const synced = await syncTools(client, generation, { startedAt });\n if (!synced) return false;\n\n pendingTransportRef.current = null;\n clientRef.current = client;\n transportRef.current = transport;\n setConnectionState(\"connected\");\n return true;\n },\n );\n\n const doConnect = useEffectEvent(async () => {\n const generation = ++connectionGenerationRef.current;\n // Close any prior transport/client so a re-connect doesn't leak.\n await closeTransports();\n if (!isCurrentConnection(generation)) return;\n\n setConnectionState(\"connecting\");\n setLastError(null);\n setAuthorizationUrl(null);\n // Clear tools so a reconnect (error → connect, or authRequired\n // → connect) doesn't expose the previous attempt's tool list.\n setTools([]);\n let transport: StreamableHTTPClientTransport | null = null;\n try {\n transport = await buildTransport();\n if (!isCurrentConnection(generation)) {\n await closeQueuedTransports([transport]);\n return;\n }\n pendingTransportRef.current = transport;\n // Don't assign to transportRef until connect succeeds — otherwise a\n // failed `listTools()` leaves an orphaned transport that future\n // doConnect / doDisconnect calls treat as live.\n await finalizeConnect(transport, generation);\n } catch (err) {\n if (!isCurrentConnection(generation)) return;\n\n if (err instanceof UnauthorizedError) {\n // OAuth: keep the transport alive so completeAuth can call\n // finishAuth on it. Closing it before storing would leave a\n // closed transport on transportRef.\n pendingTransportRef.current = null;\n transportRef.current = transport;\n setConnectionState(\"authRequired\");\n } else {\n cancelPendingElicitations();\n if (transport) {\n pendingTransportRef.current = null;\n await closeQueuedTransports([transport]);\n }\n setLastError({\n message: err instanceof Error ? err.message : String(err),\n });\n setConnectionState(\"error\");\n }\n }\n });\n\n const doDisconnect = useEffectEvent(async () => {\n connectionGenerationRef.current += 1;\n setTools([]);\n setAuthorizationUrl(null);\n setConnectionState(\"disconnected\");\n await closeTransports();\n });\n\n const doCompleteAuth = useEffectEvent(async (callbackUrl: string) => {\n const generation = ++connectionGenerationRef.current;\n cancelPendingElicitations();\n await closePendingTransport();\n if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n\n setConnectionState(\"authPending\");\n setLastError(null);\n try {\n const url = new URL(callbackUrl);\n const code = url.searchParams.get(\"code\");\n if (!code) throw new Error(\"missing authorization code in callback URL\");\n let transport = transportRef.current;\n if (!transport) {\n transport = await buildTransport();\n if (!isCurrentConnection(generation)) {\n await closeQueuedTransports([transport]);\n throw createInterruptedAuthError();\n }\n }\n transportRef.current = null;\n clientRef.current = null;\n pendingTransportRef.current = transport;\n await transport.finishAuth(code);\n if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n setAuthorizationUrl(null);\n const connected = await finalizeConnect(transport, generation);\n if (!connected) throw createInterruptedAuthError();\n } catch (err) {\n const error = err instanceof Error ? err : new Error(String(err));\n if (!isCurrentConnection(generation))\n throw createInterruptedAuthError(error);\n\n await closeTransports();\n setLastError({\n message: error.message,\n });\n setConnectionState(\"error\");\n throw error;\n }\n });\n\n const tryAutoConnect = useEffectEvent(\n async (signal: { cancelled: boolean }) => {\n if (!props.autoConnect) return;\n if (props.auth.type === \"none\") {\n void doConnect();\n return;\n }\n // Static connector token short-circuits the storage read.\n if (props.auth.type === \"bearer\" && props.auth.token) {\n void doConnect();\n return;\n }\n const generation = connectionGenerationRef.current;\n let persisted: Awaited<ReturnType<MCPStorage[\"loadAuthState\"]>>;\n try {\n persisted = await props.storage.loadAuthState(props.id);\n } catch (error) {\n if (signal.cancelled || !isCurrentConnection(generation)) return;\n const message = error instanceof Error ? error.message : String(error);\n setLastError({\n message: `MCP server \"${props.id}\" failed to load saved authentication: ${message}`,\n });\n setConnectionState(\"error\");\n return;\n }\n if (signal.cancelled || !isCurrentConnection(generation)) return;\n if (props.auth.type === \"oauth\") {\n if (!persisted?.tokens) return;\n } else if (!persisted?.token) {\n return;\n }\n void doConnect();\n },\n );\n\n // Auto-connect on mount when usable auth exists.\n useEffect(() => {\n const transportCloseQueueRef = props.transportCloseQueueRef;\n const previousDisposal = pendingDisposalRef.current;\n if (previousDisposal) previousDisposal.cancelled = true;\n const pendingDisposal = { cancelled: false };\n pendingDisposalRef.current = pendingDisposal;\n mountedRef.current = true;\n const signal = { cancelled: false };\n void tryAutoConnect(signal);\n return () => {\n mountedRef.current = false;\n signal.cancelled = true;\n const task = transportCloseQueueRef.current.then(async () => {\n await new Promise<void>((resolve) => queueMicrotask(resolve));\n if (pendingDisposal.cancelled) return;\n connectionGenerationRef.current += 1;\n await Promise.all(detachTransports().map(closeTransportSafely));\n });\n transportCloseQueueRef.current = task;\n };\n }, [props.transportCloseQueueRef]);\n\n const state = useMemo<MCPServerState>(\n () => ({\n id: props.id,\n kind: props.kind,\n name: props.name,\n url: props.url,\n icon: props.icon,\n connectionState,\n lastError,\n tools,\n authorizationUrl,\n pendingElicitations,\n }),\n [\n props.id,\n props.kind,\n props.name,\n props.url,\n props.icon,\n connectionState,\n lastError,\n tools,\n authorizationUrl,\n pendingElicitations,\n ],\n );\n\n return {\n getState: () => state,\n connect: doConnect,\n disconnect: doDisconnect,\n remove: async () => {\n await doDisconnect();\n try {\n await props.storage.clearAuthState(props.id);\n await props.onRemove();\n } catch (err) {\n setLastError({\n message: err instanceof Error ? err.message : String(err),\n });\n throw err;\n }\n },\n callTool: async (name, args) => {\n const client = clientRef.current;\n if (!client) {\n throw new Error(`MCP server \"${props.id}\" is not connected`);\n }\n return await client.callTool({\n name,\n arguments: args as Record<string, unknown> | undefined,\n });\n },\n listResources: async (params) => {\n const client = clientRef.current;\n if (!client) {\n throw new Error(`MCP server \"${props.id}\" is not connected`);\n }\n return await client.listResources(params);\n },\n readResource: async (uri) => {\n const client = clientRef.current;\n if (!client) {\n throw new Error(`MCP server \"${props.id}\" is not connected`);\n }\n return await client.readResource({ uri });\n },\n completeAuth: doCompleteAuth,\n answerElicitation: (\n id: string,\n response: MCPElicitationResponse,\n ): readonly { property: string; message: string }[] | undefined => {\n if (response.action === \"accept\") {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return;\n\n if (\n typeof response.content !== \"object\" ||\n response.content === null ||\n Array.isArray(response.content)\n ) {\n const errors = [\n {\n property: \"content\",\n message: \"Response content must be an object.\",\n },\n ];\n setPendingElicitationError(id, {\n message: \"Invalid elicitation content: content.\",\n properties: [\"content\"],\n });\n return errors;\n }\n\n const errors = validateElicitationContent(\n entry.requestedSchema,\n response.content,\n );\n if (errors.length > 0) {\n const properties = [\n ...new Set(errors.map((error) => error.property)),\n ];\n setPendingElicitationError(id, {\n message: `Invalid elicitation content: ${properties.join(\", \")}.`,\n properties,\n });\n return errors;\n }\n\n const result: ElicitResult = {\n action: \"accept\",\n content: response.content as ElicitResult[\"content\"],\n };\n resolvePendingElicitation(id, result);\n return;\n }\n\n resolvePendingElicitation(id, { action: response.action });\n },\n };\n};\n\nconst McpServerResourceInstance = resource(useMcpServerResourceInstance);\n\nexport const McpServerResource = resource(function useMcpServerResource(\n props: McpServerResourceProps,\n): ClientOutput<\"mcpServer\"> {\n const transportCloseQueueRef = useRef(Promise.resolve());\n const dependencies = getConnectionDependencies(props);\n const [connection, setConnection] = useState({ dependencies, generation: 0 });\n let currentConnection = connection;\n if (!areConnectionDependenciesEqual(connection.dependencies, dependencies)) {\n currentConnection = {\n dependencies,\n generation: connection.generation + 1,\n };\n setConnection(currentConnection);\n }\n\n // Storage resources do not expose a stable scope identity and may return a\n // fresh client on ordinary renders, so storage changes cannot key remounts.\n return useResource(\n withKey(\n currentConnection.generation,\n McpServerResourceInstance({ ...props, transportCloseQueueRef }),\n ),\n );\n});\n"],"mappings":";;;;;;;;;AAgDA,MAAMgD,6BACJC,UACuB;CACvB,MAAMd,OAAOc,MAAMd;CACnB,MAAMe,mBACJf,KAAKgB,SAAS,WACV,CAAChB,KAAKgB,MAAMhB,KAAKiB,KAAK,IACtBjB,KAAKgB,SAAS,UACZ;EACEhB,KAAKgB;EACLhB,KAAKkB,QAAQC;EACb,GAAInB,KAAKkB,UAAU,CAAA;EACnBlB,KAAKoB;EACLpB,KAAKqB;EACLrB,KAAKsB;EACLtB,KAAKuB;EACLvB,KAAKwB;CAAY,IAEnB,CAACxB,KAAKgB,IAAI;CAElB,OAAO;EACLF,MAAMnB;EACNmB,MAAMhB;EACN,GAAGiB;EACHD,MAAMZ;EACNY,MAAMT,OAAOC;EACbQ,MAAMP,gBAAgB;CAAK;AAE/B;AAEA,MAAMkB,kCACJC,MACAC,UAEAD,KAAKP,WAAWQ,MAAMR,UACtBO,KAAKE,OAAOC,OAAOC,UAAUC,OAAOC,GAAGH,OAAOF,MAAMG,MAAM,CAAC;AAE7D,MAAMG,gCACJnB,UAC8B;CAC9B/B,oBAAoB+B,MAAMnB,EAAE;CAC5B,MAAM,CAACuC,iBAAiBC,sBACtBtE,SAA6B,cAAc;CAC7C,MAAM,CAACuE,OAAOC,YAAYxE,SAAwB,CAAA,CAAE;CACpD,MAAM,CAACyE,WAAWC,gBAAgB1E,SAAqC,IAAI;CAC3E,MAAM,CAAC4E,kBAAkBC,uBAAuB7E,SAAwB,IAAI;CAC5E,MAAM,CAAC8E,qBAAqBC,0BAA0B/E,SAEpD,CAAA,CAAE;CAEJ,MAAMgF,YAAY/E,OAAsB,IAAI;CAC5C,MAAMgF,eAAehF,OAA6C,IAAI;CACtE,MAAMiF,sBAAsBjF,OAC1B,IACF;CACA,MAAMkF,0BAA0BlF,OAAO,CAAC;CACxC,MAAMmF,0BAA0BnF,uBAC9B,IAAIoF,IAQF,CACJ;CACA,MAAMO,qBAAqB3F,OAAsC,IAAI;CACrE,MAAM6F,aAAa7F,OAAO,IAAI;CAE9B,MAAM8F,uBAAuB,OAC3BC,cACkB;EAClB,IAAI;GACF,MAAMA,UAAUC,MAAM;EACxB,QAAQ,CACN;CAEJ;CAEA,MAAMC,yBACJC,eACkB;EAClB,MAAMC,OAAOnD,MAAMH,uBAAuBC,QAAQsD,KAAK,YAAY;GACjE,MAAMzD,QAAQ0D,IAAIH,WAAWI,IAAIR,oBAAoB,CAAC;EACxD,CAAC;EACD9C,MAAMH,uBAAuBC,UAAUqD;EACvC,OAAOA;CACT;CAEA,MAAMI,wBAAwB,YAAY;EACxC,MAAMR,cAAYd,oBAAoBnC;EACtCmC,oBAAoBnC,UAAU;EAC9B,MAAMmD,sBAAsBF,cAAY,CAACA,WAAS,IAAI,CAAA,CAAE;CAC1D;CAEA,MAAMS,6BAA6B3E,IAAYyD,WAAyB;EACtE,MAAMmB,QAAQtB,wBAAwBrC,QAAQ4D,IAAI7E,EAAE;EACpD,IAAI,CAAC4E,OAAO,OAAO;EACnBtB,wBAAwBrC,QAAQ6D,OAAO9E,EAAE;EACzC4E,MAAMlB,OAAOqB,oBAAoB,SAASH,MAAMhB,OAAO;EACvDX,wBAAwBhC,YACtBA,QAAQ+D,QAAQpE,gBAAgBA,YAAYZ,OAAOA,EAAE,CACvD;EACA4E,MAAMpB,QAAQC,MAAM;EACpB,OAAO;CACT;CAEA,MAAMwB,8BACJjF,MACAkF,UACG;EACH,IAAI,CAAC5B,wBAAwBrC,QAAQmE,IAAIpF,IAAE,GAAG,OAAO;EACrDiD,wBAAwBhC,cACtBA,UAAQwD,KAAK7D,kBACXA,cAAYZ,OAAOA,OAAK;GAAE,GAAGY;GAAasE;EAAM,IAAItE,aACtD,CACF;EACA,OAAO;CACT;CAEA,MAAMyE,kCAAkC;EACtC,KAAK,MAAM,CAACrF,SAAOsD,wBAAwBrC,SACzC0D,0BAA0B3E,MAAI,EAAEsF,QAAQ,SAAS,CAAC;CAEtD;CAEA,MAAMC,yBAAyB;EAC7BF,0BAA0B;EAC1B,MAAMG,mBAAmBpC,oBAAoBnC;EAC7C,MAAMwE,kBAAkBtC,aAAalC;EACrCmC,oBAAoBnC,UAAU;EAC9BkC,aAAalC,UAAU;EACvBiC,UAAUjC,UAAU;EAEpB,OAAO,CACL,GAAG,IAAIyE,IACL,CAACF,kBAAkBC,eAAe,CAAC,CAACT,QACjCd,gBACCA,gBAAc,IAClB,CACF,CAAC;CAEL;CAEA,MAAMyB,kBAAkB,YAAY;EAClC,MAAMvB,sBAAsBmB,iBAAiB,CAAC;CAChD;CAEA,MAAMK,uBAAuBC,eAC3B7B,WAAW/C,WAAW4E,eAAexC,wBAAwBpC;CAE/D,MAAM6E,8BAA8BC,UAClC,IAAIC,MACF,eAAe7E,MAAMnB,GAAE,qDACvB+F,UAAUE,KAAAA,IAAYA,KAAAA,IAAY,EAAEF,MAAM,CAC5C;CAEF,MAAMG,wBAAwB5H,eAC5B,OACE6H,SACAE,OACAC,cACe;EACf,MAAMC,YAAYpF,MAAMV;EACxB,IAAI8F,cAAcN,KAAAA,GAAW,OAAO,MAAME;EAC1C,MAAMK,cAAcD,aAAaE,KAAKC,IAAI,IAAIJ;EAC9C,MAAMK,qCACJ,IAAIX,MACF,eAAe7E,MAAMnB,GAAE,oBAAqBqG,MAAK,SAAUE,UAAS,IACtE;EACF,IAAIC,eAAe,GAAG,MAAMG,aAAa;EAEzC,IAAIC;EACJ,IAAI;GACF,OAAO,MAAM9F,QAAQiG,KAAK,CACxBZ,SACA,IAAIrF,SAAgBkG,GAAGC,WAAW;IAChCL,UAAUE,iBAAiBG,OAAON,aAAa,CAAC,GAAGH,WAAW;GAChE,CAAC,CAAC,CACH;EACH,UAAU;GACR,IAAII,YAAYX,KAAAA,GAAWiB,aAAaN,OAAO;EACjD;CACF,CACF;CAEA,MAAMO,iBAAiB7I,eACrB,YAAoD;EAClD,IAAI6C,MAAMd,KAAKgB,SAAS,SAAS;GAC/B,MAAM+F,eAAelI,oBAAoB;IACvCmI,UAAUlG,MAAMnB;IAChBsH,QAAQnG,MAAMd;IACdC,SAASa,MAAMb;IACfC,aAAaY,MAAMZ;IACnBgH,qBAAqBpH,QAAQ4C,oBAAoB5C,IAAIqH,SAAS,CAAC;GACjE,CAAC;GACD,OAAO,IAAI5I,8BAA8B,IAAI6I,IAAItG,MAAMhB,GAAG,GAAG,EAC3DiH,aACF,CAAC;EACH;EACA,IAAIjG,MAAMd,KAAKgB,SAAS,UAAU;GAChC,MAAMqG,YAAY,MAAMvG,MAAMb,QAAQqH,cAAcxG,MAAMnB,EAAE;GAC5D,MAAM4H,UAAUzI,aAAagC,MAAMd,MAAMqH,SAAS;GAClD,MAAMG,gBAAsD,CAAC;GAC7D,IAAID,SAASC,cAAcC,cAAc,EAAEF,QAAQ;GACnD,OAAO,IAAIhJ,8BACT,IAAI6I,IAAItG,MAAMhB,GAAG,GACjB0H,aACF;EACF;EACA,OAAO,IAAIjJ,8BAA8B,IAAI6I,IAAItG,MAAMhB,GAAG,CAAC;CAC7D,CACF;CAEA,MAAM4H,iBAAiBzJ,gBACpB0J,SAMK;EACJtF,SACEsF,KAAKvF,MAAMgC,KAAK2D,MAAM;GACpB,MAAMC,OAAoB;IACxBnI,MAAMkI,EAAElI;IACRiI,aAAaC,EAAED;GACjB;GACA,IAAIC,EAAEF,gBAAgBjC,KAAAA,GAAWoC,KAAKH,cAAcE,EAAEF;GACtD,OAAOG;EACT,CAAC,CACH;CACF,CACF;CAEA,MAAMC,YAAYhK,eAChB,OACEiK,QACA1C,cACA2C,YACqB;EACrB,MAAMC,cAAcF,OAAOG,UAAU;EACrC,MAAMV,SACJQ,SAASlC,cAAcL,KAAAA,IACnB,MAAMwC,cACN,MAAMvC,sBACJuC,aACA,iBACAD,QAAQlC,SACV;EACN,IAAI,CAACV,oBAAoBC,YAAU,GAAG,OAAO;EAC7CkC,eAAeC,MAAI;EACnB,OAAO;CACT,CACF;CAEA,MAAMW,kBAAkBrK,eACtB,OACE4F,aACA2B,iBACqB;EACrB,MAAM+C,gBAA+B;GACnC,GAAIzH,MAAMP,gBAAgB,QACtB,CAAC,IACD,EAAEiI,cAAc,EAAEjI,aAAa,CAAC,EAAE,EAAE;GACxCkI,aAAa,EACXrG,OAAO;IACLsG,aAAa;IACbC,YAAY;IACZC,YAAY/D,SAAOgE,UAAU;KAC3B,IAAI,CAACtD,oBAAoBC,YAAU,GAAG;KACtC,IAAIX,YAAU,MAAM;MAClBtC,aAAa,EAAEC,SAASqC,QAAMrC,QAAQ,CAAC;MACvC;KACF;KACA,IAAIqG,UAAU,MAAM;KACpBtG,aAAa,IAAI;KACjBmF,eAAe,EAAEtF,OAAOyG,MAAM,CAAC;IACjC;GACF,EACF;EACF;EACA,IAAI/H,MAAMT,OAAOC,iBAAiBsF,KAAAA,GAChC2C,cAAcO,oBAAoBhI,MAAMT,MAAMC;EAEhD,MAAM4H,WAAS,IAAI5J,OACjB;GACEuB,MAAM;GACNkJ,SAAS;EACX,GACAR,aACF;EACA,IAAIzH,MAAMP,gBAAgB,OACxB2H,SAAOc,kBACL,uBACCC,SAAwBC,YAAmC;GAC1D,IAAI,CAAC3D,oBAAoBC,YAAU,GACjC,OAAO/E,QAAQ0C,QAAQ,EAAE8B,QAAQ,SAAS,CAAC;GAE7C,IAAI,EAAE,qBAAqBgE,QAAQE,SACjC,OAAO1I,QAAQ0C,QAAQ,EAAE8B,QAAQ,SAAS,CAAC;GAE7C,MAAM,EAAEzC,SAASgB,oBAAoByF,QAAQE;GAE7C,MAAMxJ,OAAKF,YAAY;GACvB,MAAMqG,YAAU,IAAIrF,SAAuB0C,YAAY;IACrD,MAAMI,gBAAgB;KACpBe,0BAA0B3E,MAAI,EAAEsF,QAAQ,SAAS,CAAC;IACpD;IACAhC,wBAAwBrC,QAAQwI,IAAIzJ,MAAI;KACtCwD;KACAE,QAAQ6F,QAAQ7F;KAChBE;KACAC;IACF,CAAC;GACH,CAAC;GACDZ,wBAAwBhC,cAAY,CAClC,GAAGA,WACH;IACEjB,IAAAA;IACA6C;IACAgB;GACF,CAAC,CACF;GACD,MAAMe,UAAQtB,wBAAwBrC,QAAQ4D,IAAI7E,IAAE;GACpD,IAAI4E,SAAO;IACT,IAAI2E,QAAQ7F,OAAOgG,SACjB9E,QAAMhB,QAAQ;SAEd2F,QAAQ7F,OAAOiG,iBAAiB,SAAS/E,QAAMhB,SAAS,EACtDgG,MAAM,KACR,CAAC;GAEL;GACA,OAAOzD;EACT,CACF;EAEF,MAAMG,cAAYG,KAAKC,IAAI;EAC3B,MAAMR,sBACJqC,SAAOsB,QAAQ3F,WAAS,GACxB,cACAoC,WACF;EACA,IAAI,CAACV,oBAAoBC,YAAU,GAAG,OAAO;EAM7C,IAAI,CAACiE,MADgBxB,UAAUC,UAAQ1C,cAAY,EAAES,WAAAA,YAAU,CAAC,GACnD,OAAO;EAEpBlD,oBAAoBnC,UAAU;EAC9BiC,UAAUjC,UAAUsH;EACpBpF,aAAalC,UAAUiD;EACvB1B,mBAAmB,WAAW;EAC9B,OAAO;CACT,CACF;CAEA,MAAMuH,YAAYzL,eAAe,YAAY;EAC3C,MAAMuH,eAAa,EAAExC,wBAAwBpC;EAE7C,MAAM0E,gBAAgB;EACtB,IAAI,CAACC,oBAAoBC,YAAU,GAAG;EAEtCrD,mBAAmB,YAAY;EAC/BI,aAAa,IAAI;EACjBG,oBAAoB,IAAI;EAGxBL,SAAS,CAAA,CAAE;EACX,IAAIwB,cAAkD;EACtD,IAAI;GACFA,cAAY,MAAMiD,eAAe;GACjC,IAAI,CAACvB,oBAAoBC,YAAU,GAAG;IACpC,MAAMzB,sBAAsB,CAACF,WAAS,CAAC;IACvC;GACF;GACAd,oBAAoBnC,UAAUiD;GAI9B,MAAMyE,gBAAgBzE,aAAW2B,YAAU;EAC7C,SAASmE,KAAK;GACZ,IAAI,CAACpE,oBAAoBC,YAAU,GAAG;GAEtC,IAAImE,eAAenL,mBAAmB;IAIpCuE,oBAAoBnC,UAAU;IAC9BkC,aAAalC,UAAUiD;IACvB1B,mBAAmB,cAAc;GACnC,OAAO;IACL6C,0BAA0B;IAC1B,IAAInB,aAAW;KACbd,oBAAoBnC,UAAU;KAC9B,MAAMmD,sBAAsB,CAACF,WAAS,CAAC;IACzC;IACAtB,aAAa,EACXC,SAASmH,eAAehE,QAAQgE,IAAInH,UAAUoH,OAAOD,GAAG,EAC1D,CAAC;IACDxH,mBAAmB,OAAO;GAC5B;EACF;CACF,CAAC;CAED,MAAM0H,eAAe5L,eAAe,YAAY;EAC9C+E,wBAAwBpC,WAAW;EACnCyB,SAAS,CAAA,CAAE;EACXK,oBAAoB,IAAI;EACxBP,mBAAmB,cAAc;EACjC,MAAMmD,gBAAgB;CACxB,CAAC;CAED,MAAMwE,iBAAiB7L,eAAe,OAAO8L,gBAAwB;EACnE,MAAMvE,eAAa,EAAExC,wBAAwBpC;EAC7CoE,0BAA0B;EAC1B,MAAMX,sBAAsB;EAC5B,IAAI,CAACkB,oBAAoBC,YAAU,GAAG,MAAMC,2BAA2B;EAEvEtD,mBAAmB,aAAa;EAChCI,aAAa,IAAI;EACjB,IAAI;GAEF,MAAMyH,OAAOlK,IADGsH,IAAI2C,WACPjK,CAAG,CAACmK,aAAazF,IAAI,MAAM;GACxC,IAAI,CAACwF,MAAM,MAAM,IAAIrE,MAAM,4CAA4C;GACvE,IAAI9B,cAAYf,aAAalC;GAC7B,IAAI,CAACiD,aAAW;IACdA,cAAY,MAAMiD,eAAe;IACjC,IAAI,CAACvB,oBAAoBC,YAAU,GAAG;KACpC,MAAMzB,sBAAsB,CAACF,WAAS,CAAC;KACvC,MAAM4B,2BAA2B;IACnC;GACF;GACA3C,aAAalC,UAAU;GACvBiC,UAAUjC,UAAU;GACpBmC,oBAAoBnC,UAAUiD;GAC9B,MAAMA,YAAUqG,WAAWF,IAAI;GAC/B,IAAI,CAACzE,oBAAoBC,YAAU,GAAG,MAAMC,2BAA2B;GACvE/C,oBAAoB,IAAI;GAExB,IAAI,CAACyH,MADmB7B,gBAAgBzE,aAAW2B,YAAU,GAC7C,MAAMC,2BAA2B;EACnD,SAASkE,OAAK;GACZ,MAAM9E,UAAQ8E,iBAAehE,QAAQgE,QAAM,IAAIhE,MAAMiE,OAAOD,KAAG,CAAC;GAChE,IAAI,CAACpE,oBAAoBC,YAAU,GACjC,MAAMC,2BAA2BZ,OAAK;GAExC,MAAMS,gBAAgB;GACtB/C,aAAa,EACXC,SAASqC,QAAMrC,QACjB,CAAC;GACDL,mBAAmB,OAAO;GAC1B,MAAM0C;EACR;CACF,CAAC;CAED,MAAMuF,iBAAiBnM,eACrB,OAAOoF,WAAmC;EACxC,IAAI,CAACvC,MAAMX,aAAa;EACxB,IAAIW,MAAMd,KAAKgB,SAAS,QAAQ;GAC9B,UAAe;GACf;EACF;EAEA,IAAIF,MAAMd,KAAKgB,SAAS,YAAYF,MAAMd,KAAKiB,OAAO;GACpD,UAAe;GACf;EACF;EACA,MAAMuE,eAAaxC,wBAAwBpC;EAC3C,IAAIyG;EACJ,IAAI;GACFA,cAAY,MAAMvG,MAAMb,QAAQqH,cAAcxG,MAAMnB,EAAE;EACxD,SAASkF,SAAO;GACd,IAAIxB,OAAOK,aAAa,CAAC6B,oBAAoBC,YAAU,GAAG;GAC1D,MAAMhD,YAAUqC,mBAAiBc,QAAQd,QAAMrC,UAAUoH,OAAO/E,OAAK;GACrEtC,aAAa,EACXC,SAAS,eAAe1B,MAAMnB,GAAE,yCAA0C6C,YAC5E,CAAC;GACDL,mBAAmB,OAAO;GAC1B;EACF;EACA,IAAIkB,OAAOK,aAAa,CAAC6B,oBAAoBC,YAAU,GAAG;EAC1D,IAAI1E,MAAMd,KAAKgB,SAAS,SAClB;OAAA,CAACqG,aAAWiD,QAAQ;EAAA,OACnB,IAAI,CAACjD,aAAWpG,OACrB;EAEF,UAAe;CACjB,CACF;CAGAlD,gBAAgB;EACd,MAAM4C,yBAAyBG,MAAMH;EACrC,MAAM4J,mBAAmB9G,mBAAmB7C;EAC5C,IAAI2J,kBAAkBA,iBAAiB7G,YAAY;EACnD,MAAM8G,kBAAkB,EAAE9G,WAAW,MAAM;EAC3CD,mBAAmB7C,UAAU4J;EAC7B7G,WAAW/C,UAAU;EACrB,MAAMyC,WAAS,EAAEK,WAAW,MAAM;EAClC,eAAoBL,QAAM;EAC1B,aAAa;GACXM,WAAW/C,UAAU;GACrByC,SAAOK,YAAY;GACnB,MAAMO,SAAOtD,uBAAuBC,QAAQsD,KAAK,YAAY;IAC3D,MAAM,IAAIzD,SAAe0C,cAAYsH,eAAetH,SAAO,CAAC;IAC5D,IAAIqH,gBAAgB9G,WAAW;IAC/BV,wBAAwBpC,WAAW;IACnC,MAAMH,QAAQ0D,IAAIe,iBAAiB,CAAC,CAACd,IAAIR,oBAAoB,CAAC;GAChE,CAAC;GACDjD,uBAAuBC,UAAUqD;EACnC;CACF,GAAG,CAACnD,MAAMH,sBAAsB,CAAC;CAEjC,MAAM+J,QAAQ1M,eACL;EACL2B,IAAImB,MAAMnB;EACVC,MAAMkB,MAAMlB;EACZC,MAAMiB,MAAMjB;EACZC,KAAKgB,MAAMhB;EACXC,MAAMe,MAAMf;EACZmC;EACAI;EACAF;EACAK;EACAE;CACF,IACA;EACE7B,MAAMnB;EACNmB,MAAMlB;EACNkB,MAAMjB;EACNiB,MAAMhB;EACNgB,MAAMf;EACNmC;EACAI;EACAF;EACAK;EACAE;CAAmB,CAEvB;CAEA,OAAO;EACLgI,gBAAgBD;EAChBlB,SAASE;EACTkB,YAAYf;EACZgB,QAAQ,YAAY;GAClB,MAAMhB,aAAa;GACnB,IAAI;IACF,MAAM/I,MAAMb,QAAQ6K,eAAehK,MAAMnB,EAAE;IAC3C,MAAMmB,MAAMN,SAAS;GACvB,SAASmJ,OAAK;IACZpH,aAAa,EACXC,SAASmH,iBAAehE,QAAQgE,MAAInH,UAAUoH,OAAOD,KAAG,EAC1D,CAAC;IACD,MAAMA;GACR;EACF;EACAoB,UAAU,OAAOlL,MAAMmL,SAAS;GAC9B,MAAM9C,WAASrF,UAAUjC;GACzB,IAAI,CAACsH,UACH,MAAM,IAAIvC,MAAM,eAAe7E,MAAMnB,GAAE,mBAAoB;GAE7D,OAAO,MAAMuI,SAAO6C,SAAS;IAC3BlL;IACAoL,WAAWD;GACb,CAAC;EACH;EACAG,eAAe,OAAOhC,WAAW;GAC/B,MAAMjB,WAASrF,UAAUjC;GACzB,IAAI,CAACsH,UACH,MAAM,IAAIvC,MAAM,eAAe7E,MAAMnB,GAAE,mBAAoB;GAE7D,OAAO,MAAMuI,SAAOiD,cAAchC,MAAM;EAC1C;EACAiC,cAAc,OAAOC,QAAQ;GAC3B,MAAMnD,WAASrF,UAAUjC;GACzB,IAAI,CAACsH,UACH,MAAM,IAAIvC,MAAM,eAAe7E,MAAMnB,GAAE,mBAAoB;GAE7D,OAAO,MAAMuI,SAAOkD,aAAa,EAAEC,IAAI,CAAC;EAC1C;EACAC,cAAcxB;EACdyB,oBACE5L,MACA6L,aACiE;GACjE,IAAIA,SAASvG,WAAW,UAAU;IAChC,MAAMV,UAAQtB,wBAAwBrC,QAAQ4D,IAAI7E,IAAE;IACpD,IAAI,CAAC4E,SAAO;IAEZ,IACE,OAAOiH,SAASE,YAAY,YAC5BF,SAASE,YAAY,QACrB9D,MAAM+D,QAAQH,SAASE,OAAO,GAC9B;KACA,MAAME,SAAS,CACb;MACEH,UAAU;MACVjJ,SAAS;KACX,CAAC;KAEHoC,2BAA2BjF,MAAI;MAC7B6C,SAAS;MACTqJ,YAAY,CAAC,SAAS;KACxB,CAAC;KACD,OAAOD;IACT;IAEA,MAAMA,WAAS5M,2BACbuF,QAAMf,iBACNgI,SAASE,OACX;IACA,IAAIE,SAAOzK,SAAS,GAAG;KACrB,MAAM0K,aAAa,CACjB,GAAG,IAAIxG,IAAIuG,SAAOxH,KAAKS,YAAUA,QAAM4G,QAAQ,CAAC,CAAC;KAEnD7G,2BAA2BjF,MAAI;MAC7B6C,SAAS,gCAAgCqJ,WAAWC,KAAK,IAAI,EAAC;MAC9DD;KACF,CAAC;KACD,OAAOD;IACT;IAEA,MAAMxI,WAAuB;KAC3B6B,QAAQ;KACRyG,SAASF,SAASE;IACpB;IACApH,0BAA0B3E,MAAIyD,QAAM;IACpC;GACF;GAEAkB,0BAA0B3E,MAAI,EAAEsF,QAAQuG,SAASvG,OAAO,CAAC;EAC3D;CACF;AACF;AAEA,MAAM8G,4BAA4B7N,SAAS+D,4BAA4B;AAEvE,MAAa+J,oBAAoB9N,SAAS,SAAS+N,qBACjDnL,OAC2B;CAC3B,MAAMH,yBAAyB7C,OAAO2C,QAAQ0C,QAAQ,CAAC;CACvD,MAAM+I,eAAerL,0BAA0BC,KAAK;CACpD,MAAM,CAACqL,YAAYC,iBAAiBvO,SAAS;EAAEqO;EAAc1G,YAAY;CAAE,CAAC;CAC5E,IAAI6G,oBAAoBF;CACxB,IAAI,CAAC1K,+BAA+B0K,WAAWD,cAAcA,YAAY,GAAG;EAC1EG,oBAAoB;GAClBH;GACA1G,YAAY2G,WAAW3G,aAAa;EACtC;EACA4G,cAAcC,iBAAiB;CACjC;CAIA,OAAOlO,YACLC,QACEiO,kBAAkB7G,YAClBuG,0BAA0B;EAAE,GAAGjL;EAAOH;CAAuB,CAAC,CAChE,CACF;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"McpServerResource.js","names":["useState","useRef","useEffect","useMemo","useEffectEvent","resource","useResource","withKey","ClientOutput","Client","StreamableHTTPClientTransport","UnauthorizedError","ClientOptions","ElicitRequest","ElicitResult","StreamableHTTPClientTransportOptions","clearOAuthProviderAuthState","createOAuthProvider","buildHeaders","assertValidServerId","validateElicitationContent","MCPStorage","MCPAuthConfig","MCPConnectionState","MCPElicitation","MCPElicitationResponse","MCPServerKind","MCPServerState","MCPToolInfo","createMcpId","McpServerResourceProps","id","kind","name","url","icon","auth","storage","redirectUri","autoConnect","connectionTimeout","cache","defaultTtlMs","elicitation","onRemove","Promise","McpServerResourceInstanceProps","transportCloseQueueRef","current","getConnectionDependencies","props","authDependencies","type","token","scopeId","scopes","length","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","areConnectionDependenciesEqual","left","right","every","value","index","Object","is","useMcpServerResourceInstance","connectionState","setConnectionState","tools","setTools","lastError","setLastError","message","authorizationUrl","setAuthorizationUrl","pendingElicitations","setPendingElicitations","clientRef","transportRef","pendingTransportRef","connectionGenerationRef","pendingAuthValidationRef","count","promise","resolve","elicitationResolversRef","Map","result","signal","AbortSignal","onAbort","requestedSchema","pendingDisposalRef","cancelled","mountedRef","closeTransportSafely","transport","close","closeQueuedTransports","transports","task","then","all","map","closePendingTransport","resolvePendingElicitation","entry","get","delete","removeEventListener","filter","setPendingElicitationError","error","NonNullable","has","cancelPendingElicitations","action","detachTransports","pendingTransport","activeTransport","Set","closeTransports","isCurrentConnection","generation","createInterruptedAuthError","cause","Error","undefined","withConnectionTimeout","T","phase","startedAt","timeoutMs","remainingMs","Date","now","timeoutError","timeout","ReturnType","setTimeout","race","_","reject","clearTimeout","buildTransport","authProvider","serverId","config","onAuthorizationUrl","toString","URL","persisted","loadAuthState","headers","transportOpts","requestInit","applyToolsList","list","Array","description","inputSchema","t","info","syncTools","client","options","listPromise","listTools","finalizeConnect","clientOptions","capabilities","listChanged","autoRefresh","debounceMs","onChanged","items","defaultCacheTtlMs","version","setRequestHandler","request","context","params","set","aborted","addEventListener","once","connect","synced","doConnect","err","String","doDisconnect","doCompleteAuth","callbackUrl","validationGeneration","state","searchParams","pendingAuthValidation","resolvePromise","finishAuth","connected","tryAutoConnect","Awaited","tokens","previousDisposal","pendingDisposal","queueMicrotask","getState","disconnect","remove","callTool","args","arguments","Record","listResources","readResource","uri","completeAuth","answerElicitation","response","property","content","isArray","errors","properties","join","McpServerResourceInstance","McpServerResource","useMcpServerResource","dependencies","connection","setConnection","currentConnection"],"sources":["../../src/resources/McpServerResource.ts"],"sourcesContent":["import { useState, useRef, useEffect, useMemo, useEffectEvent } from \"react\";\nimport { resource, useResource, withKey } from \"@assistant-ui/tap\";\nimport type { ClientOutput } from \"@assistant-ui/store\";\nimport {\n Client,\n StreamableHTTPClientTransport,\n UnauthorizedError,\n type ClientOptions,\n type ElicitRequest,\n type ElicitResult,\n type StreamableHTTPClientTransportOptions,\n} from \"@modelcontextprotocol/client\";\nimport {\n clearOAuthProviderAuthState,\n createOAuthProvider,\n} from \"../auth/createOAuthProvider\";\nimport { buildHeaders } from \"../auth/buildHeaders\";\nimport { assertValidServerId } from \"../utils/serverId\";\nimport { validateElicitationContent } from \"./validateElicitationContent\";\nimport type { MCPStorage } from \"./storage/types\";\nimport type {\n MCPAuthConfig,\n MCPConnectionState,\n MCPElicitation,\n MCPElicitationResponse,\n MCPServerKind,\n MCPServerState,\n MCPToolInfo,\n} from \"../mcp-scope\";\nimport { createMcpId } from \"../utils/createMcpId\";\n\nexport type McpServerResourceProps = {\n id: string;\n kind: MCPServerKind;\n name: string;\n url: string;\n icon?: string | undefined;\n auth: MCPAuthConfig;\n storage: MCPStorage;\n redirectUri: string;\n autoConnect: boolean;\n connectionTimeout?: number | undefined;\n cache?: { readonly defaultTtlMs?: number } | undefined;\n readonly elicitation?: boolean;\n onRemove: () => Promise<void>;\n};\n\ntype McpServerResourceInstanceProps = McpServerResourceProps & {\n transportCloseQueueRef: { current: Promise<void> };\n};\n\nexport const getConnectionDependencies = (\n props: McpServerResourceProps,\n): readonly unknown[] => {\n const auth = props.auth;\n const authDependencies =\n auth.type === \"bearer\"\n ? [auth.type, auth.token, props.storage.scopeId]\n : auth.type === \"oauth\"\n ? [\n auth.type,\n auth.scopes?.length,\n ...(auth.scopes ?? []),\n auth.authorizationEndpoint,\n auth.tokenEndpoint,\n auth.registrationEndpoint,\n auth.clientId,\n auth.clientSecret,\n props.storage.scopeId,\n ]\n : [auth.type];\n\n return [\n props.id,\n props.url,\n ...authDependencies,\n props.redirectUri,\n props.cache?.defaultTtlMs,\n props.elicitation !== false,\n ];\n};\n\nconst areConnectionDependenciesEqual = (\n left: readonly unknown[],\n right: readonly unknown[],\n) =>\n left.length === right.length &&\n left.every((value, index) => Object.is(value, right[index]));\n\nconst useMcpServerResourceInstance = (\n props: McpServerResourceInstanceProps,\n): ClientOutput<\"mcpServer\"> => {\n assertValidServerId(props.id);\n const [connectionState, setConnectionState] =\n useState<MCPConnectionState>(\"disconnected\");\n const [tools, setTools] = useState<MCPToolInfo[]>([]);\n const [lastError, setLastError] = useState<{ message: string } | null>(null);\n const [authorizationUrl, setAuthorizationUrl] = useState<string | null>(null);\n const [pendingElicitations, setPendingElicitations] = useState<\n MCPElicitation[]\n >([]);\n\n const clientRef = useRef<Client | null>(null);\n const transportRef = useRef<StreamableHTTPClientTransport | null>(null);\n const pendingTransportRef = useRef<StreamableHTTPClientTransport | null>(\n null,\n );\n const connectionGenerationRef = useRef(0);\n const pendingAuthValidationRef = useRef<{\n count: number;\n promise: Promise<void>;\n resolve: () => void;\n } | null>(null);\n const elicitationResolversRef = useRef(\n new Map<\n string,\n {\n resolve: (result: ElicitResult) => void;\n signal: AbortSignal;\n onAbort: () => void;\n requestedSchema: unknown;\n }\n >(),\n );\n const pendingDisposalRef = useRef<{ cancelled: boolean } | null>(null);\n const mountedRef = useRef(true);\n\n const closeTransportSafely = async (\n transport: StreamableHTTPClientTransport,\n ): Promise<void> => {\n try {\n await transport.close();\n } catch {\n // ignore close errors\n }\n };\n\n const closeQueuedTransports = (\n transports: StreamableHTTPClientTransport[],\n ): Promise<void> => {\n const task = props.transportCloseQueueRef.current.then(async () => {\n await Promise.all(transports.map(closeTransportSafely));\n });\n props.transportCloseQueueRef.current = task;\n return task;\n };\n\n const closePendingTransport = async () => {\n const transport = pendingTransportRef.current;\n pendingTransportRef.current = null;\n await closeQueuedTransports(transport ? [transport] : []);\n };\n\n const resolvePendingElicitation = (id: string, result: ElicitResult) => {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return false;\n elicitationResolversRef.current.delete(id);\n entry.signal.removeEventListener(\"abort\", entry.onAbort);\n setPendingElicitations((current) =>\n current.filter((elicitation) => elicitation.id !== id),\n );\n entry.resolve(result);\n return true;\n };\n\n const setPendingElicitationError = (\n id: string,\n error: NonNullable<MCPElicitation[\"error\"]>,\n ) => {\n if (!elicitationResolversRef.current.has(id)) return false;\n setPendingElicitations((current) =>\n current.map((elicitation) =>\n elicitation.id === id ? { ...elicitation, error } : elicitation,\n ),\n );\n return true;\n };\n\n const cancelPendingElicitations = () => {\n for (const [id] of elicitationResolversRef.current) {\n resolvePendingElicitation(id, { action: \"cancel\" });\n }\n };\n\n const detachTransports = () => {\n cancelPendingElicitations();\n const pendingTransport = pendingTransportRef.current;\n const activeTransport = transportRef.current;\n pendingTransportRef.current = null;\n transportRef.current = null;\n clientRef.current = null;\n\n return [\n ...new Set(\n [pendingTransport, activeTransport].filter(\n (transport): transport is StreamableHTTPClientTransport =>\n transport !== null,\n ),\n ),\n ];\n };\n\n const closeTransports = async () => {\n await closeQueuedTransports(detachTransports());\n };\n\n const isCurrentConnection = (generation: number) =>\n mountedRef.current && generation === connectionGenerationRef.current;\n\n const createInterruptedAuthError = (cause?: unknown) =>\n new Error(\n `MCP server \"${props.id}\" authorization was interrupted before completion.`,\n cause === undefined ? undefined : { cause },\n );\n\n const withConnectionTimeout = useEffectEvent(\n async <T>(\n promise: Promise<T>,\n phase: \"connecting\" | \"listing tools\",\n startedAt: number,\n ): Promise<T> => {\n const timeoutMs = props.connectionTimeout;\n if (timeoutMs === undefined) return await promise;\n const remainingMs = timeoutMs - (Date.now() - startedAt);\n const timeoutError = () =>\n new Error(\n `MCP server \"${props.id}\" timed out while ${phase} after ${timeoutMs}ms.`,\n );\n if (remainingMs <= 0) throw timeoutError();\n\n let timeout: ReturnType<typeof setTimeout> | undefined;\n try {\n return await Promise.race([\n promise,\n new Promise<never>((_, reject) => {\n timeout = setTimeout(() => reject(timeoutError()), remainingMs);\n }),\n ]);\n } finally {\n if (timeout !== undefined) clearTimeout(timeout);\n }\n },\n );\n\n const buildTransport = useEffectEvent(\n async (): Promise<StreamableHTTPClientTransport> => {\n if (props.auth.type === \"oauth\") {\n const authProvider = createOAuthProvider({\n serverId: props.id,\n config: props.auth,\n storage: props.storage,\n redirectUri: props.redirectUri,\n onAuthorizationUrl: (url) => setAuthorizationUrl(url.toString()),\n });\n return new StreamableHTTPClientTransport(new URL(props.url), {\n authProvider,\n });\n }\n if (props.auth.type === \"bearer\") {\n const persisted = await props.storage.loadAuthState(props.id);\n const headers = buildHeaders(props.auth, persisted);\n const transportOpts: StreamableHTTPClientTransportOptions = {};\n if (headers) transportOpts.requestInit = { headers };\n return new StreamableHTTPClientTransport(\n new URL(props.url),\n transportOpts,\n );\n }\n return new StreamableHTTPClientTransport(new URL(props.url));\n },\n );\n\n const applyToolsList = useEffectEvent(\n (list: {\n tools: Array<{\n name: string;\n description?: string | undefined;\n inputSchema: unknown;\n }>;\n }) => {\n setTools(\n list.tools.map((t) => {\n const info: MCPToolInfo = {\n name: t.name,\n inputSchema: t.inputSchema,\n };\n if (t.description !== undefined) info.description = t.description;\n return info;\n }),\n );\n },\n );\n\n const syncTools = useEffectEvent(\n async (\n client: Client,\n generation: number,\n options?: { startedAt?: number | undefined },\n ): Promise<boolean> => {\n const listPromise = client.listTools();\n const list =\n options?.startedAt === undefined\n ? await listPromise\n : await withConnectionTimeout(\n listPromise,\n \"listing tools\",\n options.startedAt,\n );\n if (!isCurrentConnection(generation)) return false;\n applyToolsList(list);\n return true;\n },\n );\n\n const finalizeConnect = useEffectEvent(\n async (\n transport: StreamableHTTPClientTransport,\n generation: number,\n ): Promise<boolean> => {\n const clientOptions: ClientOptions = {\n ...(props.elicitation === false\n ? {}\n : { capabilities: { elicitation: {} } }),\n listChanged: {\n tools: {\n autoRefresh: true,\n debounceMs: 300,\n onChanged: (error, items) => {\n if (!isCurrentConnection(generation)) return;\n if (error !== null) {\n setLastError({ message: error.message });\n return;\n }\n if (items === null) return;\n setLastError(null);\n applyToolsList({ tools: items });\n },\n },\n },\n };\n if (props.cache?.defaultTtlMs !== undefined) {\n clientOptions.defaultCacheTtlMs = props.cache.defaultTtlMs;\n }\n const client = new Client(\n {\n name: \"assistant-ui-mcp\",\n version: \"0.0.0\",\n },\n clientOptions,\n );\n if (props.elicitation !== false) {\n client.setRequestHandler(\n \"elicitation/create\",\n (request: ElicitRequest, context): Promise<ElicitResult> => {\n if (!isCurrentConnection(generation)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n if (!(\"requestedSchema\" in request.params)) {\n return Promise.resolve({ action: \"cancel\" });\n }\n const { message, requestedSchema } = request.params;\n\n const id = createMcpId();\n const promise = new Promise<ElicitResult>((resolve) => {\n const onAbort = () => {\n resolvePendingElicitation(id, { action: \"cancel\" });\n };\n elicitationResolversRef.current.set(id, {\n resolve,\n signal: context.signal,\n onAbort,\n requestedSchema,\n });\n });\n setPendingElicitations((current) => [\n ...current,\n {\n id,\n message,\n requestedSchema,\n },\n ]);\n const entry = elicitationResolversRef.current.get(id);\n if (entry) {\n if (context.signal.aborted) {\n entry.onAbort();\n } else {\n context.signal.addEventListener(\"abort\", entry.onAbort, {\n once: true,\n });\n }\n }\n return promise;\n },\n );\n }\n const startedAt = Date.now();\n await withConnectionTimeout(\n client.connect(transport),\n \"connecting\",\n startedAt,\n );\n if (!isCurrentConnection(generation)) return false;\n // Defer ref assignment until listTools() also succeeds — otherwise a\n // post-connect failure leaves stale refs that `callTool()` would\n // happily walk into, producing confusing SDK errors instead of\n // \"not connected\".\n const synced = await syncTools(client, generation, { startedAt });\n if (!synced) return false;\n\n pendingTransportRef.current = null;\n clientRef.current = client;\n transportRef.current = transport;\n setConnectionState(\"connected\");\n return true;\n },\n );\n\n const doConnect = useEffectEvent(async () => {\n const generation = ++connectionGenerationRef.current;\n // Close any prior transport/client so a re-connect doesn't leak.\n await closeTransports();\n if (!isCurrentConnection(generation)) return;\n\n setConnectionState(\"connecting\");\n setLastError(null);\n setAuthorizationUrl(null);\n // Clear tools so a reconnect (error → connect, or authRequired\n // → connect) doesn't expose the previous attempt's tool list.\n setTools([]);\n let transport: StreamableHTTPClientTransport | null = null;\n try {\n transport = await buildTransport();\n if (!isCurrentConnection(generation)) {\n await closeQueuedTransports([transport]);\n return;\n }\n pendingTransportRef.current = transport;\n // Don't assign to transportRef until connect succeeds — otherwise a\n // failed `listTools()` leaves an orphaned transport that future\n // doConnect / doDisconnect calls treat as live.\n await finalizeConnect(transport, generation);\n } catch (err) {\n if (!isCurrentConnection(generation)) return;\n\n if (err instanceof UnauthorizedError) {\n // OAuth: keep the transport alive so completeAuth can call\n // finishAuth on it. Closing it before storing would leave a\n // closed transport on transportRef.\n pendingTransportRef.current = null;\n transportRef.current = transport;\n setConnectionState(\"authRequired\");\n } else {\n cancelPendingElicitations();\n if (transport) {\n pendingTransportRef.current = null;\n await closeQueuedTransports([transport]);\n }\n setLastError({\n message: err instanceof Error ? err.message : String(err),\n });\n setConnectionState(\"error\");\n }\n }\n });\n\n const doDisconnect = useEffectEvent(async () => {\n connectionGenerationRef.current += 1;\n setTools([]);\n setAuthorizationUrl(null);\n setConnectionState(\"disconnected\");\n await closeTransports();\n });\n\n const doCompleteAuth = useEffectEvent(async (callbackUrl: string) => {\n const validationGeneration = connectionGenerationRef.current;\n const url = new URL(callbackUrl);\n const state = url.searchParams.get(\"state\");\n if (!state) throw new Error('missing \"state\" parameter');\n let pendingAuthValidation = pendingAuthValidationRef.current;\n if (!pendingAuthValidation) {\n let resolve!: () => void;\n const promise = new Promise<void>((resolvePromise) => {\n resolve = resolvePromise;\n });\n pendingAuthValidation = { count: 0, promise, resolve };\n pendingAuthValidationRef.current = pendingAuthValidation;\n }\n pendingAuthValidation.count += 1;\n try {\n const persisted = await props.storage.loadAuthState(props.id);\n if (!isCurrentConnection(validationGeneration)) {\n throw createInterruptedAuthError();\n }\n if (!persisted?.state) {\n throw new Error(\n \"no pending OAuth authorization request for this server\",\n );\n }\n if (persisted.state !== state) {\n throw new Error(\"OAuth state does not match the authorization request\");\n }\n if (!url.searchParams.get(\"code\") && !url.searchParams.get(\"error\")) {\n throw new Error(\"missing authorization code in callback URL\");\n }\n } finally {\n pendingAuthValidation.count -= 1;\n if (pendingAuthValidation.count === 0) {\n pendingAuthValidationRef.current = null;\n pendingAuthValidation.resolve();\n }\n }\n\n // Claim the generation before a waiting auto-connect can resume.\n const generation = ++connectionGenerationRef.current;\n cancelPendingElicitations();\n await closePendingTransport();\n if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n\n setConnectionState(\"authPending\");\n setLastError(null);\n try {\n let transport = transportRef.current;\n if (!transport) {\n transport = await buildTransport();\n if (!isCurrentConnection(generation)) {\n await closeQueuedTransports([transport]);\n throw createInterruptedAuthError();\n }\n }\n transportRef.current = null;\n clientRef.current = null;\n pendingTransportRef.current = transport;\n await transport.finishAuth(url.searchParams);\n if (!isCurrentConnection(generation)) throw createInterruptedAuthError();\n setAuthorizationUrl(null);\n const connected = await finalizeConnect(transport, generation);\n if (!connected) throw createInterruptedAuthError();\n } catch (err) {\n const error = err instanceof Error ? err : new Error(String(err));\n if (!isCurrentConnection(generation))\n throw createInterruptedAuthError(error);\n\n await closeTransports();\n setLastError({\n message: error.message,\n });\n setConnectionState(\"error\");\n throw error;\n }\n });\n\n const tryAutoConnect = useEffectEvent(\n async (signal: { cancelled: boolean }) => {\n if (!props.autoConnect) return;\n if (props.auth.type === \"none\") {\n void doConnect();\n return;\n }\n // Static connector token short-circuits the storage read.\n if (props.auth.type === \"bearer\" && props.auth.token) {\n void doConnect();\n return;\n }\n const generation = connectionGenerationRef.current;\n let persisted: Awaited<ReturnType<MCPStorage[\"loadAuthState\"]>>;\n try {\n persisted = await props.storage.loadAuthState(props.id);\n } catch (error) {\n if (signal.cancelled || !isCurrentConnection(generation)) return;\n const message = error instanceof Error ? error.message : String(error);\n setLastError({\n message: `MCP server \"${props.id}\" failed to load saved authentication: ${message}`,\n });\n setConnectionState(\"error\");\n return;\n }\n if (signal.cancelled || !isCurrentConnection(generation)) return;\n if (props.auth.type === \"oauth\") {\n if (!persisted?.tokens) return;\n } else if (!persisted?.token) {\n return;\n }\n const pendingAuthValidation = pendingAuthValidationRef.current;\n if (pendingAuthValidation) {\n await pendingAuthValidation.promise;\n if (signal.cancelled || !isCurrentConnection(generation)) return;\n }\n void doConnect();\n },\n );\n\n // Auto-connect on mount when usable auth exists.\n useEffect(() => {\n const transportCloseQueueRef = props.transportCloseQueueRef;\n const previousDisposal = pendingDisposalRef.current;\n if (previousDisposal) previousDisposal.cancelled = true;\n const pendingDisposal = { cancelled: false };\n pendingDisposalRef.current = pendingDisposal;\n mountedRef.current = true;\n const signal = { cancelled: false };\n void tryAutoConnect(signal);\n return () => {\n mountedRef.current = false;\n signal.cancelled = true;\n const task = transportCloseQueueRef.current.then(async () => {\n await new Promise<void>((resolve) => queueMicrotask(resolve));\n if (pendingDisposal.cancelled) return;\n connectionGenerationRef.current += 1;\n await Promise.all(detachTransports().map(closeTransportSafely));\n });\n transportCloseQueueRef.current = task;\n };\n }, [props.transportCloseQueueRef]);\n\n const state = useMemo<MCPServerState>(\n () => ({\n id: props.id,\n kind: props.kind,\n name: props.name,\n url: props.url,\n icon: props.icon,\n connectionState,\n lastError,\n tools,\n authorizationUrl,\n pendingElicitations,\n }),\n [\n props.id,\n props.kind,\n props.name,\n props.url,\n props.icon,\n connectionState,\n lastError,\n tools,\n authorizationUrl,\n pendingElicitations,\n ],\n );\n\n return {\n getState: () => state,\n connect: doConnect,\n disconnect: doDisconnect,\n remove: async () => {\n await doDisconnect();\n try {\n await clearOAuthProviderAuthState(props.storage, props.id);\n await props.onRemove();\n } catch (err) {\n setLastError({\n message: err instanceof Error ? err.message : String(err),\n });\n throw err;\n }\n },\n callTool: async (name, args) => {\n const client = clientRef.current;\n if (!client) {\n throw new Error(`MCP server \"${props.id}\" is not connected`);\n }\n return await client.callTool({\n name,\n arguments: args as Record<string, unknown> | undefined,\n });\n },\n listResources: async (params) => {\n const client = clientRef.current;\n if (!client) {\n throw new Error(`MCP server \"${props.id}\" is not connected`);\n }\n return await client.listResources(params);\n },\n readResource: async (uri) => {\n const client = clientRef.current;\n if (!client) {\n throw new Error(`MCP server \"${props.id}\" is not connected`);\n }\n return await client.readResource({ uri });\n },\n completeAuth: doCompleteAuth,\n answerElicitation: (\n id: string,\n response: MCPElicitationResponse,\n ): readonly { property: string; message: string }[] | undefined => {\n if (response.action === \"accept\") {\n const entry = elicitationResolversRef.current.get(id);\n if (!entry) return;\n\n if (\n typeof response.content !== \"object\" ||\n response.content === null ||\n Array.isArray(response.content)\n ) {\n const errors = [\n {\n property: \"content\",\n message: \"Response content must be an object.\",\n },\n ];\n setPendingElicitationError(id, {\n message: \"Invalid elicitation content: content.\",\n properties: [\"content\"],\n });\n return errors;\n }\n\n const errors = validateElicitationContent(\n entry.requestedSchema,\n response.content,\n );\n if (errors.length > 0) {\n const properties = [\n ...new Set(errors.map((error) => error.property)),\n ];\n setPendingElicitationError(id, {\n message: `Invalid elicitation content: ${properties.join(\", \")}.`,\n properties,\n });\n return errors;\n }\n\n const result: ElicitResult = {\n action: \"accept\",\n content: response.content as ElicitResult[\"content\"],\n };\n resolvePendingElicitation(id, result);\n return;\n }\n\n resolvePendingElicitation(id, { action: response.action });\n },\n };\n};\n\nconst McpServerResourceInstance = resource(useMcpServerResourceInstance);\n\nexport const McpServerResource = resource(function useMcpServerResource(\n props: McpServerResourceProps,\n): ClientOutput<\"mcpServer\"> {\n const transportCloseQueueRef = useRef(Promise.resolve());\n const dependencies = getConnectionDependencies(props);\n const [connection, setConnection] = useState({ dependencies, generation: 0 });\n let currentConnection = connection;\n if (!areConnectionDependenciesEqual(connection.dependencies, dependencies)) {\n currentConnection = {\n dependencies,\n generation: connection.generation + 1,\n };\n setConnection(currentConnection);\n }\n\n // Storage keys remounts through its optional scopeId rather than object\n // identity, because a defaulted storage element is rebuilt on ordinary\n // renders.\n return useResource(\n withKey(\n currentConnection.generation,\n McpServerResourceInstance({ ...props, transportCloseQueueRef }),\n ),\n );\n});\n"],"mappings":"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"}
|
|
@@ -7,6 +7,13 @@ type McpLocalStorageOptions = {
|
|
|
7
7
|
keyPrefix?: string;
|
|
8
8
|
/** Override the underlying Storage. Defaults to globalThis.localStorage. */
|
|
9
9
|
storage?: Storage;
|
|
10
|
+
/**
|
|
11
|
+
* Stable identity for the backing data, used to key server reconnects.
|
|
12
|
+
* Required to get reconnect-on-swap behavior when `storage` is overridden;
|
|
13
|
+
* without it a custom backing store declares no scope, since a prefix
|
|
14
|
+
* alone cannot distinguish two different stores.
|
|
15
|
+
*/
|
|
16
|
+
scopeId?: string;
|
|
10
17
|
};
|
|
11
18
|
declare const normalizeCustomServerRecords: (value: unknown) => MCPCustomServerRecord[];
|
|
12
19
|
declare const normalizePersistedAuthState: (value: unknown) => MCPPersistedAuthState | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"McpLocalStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"McpLocalStorage.d.ts","names":[],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"mappings":";;;;KAaY;;EAEV;;EAEA,UAAU;;;;;;;EAOV;;cAiGW,+BACX,mBACC;cAsEU,8BACX,mBACC;cAuFU,6CAAe,SAAA,aAAA,OAAA"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { assertValidServerId } from "../../utils/serverId.js";
|
|
2
|
+
import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
|
|
3
|
+
import "@assistant-ui/tap/react-shim";
|
|
2
4
|
import { resource } from "@assistant-ui/tap";
|
|
3
5
|
import { OAuthClientInformationFullSchema, OAuthMetadataSchema, OAuthProtectedResourceMetadataSchema, OAuthTokensSchema } from "@modelcontextprotocol/core";
|
|
4
6
|
//#region src/resources/storage/McpLocalStorage.ts
|
|
@@ -85,6 +87,7 @@ const normalizePersistedAuthState = (value) => {
|
|
|
85
87
|
const state = {};
|
|
86
88
|
if (isNonEmptyString(value.token)) state.token = value.token;
|
|
87
89
|
if (isNonEmptyString(value.codeVerifier)) state.codeVerifier = value.codeVerifier;
|
|
90
|
+
if (isNonEmptyString(value.state)) state.state = value.state;
|
|
88
91
|
const tokens = normalizeOAuthTokens(value.tokens);
|
|
89
92
|
if (tokens) state.tokens = tokens;
|
|
90
93
|
const clientInformation = normalizeClientInformation(value.clientInformation);
|
|
@@ -93,46 +96,138 @@ const normalizePersistedAuthState = (value) => {
|
|
|
93
96
|
if (discoveryState) state.discoveryState = discoveryState;
|
|
94
97
|
return Object.keys(state).length > 0 ? state : null;
|
|
95
98
|
};
|
|
96
|
-
const useMcpLocalStorage = (
|
|
99
|
+
const useMcpLocalStorage = (t0) => {
|
|
100
|
+
const $ = c(36);
|
|
101
|
+
let t1;
|
|
102
|
+
if ($[0] !== t0) {
|
|
103
|
+
t1 = t0 === void 0 ? {} : t0;
|
|
104
|
+
$[0] = t0;
|
|
105
|
+
$[1] = t1;
|
|
106
|
+
} else t1 = $[1];
|
|
107
|
+
const opts = t1;
|
|
97
108
|
const prefix = opts.keyPrefix ?? "aui-mcp";
|
|
109
|
+
let t2;
|
|
110
|
+
if ($[2] !== opts) {
|
|
111
|
+
t2 = resolveStorage(opts);
|
|
112
|
+
$[2] = opts;
|
|
113
|
+
$[3] = t2;
|
|
114
|
+
} else t2 = $[3];
|
|
115
|
+
const storage = t2;
|
|
116
|
+
const scopeId = opts.scopeId ?? (opts.storage === void 0 ? `local-storage:${prefix}` : void 0);
|
|
98
117
|
const customServersKey = `${prefix}:custom-servers`;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
118
|
+
let t3;
|
|
119
|
+
if ($[4] !== prefix) {
|
|
120
|
+
t3 = (id) => `${prefix}:auth:${id}`;
|
|
121
|
+
$[4] = prefix;
|
|
122
|
+
$[5] = t3;
|
|
123
|
+
} else t3 = $[5];
|
|
124
|
+
const authKey = t3;
|
|
125
|
+
let t4;
|
|
126
|
+
if ($[6] !== storage) {
|
|
127
|
+
t4 = (key, fallback) => {
|
|
128
|
+
if (!storage) return fallback;
|
|
129
|
+
try {
|
|
130
|
+
const raw = storage.getItem(key);
|
|
131
|
+
if (raw == null) return fallback;
|
|
132
|
+
return JSON.parse(raw);
|
|
133
|
+
} catch {
|
|
134
|
+
return fallback;
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
$[6] = storage;
|
|
138
|
+
$[7] = t4;
|
|
139
|
+
} else t4 = $[7];
|
|
140
|
+
const read = t4;
|
|
141
|
+
let t5;
|
|
142
|
+
if ($[8] !== storage) {
|
|
143
|
+
t5 = (key_0, value) => {
|
|
144
|
+
if (!storage) return;
|
|
145
|
+
try {
|
|
146
|
+
storage.setItem(key_0, JSON.stringify(value));
|
|
147
|
+
} catch {}
|
|
148
|
+
};
|
|
149
|
+
$[8] = storage;
|
|
150
|
+
$[9] = t5;
|
|
151
|
+
} else t5 = $[9];
|
|
152
|
+
const write = t5;
|
|
153
|
+
let t6;
|
|
154
|
+
if ($[10] !== storage) {
|
|
155
|
+
t6 = (key_1) => {
|
|
156
|
+
if (!storage) return;
|
|
157
|
+
try {
|
|
158
|
+
storage.removeItem(key_1);
|
|
159
|
+
} catch {}
|
|
160
|
+
};
|
|
161
|
+
$[10] = storage;
|
|
162
|
+
$[11] = t6;
|
|
163
|
+
} else t6 = $[11];
|
|
164
|
+
const remove = t6;
|
|
165
|
+
let t7;
|
|
166
|
+
if ($[12] !== scopeId) {
|
|
167
|
+
t7 = scopeId !== void 0 ? { scopeId } : {};
|
|
168
|
+
$[12] = scopeId;
|
|
169
|
+
$[13] = t7;
|
|
170
|
+
} else t7 = $[13];
|
|
171
|
+
let t8;
|
|
172
|
+
if ($[14] !== customServersKey || $[15] !== read) {
|
|
173
|
+
t8 = async () => normalizeCustomServerRecords(read(customServersKey, []));
|
|
174
|
+
$[14] = customServersKey;
|
|
175
|
+
$[15] = read;
|
|
176
|
+
$[16] = t8;
|
|
177
|
+
} else t8 = $[16];
|
|
178
|
+
let t9;
|
|
179
|
+
if ($[17] !== customServersKey || $[18] !== write) {
|
|
180
|
+
t9 = async (records) => {
|
|
126
181
|
write(customServersKey, records);
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
182
|
+
};
|
|
183
|
+
$[17] = customServersKey;
|
|
184
|
+
$[18] = write;
|
|
185
|
+
$[19] = t9;
|
|
186
|
+
} else t9 = $[19];
|
|
187
|
+
let t10;
|
|
188
|
+
if ($[20] !== authKey || $[21] !== read) {
|
|
189
|
+
t10 = async (id_0) => normalizePersistedAuthState(read(authKey(id_0), null));
|
|
190
|
+
$[20] = authKey;
|
|
191
|
+
$[21] = read;
|
|
192
|
+
$[22] = t10;
|
|
193
|
+
} else t10 = $[22];
|
|
194
|
+
let t11;
|
|
195
|
+
if ($[23] !== authKey || $[24] !== write) {
|
|
196
|
+
t11 = async (id_1, state) => {
|
|
197
|
+
write(authKey(id_1), state);
|
|
198
|
+
};
|
|
199
|
+
$[23] = authKey;
|
|
200
|
+
$[24] = write;
|
|
201
|
+
$[25] = t11;
|
|
202
|
+
} else t11 = $[25];
|
|
203
|
+
let t12;
|
|
204
|
+
if ($[26] !== authKey || $[27] !== remove) {
|
|
205
|
+
t12 = async (id_2) => {
|
|
206
|
+
remove(authKey(id_2));
|
|
207
|
+
};
|
|
208
|
+
$[26] = authKey;
|
|
209
|
+
$[27] = remove;
|
|
210
|
+
$[28] = t12;
|
|
211
|
+
} else t12 = $[28];
|
|
212
|
+
let t13;
|
|
213
|
+
if ($[29] !== t10 || $[30] !== t11 || $[31] !== t12 || $[32] !== t7 || $[33] !== t8 || $[34] !== t9) {
|
|
214
|
+
t13 = {
|
|
215
|
+
...t7,
|
|
216
|
+
loadCustomServers: t8,
|
|
217
|
+
saveCustomServers: t9,
|
|
218
|
+
loadAuthState: t10,
|
|
219
|
+
saveAuthState: t11,
|
|
220
|
+
clearAuthState: t12
|
|
221
|
+
};
|
|
222
|
+
$[29] = t10;
|
|
223
|
+
$[30] = t11;
|
|
224
|
+
$[31] = t12;
|
|
225
|
+
$[32] = t7;
|
|
226
|
+
$[33] = t8;
|
|
227
|
+
$[34] = t9;
|
|
228
|
+
$[35] = t13;
|
|
229
|
+
} else t13 = $[35];
|
|
230
|
+
return t13;
|
|
136
231
|
};
|
|
137
232
|
const McpLocalStorage = resource(useMcpLocalStorage);
|
|
138
233
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"McpLocalStorage.js","names":["resource","OAuthMetadataSchema","OAuthClientInformationFullSchema","OAuthProtectedResourceMetadataSchema","OAuthTokensSchema","MCPAuthConfig","MCPCustomServerRecord","MCPPersistedAuthState","assertValidServerId","MCPStorage","McpLocalStorageOptions","keyPrefix","storage","Storage","resolveStorage","opts","globalThis","localStorage","isRecord","value","Record","Array","isArray","isOptionalString","undefined","isNonEmptyString","trim","length","isOptionalNonEmptyString","isOptionalStringArray","every","item","isOptionalConnectionTimeout","Number","isFinite","isValidServerId","id","isMCPAuthConfig","auth","type","token","scopes","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","isCustomServerRecord","name","url","createdAt","connectionTimeout","normalizeCustomServerRecord","record","normalizeCustomServerRecords","flatMap","normalizeOAuthTokens","result","safeParse","success","data","normalizeClientInformation","isSecureNetworkUrl","URL","protocol","hostname","endsWith","startsWith","normalizeDiscoveryState","authorizationServerUrl","state","NonNullable","resourceMetadataUrl","metadata","authorizationServerMetadata","resourceMetadata","normalizePersistedAuthState","codeVerifier","tokens","clientInformation","discoveryState","Object","keys","useMcpLocalStorage","prefix","customServersKey","authKey","read","key","fallback","T","raw","getItem","JSON","parse","write","setItem","stringify","remove","removeItem","loadCustomServers","saveCustomServers","records","loadAuthState","saveAuthState","clearAuthState","McpLocalStorage"],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport {\n OAuthMetadataSchema,\n OAuthClientInformationFullSchema,\n OAuthProtectedResourceMetadataSchema,\n OAuthTokensSchema,\n} from \"@modelcontextprotocol/core\";\nimport type { MCPAuthConfig, MCPCustomServerRecord } from \"../../mcp-scope\";\nimport type { MCPPersistedAuthState } from \"../../auth/types\";\nimport { assertValidServerId } from \"../../utils/serverId\";\nimport type { MCPStorage } from \"./types\";\n\nexport type McpLocalStorageOptions = {\n /** Namespace prefix for keys. Default \"aui-mcp\". */\n keyPrefix?: string;\n /** Override the underlying Storage. Defaults to globalThis.localStorage. */\n storage?: Storage;\n};\n\nfunction resolveStorage(opts: McpLocalStorageOptions): Storage | null {\n if (opts.storage) return opts.storage;\n if (typeof globalThis !== \"undefined\" && \"localStorage\" in globalThis) {\n try {\n return (globalThis as { localStorage: Storage }).localStorage;\n } catch {\n return null;\n }\n }\n return null;\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n typeof value === \"object\" && value !== null && !Array.isArray(value);\n\nconst isOptionalString = (value: unknown): value is string | undefined =>\n value === undefined || typeof value === \"string\";\n\nconst isNonEmptyString = (value: unknown): value is string =>\n typeof value === \"string\" && value.trim().length > 0;\n\nconst isOptionalNonEmptyString = (\n value: unknown,\n): value is string | undefined =>\n value === undefined || isNonEmptyString(value);\n\nconst isOptionalStringArray = (value: unknown): value is string[] | undefined =>\n value === undefined ||\n (Array.isArray(value) && value.every((item) => typeof item === \"string\"));\n\nconst isOptionalConnectionTimeout = (\n value: unknown,\n): value is number | undefined =>\n value === undefined ||\n (typeof value === \"number\" && Number.isFinite(value) && value >= 0);\n\nconst isValidServerId = (id: string): boolean => {\n try {\n assertValidServerId(id);\n return true;\n } catch {\n return false;\n }\n};\n\nconst isMCPAuthConfig = (auth: unknown): auth is MCPAuthConfig => {\n if (!isRecord(auth)) return false;\n\n switch (auth.type) {\n case \"none\":\n return true;\n case \"bearer\":\n return isOptionalNonEmptyString(auth.token);\n case \"oauth\":\n return (\n isOptionalStringArray(auth.scopes) &&\n isOptionalString(auth.authorizationEndpoint) &&\n isOptionalString(auth.tokenEndpoint) &&\n isOptionalString(auth.registrationEndpoint) &&\n isOptionalString(auth.clientId) &&\n isOptionalString(auth.clientSecret)\n );\n default:\n return false;\n }\n};\n\nconst isCustomServerRecord = (\n value: unknown,\n): value is MCPCustomServerRecord => {\n if (!isRecord(value)) return false;\n if (typeof value.id !== \"string\" || !isValidServerId(value.id)) {\n return false;\n }\n return (\n isNonEmptyString(value.name) &&\n isNonEmptyString(value.url) &&\n Number.isFinite(value.createdAt) &&\n isMCPAuthConfig(value.auth) &&\n isOptionalConnectionTimeout(value.connectionTimeout)\n );\n};\n\nconst normalizeCustomServerRecord = (\n value: unknown,\n): MCPCustomServerRecord | null => {\n if (isCustomServerRecord(value)) return value;\n if (!isRecord(value)) return null;\n\n const record = { ...value };\n delete record.connectionTimeout;\n return isCustomServerRecord(record) ? record : null;\n};\n\nexport const normalizeCustomServerRecords = (\n value: unknown,\n): MCPCustomServerRecord[] => {\n if (!Array.isArray(value)) return [];\n return value.flatMap((item) => {\n const record = normalizeCustomServerRecord(item);\n return record === null ? [] : [record];\n });\n};\n\nconst normalizeOAuthTokens = (\n value: unknown,\n): MCPPersistedAuthState[\"tokens\"] | undefined => {\n const result = OAuthTokensSchema.safeParse(value);\n return result.success ? result.data : undefined;\n};\n\nconst normalizeClientInformation = (\n value: unknown,\n): MCPPersistedAuthState[\"clientInformation\"] | undefined => {\n const result = OAuthClientInformationFullSchema.safeParse(value);\n return result.success ? result.data : undefined;\n};\n\nconst isSecureNetworkUrl = (value: unknown): value is string => {\n if (!isNonEmptyString(value)) return false;\n try {\n const url = new URL(value);\n return (\n url.protocol === \"https:\" ||\n (url.protocol === \"http:\" &&\n (url.hostname === \"localhost\" ||\n url.hostname.endsWith(\".localhost\") ||\n url.hostname.startsWith(\"127.\") ||\n url.hostname === \"[::1]\"))\n );\n } catch {\n return false;\n }\n};\n\nconst normalizeDiscoveryState = (\n value: unknown,\n): MCPPersistedAuthState[\"discoveryState\"] | undefined => {\n if (!isRecord(value) || !isSecureNetworkUrl(value.authorizationServerUrl)) {\n return undefined;\n }\n\n // A malformed optional field is dropped alone: keeping the validated\n // authorization server URL preserves the redirect-time binding, and the SDK\n // re-discovers whatever metadata is missing.\n const state: NonNullable<MCPPersistedAuthState[\"discoveryState\"]> = {\n authorizationServerUrl: value.authorizationServerUrl,\n };\n\n if (isSecureNetworkUrl(value.resourceMetadataUrl)) {\n state.resourceMetadataUrl = value.resourceMetadataUrl;\n }\n\n const metadata = OAuthMetadataSchema.safeParse(\n value.authorizationServerMetadata,\n );\n if (metadata.success) state.authorizationServerMetadata = metadata.data;\n\n const resourceMetadata = OAuthProtectedResourceMetadataSchema.safeParse(\n value.resourceMetadata,\n );\n if (resourceMetadata.success) state.resourceMetadata = resourceMetadata.data;\n\n return state;\n};\n\nexport const normalizePersistedAuthState = (\n value: unknown,\n): MCPPersistedAuthState | null => {\n if (!isRecord(value)) return null;\n\n const state: MCPPersistedAuthState = {};\n if (isNonEmptyString(value.token)) state.token = value.token;\n if (isNonEmptyString(value.codeVerifier)) {\n state.codeVerifier = value.codeVerifier;\n }\n\n const tokens = normalizeOAuthTokens(value.tokens);\n if (tokens) state.tokens = tokens;\n\n const clientInformation = normalizeClientInformation(value.clientInformation);\n if (clientInformation) state.clientInformation = clientInformation;\n\n const discoveryState = normalizeDiscoveryState(value.discoveryState);\n if (discoveryState) state.discoveryState = discoveryState;\n\n return Object.keys(state).length > 0 ? state : null;\n};\n\nconst useMcpLocalStorage = (opts: McpLocalStorageOptions = {}): MCPStorage => {\n const prefix = opts.keyPrefix ?? \"aui-mcp\";\n const customServersKey = `${prefix}:custom-servers`;\n const authKey = (id: string) => `${prefix}:auth:${id}`;\n const storage = resolveStorage(opts);\n\n const read = <T>(key: string, fallback: T): T => {\n if (!storage) return fallback;\n try {\n const raw = storage.getItem(key);\n if (raw == null) return fallback;\n return JSON.parse(raw) as T;\n } catch {\n return fallback;\n }\n };\n\n const write = (key: string, value: unknown): void => {\n if (!storage) return;\n try {\n storage.setItem(key, JSON.stringify(value));\n } catch {\n // quota or serialization failure — silently drop\n }\n };\n\n const remove = (key: string): void => {\n if (!storage) return;\n try {\n storage.removeItem(key);\n } catch {\n // ignore\n }\n };\n\n return {\n loadCustomServers: async () =>\n normalizeCustomServerRecords(read<unknown>(customServersKey, [])),\n saveCustomServers: async (records) => {\n write(customServersKey, records);\n },\n loadAuthState: async (id) =>\n normalizePersistedAuthState(read<unknown>(authKey(id), null)),\n saveAuthState: async (id, state) => {\n write(authKey(id), state);\n },\n clearAuthState: async (id) => {\n remove(authKey(id));\n },\n };\n};\n\nexport const McpLocalStorage = resource(useMcpLocalStorage);\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"McpLocalStorage.js","names":["resource","useMemo","OAuthMetadataSchema","OAuthClientInformationFullSchema","OAuthProtectedResourceMetadataSchema","OAuthTokensSchema","MCPAuthConfig","MCPCustomServerRecord","MCPPersistedAuthState","assertValidServerId","MCPStorage","McpLocalStorageOptions","keyPrefix","storage","Storage","scopeId","resolveStorage","opts","globalThis","localStorage","isRecord","value","Record","Array","isArray","isOptionalString","undefined","isNonEmptyString","trim","length","isOptionalNonEmptyString","isOptionalStringArray","every","item","isOptionalConnectionTimeout","Number","isFinite","isValidServerId","id","isMCPAuthConfig","auth","type","token","scopes","authorizationEndpoint","tokenEndpoint","registrationEndpoint","clientId","clientSecret","isCustomServerRecord","name","url","createdAt","connectionTimeout","normalizeCustomServerRecord","record","normalizeCustomServerRecords","flatMap","normalizeOAuthTokens","result","safeParse","success","data","normalizeClientInformation","isSecureNetworkUrl","URL","protocol","hostname","endsWith","startsWith","normalizeDiscoveryState","authorizationServerUrl","state","NonNullable","resourceMetadataUrl","metadata","authorizationServerMetadata","resourceMetadata","normalizePersistedAuthState","codeVerifier","tokens","clientInformation","discoveryState","Object","keys","useMcpLocalStorage","t0","$","_c","t1","prefix","t2","customServersKey","t3","authKey","t4","key","fallback","raw","getItem","JSON","parse","T","read","t5","key_0","setItem","stringify","write","t6","key_1","removeItem","remove","t7","t8","t9","records","t10","id_0","t11","id_1","t12","id_2","t13","loadCustomServers","saveCustomServers","loadAuthState","saveAuthState","clearAuthState","McpLocalStorage"],"sources":["../../../src/resources/storage/McpLocalStorage.ts"],"sourcesContent":["import { resource } from \"@assistant-ui/tap\";\nimport { useMemo } from \"react\";\nimport {\n OAuthMetadataSchema,\n OAuthClientInformationFullSchema,\n OAuthProtectedResourceMetadataSchema,\n OAuthTokensSchema,\n} from \"@modelcontextprotocol/core\";\nimport type { MCPAuthConfig, MCPCustomServerRecord } from \"../../mcp-scope\";\nimport type { MCPPersistedAuthState } from \"../../auth/types\";\nimport { assertValidServerId } from \"../../utils/serverId\";\nimport type { MCPStorage } from \"./types\";\n\nexport type McpLocalStorageOptions = {\n /** Namespace prefix for keys. Default \"aui-mcp\". */\n keyPrefix?: string;\n /** Override the underlying Storage. Defaults to globalThis.localStorage. */\n storage?: Storage;\n /**\n * Stable identity for the backing data, used to key server reconnects.\n * Required to get reconnect-on-swap behavior when `storage` is overridden;\n * without it a custom backing store declares no scope, since a prefix\n * alone cannot distinguish two different stores.\n */\n scopeId?: string;\n};\n\nfunction resolveStorage(opts: McpLocalStorageOptions): Storage | null {\n if (opts.storage) return opts.storage;\n if (typeof globalThis !== \"undefined\" && \"localStorage\" in globalThis) {\n try {\n return (globalThis as { localStorage: Storage }).localStorage;\n } catch {\n return null;\n }\n }\n return null;\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n typeof value === \"object\" && value !== null && !Array.isArray(value);\n\nconst isOptionalString = (value: unknown): value is string | undefined =>\n value === undefined || typeof value === \"string\";\n\nconst isNonEmptyString = (value: unknown): value is string =>\n typeof value === \"string\" && value.trim().length > 0;\n\nconst isOptionalNonEmptyString = (\n value: unknown,\n): value is string | undefined =>\n value === undefined || isNonEmptyString(value);\n\nconst isOptionalStringArray = (value: unknown): value is string[] | undefined =>\n value === undefined ||\n (Array.isArray(value) && value.every((item) => typeof item === \"string\"));\n\nconst isOptionalConnectionTimeout = (\n value: unknown,\n): value is number | undefined =>\n value === undefined ||\n (typeof value === \"number\" && Number.isFinite(value) && value >= 0);\n\nconst isValidServerId = (id: string): boolean => {\n try {\n assertValidServerId(id);\n return true;\n } catch {\n return false;\n }\n};\n\nconst isMCPAuthConfig = (auth: unknown): auth is MCPAuthConfig => {\n if (!isRecord(auth)) return false;\n\n switch (auth.type) {\n case \"none\":\n return true;\n case \"bearer\":\n return isOptionalNonEmptyString(auth.token);\n case \"oauth\":\n return (\n isOptionalStringArray(auth.scopes) &&\n isOptionalString(auth.authorizationEndpoint) &&\n isOptionalString(auth.tokenEndpoint) &&\n isOptionalString(auth.registrationEndpoint) &&\n isOptionalString(auth.clientId) &&\n isOptionalString(auth.clientSecret)\n );\n default:\n return false;\n }\n};\n\nconst isCustomServerRecord = (\n value: unknown,\n): value is MCPCustomServerRecord => {\n if (!isRecord(value)) return false;\n if (typeof value.id !== \"string\" || !isValidServerId(value.id)) {\n return false;\n }\n return (\n isNonEmptyString(value.name) &&\n isNonEmptyString(value.url) &&\n Number.isFinite(value.createdAt) &&\n isMCPAuthConfig(value.auth) &&\n isOptionalConnectionTimeout(value.connectionTimeout)\n );\n};\n\nconst normalizeCustomServerRecord = (\n value: unknown,\n): MCPCustomServerRecord | null => {\n if (isCustomServerRecord(value)) return value;\n if (!isRecord(value)) return null;\n\n const record = { ...value };\n delete record.connectionTimeout;\n return isCustomServerRecord(record) ? record : null;\n};\n\nexport const normalizeCustomServerRecords = (\n value: unknown,\n): MCPCustomServerRecord[] => {\n if (!Array.isArray(value)) return [];\n return value.flatMap((item) => {\n const record = normalizeCustomServerRecord(item);\n return record === null ? [] : [record];\n });\n};\n\nconst normalizeOAuthTokens = (\n value: unknown,\n): MCPPersistedAuthState[\"tokens\"] | undefined => {\n const result = OAuthTokensSchema.safeParse(value);\n return result.success ? result.data : undefined;\n};\n\nconst normalizeClientInformation = (\n value: unknown,\n): MCPPersistedAuthState[\"clientInformation\"] | undefined => {\n const result = OAuthClientInformationFullSchema.safeParse(value);\n return result.success ? result.data : undefined;\n};\n\nconst isSecureNetworkUrl = (value: unknown): value is string => {\n if (!isNonEmptyString(value)) return false;\n try {\n const url = new URL(value);\n return (\n url.protocol === \"https:\" ||\n (url.protocol === \"http:\" &&\n (url.hostname === \"localhost\" ||\n url.hostname.endsWith(\".localhost\") ||\n url.hostname.startsWith(\"127.\") ||\n url.hostname === \"[::1]\"))\n );\n } catch {\n return false;\n }\n};\n\nconst normalizeDiscoveryState = (\n value: unknown,\n): MCPPersistedAuthState[\"discoveryState\"] | undefined => {\n if (!isRecord(value) || !isSecureNetworkUrl(value.authorizationServerUrl)) {\n return undefined;\n }\n\n // A malformed optional field is dropped alone: keeping the validated\n // authorization server URL preserves the redirect-time binding, and the SDK\n // re-discovers whatever metadata is missing.\n const state: NonNullable<MCPPersistedAuthState[\"discoveryState\"]> = {\n authorizationServerUrl: value.authorizationServerUrl,\n };\n\n if (isSecureNetworkUrl(value.resourceMetadataUrl)) {\n state.resourceMetadataUrl = value.resourceMetadataUrl;\n }\n\n const metadata = OAuthMetadataSchema.safeParse(\n value.authorizationServerMetadata,\n );\n if (metadata.success) state.authorizationServerMetadata = metadata.data;\n\n const resourceMetadata = OAuthProtectedResourceMetadataSchema.safeParse(\n value.resourceMetadata,\n );\n if (resourceMetadata.success) state.resourceMetadata = resourceMetadata.data;\n\n return state;\n};\n\nexport const normalizePersistedAuthState = (\n value: unknown,\n): MCPPersistedAuthState | null => {\n if (!isRecord(value)) return null;\n\n const state: MCPPersistedAuthState = {};\n if (isNonEmptyString(value.token)) state.token = value.token;\n if (isNonEmptyString(value.codeVerifier)) {\n state.codeVerifier = value.codeVerifier;\n }\n if (isNonEmptyString(value.state)) state.state = value.state;\n\n const tokens = normalizeOAuthTokens(value.tokens);\n if (tokens) state.tokens = tokens;\n\n const clientInformation = normalizeClientInformation(value.clientInformation);\n if (clientInformation) state.clientInformation = clientInformation;\n\n const discoveryState = normalizeDiscoveryState(value.discoveryState);\n if (discoveryState) state.discoveryState = discoveryState;\n\n return Object.keys(state).length > 0 ? state : null;\n};\n\nconst useMcpLocalStorage = (opts: McpLocalStorageOptions = {}): MCPStorage => {\n const prefix = opts.keyPrefix ?? \"aui-mcp\";\n const storage = resolveStorage(opts);\n // Deriving a scope from the prefix is only honest for the shared\n // globalThis.localStorage; two custom backing stores under one prefix hold\n // different data, so an overridden backing declares no scope unless the\n // caller names one.\n const scopeId =\n opts.scopeId ??\n (opts.storage === undefined ? `local-storage:${prefix}` : undefined);\n\n // Callers key per-server coordination state on this instance, so it has to\n // stay referentially stable for as long as the underlying store does.\n return useMemo(() => {\n const customServersKey = `${prefix}:custom-servers`;\n const authKey = (id: string) => `${prefix}:auth:${id}`;\n\n const read = <T>(key: string, fallback: T): T => {\n if (!storage) return fallback;\n try {\n const raw = storage.getItem(key);\n if (raw == null) return fallback;\n return JSON.parse(raw) as T;\n } catch {\n return fallback;\n }\n };\n\n const write = (key: string, value: unknown): void => {\n if (!storage) return;\n try {\n storage.setItem(key, JSON.stringify(value));\n } catch {\n // quota or serialization failure — silently drop\n }\n };\n\n const remove = (key: string): void => {\n if (!storage) return;\n try {\n storage.removeItem(key);\n } catch {\n // ignore\n }\n };\n\n return {\n ...(scopeId !== undefined ? { scopeId } : {}),\n loadCustomServers: async () =>\n normalizeCustomServerRecords(read<unknown>(customServersKey, [])),\n saveCustomServers: async (records) => {\n write(customServersKey, records);\n },\n loadAuthState: async (id) =>\n normalizePersistedAuthState(read<unknown>(authKey(id), null)),\n saveAuthState: async (id, state) => {\n write(authKey(id), state);\n },\n clearAuthState: async (id) => {\n remove(authKey(id));\n },\n };\n }, [prefix, storage, scopeId]);\n};\n\nexport const McpLocalStorage = resource(useMcpLocalStorage);\n"],"mappings":"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"}
|