@armory-sh/middleware 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-import { Address, CAIP2ChainId, CAIPAssetId, PaymentRequirements, SettlementResponse, PaymentPayload, ResolvedPaymentConfig, AcceptPaymentOptions, NetworkId, TokenId, ValidationError } from '@armory-sh/base';
-export { AcceptPaymentOptions, NetworkId, FacilitatorConfig as SimpleFacilitatorConfig, TokenId } from '@armory-sh/base';
-import { VerifyPaymentOptions } from '@armory-sh/facilitator';
+import * as _armory_sh_base from '@armory-sh/base';
+import { Address, CAIP2ChainId, CAIPAssetId, PaymentRequirements as PaymentRequirements$1, X402SettlementResponse, SettlementResponseV1, SettlementResponseV2, X402PaymentPayload, X402PaymentRequirements, ResolvedPaymentConfig, AcceptPaymentOptions, NetworkId, TokenId, ValidationError } from '@armory-sh/base';
+export { AcceptPaymentOptions, NetworkId, PaymentRequirementsV1, PaymentRequirementsV2, SettlementResponseV1, SettlementResponseV2, FacilitatorConfig as SimpleFacilitatorConfig, TokenId } from '@armory-sh/base';
+import { X402VerifyOptions } from '@armory-sh/facilitator';
 
 interface FacilitatorConfig {
     url: string;
@@ -39,16 +40,40 @@ interface FacilitatorSettleResult {
     error?: string;
 }
 
-declare const createPaymentRequirements: (config: MiddlewareConfig, version?: 1 | 2) => PaymentRequirements;
+declare const createPaymentRequirements: (config: MiddlewareConfig, version?: 1 | 2) => PaymentRequirements$1;
 declare const verifyWithFacilitator: (request: HttpRequest, facilitator: FacilitatorConfig) => Promise<FacilitatorVerifyResult>;
 declare const settleWithFacilitator: (request: HttpRequest, facilitator: FacilitatorConfig) => Promise<FacilitatorSettleResult>;
-declare const createPaymentRequiredHeaders: (requirements: PaymentRequirements, version: 1 | 2) => Record<string, string>;
-declare const createSettlementHeaders: (response: SettlementResponse, version: 1 | 2) => Record<string, string>;
+declare const createPaymentRequiredHeaders: (requirements: PaymentRequirements$1, version: 1 | 2) => Record<string, string>;
+/**
+ * Accepts both X402SettlementResponse and legacy SettlementResponseV1/V2
+ * For V1, manually constructs the header. For V2/x402, uses the x402 encoder.
+ */
+declare const createSettlementHeaders: (response: X402SettlementResponse | SettlementResponseV1 | SettlementResponseV2, version: 1 | 2) => Record<string, string>;
 
+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 PaymentVersion = 1 | 2;
 interface PaymentVerificationResult {
     success: boolean;
-    payload?: PaymentPayload;
+    payload?: AnyPaymentPayload;
     version?: PaymentVersion;
     payerAddress?: string;
     error?: string;
@@ -59,14 +84,17 @@ interface PaymentHeaders {
     response: string;
 }
 declare const getHeadersForVersion: (version: PaymentVersion) => PaymentHeaders;
-declare const getRequirementsVersion: (requirements: PaymentRequirements) => PaymentVersion;
-declare const encodeRequirements: (requirements: PaymentRequirements) => string;
+declare const getRequirementsVersion: (requirements: X402PaymentRequirements) => PaymentVersion;
+declare const encodeRequirements: (requirements: X402PaymentRequirements) => string;
 declare const decodePayload: (headerValue: string) => {
-    payload: PaymentPayload;
+    payload: AnyPaymentPayload;
     version: PaymentVersion;
 };
-declare const verifyPaymentWithRetry: (payload: PaymentPayload, requirements: PaymentRequirements, facilitatorUrl?: string, verifyOptions?: VerifyPaymentOptions) => Promise<PaymentVerificationResult>;
-declare const extractPayerAddress: (payload: PaymentPayload) => string;
+declare const verifyPaymentWithRetry: (payload: AnyPaymentPayload, requirements: X402PaymentRequirements, facilitatorUrl?: string, verifyOptions?: X402VerifyOptions) => Promise<PaymentVerificationResult>;
+/**
+ * Extract payer address from various payload formats
+ */
+declare const extractPayerAddress: (payload: AnyPaymentPayload) => string;
 declare const createResponseHeaders: (payerAddress: string, version: PaymentVersion) => Record<string, string>;
 
 /**
@@ -105,7 +133,7 @@ declare const resolveMiddlewareConfig: (config: SimpleMiddlewareConfig) => Resol
 /**
  * Get payment requirements for a specific network/token combination
  */
-declare const getRequirements: (config: ResolvedMiddlewareConfig, network: NetworkId, token: TokenId) => PaymentRequirements | ValidationError;
+declare const getRequirements: (config: ResolvedMiddlewareConfig, network: NetworkId, token: TokenId) => PaymentRequirements$1 | ValidationError;
 /**
  * Get the primary/default middleware config for legacy middlewares
  */
@@ -160,4 +188,7 @@ declare const acceptPaymentsViaArmory: (config: SimpleMiddlewareConfig & {
     waitForSettlement?: boolean;
 }) => BunMiddleware;
 
-export { type BunMiddleware, type BunMiddlewareConfig, type FacilitatorConfig, type FacilitatorSettleResult, type FacilitatorVerifyResult, type HttpRequest, type HttpResponse, type MiddlewareConfig, type PayToAddress, type PaymentVerificationResult, type PaymentVersion, type ResolvedMiddlewareConfig, type SettlementMode, type SimpleMiddlewareConfig, acceptPaymentsViaArmory, createBunMiddleware, createPaymentRequiredHeaders, createPaymentRequirements, createResponseHeaders, createSettlementHeaders, decodePayload, encodeRequirements, extractPayerAddress, getHeadersForVersion, getPrimaryConfig, getRequirements, getRequirementsVersion, getSupportedNetworks, getSupportedTokens, isSupported, resolveMiddlewareConfig, settleWithFacilitator, verifyPaymentWithRetry, verifyWithFacilitator };
+type PaymentRequirements = _armory_sh_base.PaymentRequirementsV1 | _armory_sh_base.PaymentRequirementsV2;
+type SettlementResponse = _armory_sh_base.SettlementResponseV1 | _armory_sh_base.SettlementResponseV2;
+
+export { type AnyPaymentPayload, type BunMiddleware, type BunMiddlewareConfig, type FacilitatorConfig, type FacilitatorSettleResult, type FacilitatorVerifyResult, type HttpRequest, type HttpResponse, type LegacyPaymentPayloadV1, type LegacyPaymentPayloadV2, type MiddlewareConfig, type PayToAddress, type AnyPaymentPayload as PaymentPayload, type PaymentRequirements, type PaymentVerificationResult, type PaymentVersion, type ResolvedMiddlewareConfig, type SettlementMode, type SettlementResponse, type SimpleMiddlewareConfig, acceptPaymentsViaArmory, createBunMiddleware, createPaymentRequiredHeaders, createPaymentRequirements, createResponseHeaders, createSettlementHeaders, decodePayload, encodeRequirements, extractPayerAddress, getHeadersForVersion, getPrimaryConfig, getRequirements, getRequirementsVersion, getSupportedNetworks, getSupportedTokens, isSupported, resolveMiddlewareConfig, settleWithFacilitator, verifyPaymentWithRetry, verifyWithFacilitator };

package/dist/index.js

@@ -1,5 +1,15 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/core.ts
-import { getNetworkConfig, getNetworkByChainId } from "@armory-sh/base";
+import {
+  getNetworkConfig,
+  getNetworkByChainId
+} from "@armory-sh/base";
 var getNetworkName = (network) => {
   if (typeof network === "string") return network;
   const net = getNetworkByChainId(network);
@@ -32,6 +42,9 @@ var createV2Requirements = (config, expiry) => {
   };
 };
 var createPaymentRequirements = (config, version = 1) => {
+  const networkName = getNetworkName(config.network);
+  const network = getNetworkConfig(networkName);
+  if (!network) throw new Error(`Unsupported network: ${networkName}`);
   const expiry = Math.floor(Date.now() / 1e3) + 3600;
   return version === 1 ? createV1Requirements(config, expiry) : createV2Requirements(config, expiry);
 };
@@ -117,32 +130,68 @@ var settleWithFacilitator = async (request, facilitator) => {
     };
   }
 };
-var encode = (data) => btoa(JSON.stringify(data));
 var createPaymentRequiredHeaders = (requirements, version) => {
   if (version === 1) {
-    return { "X-PAYMENT-REQUIRED": encode(requirements) };
+    const { encodePaymentPayload: encodeV1Payload } = __require("@armory-sh/base");
+    return { "X-PAYMENT-REQUIRED": encodeV1Payload(requirements) };
   }
-  return { "PAYMENT-REQUIRED": encode(requirements) };
+  return { "PAYMENT-REQUIRED": Buffer.from(JSON.stringify(requirements)).toString("base64") };
 };
 var createSettlementHeaders = (response, version) => {
   if (version === 1) {
-    return { "X-PAYMENT-RESPONSE": encode(response) };
+    const isSuccess2 = "success" in response ? response.success : response.status === "success";
+    const txHash2 = "transaction" in response ? response.transaction : response.txHash || "";
+    const settlementJson2 = JSON.stringify({
+      status: isSuccess2 ? "success" : "failed",
+      txHash: txHash2 ?? ""
+    });
+    return { "X-PAYMENT-RESPONSE": Buffer.from(settlementJson2).toString("base64") };
   }
-  return { "PAYMENT-RESPONSE": encode(response) };
+  const txHash = "transaction" in response ? response.transaction : response.txHash || "";
+  const isSuccess = "success" in response ? response.success : response.status === "success";
+  const settlementJson = JSON.stringify({
+    status: isSuccess ? "success" : "failed",
+    txHash: txHash || ""
+  });
+  return { "PAYMENT-RESPONSE": Buffer.from(settlementJson).toString("base64") };
 };
 
 // src/payment-utils.ts
-import { decodePayment, detectPaymentVersion, isPaymentV1 } from "@armory-sh/base";
-import { verifyPayment } from "@armory-sh/facilitator";
+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" };
 var getRequirementsVersion = (requirements) => "contractAddress" in requirements && "network" in requirements ? 1 : 2;
 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";
+}
 var decodePayload = (headerValue) => {
+  let parsed;
+  try {
+    if (headerValue.startsWith("{")) {
+      parsed = JSON.parse(headerValue);
+    } else {
+      parsed = JSON.parse(atob(headerValue));
+    }
+  } catch {
+    throw new Error("Invalid payment payload");
+  }
   const headers = new Headers();
-  headers.set(headerValue.startsWith("{") ? "PAYMENT-SIGNATURE" : "X-PAYMENT", headerValue);
-  const payload = decodePayment(headers);
-  const version = detectPaymentVersion(headers) ?? 2;
-  return { payload, version };
+  headers.set(X402_HEADERS.PAYMENT, headerValue);
+  const x402Payload = extractPaymentFromHeaders(headers);
+  if (x402Payload) {
+    return { payload: x402Payload, version: 2 };
+  }
+  if (isLegacyV1(parsed)) {
+    return { payload: parsed, version: 1 };
+  }
+  if (isLegacyV2(parsed)) {
+    return { payload: parsed, version: 2 };
+  }
+  throw new Error("Unrecognized payment payload format");
 };
 var verifyWithFacilitator2 = async (facilitatorUrl, payload, requirements, verifyOptions) => {
   try {
@@ -168,6 +217,12 @@ var verifyWithFacilitator2 = async (facilitatorUrl, payload, requirements, verif
   }
 };
 var verifyLocally = async (payload, requirements, verifyOptions) => {
+  if (isLegacyV1(payload) || isLegacyV2(payload)) {
+    return {
+      success: false,
+      error: "Local verification not supported for legacy payload formats. Use a facilitator."
+    };
+  }
   const result = await verifyPayment(payload, requirements, verifyOptions);
   if (!result.success) {
     return {
@@ -182,7 +237,18 @@ var verifyLocally = async (payload, requirements, verifyOptions) => {
   return { success: true, payerAddress: result.payerAddress };
 };
 var verifyPaymentWithRetry = async (payload, requirements, facilitatorUrl, verifyOptions) => facilitatorUrl ? verifyWithFacilitator2(facilitatorUrl, payload, requirements, verifyOptions) : verifyLocally(payload, requirements, verifyOptions);
-var extractPayerAddress = (payload) => isPaymentV1(payload) ? payload.from : payload.from;
+var extractPayerAddress = (payload) => {
+  if ("payload" in payload) {
+    const x402Payload = payload;
+    if ("authorization" in x402Payload.payload) {
+      return x402Payload.payload.authorization.from;
+    }
+  }
+  if ("from" in payload && typeof payload.from === "string") {
+    return payload.from;
+  }
+  throw new Error("Unable to extract payer address from payload");
+};
 var createResponseHeaders = (payerAddress, version) => ({
   [getHeadersForVersion(version).response]: JSON.stringify({
     status: "verified",
@@ -192,7 +258,7 @@ var createResponseHeaders = (payerAddress, version) => ({
 });
 
 // src/bun.ts
-import { decodePayment as decodePayment2, isV1, isV2 } from "@armory-sh/base";
+import { decodePayment, isExactEvmPayload, X402_HEADERS as X402_HEADERS2 } from "@armory-sh/base";
 
 // src/simple.ts
 import {
@@ -287,17 +353,25 @@ var isSupported = (config, network, token) => {
 
 // src/bun.ts
 var parsePaymentHeader = async (request) => {
+  const x402Sig = request.headers.get(X402_HEADERS2.PAYMENT);
+  if (x402Sig) {
+    try {
+      const payload = decodePayment(x402Sig);
+      if (isExactEvmPayload(payload)) {
+        return { payload, version: 2, payerAddress: payload.payload.authorization.from };
+      }
+    } catch {
+    }
+  }
   const v1 = request.headers.get("X-PAYMENT");
   if (v1) {
-    const headers = new Headers({ "X-PAYMENT": v1 });
-    const payload = decodePayment2(headers);
-    return isV1(payload) ? { payload, version: 1, payerAddress: payload.from } : null;
-  }
-  const v2 = request.headers.get("PAYMENT-SIGNATURE");
-  if (v2) {
-    const headers = new Headers({ "PAYMENT-SIGNATURE": v2 });
-    const payload = decodePayment2(headers);
-    return isV2(payload) ? { payload, version: 2, payerAddress: payload.from } : null;
+    try {
+      const payload = decodePayment(v1);
+      if (isExactEvmPayload(payload)) {
+        return { payload, version: 2, payerAddress: payload.payload.authorization.from };
+      }
+    } catch {
+    }
   }
   return null;
 };
@@ -313,14 +387,14 @@ var errorResponse = (error, status, headers) => new Response(JSON.stringify({ er
   headers: { "Content-Type": "application/json", ...headers }
 });
 var createSettlementResponse = (success, txHash) => ({
-  status: success ? "success" : "failed",
-  txHash,
-  txId: txHash,
-  timestamp: Math.floor(Date.now() / 1e3)
+  success,
+  transaction: txHash ?? "",
+  errorReason: success ? void 0 : "Settlement failed",
+  network: "base"
 });
 var successResponse = (payerAddress, version, settlement) => {
-  const isSuccess = settlement ? "success" in settlement ? settlement.success : settlement.status === "success" : void 0;
-  const txHash = settlement?.txHash;
+  const isSuccess = settlement?.success;
+  const txHash = settlement?.transaction;
   return new Response(
     JSON.stringify({
       verified: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/middleware",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -27,8 +27,8 @@
     "directory": "packages/middleware"
   },
   "dependencies": {
-    "@armory-sh/base": "workspace:*",
-    "@armory-sh/facilitator": "workspace:*"
+    "@armory-sh/base": "0.2.2",
+    "@armory-sh/facilitator": "0.2.2"
   },
   "devDependencies": {
     "typescript": "5.9.3",