polycopy 0.2.0 → 0.2.1

package/dist/index.js

@@ -11,6 +11,7 @@ const accounts = require("viem/accounts");
 const chains = require("viem/chains");
 const builderRelayerClient = require("@polymarket/builder-relayer-client");
 const setPromiseInterval = require("set-promise-interval");
+const lodash = require("lodash");
 const child_process = require("child_process");
 const fs = require("fs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
@@ -578,6 +579,12 @@ class TelegramService {
   async stop() {
     await this.ensureListener().stop();
   }
+  /**
+   * 发送普通通知
+   */
+  async info(message, details) {
+    await this.send(`${message}`, details);
+  }
   /**
    * 发送错误通知
    */
@@ -1071,103 +1078,48 @@ class OrderWatcher {
   }
 }
 const DATA_API_HOST = "https://data-api.polymarket.com";
-const BASE_INTERVAL = 5 * 60 * 1e3;
-const DEFAULT_BATCH_SIZE = 5;
+const AUTO_REDEEM_INTERVAL = 5 * 60 * 1e3;
+const MAX_BATCH_SIZE = 5;
 const MAX_MATCH_TIMES = 3;
 class Redeemer {
   // conditionId -> RedeemRecord
   records = /* @__PURE__ */ new Map();
-  intervalId;
-  delayTimeoutId;
-  // stopped: 未启动; running: 正常轮询; paused: 限流等待恢复
-  state = "stopped";
-  scheduler;
-  redeemFn = null;
-  batchSize = DEFAULT_BATCH_SIZE;
-  funderAddress = "";
-  onRedeemSuccess = null;
-  constructor(scheduler = {
-    setInterval: setPromiseInterval__default.default,
-    clearInterval: setPromiseInterval.clearPromiseInterval,
-    setTimeout,
-    clearTimeout
-  }) {
-    this.scheduler = scheduler;
-  }
-  /**
-   * 启动 Redeemer
-   * @param redeemFn 执行 Redeem 的函数（返回交易哈希）
-   * @param funderAddress Polymarket 账户地址（用于查询仓位）
-   * @param onRedeemSuccess Redeem 成功后的回调（用于更新余额缓存）
-   */
-  start(redeemFn, funderAddress, onRedeemSuccess) {
-    if (this.state !== "stopped") {
-      return;
-    }
-    this.redeemFn = redeemFn;
-    const envBatchSize = Number(process.env.POLYCOPY_REDEEM_BATCH_SIZE || "");
-    if (!Number.isNaN(envBatchSize) && envBatchSize > 0) {
-      this.batchSize = Math.floor(envBatchSize);
-    }
-    this.funderAddress = funderAddress;
-    this.onRedeemSuccess = onRedeemSuccess || null;
-    this.state = "running";
-    logger.success("自动 redeem 已启动");
-    this.startInterval();
-  }
-  /**
-   * 启动定时任务（仅在 running 状态生效）
-   */
-  startInterval() {
-    if (this.state !== "running" || this.intervalId !== void 0) {
-      return;
-    }
-    this.intervalId = this.scheduler.setInterval(async () => {
-      await this.runOnce();
-    }, BASE_INTERVAL);
-  }
-  /**
-   * 暂停定时任务，延迟后重启（用于 429 限流）
-   */
-  pauseAndRestart(delayMs) {
-    if (this.intervalId !== void 0) {
-      this.scheduler.clearInterval(this.intervalId);
-      this.intervalId = void 0;
-    }
-    if (this.delayTimeoutId) {
-      this.scheduler.clearTimeout(this.delayTimeoutId);
-      this.delayTimeoutId = void 0;
-    }
-    this.state = "paused";
-    this.delayTimeoutId = this.scheduler.setTimeout(() => {
-      this.delayTimeoutId = void 0;
-      if (this.state === "paused") {
-        this.state = "running";
-        this.startInterval();
-      }
-    }, delayMs);
+  running = false;
+  mainTimer;
+  restartTimer;
+  options;
+  constructor(options) {
+    this.options = options;
+  }
+  start(restart) {
+    if (this.running) return;
+    this.running = true;
+    this.mainTimer = setPromiseInterval__default.default(
+      this.autoRedeem.bind(this),
+      AUTO_REDEEM_INTERVAL
+    );
+    logger.success(restart ? "自动 redeem 已重启" : "自动 redeem 已启动");
   }
-  /**
-   * 停止 Redeemer
-   */
   stop() {
-    if (this.intervalId !== void 0) {
-      this.scheduler.clearInterval(this.intervalId);
-      this.intervalId = void 0;
-    }
-    if (this.delayTimeoutId) {
-      this.scheduler.clearTimeout(this.delayTimeoutId);
-      this.delayTimeoutId = void 0;
-    }
-    this.state = "stopped";
+    setPromiseInterval.clearPromiseInterval(this.mainTimer);
+    clearTimeout(this.restartTimer);
+    this.running = false;
     logger.info("自动 redeem 已停止");
   }
+  restart(delayMs) {
+    if (!this.running) return;
+    this.stop();
+    this.restartTimer = setTimeout(() => {
+      this.start(true);
+      telegramService.info("自动 redeem 已重启");
+    }, delayMs);
+  }
   /**
    * 获取可 Redeem 的仓位
    */
   async fetchRedeemablePositions() {
     const url = new URL(`${DATA_API_HOST}/positions`);
-    url.searchParams.set("user", this.funderAddress);
+    url.searchParams.set("user", this.options.funderAddress);
     url.searchParams.set("redeemable", "true");
     url.searchParams.set("sizeThreshold", ".1");
     url.searchParams.set("sortBy", "CURRENT");
@@ -1197,63 +1149,35 @@ class Redeemer {
     }
     return positions;
   }
+  testRequestLimit(errorMsg) {
+    if (errorMsg.includes("429") || errorMsg.includes("Too Many Requests")) {
+      const match = errorMsg.match(/resets in (\d+) seconds/);
+      return match ? parseInt(match[1]) : 0;
+    }
+    return 0;
+  }
+  toMessages(records) {
+    return records.map(
+      ({ position, matchedCount, failedCount }) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC (matched: ${matchedCount} failed: ${failedCount})`
+    );
+  }
   /**
    * 执行一轮 Redeem
    */
-  async runOnce() {
-    if (this.state !== "running" || !this.redeemFn) {
-      return;
-    }
-    let positions;
+  async autoRedeem() {
+    let redeemablePositions;
     try {
-      positions = await this.fetchRedeemablePositions();
+      redeemablePositions = await this.fetchRedeemablePositions();
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
-      if (errorMsg.includes("429") || errorMsg.includes("Too Many Requests")) {
-        const resetSeconds = this.parseResetSeconds(errorMsg);
-        logger.warning(`获取仓位限流，${resetSeconds} 秒后重试`);
-        telegramService.warning(
-          "API 限流",
-          `获取仓位限流，${resetSeconds} 秒后重试`
-        );
-        this.pauseAndRestart((resetSeconds + 60) * 1e3);
-        return;
-      }
-      logger.error(`获取仓位失败: ${errorMsg}`);
+      logger.error(`自动 redeem: 获取仓位失败: ${errorMsg}`);
       return;
     }
-    const currentIds = new Set(positions.map((position) => position.conditionId));
-    this.logPendingPositions(positions);
-    const pendingRecords = this.buildRecords(positions);
-    this.updateMatchedRecords(currentIds);
-    const shouldContinue = await this.executeBatches(pendingRecords);
-    if (!shouldContinue) {
-      return;
-    }
-    const successItems = this.collectSuccessRecords(currentIds);
-    if (successItems.length > 0) {
-      const successTitle = `自动 redeem: 成功 ${successItems.length} 个`;
-      const successLines = this.logPositions(successTitle, successItems);
-      telegramService.success(successTitle, successLines.join("\n"));
-      this.onRedeemSuccess?.();
-    }
-    logger.info(`redeem 状态: ${this.records.size} 个待确认`);
-  }
-  logPendingPositions(positions) {
-    const pendingRedeemablePositions = positions.filter((position) => {
-      const record = this.records.get(position.conditionId);
-      return !record?.success;
-    });
-    if (pendingRedeemablePositions.length > 0) {
-      this.logPositions(
-        `自动 redeem: 发现 ${pendingRedeemablePositions.length} 个可 Redeem 仓位`,
-        pendingRedeemablePositions.map((position) => ({ position }))
-      );
-      logger.info(`Redeem 批量大小: ${this.batchSize}`);
-    }
-  }
-  buildRecords(positions) {
-    return positions.map((position) => {
+    let requestLimit = 0;
+    const pendingRedeems = [];
+    const failedRedeems = [];
+    const successRedeem = [];
+    for (const position of redeemablePositions) {
       let record = this.records.get(position.conditionId);
       if (!record) {
         record = {
@@ -1265,111 +1189,104 @@ class Redeemer {
         this.records.set(position.conditionId, record);
       }
       record.position = position;
-      return record;
-    }).filter((record) => !record.success && record.failedCount < MAX_MATCH_TIMES);
-  }
-  updateMatchedRecords(currentIds) {
-    for (const record of this.records.values()) {
-      if (!record.success) {
-        continue;
-      }
-      if (!currentIds.has(record.position.conditionId)) {
-        continue;
-      }
-      record.matchedCount++;
-      if (record.matchedCount >= MAX_MATCH_TIMES) {
-        logger.error(
-          `Redeem 失败: 执行成功但仍存在 ${record.matchedCount} 次 (conditionId: ${record.position.conditionId.slice(0, 10)}...)`
-        );
-        telegramService.error(
-          "Redeem 失败",
-          `执行成功但仓位仍存在 ${record.matchedCount} 次
-conditionId: ${record.position.conditionId}
-价值: ${record.position.currentValue} USDC`
+      if (record.success) {
+        record.matchedCount++;
+        if (record.matchedCount === MAX_MATCH_TIMES) {
+          failedRedeems.push(record);
+        }
+      } else if (record.failedCount < MAX_MATCH_TIMES) {
+        const insertIndex = lodash.sortedIndexBy(
+          pendingRedeems,
+          record,
+          "failedCount"
         );
+        pendingRedeems.splice(insertIndex, 0, record);
       }
     }
-  }
-  async executeBatches(pendingRecords) {
-    const batch = pendingRecords.slice(0, this.batchSize);
-    const conditionIds = batch.map((record) => record.position.conditionId);
-    if (conditionIds.length === 0) {
-      return true;
-    }
-    try {
-      const txHash = await this.redeemFn?.(conditionIds);
-      batch.forEach((record) => {
-        record.success = true;
-        record.matchedCount = 0;
-      });
-      logger.info(`Redeem 已执行 (批量 ${batch.length}): ${txHash}`);
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      if (errorMsg.includes("429") || errorMsg.includes("Too Many Requests")) {
-        const resetSeconds = this.parseResetSeconds(errorMsg);
-        logger.warning(`Redeem 限流，${resetSeconds} 秒后重试`);
-        telegramService.warning("Redeem 限流", `${resetSeconds} 秒后重试`);
-        this.pauseAndRestart((resetSeconds + 60) * 1e3);
-        return false;
-      }
-      batch.forEach((record) => {
-        record.failedCount++;
-      });
-      logger.error(`Redeem 批量异常 (批量 ${batch.length}): ${errorMsg}`);
-      batch.forEach((record) => {
-        if (record.failedCount >= MAX_MATCH_TIMES) {
-          telegramService.error(
-            "Redeem 异常",
-            `重试 ${record.failedCount} 次仍失败
-conditionId: ${record.position.conditionId}
-错误: ${errorMsg}`
-          );
+    const execRedeems = pendingRedeems.slice(0, MAX_BATCH_SIZE);
+    if (execRedeems.length > 0) {
+      try {
+        const txHash = await this.options.redeemFn(
+          execRedeems.map(({ position }) => position.conditionId)
+        );
+        logger.info(`Redeem 已执行 (批量 ${execRedeems.length}): ${txHash}`);
+        for (const record of execRedeems) record.success = true;
+      } catch (error) {
+        const errorMsg = error instanceof Error ? error.message : String(error);
+        logger.error(
+          `Redeem 批量异常 (批量 ${execRedeems.length}): ${errorMsg}`
+        );
+        requestLimit = this.testRequestLimit(errorMsg);
+        if (requestLimit <= 0) {
+          for (const record of execRedeems) {
+            record.failedCount++;
+            if (record.failedCount >= MAX_MATCH_TIMES) {
+              failedRedeems.push(record);
+            }
+          }
         }
-      });
+      }
     }
-    return true;
-  }
-  collectSuccessRecords(currentIds) {
-    const successItems = [];
     for (const [conditionId, record] of this.records.entries()) {
-      if (!currentIds.has(conditionId)) {
-        successItems.push({
-          position: record.position,
-          matchedCount: record.matchedCount
-        });
+      if (!redeemablePositions.some((p) => p.conditionId === conditionId)) {
+        successRedeem.push(record);
         this.records.delete(conditionId);
       }
     }
-    return successItems;
-  }
-  /**
-   * 统一格式化仓位信息
-   */
-  formatPositionLine(position, matchedCount) {
-    const label = position.slug || `${position.assetId.slice(0, 10)}...`;
-    const outcomeLabel = position.outcome ? ` ${position.outcome}` : "";
-    const matchedLabel = matchedCount !== void 0 ? ` (matched: ${matchedCount})` : "";
-    return `${label}${outcomeLabel}: ${position.currentValue} USDC${matchedLabel}`;
-  }
-  /**
-   * 统一输出 Redeem 仓位列表
-   */
-  logPositions(title, items) {
-    logger.info(title);
-    const lines = [];
-    for (const item of items) {
-      const line = this.formatPositionLine(item.position, item.matchedCount);
-      lines.push(line);
-      logger.line("", `- ${line}`);
+    const messages = [];
+    if (successRedeem.length > 0) {
+      messages.push("🟢 redeem 成功:", ...this.toMessages(successRedeem));
+    }
+    if (failedRedeems.length > 0) {
+      messages.push("🔴 redeem 失败:", ...this.toMessages(failedRedeems));
+    }
+    if (messages.length > 0) {
+      telegramService.info(messages.join("\n"));
+    }
+    const logLines = [];
+    if (execRedeems.length > 0) {
+      logLines.push(
+        `redeem 本轮执行（待确认）: ${execRedeems.length} 个`,
+        ...this.toMessages(execRedeems),
+        ""
+      );
+    }
+    if (pendingRedeems.length > 0) {
+      logLines.push(
+        `redeem 本轮未执行（等待下轮）: ${pendingRedeems.length} 个`,
+        ...this.toMessages(pendingRedeems),
+        ""
+      );
+    }
+    logLines.push(`redeem 待确认总数: ${this.records.size} 个`, "");
+    if (successRedeem.length > 0) {
+      logLines.push(
+        `🟢 redeem 成功确认: ${successRedeem.length} 个`,
+        ...this.toMessages(successRedeem),
+        ""
+      );
+    }
+    if (failedRedeems.length > 0) {
+      logLines.push(
+        `🔴 redeem 失败已放弃（重试超限）: ${failedRedeems.length} 个`,
+        ...this.toMessages(failedRedeems),
+        ""
+      );
+    }
+    if (logLines.length > 0) {
+      while (logLines.length > 0 && logLines[logLines.length - 1] === "") {
+        logLines.pop();
+      }
+      logger.info(logLines.join("\n"));
+    }
+    if (successRedeem.length > 0) {
+      this.options.onRedeemSuccess?.();
+    }
+    if (requestLimit > 0) {
+      logger.warning(`Redeem 限流，${requestLimit} 秒后重试`);
+      telegramService.warning("Redeem 限流", `${requestLimit} 秒后重试`);
+      this.restart(requestLimit * 1e3);
     }
-    return lines;
-  }
-  /**
-   * 解析 429 错误中的 resets in 时间
-   */
-  parseResetSeconds(errorMsg) {
-    const match = errorMsg.match(/resets in (\d+) seconds/);
-    return match ? parseInt(match[1]) : 3600;
   }
 }
 const POSITION_POLL_INTERVAL = 5e3;
@@ -1389,7 +1306,6 @@ class Trader {
     this.assetFilter = new AssetFilter();
     this.balanceCache = new BalanceCache();
     this.orderWatcher = new OrderWatcher();
-    this.redeemer = new Redeemer();
   }
   /**
    * 初始化交易模块
@@ -1426,11 +1342,16 @@ class Trader {
     if (!this.config?.polymarket?.builderCreds) {
       return;
     }
-    this.redeemer.start(
-      this.executeRedeemBatch.bind(this),
-      this.config.polymarket.funderAddress || "",
-      () => this.balanceCache.invalidate()
-    );
+    if (!this.redeemer) {
+      this.redeemer = new Redeemer({
+        funderAddress: this.config.polymarket.funderAddress,
+        redeemFn: this.executeRedeemBatch.bind(this),
+        onRedeemSuccess: () => {
+          this.balanceCache.invalidate();
+        }
+      });
+      this.redeemer.start();
+    }
   }
   /**
    * 检查是否已初始化
@@ -1645,7 +1566,7 @@ class Trader {
    * 停止交易模块
    */
   async shutdown() {
-    this.redeemer.stop();
+    this.redeemer?.stop();
     logger.info("交易模块已停止");
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polycopy",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "polycopy test",
   "main": "dist/index.js",
   "bin": {
@@ -13,8 +13,6 @@
     "dev": "tsc --noEmit && vite build && node dist/index.js",
     "cli": "node dist/cli.js",
     "prepublishOnly": "npm run build",
-    "test": "HOME=$PWD node --import tsx tests/redeemer.test.ts",
-    "test:redeemer": "HOME=$PWD node --import tsx tests/redeemer.test.ts",
     "test:log-follow": "node scripts/test-log-follow.cjs"
   },
   "dependencies": {