@bosonprotocol/x402-server 0.2.0 → 0.3.0-alpha-0

package/dist/cjs/handlers/index.js

@@ -60,6 +60,21 @@ function emitNextActions(input, registry, facilitatorUrl) {
   };
 }
 
+// src/handlers/fulfillment-result.ts
+function serializeFulfillmentResult(result) {
+  if (result.kind === "inline") {
+    return {
+      kind: "inline",
+      body: Buffer.from(result.body).toString("base64"),
+      contentType: result.contentType
+    };
+  }
+  return {
+    kind: "async",
+    ...result.pointer !== void 0 ? { pointer: result.pointer } : {}
+  };
+}
+
 // src/handlers/types.ts
 function handlerOk(body) {
   return { ok: true, status: 200, body };
@@ -578,6 +593,18 @@ var FacilitatorHttpError = class extends Error {
   }
 };
 
+// src/logger.ts
+var noopLogger = {
+  debug: () => {
+  },
+  info: () => {
+  },
+  warn: () => {
+  },
+  error: () => {
+  }
+};
+
 // src/handlers/commit-and-redeem.ts
 async function handleCommit(input, ctx) {
   return await handleCommitImpl(input, ctx, {
@@ -592,6 +619,7 @@ async function handleCommitAndRedeem(input, ctx) {
   });
 }
 async function handleCommitImpl(input, ctx, expected) {
+  const logger = ctx.logger ?? noopLogger;
   const decoded = decodeXPaymentHeader(input.paymentHeader);
   if (!decoded.ok) {
     const status = decoded.code === "MISSING_HEADER" ? 402 : 400;
@@ -680,28 +708,38 @@ async function handleCommitImpl(input, ctx, expected) {
     );
   }
   if (expected.expectedState === x402Actions.ExchangeState.COMMITTED) {
-    ctx.exchangeFulfillmentOptionStore.set(
+    await ctx.exchangeFulfillmentOptionStore.set(
       settleResult.exchangeId,
       input.requirements.fulfillment?.options.map((option) => option.id) ?? []
     );
   }
   const warnings = [];
+  let delivery;
   if (expected.expectedState === x402Actions.ExchangeState.REDEEMED && decoded.payload.fulfillment !== void 0 && decoded.payload.fulfillment.data !== void 0) {
     const pending = {
       exchangeId: settleResult.exchangeId,
       option: decoded.payload.fulfillment.option,
       data: decoded.payload.fulfillment.data,
       redeemer: decoded.payload.payload.buyer,
-      recordedAt: Date.now()
+      recordedAt: Date.now(),
+      phase: "commit"
     };
-    ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, pending);
+    await ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, pending);
+    logger.debug("x402-server: fulfillment recovery entry recorded (Flow B)", {
+      exchangeId: settleResult.exchangeId,
+      option: decoded.payload.fulfillment.option
+    });
     const channel = channelById.get(decoded.payload.fulfillment.option);
     if (channel === void 0) {
       const reason = "no channel adapter is registered";
-      ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, {
+      await ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, {
         ...pending,
         error: reason
       });
+      logger.error("x402-server: Flow B channel adapter missing post-settle", {
+        exchangeId: settleResult.exchangeId,
+        option: decoded.payload.fulfillment.option
+      });
       warnings.push({
         code: "FULFILLMENT_COMMIT_DEFERRED",
         reason: "atomic redeem succeeded on-chain, but no channel adapter is registered",
@@ -714,13 +752,54 @@ async function handleCommitImpl(input, ctx, expected) {
     } else {
       try {
         await channel.onCommit(settleResult.exchangeId, decoded.payload.fulfillment.data);
-        ctx.fulfillmentRecoveryStore.delete(settleResult.exchangeId);
+        if (channel.onFulfill !== void 0) {
+          const deliveryPending = {
+            ...pending,
+            phase: "delivery",
+            recordedAt: Date.now()
+          };
+          await ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, deliveryPending);
+          try {
+            delivery = serializeFulfillmentResult(await channel.onFulfill(settleResult.exchangeId));
+            await ctx.fulfillmentRecoveryStore.delete(settleResult.exchangeId);
+            logger.debug("x402-server: Flow B channel onCommit succeeded", {
+              exchangeId: settleResult.exchangeId,
+              option: decoded.payload.fulfillment.option
+            });
+          } catch (e) {
+            const reason = e instanceof Error ? e.message : String(e);
+            await ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, {
+              ...deliveryPending,
+              error: reason
+            });
+            warnings.push({
+              code: "FULFILLMENT_DELIVERY_DEFERRED",
+              reason: "atomic redeem succeeded on-chain, but the channel's delivery dispatch failed",
+              details: {
+                exchangeId: settleResult.exchangeId,
+                option: decoded.payload.fulfillment.option,
+                error: reason
+              }
+            });
+          }
+        } else {
+          await ctx.fulfillmentRecoveryStore.delete(settleResult.exchangeId);
+          logger.debug("x402-server: Flow B channel onCommit succeeded", {
+            exchangeId: settleResult.exchangeId,
+            option: decoded.payload.fulfillment.option
+          });
+        }
       } catch (e) {
         const reason = e instanceof Error ? e.message : String(e);
-        ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, {
+        await ctx.fulfillmentRecoveryStore.set(settleResult.exchangeId, {
           ...pending,
           error: reason
         });
+        logger.warn("x402-server: Flow B channel onCommit failed; recovery entry retained", {
+          exchangeId: settleResult.exchangeId,
+          option: decoded.payload.fulfillment.option,
+          error: reason
+        });
         warnings.push({
           code: "FULFILLMENT_COMMIT_DEFERRED",
           reason: "atomic redeem succeeded on-chain, but the channel adapter rejected the data",
@@ -745,7 +824,8 @@ async function handleCommitImpl(input, ctx, expected) {
     exchangeId: settleResult.exchangeId,
     txHash: settleResult.txHash,
     nextActions,
-    ...warnings.length > 0 ? { warnings } : {}
+    ...warnings.length > 0 ? { warnings } : {},
+    ...delivery !== void 0 ? { fulfillment: delivery } : {}
   });
 }
 function buildExpectedFromRequirements(requirements, state) {
@@ -845,7 +925,7 @@ async function handleRedeem(input, ctx) {
   }
   let resolvedChannel;
   if (input.fulfillment !== void 0) {
-    const advertisedOptions = ctx.exchangeFulfillmentOptionStore.get(input.exchangeId);
+    const advertisedOptions = await ctx.exchangeFulfillmentOptionStore.get(input.exchangeId);
     if (advertisedOptions !== void 0 && !advertisedOptions.includes(input.fulfillment.option)) {
       return handlerErr(
         400,
@@ -888,23 +968,40 @@ async function handleRedeem(input, ctx) {
   }
   const result = await handlePerformAction("boson-redeem", input, ctx);
   if (!result.ok) return result;
-  let warning;
+  const warnings = [];
+  let delivery;
   if (resolvedChannel !== void 0 && input.fulfillment !== void 0) {
     const pending = {
       exchangeId: input.exchangeId,
       option: input.fulfillment.option,
       data: input.fulfillment.data,
       redeemer,
-      recordedAt: Date.now()
+      recordedAt: Date.now(),
+      phase: "commit"
     };
-    ctx.fulfillmentRecoveryStore.set(input.exchangeId, pending);
+    const logger = ctx.logger ?? noopLogger;
+    await ctx.fulfillmentRecoveryStore.set(input.exchangeId, pending);
+    logger.debug("x402-server: fulfillment recovery entry recorded (Flow A redeem)", {
+      exchangeId: input.exchangeId,
+      option: input.fulfillment.option
+    });
+    let onCommitOk = false;
     try {
       await resolvedChannel.onCommit(input.exchangeId, input.fulfillment.data);
-      ctx.fulfillmentRecoveryStore.delete(input.exchangeId);
+      onCommitOk = true;
+      logger.debug("x402-server: Flow A channel onCommit succeeded", {
+        exchangeId: input.exchangeId,
+        option: input.fulfillment.option
+      });
     } catch (e) {
       const reason = errorMessage(e);
-      ctx.fulfillmentRecoveryStore.set(input.exchangeId, { ...pending, error: reason });
-      warning = {
+      await ctx.fulfillmentRecoveryStore.set(input.exchangeId, { ...pending, error: reason });
+      logger.warn("x402-server: Flow A channel onCommit failed; recovery entry retained", {
+        exchangeId: input.exchangeId,
+        option: input.fulfillment.option,
+        error: reason
+      });
+      warnings.push({
         code: "FULFILLMENT_UPDATE_DEFERRED",
         reason: "redeem succeeded on-chain, but the server could not persist the fulfillment update",
         details: {
@@ -912,16 +1009,48 @@ async function handleRedeem(input, ctx) {
           option: input.fulfillment.option,
           error: reason
         }
-      };
+      });
+    }
+    if (onCommitOk) {
+      if (resolvedChannel.onFulfill !== void 0) {
+        const deliveryPending = {
+          ...pending,
+          phase: "delivery",
+          recordedAt: Date.now()
+        };
+        await ctx.fulfillmentRecoveryStore.set(input.exchangeId, deliveryPending);
+        try {
+          delivery = serializeFulfillmentResult(await resolvedChannel.onFulfill(input.exchangeId));
+          await ctx.fulfillmentRecoveryStore.delete(input.exchangeId);
+        } catch (e) {
+          const reason = errorMessage(e);
+          await ctx.fulfillmentRecoveryStore.set(input.exchangeId, {
+            ...deliveryPending,
+            error: reason
+          });
+          warnings.push({
+            code: "FULFILLMENT_DELIVERY_DEFERRED",
+            reason: "redeem succeeded on-chain, but the fulfillment channel's delivery dispatch failed",
+            details: {
+              exchangeId: input.exchangeId,
+              option: input.fulfillment.option,
+              error: reason
+            }
+          });
+        }
+      } else {
+        await ctx.fulfillmentRecoveryStore.delete(input.exchangeId);
+      }
     }
   }
-  ctx.exchangeFulfillmentOptionStore.delete(input.exchangeId);
-  if (warning !== void 0) {
+  await ctx.exchangeFulfillmentOptionStore.delete(input.exchangeId);
+  if (warnings.length > 0 || delivery !== void 0) {
     return {
       ...result,
       body: {
         ...result.body,
-        warnings: [...result.body.warnings ?? [], warning]
+        ...delivery !== void 0 ? { fulfillment: delivery } : {},
+        ...warnings.length > 0 ? { warnings: [...result.body.warnings ?? [], ...warnings] } : {}
       }
     };
   }