moltspay 0.9.3 → 0.9.6

package/dist/server/index.d.mts

@@ -3,12 +3,19 @@ import { d as FacilitatorSelection } from '../registry-OsEO2dOu.mjs';
 /**
  * MoltsPay Server Types
  */
+type TokenSymbol = 'USDC' | 'USDT';
 interface ServiceConfig {
     id: string;
     name: string;
     description?: string;
     price: number;
     currency: string;
+    /**
+     * Tokens accepted for payment (optional).
+     * If not specified, defaults to [currency].
+     * Example: ["USDC", "USDT"]
+     */
+    acceptedCurrencies?: TokenSymbol[];
     input: Record<string, InputField>;
     output: Record<string, OutputField>;
     /** Shell command to execute for this service. Params passed as JSON to stdin. */
@@ -120,6 +127,10 @@ declare class MoltsPayServer {
      * Handle incoming request
      */
     private handleRequest;
+    /**
+     * GET /.well-known/agent-services.json - Standard discovery endpoint
+     */
+    private handleAgentServicesDiscovery;
     /**
      * GET /services - List available services
      */
@@ -134,6 +145,7 @@ declare class MoltsPayServer {
     private handleExecute;
     /**
      * Return 402 with x402 payment requirements (v2 format)
+     * Includes requirements for all accepted currencies
      */
     private sendPaymentRequired;
     /**
@@ -142,8 +154,18 @@ declare class MoltsPayServer {
     private validatePayment;
     /**
      * Build payment requirements for facilitator
+     * Returns requirements for the primary currency (USDC by default)
+     * Server accepts any of the acceptedCurrencies
      */
     private buildPaymentRequirements;
+    /**
+     * Detect which token is being used in the payment
+     */
+    private detectPaymentToken;
+    /**
+     * Check if payment token is accepted for service
+     */
+    private isTokenAccepted;
     private readBody;
     private sendJson;
     /**
@@ -173,4 +195,4 @@ declare class MoltsPayServer {
     private sendProxyPaymentRequired;
 }
 
-export { type Charge, type ChargeStatus, type InputField, MoltsPayServer, type MoltsPayServerOptions, type MoltsPayServerOptionsExtended, type OutputField, type PaymentRequest, type ProviderConfig, type RegisteredSkill, type ServiceConfig, type ServicesManifest, type SkillFunction, type VerifyRequest };
+export { type Charge, type ChargeStatus, type InputField, MoltsPayServer, type MoltsPayServerOptions, type MoltsPayServerOptionsExtended, type OutputField, type PaymentRequest, type ProviderConfig, type RegisteredSkill, type ServiceConfig, type ServicesManifest, type SkillFunction, type TokenSymbol, type VerifyRequest };

package/dist/server/index.d.ts

@@ -3,12 +3,19 @@ import { d as FacilitatorSelection } from '../registry-OsEO2dOu.js';
 /**
  * MoltsPay Server Types
  */
+type TokenSymbol = 'USDC' | 'USDT';
 interface ServiceConfig {
     id: string;
     name: string;
     description?: string;
     price: number;
     currency: string;
+    /**
+     * Tokens accepted for payment (optional).
+     * If not specified, defaults to [currency].
+     * Example: ["USDC", "USDT"]
+     */
+    acceptedCurrencies?: TokenSymbol[];
     input: Record<string, InputField>;
     output: Record<string, OutputField>;
     /** Shell command to execute for this service. Params passed as JSON to stdin. */
@@ -120,6 +127,10 @@ declare class MoltsPayServer {
      * Handle incoming request
      */
     private handleRequest;
+    /**
+     * GET /.well-known/agent-services.json - Standard discovery endpoint
+     */
+    private handleAgentServicesDiscovery;
     /**
      * GET /services - List available services
      */
@@ -134,6 +145,7 @@ declare class MoltsPayServer {
     private handleExecute;
     /**
      * Return 402 with x402 payment requirements (v2 format)
+     * Includes requirements for all accepted currencies
      */
     private sendPaymentRequired;
     /**
@@ -142,8 +154,18 @@ declare class MoltsPayServer {
     private validatePayment;
     /**
      * Build payment requirements for facilitator
+     * Returns requirements for the primary currency (USDC by default)
+     * Server accepts any of the acceptedCurrencies
      */
     private buildPaymentRequirements;
+    /**
+     * Detect which token is being used in the payment
+     */
+    private detectPaymentToken;
+    /**
+     * Check if payment token is accepted for service
+     */
+    private isTokenAccepted;
     private readBody;
     private sendJson;
     /**
@@ -173,4 +195,4 @@ declare class MoltsPayServer {
     private sendProxyPaymentRequired;
 }
 
-export { type Charge, type ChargeStatus, type InputField, MoltsPayServer, type MoltsPayServerOptions, type MoltsPayServerOptionsExtended, type OutputField, type PaymentRequest, type ProviderConfig, type RegisteredSkill, type ServiceConfig, type ServicesManifest, type SkillFunction, type VerifyRequest };
+export { type Charge, type ChargeStatus, type InputField, MoltsPayServer, type MoltsPayServerOptions, type MoltsPayServerOptionsExtended, type OutputField, type PaymentRequest, type ProviderConfig, type RegisteredSkill, type ServiceConfig, type ServicesManifest, type SkillFunction, type TokenSymbol, type VerifyRequest };

package/dist/server/index.js

@@ -486,16 +486,24 @@ var X402_VERSION2 = 2;
 var PAYMENT_REQUIRED_HEADER = "x-payment-required";
 var PAYMENT_HEADER = "x-payment";
 var PAYMENT_RESPONSE_HEADER = "x-payment-response";
-var USDC_ADDRESSES = {
-  "eip155:8453": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-  // Base mainnet
-  "eip155:84532": "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
-  // Base Sepolia
+var TOKEN_ADDRESSES = {
+  "eip155:8453": {
+    USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    USDT: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2"
+  },
+  "eip155:84532": {
+    USDC: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+    USDT: "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
+    // Same as USDC on testnet
+  }
 };
-var USDC_DOMAIN = {
-  name: "USD Coin",
-  version: "2"
+var TOKEN_DOMAINS = {
+  USDC: { name: "USD Coin", version: "2" },
+  USDT: { name: "Tether USD", version: "2" }
 };
+function getAcceptedCurrencies(config) {
+  return config.acceptedCurrencies ?? [config.currency];
+}
 function loadEnvFile2() {
   const envPaths = [
     path2.join(process.cwd(), ".env"),
@@ -607,6 +615,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);
       }
@@ -630,6 +641,44 @@ 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,
+      acceptedCurrencies: getAcceptedCurrencies(s),
+      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_VERSION2,
+        network: this.networkId,
+        schemes: ["exact"],
+        mainnet: this.useMainnet
+      }
+    });
+  }
   /**
    * GET /services - List available services
    */
@@ -640,6 +689,7 @@ var MoltsPayServer = class {
       description: s.description,
       price: s.price,
       currency: s.currency,
+      acceptedCurrencies: getAcceptedCurrencies(s),
       input: s.input,
       output: s.output,
       available: this.skills.has(s.id)
@@ -706,7 +756,14 @@ var MoltsPayServer = class {
     if (!validation.valid) {
       return this.sendJson(res, 402, { error: validation.error });
     }
-    const requirements = this.buildPaymentRequirements(skill.config);
+    const paymentToken = this.detectPaymentToken(payment);
+    if (paymentToken && !this.isTokenAccepted(skill.config, paymentToken)) {
+      const accepted = getAcceptedCurrencies(skill.config);
+      return this.sendJson(res, 402, {
+        error: `Token ${paymentToken} not accepted. Accepted: ${accepted.join(", ")}`
+      });
+    }
+    const requirements = this.buildPaymentRequirements(skill.config, paymentToken);
     console.log(`[MoltsPay] Verifying payment...`);
     const verifyResult = await this.registry.verify(payment, requirements);
     if (!verifyResult.valid) {
@@ -716,10 +773,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, {
@@ -755,12 +818,15 @@ var MoltsPayServer = class {
   }
   /**
    * Return 402 with x402 payment requirements (v2 format)
+   * Includes requirements for all accepted currencies
    */
   sendPaymentRequired(config, res) {
-    const requirements = this.buildPaymentRequirements(config);
+    const acceptedTokens = getAcceptedCurrencies(config);
+    const accepts = acceptedTokens.map((token) => this.buildPaymentRequirements(config, token));
     const paymentRequired = {
       x402Version: X402_VERSION2,
-      accepts: [requirements],
+      accepts,
+      acceptedCurrencies: acceptedTokens,
       resource: {
         url: `/execute?service=${config.id}`,
         description: `${config.name} - $${config.price} ${config.currency}`,
@@ -775,6 +841,7 @@ var MoltsPayServer = class {
     res.end(JSON.stringify({
       error: "Payment required",
       message: `Service requires $${config.price} ${config.currency}`,
+      acceptedCurrencies: acceptedTokens,
       x402: paymentRequired
     }, null, 2));
   }
@@ -797,20 +864,47 @@ var MoltsPayServer = class {
   }
   /**
    * Build payment requirements for facilitator
+   * Returns requirements for the primary currency (USDC by default)
+   * Server accepts any of the acceptedCurrencies
    */
-  buildPaymentRequirements(config) {
+  buildPaymentRequirements(config, token) {
     const amountInUnits = Math.floor(config.price * 1e6).toString();
-    const usdcAddress = USDC_ADDRESSES[this.networkId];
+    const acceptedTokens = getAcceptedCurrencies(config);
+    const selectedToken = token && acceptedTokens.includes(token) ? token : acceptedTokens[0];
+    const tokenAddresses = TOKEN_ADDRESSES[this.networkId] || {};
+    const tokenAddress = tokenAddresses[selectedToken];
+    const tokenDomain = TOKEN_DOMAINS[selectedToken] || TOKEN_DOMAINS.USDC;
     return {
       scheme: "exact",
       network: this.networkId,
-      asset: usdcAddress,
+      asset: tokenAddress,
       amount: amountInUnits,
       payTo: this.manifest.provider.wallet,
       maxTimeoutSeconds: 300,
-      extra: USDC_DOMAIN
+      extra: tokenDomain
     };
   }
+  /**
+   * Detect which token is being used in the payment
+   */
+  detectPaymentToken(payment) {
+    const asset = payment.accepted?.asset || payment.payload?.asset;
+    if (!asset) return void 0;
+    const tokenAddresses = TOKEN_ADDRESSES[this.networkId] || {};
+    for (const [symbol, address] of Object.entries(tokenAddresses)) {
+      if (address.toLowerCase() === asset.toLowerCase()) {
+        return symbol;
+      }
+    }
+    return void 0;
+  }
+  /**
+   * Check if payment token is accepted for service
+   */
+  isTokenAccepted(config, token) {
+    const accepted = getAcceptedCurrencies(config);
+    return accepted.includes(token);
+  }
   async readBody(req) {
     return new Promise((resolve, reject) => {
       let body = "";
@@ -928,9 +1022,15 @@ var MoltsPayServer = class {
           error: `Service not found: ${service}`
         });
       }
+      const timeoutSeconds = parseInt(process.env.SKILL_TIMEOUT_SECONDS || "1200");
       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)
+          )
+        ]);
         console.log(`[MoltsPay] /proxy: Skill succeeded, now settling payment...`);
       } catch (err) {
         console.error(`[MoltsPay] /proxy: Skill failed: ${err.message} - NOT settling`);
@@ -1004,18 +1104,22 @@ var MoltsPayServer = class {
   /**
    * Build payment requirements for proxy endpoint (uses provided wallet)
    */
-  buildProxyPaymentRequirements(config, wallet) {
+  buildProxyPaymentRequirements(config, wallet, token) {
     const amountInUnits = Math.floor(config.price * 1e6).toString();
-    const usdcAddress = USDC_ADDRESSES[this.networkId];
+    const acceptedTokens = getAcceptedCurrencies(config);
+    const selectedToken = token && acceptedTokens.includes(token) ? token : acceptedTokens[0];
+    const tokenAddresses = TOKEN_ADDRESSES[this.networkId] || {};
+    const tokenAddress = tokenAddresses[selectedToken];
+    const tokenDomain = TOKEN_DOMAINS[selectedToken] || TOKEN_DOMAINS.USDC;
     return {
       scheme: "exact",
       network: this.networkId,
-      asset: usdcAddress,
+      asset: tokenAddress,
       amount: amountInUnits,
       payTo: wallet,
       // Use provided wallet, not manifest
       maxTimeoutSeconds: 300,
-      extra: USDC_DOMAIN
+      extra: tokenDomain
     };
   }
   /**