@armory-sh/middleware-hono 0.3.21 → 0.3.22-alpha.3.20

package/dist/chunk-XYM6YXAQ.js

@@ -0,0 +1,58 @@
+// src/extensions.ts
+var declareDiscoveryExtension = (config = {}) => {
+  const info = {};
+  if (config.input !== void 0) {
+    info.input = config.input;
+  }
+  if (config.inputSchema !== void 0) {
+    info.inputSchema = config.inputSchema;
+  }
+  if (config.output !== void 0) {
+    info.output = config.output;
+  }
+  return { info, schema: { type: "object" } };
+};
+var declareSIWxExtension = (config = {}) => {
+  const info = {};
+  if (config.domain !== void 0) {
+    info.domain = config.domain;
+  }
+  if (config.resourceUri !== void 0) {
+    info.resourceUri = config.resourceUri;
+  }
+  if (config.network !== void 0) {
+    info.network = config.network;
+  }
+  if (config.statement !== void 0) {
+    info.statement = config.statement;
+  }
+  if (config.version !== void 0) {
+    info.version = config.version;
+  }
+  if (config.expirationSeconds !== void 0) {
+    info.expirationSeconds = config.expirationSeconds;
+  }
+  return { info, schema: { type: "object" } };
+};
+function buildExtensions(config) {
+  const extensions = {};
+  if (config.bazaar) {
+    extensions.bazaar = declareDiscoveryExtension(config.bazaar);
+  }
+  if (config.signInWithX) {
+    extensions["sign-in-with-x"] = declareSIWxExtension(config.signInWithX);
+  }
+  return extensions;
+}
+function extractExtension(extensions, key) {
+  if (!extensions || typeof extensions !== "object") {
+    return null;
+  }
+  const extension = extensions[key];
+  if (!extension || typeof extension !== "object") {
+    return null;
+  }
+  return extension;
+}
+
+export { buildExtensions, extractExtension };

package/dist/extensions.js

@@ -1,60 +1 @@
-// src/extensions.ts
-var declareDiscoveryExtension = (config = {}) => {
-  const info = {};
-  if (config.input !== void 0) {
-    info.input = config.input;
-  }
-  if (config.inputSchema !== void 0) {
-    info.inputSchema = config.inputSchema;
-  }
-  if (config.output !== void 0) {
-    info.output = config.output;
-  }
-  return { info, schema: { type: "object" } };
-};
-var declareSIWxExtension = (config = {}) => {
-  const info = {};
-  if (config.domain !== void 0) {
-    info.domain = config.domain;
-  }
-  if (config.resourceUri !== void 0) {
-    info.resourceUri = config.resourceUri;
-  }
-  if (config.network !== void 0) {
-    info.network = config.network;
-  }
-  if (config.statement !== void 0) {
-    info.statement = config.statement;
-  }
-  if (config.version !== void 0) {
-    info.version = config.version;
-  }
-  if (config.expirationSeconds !== void 0) {
-    info.expirationSeconds = config.expirationSeconds;
-  }
-  return { info, schema: { type: "object" } };
-};
-function buildExtensions(config) {
-  const extensions = {};
-  if (config.bazaar) {
-    extensions.bazaar = declareDiscoveryExtension(config.bazaar);
-  }
-  if (config.signInWithX) {
-    extensions["sign-in-with-x"] = declareSIWxExtension(config.signInWithX);
-  }
-  return extensions;
-}
-function extractExtension(extensions, key) {
-  if (!extensions || typeof extensions !== "object") {
-    return null;
-  }
-  const extension = extensions[key];
-  if (!extension || typeof extension !== "object") {
-    return null;
-  }
-  return extension;
-}
-export {
-  buildExtensions,
-  extractExtension
-};
+export { buildExtensions, extractExtension } from './chunk-XYM6YXAQ.js';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Context, Next } from 'hono';
-import { PaymentRequirementsV2, ValidationError, PaymentRequirements, PaymentPayloadV2 } from '@armory-sh/base';
+import { PaymentRequirementsV2, ValidationError, PaymentRequirements, X402PaymentPayload } from '@armory-sh/base';
 import { ExtensionConfig } from './extensions.js';
 export { buildExtensions, extractExtension } from './extensions.js';
 
@@ -41,12 +41,12 @@ declare const routeAwarePaymentMiddleware: (config: RouteAwarePaymentConfig) =>
 
 interface AdvancedPaymentConfig {
     requirements: PaymentRequirements;
-    facilitatorUrl?: string;
+    facilitatorUrl: string;
     network?: string;
 }
 interface AugmentedRequest extends Request {
     payment?: {
-        payload: PaymentPayloadV2;
+        payload: X402PaymentPayload;
         payerAddress: string;
         verified: boolean;
     };

package/dist/index.js

@@ -1,80 +1,7 @@
-// src/index.ts
-import {
-  createPaymentRequiredHeaders,
-  PAYMENT_SIGNATURE_HEADER,
-  decodePaymentV2
-} from "@armory-sh/base";
-
-// src/simple.ts
-import {
-  resolveNetwork,
-  resolveToken,
-  safeBase64Encode,
-  V2_HEADERS,
-  registerToken
-} from "@armory-sh/base";
-import {
-  TOKENS
-} from "@armory-sh/base";
+import { buildExtensions } from './chunk-XYM6YXAQ.js';
+export { buildExtensions, extractExtension } from './chunk-XYM6YXAQ.js';
+import { V2_HEADERS, safeBase64Encode, decodePayloadHeader, verifyPayment, createPaymentRequiredHeaders, settlePayment, createSettlementHeaders, matchRoute, PAYMENT_SIGNATURE_HEADER, TOKENS, registerToken, resolveNetwork, resolveToken, validateRouteConfig } from '@armory-sh/base';
 
-// src/extensions.ts
-var declareDiscoveryExtension = (config = {}) => {
-  const info = {};
-  if (config.input !== void 0) {
-    info.input = config.input;
-  }
-  if (config.inputSchema !== void 0) {
-    info.inputSchema = config.inputSchema;
-  }
-  if (config.output !== void 0) {
-    info.output = config.output;
-  }
-  return { info, schema: { type: "object" } };
-};
-var declareSIWxExtension = (config = {}) => {
-  const info = {};
-  if (config.domain !== void 0) {
-    info.domain = config.domain;
-  }
-  if (config.resourceUri !== void 0) {
-    info.resourceUri = config.resourceUri;
-  }
-  if (config.network !== void 0) {
-    info.network = config.network;
-  }
-  if (config.statement !== void 0) {
-    info.statement = config.statement;
-  }
-  if (config.version !== void 0) {
-    info.version = config.version;
-  }
-  if (config.expirationSeconds !== void 0) {
-    info.expirationSeconds = config.expirationSeconds;
-  }
-  return { info, schema: { type: "object" } };
-};
-function buildExtensions(config) {
-  const extensions = {};
-  if (config.bazaar) {
-    extensions.bazaar = declareDiscoveryExtension(config.bazaar);
-  }
-  if (config.signInWithX) {
-    extensions["sign-in-with-x"] = declareSIWxExtension(config.signInWithX);
-  }
-  return extensions;
-}
-function extractExtension(extensions, key) {
-  if (!extensions || typeof extensions !== "object") {
-    return null;
-  }
-  const extension = extensions[key];
-  if (!extension || typeof extension !== "object") {
-    return null;
-  }
-  return extension;
-}
-
-// src/simple.ts
 var isValidationError = (value) => {
   return typeof value === "object" && value !== null && "code" in value;
 };
@@ -225,7 +152,7 @@ function createPaymentRequirements(config) {
       requirements.push({
         scheme: "exact",
         network: network.caip2,
-        amount: atomicAmount,
+        maxAmountRequired: atomicAmount,
         asset: tokenConfig.contractAddress,
         payTo: resolvedPayTo,
         maxTimeoutSeconds,
@@ -241,8 +168,10 @@ function createPaymentRequirements(config) {
 }
 function paymentMiddleware(config) {
   const { requirements, error } = createPaymentRequirements(config);
+  console.log("[payment-middleware] Initialized with requirements:", JSON.stringify(requirements, null, 2));
   return async (c, next) => {
     if (error) {
+      console.log("[payment-middleware] Configuration error:", error.message);
       c.status(500);
       return c.json({
         error: "Payment middleware configuration error",
@@ -250,6 +179,7 @@ function paymentMiddleware(config) {
       });
     }
     const paymentHeader = c.req.header(V2_HEADERS.PAYMENT_SIGNATURE);
+    console.log("[payment-middleware] Payment header present:", !!paymentHeader);
     if (!paymentHeader) {
       const resource = {
         url: c.req.url,
@@ -263,6 +193,7 @@ function paymentMiddleware(config) {
         accepts: requirements,
         extensions: config.extensions ? buildExtensions(config.extensions) : void 0
       };
+      console.log("[payment-middleware] Returning 402 with requirements:", JSON.stringify(paymentRequired.accepts, null, 2));
       c.status(402);
       c.header(V2_HEADERS.PAYMENT_REQUIRED, safeBase64Encode(JSON.stringify(paymentRequired)));
       return c.json({
@@ -270,34 +201,65 @@ function paymentMiddleware(config) {
         accepts: requirements
       });
     }
-    const payload = paymentHeader;
+    const primaryRequirement = requirements[0];
+    if (!primaryRequirement) {
+      console.log("[payment-middleware] No requirements configured");
+      c.status(500);
+      return c.json({ error: "Payment middleware configuration error", details: "No payment requirements configured" });
+    }
+    console.log("[payment-middleware] Primary requirement:", JSON.stringify(primaryRequirement, null, 2));
     let parsedPayload;
     try {
-      const decoded = atob(payload);
-      parsedPayload = JSON.parse(decoded);
+      parsedPayload = decodePayloadHeader(paymentHeader, {
+        accepted: primaryRequirement
+      });
     } catch {
-      try {
-        parsedPayload = JSON.parse(payload);
-      } catch {
-        c.status(400);
-        return c.json({ error: "Invalid payment payload" });
-      }
+      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);
+    console.log("[payment-middleware] Facilitator URL:", facilitatorUrl);
+    if (!facilitatorUrl) {
+      console.log("[payment-middleware] No facilitator URL configured");
+      c.status(500);
+      return c.json({ error: "Payment middleware configuration error", message: "Facilitator URL is required for verification" });
+    }
+    console.log("[payment-middleware] Verifying payment with facilitator...");
+    const verifyResult = await verifyPayment(parsedPayload, primaryRequirement, { url: facilitatorUrl });
+    console.log("[payment-middleware] Verify result:", JSON.stringify(verifyResult, null, 2));
+    if (!verifyResult.isValid) {
+      console.log("[payment-middleware] Verification failed:", verifyResult.invalidReason);
+      c.status(402);
+      c.header(V2_HEADERS.PAYMENT_REQUIRED, createPaymentRequiredHeaders(requirements)[V2_HEADERS.PAYMENT_REQUIRED]);
+      return c.json({ error: "Payment verification failed", message: verifyResult.invalidReason });
     }
+    console.log("[payment-middleware] Payment verified, setting payment context");
     c.set("payment", {
       payload: parsedPayload,
-      verified: false
+      payerAddress: verifyResult.payer,
+      verified: true
     });
-    return next();
+    await next();
+    if (c.res.status >= 400) {
+      return;
+    }
+    console.log("[payment-middleware] Settling payment...");
+    const settleResult = await settlePayment(parsedPayload, primaryRequirement, { url: facilitatorUrl });
+    console.log("[payment-middleware] Settle result:", JSON.stringify(settleResult, null, 2));
+    if (!settleResult.success) {
+      console.log("[payment-middleware] Settlement failed:", settleResult.errorReason);
+      c.status(502);
+      c.res = c.json({ error: "Settlement failed", details: settleResult.errorReason }, 502);
+      return;
+    }
+    console.log("[payment-middleware] Payment settled, tx:", settleResult.transaction);
+    const headers = createSettlementHeaders(settleResult);
+    for (const [key, value] of Object.entries(headers)) {
+      c.header(key, value);
+    }
   };
 }
-
-// src/routes.ts
-import {
-  safeBase64Encode as safeBase64Encode2,
-  V2_HEADERS as V2_HEADERS2,
-  matchRoute,
-  validateRouteConfig
-} from "@armory-sh/base";
 var resolveRouteConfig = (config) => {
   const validationError = validateRouteConfig(config);
   if (validationError) {
@@ -342,7 +304,7 @@ var routeAwarePaymentMiddleware = (config) => {
         details: requirementsError.message
       });
     }
-    const paymentHeader = c.req.header(V2_HEADERS2.PAYMENT_SIGNATURE);
+    const paymentHeader = c.req.header(V2_HEADERS.PAYMENT_SIGNATURE);
     if (!paymentHeader) {
       const resource = {
         url: c.req.url,
@@ -357,38 +319,66 @@ var routeAwarePaymentMiddleware = (config) => {
       };
       c.status(402);
       c.header(
-        V2_HEADERS2.PAYMENT_REQUIRED,
-        safeBase64Encode2(JSON.stringify(paymentRequired))
+        V2_HEADERS.PAYMENT_REQUIRED,
+        safeBase64Encode(JSON.stringify(paymentRequired))
       );
       return c.json({
         error: "Payment required",
         accepts: requirements
       });
     }
+    const primaryRequirement = requirements[0];
+    if (!primaryRequirement) {
+      c.status(500);
+      return c.json({ error: "Payment middleware configuration error", details: "No payment requirements configured" });
+    }
     let parsedPayload;
     try {
-      const decoded = atob(paymentHeader);
-      parsedPayload = JSON.parse(decoded);
+      parsedPayload = decodePayloadHeader(paymentHeader, {
+        accepted: primaryRequirement
+      });
     } catch {
-      try {
-        parsedPayload = JSON.parse(paymentHeader);
-      } catch {
-        c.status(400);
-        return c.json({ error: "Invalid payment payload" });
-      }
+      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);
+    if (!facilitatorUrl) {
+      c.status(500);
+      return c.json({ error: "Payment middleware configuration error", message: "Facilitator URL is required for verification" });
+    }
+    const verifyResult = await verifyPayment(parsedPayload, primaryRequirement, { url: facilitatorUrl });
+    if (!verifyResult.isValid) {
+      c.status(402);
+      c.header(V2_HEADERS.PAYMENT_REQUIRED, createPaymentRequiredHeaders(requirements)[V2_HEADERS.PAYMENT_REQUIRED]);
+      return c.json({ error: "Payment verification failed", message: verifyResult.invalidReason });
     }
     c.set("payment", {
       payload: parsedPayload,
-      verified: false,
+      payerAddress: verifyResult.payer,
+      verified: true,
       route: matchedRoute.pattern
     });
-    return next();
+    await next();
+    if (c.res.status >= 400) {
+      return;
+    }
+    const settleResult = await settlePayment(parsedPayload, primaryRequirement, { url: facilitatorUrl });
+    if (!settleResult.success) {
+      c.status(502);
+      c.res = c.json({ error: "Settlement failed", details: settleResult.errorReason }, 502);
+      return;
+    }
+    const headers = createSettlementHeaders(settleResult);
+    for (const [key, value] of Object.entries(headers)) {
+      c.header(key, value);
+    }
   };
 };
 
 // src/index.ts
 var advancedPaymentMiddleware = (config) => {
-  const { requirements, facilitatorUrl, network = "base" } = config;
+  const { requirements, facilitatorUrl } = config;
   return async (c, next) => {
     const paymentHeader = c.req.header(PAYMENT_SIGNATURE_HEADER);
     if (!paymentHeader) {
@@ -402,31 +392,52 @@ var advancedPaymentMiddleware = (config) => {
         accepts: [requirements]
       });
     }
-    let paymentPayload = null;
+    let paymentPayload;
     try {
-      paymentPayload = decodePaymentV2(paymentHeader);
+      paymentPayload = decodePayloadHeader(paymentHeader, {
+        accepted: requirements
+      });
     } catch (e) {
       c.status(400);
       return c.json({ error: "Invalid payment payload", details: String(e) });
     }
-    if (!paymentPayload) {
-      c.status(400);
-      return c.json({ error: "Invalid payment payload" });
+    if (!facilitatorUrl) {
+      c.status(500);
+      return c.json({ error: "Payment middleware configuration error", message: "Facilitator URL is required for verification" });
+    }
+    const verifyResult = await verifyPayment(paymentPayload, requirements, { url: facilitatorUrl });
+    if (!verifyResult.isValid) {
+      const requiredHeaders = createPaymentRequiredHeaders(requirements);
+      c.status(402);
+      for (const [key, value] of Object.entries(requiredHeaders)) {
+        c.header(key, value);
+      }
+      return c.json({
+        error: "Payment verification failed",
+        message: verifyResult.invalidReason
+      });
     }
-    const payerAddress = paymentPayload.payload.authorization.from;
+    const payerAddress = verifyResult.payer ?? paymentPayload.payload.authorization.from;
     c.set("payment", {
       payload: paymentPayload,
       payerAddress,
       verified: true
     });
-    return next();
+    await next();
+    if (c.res.status >= 400) {
+      return;
+    }
+    const settleResult = await settlePayment(paymentPayload, requirements, { url: facilitatorUrl });
+    if (!settleResult.success) {
+      c.status(502);
+      c.res = c.json({ error: "Settlement failed", details: settleResult.errorReason }, 502);
+      return;
+    }
+    const settlementHeaders = createSettlementHeaders(settleResult);
+    for (const [key, value] of Object.entries(settlementHeaders)) {
+      c.header(key, value);
+    }
   };
 };
-export {
-  advancedPaymentMiddleware,
-  buildExtensions,
-  createPaymentRequirements,
-  extractExtension,
-  paymentMiddleware,
-  routeAwarePaymentMiddleware
-};
+
+export { advancedPaymentMiddleware, createPaymentRequirements, paymentMiddleware, routeAwarePaymentMiddleware };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware-hono",
-  "version": "0.3.21",
+  "version": "0.3.22-alpha.3.20",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -26,15 +26,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/thegreataxios/armory.git",
+    "url": "git+https://github.com/TheGreatAxios/armory.git",
     "directory": "packages/middleware-hono"
   },
   "peerDependencies": {
     "hono": "^4"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.21",
-    "@armory-sh/extensions": "0.1.2"
+    "@armory-sh/base": "0.2.22",
+    "@armory-sh/extensions": "0.1.3"
   },
   "devDependencies": {
     "bun-types": "latest",