moltspay 0.9.2 → 0.9.3

package/dist/cli/index.js

@@ -1316,7 +1316,66 @@ var MoltsPayServer = class {
       });
     }
     console.log(`[MoltsPay] /proxy: Verified by ${verifyResult.facilitator}`);
-    console.log(`[MoltsPay] /proxy: Settling payment...`);
+    const { execute, service, params } = body;
+    if (execute && service) {
+      console.log(`[MoltsPay] /proxy: Executing skill first (pay on success): ${service}`);
+      const skill = this.skills.get(service);
+      if (!skill) {
+        console.log(`[MoltsPay] /proxy: Service not found: ${service} - NOT settling`);
+        return this.sendJson(res, 404, {
+          success: false,
+          paymentSettled: false,
+          error: `Service not found: ${service}`
+        });
+      }
+      let result;
+      try {
+        result = await skill.handler(params || {});
+        console.log(`[MoltsPay] /proxy: Skill succeeded, now settling payment...`);
+      } catch (err) {
+        console.error(`[MoltsPay] /proxy: Skill failed: ${err.message} - NOT settling`);
+        return this.sendJson(res, 500, {
+          success: false,
+          paymentSettled: false,
+          error: `Service execution failed: ${err.message}`
+        });
+      }
+      let settlement2 = null;
+      try {
+        settlement2 = await this.registry.settle(payment, requirements);
+        console.log(`[MoltsPay] /proxy: Payment settled by ${settlement2.facilitator}: ${settlement2.transaction || "pending"}`);
+      } catch (err) {
+        console.error("[MoltsPay] /proxy: Settlement failed:", err.message);
+        return this.sendJson(res, 200, {
+          success: true,
+          verified: true,
+          settled: false,
+          settlementError: err.message,
+          from: payment.payload?.authorization?.from,
+          // Buyer's wallet address
+          paidTo: wallet,
+          amount: amountNum,
+          currency: currency || "USDC",
+          memo,
+          result
+        });
+      }
+      return this.sendJson(res, 200, {
+        success: true,
+        verified: true,
+        settled: settlement2?.success || false,
+        txHash: settlement2?.transaction,
+        from: payment.payload?.authorization?.from,
+        // Buyer's wallet address
+        paidTo: wallet,
+        amount: amountNum,
+        currency: currency || "USDC",
+        facilitator: settlement2?.facilitator,
+        memo,
+        result
+      });
+    }
+    console.log(`[MoltsPay] /proxy: Settling payment (no execution)...`);
     let settlement = null;
     try {
       settlement = await this.registry.settle(payment, requirements);
@@ -1333,6 +1392,8 @@ var MoltsPayServer = class {
       verified: true,
       settled: settlement?.success || false,
       txHash: settlement?.transaction,
+      from: payment.payload?.authorization?.from,
+      // Buyer's wallet address
       paidTo: wallet,
       amount: amountNum,
       currency: currency || "USDC",