uvd-x402-sdk 2.86.0 → 2.87.0

package/dist/backend/index.mjs

@@ -1211,6 +1211,14 @@ function randomNonce() {
   }
   return ethers.hexlify(ethers.randomBytes(32));
 }
+function resolveOrderTiming(params) {
+  const nowSec = params.now === void 0 ? Math.floor(Date.now() / 1e3) : Math.floor(params.now);
+  return {
+    nowSec,
+    deadline: params.deadline === void 0 ? nowSec + LIFECYCLE_DEFAULT_DEADLINE_SECS : Math.floor(params.deadline),
+    nonce: params.nonce === void 0 ? randomNonce() : params.nonce
+  };
+}
 function toUintString(value, field) {
   let n;
   try {
@@ -1224,7 +1232,8 @@ function toUintString(value, field) {
   return n.toString();
 }
 function buildLifecycleTypedData(params) {
-  const { action, paymentInfo, payer, amount, chainId, deadline, nonce } = params;
+  const { action, paymentInfo, payer, amount, chainId } = params;
+  const { deadline, nonce } = resolveOrderTiming(params);
   if (!LIFECYCLE_ACTIONS.includes(action)) {
     throw new X402Error(
       `unknown lifecycle action ${String(action)}; the facilitator only signs ${LIFECYCLE_ACTIONS.join(", ")}`,
@@ -1283,10 +1292,8 @@ function buildLifecycleTypedData(params) {
   };
 }
 async function buildLifecycleAuth(params) {
-  const { wallet, deadline, nonce, now, ...rest } = params;
-  const nowSec = now === void 0 ? Math.floor(Date.now() / 1e3) : Math.floor(now);
-  const dl = deadline === void 0 ? nowSec + LIFECYCLE_DEFAULT_DEADLINE_SECS : Math.floor(deadline);
-  const nonceHex = nonce === void 0 ? randomNonce() : nonce;
+  const { wallet, ...rest } = params;
+  const { nowSec, deadline: dl, nonce: nonceHex } = resolveOrderTiming(params);
   if (dl < nowSec) {
     throw new X402Error(
       `deadline ${dl} is in the past (now ${nowSec}): the facilitator discards it as \`expired\``,
@@ -4257,6 +4264,25 @@ var TIER_TIMINGS = {
   premium: { pre: 14400, auth: 172800, refund: 1209600 },
   enterprise: { pre: 86400, auth: 604800, refund: 2592e3 }
 };
+async function resolveLifecycleAuth(action, options, order) {
+  if (options?.lifecycleSigner && options?.lifecycleAuth) {
+    throw new X402Error(
+      "lifecycleSigner and lifecycleAuth are mutually exclusive: the first signs an order here, the second was already signed elsewhere. Passing both means two different orders exist and only one can travel.",
+      "INVALID_CONFIG"
+    );
+  }
+  if (options?.lifecycleAuth) return options.lifecycleAuth;
+  if (!options?.lifecycleSigner) return void 0;
+  return buildLifecycleAuth({
+    action,
+    paymentInfo: order.paymentInfo,
+    payer: order.payer,
+    amount: order.amount,
+    chainId: order.chainId,
+    wallet: options.lifecycleSigner,
+    deadline: options.lifecycleDeadline
+  });
+}
 var OPERATOR_ABI = [
   "function release(tuple(address operator, address payer, address receiver, address token, uint120 maxAmount, uint48 preApprovalExpiry, uint48 authorizationExpiry, uint48 refundExpiry, uint16 minFeeBps, uint16 maxFeeBps, address feeReceiver, uint256 salt) paymentInfo, uint256 amount)",
   "function refundInEscrow(tuple(address operator, address payer, address receiver, address token, uint120 maxAmount, uint48 preApprovalExpiry, uint48 authorizationExpiry, uint48 refundExpiry, uint16 minFeeBps, uint16 maxFeeBps, address feeReceiver, uint256 salt) paymentInfo, uint120 amount)",
@@ -4667,6 +4693,13 @@ var AdvancedEscrowClient = class {
    *   lifecycleSigner: payerWallet,   // EnvKeyAdapter, OWS, wagmiLifecycleSigner(...)
    * });
    * ```
+   *
+   * @example Transporting an order the publisher signed in their browser
+   * ```typescript
+   * // The browser sent back a signature over a document THIS backend built.
+   * const lifecycleAuth = lifecycleAuthFromSignature(typedData, signature, payer);
+   * await client.releaseViaFacilitator(pi, amount, { lifecycleAuth });
+   * ```
    */
   async releaseViaFacilitator(paymentInfo, amount, options) {
     if (!this.payerAddress) await this.init();
@@ -4685,15 +4718,12 @@ var AdvancedEscrowClient = class {
         salt: paymentInfo.salt
       };
       const releaseAmount = amount || paymentInfo.maxAmount;
-      const lifecycleAuth = options?.lifecycleSigner ? await buildLifecycleAuth({
-        action: "release",
+      const lifecycleAuth = await resolveLifecycleAuth("release", options, {
         paymentInfo: wirePaymentInfo,
         payer: this.payerAddress,
         amount: releaseAmount,
-        chainId: this.chainId,
-        wallet: options.lifecycleSigner,
-        deadline: options.lifecycleDeadline
-      }) : void 0;
+        chainId: this.chainId
+      });
       const payload = {
         x402Version: 2,
         scheme: "escrow",
@@ -4822,15 +4852,12 @@ var AdvancedEscrowClient = class {
         salt: paymentInfo.salt
       };
       const refundAmount = amount || paymentInfo.maxAmount;
-      const lifecycleAuth = options?.lifecycleSigner ? await buildLifecycleAuth({
-        action: "refundInEscrow",
+      const lifecycleAuth = await resolveLifecycleAuth("refundInEscrow", options, {
         paymentInfo: wirePaymentInfo,
         payer: this.payerAddress,
         amount: refundAmount,
-        chainId: this.chainId,
-        wallet: options.lifecycleSigner,
-        deadline: options.lifecycleDeadline
-      }) : void 0;
+        chainId: this.chainId
+      });
       const payload = {
         x402Version: 2,
         scheme: "escrow",