tt-help-cli-ycl 1.4.59 → 1.4.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.59",
+  "version": "1.4.61",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/watch/watchdog-server.js

@@ -83,9 +83,9 @@ function getOnlineClients() {
 
 function normalizeCmd(c) {
   if (typeof c === "string")
-    return { cmd: c, enabled: true, maxUptimeSeconds: 0, maxMemoryMB: 0 };
+    return { cmd: c.replace(/^[▶\n\r\s]+/, "").trim(), enabled: true, maxUptimeSeconds: 0, maxMemoryMB: 0 };
   return {
-    cmd: c.cmd || "",
+    cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim(),
     enabled: c.enabled !== false,
     maxUptimeSeconds: c.maxUptimeSeconds || 0,
     maxMemoryMB: c.maxMemoryMB || 0,
@@ -108,9 +108,14 @@ function getClientCommands(userId) {
 
 function setClientCommands(userId, commands) {
   if (!Array.isArray(commands)) return;
+  // 清洗每个命令中的非法前缀
+  const cleaned = commands.map((c) => {
+    if (typeof c === "string") return c.replace(/^[▶\n\r\s]+/, "").trim();
+    return { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
+  });
   const cfg = loadConfig();
   if (!cfg.clientCommands) cfg.clientCommands = {};
-  cfg.clientCommands[userId] = commands;
+  cfg.clientCommands[userId] = cleaned;
   saveConfig(cfg);
 }
 

package/src/watchdog/process-manager.js

@@ -11,13 +11,8 @@
 
 import { spawn, execSync } from "child_process";
 import { EventEmitter } from "events";
-import os from "os";
 
 const MAX_RESTART = 3;
-const SHELL =
-  os.platform() === "win32"
-    ? { cmd: process.env.COMSPEC || "cmd.exe", flag: "/c" }
-    : { cmd: "sh", flag: "-c" };
 
 function getProcessStats(pid) {
   try {
@@ -65,16 +60,17 @@ export class ProcessManager extends EventEmitter {
     let child;
     const startTime = Date.now();
     try {
-      // 有显式 args 则直接 spawn，否则用 sh -c 传递完整命令行（保留引号语义）
+      // 有显式 args 则直接 spawn，否则用 shell 模式传递完整命令行（跨平台兼容）
       if (args.length > 0) {
         child = spawn(command, args, {
           stdio: ["ignore", "pipe", "pipe"],
           detached: false,
         });
       } else {
-        child = spawn(SHELL.cmd, [SHELL.flag, command], {
+        child = spawn(command, {
           stdio: ["ignore", "pipe", "pipe"],
           detached: false,
+          shell: true,
         });
       }
     } catch (e) {
@@ -227,7 +223,8 @@ export class ProcessManager extends EventEmitter {
       .map((c) => {
         if (typeof c === "string")
           c = { cmd: c, maxUptimeSeconds: 0, maxMemoryMB: 0 };
-        const cmdLine = (c.cmd || "").trim();
+        // 清洗：去除可能混入的控制字符、状态图标等
+        const cmdLine = (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim();
         if (!cmdLine) return null;
         const id =
           cmdLine.length > 60 ? cmdLine.substring(0, 60) + "..." : cmdLine;