polycopy 0.0.8 → 0.1.0

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-OIFlNHFx.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-OIFlNHFx.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 限价单）
@@ -272,7 +272,7 @@ class ClobClientWrapper {
    */
   async getOrder(orderId) {
     const client = this.ensureInitialized();
-    return await client.getOrder(orderId);
+    return client.getOrder(orderId);
   }
   /**
    * 取消订单
@@ -548,7 +548,7 @@ class Redeemer {
     this.funderAddress = funderAddress;
     this.onRedeemSuccess = onRedeemSuccess || null;
     this.running = true;
-    init.logger.info("Redeemer 已启动");
+    init.logger.info("自动 redeem 已启动");
     this.intervalId = setPromiseInterval__default.default(async () => {
       await this.runOnce();
     }, BASE_INTERVAL);
@@ -651,7 +651,7 @@ class Redeemer {
       init.logger.error(`获取仓位失败: ${errorMsg}`);
       return;
     }
-    init.logger.info(`autoRedeem: ${positions.length} 个可 Redeem 仓位`);
+    init.logger.info(`自动 redeem: ${positions.length} 个可 Redeem 仓位`);
     for (const position of positions) {
       let record = this.records.get(position.conditionId);
       if (!record) {
@@ -723,7 +723,7 @@ conditionId: ${position.conditionId}
       }
       this.onRedeemSuccess?.();
     }
-    init.logger.info(`redeemedRecord: ${this.records.size} 个待确认`);
+    init.logger.info(`redeem 记录: ${this.records.size} 个待确认`);
   }
   /**
    * 解析 429 错误中的 resets in 时间
@@ -1003,7 +1003,7 @@ class Trader {
     if (!this.relayClient.isInitialized()) {
       throw new Error("RelayClient 未初始化");
     }
-    return await this.relayClient.redeem(conditionId);
+    return this.relayClient.redeem(conditionId);
   }
   /**
    * 停止交易模块
@@ -1021,7 +1021,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 +1079,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 +1110,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 +1125,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 +1136,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-OIFlNHFx.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");
@@ -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.8",
+  "version": "0.1.0",
   "description": "polycopy test",
   "main": "dist/index.js",
   "bin": {