tiny-http-mcp-server 0.1.21 → 0.1.22

package/dist/composition.json

@@ -18,7 +18,7 @@
     },
     {
       "name": "tiny-http-mcp-server",
-      "version": "0.1.21",
+      "version": "0.1.22",
       "license": "MIT"
     },
     {

package/node_modules/mcp-oauth/README.md

@@ -40,10 +40,14 @@ const verifier = createJwksTokenVerifier({
 - `client`
   - `mode: "dynamic"` with optional `metadata`
   - `mode: "static"` with `clientId`, optional `clientSecret`, optional `metadata`
-- `browser.openBrowser(url)`
+- `allowInteractive: false` prevents interactive login while retaining cached tokens and silent refresh
+- `browser.openBrowser(url)` optional
 - `browser.readLine()` optional
 - `browser.createServer()` optional
 - `browser.landingPage` optional
+- `browser.redirectUri` optional exact registered HTTP loopback callback with a fixed port
+- `browser.signal` optional cancellation signal
+- `browser.timeoutMs` optional authorization deadline (default 120,000 ms)
 - `sessionStore` optional
 - `authStore` optional `auth-store` backend config for the default session store
 - `now()` optional clock override
@@ -62,6 +66,23 @@ const verifier = createJwksTokenVerifier({
 | `requireAccessTokenType` | `boolean`           | `false`        | Require the JWT `typ` protected header to be `at+jwt`.                                   |
 | `fetch`                  | `typeof fetch`      | global `fetch` | Custom fetch implementation.                                                             |
 
+Fixed redirects support `localhost`, `127.0.0.1`, and `::1` over HTTP. Their
+exact spelling, port, path and query are preserved through registration,
+authorization and code exchange. Credentials, fragments, port zero and reserved
+OAuth callback query parameters are rejected before binding a listener. Omit
+`redirectUri` to allocate a random loopback port. Standalone callback sessions
+accept the same `redirectUri`, `signal` and `timeoutMs` options. Cancellation,
+timeout and explicit close settle pending code waits and release listeners.
+Always close a successful standalone session in `finally`.
+
+Provider request inputs accept an optional `signal`. It reaches callback waits,
+registration, token requests and bounded token-body reads. Cancellation retains
+its original reason and does not retry authorization. Custom providers should
+observe the supplied signal and pass it to any work they start.
+
+Configure `client.metadata.scope` to request a precise scope set; broader
+discovery metadata does not override it.
+
 `createAuthStoreSessionStore(options)` accepts the standard `auth-store` config.
 
 ## Environment Variables

package/node_modules/mcp-oauth/dist/client/default-oauth-client-provider.js

@@ -25,7 +25,7 @@ export function createDefaultOAuthClientProvider(options) {
         async authorizeRequest(input) {
             assertNoAccessTokenInUrl(input.requestUrl, "Protected resource request URL");
             const requestUrl = canonicalizeResourceIndicator(input.requestUrl);
-            const session = await ensureAuthorizedSession(requestUrl, undefined, input.fetch, false);
+            const session = await ensureAuthorizedSession(requestUrl, undefined, input.fetch, false, false, input.signal);
             const accessToken = session?.tokens?.accessToken;
             if (session === null ||
                 accessToken === undefined ||
@@ -47,13 +47,14 @@ export function createDefaultOAuthClientProvider(options) {
                 const session = await ensureAuthorizedSession(resource, {
                     ...input.discovery,
                     resource
-                }, input.fetch, true, forceRefresh);
+                }, input.fetch, true, forceRefresh, input.signal);
                 if (session?.tokens?.accessToken === undefined) {
                     return { action: "fail" };
                 }
                 return { action: "retry" };
             }
             catch (error) {
+                input.signal?.throwIfAborted();
                 return {
                     action: "fail",
                     error: error instanceof Error ? error : new Error(String(error))
@@ -61,9 +62,11 @@ export function createDefaultOAuthClientProvider(options) {
             }
         }
     };
-    async function ensureAuthorizedSession(resource, discovery, fetch, allowInteractive, forceRefresh = false) {
+    async function ensureAuthorizedSession(resource, discovery, fetch, allowInteractive, forceRefresh = false, signal) {
+        signal?.throwIfAborted();
         const canonicalResource = canonicalizeResourceIndicator(resource);
         let session = await loadSession(canonicalResource);
+        signal?.throwIfAborted();
         if (discovery !== undefined && getOwnString(discovery.authorizationServerMetadata, "issuer") !== discovery.authorizationServer) {
             throw new Error("OAuth discovery authorization-server issuer mismatch");
         }
@@ -80,7 +83,7 @@ export function createDefaultOAuthClientProvider(options) {
         if (session?.tokens?.refreshToken !== undefined &&
             sessionDiscovery !== undefined &&
             (forceRefresh || isExpired(session.tokens, now))) {
-            session = await refreshSession(canonicalResource, session, sessionDiscovery, fetch);
+            session = await refreshSession(canonicalResource, session, sessionDiscovery, fetch, signal);
             if (session?.tokens !== undefined && !isExpired(session.tokens, now)) {
                 return session;
             }
@@ -92,9 +95,12 @@ export function createDefaultOAuthClientProvider(options) {
         if (!allowInteractive || sessionDiscovery === undefined) {
             return session;
         }
-        return authorizeSession(canonicalResource, session, sessionDiscovery, fetch);
+        if (options.allowInteractive === false)
+            throw new Error("OAuth interactive authorization is disabled");
+        return authorizeSession(canonicalResource, session, sessionDiscovery, fetch, signal);
     }
-    async function refreshSession(resource, session, discovery, fetch) {
+    async function refreshSession(resource, session, discovery, fetch, signal) {
+        signal?.throwIfAborted();
         assertSecureOAuthFlowEndpoints(discovery.authorizationServerMetadata);
         const inFlight = refreshPromises.get(resource);
         if (inFlight !== undefined) {
@@ -115,12 +121,13 @@ export function createDefaultOAuthClientProvider(options) {
                             clientSecret: session.client.clientSecret,
                             refreshToken: session.tokens.refreshToken,
                             resource,
-                            fetch,
+                            fetch, signal,
                             now
                         });
                         break;
                     }
                     catch (error) {
+                        signal?.throwIfAborted();
                         if (error instanceof OAuthError && error.error === "invalid_grant") {
                             const clearedSession = clearSessionTokens(session);
                             await saveSession(resource, clearedSession);
@@ -156,7 +163,8 @@ export function createDefaultOAuthClientProvider(options) {
         refreshPromises.set(resource, promise);
         return promise;
     }
-    async function authorizeSession(resource, existingSession, discovery, fetch) {
+    async function authorizeSession(resource, existingSession, discovery, fetch, signal) {
+        signal?.throwIfAborted();
         const inFlight = authorizationPromises.get(resource);
         if (inFlight !== undefined) {
             return inFlight;
@@ -172,11 +180,14 @@ export function createDefaultOAuthClientProvider(options) {
                     openBrowser: options.browser.openBrowser,
                     readLine: options.browser.readLine,
                     createServer: options.browser.createServer,
-                    landingPage: options.browser.landingPage
+                    landingPage: options.browser.landingPage,
+                    redirectUri: options.browser.redirectUri,
+                    signal: options.browser.signal === undefined ? signal : signal === undefined ? options.browser.signal : AbortSignal.any([signal, options.browser.signal]),
+                    timeoutMs: options.browser.timeoutMs
                 });
                 let resolvedClient = null;
                 try {
-                    resolvedClient = await resolveClient(currentSession, discovery, loopback.redirectUri, fetch);
+                    resolvedClient = await resolveClient(currentSession, discovery, loopback.redirectUri, fetch, signal);
                     const sessionWithoutTokens = {
                         resource,
                         authorizationServer: discovery.authorizationServer,
@@ -203,7 +214,7 @@ export function createDefaultOAuthClientProvider(options) {
                         codeVerifier: verifier,
                         redirectUri: loopback.redirectUri,
                         resource,
-                        fetch,
+                        fetch, signal,
                         now
                     });
                     const session = {
@@ -214,6 +225,7 @@ export function createDefaultOAuthClientProvider(options) {
                     return session;
                 }
                 catch (error) {
+                    signal?.throwIfAborted();
                     if (shouldReRegisterStoredDynamicClient(error, resolvedClient, reRegistrationAttempted)) {
                         reRegistrationAttempted = true;
                         await clearRegisteredClient(discovery.authorizationServer);
@@ -240,7 +252,8 @@ export function createDefaultOAuthClientProvider(options) {
         authorizationPromises.set(resource, finalPromise);
         return finalPromise;
     }
-    async function resolveClient(existingSession, discovery, redirectUri, fetch) {
+    async function resolveClient(existingSession, discovery, redirectUri, fetch, parentSignal) {
+        parentSignal?.throwIfAborted();
         const configuredClient = normalizeConfiguredClient(options.client);
         if (options.client.mode === "static") {
             if (configuredClient === null) {
@@ -292,7 +305,8 @@ export function createDefaultOAuthClientProvider(options) {
             }
         }
         const registrationBody = buildClientRegistrationBody(getClientMetadata(options.client), redirectUri);
-        const signal = AbortSignal.timeout(30_000);
+        const deadline = AbortSignal.timeout(30_000);
+        const signal = parentSignal === undefined ? deadline : AbortSignal.any([parentSignal, deadline]);
         const response = await fetchMcpResponse(fetch, registrationEndpoint, {
             method: "POST",
             headers: {

package/node_modules/mcp-oauth/dist/client/loopback-authorization.d.ts

@@ -9,6 +9,11 @@ export interface LoopbackAuthorizationOptions {
     createServer?: () => http.Server;
     landingPage?: OAuthLandingPage;
     callbackPath?: string;
+    /** Exact registered HTTP loopback redirect, including its fixed port and query. */
+    redirectUri?: string;
+    signal?: AbortSignal;
+    /** Bounds listener setup and authorization; defaults to two minutes. */
+    timeoutMs?: number;
 }
 export interface LoopbackAuthorizationSession {
     redirectUri: string;

package/node_modules/mcp-oauth/dist/client/loopback-authorization.js

@@ -1,77 +1,150 @@
 import http from "node:http";
 import { parseAuthorizationState } from "./authorization-state.js";
 export async function createLoopbackAuthorizationSession(options = {}) {
-    const callbackPath = options.callbackPath ?? "/callback";
+    options.signal?.throwIfAborted();
+    const timeoutMs = options.timeoutMs ?? 120_000;
+    if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 1 || timeoutMs > 2_147_483_647)
+        throw new Error("OAuth authorization timeoutMs must be a positive supported timer interval");
+    const target = loopbackTarget(options);
     const server = options.createServer ? options.createServer() : http.createServer();
-    const port = await startServer(server);
-    const redirectUri = `http://127.0.0.1:${port}${callbackPath}`;
+    const controller = new AbortController();
+    let closed = false;
+    let used = false;
+    const callerAbort = () => controller.abort(options.signal?.reason);
+    const teardown = () => {
+        if (closed)
+            return;
+        closed = true;
+        clearTimeout(timer);
+        options.signal?.removeEventListener("abort", callerAbort);
+        server.closeAllConnections?.();
+        server.close();
+    };
+    const timer = setTimeout(() => controller.abort(new Error("OAuth authorization timed out")), timeoutMs);
+    timer.unref?.();
+    controller.signal.addEventListener("abort", teardown, { once: true });
+    options.signal?.addEventListener("abort", callerAbort, { once: true });
+    if (options.signal?.aborted)
+        callerAbort();
+    let port;
+    try {
+        port = await startServer(server, target.port, target.host, controller.signal);
+    }
+    catch (error) {
+        controller.abort(error);
+        throw error;
+    }
+    const redirectUri = options.redirectUri ?? `http://127.0.0.1:${port}${target.callbackPath}`;
     return {
         redirectUri,
         async waitForCode(authorizationUrl) {
-            return waitForAuthorizationCode(server, authorizationUrl, options, callbackPath);
+            controller.signal.throwIfAborted();
+            if (used)
+                throw new Error("OAuth authorization session has already been used");
+            used = true;
+            try {
+                return await waitForAuthorizationCode(server, authorizationUrl, options, target.callbackPath, controller.signal);
+            }
+            finally {
+                clearTimeout(timer);
+            }
         },
         close() {
-            server.closeAllConnections?.();
-            server.close();
+            controller.abort(new Error("OAuth authorization session closed"));
         }
     };
 }
-async function startServer(server) {
+function loopbackTarget(options) {
+    if (options.redirectUri !== undefined) {
+        let url;
+        try {
+            url = new URL(options.redirectUri);
+        }
+        catch (cause) {
+            throw new Error("Invalid OAuth loopback redirect URI", { cause });
+        }
+        const forbiddenQuery = ["code", "state", "error", "error_description", "iss"];
+        if (url.protocol !== "http:" || !["localhost", "127.0.0.1", "[::1]"].includes(url.hostname)
+            || url.username || url.password || url.hash || url.port === "0"
+            || forbiddenQuery.some(name => url.searchParams.has(name))
+            || [...options.redirectUri].some(char => char.codePointAt(0) <= 32)
+            || (options.callbackPath !== undefined && options.callbackPath !== url.pathname))
+            throw new Error("Invalid OAuth loopback redirect URI");
+        return { port: url.port ? Number(url.port) : 80, host: url.hostname === "[::1]" ? "::1" : url.hostname, callbackPath: url.pathname };
+    }
+    const callbackPath = options.callbackPath ?? "/callback";
+    const parsed = new URL(callbackPath, "http://127.0.0.1");
+    if (!callbackPath.startsWith("/") || parsed.origin !== "http://127.0.0.1" || parsed.pathname !== callbackPath || parsed.search || parsed.hash)
+        throw new Error("Invalid OAuth loopback callback path");
+    return { port: 0, host: "127.0.0.1", callbackPath };
+}
+async function startServer(server, port, host, signal) {
+    signal.throwIfAborted();
     return new Promise((resolve, reject) => {
-        const handleError = (error) => {
-            server.off("error", handleError);
-            reject(error);
-        };
+        const cleanup = () => { server.off("error", handleError); signal.removeEventListener("abort", aborted); };
+        const handleError = (error) => { cleanup(); reject(error); };
+        const aborted = () => { cleanup(); reject(signal.reason); };
         server.once("error", handleError);
-        server.listen(0, "127.0.0.1", () => {
-            server.off("error", handleError);
-            const address = server.address();
-            resolve(address.port);
-        });
+        signal.addEventListener("abort", aborted, { once: true });
+        try {
+            server.listen(port, host, () => {
+                cleanup();
+                if (signal.aborted) {
+                    server.close();
+                    reject(signal.reason);
+                    return;
+                }
+                const address = server.address();
+                if (address === null || typeof address === "string") {
+                    reject(new Error("OAuth listener has no TCP address"));
+                    return;
+                }
+                resolve(address.port);
+            });
+        }
+        catch (error) {
+            cleanup();
+            reject(error);
+        }
     });
 }
-function waitForAuthorizationCode(server, authorizationUrl, options, callbackPath) {
+function waitForAuthorizationCode(server, authorizationUrl, options, callbackPath, signal) {
+    signal.throwIfAborted();
     const expectedAuthorization = readExpectedAuthorizationCallback(authorizationUrl);
     return new Promise((resolve, reject) => {
         let settled = false;
         const settle = (fn) => {
-            if (!settled) {
-                settled = true;
-                fn();
-            }
+            if (settled)
+                return;
+            settled = true;
+            server.off("request", request);
+            signal.removeEventListener("abort", aborted);
+            fn();
         };
-        server.on("request", (req, res) => {
-            const url = new URL(req.url ?? "/", "http://127.0.0.1");
+        const aborted = () => settle(() => reject(signal.reason));
+        const request = (req, res) => {
+            let url;
+            try {
+                url = new URL(req.url ?? "/", "http://127.0.0.1");
+            }
+            catch {
+                res.writeHead(400);
+                res.end("Invalid callback URL");
+                return;
+            }
             if (url.pathname !== callbackPath) {
                 res.writeHead(404);
                 res.end("Not found");
                 return;
             }
             const callbackParameters = {
-                code: url.searchParams.get("code"),
-                error: url.searchParams.get("error"),
-                errorDescription: url.searchParams.get("error_description"),
-                state: url.searchParams.get("state"),
-                iss: url.searchParams.get("iss")
+                code: url.searchParams.get("code"), error: url.searchParams.get("error"),
+                errorDescription: url.searchParams.get("error_description"), state: url.searchParams.get("state"), iss: url.searchParams.get("iss")
             };
             try {
                 validateAuthorizationCallbackBinding(callbackParameters, expectedAuthorization);
-            }
-            catch (error) {
-                res.writeHead(400);
-                res.end(error instanceof Error ? error.message : "Invalid OAuth callback");
-                settle(() => reject(error instanceof Error ? error : new Error(String(error))));
-                return;
-            }
-            const authorizationError = callbackParameters.error;
-            if (authorizationError !== null) {
-                const description = callbackParameters.errorDescription ?? authorizationError;
-                res.writeHead(400);
-                res.end(`Authorization failed: ${description}`);
-                settle(() => reject(createAuthorizationError(authorizationError, description)));
-                return;
-            }
-            try {
+                if (callbackParameters.error !== null)
+                    throw createAuthorizationError(callbackParameters.error, callbackParameters.errorDescription ?? callbackParameters.error);
                 const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
                 res.writeHead(200, { "Content-Type": "text/html" });
                 res.end(buildSuccessPage(options.landingPage));
@@ -80,39 +153,28 @@ function waitForAuthorizationCode(server, authorizationUrl, options, callbackPat
             catch (error) {
                 res.writeHead(400);
                 res.end(error instanceof Error ? error.message : "Invalid OAuth callback");
-                settle(() => reject(error instanceof Error ? error : new Error(String(error))));
+                settle(() => reject(error));
             }
-        });
+        };
+        server.on("request", request);
+        signal.addEventListener("abort", aborted, { once: true });
         if (options.readLine !== undefined) {
-            options
-                .readLine()
-                .then((input) => {
-                const callbackParameters = extractCallbackParametersFromInput(input);
-                if (callbackParameters === null) {
-                    settle(() => reject(new Error("OAuth callback missing authorization code")));
+            void Promise.resolve().then(() => settled ? undefined : options.readLine()).then(input => {
+                if (settled)
                     return;
-                }
-                try {
-                    validateAuthorizationCallbackBinding(callbackParameters, expectedAuthorization);
-                    if (callbackParameters.error !== null) {
-                        const description = callbackParameters.errorDescription ?? callbackParameters.error;
-                        throw createAuthorizationError(callbackParameters.error, description);
-                    }
-                    const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
-                    settle(() => resolve(code));
-                }
-                catch (error) {
-                    settle(() => reject(error instanceof Error ? error : new Error(String(error))));
-                }
-            })
-                .catch((error) => {
-                settle(() => reject(error instanceof Error ? error : new Error(String(error))));
-            });
+                const callbackParameters = extractCallbackParametersFromInput(input);
+                if (callbackParameters === null)
+                    throw new Error("OAuth callback missing authorization code");
+                validateAuthorizationCallbackBinding(callbackParameters, expectedAuthorization);
+                if (callbackParameters.error !== null)
+                    throw createAuthorizationError(callbackParameters.error, callbackParameters.errorDescription ?? callbackParameters.error);
+                const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
+                settle(() => resolve(code));
+            }).catch(error => settle(() => reject(error)));
         }
         if (options.openBrowser !== undefined) {
-            options.openBrowser(authorizationUrl).catch((error) => {
-                settle(() => reject(error));
-            });
+            void Promise.resolve().then(() => settled ? undefined : options.openBrowser(authorizationUrl))
+                .catch(error => settle(() => reject(error)));
         }
     });
 }

package/node_modules/mcp-oauth/dist/client/token-endpoint.d.ts

@@ -25,6 +25,7 @@ export declare function exchangeAuthorizationCode(input: {
     redirectUri: string;
     resource: string;
     fetch: OAuthMetadataFetch;
+    signal?: AbortSignal;
     now: () => number;
 }): Promise<StoredOAuthTokens>;
 export declare function refreshAccessToken(input: {
@@ -34,6 +35,7 @@ export declare function refreshAccessToken(input: {
     refreshToken: string;
     resource: string;
     fetch: OAuthMetadataFetch;
+    signal?: AbortSignal;
     now: () => number;
 }): Promise<StoredOAuthTokens>;
 export declare function readOAuthJsonObjectResponse(response: Response, signal?: AbortSignal): Promise<Record<string, unknown>>;

package/node_modules/mcp-oauth/dist/client/token-endpoint.js

@@ -44,6 +44,7 @@ export async function exchangeAuthorizationCode(input) {
             resource
         },
         fetch: input.fetch,
+        signal: input.signal,
         now: input.now
     });
 }
@@ -59,6 +60,7 @@ export async function refreshAccessToken(input) {
             resource
         },
         fetch: input.fetch,
+        signal: input.signal,
         now: input.now
     });
 }
@@ -70,7 +72,9 @@ async function requestTokens(input) {
     if (input.clientSecret !== undefined) {
         body.set("client_secret", input.clientSecret);
     }
-    const signal = AbortSignal.timeout(30_000);
+    input.signal?.throwIfAborted();
+    const deadline = AbortSignal.timeout(30_000);
+    const signal = input.signal === undefined ? deadline : AbortSignal.any([input.signal, deadline]);
     const response = await fetchMcpResponse(input.fetch, input.tokenEndpoint, {
         method: "POST",
         headers: {

package/node_modules/mcp-oauth/dist/client/types.d.ts

@@ -32,6 +32,7 @@ export interface OAuthClientProvider {
         requestUrl: URL;
         headers: Headers;
         fetch: OAuthMetadataFetch;
+        signal?: AbortSignal;
     }): Promise<void> | void;
     handleUnauthorized(input: {
         requestUrl: URL;
@@ -39,6 +40,7 @@ export interface OAuthClientProvider {
         challenge: OAuthUnauthorizedChallenge | null;
         discovery: OAuthDiscoveryResult;
         fetch: OAuthMetadataFetch;
+        signal?: AbortSignal;
     }): Promise<{
         action: "retry";
     } | {
@@ -95,8 +97,14 @@ export interface DefaultOAuthClientProviderOptions {
         clientSecret?: string;
         metadata?: OAuthClientMetadata;
     };
+    /** Disable interactive authorization while allowing cached tokens and silent refresh. */
+    allowInteractive?: boolean;
     browser: {
-        openBrowser(url: string): Promise<void>;
+        openBrowser?(url: string): Promise<void>;
+        /** Exact registered HTTP loopback redirect URI. */
+        redirectUri?: string;
+        signal?: AbortSignal;
+        timeoutMs?: number;
         readLine?: () => Promise<string>;
         createServer?: () => http.Server;
         landingPage?: {

package/node_modules/tiny-mcp-client/README.md

@@ -66,7 +66,9 @@ const transport = new HttpTransport({
 });
 ```
 
-You can also call `discoverOAuthMetadata(resourceUrl, options)` directly, or instantiate `OAuthMetadataDiscovery` with a custom `fetch` implementation and shared cache.
+You can also call `discoverOAuthMetadata(resourceUrl, options)` directly, or instantiate `OAuthMetadataDiscovery` with a custom `fetch` implementation and shared cache. Lookup options accept `signal`; cancellation stops metadata fetches and body reads without trying another discovery candidate.
+
+OAuth provider inputs receive the originating request's `signal`, covering header authorization and unauthorized handling. Modern request cancellation stops its OAuth work while leaving other requests usable; transport disposal cancels all pending OAuth operations. The default provider propagates this signal to callback, registration and token work. Custom providers must observe it for their own operations.
 
 ## Testing helpers
 

package/node_modules/tiny-mcp-client/dist/index.d.ts

@@ -109,6 +109,7 @@ interface OAuthClientProvider {
         requestUrl: URL;
         headers: Headers;
         fetch: OAuthMetadataFetch;
+        signal?: AbortSignal;
     }): Promise<void> | void;
     handleUnauthorized(input: {
         requestUrl: URL;
@@ -116,6 +117,7 @@ interface OAuthClientProvider {
         challenge: OAuthUnauthorizedChallenge | null;
         discovery: OAuthDiscoveryResult;
         fetch: OAuthMetadataFetch;
+        signal?: AbortSignal;
     }): Promise<{
         action: "retry";
     } | {
@@ -172,8 +174,14 @@ interface DefaultOAuthClientProviderOptions {
         clientSecret?: string;
         metadata?: OAuthClientMetadata;
     };
+    /** Disable interactive authorization while allowing cached tokens and silent refresh. */
+    allowInteractive?: boolean;
     browser: {
-        openBrowser(url: string): Promise<void>;
+        openBrowser?(url: string): Promise<void>;
+        /** Exact registered HTTP loopback redirect URI. */
+        redirectUri?: string;
+        signal?: AbortSignal;
+        timeoutMs?: number;
         readLine?: () => Promise<string>;
         createServer?: () => http.Server;
         landingPage?: {
@@ -202,6 +210,7 @@ interface OAuthMetadataDiscoveryOptions {
 }
 interface OAuthMetadataLookupOptions {
     resourceMetadataUrl?: string | URL;
+    signal?: AbortSignal;
 }
 declare class OAuthMetadataDiscovery {
     private readonly fetchImpl;
@@ -209,7 +218,7 @@ declare class OAuthMetadataDiscovery {
     private readonly memoryCache;
     constructor({ fetch, cache }?: OAuthMetadataDiscoveryOptions);
     private discoverProtectedResource;
-    discover(resourceUrl: string | URL, { resourceMetadataUrl }?: OAuthMetadataLookupOptions): Promise<OAuthDiscoveryResult>;
+    discover(resourceUrl: string | URL, { resourceMetadataUrl, signal }?: OAuthMetadataLookupOptions): Promise<OAuthDiscoveryResult>;
 }
 declare function discoverOAuthMetadata(resourceUrl: string | URL, options?: OAuthMetadataDiscoveryOptions & OAuthMetadataLookupOptions): Promise<OAuthDiscoveryResult>;
 
@@ -634,6 +643,7 @@ declare class HttpTransport implements McpTransport {
     private readonly oauthProvider;
     private readonly oauthMetadataDiscovery;
     private readonly inFlightFetchAbortControllers;
+    private readonly inFlightOAuthAbortControllers;
     private readonly openResponseReaders;
     private readonly modernRequests;
     private modernMode;

package/node_modules/tiny-mcp-client/dist/index.js

@@ -4102,47 +4102,137 @@ function getOwnEntry4(record2, key2) {
 
 // ../mcp-oauth/dist/client/loopback-authorization.js
 async function createLoopbackAuthorizationSession(options = {}) {
-  const callbackPath = options.callbackPath ?? "/callback";
+  options.signal?.throwIfAborted();
+  const timeoutMs = options.timeoutMs ?? 12e4;
+  if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 1 || timeoutMs > 2147483647)
+    throw new Error("OAuth authorization timeoutMs must be a positive supported timer interval");
+  const target = loopbackTarget(options);
   const server = options.createServer ? options.createServer() : http.createServer();
-  const port = await startServer(server);
-  const redirectUri = `http://127.0.0.1:${port}${callbackPath}`;
+  const controller = new AbortController();
+  let closed = false;
+  let used = false;
+  const callerAbort = () => controller.abort(options.signal?.reason);
+  const teardown = () => {
+    if (closed)
+      return;
+    closed = true;
+    clearTimeout(timer);
+    options.signal?.removeEventListener("abort", callerAbort);
+    server.closeAllConnections?.();
+    server.close();
+  };
+  const timer = setTimeout(() => controller.abort(new Error("OAuth authorization timed out")), timeoutMs);
+  timer.unref?.();
+  controller.signal.addEventListener("abort", teardown, { once: true });
+  options.signal?.addEventListener("abort", callerAbort, { once: true });
+  if (options.signal?.aborted)
+    callerAbort();
+  let port;
+  try {
+    port = await startServer(server, target.port, target.host, controller.signal);
+  } catch (error) {
+    controller.abort(error);
+    throw error;
+  }
+  const redirectUri = options.redirectUri ?? `http://127.0.0.1:${port}${target.callbackPath}`;
   return {
     redirectUri,
     async waitForCode(authorizationUrl) {
-      return waitForAuthorizationCode(server, authorizationUrl, options, callbackPath);
+      controller.signal.throwIfAborted();
+      if (used)
+        throw new Error("OAuth authorization session has already been used");
+      used = true;
+      try {
+        return await waitForAuthorizationCode(server, authorizationUrl, options, target.callbackPath, controller.signal);
+      } finally {
+        clearTimeout(timer);
+      }
     },
     close() {
-      server.closeAllConnections?.();
-      server.close();
+      controller.abort(new Error("OAuth authorization session closed"));
     }
   };
 }
-async function startServer(server) {
+function loopbackTarget(options) {
+  if (options.redirectUri !== void 0) {
+    let url;
+    try {
+      url = new URL(options.redirectUri);
+    } catch (cause) {
+      throw new Error("Invalid OAuth loopback redirect URI", { cause });
+    }
+    const forbiddenQuery = ["code", "state", "error", "error_description", "iss"];
+    if (url.protocol !== "http:" || !["localhost", "127.0.0.1", "[::1]"].includes(url.hostname) || url.username || url.password || url.hash || url.port === "0" || forbiddenQuery.some((name) => url.searchParams.has(name)) || [...options.redirectUri].some((char) => char.codePointAt(0) <= 32) || options.callbackPath !== void 0 && options.callbackPath !== url.pathname)
+      throw new Error("Invalid OAuth loopback redirect URI");
+    return { port: url.port ? Number(url.port) : 80, host: url.hostname === "[::1]" ? "::1" : url.hostname, callbackPath: url.pathname };
+  }
+  const callbackPath = options.callbackPath ?? "/callback";
+  const parsed = new URL(callbackPath, "http://127.0.0.1");
+  if (!callbackPath.startsWith("/") || parsed.origin !== "http://127.0.0.1" || parsed.pathname !== callbackPath || parsed.search || parsed.hash)
+    throw new Error("Invalid OAuth loopback callback path");
+  return { port: 0, host: "127.0.0.1", callbackPath };
+}
+async function startServer(server, port, host, signal) {
+  signal.throwIfAborted();
   return new Promise((resolve, reject) => {
-    const handleError = (error) => {
+    const cleanup = () => {
       server.off("error", handleError);
+      signal.removeEventListener("abort", aborted);
+    };
+    const handleError = (error) => {
+      cleanup();
       reject(error);
     };
+    const aborted = () => {
+      cleanup();
+      reject(signal.reason);
+    };
     server.once("error", handleError);
-    server.listen(0, "127.0.0.1", () => {
-      server.off("error", handleError);
-      const address = server.address();
-      resolve(address.port);
-    });
+    signal.addEventListener("abort", aborted, { once: true });
+    try {
+      server.listen(port, host, () => {
+        cleanup();
+        if (signal.aborted) {
+          server.close();
+          reject(signal.reason);
+          return;
+        }
+        const address = server.address();
+        if (address === null || typeof address === "string") {
+          reject(new Error("OAuth listener has no TCP address"));
+          return;
+        }
+        resolve(address.port);
+      });
+    } catch (error) {
+      cleanup();
+      reject(error);
+    }
   });
 }
-function waitForAuthorizationCode(server, authorizationUrl, options, callbackPath) {
+function waitForAuthorizationCode(server, authorizationUrl, options, callbackPath, signal) {
+  signal.throwIfAborted();
   const expectedAuthorization = readExpectedAuthorizationCallback(authorizationUrl);
   return new Promise((resolve, reject) => {
     let settled = false;
     const settle = (fn) => {
-      if (!settled) {
-        settled = true;
-        fn();
-      }
+      if (settled)
+        return;
+      settled = true;
+      server.off("request", request);
+      signal.removeEventListener("abort", aborted);
+      fn();
     };
-    server.on("request", (req, res) => {
-      const url = new URL(req.url ?? "/", "http://127.0.0.1");
+    const aborted = () => settle(() => reject(signal.reason));
+    const request = (req, res) => {
+      let url;
+      try {
+        url = new URL(req.url ?? "/", "http://127.0.0.1");
+      } catch {
+        res.writeHead(400);
+        res.end("Invalid callback URL");
+        return;
+      }
       if (url.pathname !== callbackPath) {
         res.writeHead(404);
         res.end("Not found");
@@ -4157,21 +4247,8 @@ function waitForAuthorizationCode(server, authorizationUrl, options, callbackPat
       };
       try {
         validateAuthorizationCallbackBinding(callbackParameters, expectedAuthorization);
-      } catch (error) {
-        res.writeHead(400);
-        res.end(error instanceof Error ? error.message : "Invalid OAuth callback");
-        settle(() => reject(error instanceof Error ? error : new Error(String(error))));
-        return;
-      }
-      const authorizationError = callbackParameters.error;
-      if (authorizationError !== null) {
-        const description = callbackParameters.errorDescription ?? authorizationError;
-        res.writeHead(400);
-        res.end(`Authorization failed: ${description}`);
-        settle(() => reject(createAuthorizationError(authorizationError, description)));
-        return;
-      }
-      try {
+        if (callbackParameters.error !== null)
+          throw createAuthorizationError(callbackParameters.error, callbackParameters.errorDescription ?? callbackParameters.error);
         const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
         res.writeHead(200, { "Content-Type": "text/html" });
         res.end(buildSuccessPage(options.landingPage));
@@ -4179,35 +4256,27 @@ function waitForAuthorizationCode(server, authorizationUrl, options, callbackPat
       } catch (error) {
         res.writeHead(400);
         res.end(error instanceof Error ? error.message : "Invalid OAuth callback");
-        settle(() => reject(error instanceof Error ? error : new Error(String(error))));
+        settle(() => reject(error));
       }
-    });
+    };
+    server.on("request", request);
+    signal.addEventListener("abort", aborted, { once: true });
     if (options.readLine !== void 0) {
-      options.readLine().then((input) => {
-        const callbackParameters = extractCallbackParametersFromInput(input);
-        if (callbackParameters === null) {
-          settle(() => reject(new Error("OAuth callback missing authorization code")));
+      void Promise.resolve().then(() => settled ? void 0 : options.readLine()).then((input) => {
+        if (settled)
           return;
-        }
-        try {
-          validateAuthorizationCallbackBinding(callbackParameters, expectedAuthorization);
-          if (callbackParameters.error !== null) {
-            const description = callbackParameters.errorDescription ?? callbackParameters.error;
-            throw createAuthorizationError(callbackParameters.error, description);
-          }
-          const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
-          settle(() => resolve(code));
-        } catch (error) {
-          settle(() => reject(error instanceof Error ? error : new Error(String(error))));
-        }
-      }).catch((error) => {
-        settle(() => reject(error instanceof Error ? error : new Error(String(error))));
-      });
+        const callbackParameters = extractCallbackParametersFromInput(input);
+        if (callbackParameters === null)
+          throw new Error("OAuth callback missing authorization code");
+        validateAuthorizationCallbackBinding(callbackParameters, expectedAuthorization);
+        if (callbackParameters.error !== null)
+          throw createAuthorizationError(callbackParameters.error, callbackParameters.errorDescription ?? callbackParameters.error);
+        const code = validateAuthorizationCallbackParameters(callbackParameters, expectedAuthorization);
+        settle(() => resolve(code));
+      }).catch((error) => settle(() => reject(error)));
     }
     if (options.openBrowser !== void 0) {
-      options.openBrowser(authorizationUrl).catch((error) => {
-        settle(() => reject(error));
-      });
+      void Promise.resolve().then(() => settled ? void 0 : options.openBrowser(authorizationUrl)).catch((error) => settle(() => reject(error)));
     }
   });
 }
@@ -4387,6 +4456,7 @@ async function exchangeAuthorizationCode(input) {
       resource
     },
     fetch: input.fetch,
+    signal: input.signal,
     now: input.now
   });
 }
@@ -4402,6 +4472,7 @@ async function refreshAccessToken(input) {
       resource
     },
     fetch: input.fetch,
+    signal: input.signal,
     now: input.now
   });
 }
@@ -4413,7 +4484,9 @@ async function requestTokens(input) {
   if (input.clientSecret !== void 0) {
     body.set("client_secret", input.clientSecret);
   }
-  const signal = AbortSignal.timeout(3e4);
+  input.signal?.throwIfAborted();
+  const deadline = AbortSignal.timeout(3e4);
+  const signal = input.signal === void 0 ? deadline : AbortSignal.any([input.signal, deadline]);
   const response = await fetchMcpResponse(input.fetch, input.tokenEndpoint, {
     method: "POST",
     headers: {
@@ -4525,7 +4598,7 @@ function createDefaultOAuthClientProvider(options) {
     async authorizeRequest(input) {
       assertNoAccessTokenInUrl(input.requestUrl, "Protected resource request URL");
       const requestUrl = canonicalizeResourceIndicator(input.requestUrl);
-      const session = await ensureAuthorizedSession(requestUrl, void 0, input.fetch, false);
+      const session = await ensureAuthorizedSession(requestUrl, void 0, input.fetch, false, false, input.signal);
       const accessToken = session?.tokens?.accessToken;
       if (session === null || accessToken === void 0 || session.tokens === void 0 || isExpired(session.tokens, now)) {
         return;
@@ -4543,12 +4616,13 @@ function createDefaultOAuthClientProvider(options) {
         const session = await ensureAuthorizedSession(resource, {
           ...input.discovery,
           resource
-        }, input.fetch, true, forceRefresh);
+        }, input.fetch, true, forceRefresh, input.signal);
         if (session?.tokens?.accessToken === void 0) {
           return { action: "fail" };
         }
         return { action: "retry" };
       } catch (error) {
+        input.signal?.throwIfAborted();
         return {
           action: "fail",
           error: error instanceof Error ? error : new Error(String(error))
@@ -4556,9 +4630,11 @@ function createDefaultOAuthClientProvider(options) {
       }
     }
   };
-  async function ensureAuthorizedSession(resource, discovery, fetch2, allowInteractive, forceRefresh = false) {
+  async function ensureAuthorizedSession(resource, discovery, fetch2, allowInteractive, forceRefresh = false, signal) {
+    signal?.throwIfAborted();
     const canonicalResource = canonicalizeResourceIndicator(resource);
     let session = await loadSession(canonicalResource);
+    signal?.throwIfAborted();
     if (discovery !== void 0 && getOwnString2(discovery.authorizationServerMetadata, "issuer") !== discovery.authorizationServer) {
       throw new Error("OAuth discovery authorization-server issuer mismatch");
     }
@@ -4571,7 +4647,7 @@ function createDefaultOAuthClientProvider(options) {
       return session;
     }
     if (session?.tokens?.refreshToken !== void 0 && sessionDiscovery !== void 0 && (forceRefresh || isExpired(session.tokens, now))) {
-      session = await refreshSession(canonicalResource, session, sessionDiscovery, fetch2);
+      session = await refreshSession(canonicalResource, session, sessionDiscovery, fetch2, signal);
       if (session?.tokens !== void 0 && !isExpired(session.tokens, now)) {
         return session;
       }
@@ -4583,9 +4659,12 @@ function createDefaultOAuthClientProvider(options) {
     if (!allowInteractive || sessionDiscovery === void 0) {
       return session;
     }
-    return authorizeSession(canonicalResource, session, sessionDiscovery, fetch2);
+    if (options.allowInteractive === false)
+      throw new Error("OAuth interactive authorization is disabled");
+    return authorizeSession(canonicalResource, session, sessionDiscovery, fetch2, signal);
   }
-  async function refreshSession(resource, session, discovery, fetch2) {
+  async function refreshSession(resource, session, discovery, fetch2, signal) {
+    signal?.throwIfAborted();
     assertSecureOAuthFlowEndpoints(discovery.authorizationServerMetadata);
     const inFlight = refreshPromises.get(resource);
     if (inFlight !== void 0) {
@@ -4607,10 +4686,12 @@ function createDefaultOAuthClientProvider(options) {
               refreshToken: session.tokens.refreshToken,
               resource,
               fetch: fetch2,
+              signal,
               now
             });
             break;
           } catch (error) {
+            signal?.throwIfAborted();
             if (error instanceof OAuthError && error.error === "invalid_grant") {
               const clearedSession = clearSessionTokens(session);
               await saveSession(resource, clearedSession);
@@ -4645,7 +4726,8 @@ function createDefaultOAuthClientProvider(options) {
     refreshPromises.set(resource, promise);
     return promise;
   }
-  async function authorizeSession(resource, existingSession, discovery, fetch2) {
+  async function authorizeSession(resource, existingSession, discovery, fetch2, signal) {
+    signal?.throwIfAborted();
     const inFlight = authorizationPromises.get(resource);
     if (inFlight !== void 0) {
       return inFlight;
@@ -4661,11 +4743,14 @@ function createDefaultOAuthClientProvider(options) {
           openBrowser: options.browser.openBrowser,
           readLine: options.browser.readLine,
           createServer: options.browser.createServer,
-          landingPage: options.browser.landingPage
+          landingPage: options.browser.landingPage,
+          redirectUri: options.browser.redirectUri,
+          signal: options.browser.signal === void 0 ? signal : signal === void 0 ? options.browser.signal : AbortSignal.any([signal, options.browser.signal]),
+          timeoutMs: options.browser.timeoutMs
         });
         let resolvedClient = null;
         try {
-          resolvedClient = await resolveClient(currentSession, discovery, loopback.redirectUri, fetch2);
+          resolvedClient = await resolveClient(currentSession, discovery, loopback.redirectUri, fetch2, signal);
           const sessionWithoutTokens = {
             resource,
             authorizationServer: discovery.authorizationServer,
@@ -4693,6 +4778,7 @@ function createDefaultOAuthClientProvider(options) {
             redirectUri: loopback.redirectUri,
             resource,
             fetch: fetch2,
+            signal,
             now
           });
           const session = {
@@ -4702,6 +4788,7 @@ function createDefaultOAuthClientProvider(options) {
           await saveSession(resource, session);
           return session;
         } catch (error) {
+          signal?.throwIfAborted();
           if (shouldReRegisterStoredDynamicClient(error, resolvedClient, reRegistrationAttempted)) {
             reRegistrationAttempted = true;
             await clearRegisteredClient(discovery.authorizationServer);
@@ -4727,7 +4814,8 @@ function createDefaultOAuthClientProvider(options) {
     authorizationPromises.set(resource, finalPromise);
     return finalPromise;
   }
-  async function resolveClient(existingSession, discovery, redirectUri, fetch2) {
+  async function resolveClient(existingSession, discovery, redirectUri, fetch2, parentSignal) {
+    parentSignal?.throwIfAborted();
     const configuredClient = normalizeConfiguredClient(options.client);
     if (options.client.mode === "static") {
       if (configuredClient === null) {
@@ -4777,7 +4865,8 @@ function createDefaultOAuthClientProvider(options) {
       }
     }
     const registrationBody = buildClientRegistrationBody(getClientMetadata(options.client), redirectUri);
-    const signal = AbortSignal.timeout(3e4);
+    const deadline = AbortSignal.timeout(3e4);
+    const signal = parentSignal === void 0 ? deadline : AbortSignal.any([parentSignal, deadline]);
     const response = await fetchMcpResponse(fetch2, registrationEndpoint, {
       method: "POST",
       headers: {
@@ -5340,8 +5429,10 @@ async function readJsonResponse(response, label, signal) {
     throw new Error(`${label} response must be valid JSON`);
   }
 }
-async function fetchMetadata(fetch2, location, label) {
-  const signal = AbortSignal.timeout(1e4);
+async function fetchMetadata(fetch2, location, label, parentSignal) {
+  parentSignal?.throwIfAborted();
+  const deadline = AbortSignal.timeout(1e4);
+  const signal = parentSignal === void 0 ? deadline : AbortSignal.any([deadline, parentSignal]);
   const response = await fetchMcpResponse(fetch2, location, {
     method: "GET",
     headers: { Accept: "application/json" },
@@ -5443,7 +5534,7 @@ var OAuthMetadataDiscovery = class {
     this.fetchImpl = fetch2;
     this.cache = cache;
   }
-  async discoverProtectedResource(resource, resourceMetadataUrl) {
+  async discoverProtectedResource(resource, resourceMetadataUrl, signal) {
     const locations = /* @__PURE__ */ new Set([resolveProtectedResourceMetadataUrl(resource, resourceMetadataUrl)]);
     if (resourceMetadataUrl === void 0) {
       locations.add(new URL("/.well-known/oauth-protected-resource", resource).toString());
@@ -5452,17 +5543,19 @@ var OAuthMetadataDiscovery = class {
     for (const location of locations) {
       try {
         const metadata = validateProtectedResourceMetadata(
-          await fetchMetadata(this.fetchImpl, location, "Protected resource metadata"),
+          await fetchMetadata(this.fetchImpl, location, "Protected resource metadata", signal),
           resource
         );
         return { location, metadata };
       } catch (error) {
+        signal?.throwIfAborted();
         lastError = error;
       }
     }
     throw lastError;
   }
-  async discover(resourceUrl, { resourceMetadataUrl } = {}) {
+  async discover(resourceUrl, { resourceMetadataUrl, signal } = {}) {
+    signal?.throwIfAborted();
     const cacheKey = canonicalizeResourceIndicator(resourceUrl);
     resolveProtectedResourceMetadataUrl(cacheKey, resourceMetadataUrl);
     const memoryCachedResult = this.memoryCache.get(cacheKey);
@@ -5470,6 +5563,7 @@ var OAuthMetadataDiscovery = class {
       return structuredClone(memoryCachedResult);
     }
     const sharedCachedResult = await this.cache?.get(cacheKey);
+    signal?.throwIfAborted();
     if (sharedCachedResult !== null && sharedCachedResult !== void 0 && resourceMetadataUrl === void 0) {
       try {
         const result = validateCachedDiscovery(sharedCachedResult, cacheKey);
@@ -5479,7 +5573,7 @@ var OAuthMetadataDiscovery = class {
         await this.cache?.delete?.(cacheKey);
       }
     }
-    const { location: resourceMetadataLocation, metadata: resourceMetadata } = await this.discoverProtectedResource(cacheKey, resourceMetadataUrl);
+    const { location: resourceMetadataLocation, metadata: resourceMetadata } = await this.discoverProtectedResource(cacheKey, resourceMetadataUrl, signal);
     const authorizationServerErrors = [];
     for (const authorizationServer of resourceMetadata.authorization_servers) {
       const normalizedAuthorizationServer = validateAuthorizationServerIssuer(authorizationServer);
@@ -5487,7 +5581,7 @@ var OAuthMetadataDiscovery = class {
       for (const authorizationServerMetadataUrl of metadataLocations) {
         try {
           const authorizationServerMetadata = validateAuthorizationServerMetadata(
-            await fetchMetadata(this.fetchImpl, authorizationServerMetadataUrl, "Authorization server metadata"),
+            await fetchMetadata(this.fetchImpl, authorizationServerMetadataUrl, "Authorization server metadata", signal),
             normalizedAuthorizationServer
           );
           const result = {
@@ -5502,6 +5596,7 @@ var OAuthMetadataDiscovery = class {
           await this.cache?.set(cacheKey, structuredClone(result));
           return result;
         } catch (error) {
+          signal?.throwIfAborted();
           authorizationServerErrors.push(
             `${authorizationServerMetadataUrl}: ${error instanceof Error ? error.message : String(error)}`
           );
@@ -6642,6 +6737,7 @@ var HttpTransport = class {
   oauthProvider;
   oauthMetadataDiscovery;
   inFlightFetchAbortControllers = /* @__PURE__ */ new Set();
+  inFlightOAuthAbortControllers = /* @__PURE__ */ new Set();
   openResponseReaders = /* @__PURE__ */ new Set();
   modernRequests = /* @__PURE__ */ new Map();
   modernMode = false;
@@ -6711,7 +6807,7 @@ var HttpTransport = class {
     this.rejectLegacyEndpoint = void 0;
     this.resolveLegacyEndpoint = void 0;
     this.toolParameterHeaders.clear();
-    this.abortInFlightFetches();
+    this.abortInFlightFetches(reason);
     this.cancelOpenResponseReaders();
     if (!this.writeStream.destroyed && !this.writeStream.writableEnded) {
       this.writeStream.end();
@@ -6747,12 +6843,14 @@ var HttpTransport = class {
     this.resolveClosed = void 0;
     resolveClosed?.({ reason: closeReason });
   }
-  abortInFlightFetches() {
-    for (const controller of this.modernRequests.values()) controller.abort();
+  abortInFlightFetches(reason) {
+    for (const controller of this.modernRequests.values()) controller.abort(reason);
     this.modernRequests.clear();
     for (const abortController of this.inFlightFetchAbortControllers) {
-      abortController.abort();
+      abortController.abort(reason);
     }
+    for (const controller of this.inFlightOAuthAbortControllers) controller.abort(reason);
+    this.inFlightOAuthAbortControllers.clear();
     this.inFlightFetchAbortControllers.clear();
   }
   cancelOpenResponseReaders() {
@@ -6818,7 +6916,7 @@ var HttpTransport = class {
       const response = await this.fetchWithOAuthRetry({
         url: postUrl,
         method: "POST",
-        createHeaders: () => this.createPostHeaders(message, modern),
+        createHeaders: (signal) => this.createPostHeaders(message, modern, signal),
         body: line,
         controller
       });
@@ -6858,7 +6956,7 @@ var HttpTransport = class {
         this.modernRequests.delete(id);
     }
   }
-  async createPostHeaders(message, modern = false) {
+  async createPostHeaders(message, modern = false, signal) {
     const headers = new Headers(this.headers);
     headers.set("Accept", "application/json, text/event-stream");
     headers.set("Content-Type", "application/json");
@@ -6888,9 +6986,9 @@ var HttpTransport = class {
       headers.set("Mcp-Session-Id", this.sessionId);
       headers.set("MCP-Protocol-Version", MCP_PROTOCOL_VERSION);
     }
-    return this.authorizeRequestHeaders(headers);
+    return this.authorizeRequestHeaders(headers, signal);
   }
-  async createGetHeaders() {
+  async createGetHeaders(signal) {
     const headers = new Headers(this.headers);
     headers.set("Accept", "text/event-stream");
     if (this.sessionId !== void 0) {
@@ -6900,20 +6998,26 @@ var HttpTransport = class {
     if (this.lastEventId !== void 0) {
       headers.set("Last-Event-ID", this.lastEventId);
     }
-    return this.authorizeRequestHeaders(headers);
+    return this.authorizeRequestHeaders(headers, signal);
   }
-  async createDeleteHeaders(sessionId) {
+  async createDeleteHeaders(sessionId, signal) {
     const headers = new Headers(this.headers);
     headers.set("Mcp-Session-Id", sessionId);
     headers.set("MCP-Protocol-Version", MCP_PROTOCOL_VERSION);
-    return this.authorizeRequestHeaders(headers);
+    return this.authorizeRequestHeaders(headers, signal);
   }
-  async authorizeRequestHeaders(headers) {
+  async authorizeRequestHeaders(headers, signal) {
+    signal?.throwIfAborted();
     await this.oauthProvider?.authorizeRequest?.({
       requestUrl: new URL(this.url),
       headers,
-      fetch: this.fetchImpl
+      signal,
+      fetch: (url, init) => fetchMcpResponse(this.fetchImpl, url, {
+        ...init,
+        signal: signal === void 0 ? init?.signal : init?.signal == null ? signal : AbortSignal.any([signal, init.signal])
+      })
     });
+    signal?.throwIfAborted();
     return headers;
   }
   captureSessionId(response) {
@@ -6950,7 +7054,7 @@ var HttpTransport = class {
     return this.legacyEndpointReady;
   }
   async sendSessionTerminationRequest(sessionId, signal) {
-    const headers = await this.createDeleteHeaders(sessionId);
+    const headers = await this.createDeleteHeaders(sessionId, signal);
     signal.throwIfAborted();
     const response = await fetchMcpResponse(this.fetchImpl, this.url, {
       method: "DELETE",
@@ -6973,7 +7077,7 @@ var HttpTransport = class {
   async consumeGetSseStream() {
     const response = await this.fetchWithOAuthRetry({
       method: "GET",
-      createHeaders: () => this.createGetHeaders()
+      createHeaders: (signal) => this.createGetHeaders(signal)
     });
     if (this.disposed) {
       void response.body?.cancel().catch(() => void 0);
@@ -7056,7 +7160,7 @@ var HttpTransport = class {
     const message = responseBody.length === 0 ? `HTTP transport POST failed (${statusDescriptor})` : `HTTP transport POST failed (${statusDescriptor}): ${responseBody}`;
     throw new HttpTransportError(message, response.status, "POST");
   }
-  async maybeHandleUnauthorizedResponse(response) {
+  async maybeHandleUnauthorizedResponse(response, signal) {
     if (response.status !== 401 || this.oauthProvider === void 0) {
       return false;
     }
@@ -7067,7 +7171,7 @@ var HttpTransport = class {
     const challenge = parseBearerWwwAuthenticateHeader(response.headers.get("WWW-Authenticate"));
     const resourceMetadataUrl = challenge?.params.resource_metadata;
     try {
-      const discovery = await discoveryClient.discover(this.url, { resourceMetadataUrl });
+      const discovery = await discoveryClient.discover(this.url, { resourceMetadataUrl, signal });
       const providerResponse = response.clone();
       let result;
       try {
@@ -7076,8 +7180,13 @@ var HttpTransport = class {
           response: providerResponse,
           challenge,
           discovery,
-          fetch: this.fetchImpl
+          signal,
+          fetch: (url, init) => fetchMcpResponse(this.fetchImpl, url, {
+            ...init,
+            signal: init?.signal == null ? signal : AbortSignal.any([signal, init.signal])
+          })
         });
+        signal.throwIfAborted();
       } finally {
         void providerResponse.body?.cancel().catch(() => void 0);
       }
@@ -7207,25 +7316,30 @@ var HttpTransport = class {
 `);
   }
   async fetchWithOAuthRetry(input) {
-    const request = async () => this.fetchWithAbort(
-      input.url ?? this.url,
-      {
+    const controller = input.controller ?? new AbortController();
+    this.inFlightOAuthAbortControllers.add(controller);
+    const request = async () => {
+      controller.signal.throwIfAborted();
+      const headers = await input.createHeaders(controller.signal);
+      controller.signal.throwIfAborted();
+      return this.fetchWithAbort(input.url ?? this.url, {
         method: input.method,
-        headers: await input.createHeaders(),
+        headers,
         body: input.body
-      },
-      input.controller
-    );
-    let response = await request();
-    if (await this.maybeHandleUnauthorizedResponse(response)) {
-      response = await request();
-    }
-    const oauthError = this.oauthProvider === void 0 ? null : this.readOAuthChallengeError(response);
-    if (oauthError !== null) {
-      void response.body?.cancel().catch(() => void 0);
-      throw oauthError;
+      }, controller);
+    };
+    try {
+      let response = await request();
+      if (await this.maybeHandleUnauthorizedResponse(response, controller.signal)) response = await request();
+      const oauthError = this.oauthProvider === void 0 ? null : this.readOAuthChallengeError(response);
+      if (oauthError !== null) {
+        void response.body?.cancel().catch(() => void 0);
+        throw oauthError;
+      }
+      return response;
+    } finally {
+      this.inFlightOAuthAbortControllers.delete(controller);
     }
-    return response;
   }
   readOAuthChallengeError(response) {
     if (response.status !== 401 && response.status !== 403) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-http-mcp-server",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Minimal MCP server over HTTP built on tiny-stdio-mcp-server",
   "type": "module",
   "main": "dist/index.js",