@armory-sh/middleware-hono 0.3.22-alpha.3.21 → 0.3.22-alpha.3.23

package/dist/index.js

@@ -119,6 +119,37 @@ function resolveFacilitatorUrl(config, network, token) {
   }
   return config.facilitatorUrl;
 }
+function resolveFacilitatorUrlFromRequirement(config, requirement) {
+  const chainId = parseInt(requirement.network.split(":")[1] || "0", 10);
+  const assetAddress = requirement.asset.toLowerCase();
+  if (config.facilitatorUrlByToken) {
+    for (const [chainKey, tokenMap] of Object.entries(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 (config.facilitatorUrlByChain) {
+    for (const [chainKey, url] of Object.entries(config.facilitatorUrlByChain)) {
+      const resolvedChain = resolveNetwork(chainKey);
+      if (!isValidationError(resolvedChain) && resolvedChain.config.chainId === chainId) {
+        return url;
+      }
+    }
+  }
+  return config.facilitatorUrl;
+}
 function createPaymentRequirements(config) {
   ensureTokensRegistered();
   const {
@@ -148,18 +179,17 @@ function createPaymentRequirements(config) {
       const atomicAmount = toAtomicUnits(amount);
       const tokenConfig = resolvedToken.config;
       const resolvedPayTo = resolvePayTo(config, network, resolvedToken);
-      const resolvedFacilitatorUrl = resolveFacilitatorUrl(config, network, resolvedToken);
+      resolveFacilitatorUrl(config, network, resolvedToken);
       requirements.push({
         scheme: "exact",
         network: network.caip2,
-        maxAmountRequired: atomicAmount,
+        amount: atomicAmount,
         asset: tokenConfig.contractAddress,
         payTo: resolvedPayTo,
         maxTimeoutSeconds,
         extra: {
           name: tokenConfig.name,
-          version: tokenConfig.version,
-          ...resolvedFacilitatorUrl && { facilitatorUrl: resolvedFacilitatorUrl }
+          version: tokenConfig.version
         }
       });
     }
@@ -217,8 +247,7 @@ function paymentMiddleware(config) {
       c.status(400);
       return c.json({ error: "Invalid payment payload" });
     }
-    const requirementFacilitatorUrl = primaryRequirement.extra?.facilitatorUrl;
-    const facilitatorUrl = config.facilitatorUrl ?? (typeof requirementFacilitatorUrl === "string" ? requirementFacilitatorUrl : void 0);
+    const facilitatorUrl = resolveFacilitatorUrlFromRequirement(config, primaryRequirement);
     console.log("[payment-middleware] Facilitator URL:", facilitatorUrl);
     if (!facilitatorUrl) {
       console.log("[payment-middleware] No facilitator URL configured");
@@ -341,8 +370,7 @@ var routeAwarePaymentMiddleware = (config) => {
       c.status(400);
       return c.json({ error: "Invalid payment payload" });
     }
-    const requirementFacilitatorUrl = primaryRequirement.extra?.facilitatorUrl;
-    const facilitatorUrl = matchedRoute.config.facilitatorUrl ?? (typeof requirementFacilitatorUrl === "string" ? requirementFacilitatorUrl : void 0);
+    const facilitatorUrl = matchedRoute.config.facilitatorUrl ?? resolveFacilitatorUrlFromRequirement(matchedRoute.config, primaryRequirement);
     if (!facilitatorUrl) {
       c.status(500);
       return c.json({ error: "Payment middleware configuration error", message: "Facilitator URL is required for verification" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware-hono",
-  "version": "0.3.22-alpha.3.21",
+  "version": "0.3.22-alpha.3.23",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -33,8 +33,8 @@
     "hono": "^4"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.22-alpha.3.21",
-    "@armory-sh/extensions": "0.1.3-alpha.3.21"
+    "@armory-sh/base": "0.2.22-alpha.3.23",
+    "@armory-sh/extensions": "0.1.3-alpha.3.23"
   },
   "devDependencies": {
     "bun-types": "latest",