tt-help-cli-ycl 1.4.153 → 1.4.155

package/src/watch/public/app.js

@@ -4159,6 +4159,7 @@ function cmdObj(cmd) {
       enabled: true,
       maxUptimeSeconds: 0,
       maxMemoryMB: 0,
+      resumeAt: 0,
     };
   return {
     id: cmd.id || "",
@@ -4167,6 +4168,7 @@ function cmdObj(cmd) {
     enabled: cmd.enabled !== false,
     maxUptimeSeconds: cmd.maxUptimeSeconds || 0,
     maxMemoryMB: cmd.maxMemoryMB || 0,
+    resumeAt: cmd.resumeAt || 0,
   };
 }
 
@@ -4686,14 +4688,36 @@ function wdShowCountryModal(userId) {
       cc +
       '" ' +
       checked +
-      "/> " +
+      ' onchange="wdSyncAllCountriesCb()"/> ' +
       cc +
       "</label>";
   }
   document.getElementById("wdCountryList").innerHTML = html;
+  wdSyncAllCountriesCb();
   document.getElementById("wdCountryModal").style.display = "flex";
 }
 
+// 全选/全不选所有国家
+function wdToggleAllCountries(cb) {
+  var cbs = document.querySelectorAll(".wd-country-cb");
+  for (var i = 0; i < cbs.length; i++) cbs[i].checked = cb.checked;
+}
+
+// 根据国家勾选情况同步“全选”框状态（全部勾中→勾上，否则取消）
+function wdSyncAllCountriesCb() {
+  var allCb = document.getElementById("wdCountryAllCb");
+  if (!allCb) return;
+  var cbs = document.querySelectorAll(".wd-country-cb");
+  var all = cbs.length > 0;
+  for (var i = 0; i < cbs.length; i++) {
+    if (!cbs[i].checked) {
+      all = false;
+      break;
+    }
+  }
+  allCb.checked = all;
+}
+
 async function wdSetCountries() {
   var cbs = document.querySelectorAll(".wd-country-cb:checked");
   var countries = [];
@@ -5462,6 +5486,27 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
     var label =
       c.name || (c.cmd.length > 40 ? c.cmd.substring(0, 37) + "..." : c.cmd);
     var cmdTitle = c.name ? c.name + "\n" + c.cmd : c.cmd;
+    // 禁用中的定时恢复徽标（点击可改时间）
+    var resumeBadge = "";
+    if (!c.enabled && c.resumeAt) {
+      var rd = new Date(c.resumeAt);
+      var rhh = ("0" + rd.getHours()).slice(-2);
+      var rmm = ("0" + rd.getMinutes()).slice(-2);
+      var rtxt =
+        c.resumeAt > Date.now()
+          ? "⏰ " + rhh + ":" + rmm + " 自动启动"
+          : "⏰ 待心跳恢复";
+      resumeBadge = tag(
+        "span",
+        {
+          onclick: "wdShowCmdOffModal('" + esc(userId) + "'," + idx + ")",
+          style:
+            "color:#fbbf24;font-size:10px;margin-left:6px;cursor:pointer;white-space:nowrap",
+          title: "点击修改自动启动时间",
+        },
+        rtxt,
+      );
+    }
     var pid = p ? p.pid : "-";
     var mem = p && p.memoryMB != null ? p.memoryMB + "MB" : "-";
     var uptime = p ? p.uptimeDisplay || p.uptimeSeconds + "s" : "-";
@@ -5493,7 +5538,8 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
                 "color:#555;font-size:10px;margin-left:4px;font-family:monospace",
                 c.cmd.substring(0, 30) + (c.cmd.length > 30 ? "..." : ""),
               )
-            : ""),
+            : "") +
+          resumeBadge,
       ) +
         tag(
           "span",
@@ -5809,7 +5855,7 @@ function wdModalSave() {
   var myCmds = (allCmds[_wdModalUserId] || []).slice();
 
   if (_wdModalEditIdx >= 0) {
-    // 编辑模式：保留已有 ID
+    // 编辑模式：保留已有 ID 与定时恢复状态
     if (_wdModalEditIdx < myCmds.length) {
       var oldObj = cmdObj(myCmds[_wdModalEditIdx]);
       myCmds[_wdModalEditIdx] = {
@@ -5819,6 +5865,7 @@ function wdModalSave() {
         enabled: oldObj.enabled,
         maxUptimeSeconds: maxUp,
         maxMemoryMB: maxMem,
+        resumeAt: oldObj.resumeAt,
       };
     }
   } else {
@@ -5913,17 +5960,13 @@ function wdToggleClientCmd(userId, idx) {
   var myCmds = (allCmds[userId] || []).slice();
   if (idx >= myCmds.length) return;
   var cmd = myCmds[idx];
-  if (typeof cmd === "string") {
-    myCmds[idx] = {
-      id: String(Date.now()),
-      cmd: cmd,
-      enabled: false,
-      maxUptimeSeconds: 0,
-      maxMemoryMB: 0,
-    };
-  } else {
-    cmd.enabled = !cmd.enabled;
+  // 启用中（含老数据字符串命令）→ 弹关闭定时弹窗；已禁用 → 立即开启
+  if (typeof cmd === "string" || cmdObj(cmd).enabled) {
+    wdShowCmdOffModal(userId, idx);
+    return;
   }
+  cmd.enabled = true;
+  cmd.resumeAt = 0;
   // 立即更新按钮为 loading 状态
   var btn = event.target;
   if (btn && btn.tagName === "BUTTON") {
@@ -5934,6 +5977,47 @@ function wdToggleClientCmd(userId, idx) {
   wdSaveClientCmds(userId, myCmds);
 }
 
+// ── 关闭命令定时弹窗 ──
+
+var _wdOffUserId = "";
+var _wdOffIdx = -1;
+
+function wdShowCmdOffModal(userId, idx) {
+  if (!_wdData) return;
+  var myCmds = (_wdData.clientCommands || {})[userId] || [];
+  if (idx >= myCmds.length) return;
+  var c = cmdObj(myCmds[idx]);
+  _wdOffUserId = userId;
+  _wdOffIdx = idx;
+  document.getElementById("wdCmdOffName").textContent = c.name || c.cmd;
+  document.getElementById("wdCmdOffMinutes").value = "";
+  document.getElementById("wdCmdOffModal").style.display = "flex";
+}
+
+function wdCmdOffCancel() {
+  document.getElementById("wdCmdOffModal").style.display = "none";
+}
+
+// minutes: 数字分钟；0=永久关闭；undefined=读自定义输入框。
+// 只把 resumeDelayMinutes 传给服务端，恢复时间由服务端按服务器时钟换算。
+function wdCmdOffConfirm(minutes) {
+  var mins =
+    minutes !== undefined
+      ? Number(minutes) || 0
+      : parseInt(document.getElementById("wdCmdOffMinutes").value, 10) || 0;
+  document.getElementById("wdCmdOffModal").style.display = "none";
+  if (!_wdData) return;
+  var allCmds = _wdData.clientCommands || {};
+  var myCmds = (allCmds[_wdOffUserId] || []).slice();
+  if (_wdOffIdx >= myCmds.length) return;
+  var c = cmdObj(myCmds[_wdOffIdx]);
+  c.enabled = false;
+  c.resumeAt = 0;
+  c.resumeDelayMinutes = mins;
+  myCmds[_wdOffIdx] = c;
+  wdSaveClientCmds(_wdOffUserId, myCmds);
+}
+
 var _wdSaving = false;
 
 function wdShowSaving() {

package/src/watch/public/index.html

@@ -690,6 +690,37 @@
     </div>
   </div>
 
+  <!-- 命令关闭定时弹窗 -->
+  <div id="wdCmdOffModal"
+    style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
+    <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:420px">
+      <div style="font-size:16px;color:#f59e0b;margin-bottom:4px">⏸ 关闭命令</div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px"><span id="wdCmdOffName"
+          style="color:#e0e0e0;font-family:monospace"></span><br>关闭后经过所选时间自动重新启动（按服务器时钟计时，到点随心跳生效）：</div>
+      <div style="display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap">
+        <button onclick="wdCmdOffConfirm(30)"
+          style="padding:8px 14px;background:#333;color:#e0e0e0;border:none;border-radius:6px;cursor:pointer;font-size:12px">30分钟</button>
+        <button onclick="wdCmdOffConfirm(60)"
+          style="padding:8px 14px;background:#333;color:#e0e0e0;border:none;border-radius:6px;cursor:pointer;font-size:12px">1小时</button>
+        <button onclick="wdCmdOffConfirm(120)"
+          style="padding:8px 14px;background:#333;color:#e0e0e0;border:none;border-radius:6px;cursor:pointer;font-size:12px">2小时</button>
+        <button onclick="wdCmdOffConfirm(0)"
+          style="padding:8px 14px;background:#7f1d1d;color:#fca5a5;border:none;border-radius:6px;cursor:pointer;font-size:12px">永久关闭</button>
+      </div>
+      <div style="display:flex;gap:8px;align-items:center;margin-bottom:16px">
+        <label style="color:#888;font-size:12px;white-space:nowrap">自定义（分钟）</label>
+        <input id="wdCmdOffMinutes" type="number" min="1"
+          style="width:90px;padding:6px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:6px;font-size:12px;box-sizing:border-box">
+        <button onclick="wdCmdOffConfirm()"
+          style="padding:8px 14px;background:#f59e0b;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">确定</button>
+      </div>
+      <div style="display:flex;justify-content:flex-end">
+        <button onclick="wdCmdOffCancel()"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+      </div>
+    </div>
+  </div>
+
   <!-- 客户端配置编辑弹窗 -->
   <div id="wdConfigModal"
     style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
@@ -757,6 +788,12 @@
       <div style="font-size:16px;color:#fbbf24;margin-bottom:4px">🌍 节点国家配置 — <span id="wdCountryUserId"></span></div>
       <div style="color:#888;font-size:12px;margin-bottom:12px">选择该客户端可用的代理节点国家（可多选）。<br>未配置时默认使用 <b
           style="color:#fbbf24">US</b>。修改后客户端将在下次心跳时生效。</div>
+      <div style="margin-bottom:8px">
+        <label style="display:inline-flex;align-items:center;gap:6px;color:#e0e0e0;font-size:12px;cursor:pointer">
+          <input type="checkbox" id="wdCountryAllCb" onchange="wdToggleAllCountries(this)"
+            style="width:14px;height:14px"> 全选
+        </label>
+      </div>
       <div id="wdCountryList"
         style="padding:10px;background:#16161e;border:1px solid #333;border-radius:8px;min-height:120px">加载中...</div>
       <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
@@ -882,7 +919,7 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260828c"></script>
+  <script src="app.js?v=20260921a"></script>
 </body>
 
 </html>

package/src/watch/watchdog-server.js

@@ -195,10 +195,23 @@ function setClientCommands(userId, commands) {
         enabled: true,
         maxUptimeSeconds: 0,
         maxMemoryMB: 0,
+        resumeAt: 0,
       };
     }
     const obj = { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
     if (!obj.id) obj.id = String(Date.now() + nextId++);
+    // 关闭延迟启动：resumeDelayMinutes 是前端显式信号（本次关闭操作指定的分钟数）。
+    // 恢复时间一律按服务器时钟换算，避免浏览器时钟偏差导致提前/延后恢复。
+    if (obj.resumeDelayMinutes !== undefined) {
+      const mins = Number(obj.resumeDelayMinutes) || 0;
+      obj.resumeAt =
+        obj.enabled === false && mins > 0 ? Date.now() + mins * 60000 : 0;
+      delete obj.resumeDelayMinutes;
+    } else if (obj.enabled !== false) {
+      obj.resumeAt = 0; // 启用的命令不允许残留恢复时间
+    } else {
+      obj.resumeAt = obj.resumeAt || 0; // 未改动的禁用命令保留原定时
+    }
     return obj;
   });
   const cfg = loadConfig();
@@ -223,6 +236,30 @@ function getAllClientCommandsRaw() {
   return cfg.clientCommands || {};
 }
 
+// 命令到点自动恢复：禁用且 resumeAt 已过 → 置回启用并写盘。
+// 心跳前惰性触发（~15s 粒度足够）；客户端零改动，恢复后随本次心跳正常下发。
+function autoResumeCommands(userId) {
+  if (!userId) return;
+  const cfg = loadConfig();
+  const cmds = cfg.clientCommands && cfg.clientCommands[userId];
+  if (!cmds || !cmds.length) return;
+  const now = Date.now();
+  let resumed = [];
+  for (const c of cmds) {
+    if (c && c.enabled === false && c.resumeAt && c.resumeAt <= now) {
+      c.enabled = true;
+      c.resumeAt = 0;
+      resumed.push(c.id || c.cmd);
+    }
+  }
+  if (resumed.length) {
+    saveConfig(cfg);
+    console.error(
+      `[watchdog ${new Date().toLocaleTimeString("zh-CN", { hour12: false })}] ${userId} 命令到点自动恢复: ${resumed.join(", ")}`,
+    );
+  }
+}
+
 // ── 客户端配置管理（用于远程下发 ~/.tt-help.json 配置） ──
 
 function getClientConfigStored(userId) {
@@ -435,8 +472,9 @@ async function handleHeartbeat(params, body, res) {
     loginReport: body.loginReport || null,
   });
 
-  // 按 userId 返回该客户端的专属命令列表
+  // 按 userId 返回该客户端的专属命令列表（先处理到点自动恢复）
   const userId = (body.config && body.config.userId) || "";
+  autoResumeCommands(userId);
   const commands = getClientCommands(userId);
 
   // 幂等下发节点国家配置（默认 US）