@armory-sh/middleware-bun 0.3.27 → 0.3.29

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { M as MiddlewareConfig, B as BunHandler, a as BunMiddleware } from './routes-BKjM-6xh.js';
-export { P as PaymentConfig, R as ResolvedRequirementsConfig, b as RouteAwareBunMiddlewareConfig, c as createPaymentRequirements, d as createRouteAwareBunMiddleware, p as paymentMiddleware, r as resolveFacilitatorUrlFromRequirement } from './routes-BKjM-6xh.js';
+import { M as MiddlewareConfig, B as BunHandler, a as BunMiddleware } from './routes-C69V5KAQ.js';
+export { P as PaymentConfig, R as ResolvedRequirementsConfig, b as RouteAwareBunMiddlewareConfig, c as createPaymentRequirements, d as createRouteAwareBunMiddleware, p as paymentMiddleware, r as resolveFacilitatorUrlFromRequirement } from './routes-C69V5KAQ.js';
 import '@armory-sh/base';
 
 interface BunMiddlewareConfig extends MiddlewareConfig {

package/dist/index.js

@@ -1,7 +1,9 @@
 import { createPaymentRequirements as createPaymentRequirements$1 } from './chunk-BJBLQMMR.js';
 export { createRouteAwareBunMiddleware } from './chunk-BJBLQMMR.js';
-import { resolveNetwork, isValidationError, resolveToken, createPaymentRequirements, PAYMENT_SIGNATURE_HEADER, createPaymentRequiredHeaders, decodePayloadHeader, findRequirementByAccepted, verifyPayment, extractPayerAddress, settlePayment, TOKENS, registerToken, createSettlementHeaders } from '@armory-sh/base';
+import { resolveNetwork, isValidationError, resolveToken, enrichPaymentRequirements, createPaymentRequirements, PAYMENT_SIGNATURE_HEADER, decodePayloadHeader, findRequirementByAccepted, verifyPayment, extractPayerAddress, settlePayment, createPaymentRequiredHeaders, TOKENS, registerToken, createSettlementHeaders, getSupported } from '@armory-sh/base';
 
+var extensionCapabilityCache = /* @__PURE__ */ new Map();
+var EXTENSION_CAPABILITY_TTL_MS = 5 * 60 * 1e3;
 function ensureTokensRegistered() {
   for (const token of Object.values(TOKENS)) {
     try {
@@ -18,17 +20,13 @@ function resolveFacilitatorUrlFromRequirement(config, requirement) {
       config.facilitatorUrlByToken
     )) {
       const resolvedChain = resolveNetwork(chainKey);
-      if (!isValidationError(resolvedChain) && resolvedChain.config.chainId === chainId) {
-        for (const [, url] of Object.entries(tokenMap)) {
-          const network = resolveNetwork(chainKey);
-          if (!isValidationError(network)) {
-            for (const tokenKey of Object.keys(tokenMap)) {
-              const resolvedToken = resolveToken(tokenKey, network);
-              if (!isValidationError(resolvedToken) && resolvedToken.config.contractAddress.toLowerCase() === assetAddress) {
-                return url;
-              }
-            }
-          }
+      if (isValidationError(resolvedChain) || resolvedChain.config.chainId !== chainId) {
+        continue;
+      }
+      for (const [tokenKey, url] of Object.entries(tokenMap)) {
+        const resolvedToken = resolveToken(tokenKey, resolvedChain);
+        if (!isValidationError(resolvedToken) && resolvedToken.config.contractAddress.toLowerCase() === assetAddress) {
+          return url;
         }
       }
     }
@@ -47,8 +45,9 @@ function resolveFacilitatorUrlFromRequirement(config, requirement) {
 }
 function createPaymentRequirements2(config) {
   if (config.requirements) {
+    const requirements = Array.isArray(config.requirements) ? config.requirements : [config.requirements];
     return {
-      requirements: Array.isArray(config.requirements) ? config.requirements : [config.requirements]
+      requirements: enrichPaymentRequirements(requirements)
     };
   }
   if (!config.payTo) {
@@ -63,6 +62,48 @@ function createPaymentRequirements2(config) {
   ensureTokensRegistered();
   return createPaymentRequirements(config);
 }
+async function resolvePaymentRequiredExtensions(config, requirements) {
+  if (!config.extensions) {
+    return {};
+  }
+  let filtered = { ...config.extensions };
+  for (const requirement of requirements) {
+    const facilitatorUrl = resolveFacilitatorUrlFromRequirement(config, requirement);
+    if (!facilitatorUrl) {
+      continue;
+    }
+    const cacheKey = `${facilitatorUrl}|${requirement.network.toLowerCase()}`;
+    const now = Date.now();
+    let keys = extensionCapabilityCache.get(cacheKey);
+    if (!keys || keys.expiresAt <= now) {
+      try {
+        const supported = await getSupported({ url: facilitatorUrl });
+        const nextKeys = /* @__PURE__ */ new Set();
+        for (const kind of supported.kinds) {
+          if (kind.network.toLowerCase() !== requirement.network.toLowerCase()) {
+            continue;
+          }
+          if (kind.extra && typeof kind.extra === "object") {
+            for (const key of Object.keys(kind.extra)) {
+              nextKeys.add(key);
+            }
+          }
+        }
+        keys = { expiresAt: now + EXTENSION_CAPABILITY_TTL_MS, keys: nextKeys };
+      } catch {
+        keys = { expiresAt: now + EXTENSION_CAPABILITY_TTL_MS, keys: /* @__PURE__ */ new Set() };
+      }
+      extensionCapabilityCache.set(cacheKey, keys);
+    }
+    filtered = Object.fromEntries(
+      Object.entries(filtered).filter(([key]) => keys.keys.has(key))
+    );
+    if (Object.keys(filtered).length === 0) {
+      return {};
+    }
+  }
+  return filtered;
+}
 var errorResponse = (error, status, headers, accepts) => new Response(JSON.stringify({ error, accepts }), {
   status,
   headers: { "Content-Type": "application/json", ...headers }
@@ -99,6 +140,12 @@ var appendSettlementHeaders = (response, settlement) => {
 };
 var paymentMiddleware = (config, handler) => {
   const { requirements, error } = createPaymentRequirements2(config);
+  const resolvePaymentRequiredHeaders = async () => createPaymentRequiredHeaders(requirements, {
+    extensions: await resolvePaymentRequiredExtensions(
+      config,
+      requirements
+    )
+  });
   return async (request) => {
     if (error) {
       return errorResponse(
@@ -117,10 +164,11 @@ var paymentMiddleware = (config, handler) => {
     }
     const paymentSig = request.headers.get(PAYMENT_SIGNATURE_HEADER);
     if (!paymentSig) {
+      const requiredHeaders = await resolvePaymentRequiredHeaders();
       return errorResponse(
         "Payment required",
         402,
-        createPaymentRequiredHeaders(requirements),
+        requiredHeaders,
         [requirements]
       );
     }
@@ -158,10 +206,11 @@ var paymentMiddleware = (config, handler) => {
       { url: facilitatorUrl }
     );
     if (!verifyResult.isValid) {
+      const requiredHeaders = await resolvePaymentRequiredHeaders();
       return errorResponse(
         `Payment verification failed: ${verifyResult.invalidReason}`,
         402,
-        createPaymentRequiredHeaders(requirements)
+        requiredHeaders
       );
     }
     const payerAddress = verifyResult.payer ?? extractPayerAddress(payload);

package/dist/{routes-BKjM-6xh.d.ts → routes-C69V5KAQ.d.ts}

@@ -14,6 +14,7 @@ interface PaymentConfig {
     facilitatorUrl?: string;
     facilitatorUrlByChain?: Record<string, string>;
     facilitatorUrlByToken?: Record<string, Record<string, string>>;
+    extensions?: Record<string, unknown>;
 }
 interface ResolvedRequirementsConfig {
     requirements: PaymentRequirementsV2[];

package/dist/routes.d.ts

@@ -1,2 +1,2 @@
-export { e as BunMiddleware, b as RouteAwareBunMiddlewareConfig, d as createRouteAwareBunMiddleware } from './routes-BKjM-6xh.js';
+export { e as BunMiddleware, b as RouteAwareBunMiddlewareConfig, d as createRouteAwareBunMiddleware } from './routes-C69V5KAQ.js';
 import '@armory-sh/base';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware-bun",
-  "version": "0.3.27",
+  "version": "0.3.29",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "keywords": [
@@ -43,7 +43,7 @@
     "directory": "packages/middleware-bun"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.29"
+    "@armory-sh/base": "0.2.31"
   },
   "devDependencies": {
     "bun-types": "latest",