polycopy 0.1.0 → 0.1.1

package/dist/config.js

@@ -1,5 +1,5 @@
 "use strict";
-const init = require("./init-OIFlNHFx.js");
+const init = require("./init-C5cwUXyD.js");
 async function main() {
   try {
     await init.runConfigWizard();

package/dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
-const init = require("./init-OIFlNHFx.js");
+const init = require("./init-C5cwUXyD.js");
 const grammy = require("grammy");
 const wallet = require("@ethersproject/wallet");
 const clobClient = require("@polymarket/clob-client");
@@ -204,13 +204,13 @@ class ClobClientWrapper {
         clobClient.OrderType.GTC
       );
       if (response.success) {
-        init.logger.success(`买单创建成功: ${response.orderID}`);
+        init.logger.success(`买单已提交: ${response.orderID}`);
         return {
           success: true,
           orderId: response.orderID
         };
       } else {
-        init.logger.error(`买单创建失败: ${response.errorMsg}`);
+        init.logger.error(`买单提交失败: ${response.errorMsg}`);
         return {
           success: false,
           orderId: "",
@@ -219,7 +219,7 @@ class ClobClientWrapper {
       }
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
-      init.logger.error(`买单创建异常: ${errorMsg}`);
+      init.logger.error(`买单提交失败: ${errorMsg}`);
       return {
         success: false,
         orderId: "",
@@ -410,7 +410,7 @@ class AssetFilter {
       this.traded.set(endTime, /* @__PURE__ */ new Set());
     }
     this.traded.get(endTime).add(assetId);
-    init.logger.info(`已标记 assetId 交易完成: ${assetId.slice(0, 10)}...`);
+    init.logger.info(`已标记 assetId: ${assetId.slice(0, 10)}...`);
   }
   /**
    * 清理过期记录
@@ -530,10 +530,20 @@ class Redeemer {
   records = /* @__PURE__ */ new Map();
   intervalId;
   delayTimeoutId;
-  running = false;
+  // stopped: 未启动; running: 正常轮询; paused: 限流等待恢复
+  state = "stopped";
+  scheduler;
   redeemFn = null;
   funderAddress = "";
   onRedeemSuccess = null;
+  constructor(scheduler = {
+    setInterval: setPromiseInterval__default.default,
+    clearInterval: setPromiseInterval.clearPromiseInterval,
+    setTimeout,
+    clearTimeout
+  }) {
+    this.scheduler = scheduler;
+  }
   /**
    * 启动 Redeemer
    * @param redeemFn 执行 Redeem 的函数（返回交易哈希）
@@ -541,26 +551,24 @@ class Redeemer {
    * @param onRedeemSuccess Redeem 成功后的回调（用于更新余额缓存）
    */
   start(redeemFn, funderAddress, onRedeemSuccess) {
-    if (this.running) {
+    if (this.state !== "stopped") {
       return;
     }
     this.redeemFn = redeemFn;
     this.funderAddress = funderAddress;
     this.onRedeemSuccess = onRedeemSuccess || null;
-    this.running = true;
-    init.logger.info("自动 redeem 已启动");
-    this.intervalId = setPromiseInterval__default.default(async () => {
-      await this.runOnce();
-    }, BASE_INTERVAL);
+    this.state = "running";
+    init.logger.success("自动 redeem 已启动");
+    this.startInterval();
   }
   /**
-   * 启动定时任务
+   * 启动定时任务（仅在 running 状态生效）
    */
   startInterval() {
-    if (!this.running || this.intervalId !== void 0) {
+    if (this.state !== "running" || this.intervalId !== void 0) {
       return;
     }
-    this.intervalId = setPromiseInterval__default.default(async () => {
+    this.intervalId = this.scheduler.setInterval(async () => {
       await this.runOnce();
     }, BASE_INTERVAL);
   }
@@ -569,15 +577,19 @@ class Redeemer {
    */
   pauseAndRestart(delayMs) {
     if (this.intervalId !== void 0) {
-      setPromiseInterval.clearPromiseInterval(this.intervalId);
+      this.scheduler.clearInterval(this.intervalId);
       this.intervalId = void 0;
     }
-    this.delayTimeoutId = setTimeout(() => {
+    if (this.delayTimeoutId) {
+      this.scheduler.clearTimeout(this.delayTimeoutId);
       this.delayTimeoutId = void 0;
-      if (this.running) {
-        this.runOnce().finally(() => {
-          this.startInterval();
-        });
+    }
+    this.state = "paused";
+    this.delayTimeoutId = this.scheduler.setTimeout(() => {
+      this.delayTimeoutId = void 0;
+      if (this.state === "paused") {
+        this.state = "running";
+        this.startInterval();
       }
     }, delayMs);
   }
@@ -586,14 +598,14 @@ class Redeemer {
    */
   stop() {
     if (this.intervalId !== void 0) {
-      setPromiseInterval.clearPromiseInterval(this.intervalId);
+      this.scheduler.clearInterval(this.intervalId);
       this.intervalId = void 0;
     }
     if (this.delayTimeoutId) {
-      clearTimeout(this.delayTimeoutId);
+      this.scheduler.clearTimeout(this.delayTimeoutId);
       this.delayTimeoutId = void 0;
     }
-    this.running = false;
+    this.state = "stopped";
     init.logger.info("Redeemer 已停止");
   }
   /**
@@ -621,7 +633,9 @@ class Redeemer {
         positions.push({
           conditionId: item.conditionId,
           assetId: item.asset,
-          currentValue
+          currentValue,
+          slug: item.slug,
+          outcome: item.outcome
         });
       } else {
         break;
@@ -633,7 +647,7 @@ class Redeemer {
    * 执行一轮 Redeem
    */
   async runOnce() {
-    if (!this.running || !this.redeemFn) {
+    if (this.state !== "running" || !this.redeemFn) {
       return;
     }
     let positions;
@@ -651,7 +665,16 @@ class Redeemer {
       init.logger.error(`获取仓位失败: ${errorMsg}`);
       return;
     }
-    init.logger.info(`自动 redeem: ${positions.length} 个可 Redeem 仓位`);
+    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 }))
+      );
+    }
     for (const position of positions) {
       let record = this.records.get(position.conditionId);
       if (!record) {
@@ -679,11 +702,10 @@ conditionId: ${position.conditionId}
         }
       } else if (record.failedCount < MAX_MATCH_TIMES) {
         try {
-          const txHash = await this.redeemFn(position.conditionId);
+          const txHash = await this.redeemFn?.(position.conditionId);
           record.success = true;
-          init.logger.info(`Redeem 交易已提交: ${txHash}`);
+          init.logger.info(`Redeem 已执行: ${txHash}`);
         } catch (error) {
-          record.failedCount++;
           const errorMsg = error instanceof Error ? error.message : String(error);
           if (errorMsg.includes("429") || errorMsg.includes("Too Many Requests")) {
             const resetSeconds = this.parseResetSeconds(errorMsg);
@@ -692,6 +714,7 @@ conditionId: ${position.conditionId}
             this.pauseAndRestart((resetSeconds + 60) * 1e3);
             return;
           }
+          record.failedCount++;
           init.logger.error(
             `Redeem 异常 (第 ${record.failedCount} 次): ${errorMsg}`
           );
@@ -706,24 +729,49 @@ conditionId: ${position.conditionId}
         }
       }
     }
-    const successList = [];
+    const successItems = [];
     for (const [conditionId, record] of this.records.entries()) {
       const stillExists = positions.some((p) => p.conditionId === conditionId);
       if (!stillExists) {
-        successList.push(
-          `${record.position.assetId.slice(0, 10)}... (${record.position.currentValue} USDC, matched: ${record.matchedCount})`
-        );
+        successItems.push({
+          position: record.position,
+          matchedCount: record.matchedCount
+        });
         this.records.delete(conditionId);
       }
     }
-    if (successList.length > 0) {
-      init.logger.success(`Redeem 成功: ${successList.length} 个`);
-      for (const item of successList) {
-        init.logger.line("", `- ${item}`);
-      }
+    if (successItems.length > 0) {
+      const successTitle = `自动 redeem: 成功 ${successItems.length} 个`;
+      const successLines = this.logPositions(successTitle, successItems);
+      notifier.success(successTitle, successLines.join("\n"));
       this.onRedeemSuccess?.();
     }
-    init.logger.info(`redeem 记录: ${this.records.size} 个待确认`);
+    init.logger.info(`redeem 状态: ${this.records.size} 个待确认`);
+  }
+  /**
+   * 统一格式化仓位信息
+   */
+  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) {
+    init.logger.info(title);
+    const lines = [];
+    for (const item of items) {
+      const line = this.formatPositionLine(
+        item.position,
+        item.matchedCount
+      );
+      lines.push(line);
+      init.logger.line("", `- ${line}`);
+    }
+    return lines;
   }
   /**
    * 解析 429 错误中的 resets in 时间
@@ -862,8 +910,7 @@ class Trader {
     }
     this.assetFilter.markTraded(assetId, endTime);
     if (sellPrice === 1) {
-      init.logger.success(`买单已提交: ${buyResult.orderId}`);
-      init.logger.line("", "sellPrice = 1，成交后将自动 redeem");
+      init.logger.info("sellPrice = 1，成交后将自动 redeem");
       return;
     }
     this.watchAndHandle(
@@ -990,10 +1037,10 @@ class Trader {
     init.logger.info(`创建卖单: ${size.toFixed(4)} 份 @ ${price}`);
     const sellResult = await this.client.createSellOrder(assetId, price, size);
     if (sellResult.success) {
-      init.logger.success(`卖单已创建: ${sellResult.orderId}`);
+      init.logger.success(`卖单已提交: ${sellResult.orderId}`);
     } else {
-      init.logger.error(`卖单创建失败: ${sellResult.errorMsg}`);
-      notifier.error("卖单创建失败", `错误: ${sellResult.errorMsg}`);
+      init.logger.error(`卖单提交失败: ${sellResult.errorMsg}`);
+      notifier.error("卖单提交失败", `错误: ${sellResult.errorMsg}`);
     }
   }
   /**

package/dist/{init-OIFlNHFx.js → init-C5cwUXyD.js}

@@ -462,7 +462,7 @@ class TelegramListener {
       logger.info("正在启动 Bot...");
       const botInfo = await this.bot.api.getMe();
       const botId = botInfo.id;
-      logger.success(`Bot 信息: @${botInfo.username} (ID: ${botId})`);
+      logger.info(`Bot 信息: @${botInfo.username} (ID: ${botId})`);
       await this.checkAndDisplayChannels(botId);
       if (onReady) {
         await onReady();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polycopy",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "polycopy test",
   "main": "dist/index.js",
   "bin": {
@@ -15,7 +15,8 @@
     "cli": "node dist/cli.js",
     "preuninstall": "node dist/cli.js stop 2>/dev/null || true",
     "prepublishOnly": "npm run build",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "HOME=$PWD node --import tsx tests/redeemer.test.ts",
+    "test:redeemer": "HOME=$PWD node --import tsx tests/redeemer.test.ts"
   },
   "dependencies": {
     "@polymarket/builder-relayer-client": "^0.0.8",
@@ -33,6 +34,7 @@
     "@types/lodash": "^4.17.23",
     "@types/node": "^20.0.0",
     "prettier": "^3.7.4",
+    "tsx": "^4.19.2",
     "typescript": "^5.9.3",
     "vite": "^7.3.1",
     "vite-tsconfig-paths": "^6.0.4"