@armory-sh/middleware-elysia 0.3.12 → 0.3.13

package/dist/index.d.ts

@@ -1,38 +1,14 @@
 import { Elysia } from 'elysia';
 import { X402PaymentPayload, X402PaymentRequirements } from '@armory-sh/base';
 
-interface LegacyPaymentPayloadV1 {
-    amount: string;
-    network: string;
-    contractAddress: string;
-    payTo: string;
-    from: string;
-    expiry: number;
-    signature: string;
-}
-interface LegacyPaymentPayloadV2 {
-    to: string;
-    from: string;
-    amount: string;
-    chainId: string;
-    assetId: string;
-    nonce: string;
-    expiry: number;
-    signature: string;
-}
-type AnyPaymentPayload = X402PaymentPayload | LegacyPaymentPayloadV1 | LegacyPaymentPayloadV2;
-type PaymentPayload = AnyPaymentPayload;
-
 interface PaymentMiddlewareConfig {
     requirements: X402PaymentRequirements;
     facilitatorUrl?: string;
     skipVerification?: boolean;
-    defaultVersion?: 1 | 2;
 }
 interface PaymentInfo {
-    payload: PaymentPayload;
+    payload: X402PaymentPayload;
     payerAddress: string;
-    version: 1 | 2;
     verified: boolean;
 }
 interface PaymentContext {

package/dist/index.js

@@ -2,13 +2,13 @@
 import { Elysia } from "elysia";
 
 // src/payment-utils.ts
-import { extractPaymentFromHeaders, X402_HEADERS } from "@armory-sh/base";
-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" };
-var getRequirementsVersion = (requirements) => "contractAddress" in requirements && "network" in requirements ? 1 : 2;
+import { extractPaymentFromHeaders, PAYMENT_SIGNATURE_HEADER } from "@armory-sh/base";
+var PAYMENT_HEADERS = {
+  PAYMENT: "PAYMENT-SIGNATURE",
+  REQUIRED: "PAYMENT-REQUIRED",
+  RESPONSE: "PAYMENT-RESPONSE"
+};
 var encodeRequirements = (requirements) => JSON.stringify(requirements);
-function isLegacyV1(payload) {
-  return typeof payload === "object" && payload !== null && "contractAddress" in payload && "network" in payload && "signature" in payload && typeof payload.signature === "string";
-}
 function isLegacyV2(payload) {
   return typeof payload === "object" && payload !== null && "chainId" in payload && "assetId" in payload && "signature" in payload && typeof payload.signature === "string";
 }
@@ -27,16 +27,13 @@ var decodePayload = (headerValue) => {
   }
   const base64Value = isJsonString ? Buffer.from(headerValue).toString("base64") : headerValue;
   const headers = new Headers();
-  headers.set(X402_HEADERS.PAYMENT, base64Value);
+  headers.set(PAYMENT_SIGNATURE_HEADER, base64Value);
   const x402Payload = extractPaymentFromHeaders(headers);
   if (x402Payload) {
-    return { payload: x402Payload, version: 2 };
-  }
-  if (isLegacyV1(parsed)) {
-    return { payload: parsed, version: 1 };
+    return { payload: x402Payload };
   }
   if (isLegacyV2(parsed)) {
-    return { payload: parsed, version: 2 };
+    return { payload: parsed };
   }
   throw new Error("Unrecognized payment payload format");
 };
@@ -64,10 +61,10 @@ var verifyWithFacilitator = async (facilitatorUrl, payload, requirements) => {
   }
 };
 var verifyLocally = async (payload, requirements) => {
-  if (isLegacyV1(payload) || isLegacyV2(payload)) {
+  if (isLegacyV2(payload)) {
     return {
       success: false,
-      error: "Local verification not supported for legacy payload formats. Use a facilitator."
+      error: "Local verification not supported for legacy payload format. Use a facilitator."
     };
   }
   return {
@@ -88,11 +85,10 @@ var extractPayerAddress = (payload) => {
   }
   throw new Error("Unable to extract payer address from payload");
 };
-var createResponseHeaders = (payerAddress, version) => ({
-  [getHeadersForVersion(version).response]: JSON.stringify({
+var createResponseHeaders = (payerAddress) => ({
+  [PAYMENT_HEADERS.RESPONSE]: JSON.stringify({
     status: "verified",
-    payerAddress,
-    version
+    payerAddress
   })
 });
 
@@ -102,56 +98,38 @@ var errorResponse = (error, status, headers) => new Response(JSON.stringify(erro
   headers: { "Content-Type": "application/json", ...headers }
 });
 var paymentMiddleware = (config) => {
-  const { requirements, facilitatorUrl, skipVerification = false, defaultVersion } = config;
-  const version = defaultVersion ?? getRequirementsVersion(requirements);
-  const headers = getHeadersForVersion(version);
+  const { requirements, facilitatorUrl, skipVerification = false } = config;
   return new Elysia({ name: "armory-payment" }).derive(() => ({
     payment: void 0
   })).onBeforeHandle(async ({ payment, request }) => {
     try {
-      const paymentHeader = request.headers.get(headers.payment);
+      const paymentHeader = request.headers.get(PAYMENT_HEADERS.PAYMENT);
       if (!paymentHeader) {
-        const requiredValue = version === 1 ? Buffer.from(JSON.stringify(requirements)).toString("base64") : JSON.stringify({
-          x402Version: version,
-          resource: {
-            url: request.url,
-            description: "API Access"
-          },
-          accepts: [requirements]
-        });
         return errorResponse(
           { error: "Payment required", accepts: [requirements] },
           402,
-          { [headers.required]: requiredValue }
+          { [PAYMENT_HEADERS.REQUIRED]: encodeRequirements(requirements) }
         );
       }
       let payload;
-      let payloadVersion;
       try {
-        ({ payload, version: payloadVersion } = decodePayload(paymentHeader));
+        ({ payload } = decodePayload(paymentHeader));
       } catch (error) {
         return errorResponse({
           error: "Invalid payment payload",
           message: error instanceof Error ? error.message : "Unknown error"
         }, 400);
       }
-      if (payloadVersion !== version) {
-        return errorResponse({
-          error: "Payment version mismatch",
-          expected: version,
-          received: payloadVersion
-        }, 400);
-      }
       const verifyResult = skipVerification ? { success: true, payerAddress: extractPayerAddress(payload) } : await verifyPaymentWithRetry(payload, requirements, facilitatorUrl);
       if (!verifyResult.success) {
         return errorResponse(
           { error: verifyResult.error },
           402,
-          { [headers.required]: encodeRequirements(requirements) }
+          { [PAYMENT_HEADERS.REQUIRED]: encodeRequirements(requirements) }
         );
       }
       const payerAddress = verifyResult.payerAddress;
-      payment = { payload, payerAddress, version, verified: !skipVerification };
+      payment = { payload, payerAddress, verified: !skipVerification };
     } catch (error) {
       return errorResponse({
         error: "Payment middleware error",
@@ -160,9 +138,9 @@ var paymentMiddleware = (config) => {
     }
   }).onAfterHandle(({ payment }) => {
     if (payment) {
-      const { payerAddress, version: version2 } = payment;
+      const { payerAddress } = payment;
       return {
-        headers: createResponseHeaders(payerAddress, version2)
+        headers: createResponseHeaders(payerAddress)
       };
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware-elysia",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",