@armory-sh/middleware-hono 0.3.13 → 0.3.14

package/dist/index.d.ts

@@ -59,7 +59,7 @@ declare const acceptPaymentsViaArmory: (config: SimpleMiddlewareConfig & {
 }) => (c: Context, next: Next) => Promise<(Response & hono.TypedResponse<{
     error: string;
     x402Version: number;
-    requirements: {
+    accepts: ({
         scheme: "exact";
         network: X402V1Network;
         maxAmountRequired: string;
@@ -89,7 +89,7 @@ declare const acceptPaymentsViaArmory: (config: SimpleMiddlewareConfig & {
         contractAddress: string;
         payTo: string;
         expiry: number;
-    };
+    })[];
 }, hono_utils_http_status.ContentfulStatusCode, "json">) | (Response & hono.TypedResponse<{
     error: string;
     x402Version: PaymentVersion;

package/dist/index.js

@@ -298,7 +298,6 @@ var getPrimaryConfig = (resolved) => {
 
 // src/payment-utils.ts
 import { extractPaymentFromHeaders, X402_HEADERS } from "@armory-sh/base";
-import { verifyX402Payment as verifyPayment } from "@armory-sh/facilitator";
 var getHeadersForVersion = (version) => version === 1 ? { payment: "X-PAYMENT", required: "X-PAYMENT-REQUIRED", response: "X-PAYMENT-RESPONSE" } : { payment: "PAYMENT-SIGNATURE", required: "PAYMENT-REQUIRED", response: "PAYMENT-RESPONSE" };
 function isLegacyV1(payload) {
   return typeof payload === "object" && payload !== null && "contractAddress" in payload && "network" in payload && "signature" in payload && typeof payload.signature === "string";
@@ -308,17 +307,36 @@ function isLegacyV2(payload) {
 }
 var decodePayload = (headerValue) => {
   let parsed;
+  let isJsonString = false;
   try {
     if (headerValue.startsWith("{")) {
       parsed = JSON.parse(headerValue);
+      isJsonString = true;
     } else {
-      parsed = JSON.parse(atob(headerValue));
+      try {
+        parsed = JSON.parse(atob(headerValue));
+      } catch {
+        const padding = 4 - headerValue.length % 4;
+        const padded = padding !== 4 ? headerValue + "=".repeat(padding) : headerValue;
+        const standard = padded.replace(/-/g, "+").replace(/_/g, "/");
+        parsed = JSON.parse(atob(standard));
+      }
     }
   } catch {
     throw new Error("Invalid payment payload");
   }
+  if (typeof parsed === "object" && parsed !== null && "x402Version" in parsed) {
+    const version = parsed.x402Version;
+    if (version === 1) {
+      return { payload: parsed, version: 1 };
+    }
+    if (version === 2) {
+      return { payload: parsed, version: 2 };
+    }
+  }
+  const base64Value = isJsonString ? Buffer.from(headerValue).toString("base64") : headerValue;
   const headers = new Headers();
-  headers.set(X402_HEADERS.PAYMENT, headerValue);
+  headers.set(X402_HEADERS.PAYMENT, base64Value);
   const x402Payload = extractPaymentFromHeaders(headers);
   if (x402Payload) {
     return { payload: x402Payload, version: 2 };
@@ -372,7 +390,7 @@ var acceptPaymentsViaArmory = (config) => {
     );
   };
   return async (c, next) => {
-    const paymentHeader = c.req.header(V1_HEADERS2.PAYMENT) || c.req.header(V2_HEADERS2.PAYMENT_SIGNATURE) || c.req.header("X-Payment");
+    const paymentHeader = c.req.header(V1_HEADERS2.PAYMENT) || c.req.header(V2_HEADERS2.PAYMENT_SIGNATURE) || c.req.header("X-PAYMENT");
     const resourceUrl = c.req.url;
     if (!paymentHeader) {
       const version = defaultVersion === 1 ? 1 : 2;
@@ -385,7 +403,7 @@ var acceptPaymentsViaArmory = (config) => {
       return c.json({
         error: "Payment required",
         x402Version: version,
-        requirements
+        accepts: [requirements]
       });
     }
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware-hono",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -28,8 +28,7 @@
     "hono": "^4"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.12",
-    "@armory-sh/facilitator": "0.2.12"
+    "@armory-sh/base": "workspace:*"
   },
   "devDependencies": {
     "bun-types": "latest",
@@ -37,8 +36,8 @@
     "hono": "^4"
   },
   "scripts": {
-    "build": "tsup",
-    "build:dts": "tsc --declaration --skipLibCheck",
+    "build": "rm -rf dist && tsup",
+    "build:dts": "rm -rf dist && tsc --declaration --skipLibCheck",
     "test": "bun test"
   }
 }