polycopy 0.1.8 → 0.1.9

package/dist/cli.js

@@ -3,7 +3,7 @@
 const child_process = require("child_process");
 const fs = require("fs");
 const path = require("path");
-const processLock = require("./process-lock-BbFF27h8.js");
+const processLock = require("./process-lock-y_yjnMCr.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
-const processLock = require("./process-lock-BbFF27h8.js");
+const processLock = require("./process-lock-y_yjnMCr.js");
 const grammy = require("grammy");
 const log4js = require("log4js");
 const path = require("path");
@@ -874,15 +874,7 @@ class RelayClientWrapper {
   isInitialized() {
     return this.initialized;
   }
-  /**
-   * 执行 Redeem
-   * @param conditionId 条件 ID
-   * @returns 交易哈希
-   */
-  async redeem(conditionId) {
-    if (!this.relayClient || !this.initialized) {
-      throw new Error("RelayClient 未初始化");
-    }
+  buildRedeemTransaction(conditionId) {
     const calldata = viem.encodeFunctionData({
       abi: [
         {
@@ -901,14 +893,27 @@ class RelayClientWrapper {
       functionName: "redeemPositions",
       args: [USDC_ADDRESS, viem.zeroHash, conditionId, [1n, 2n]]
     });
-    const tx = {
+    return {
       to: CTF_ADDRESS,
       value: "0",
       data: calldata
     };
+  }
+  /**
+   * 批量执行 Redeem
+   * @param conditionIds 条件 ID 列表
+   * @returns 交易哈希
+   */
+  async redeemBatch(conditionIds) {
+    if (!this.relayClient || !this.initialized) {
+      throw new Error("RelayClient 未初始化");
+    }
+    const transactions = conditionIds.map(
+      (conditionId) => this.buildRedeemTransaction(conditionId)
+    );
     const response = await this.relayClient.execute(
-      [tx],
-      "Polymarket redeem positions"
+      transactions,
+      `Polymarket redeem positions (${transactions.length})`
     );
     const result = await response.wait();
     if (!result) {
@@ -918,6 +923,14 @@ class RelayClientWrapper {
     }
     return result.transactionHash;
   }
+  /**
+   * 执行 Redeem（兼容单个）
+   * @param conditionId 条件 ID
+   * @returns 交易哈希
+   */
+  async redeem(conditionId) {
+    return this.redeemBatch([conditionId]);
+  }
 }
 class AssetFilter {
   // endTime -> Set<assetId>
@@ -1059,6 +1072,7 @@ class OrderWatcher {
 }
 const DATA_API_HOST = "https://data-api.polymarket.com";
 const BASE_INTERVAL = 5 * 60 * 1e3;
+const DEFAULT_BATCH_SIZE = 5;
 const MAX_MATCH_TIMES = 3;
 class Redeemer {
   // conditionId -> RedeemRecord
@@ -1069,6 +1083,7 @@ class Redeemer {
   state = "stopped";
   scheduler;
   redeemFn = null;
+  batchSize = DEFAULT_BATCH_SIZE;
   funderAddress = "";
   onRedeemSuccess = null;
   constructor(scheduler = {
@@ -1090,6 +1105,10 @@ class Redeemer {
       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";
@@ -1203,6 +1222,24 @@ class Redeemer {
       logger.error(`获取仓位失败: ${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;
@@ -1212,8 +1249,11 @@ class Redeemer {
         `自动 redeem: 发现 ${pendingRedeemablePositions.length} 个可 Redeem 仓位`,
         pendingRedeemablePositions.map((position) => ({ position }))
       );
+      logger.info(`Redeem 批量大小: ${this.batchSize}`);
     }
-    for (const position of positions) {
+  }
+  buildRecords(positions) {
+    return positions.map((position) => {
       let record = this.records.get(position.conditionId);
       if (!record) {
         record = {
@@ -1225,52 +1265,76 @@ class Redeemer {
         this.records.set(position.conditionId, record);
       }
       record.position = position;
-      if (record.success) {
-        record.matchedCount++;
-        if (record.matchedCount >= MAX_MATCH_TIMES) {
-          logger.error(
-            `Redeem 失败: 执行成功但仍存在 ${record.matchedCount} 次 (conditionId: ${position.conditionId.slice(0, 10)}...)`
-          );
-          telegramService.error(
-            "Redeem 失败",
-            `执行成功但仓位仍存在 ${record.matchedCount} 次
-conditionId: ${position.conditionId}
-价值: ${position.currentValue} USDC`
-          );
-        }
-      } else if (record.failedCount < MAX_MATCH_TIMES) {
-        try {
-          const txHash = await this.redeemFn?.(position.conditionId);
+      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`
+        );
+      }
+    }
+  }
+  async executeBatches(pendingRecords) {
+    for (let i = 0; i < pendingRecords.length; i += this.batchSize) {
+      const batch = pendingRecords.slice(i, i + this.batchSize);
+      const conditionIds = batch.map((record) => record.position.conditionId);
+      if (conditionIds.length === 0) {
+        continue;
+      }
+      try {
+        const txHash = await this.redeemFn?.(conditionIds);
+        batch.forEach((record) => {
           record.success = true;
-          logger.info(`Redeem 已执行: ${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;
-          }
+          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 异常 (第 ${record.failedCount} 次): ${errorMsg}`
-          );
+        });
+        logger.error(`Redeem 批量异常 (批量 ${batch.length}): ${errorMsg}`);
+        batch.forEach((record) => {
           if (record.failedCount >= MAX_MATCH_TIMES) {
             telegramService.error(
               "Redeem 异常",
               `重试 ${record.failedCount} 次仍失败
-conditionId: ${position.conditionId}
+conditionId: ${record.position.conditionId}
 错误: ${errorMsg}`
             );
           }
-        }
+        });
       }
     }
+    return true;
+  }
+  collectSuccessRecords(currentIds) {
     const successItems = [];
     for (const [conditionId, record] of this.records.entries()) {
-      const stillExists = positions.some((p) => p.conditionId === conditionId);
-      if (!stillExists) {
+      if (!currentIds.has(conditionId)) {
         successItems.push({
           position: record.position,
           matchedCount: record.matchedCount
@@ -1278,13 +1342,7 @@ conditionId: ${position.conditionId}
         this.records.delete(conditionId);
       }
     }
-    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} 个待确认`);
+    return successItems;
   }
   /**
    * 统一格式化仓位信息
@@ -1371,7 +1429,7 @@ class Trader {
       return;
     }
     this.redeemer.start(
-      this.executeRedeem.bind(this),
+      this.executeRedeemBatch.bind(this),
       this.config.polymarket.funderAddress || "",
       () => this.balanceCache.invalidate()
     );
@@ -1577,13 +1635,13 @@ class Trader {
     }
   }
   /**
-   * 执行 Redeem（供 Redeemer 调用）
+   * 批量执行 Redeem（供 Redeemer 调用）
    */
-  async executeRedeem(conditionId) {
+  async executeRedeemBatch(conditionIds) {
     if (!this.relayClient.isInitialized()) {
       throw new Error("RelayClient 未初始化");
     }
-    return this.relayClient.redeem(conditionId);
+    return this.relayClient.redeemBatch(conditionIds);
   }
   /**
    * 停止交易模块
@@ -1654,8 +1712,12 @@ ${message}`);
   process.on("beforeExit", async () => {
     await logger.flush();
   });
-  logger.section("PolyMarket 跟单机器人");
   const config = await processLock.ensureConfig();
+  if (process.env.POLYCOPY_DAEMON === "1") {
+    enterDaemonMode();
+    return;
+  }
+  logger.section("PolyMarket 跟单机器人");
   telegramService.init(
     config.telegram.botToken,
     config.telegram.adminChatId,
@@ -1721,10 +1783,6 @@ ${message}`);
       }
     }
   });
-  if (process.env.POLYCOPY_DAEMON === "1") {
-    enterDaemonMode();
-    return;
-  }
   let isShuttingDown = false;
   const shutdown = async () => {
     if (isShuttingDown) return;

package/dist/{process-lock-BbFF27h8.js → process-lock-y_yjnMCr.js}

@@ -467,12 +467,13 @@ async function ensureConfig() {
   }
   return config;
 }
+const normalizePath = (value) => value.replace(/\\/g, "/").toLowerCase();
+const distIndexPath = normalizePath(DIST_INDEX);
+const distCliPath = normalizePath(DIST_CLI);
 const normalizeCommand = (command) => command.replace(/\\/g, "/");
 const isPolycopyCommand = (command) => {
   const normalized = normalizeCommand(command).toLowerCase();
-  const distIndexMarker = "dist/index.js";
-  const distCliMarker = "dist/cli.js";
-  return normalized.includes(DIST_INDEX.toLowerCase()) || normalized.includes(DIST_CLI.toLowerCase()) || normalized.includes(distIndexMarker) || normalized.includes(distCliMarker);
+  return normalized.includes(distIndexPath) || normalized.includes(distCliPath) || normalized.includes("dist/cli.js");
 };
 const findPolycopyPids = () => {
   if (process.platform === "win32") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polycopy",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "polycopy test",
   "main": "dist/index.js",
   "bin": {