@aeon-ai-pay/aigateway 0.2.4 → 0.2.5

package/docs/troubleshooting.md

@@ -165,7 +165,7 @@ The skill version is locked to `metadata.version` in the frontmatter. If you edi
 
 ```yaml
 metadata:
-  version: "0.2.4"   # was 0.2.4
+  version: "0.2.5"   # was 0.2.5
 ```
 
 Then `npx skills add AEON-Project/aigateway -g -y -f` (force) or re-run postinstall.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeon-ai-pay/aigateway",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "AI Agents discover, invoke, and settle paid LLMs, APIs, and Skills — starting with Skill Boss. No manual key setup. No prepayment. Pay-per-call via x402 or Agent Card.",
   "type": "module",
   "bin": {

package/skills/aigateway/SKILL.md

@@ -26,7 +26,7 @@ description: >
 emoji: "🛰️"
 homepage: https://github.com/AEON-Project/aigateway
 metadata:
-  version: "0.2.4"
+  version: "0.2.5"
   author: AEON-Project
   openclaw:
     requires:

package/src/commands/wallet-init.mjs

@@ -20,7 +20,7 @@ import {
   TOPUP_PRESETS,
 } from "../funding.mjs";
 import { emitOk, logInfo } from "../output.mjs";
-import { claimCoupon } from "../coupon.mjs";
+import { checkCouponStatus, claimCoupon } from "../coupon.mjs";
 
 export async function initWallet(opts) {
   const config = loadConfig();
@@ -94,23 +94,52 @@ export async function initWallet(opts) {
   // device id 在首次 init 时生成,后续 claim / 审计复用
   const deviceId = getOrCreateDeviceId();
 
-  // AEON x BNB Chain AI Agent Campaign — wallet 新建时尝试领取一次优惠券 token
-  // 已领过 / 名额满 / 服务端不通 → 安静失败,不阻塞 wallet-init 主流程
+  // AEON x BNB Chain AI Agent Campaign — 两步同步流程:
+  //   1) status check:已领 → 跳过,直接走后续流程
+  //   2) 未领 → 输出"申请中..." → claim 同步阻塞 → 输出 mint 结果
+  // 任何网络异常都安静 log,不阻塞 wallet-init 主流程。
   let coupon = null;
-  if (created) {
-    const serviceUrl = resolve(opts.serviceUrl, "AIGATEWAY_SERVICE_URL", "serviceUrl");
-    coupon = await claimCoupon({
-      serviceUrl,
-      userAddress: config.address,
-      deviceId,
-      appId,
-    });
-    if (coupon?.ok) {
-      logInfo(`🎁 Claimed ${coupon.tokenAmount} coupon credits (tx: ${coupon.txHash})`);
-    } else if (coupon?.code === "ALREADY_CLAIMED") {
-      logInfo("Coupon already claimed before.");
-    } else if (coupon?.code) {
-      logInfo(`Coupon claim skipped: ${coupon.code} — ${coupon.errorMsg || ""}`);
+  const serviceUrl = resolve(opts.serviceUrl, "AIGATEWAY_SERVICE_URL", "serviceUrl");
+  if (serviceUrl && config.address) {
+    const status = await checkCouponStatus({ serviceUrl, userAddress: config.address });
+    if (status.ok && status.claimed) {
+      // 已领过 → 直接走后续流程
+      logInfo(`Coupon already claimed (status=${status.mintStatus}${status.mintTxHash ? ", tx=" + status.mintTxHash : ""}).`);
+      coupon = {
+        ok: status.mintStatus === "SUCCESS",
+        code: status.mintStatus === "SUCCESS" ? "ALREADY_CLAIMED_SUCCESS" : "ALREADY_CLAIMED_" + status.mintStatus,
+        tokenAddress: status.tokenAddress,
+        tokenAmount: status.tokenAmount,
+        txHash: status.mintTxHash,
+        campaignId: status.campaignId,
+      };
+    } else if (status.ok && !status.claimed) {
+      // 未领 → 申请,同步阻塞
+      logInfo("🎁 Claiming AEON x BNB campaign coupon, please wait...");
+      coupon = await claimCoupon({
+        serviceUrl,
+        userAddress: config.address,
+        deviceId,
+        appId,
+      });
+      if (coupon?.ok) {
+        logInfo(`✅ Coupon claimed: ${coupon.tokenAmount} credits (tx: ${coupon.txHash})`);
+      } else if (coupon?.code === "ALREADY_CLAIMED") {
+        // status 和 claim 之间有人抢着领过(罕见 race),按已领处理
+        logInfo("Coupon already claimed (race with status check).");
+      } else if (coupon?.code === "CAMPAIGN_QUOTA_EXHAUSTED") {
+        logInfo("⚠️ Coupon campaign quota exhausted.");
+      } else if (coupon?.code === "MINT_FAILED") {
+        logInfo(`❌ Coupon mint failed: ${coupon.errorMsg}`);
+      } else if (coupon?.code === "CLAIM_NETWORK_ERROR") {
+        logInfo(`Coupon claim network error: ${coupon.errorMsg}`);
+      } else if (coupon?.code) {
+        logInfo(`Coupon claim skipped: ${coupon.code} — ${coupon.errorMsg || ""}`);
+      }
+    } else {
+      // status check 自己网络失败 — 静默,不阻塞 wallet-init
+      logInfo(`Coupon status check unreachable: ${status.errorMsg}`);
+      coupon = { ok: false, code: status.code, errorMsg: status.errorMsg };
     }
   }
 

package/src/coupon.mjs

@@ -1,17 +1,63 @@
 /**
  * Coupon client — AEON x BNB Chain AI Agent Campaign.
  *
- * 调用服务端 POST /open/api/coupon/claim 申请优惠券 token。
+ * 两步流程:
+ *   1) checkCouponStatus(...) — GET /open/api/coupon/status → 已领过 / 未领
+ *   2) 仅未领时调用 claimCoupon(...) — POST /open/api/coupon/claim → 同步 mint 结果
+ *
  * 返回归一化结构:
- *   { ok: true,  code: "SUCCESS",       tokenAmount, tokenAddress, txHash, campaignId }
- *   { ok: false, code: "ALREADY_CLAIMED" | "CAMPAIGN_QUOTA_EXHAUSTED" | "MINT_FAILED" | ...,
- *     errorMsg, status? }
+ *   checkCouponStatus:
+ *     { ok: true, claimed: true, mintStatus, mintTxHash, tokenAddress, tokenAmount, campaignId, claimedAt }
+ *     { ok: true, claimed: false, campaignId }
+ *     { ok: false, code: "STATUS_NETWORK_ERROR", errorMsg }
+ *
+ *   claimCoupon:
+ *     { ok: true,  code: "SUCCESS", tokenAmount, tokenAddress, txHash, campaignId }
+ *     { ok: false, code: "ALREADY_CLAIMED" | "CAMPAIGN_QUOTA_EXHAUSTED" | "MINT_FAILED" | ...,
+ *       errorMsg, status? }
+ *     { ok: false, code: "CLAIM_NETWORK_ERROR", errorMsg }
  *
- * 错误吞掉(网络/超时/任何异常)返回 { ok: false, code: "CLAIM_NETWORK_ERROR", errorMsg },
- * 让调用方(wallet-init)继续主流程,不要因为优惠券领取失败阻塞钱包初始化。
+ * 网络层错误吞掉,让调用方决定是否阻塞主流程。
  */
 import axios from "axios";
 
+/** 查询钱包是否已领过当前活动(不发起 mint) */
+export async function checkCouponStatus({ serviceUrl, userAddress, campaignId }) {
+  if (!serviceUrl) {
+    return { ok: false, code: "SERVICE_URL_MISSING", errorMsg: "serviceUrl is required" };
+  }
+  if (!userAddress) {
+    return { ok: false, code: "INVALID_PARAM", errorMsg: "userAddress is required" };
+  }
+  const params = new URLSearchParams({ userAddress });
+  if (campaignId) params.set("campaignId", campaignId);
+  const url = `${serviceUrl}/open/api/coupon/status?${params}`;
+
+  try {
+    const resp = await axios.get(url, { timeout: 10_000 });
+    const envelope = resp.data;
+    const result = envelope?.model || envelope?.data || envelope;
+    return {
+      ok: true,
+      claimed: !!result?.claimed,
+      campaignId: result?.campaignId,
+      mintStatus: result?.mintStatus || null,
+      mintTxHash: result?.mintTxHash || null,
+      tokenAddress: result?.tokenAddress || null,
+      tokenAmount: result?.tokenAmount ?? null,
+      errorMsg: result?.errorMsg || null,
+      claimedAt: result?.claimedAt || null,
+    };
+  } catch (e) {
+    return {
+      ok: false,
+      code: "STATUS_NETWORK_ERROR",
+      errorMsg: e.message,
+      status: e.response?.status,
+    };
+  }
+}
+
 export async function claimCoupon({ serviceUrl, userAddress, deviceId, appId, campaignId }) {
   if (!serviceUrl) {
     return { ok: false, code: "SERVICE_URL_MISSING", errorMsg: "serviceUrl is required" };
@@ -30,7 +76,7 @@ export async function claimCoupon({ serviceUrl, userAddress, deviceId, appId, ca
 
   try {
     const resp = await axios.post(url, body, {
-      timeout: 60_000,
+      timeout: 15_000,
       headers: { "Content-Type": "application/json" },
     });
     // 服务端约定:HTTP 200 + APIResponse 包装 + data 字段 = CouponClaimResult