moltspay 0.9.2 → 0.9.5

package/dist/cli/index.mjs

@@ -984,6 +984,9 @@ var MoltsPayServer = class {
       if (url.pathname === "/services" && req.method === "GET") {
         return this.handleGetServices(res);
       }
+      if (url.pathname === "/.well-known/agent-services.json" && req.method === "GET") {
+        return this.handleAgentServicesDiscovery(res);
+      }
       if (url.pathname === "/health" && req.method === "GET") {
         return await this.handleHealthCheck(res);
       }
@@ -1007,6 +1010,43 @@ var MoltsPayServer = class {
       this.sendJson(res, 500, { error: err.message || "Internal error" });
     }
   }
+  /**
+   * GET /.well-known/agent-services.json - Standard discovery endpoint
+   */
+  handleAgentServicesDiscovery(res) {
+    const services = this.manifest.services.map((s) => ({
+      id: s.id,
+      name: s.name,
+      description: s.description,
+      price: s.price,
+      currency: s.currency,
+      input: s.input,
+      output: s.output,
+      available: this.skills.has(s.id)
+    }));
+    this.sendJson(res, 200, {
+      version: "1.0",
+      provider: {
+        name: this.manifest.provider.name,
+        description: this.manifest.provider.description,
+        wallet: this.manifest.provider.wallet,
+        chain: this.manifest.provider.chain || "base"
+      },
+      services,
+      endpoints: {
+        services: "/services",
+        execute: "/execute",
+        health: "/health"
+      },
+      payment: {
+        protocol: "x402",
+        version: X402_VERSION3,
+        network: this.networkId,
+        schemes: ["exact"],
+        mainnet: this.useMainnet
+      }
+    });
+  }
   /**
    * GET /services - List available services
    */
@@ -1093,10 +1133,16 @@ var MoltsPayServer = class {
       });
     }
     console.log(`[MoltsPay] Verified by ${verifyResult.facilitator}`);
-    console.log(`[MoltsPay] Executing skill: ${service}`);
+    const timeoutSeconds = parseInt(process.env.SKILL_TIMEOUT_SECONDS || "1200");
+    console.log(`[MoltsPay] Executing skill: ${service} (timeout: ${timeoutSeconds}s)`);
     let result;
     try {
-      result = await skill.handler(params || {});
+      result = await Promise.race([
+        skill.handler(params || {}),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error(`Skill timeout after ${timeoutSeconds}s`)), timeoutSeconds * 1e3)
+        )
+      ]);
     } catch (err) {
       console.error("[MoltsPay] Skill execution failed:", err.message);
       return this.sendJson(res, 500, {
@@ -1293,7 +1339,72 @@ 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}`
+        });
+      }
+      const timeoutSeconds = parseInt(process.env.SKILL_TIMEOUT_SECONDS || "1200");
+      let result;
+      try {
+        result = await Promise.race([
+          skill.handler(params || {}),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error(`Skill timeout after ${timeoutSeconds}s`)), timeoutSeconds * 1e3)
+          )
+        ]);
+        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);
@@ -1310,6 +1421,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",