polycopy 0.0.9 → 0.1.1

package/dist/cli.js

@@ -3,7 +3,7 @@
 const child_process = require("child_process");
 const fs = require("fs");
 const path = require("path");
-const paths = require("./paths-CEeDxAGM.js");
+const paths = require("./paths-CEjGES8j.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -35,6 +35,10 @@ function getRunningPid() {
   try {
     const pid = parseInt(fs__namespace.readFileSync(paths.PID_FILE, "utf-8").trim());
     process.kill(pid, 0);
+    if (!isPolycopyProcess(pid)) {
+      fs__namespace.unlinkSync(paths.PID_FILE);
+      return null;
+    }
     return pid;
   } catch {
     fs__namespace.unlinkSync(paths.PID_FILE);
@@ -111,10 +115,65 @@ async function startDaemon() {
   const mainPath = path__namespace.join(__dirname, "index.js");
   await import(mainPath);
 }
+function isPolycopyProcess(pid) {
+  if (process.platform === "win32") {
+    return true;
+  }
+  const result = child_process.spawnSync("ps", ["-p", String(pid), "-o", "command="], {
+    encoding: "utf-8"
+  });
+  if (result.status !== 0) {
+    return false;
+  }
+  const command = result.stdout.trim();
+  if (!command) {
+    return false;
+  }
+  return command.includes(paths.DIST_INDEX) || command.includes(paths.DIST_CLI);
+}
+function findPolycopyPids() {
+  if (process.platform === "win32") {
+    return [];
+  }
+  const result = child_process.spawnSync("ps", ["-ax", "-o", "pid=,command="], {
+    encoding: "utf-8"
+  });
+  if (result.status !== 0) {
+    return [];
+  }
+  return result.stdout.split("\n").map((line) => line.trim()).filter(Boolean).map((line) => {
+    const firstSpace = line.indexOf(" ");
+    if (firstSpace === -1) return null;
+    const pidText = line.slice(0, firstSpace).trim();
+    const command = line.slice(firstSpace + 1).trim();
+    const pid = parseInt(pidText, 10);
+    if (Number.isNaN(pid)) return null;
+    if (pid === process.pid) return null;
+    if (!(command.includes(paths.DIST_INDEX) || command.includes(paths.DIST_CLI))) {
+      return null;
+    }
+    return pid;
+  }).filter((pid) => pid !== null);
+}
 function stopDaemon() {
   const pid = getRunningPid();
   if (!pid) {
-    console.log("ℹ️  没有运行中的后台进程");
+    const fallbackPids = findPolycopyPids();
+    if (fallbackPids.length === 0) {
+      console.log("ℹ️  没有运行中的前台/后台进程");
+      return;
+    }
+    console.log(
+      `⚠️  未找到 PID 文件，尝试停止前台/后台进程 (${fallbackPids.length} 个)`
+    );
+    fallbackPids.forEach((fallbackPid) => {
+      try {
+        process.kill(fallbackPid, "SIGTERM");
+        console.log(`✅ 已发送停止信号 (PID: ${fallbackPid})`);
+      } catch (error) {
+        console.error(`❌ 停止失败 (PID: ${fallbackPid}):`, error);
+      }
+    });
     return;
   }
   try {

package/dist/config.js

@@ -1,5 +1,5 @@
 "use strict";
-const init = require("./init-D8USSmrw.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-D8USSmrw.js");
+const init = require("./init-C5cwUXyD.js");
 const grammy = require("grammy");
 const wallet = require("@ethersproject/wallet");
 const clobClient = require("@polymarket/clob-client");
@@ -11,7 +11,7 @@ const builderRelayerClient = require("@polymarket/builder-relayer-client");
 const setPromiseInterval = require("set-promise-interval");
 const child_process = require("child_process");
 const fs = require("fs");
-const paths = require("./paths-CEeDxAGM.js");
+const paths = require("./paths-CEjGES8j.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -175,14 +175,14 @@ class ClobClientWrapper {
    */
   async getTickSize(tokenId) {
     const client = this.ensureInitialized();
-    return await client.getTickSize(tokenId);
+    return client.getTickSize(tokenId);
   }
   /**
    * 获取 token 是否为 negRisk
    */
   async getNegRisk(tokenId) {
     const client = this.ensureInitialized();
-    return await client.getNegRisk(tokenId);
+    return client.getNegRisk(tokenId);
   }
   /**
    * 创建买单（GTC 限价单）
@@ -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: "",
@@ -272,7 +272,7 @@ class ClobClientWrapper {
    */
   async getOrder(orderId) {
     const client = this.ensureInitialized();
-    return await client.getOrder(orderId);
+    return client.getOrder(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;
+    }
+    this.state = "paused";
+    this.delayTimeoutId = this.scheduler.setTimeout(() => {
       this.delayTimeoutId = void 0;
-      if (this.running) {
-        this.runOnce().finally(() => {
-          this.startInterval();
-        });
+      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(`redeemedRecord: ${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}`);
     }
   }
   /**
@@ -1003,7 +1050,7 @@ class Trader {
     if (!this.relayClient.isInitialized()) {
       throw new Error("RelayClient 未初始化");
     }
-    return await this.relayClient.redeem(conditionId);
+    return this.relayClient.redeem(conditionId);
   }
   /**
    * 停止交易模块
@@ -1021,7 +1068,11 @@ function enterDaemonMode() {
   const child = child_process.spawn(process.execPath, [__filename], {
     detached: true,
     stdio: "ignore",
-    env: { ...process.env, POLYCOPY_DAEMON: void 0 }
+    env: {
+      ...process.env,
+      POLYCOPY_DAEMON: void 0,
+      POLYCOPY_DAEMON_CHILD: "1"
+    }
   });
   if (child.pid) {
     fs__namespace.writeFileSync(paths.PID_FILE, child.pid.toString());
@@ -1075,7 +1126,7 @@ async function main() {
     config.telegram.botToken,
     config.telegram.targetChatIds || []
   );
-  listener.onChatIdsChanged(async (chatIds) => {
+  listener.onChatIdsChanged((chatIds) => {
     const telegram = init.configLocal.getItem("telegram");
     if (!telegram) {
       init.logger.error("警告: 无法保存频道 ID，telegram 配置不存在");
@@ -1106,6 +1157,13 @@ async function main() {
       }
     }
   });
+  if (process.env.POLYCOPY_DAEMON === "1") {
+    enterDaemonMode();
+    return;
+  }
+  const runMode = process.env.POLYCOPY_DAEMON_CHILD === "1" ? "后台模式" : "前台模式";
+  notifier.success("程序已启动", `模式: ${runMode}
+PID: ${process.pid}`);
   let isShuttingDown = false;
   const shutdown = () => {
     if (isShuttingDown) return;
@@ -1114,6 +1172,8 @@ async function main() {
     process.removeAllListeners("SIGTERM");
     init.logger.blank();
     init.logger.info("正在退出...");
+    notifier.warning("程序已停止", `模式: ${runMode}
+PID: ${process.pid}`);
     setTimeout(() => {
       process.exit(0);
     }, 1e3);
@@ -1123,10 +1183,6 @@ async function main() {
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
-  if (process.env.POLYCOPY_DAEMON === "1") {
-    enterDaemonMode();
-    return;
-  }
   await listener.start(() => {
     if (trader.isInitialized()) {
       trader.startRedeemer();

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

@@ -2,7 +2,7 @@
 const readline = require("readline");
 const fsExtra = require("fs-extra");
 const path = require("path");
-const paths = require("./paths-CEeDxAGM.js");
+const paths = require("./paths-CEjGES8j.js");
 const grammy = require("grammy");
 const winston = require("winston");
 const DailyRotateFile = require("winston-daily-rotate-file");
@@ -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();
@@ -578,7 +578,7 @@ class TelegramListener {
    */
   async getBotInfo() {
     try {
-      return await this.bot.api.getMe();
+      return this.bot.api.getMe();
     } catch (error) {
       throw new Error(`获取 Bot 信息失败: ${error}`);
     }
@@ -776,7 +776,7 @@ async function runConfigWizard(existingConfig) {
   return config;
 }
 async function initConfig() {
-  return await runConfigWizard();
+  return runConfigWizard();
 }
 async function configureTrading(existingConfig) {
   logger.section("交易配置");
@@ -917,7 +917,7 @@ async function ensureConfig() {
   const trading = configLocal.getItem("trading");
   if (!telegram && !polymarket && !trading) {
     logger.info("未找到配置文件，开始初始化配置...");
-    return await initConfig();
+    return initConfig();
   }
   const config = {
     telegram: telegram || { botToken: "" },
@@ -929,7 +929,7 @@ async function ensureConfig() {
     logger.warning("配置文件不完整，缺少以下字段:");
     validation.missingFields.forEach((field) => logger.item(`- ${field}`, 1));
     logger.info("开始重新配置...");
-    return await initConfig();
+    return initConfig();
   }
   if (!hasPolyMarketConfig(config)) {
     logger.info("未检测到 PolyMarket 配置");
@@ -937,7 +937,7 @@ async function ensureConfig() {
       "是否要运行完整配置向导？(y/n，默认 n，选择 n 将跳过配置): "
     );
     if (useFullWizard.trim().toLowerCase() === "y") {
-      return await runConfigWizard(config);
+      return runConfigWizard(config);
     } else {
       logger.info("ℹ️  已跳过 PolyMarket 配置");
     }

package/dist/{paths-CEeDxAGM.js → paths-CEjGES8j.js}

@@ -9,6 +9,11 @@ const PID_DIR = USER_DATA_DIR;
 const LOGS_DIR = path__default.default.join(USER_DATA_DIR, "logs");
 const LOCALSTORAGE_DIR = path__default.default.join(USER_DATA_DIR, "localstorage");
 const PID_FILE = path__default.default.join(USER_DATA_DIR, "polycopy.pid");
+const INSTALL_ROOT = path__default.default.resolve(__dirname, "..");
+const DIST_INDEX = path__default.default.join(INSTALL_ROOT, "dist", "index.js");
+const DIST_CLI = path__default.default.join(INSTALL_ROOT, "dist", "cli.js");
+exports.DIST_CLI = DIST_CLI;
+exports.DIST_INDEX = DIST_INDEX;
 exports.LOCALSTORAGE_DIR = LOCALSTORAGE_DIR;
 exports.LOGS_DIR = LOGS_DIR;
 exports.PID_DIR = PID_DIR;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polycopy",
-  "version": "0.0.9",
+  "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"