tiny-http-mcp-server 0.1.24 → 0.1.25

package/dist/composition.json

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

package/node_modules/mcp-oauth/README.md

@@ -84,6 +84,15 @@ 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.
 
+`authorizeRequest` may return an owned token snapshot for the request it
+authorized. The HTTP client supplies that snapshot as `presentedTokens`, along
+with the actual request's `requestHeaders`, to `handleUnauthorized`. Providers
+that return `void` remain supported. The native provider compares the rejected
+snapshot with persisted credentials: delayed 401s retry with a newer grant
+without redeeming its refresh token again. A proven current token is refreshed
+on 401 even when the server omits `error="invalid_token"`. Invalid provenance
+fails without quoting token values.
+
 Configure `client.metadata.scope` to request a precise scope set; broader
 discovery metadata does not override it.
 

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

@@ -58,7 +58,7 @@ export function createDefaultOAuthClientProvider(options) {
             if (session === null && !initialGrantConsumed && initialGrant?.resource === requestUrl &&
                 initialGrant.tokens !== undefined && !isExpired(initialGrant.tokens, now)) {
                 input.headers.set("Authorization", `Bearer ${initialGrant.tokens.accessToken}`);
-                return;
+                return { ...initialGrant.tokens };
             }
             if (session === null ||
                 accessToken === undefined ||
@@ -68,6 +68,7 @@ export function createDefaultOAuthClientProvider(options) {
             }
             assertRequestMatchesResource(requestUrl, session.resource);
             input.headers.set("Authorization", `Bearer ${accessToken}`);
+            return { ...session.tokens };
         },
         async handleUnauthorized(input) {
             try {
@@ -75,12 +76,28 @@ export function createDefaultOAuthClientProvider(options) {
                 const requestUrl = canonicalizeResourceIndicator(input.requestUrl);
                 const resource = canonicalizeResourceIndicator(input.discovery.resource);
                 assertRequestMatchesResource(requestUrl, resource);
-                const forceRefresh = (hasCachedAccessToken(await loadSession(resource)) || (!initialGrantConsumed && initialGrant?.resource === resource)) &&
-                    input.challenge?.params.error === "invalid_token";
+                const cached = await loadSession(resource);
+                const currentTokens = cached?.tokens ?? (!initialGrantConsumed && initialGrant?.resource === resource ? initialGrant.tokens : undefined);
+                let rejectedCurrentGrant = hasCachedAccessToken(cached) || (!initialGrantConsumed && initialGrant?.resource === resource);
+                let presentedTokens = input.presentedTokens;
+                if (input.presentedTokens !== undefined) {
+                    rejectedCurrentGrant = false;
+                    if (input.presentedTokens !== null) {
+                        const presented = normalizeStoredTokens(input.presentedTokens);
+                        const header = input.requestHeaders?.get("Authorization") ?? "";
+                        const separator = header.indexOf(" ");
+                        if (presented === undefined || header.slice(0, separator).toLowerCase() !== "bearer" || header.slice(separator + 1).trim() !== presented.accessToken)
+                            throw new Error("OAuth rejected-request provenance does not match its authorization header");
+                        presentedTokens = presented;
+                        rejectedCurrentGrant = currentTokens !== undefined && sameTokenGrant(currentTokens, presented);
+                    }
+                }
+                const challengeError = input.challenge?.params.error;
+                const forceRefresh = rejectedCurrentGrant && (challengeError === "invalid_token" || (input.presentedTokens !== undefined && challengeError === undefined));
                 const session = await ensureAuthorizedSession(resource, {
                     ...input.discovery,
                     resource
-                }, input.fetch, true, forceRefresh, input.signal);
+                }, input.fetch, true, forceRefresh, input.signal, presentedTokens);
                 if (session?.tokens?.accessToken === undefined) {
                     return { action: "fail" };
                 }
@@ -95,7 +112,7 @@ export function createDefaultOAuthClientProvider(options) {
             }
         }
     };
-    async function ensureAuthorizedSession(resource, discovery, fetch, allowInteractive, forceRefresh = false, signal) {
+    async function ensureAuthorizedSession(resource, discovery, fetch, allowInteractive, forceRefresh = false, signal, rejectedTokens) {
         signal?.throwIfAborted();
         const canonicalResource = canonicalizeResourceIndicator(resource);
         let session = await loadSession(canonicalResource);
@@ -120,6 +137,8 @@ export function createDefaultOAuthClientProvider(options) {
             initialGrantConsumed = true;
             signal?.throwIfAborted();
         }
+        if (forceRefresh && rejectedTokens !== undefined && (rejectedTokens === null || session?.tokens === undefined || !sameTokenGrant(session.tokens, rejectedTokens)))
+            forceRefresh = false;
         const sessionDiscovery = resolveDiscovery(discovery, session);
         if (session?.tokens !== undefined && !forceRefresh && !isExpired(session.tokens, now)) {
             return session;
@@ -454,6 +473,10 @@ function resolveDiscovery(discovery, session) {
         authorizationServerMetadata: metadata
     };
 }
+function sameTokenGrant(left, right) {
+    return left.accessToken === right.accessToken && left.refreshToken === right.refreshToken &&
+        left.tokenType === right.tokenType && left.expiresAt === right.expiresAt && left.scope === right.scope;
+}
 function clearSessionTokens(session) {
     const nextSession = { ...session };
     delete nextSession.tokens;

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

@@ -33,7 +33,7 @@ export interface OAuthClientProvider {
         headers: Headers;
         fetch: OAuthMetadataFetch;
         signal?: AbortSignal;
-    }): Promise<void> | void;
+    }): Promise<StoredOAuthTokens | void> | StoredOAuthTokens | void;
     handleUnauthorized(input: {
         requestUrl: URL;
         response: Response;
@@ -41,6 +41,10 @@ export interface OAuthClientProvider {
         discovery: OAuthDiscoveryResult;
         fetch: OAuthMetadataFetch;
         signal?: AbortSignal;
+        /** Headers actually attached to this rejected request. */
+        requestHeaders?: Headers;
+        /** Owned snapshot returned when this request was authorized, or null if absent. */
+        presentedTokens?: StoredOAuthTokens | null;
     }): Promise<{
         action: "retry";
     } | {

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

@@ -110,7 +110,7 @@ interface OAuthClientProvider {
         headers: Headers;
         fetch: OAuthMetadataFetch;
         signal?: AbortSignal;
-    }): Promise<void> | void;
+    }): Promise<StoredOAuthTokens | void> | StoredOAuthTokens | void;
     handleUnauthorized(input: {
         requestUrl: URL;
         response: Response;
@@ -118,6 +118,10 @@ interface OAuthClientProvider {
         discovery: OAuthDiscoveryResult;
         fetch: OAuthMetadataFetch;
         signal?: AbortSignal;
+        /** Headers actually attached to this rejected request. */
+        requestHeaders?: Headers;
+        /** Owned snapshot returned when this request was authorized, or null if absent. */
+        presentedTokens?: StoredOAuthTokens | null;
     }): Promise<{
         action: "retry";
     } | {
@@ -649,6 +653,7 @@ declare class HttpTransport implements McpTransport {
     private readonly oauthMetadataDiscovery;
     private readonly inFlightFetchAbortControllers;
     private readonly inFlightOAuthAbortControllers;
+    private readonly oauthRequestTokens;
     private readonly openResponseReaders;
     private readonly modernRequests;
     private modernMode;

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

@@ -4634,13 +4634,14 @@ function createDefaultOAuthClientProvider(options) {
       const accessToken = session?.tokens?.accessToken;
       if (session === null && !initialGrantConsumed && initialGrant?.resource === requestUrl && initialGrant.tokens !== void 0 && !isExpired(initialGrant.tokens, now)) {
         input.headers.set("Authorization", `Bearer ${initialGrant.tokens.accessToken}`);
-        return;
+        return { ...initialGrant.tokens };
       }
       if (session === null || accessToken === void 0 || session.tokens === void 0 || isExpired(session.tokens, now)) {
         return;
       }
       assertRequestMatchesResource(requestUrl, session.resource);
       input.headers.set("Authorization", `Bearer ${accessToken}`);
+      return { ...session.tokens };
     },
     async handleUnauthorized(input) {
       try {
@@ -4648,11 +4649,28 @@ function createDefaultOAuthClientProvider(options) {
         const requestUrl = canonicalizeResourceIndicator(input.requestUrl);
         const resource = canonicalizeResourceIndicator(input.discovery.resource);
         assertRequestMatchesResource(requestUrl, resource);
-        const forceRefresh = (hasCachedAccessToken(await loadSession(resource)) || !initialGrantConsumed && initialGrant?.resource === resource) && input.challenge?.params.error === "invalid_token";
+        const cached = await loadSession(resource);
+        const currentTokens = cached?.tokens ?? (!initialGrantConsumed && initialGrant?.resource === resource ? initialGrant.tokens : void 0);
+        let rejectedCurrentGrant = hasCachedAccessToken(cached) || !initialGrantConsumed && initialGrant?.resource === resource;
+        let presentedTokens = input.presentedTokens;
+        if (input.presentedTokens !== void 0) {
+          rejectedCurrentGrant = false;
+          if (input.presentedTokens !== null) {
+            const presented = normalizeStoredTokens(input.presentedTokens);
+            const header = input.requestHeaders?.get("Authorization") ?? "";
+            const separator = header.indexOf(" ");
+            if (presented === void 0 || header.slice(0, separator).toLowerCase() !== "bearer" || header.slice(separator + 1).trim() !== presented.accessToken)
+              throw new Error("OAuth rejected-request provenance does not match its authorization header");
+            presentedTokens = presented;
+            rejectedCurrentGrant = currentTokens !== void 0 && sameTokenGrant(currentTokens, presented);
+          }
+        }
+        const challengeError = input.challenge?.params.error;
+        const forceRefresh = rejectedCurrentGrant && (challengeError === "invalid_token" || input.presentedTokens !== void 0 && challengeError === void 0);
         const session = await ensureAuthorizedSession(resource, {
           ...input.discovery,
           resource
-        }, input.fetch, true, forceRefresh, input.signal);
+        }, input.fetch, true, forceRefresh, input.signal, presentedTokens);
         if (session?.tokens?.accessToken === void 0) {
           return { action: "fail" };
         }
@@ -4666,7 +4684,7 @@ function createDefaultOAuthClientProvider(options) {
       }
     }
   };
-  async function ensureAuthorizedSession(resource, discovery, fetch2, allowInteractive, forceRefresh = false, signal) {
+  async function ensureAuthorizedSession(resource, discovery, fetch2, allowInteractive, forceRefresh = false, signal, rejectedTokens) {
     signal?.throwIfAborted();
     const canonicalResource = canonicalizeResourceIndicator(resource);
     let session = await loadSession(canonicalResource);
@@ -4693,6 +4711,8 @@ function createDefaultOAuthClientProvider(options) {
       initialGrantConsumed = true;
       signal?.throwIfAborted();
     }
+    if (forceRefresh && rejectedTokens !== void 0 && (rejectedTokens === null || session?.tokens === void 0 || !sameTokenGrant(session.tokens, rejectedTokens)))
+      forceRefresh = false;
     const sessionDiscovery = resolveDiscovery(discovery, session);
     if (session?.tokens !== void 0 && !forceRefresh && !isExpired(session.tokens, now)) {
       return session;
@@ -5014,6 +5034,9 @@ function resolveDiscovery(discovery, session) {
     authorizationServerMetadata: metadata
   };
 }
+function sameTokenGrant(left, right) {
+  return left.accessToken === right.accessToken && left.refreshToken === right.refreshToken && left.tokenType === right.tokenType && left.expiresAt === right.expiresAt && left.scope === right.scope;
+}
 function clearSessionTokens(session) {
   const nextSession = { ...session };
   delete nextSession.tokens;
@@ -6789,6 +6812,7 @@ var HttpTransport = class {
   oauthMetadataDiscovery;
   inFlightFetchAbortControllers = /* @__PURE__ */ new Set();
   inFlightOAuthAbortControllers = /* @__PURE__ */ new Set();
+  oauthRequestTokens = /* @__PURE__ */ new WeakMap();
   openResponseReaders = /* @__PURE__ */ new Set();
   modernRequests = /* @__PURE__ */ new Map();
   modernMode = false;
@@ -7059,7 +7083,7 @@ var HttpTransport = class {
   }
   async authorizeRequestHeaders(headers, signal) {
     signal?.throwIfAborted();
-    await this.oauthProvider?.authorizeRequest?.({
+    const tokens = await this.oauthProvider?.authorizeRequest?.({
       requestUrl: new URL(this.url),
       headers,
       signal,
@@ -7068,6 +7092,7 @@ var HttpTransport = class {
         signal: signal === void 0 ? init?.signal : init?.signal == null ? signal : AbortSignal.any([signal, init.signal])
       })
     });
+    if (tokens !== void 0) this.oauthRequestTokens.set(headers, { ...tokens });
     signal?.throwIfAborted();
     return headers;
   }
@@ -7211,7 +7236,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, signal) {
+  async maybeHandleUnauthorizedResponse(response, signal, requestHeaders, presentedTokens) {
     if (response.status !== 401 || this.oauthProvider === void 0) {
       return false;
     }
@@ -7232,6 +7257,8 @@ var HttpTransport = class {
           challenge,
           discovery,
           signal,
+          requestHeaders: new Headers(requestHeaders),
+          presentedTokens,
           fetch: (url, init) => fetchMcpResponse(this.fetchImpl, url, {
             ...init,
             signal: init?.signal == null ? signal : AbortSignal.any([signal, init.signal])
@@ -7372,16 +7399,20 @@ var HttpTransport = class {
     const request = async () => {
       controller.signal.throwIfAborted();
       const headers = await input.createHeaders(controller.signal);
+      const headerSnapshot = new Headers(headers);
+      const tokens = this.oauthRequestTokens.get(headers) ?? null;
       controller.signal.throwIfAborted();
-      return this.fetchWithAbort(input.url ?? this.url, {
+      const response = await this.fetchWithAbort(input.url ?? this.url, {
         method: input.method,
         headers,
         body: input.body
       }, controller);
+      return { response, headers: headerSnapshot, tokens };
     };
     try {
-      let response = await request();
-      if (await this.maybeHandleUnauthorizedResponse(response, controller.signal)) response = await request();
+      let attempt = await request();
+      if (await this.maybeHandleUnauthorizedResponse(attempt.response, controller.signal, attempt.headers, attempt.tokens)) attempt = await request();
+      const response = attempt.response;
       const oauthError = this.oauthProvider === void 0 ? null : this.readOAuthChallengeError(response);
       if (oauthError !== null) {
         void response.body?.cancel().catch(() => void 0);

package/package.json

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