@armory-sh/client-ethers 0.2.26-alpha.23.77 → 0.2.26-alpha.23.78

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { NetworkId, TokenId, ArmoryPaymentResult, ValidationError, X402ClientErr
 export { PaymentException as PaymentError, SigningError, X402ClientError } from '@armory-sh/base';
 import { Signer, Provider } from 'ethers';
 export { Provider, Signer } from 'ethers';
+import { ClientHook } from '@armory-sh/base/types/hooks';
 
 /**
  * Simple one-line payment API for Armory (Ethers)
@@ -140,6 +141,7 @@ interface X402ClientConfig {
     domainName?: string;
     /** Override EIP-712 domain version for custom tokens */
     domainVersion?: string;
+    hooks?: ClientHook<Signer>[];
 }
 interface SignerClientConfig extends X402ClientConfig {
     signer: Signer;
@@ -159,6 +161,7 @@ interface X402TransportConfig {
     onPaymentRequired?: (requirements: unknown) => boolean | Promise<boolean>;
     onPaymentSuccess?: (settlement: unknown) => void;
     onPaymentError?: (error: Error) => void;
+    hooks?: ClientHook<Signer>[];
 }
 interface X402RequestInit extends Omit<RequestInit, "headers"> {
     headers?: Record<string, string> | Headers;
@@ -272,7 +275,7 @@ declare function detectX402Version(_response: Response): 2;
 declare function getPaymentHeaderName(_version: 2): string;
 interface ParsedPaymentRequirements {
     version: 2;
-    requirements: PaymentRequirementsV2;
+    accepts: PaymentRequirementsV2[];
 }
 /**
  * Parse x402 PAYMENT-REQUIRED header from response
@@ -282,7 +285,7 @@ declare function parsePaymentRequired(response: Response): ParsedPaymentRequirem
 /**
  * Create x402 payment payload (V2-only wrapper)
  */
-declare function createX402Payment(signer: Signer, parsed: ParsedPaymentRequirements, fromAddress: Address, nonce?: `0x${string}`, validBefore?: number, domainName?: string, domainVersion?: string): Promise<PaymentPayloadV2>;
+declare function createX402Payment(signer: Signer, requirement: PaymentRequirementsV2, fromAddress: Address, nonce?: `0x${string}`, validBefore?: number, domainName?: string, domainVersion?: string): Promise<PaymentPayloadV2>;
 
 interface X402Transport {
     fetch(url: string, init?: X402RequestInit): Promise<Response>;

package/dist/index.js

@@ -1,5 +1,6 @@
 import { X402ClientError, createEIP712Domain, V2_HEADERS, PaymentException, isX402V2PaymentRequired, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, normalizeBase64Url, decodeBase64ToUtf8, getNetworkConfig, normalizeNetworkName, encodePaymentV2, decodeSettlementV2 } from '@armory-sh/base';
 export { PaymentException as PaymentError, SigningError, X402ClientError } from '@armory-sh/base';
+import { runOnPaymentRequiredHooks, selectRequirementWithHooks, runBeforeSignPaymentHooks, runAfterPaymentResponseHooks } from '@armory-sh/base/client-hooks-runtime';
 import { ethers } from 'ethers';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -142,7 +143,7 @@ function parsePaymentRequired(response) {
     }
     return {
       version: 2,
-      requirements: parsed.accepts[0]
+      accepts: parsed.accepts
     };
   } catch (error) {
     if (error instanceof PaymentException) throw error;
@@ -203,12 +204,12 @@ async function createX402V2Payment(signer, requirements, fromAddress, nonce, val
     payload
   };
 }
-async function createX402Payment(signer, parsed, fromAddress, nonce, validBefore, domainName, domainVersion) {
+async function createX402Payment(signer, requirement, fromAddress, nonce, validBefore, domainName, domainVersion) {
   const effectiveNonce = nonce ?? createNonce();
   const effectiveValidBefore = validBefore ?? Math.floor(Date.now() / 1e3) + 3600;
   return createX402V2Payment(
     signer,
-    parsed.requirements,
+    requirement,
     fromAddress,
     effectiveNonce,
     effectiveValidBefore,
@@ -229,7 +230,8 @@ var defaultConfig = {
   onPaymentSuccess: () => {
   },
   onPaymentError: () => {
-  }
+  },
+  hooks: []
 };
 var createState = (config) => ({
   config: { ...defaultConfig, ...config }
@@ -250,11 +252,11 @@ var fetchWithTimeout = async (url, init, timeout) => {
   }
 };
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var getRequirementDomainOverrides = (parsed) => {
-  const requirement = parsed.requirements;
+var getRequirementDomainOverrides = (_parsed, requirement) => {
   const extra = requirement.extra;
-  const extraName = extra && typeof extra === "object" && typeof extra.name === "string" ? extra.name : void 0;
-  const extraVersion = extra && typeof extra === "object" && typeof extra.version === "string" ? extra.version : void 0;
+  const extraRecord = extra && typeof extra === "object" ? extra : void 0;
+  const extraName = extraRecord && typeof extraRecord.name === "string" ? extraRecord.name : void 0;
+  const extraVersion = extraRecord && typeof extraRecord.version === "string" ? extraRecord.version : void 0;
   return {
     domainName: requirement.name ?? extraName,
     domainVersion: requirement.version ?? extraVersion
@@ -268,17 +270,46 @@ var handlePaymentRequired = async (state, response) => {
   }
   try {
     const parsed = parsePaymentRequired(response);
+    const initialRequirement = parsed.accepts[0];
+    if (!initialRequirement) {
+      throw new Error("No payment requirements found in accepts array");
+    }
     const from = await state.signer.getAddress();
-    const requirementDomain = getRequirementDomainOverrides(parsed);
+    const paymentRequiredContext = {
+      url: response.url,
+      requestInit: void 0,
+      accepts: parsed.accepts,
+      requirements: initialRequirement,
+      selectedRequirement: initialRequirement,
+      serverExtensions: void 0,
+      fromAddress: from,
+      nonce: `0x${Date.now().toString(16).padStart(64, "0")}`,
+      validBefore: Math.floor(Date.now() / 1e3) + initialRequirement.maxTimeoutSeconds
+    };
+    await runOnPaymentRequiredHooks(state.config.hooks, paymentRequiredContext);
+    const selectedRequirement = await selectRequirementWithHooks(
+      state.config.hooks,
+      paymentRequiredContext
+    );
+    const requirementDomain = getRequirementDomainOverrides(
+      parsed,
+      selectedRequirement
+    );
     const payload = await createX402Payment(
       state.signer,
-      parsed,
+      selectedRequirement,
       from,
-      void 0,
-      Math.floor(Date.now() / 1e3) + parsed.requirements.maxTimeoutSeconds,
+      paymentRequiredContext.nonce,
+      paymentRequiredContext.validBefore,
       requirementDomain.domainName,
       requirementDomain.domainVersion
     );
+    await runBeforeSignPaymentHooks(state.config.hooks, {
+      payload,
+      requirements: selectedRequirement,
+      wallet: state.signer,
+      paymentContext: paymentRequiredContext
+    });
     const encoded = encodePaymentV2(payload);
     const headerName = getPaymentHeaderName(parsed.version);
     const paymentResponse = await fetchWithTimeout(
@@ -292,6 +323,13 @@ var handlePaymentRequired = async (state, response) => {
     const settlement = decodeSettlementV2(
       paymentResponse.headers.get(V2_HEADERS.PAYMENT_RESPONSE) || ""
     );
+    await runAfterPaymentResponseHooks(state.config.hooks, {
+      payload,
+      requirements: selectedRequirement,
+      wallet: state.signer,
+      paymentContext: paymentRequiredContext,
+      response: paymentResponse
+    });
     return { success: true, settlement };
   } catch (error) {
     return {
@@ -303,7 +341,7 @@ var handlePaymentRequired = async (state, response) => {
 var shouldRetryPayment = async (state, response) => {
   if (!state.config.autoPay) return false;
   const parsed = parsePaymentRequired(response);
-  return await state.config.onPaymentRequired(parsed.requirements);
+  return await state.config.onPaymentRequired(parsed.accepts[0]);
 };
 var x402Fetch = async (state, url, init = {}) => {
   const fullUrl = state.config.baseURL ? new URL(url, state.config.baseURL).toString() : url;
@@ -571,7 +609,9 @@ var createArmory = (config) => {
 
 // src/client.ts
 function createX402Client(config) {
-  const transport = createX402Transport(void 0);
+  const transport = createX402Transport({
+    hooks: config.hooks
+  });
   if ("signer" in config && config.signer) {
     transport.setSigner(config.signer);
   } else if ("provider" in config && config.provider) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/client-ethers",
-  "version": "0.2.26-alpha.23.77",
+  "version": "0.2.26-alpha.23.78",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "keywords": [
@@ -47,7 +47,7 @@
     "directory": "packages/client-ethers"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.27-alpha.23.77",
+    "@armory-sh/base": "0.2.27-alpha.23.78",
     "ethers": "6.16.0"
   },
   "devDependencies": {