polycopy 0.1.7 → 0.1.8

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-CEjGES8j.js");
+const processLock = require("./process-lock-BbFF27h8.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -23,44 +23,13 @@ function _interopNamespace(e) {
 }
 const fs__namespace = /* @__PURE__ */ _interopNamespace(fs);
 const path__namespace = /* @__PURE__ */ _interopNamespace(path);
-function ensurePidDir() {
-  if (!fs__namespace.existsSync(paths.PID_DIR)) {
-    fs__namespace.mkdirSync(paths.PID_DIR, { recursive: true });
-  }
-}
-function getRunningPid() {
-  if (!fs__namespace.existsSync(paths.PID_FILE)) {
-    return null;
-  }
-  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);
-    return null;
-  }
-}
-function savePid(pid) {
-  ensurePidDir();
-  fs__namespace.writeFileSync(paths.PID_FILE, pid.toString());
-}
-function removePid() {
-  if (fs__namespace.existsSync(paths.PID_FILE)) {
-    fs__namespace.unlinkSync(paths.PID_FILE);
-  }
-}
 function showHelp() {
   console.log(`
 PolyMarket 跟单机器人
 
 用法:
   polycopy [选项]       启动机器人
-  polycopy stop         停止后台运行的机器人
+  polycopy stop         停止运行的机器人
   polycopy log          查看实时日志（Ctrl+C 退出）
   polycopy config       进入配置向导
 
@@ -82,93 +51,30 @@ function showVersion() {
   console.log(`polycopy v${pkg.version}`);
 }
 async function startForeground() {
-  const runningPid = getRunningPid();
+  const runningPid = processLock.resolveRunningPid();
   if (runningPid) {
-    console.log(`⚠️  已有进程运行中 (PID: ${runningPid})`);
-    console.log(`   使用 'polycopy stop' 停止后再启动`);
+    console.log(`⚠️  程序正在运行中 (PID: ${runningPid})`);
+    console.log(`   请先停止程序后再启动`);
     process.exit(1);
   }
-  savePid(process.pid);
-  const cleanup = () => {
-    removePid();
-  };
-  process.on("exit", cleanup);
-  process.on("SIGINT", () => {
-    cleanup();
-    process.exit(0);
-  });
-  process.on("SIGTERM", () => {
-    cleanup();
-    process.exit(0);
-  });
   const mainPath = path__namespace.join(__dirname, "index.js");
   await import(mainPath);
 }
 async function startDaemon() {
-  const runningPid = getRunningPid();
+  const runningPid = processLock.resolveRunningPid();
   if (runningPid) {
-    console.log(`⚠️  已有进程运行中 (PID: ${runningPid})`);
-    console.log(`   使用 'polycopy stop' 停止后再启动`);
+    console.log(`⚠️  程序正在运行中 (PID: ${runningPid})`);
+    console.log(`   请先停止程序后再启动`);
     process.exit(1);
   }
   process.env.POLYCOPY_DAEMON = "1";
   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);
-}
 async function stopDaemon() {
-  const pid = getRunningPid();
+  const pid = processLock.resolveRunningPid();
   if (!pid) {
-    const fallbackPids = findPolycopyPids();
-    if (fallbackPids.length === 0) {
-      console.log("ℹ️  没有运行中的前台/后台进程");
-      return;
-    }
-    console.log(
-      `⚠️  未找到 PID 文件，尝试停止前台/后台进程 (${fallbackPids.length} 个)`
-    );
-    await Promise.all(
-      fallbackPids.map((fallbackPid) => stopPid(fallbackPid))
-    );
+    console.log("ℹ️  没有运行中的前台/后台进程");
     return;
   }
   await stopPid(pid, true);
@@ -180,7 +86,7 @@ async function stopPid(pid, isPrimary = false) {
   } catch (error) {
     console.error(`❌ 停止失败 (PID: ${pid}):`, error);
     if (isPrimary) {
-      removePid();
+      processLock.removePid();
     }
     return;
   }
@@ -192,7 +98,7 @@ async function stopPid(pid, isPrimary = false) {
     } catch {
       console.log("✅ 进程已停止");
       if (isPrimary) {
-        removePid();
+        processLock.removePid();
       }
       return;
     }
@@ -204,29 +110,53 @@ async function stopPid(pid, isPrimary = false) {
     console.error(`❌ 强制终止失败 (PID: ${pid}):`, error);
   } finally {
     if (isPrimary) {
-      removePid();
+      processLock.removePid();
     }
   }
 }
 async function runConfig() {
-  const configPath = path__namespace.join(__dirname, "config.js");
-  await import(configPath);
+  const runningPid = processLock.resolveRunningPid();
+  if (runningPid) {
+    console.log(`⚠️  程序正在运行中 (PID: ${runningPid})`);
+    console.log("   请先停止程序后再配置");
+    process.exit(1);
+  }
+  await processLock.initConfig();
+  process.exit(0);
 }
 function getLatestLogFile() {
-  if (!fs__namespace.existsSync(paths.LOGS_DIR)) {
+  if (!fs__namespace.existsSync(processLock.LOGS_DIR)) {
     return null;
   }
-  const files = fs__namespace.readdirSync(paths.LOGS_DIR).filter((f) => f.endsWith(".log")).sort().reverse();
-  return files.length > 0 ? path__namespace.join(paths.LOGS_DIR, files[0]) : null;
+  const logFiles = fs__namespace.readdirSync(processLock.LOGS_DIR).filter(
+    (filename) => filename.startsWith("polycopy.") && filename.endsWith(".log")
+  ).map((filename) => path__namespace.join(processLock.LOGS_DIR, filename));
+  if (logFiles.length === 0) {
+    return null;
+  }
+  let latestFile = logFiles[0];
+  let latestTime = 0;
+  for (const filePath of logFiles) {
+    try {
+      const stat = fs__namespace.statSync(filePath);
+      if (stat.mtimeMs >= latestTime) {
+        latestTime = stat.mtimeMs;
+        latestFile = filePath;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return latestFile;
 }
 function showLogs() {
-  const runningPid = getRunningPid();
+  const runningPid = processLock.resolveRunningPid();
   if (!runningPid) {
     console.log("ℹ️  没有运行中的后台进程");
     console.log("   使用 'polycopy -d' 启动后台进程");
     return;
   }
-  if (!fs__namespace.existsSync(paths.LOGS_DIR)) {
+  if (!fs__namespace.existsSync(processLock.LOGS_DIR)) {
     console.log("ℹ️  日志目录不存在");
     return;
   }
@@ -247,23 +177,26 @@ function showLogs() {
       stdio: "inherit"
     }
   );
-  const watcher = fs__namespace.watch(paths.LOGS_DIR, (eventType, filename) => {
-    if (eventType === "rename" && filename?.endsWith(".log")) {
-      const newLogFile = getLatestLogFile();
-      if (newLogFile && newLogFile !== currentLogFile) {
-        console.log(`
+  const watcher = fs__namespace.watch(
+    processLock.LOGS_DIR,
+    (eventType, filename) => {
+      if (eventType === "rename" && filename && filename.startsWith("polycopy.") && filename.endsWith(".log")) {
+        const newLogFile = getLatestLogFile();
+        if (newLogFile && newLogFile !== currentLogFile) {
+          console.log(`
 >>> 切换到新日志文件: ${newLogFile}
 `);
-        currentLogFile = newLogFile;
-        if (tail) {
-          tail.kill();
+          currentLogFile = newLogFile;
+          if (tail) {
+            tail.kill();
+          }
+          tail = child_process.spawn("tail", ["-f", "-n", "10", currentLogFile], {
+            stdio: "inherit"
+          });
         }
-        tail = child_process.spawn("tail", ["-f", "-n", "10", currentLogFile], {
-          stdio: "inherit"
-        });
       }
     }
-  });
+  );
   const cleanup = () => {
     watcher.close();
     if (tail) {
@@ -305,7 +238,7 @@ async function main() {
     case void 0:
     case "start":
       if (args.includes("-d") || args.includes("--daemon")) {
-        startDaemon();
+        await startDaemon();
       } else {
         await startForeground();
       }