@assistant-ui/react-mcp 0.0.0
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/buildHeaders.d.ts +9 -0
- package/dist/auth/buildHeaders.d.ts.map +1 -0
- package/dist/auth/buildHeaders.js +15 -0
- package/dist/auth/buildHeaders.js.map +1 -0
- package/dist/auth/createOAuthProvider.d.ts +22 -0
- package/dist/auth/createOAuthProvider.d.ts.map +1 -0
- package/dist/auth/createOAuthProvider.js +148 -0
- package/dist/auth/createOAuthProvider.js.map +1 -0
- package/dist/auth/types.d.ts +9 -0
- package/dist/auth/types.d.ts.map +1 -0
- package/dist/auth/types.js +2 -0
- package/dist/auth/types.js.map +1 -0
- package/dist/connector.d.ts +3 -0
- package/dist/connector.d.ts.map +1 -0
- package/dist/connector.js +6 -0
- package/dist/connector.js.map +1 -0
- package/dist/context/McpConnectorByIndexProvider.d.ts +5 -0
- package/dist/context/McpConnectorByIndexProvider.d.ts.map +1 -0
- package/dist/context/McpConnectorByIndexProvider.js +13 -0
- package/dist/context/McpConnectorByIndexProvider.js.map +1 -0
- package/dist/context/McpCustomServerByIndexProvider.d.ts +5 -0
- package/dist/context/McpCustomServerByIndexProvider.d.ts.map +1 -0
- package/dist/context/McpCustomServerByIndexProvider.js +13 -0
- package/dist/context/McpCustomServerByIndexProvider.js.map +1 -0
- package/dist/context/McpServerByIdProvider.d.ts +5 -0
- package/dist/context/McpServerByIdProvider.d.ts.map +1 -0
- package/dist/context/McpServerByIdProvider.js +13 -0
- package/dist/context/McpServerByIdProvider.js.map +1 -0
- package/dist/hooks/useMcpOAuthCallback.d.ts +17 -0
- package/dist/hooks/useMcpOAuthCallback.d.ts.map +1 -0
- package/dist/hooks/useMcpOAuthCallback.js +59 -0
- package/dist/hooks/useMcpOAuthCallback.js.map +1 -0
- package/dist/index.d.ts +18 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +26 -0
- package/dist/index.js.map +1 -0
- package/dist/mcp-scope.d.ts +109 -0
- package/dist/mcp-scope.d.ts.map +1 -0
- package/dist/mcp-scope.js +2 -0
- package/dist/mcp-scope.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormAuthFields.d.ts +15 -0
- package/dist/primitives/addForm/McpAddFormAuthFields.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormAuthFields.js +18 -0
- package/dist/primitives/addForm/McpAddFormAuthFields.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormAuthSelect.d.ts +8 -0
- package/dist/primitives/addForm/McpAddFormAuthSelect.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormAuthSelect.js +24 -0
- package/dist/primitives/addForm/McpAddFormAuthSelect.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormCancel.d.ts +10 -0
- package/dist/primitives/addForm/McpAddFormCancel.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormCancel.js +15 -0
- package/dist/primitives/addForm/McpAddFormCancel.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormError.d.ts +10 -0
- package/dist/primitives/addForm/McpAddFormError.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormError.js +12 -0
- package/dist/primitives/addForm/McpAddFormError.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormNameField.d.ts +8 -0
- package/dist/primitives/addForm/McpAddFormNameField.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormNameField.js +10 -0
- package/dist/primitives/addForm/McpAddFormNameField.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormRoot.d.ts +16 -0
- package/dist/primitives/addForm/McpAddFormRoot.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormRoot.js +102 -0
- package/dist/primitives/addForm/McpAddFormRoot.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormSubmit.d.ts +10 -0
- package/dist/primitives/addForm/McpAddFormSubmit.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormSubmit.js +10 -0
- package/dist/primitives/addForm/McpAddFormSubmit.js.map +1 -0
- package/dist/primitives/addForm/McpAddFormUrlField.d.ts +8 -0
- package/dist/primitives/addForm/McpAddFormUrlField.d.ts.map +1 -0
- package/dist/primitives/addForm/McpAddFormUrlField.js +10 -0
- package/dist/primitives/addForm/McpAddFormUrlField.js.map +1 -0
- package/dist/primitives/addForm/context.d.ts +21 -0
- package/dist/primitives/addForm/context.d.ts.map +1 -0
- package/dist/primitives/addForm/context.js +10 -0
- package/dist/primitives/addForm/context.js.map +1 -0
- package/dist/primitives/addForm.d.ts +9 -0
- package/dist/primitives/addForm.d.ts.map +1 -0
- package/dist/primitives/addForm.js +9 -0
- package/dist/primitives/addForm.js.map +1 -0
- package/dist/primitives/manager/McpManagerAddCustomTrigger.d.ts +10 -0
- package/dist/primitives/manager/McpManagerAddCustomTrigger.d.ts.map +1 -0
- package/dist/primitives/manager/McpManagerAddCustomTrigger.js +9 -0
- package/dist/primitives/manager/McpManagerAddCustomTrigger.js.map +1 -0
- package/dist/primitives/manager/McpManagerConnectors.d.ts +31 -0
- package/dist/primitives/manager/McpManagerConnectors.d.ts.map +1 -0
- package/dist/primitives/manager/McpManagerConnectors.js +41 -0
- package/dist/primitives/manager/McpManagerConnectors.js.map +1 -0
- package/dist/primitives/manager/McpManagerCustomServers.d.ts +31 -0
- package/dist/primitives/manager/McpManagerCustomServers.d.ts.map +1 -0
- package/dist/primitives/manager/McpManagerCustomServers.js +37 -0
- package/dist/primitives/manager/McpManagerCustomServers.js.map +1 -0
- package/dist/primitives/manager/McpManagerRoot.d.ts +10 -0
- package/dist/primitives/manager/McpManagerRoot.d.ts.map +1 -0
- package/dist/primitives/manager/McpManagerRoot.js +10 -0
- package/dist/primitives/manager/McpManagerRoot.js.map +1 -0
- package/dist/primitives/manager.d.ts +5 -0
- package/dist/primitives/manager.d.ts.map +1 -0
- package/dist/primitives/manager.js +5 -0
- package/dist/primitives/manager.js.map +1 -0
- package/dist/primitives/server/McpServerConnectButton.d.ts +10 -0
- package/dist/primitives/server/McpServerConnectButton.d.ts.map +1 -0
- package/dist/primitives/server/McpServerConnectButton.js +20 -0
- package/dist/primitives/server/McpServerConnectButton.js.map +1 -0
- package/dist/primitives/server/McpServerDisconnectButton.d.ts +10 -0
- package/dist/primitives/server/McpServerDisconnectButton.d.ts.map +1 -0
- package/dist/primitives/server/McpServerDisconnectButton.js +20 -0
- package/dist/primitives/server/McpServerDisconnectButton.js.map +1 -0
- package/dist/primitives/server/McpServerError.d.ts +10 -0
- package/dist/primitives/server/McpServerError.d.ts.map +1 -0
- package/dist/primitives/server/McpServerError.js +12 -0
- package/dist/primitives/server/McpServerError.js.map +1 -0
- package/dist/primitives/server/McpServerIcon.d.ts +18 -0
- package/dist/primitives/server/McpServerIcon.d.ts.map +1 -0
- package/dist/primitives/server/McpServerIcon.js +14 -0
- package/dist/primitives/server/McpServerIcon.js.map +1 -0
- package/dist/primitives/server/McpServerName.d.ts +10 -0
- package/dist/primitives/server/McpServerName.d.ts.map +1 -0
- package/dist/primitives/server/McpServerName.js +10 -0
- package/dist/primitives/server/McpServerName.js.map +1 -0
- package/dist/primitives/server/McpServerOAuthLink.d.ts +16 -0
- package/dist/primitives/server/McpServerOAuthLink.d.ts.map +1 -0
- package/dist/primitives/server/McpServerOAuthLink.js +13 -0
- package/dist/primitives/server/McpServerOAuthLink.js.map +1 -0
- package/dist/primitives/server/McpServerRemoveButton.d.ts +10 -0
- package/dist/primitives/server/McpServerRemoveButton.d.ts.map +1 -0
- package/dist/primitives/server/McpServerRemoveButton.js +18 -0
- package/dist/primitives/server/McpServerRemoveButton.js.map +1 -0
- package/dist/primitives/server/McpServerRoot.d.ts +10 -0
- package/dist/primitives/server/McpServerRoot.d.ts.map +1 -0
- package/dist/primitives/server/McpServerRoot.js +13 -0
- package/dist/primitives/server/McpServerRoot.js.map +1 -0
- package/dist/primitives/server/McpServerStatus.d.ts +10 -0
- package/dist/primitives/server/McpServerStatus.d.ts.map +1 -0
- package/dist/primitives/server/McpServerStatus.js +10 -0
- package/dist/primitives/server/McpServerStatus.js.map +1 -0
- package/dist/primitives/server/McpServerToolName.d.ts +10 -0
- package/dist/primitives/server/McpServerToolName.d.ts.map +1 -0
- package/dist/primitives/server/McpServerToolName.js +10 -0
- package/dist/primitives/server/McpServerToolName.js.map +1 -0
- package/dist/primitives/server/McpServerTools.d.ts +10 -0
- package/dist/primitives/server/McpServerTools.d.ts.map +1 -0
- package/dist/primitives/server/McpServerTools.js +19 -0
- package/dist/primitives/server/McpServerTools.js.map +1 -0
- package/dist/primitives/server.d.ts +12 -0
- package/dist/primitives/server.d.ts.map +1 -0
- package/dist/primitives/server.js +12 -0
- package/dist/primitives/server.js.map +1 -0
- package/dist/resources/McpManagerResource.d.ts +13 -0
- package/dist/resources/McpManagerResource.d.ts.map +1 -0
- package/dist/resources/McpManagerResource.js +191 -0
- package/dist/resources/McpManagerResource.js.map +1 -0
- package/dist/resources/McpServerResource.d.ts +17 -0
- package/dist/resources/McpServerResource.d.ts.map +1 -0
- package/dist/resources/McpServerResource.js +239 -0
- package/dist/resources/McpServerResource.js.map +1 -0
- package/dist/resources/storage/McpCustomStorage.d.ts +3 -0
- package/dist/resources/storage/McpCustomStorage.d.ts.map +1 -0
- package/dist/resources/storage/McpCustomStorage.js +3 -0
- package/dist/resources/storage/McpCustomStorage.js.map +1 -0
- package/dist/resources/storage/McpLocalStorage.d.ts +9 -0
- package/dist/resources/storage/McpLocalStorage.d.ts.map +1 -0
- package/dist/resources/storage/McpLocalStorage.js +67 -0
- package/dist/resources/storage/McpLocalStorage.js.map +1 -0
- package/dist/resources/storage/McpMemoryStorage.d.ts +3 -0
- package/dist/resources/storage/McpMemoryStorage.d.ts.map +1 -0
- package/dist/resources/storage/McpMemoryStorage.js +19 -0
- package/dist/resources/storage/McpMemoryStorage.js.map +1 -0
- package/dist/resources/storage/types.d.ts +12 -0
- package/dist/resources/storage/types.d.ts.map +1 -0
- package/dist/resources/storage/types.js +2 -0
- package/dist/resources/storage/types.js.map +1 -0
- package/dist/utils/serverId.d.ts +2 -0
- package/dist/utils/serverId.d.ts.map +1 -0
- package/dist/utils/serverId.js +16 -0
- package/dist/utils/serverId.js.map +1 -0
- package/package.json +67 -0
- package/src/auth/buildHeaders.ts +19 -0
- package/src/auth/createOAuthProvider.ts +172 -0
- package/src/auth/types.ts +12 -0
- package/src/connector.ts +7 -0
- package/src/context/McpConnectorByIndexProvider.tsx +16 -0
- package/src/context/McpCustomServerByIndexProvider.tsx +16 -0
- package/src/context/McpServerByIdProvider.tsx +17 -0
- package/src/hooks/useMcpOAuthCallback.tsx +79 -0
- package/src/index.ts +68 -0
- package/src/mcp-scope.ts +110 -0
- package/src/primitives/addForm/McpAddFormAuthFields.tsx +51 -0
- package/src/primitives/addForm/McpAddFormAuthSelect.tsx +55 -0
- package/src/primitives/addForm/McpAddFormCancel.tsx +33 -0
- package/src/primitives/addForm/McpAddFormError.tsx +27 -0
- package/src/primitives/addForm/McpAddFormNameField.tsx +34 -0
- package/src/primitives/addForm/McpAddFormRoot.tsx +141 -0
- package/src/primitives/addForm/McpAddFormSubmit.tsx +30 -0
- package/src/primitives/addForm/McpAddFormUrlField.tsx +35 -0
- package/src/primitives/addForm/context.tsx +37 -0
- package/src/primitives/addForm.ts +8 -0
- package/src/primitives/manager/McpManagerAddCustomTrigger.tsx +21 -0
- package/src/primitives/manager/McpManagerConnectors.tsx +76 -0
- package/src/primitives/manager/McpManagerCustomServers.tsx +72 -0
- package/src/primitives/manager/McpManagerRoot.tsx +28 -0
- package/src/primitives/manager.ts +4 -0
- package/src/primitives/server/McpServerConnectButton.tsx +39 -0
- package/src/primitives/server/McpServerDisconnectButton.tsx +38 -0
- package/src/primitives/server/McpServerError.tsx +27 -0
- package/src/primitives/server/McpServerIcon.tsx +35 -0
- package/src/primitives/server/McpServerName.tsx +26 -0
- package/src/primitives/server/McpServerOAuthLink.tsx +38 -0
- package/src/primitives/server/McpServerRemoveButton.tsx +35 -0
- package/src/primitives/server/McpServerRoot.tsx +35 -0
- package/src/primitives/server/McpServerStatus.tsx +26 -0
- package/src/primitives/server/McpServerToolName.tsx +26 -0
- package/src/primitives/server/McpServerTools.tsx +39 -0
- package/src/primitives/server.ts +14 -0
- package/src/resources/McpManagerResource.ts +253 -0
- package/src/resources/McpServerResource.ts +292 -0
- package/src/resources/storage/McpCustomStorage.ts +6 -0
- package/src/resources/storage/McpLocalStorage.ts +77 -0
- package/src/resources/storage/McpMemoryStorage.ts +22 -0
- package/src/resources/storage/types.ts +16 -0
- package/src/utils/serverId.ts +19 -0
|
@@ -0,0 +1,292 @@
|
|
|
1
|
+
import {
|
|
2
|
+
resource,
|
|
3
|
+
tapState,
|
|
4
|
+
tapRef,
|
|
5
|
+
tapEffect,
|
|
6
|
+
tapMemo,
|
|
7
|
+
tapEffectEvent,
|
|
8
|
+
} from "@assistant-ui/tap";
|
|
9
|
+
import type { ClientOutput } from "@assistant-ui/store";
|
|
10
|
+
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
11
|
+
import {
|
|
12
|
+
StreamableHTTPClientTransport,
|
|
13
|
+
type StreamableHTTPClientTransportOptions,
|
|
14
|
+
} from "@modelcontextprotocol/sdk/client/streamableHttp.js";
|
|
15
|
+
import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
|
|
16
|
+
import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
|
|
17
|
+
import { createOAuthProvider } from "../auth/createOAuthProvider";
|
|
18
|
+
import { buildHeaders } from "../auth/buildHeaders";
|
|
19
|
+
import { assertValidServerId } from "../utils/serverId";
|
|
20
|
+
import type { MCPStorage } from "./storage/types";
|
|
21
|
+
import type {
|
|
22
|
+
MCPAuthConfig,
|
|
23
|
+
MCPConnectionState,
|
|
24
|
+
MCPServerKind,
|
|
25
|
+
MCPServerState,
|
|
26
|
+
MCPToolInfo,
|
|
27
|
+
} from "../mcp-scope";
|
|
28
|
+
|
|
29
|
+
export type McpServerResourceProps = {
|
|
30
|
+
id: string;
|
|
31
|
+
kind: MCPServerKind;
|
|
32
|
+
name: string;
|
|
33
|
+
url: string;
|
|
34
|
+
icon?: string | undefined;
|
|
35
|
+
auth: MCPAuthConfig;
|
|
36
|
+
storage: MCPStorage;
|
|
37
|
+
redirectUri: string;
|
|
38
|
+
autoConnect: boolean;
|
|
39
|
+
onRemove: () => Promise<void>;
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
export const McpServerResource = resource(
|
|
43
|
+
(props: McpServerResourceProps): ClientOutput<"mcpServer"> => {
|
|
44
|
+
assertValidServerId(props.id);
|
|
45
|
+
const [connectionState, setConnectionState] =
|
|
46
|
+
tapState<MCPConnectionState>("disconnected");
|
|
47
|
+
const [tools, setTools] = tapState<MCPToolInfo[]>([]);
|
|
48
|
+
const [lastError, setLastError] = tapState<{ message: string } | null>(
|
|
49
|
+
null,
|
|
50
|
+
);
|
|
51
|
+
const [authorizationUrl, setAuthorizationUrl] = tapState<string | null>(
|
|
52
|
+
null,
|
|
53
|
+
);
|
|
54
|
+
|
|
55
|
+
const clientRef = tapRef<Client | null>(null);
|
|
56
|
+
const transportRef = tapRef<StreamableHTTPClientTransport | null>(null);
|
|
57
|
+
|
|
58
|
+
const buildTransport = tapEffectEvent(
|
|
59
|
+
async (): Promise<StreamableHTTPClientTransport> => {
|
|
60
|
+
if (props.auth.type === "oauth") {
|
|
61
|
+
const authProvider = createOAuthProvider({
|
|
62
|
+
serverId: props.id,
|
|
63
|
+
config: props.auth,
|
|
64
|
+
storage: props.storage,
|
|
65
|
+
redirectUri: props.redirectUri,
|
|
66
|
+
onAuthorizationUrl: (url) => setAuthorizationUrl(url.toString()),
|
|
67
|
+
});
|
|
68
|
+
return new StreamableHTTPClientTransport(new URL(props.url), {
|
|
69
|
+
authProvider,
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
if (props.auth.type === "bearer") {
|
|
73
|
+
const persisted = await props.storage.loadAuthState(props.id);
|
|
74
|
+
const headers = buildHeaders(props.auth, persisted);
|
|
75
|
+
const transportOpts: StreamableHTTPClientTransportOptions = {};
|
|
76
|
+
if (headers) transportOpts.requestInit = { headers };
|
|
77
|
+
return new StreamableHTTPClientTransport(
|
|
78
|
+
new URL(props.url),
|
|
79
|
+
transportOpts,
|
|
80
|
+
);
|
|
81
|
+
}
|
|
82
|
+
return new StreamableHTTPClientTransport(new URL(props.url));
|
|
83
|
+
},
|
|
84
|
+
);
|
|
85
|
+
|
|
86
|
+
const finalizeConnect = tapEffectEvent(
|
|
87
|
+
async (transport: StreamableHTTPClientTransport) => {
|
|
88
|
+
const client = new Client({
|
|
89
|
+
name: "assistant-ui-mcp",
|
|
90
|
+
version: "0.0.0",
|
|
91
|
+
});
|
|
92
|
+
// SDK's StreamableHTTPClientTransport.sessionId is `string | undefined`
|
|
93
|
+
// but Transport.sessionId is declared `string?` — under
|
|
94
|
+
// exactOptionalPropertyTypes the SDK's own classes don't satisfy its
|
|
95
|
+
// Transport interface. Cast to bridge the gap.
|
|
96
|
+
await client.connect(transport as unknown as Transport);
|
|
97
|
+
// Defer ref assignment until listTools() also succeeds — otherwise a
|
|
98
|
+
// post-connect failure leaves stale refs that `callTool()` would
|
|
99
|
+
// happily walk into, producing confusing SDK errors instead of
|
|
100
|
+
// "not connected".
|
|
101
|
+
const list = await client.listTools();
|
|
102
|
+
clientRef.current = client;
|
|
103
|
+
transportRef.current = transport;
|
|
104
|
+
setTools(
|
|
105
|
+
list.tools.map((t) => {
|
|
106
|
+
const info: MCPToolInfo = {
|
|
107
|
+
name: t.name,
|
|
108
|
+
inputSchema: t.inputSchema,
|
|
109
|
+
};
|
|
110
|
+
if (t.description !== undefined) info.description = t.description;
|
|
111
|
+
return info;
|
|
112
|
+
}),
|
|
113
|
+
);
|
|
114
|
+
setConnectionState("connected");
|
|
115
|
+
},
|
|
116
|
+
);
|
|
117
|
+
|
|
118
|
+
const closeTransport = async () => {
|
|
119
|
+
const t = transportRef.current;
|
|
120
|
+
transportRef.current = null;
|
|
121
|
+
clientRef.current = null;
|
|
122
|
+
if (t) {
|
|
123
|
+
try {
|
|
124
|
+
await t.close();
|
|
125
|
+
} catch {
|
|
126
|
+
// ignore close errors
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
};
|
|
130
|
+
|
|
131
|
+
const doConnect = tapEffectEvent(async () => {
|
|
132
|
+
// Close any prior transport/client so a re-connect doesn't leak.
|
|
133
|
+
await closeTransport();
|
|
134
|
+
setConnectionState("connecting");
|
|
135
|
+
setLastError(null);
|
|
136
|
+
setAuthorizationUrl(null);
|
|
137
|
+
// Clear tools so a reconnect (error → connect, or authRequired
|
|
138
|
+
// → connect) doesn't expose the previous attempt's tool list.
|
|
139
|
+
setTools([]);
|
|
140
|
+
let transport: StreamableHTTPClientTransport | null = null;
|
|
141
|
+
try {
|
|
142
|
+
transport = await buildTransport();
|
|
143
|
+
// Don't assign to transportRef until connect succeeds — otherwise a
|
|
144
|
+
// failed `listTools()` leaves an orphaned transport that future
|
|
145
|
+
// doConnect / doDisconnect calls treat as live.
|
|
146
|
+
await finalizeConnect(transport);
|
|
147
|
+
} catch (err) {
|
|
148
|
+
if (err instanceof UnauthorizedError) {
|
|
149
|
+
// OAuth: keep the transport alive so completeAuth can call
|
|
150
|
+
// finishAuth on it. Closing it before storing would leave a
|
|
151
|
+
// closed transport on transportRef.
|
|
152
|
+
transportRef.current = transport;
|
|
153
|
+
setConnectionState("authRequired");
|
|
154
|
+
} else {
|
|
155
|
+
if (transport) {
|
|
156
|
+
try {
|
|
157
|
+
await transport.close();
|
|
158
|
+
} catch {
|
|
159
|
+
// ignore close errors
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
setLastError({
|
|
163
|
+
message: err instanceof Error ? err.message : String(err),
|
|
164
|
+
});
|
|
165
|
+
setConnectionState("error");
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
|
|
170
|
+
const doDisconnect = tapEffectEvent(async () => {
|
|
171
|
+
setTools([]);
|
|
172
|
+
setAuthorizationUrl(null);
|
|
173
|
+
setConnectionState("disconnected");
|
|
174
|
+
await closeTransport();
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
const doCompleteAuth = tapEffectEvent(async (callbackUrl: string) => {
|
|
178
|
+
setConnectionState("authPending");
|
|
179
|
+
setLastError(null);
|
|
180
|
+
try {
|
|
181
|
+
const url = new URL(callbackUrl);
|
|
182
|
+
const code = url.searchParams.get("code");
|
|
183
|
+
if (!code)
|
|
184
|
+
throw new Error("missing authorization code in callback URL");
|
|
185
|
+
let transport = transportRef.current;
|
|
186
|
+
if (!transport) {
|
|
187
|
+
transport = await buildTransport();
|
|
188
|
+
transportRef.current = transport;
|
|
189
|
+
}
|
|
190
|
+
await transport.finishAuth(code);
|
|
191
|
+
setAuthorizationUrl(null);
|
|
192
|
+
await finalizeConnect(transport);
|
|
193
|
+
} catch (err) {
|
|
194
|
+
await closeTransport();
|
|
195
|
+
setLastError({
|
|
196
|
+
message: err instanceof Error ? err.message : String(err),
|
|
197
|
+
});
|
|
198
|
+
setConnectionState("error");
|
|
199
|
+
}
|
|
200
|
+
});
|
|
201
|
+
|
|
202
|
+
const tryAutoConnect = tapEffectEvent(
|
|
203
|
+
async (signal: { cancelled: boolean }) => {
|
|
204
|
+
if (!props.autoConnect) return;
|
|
205
|
+
if (props.auth.type === "none") {
|
|
206
|
+
void doConnect();
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
// Static connector token short-circuits the storage read.
|
|
210
|
+
if (props.auth.type === "bearer" && props.auth.token) {
|
|
211
|
+
void doConnect();
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
214
|
+
const persisted = await props.storage.loadAuthState(props.id);
|
|
215
|
+
if (signal.cancelled) return;
|
|
216
|
+
if (props.auth.type === "oauth") {
|
|
217
|
+
if (!persisted?.tokens) return;
|
|
218
|
+
} else if (!persisted?.token) {
|
|
219
|
+
return;
|
|
220
|
+
}
|
|
221
|
+
void doConnect();
|
|
222
|
+
},
|
|
223
|
+
);
|
|
224
|
+
|
|
225
|
+
// Auto-connect on mount when usable auth exists.
|
|
226
|
+
tapEffect(() => {
|
|
227
|
+
const signal = { cancelled: false };
|
|
228
|
+
void tryAutoConnect(signal);
|
|
229
|
+
return () => {
|
|
230
|
+
signal.cancelled = true;
|
|
231
|
+
const t = transportRef.current;
|
|
232
|
+
transportRef.current = null;
|
|
233
|
+
clientRef.current = null;
|
|
234
|
+
if (t) t.close().catch(() => {});
|
|
235
|
+
};
|
|
236
|
+
}, []);
|
|
237
|
+
|
|
238
|
+
const state = tapMemo<MCPServerState>(
|
|
239
|
+
() => ({
|
|
240
|
+
id: props.id,
|
|
241
|
+
kind: props.kind,
|
|
242
|
+
name: props.name,
|
|
243
|
+
url: props.url,
|
|
244
|
+
icon: props.icon,
|
|
245
|
+
connectionState,
|
|
246
|
+
lastError,
|
|
247
|
+
tools,
|
|
248
|
+
authorizationUrl,
|
|
249
|
+
}),
|
|
250
|
+
[
|
|
251
|
+
props.id,
|
|
252
|
+
props.kind,
|
|
253
|
+
props.name,
|
|
254
|
+
props.url,
|
|
255
|
+
props.icon,
|
|
256
|
+
connectionState,
|
|
257
|
+
lastError,
|
|
258
|
+
tools,
|
|
259
|
+
authorizationUrl,
|
|
260
|
+
],
|
|
261
|
+
);
|
|
262
|
+
|
|
263
|
+
return {
|
|
264
|
+
getState: () => state,
|
|
265
|
+
connect: doConnect,
|
|
266
|
+
disconnect: doDisconnect,
|
|
267
|
+
remove: async () => {
|
|
268
|
+
await doDisconnect();
|
|
269
|
+
await props.storage.clearAuthState(props.id);
|
|
270
|
+
await props.onRemove();
|
|
271
|
+
},
|
|
272
|
+
callTool: async (name, args) => {
|
|
273
|
+
const client = clientRef.current;
|
|
274
|
+
if (!client) {
|
|
275
|
+
throw new Error(`MCP server "${props.id}" is not connected`);
|
|
276
|
+
}
|
|
277
|
+
return await client.callTool({
|
|
278
|
+
name,
|
|
279
|
+
arguments: args as Record<string, unknown> | undefined,
|
|
280
|
+
});
|
|
281
|
+
},
|
|
282
|
+
readResource: async (uri) => {
|
|
283
|
+
const client = clientRef.current;
|
|
284
|
+
if (!client) {
|
|
285
|
+
throw new Error(`MCP server "${props.id}" is not connected`);
|
|
286
|
+
}
|
|
287
|
+
return await client.readResource({ uri });
|
|
288
|
+
},
|
|
289
|
+
completeAuth: doCompleteAuth,
|
|
290
|
+
};
|
|
291
|
+
},
|
|
292
|
+
);
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { resource } from "@assistant-ui/tap";
|
|
2
|
+
import type { MCPCustomServerRecord } from "../../mcp-scope";
|
|
3
|
+
import type { MCPPersistedAuthState } from "../../auth/types";
|
|
4
|
+
import type { MCPStorage } from "./types";
|
|
5
|
+
|
|
6
|
+
export type McpLocalStorageOptions = {
|
|
7
|
+
/** Namespace prefix for keys. Default "aui-mcp". */
|
|
8
|
+
keyPrefix?: string;
|
|
9
|
+
/** Override the underlying Storage. Defaults to globalThis.localStorage. */
|
|
10
|
+
storage?: Storage;
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
function resolveStorage(opts: McpLocalStorageOptions): Storage | null {
|
|
14
|
+
if (opts.storage) return opts.storage;
|
|
15
|
+
if (typeof globalThis !== "undefined" && "localStorage" in globalThis) {
|
|
16
|
+
try {
|
|
17
|
+
return (globalThis as { localStorage: Storage }).localStorage;
|
|
18
|
+
} catch {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export const McpLocalStorage = resource(
|
|
26
|
+
(opts: McpLocalStorageOptions = {}): MCPStorage => {
|
|
27
|
+
const prefix = opts.keyPrefix ?? "aui-mcp";
|
|
28
|
+
const customServersKey = `${prefix}:custom-servers`;
|
|
29
|
+
const authKey = (id: string) => `${prefix}:auth:${id}`;
|
|
30
|
+
const storage = resolveStorage(opts);
|
|
31
|
+
|
|
32
|
+
const read = <T>(key: string, fallback: T): T => {
|
|
33
|
+
if (!storage) return fallback;
|
|
34
|
+
try {
|
|
35
|
+
const raw = storage.getItem(key);
|
|
36
|
+
if (raw == null) return fallback;
|
|
37
|
+
return JSON.parse(raw) as T;
|
|
38
|
+
} catch {
|
|
39
|
+
return fallback;
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
const write = (key: string, value: unknown): void => {
|
|
44
|
+
if (!storage) return;
|
|
45
|
+
try {
|
|
46
|
+
storage.setItem(key, JSON.stringify(value));
|
|
47
|
+
} catch {
|
|
48
|
+
// quota or serialization failure — silently drop
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
const remove = (key: string): void => {
|
|
53
|
+
if (!storage) return;
|
|
54
|
+
try {
|
|
55
|
+
storage.removeItem(key);
|
|
56
|
+
} catch {
|
|
57
|
+
// ignore
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
return {
|
|
62
|
+
loadCustomServers: async () =>
|
|
63
|
+
read<MCPCustomServerRecord[]>(customServersKey, []),
|
|
64
|
+
saveCustomServers: async (records) => {
|
|
65
|
+
write(customServersKey, records);
|
|
66
|
+
},
|
|
67
|
+
loadAuthState: async (id) =>
|
|
68
|
+
read<MCPPersistedAuthState | null>(authKey(id), null),
|
|
69
|
+
saveAuthState: async (id, state) => {
|
|
70
|
+
write(authKey(id), state);
|
|
71
|
+
},
|
|
72
|
+
clearAuthState: async (id) => {
|
|
73
|
+
remove(authKey(id));
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
},
|
|
77
|
+
);
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { resource } from "@assistant-ui/tap";
|
|
2
|
+
import type { MCPCustomServerRecord } from "../../mcp-scope";
|
|
3
|
+
import type { MCPPersistedAuthState } from "../../auth/types";
|
|
4
|
+
import type { MCPStorage } from "./types";
|
|
5
|
+
|
|
6
|
+
export const McpMemoryStorage = resource((): MCPStorage => {
|
|
7
|
+
let servers: MCPCustomServerRecord[] = [];
|
|
8
|
+
const auth = new Map<string, MCPPersistedAuthState>();
|
|
9
|
+
return {
|
|
10
|
+
loadCustomServers: async () => [...servers],
|
|
11
|
+
saveCustomServers: async (records) => {
|
|
12
|
+
servers = [...records];
|
|
13
|
+
},
|
|
14
|
+
loadAuthState: async (id) => auth.get(id) ?? null,
|
|
15
|
+
saveAuthState: async (id, state) => {
|
|
16
|
+
auth.set(id, state);
|
|
17
|
+
},
|
|
18
|
+
clearAuthState: async (id) => {
|
|
19
|
+
auth.delete(id);
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { ResourceElement } from "@assistant-ui/tap";
|
|
2
|
+
import type { MCPCustomServerRecord } from "../../mcp-scope";
|
|
3
|
+
import type { MCPPersistedAuthState } from "../../auth/types";
|
|
4
|
+
|
|
5
|
+
export type MCPStorage = {
|
|
6
|
+
loadCustomServers: () => Promise<MCPCustomServerRecord[]>;
|
|
7
|
+
saveCustomServers: (records: MCPCustomServerRecord[]) => Promise<void>;
|
|
8
|
+
loadAuthState: (serverId: string) => Promise<MCPPersistedAuthState | null>;
|
|
9
|
+
saveAuthState: (
|
|
10
|
+
serverId: string,
|
|
11
|
+
state: MCPPersistedAuthState,
|
|
12
|
+
) => Promise<void>;
|
|
13
|
+
clearAuthState: (serverId: string) => Promise<void>;
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
export type MCPStorageElement = ResourceElement<MCPStorage>;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
// Server ids are joined with tool names via `__` to form unique tool
|
|
2
|
+
// names for the AI SDK. The separator must not appear inside ids,
|
|
3
|
+
// otherwise two distinct `(serverId, toolName)` pairs could produce
|
|
4
|
+
// the same composite name.
|
|
5
|
+
export function assertValidServerId(id: string): void {
|
|
6
|
+
if (id.length === 0) {
|
|
7
|
+
throw new Error("MCP server id must not be empty.");
|
|
8
|
+
}
|
|
9
|
+
if (id.includes("__")) {
|
|
10
|
+
throw new Error(
|
|
11
|
+
`MCP server id "${id}" must not contain "__" — that sequence is reserved for separating server id from tool name.`,
|
|
12
|
+
);
|
|
13
|
+
}
|
|
14
|
+
if (id.includes("\x1f")) {
|
|
15
|
+
throw new Error(
|
|
16
|
+
`MCP server id "${id}" must not contain the ASCII Unit Separator (\\x1f) — it is reserved as the list delimiter in primitive id-list selectors.`,
|
|
17
|
+
);
|
|
18
|
+
}
|
|
19
|
+
}
|