@faremeter/payment-solana 0.15.0 → 0.16.0

package/dist/src/exact/facilitator.d.ts

@@ -1,7 +1,28 @@
+import { x402PaymentRequirements, type x402PaymentPayload, type x402SettleResponse, type x402VerifyResponse } from "@faremeter/types/x402";
 import type { FacilitatorHandler } from "@faremeter/types/facilitator";
+import { fetchMint } from "@solana-program/token";
 import { type Rpc, type SolanaRpcApi } from "@solana/kit";
 import type { TransactionError } from "@solana/rpc-types";
 import { Keypair, PublicKey } from "@solana/web3.js";
+import { logger } from "./logger.js";
+export interface HookBaseArgs {
+    network: string;
+    rpc: Rpc<SolanaRpcApi>;
+    feePayerKeypair: Keypair;
+    mint: PublicKey;
+    mintInfo: Awaited<ReturnType<typeof fetchMint>>;
+    requirements: x402PaymentRequirements;
+    payment: x402PaymentPayload;
+    logger: typeof logger;
+}
+export type HookResponseArgs<Response> = HookBaseArgs & {
+    response: Response;
+};
+export type HookResponseFuncs<Response> = (args: HookResponseArgs<Response>) => Promise<Response> | Promise<void>;
+export interface FacilitatorHooks {
+    afterVerify?: HookResponseFuncs<x402VerifyResponse>;
+    afterSettle?: HookResponseFuncs<x402SettleResponse>;
+}
 export declare const PaymentRequirementsExtraFeatures: import("arktype/internal/methods/object.ts").ObjectType<{
     xSettlementAccountSupported?: boolean;
 }, {}>;
@@ -21,6 +42,7 @@ interface FacilitatorOptions {
     features?: {
         enableSettlementAccounts?: boolean;
     };
+    hooks?: readonly FacilitatorHooks[];
 }
 export declare const PaymentPayloadTransaction: import("arktype/internal/methods/object.ts").ObjectType<{
     transaction: (In: string) => import("arktype").Out<Readonly<{

package/dist/src/exact/facilitator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,EAYL,KAAK,GAAG,EACR,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAMrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAerD,eAAO,MAAM,gCAAgC;;MAE3C,CAAC;AAEH,MAAM,MAAM,gCAAgC,GAC1C,OAAO,gCAAgC,CAAC,KAAK,CAAC;AAEhD,eAAO,MAAM,wBAAwB;;;;;;;MAKnC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC;CACH;AASD,eAAO,MAAM,yBAAyB;;;;;MAEpC,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAC,KAAK,CAAC;AAE/E,eAAO,MAAM,+BAA+B;;;MAK1C,CAAC;AACH,MAAM,MAAM,+BAA+B,GACzC,OAAO,+BAA+B,CAAC,KAAK,CAAC;AAE/C,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,OAAO,CAAC,kBAAkB,CA+T5B,CAAC"}
+{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAExB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAYL,KAAK,GAAG,EACR,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAMrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAYlC,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAChD,YAAY,EAAE,uBAAuB,CAAC;IACtC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,OAAO,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,CAAC,QAAQ,IAAI,YAAY,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,iBAAiB,CAAC,QAAQ,IAAI,CACxC,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,KAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,gCAAgC;;MAE3C,CAAC;AAEH,MAAM,MAAM,gCAAgC,GAC1C,OAAO,gCAAgC,CAAC,KAAK,CAAC;AAEhD,eAAO,MAAM,wBAAwB;;;;;;;MAKnC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC;IACF,KAAK,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;CACrC;AASD,eAAO,MAAM,yBAAyB;;;;;MAEpC,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAC,KAAK,CAAC;AAE/E,eAAO,MAAM,+BAA+B;;;MAK1C,CAAC;AACH,MAAM,MAAM,+BAA+B,GACzC,OAAO,+BAA+B,CAAC,KAAK,CAAC;AAE/C,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,OAAO,CAAC,kBAAkB,CA+X5B,CAAC"}

package/dist/src/exact/facilitator.js

@@ -50,7 +50,7 @@ const sendTransaction = async (rpc, signedTransaction, maxRetries, retryDelayMs)
     })
         .send();
     if (simResult.value.err) {
-        logger.error("transaction simulation failed: {*}", simResult.value);
+        logger.error("transaction simulation failed", simResult.value);
         return { success: false, error: "Transaction simulation failed" };
     }
     const signature = await rpc
@@ -78,6 +78,14 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
     const { isMatchingRequirement } = generateMatcher(network, mint.toBase58());
     const { maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = config ?? {};
     const mintInfo = await fetchMint(rpc, address(mint.toBase58()));
+    const hookArgs = {
+        network,
+        rpc,
+        feePayerKeypair,
+        mint,
+        mintInfo,
+        logger,
+    };
     const features = {};
     if (config?.features?.enableSettlementAccounts) {
         features.xSettlementAccountSupported = true;
@@ -101,7 +109,7 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
         const { value: accountBalance } = await rpc
             .getTokenAccountBalance(settleATA, { commitment: "confirmed" })
             .send();
-        logger.debug("settlement account info: {*}", {
+        logger.debug("settlement account info", {
             settleOwner,
             settleATA,
             accountBalance,
@@ -244,7 +252,29 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
         if ("error" in verifyResult) {
             return errorResponse(verifyResult.error);
         }
-        return { isValid: true };
+        let response = { isValid: true };
+        const hooks = config?.hooks;
+        if (hooks !== undefined) {
+            const args = {
+                ...hookArgs,
+                requirements,
+                payment,
+                response,
+            };
+            for (const hook of hooks) {
+                if (hook.afterVerify === undefined) {
+                    continue;
+                }
+                const res = await hook.afterVerify({
+                    ...args,
+                    response,
+                });
+                if (res !== undefined) {
+                    response = res;
+                }
+            }
+        }
+        return response;
     };
     const handleSettle = async (requirements, payment) => {
         if (!isMatchingRequirement(requirements)) {
@@ -278,12 +308,34 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
         if (!result.success) {
             return errorResponse(result.error);
         }
-        return {
+        let response = {
             success: true,
             error: null,
             txHash: result.signature,
             networkId: payment.network,
         };
+        const hooks = config?.hooks;
+        if (hooks !== undefined) {
+            const args = {
+                ...hookArgs,
+                requirements,
+                payment,
+                response,
+            };
+            for (const hook of hooks) {
+                if (hook.afterSettle === undefined) {
+                    continue;
+                }
+                const res = await hook.afterSettle({
+                    ...args,
+                    response,
+                });
+                if (res !== undefined) {
+                    response = res;
+                }
+            }
+        }
+        return response;
     };
     return {
         getSupported,

package/dist/src/exact/logger.d.ts

@@ -1,2 +1,2 @@
-export declare const logger: import("@logtape/logtape").Logger;
+export declare const logger: import("@faremeter/logs").Logger;
 //# sourceMappingURL=logger.d.ts.map

package/dist/src/exact/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/exact/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,mCAAmD,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/exact/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,kCAAyD,CAAC"}

package/dist/src/exact/logger.js

@@ -1,2 +1,2 @@
-import { getLogger } from "@logtape/logtape";
-export const logger = getLogger(["faremeter", "payment-solana-exact"]);
+import { getLogger } from "@faremeter/logs";
+export const logger = await getLogger(["faremeter", "payment-solana-exact"]);