Passing through customHeaders to requestInit
This commit is contained in:
parent
5a31434b62
commit
0e0849228d
3 changed files with 27 additions and 15 deletions
|
|
@ -50,5 +50,6 @@
|
||||||
"react",
|
"react",
|
||||||
"@modelcontextprotocol/sdk"
|
"@modelcontextprotocol/sdk"
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
|
"packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@ export type UseMcpOptions = {
|
||||||
name?: string;
|
name?: string;
|
||||||
version?: string;
|
version?: string;
|
||||||
};
|
};
|
||||||
|
/** Custom headers that can be used to bypass auth */
|
||||||
|
customHeaders?: Record<string, string>;
|
||||||
/** Whether to enable verbose debug logging to the console and the log state */
|
/** Whether to enable verbose debug logging to the console and the log state */
|
||||||
debug?: boolean;
|
debug?: boolean;
|
||||||
/** Auto retry connection if initial connection fails, with delay in ms (default: false) */
|
/** Auto retry connection if initial connection fails, with delay in ms (default: false) */
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ export function useMcp(options: UseMcpOptions): UseMcpResult {
|
||||||
callbackUrl = typeof window !== 'undefined' ? new URL('/oauth/callback', window.location.origin).toString() : '/oauth/callback',
|
callbackUrl = typeof window !== 'undefined' ? new URL('/oauth/callback', window.location.origin).toString() : '/oauth/callback',
|
||||||
storageKeyPrefix = 'mcp:auth',
|
storageKeyPrefix = 'mcp:auth',
|
||||||
clientConfig = {},
|
clientConfig = {},
|
||||||
|
customHeaders = {},
|
||||||
debug = false,
|
debug = false,
|
||||||
autoRetry = false,
|
autoRetry = false,
|
||||||
autoReconnect = DEFAULT_RECONNECT_DELAY,
|
autoReconnect = DEFAULT_RECONNECT_DELAY,
|
||||||
|
|
@ -148,16 +149,19 @@ export function useMcp(options: UseMcpOptions): UseMcpResult {
|
||||||
// Ensure provider/client are initialized (idempotent check)
|
// Ensure provider/client are initialized (idempotent check)
|
||||||
if (!authProviderRef.current) {
|
if (!authProviderRef.current) {
|
||||||
authProviderRef.current = new BrowserOAuthClientProvider(url, {
|
authProviderRef.current = new BrowserOAuthClientProvider(url, {
|
||||||
storageKeyPrefix, clientName, clientUri, callbackUrl
|
storageKeyPrefix,
|
||||||
});
|
clientName,
|
||||||
addLog('debug', 'BrowserOAuthClientProvider initialized in connect.');
|
clientUri,
|
||||||
|
callbackUrl,
|
||||||
|
})
|
||||||
|
addLog('debug', 'BrowserOAuthClientProvider initialized in connect.')
|
||||||
}
|
}
|
||||||
if (!clientRef.current) {
|
if (!clientRef.current) {
|
||||||
clientRef.current = new Client(
|
clientRef.current = new Client(
|
||||||
{ name: clientConfig.name || 'use-mcp-react-client', version: clientConfig.version || '0.1.0' },
|
{ name: clientConfig.name || 'use-mcp-react-client', version: clientConfig.version || '0.1.0' },
|
||||||
{ capabilities: {} },
|
{ capabilities: {} },
|
||||||
);
|
)
|
||||||
addLog('debug', 'MCP Client initialized in connect.');
|
addLog('debug', 'MCP Client initialized in connect.')
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Helper function for a single connection attempt ---
|
// --- Helper function for a single connection attempt ---
|
||||||
|
|
@ -181,7 +185,10 @@ export function useMcp(options: UseMcpOptions): UseMcpResult {
|
||||||
transportRef.current = null
|
transportRef.current = null
|
||||||
}
|
}
|
||||||
|
|
||||||
const commonOptions: SSEClientTransportOptions = { authProvider: authProviderRef.current }
|
const commonOptions: SSEClientTransportOptions = {
|
||||||
|
authProvider: authProviderRef.current,
|
||||||
|
requestInit: { headers: customHeaders },
|
||||||
|
}
|
||||||
const targetUrl = new URL(url)
|
const targetUrl = new URL(url)
|
||||||
|
|
||||||
if (transportType === 'http') {
|
if (transportType === 'http') {
|
||||||
|
|
@ -269,7 +276,10 @@ export function useMcp(options: UseMcpOptions): UseMcpResult {
|
||||||
const errorMessage = errorInstance.message
|
const errorMessage = errorInstance.message
|
||||||
const is404 = errorMessage.includes('404') || errorMessage.includes('Not Found')
|
const is404 = errorMessage.includes('404') || errorMessage.includes('Not Found')
|
||||||
const is405 = errorMessage.includes('405') || errorMessage.includes('Method Not Allowed')
|
const is405 = errorMessage.includes('405') || errorMessage.includes('Method Not Allowed')
|
||||||
const isLikelyCors = errorMessage === 'Failed to fetch' /* Chrome */ || errorMessage === 'NetworkError when attempting to fetch resource.' /* Firefox */ || errorMessage === 'Load failed' /* Safari */
|
const isLikelyCors =
|
||||||
|
errorMessage === 'Failed to fetch' /* Chrome */ ||
|
||||||
|
errorMessage === 'NetworkError when attempting to fetch resource.' /* Firefox */ ||
|
||||||
|
errorMessage === 'Load failed' /* Safari */
|
||||||
|
|
||||||
if (transportType === 'http' && (is404 || is405 || isLikelyCors)) {
|
if (transportType === 'http' && (is404 || is405 || isLikelyCors)) {
|
||||||
addLog('warn', `HTTP transport failed (${isLikelyCors ? 'CORS' : is404 ? '404' : '405'}). Will attempt fallback to SSE.`)
|
addLog('warn', `HTTP transport failed (${isLikelyCors ? 'CORS' : is404 ? '404' : '405'}). Will attempt fallback to SSE.`)
|
||||||
|
|
@ -277,11 +287,7 @@ export function useMcp(options: UseMcpOptions): UseMcpResult {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for Auth error (Simplified - requires more thought for interaction with fallback)
|
// Check for Auth error (Simplified - requires more thought for interaction with fallback)
|
||||||
if (
|
if (errorInstance instanceof UnauthorizedError || errorMessage.includes('Unauthorized') || errorMessage.includes('401')) {
|
||||||
errorInstance instanceof UnauthorizedError ||
|
|
||||||
errorMessage.includes('Unauthorized') ||
|
|
||||||
errorMessage.includes('401')
|
|
||||||
) {
|
|
||||||
addLog('info', 'Authentication required. Initiating SDK auth flow...')
|
addLog('info', 'Authentication required. Initiating SDK auth flow...')
|
||||||
// Ensure state is set only once if multiple attempts trigger auth
|
// Ensure state is set only once if multiple attempts trigger auth
|
||||||
if (stateRef.current !== 'authenticating') {
|
if (stateRef.current !== 'authenticating') {
|
||||||
|
|
@ -533,8 +539,11 @@ export function useMcp(options: UseMcpOptions): UseMcpResult {
|
||||||
// Initialize provider here if needed
|
// Initialize provider here if needed
|
||||||
if (!authProviderRef.current || authProviderRef.current.serverUrl !== url) {
|
if (!authProviderRef.current || authProviderRef.current.serverUrl !== url) {
|
||||||
authProviderRef.current = new BrowserOAuthClientProvider(url, {
|
authProviderRef.current = new BrowserOAuthClientProvider(url, {
|
||||||
storageKeyPrefix, clientName, clientUri, callbackUrl
|
storageKeyPrefix,
|
||||||
});
|
clientName,
|
||||||
|
clientUri,
|
||||||
|
callbackUrl,
|
||||||
|
})
|
||||||
addLog('debug', 'BrowserOAuthClientProvider initialized/updated on mount/option change.')
|
addLog('debug', 'BrowserOAuthClientProvider initialized/updated on mount/option change.')
|
||||||
}
|
}
|
||||||
connect() // Call stable connect
|
connect() // Call stable connect
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue