tt-help-cli-ycl 1.4.134 → 1.4.136

package/src/watch/public/app.js

@@ -1424,6 +1424,12 @@ async function fetchLlmConfig() {
     // 根据当前 provider 渲染模型下拉
     renderModelSelect(data.provider, data.model);
 
+    // 如果选择了 none，则禁用相关输入并显示已禁用状态
+    const isNone = data.provider === "none";
+    if (modelSel) modelSel.disabled = !!isNone;
+    if (urlInput) urlInput.disabled = !!isNone;
+    if (keyInput) keyInput.disabled = !!isNone;
+
     if (urlInput) urlInput.value = data.url || "";
     if (keyInput) {
       keyInput.value = data.hasApiKey ? data.apiKeyHint : "";
@@ -1436,8 +1442,13 @@ async function fetchLlmConfig() {
     }
     if (status) {
       const provider = _llmProvidersCache.find((p) => p.id === data.provider);
-      status.textContent = `当前: ${provider?.name || data.provider} / ${data.model}`;
-      status.className = "settings-status ok";
+      if (isNone) {
+        status.textContent = `当前: LLM 已禁用`;
+        status.className = "settings-status warn";
+      } else {
+        status.textContent = `当前: ${provider?.name || data.provider} / ${data.model}`;
+        status.className = "settings-status ok";
+      }
     }
   } catch (e) {
     console.error("fetchLlmConfig error:", e);
@@ -3824,7 +3835,22 @@ function renderClientCard(
           "span",
           "color:#555;font-size:12px;margin-left:8px",
           c.hostname || "",
-        ),
+        ) +
+        (online && c.clientId
+          ? tag(
+              "button",
+              {
+                onclick:
+                  "wdShowLogsModal('" +
+                  esc(c.clientId) +
+                  "','__watchdog__','看门狗自身日志')",
+                style:
+                  "padding:2px 8px;font-size:11px;background:#333;color:#a78bfa;border:1px solid #444;border-radius:3px;cursor:pointer;margin-left:8px",
+                title: "查看看门狗自身最近日志（后台按需拉取）",
+              },
+              "📄 看门狗日志",
+            )
+          : ""),
     ) +
       styled(
         "div",
@@ -3859,7 +3885,7 @@ function renderClientCard(
       renderErrorTriggerSection(c, userId, errorTriggers) +
       renderLoginSection(c, userId, loginPorts) +
       renderProxySection(c, userId) +
-      renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis),
+      renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis, c.clientId),
   );
 }
 
@@ -4503,7 +4529,7 @@ function wdSwitchNode(userId, node, port) {
 }
 
 // 统一的命令行视图：每条命令一行，含运行状态
-function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
+function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
   var match = matchProcsToCmds(myCmds, procs);
   var html = styled(
     "div",
@@ -4531,8 +4557,8 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
   // 表头
   html += styled(
     "div",
-    "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;color:#666;font-size:11px;border-bottom:1px solid #222",
-    "<span>命令行</span><span>PID</span><span>内存</span><span>运行</span><span>重启</span><span>操作</span>",
+    "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;color:#666;font-size:11px;border-bottom:1px solid #222",
+    "<span>命令行</span><span>PID</span><span>内存</span><span>运行</span><span>重启</span><span>操作</span><span>日志</span>",
   );
 
   // 命令行
@@ -4554,7 +4580,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     var prefix = "wd-" + esc(userId) + "-" + idx;
     html += styled(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
+      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
       styled(
         "span",
         "color:" +
@@ -4636,7 +4662,26 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
               },
               "✕",
             ),
-        ),
+        ) +
+        (clientId && isOnline && c.id
+          ? tag(
+              "button",
+              {
+                onclick:
+                  "wdShowLogsModal('" +
+                  esc(clientId) +
+                  "','" +
+                  esc(c.id) +
+                  "','" +
+                  esc((c.name || c.id).substring(0, 50)) +
+                  "')",
+                style:
+                  "padding:1px 5px;font-size:11px;background:#333;color:#a78bfa;border:1px solid #444;border-radius:2px;cursor:pointer",
+                title: "查看该进程最近日志（后台按需拉取）",
+              },
+              "📄",
+            )
+          : ""),
     );
 
     // AI 分析结果
@@ -4667,7 +4712,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     var opre = "wd-" + esc(userId) + "-orphan-" + esc(String(oid));
     html += styled(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
+      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
       styled(
         "span",
         "color:#666;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:monospace",
@@ -4693,7 +4738,26 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
           { style: "color:#555", "data-wd-key": opre + "-rst" },
           "0",
         ) +
-        styled("span", "color:#555;font-size:11px", "孤立"),
+        styled("span", "color:#555;font-size:11px", "孤立") +
+        (clientId && isOnline && p.cmdId
+          ? tag(
+              "button",
+              {
+                onclick:
+                  "wdShowLogsModal('" +
+                  esc(clientId) +
+                  "','" +
+                  esc(String(p.cmdId)) +
+                  "','" +
+                  esc(String(p.name || p.cmdId).substring(0, 50)) +
+                  "')",
+                style:
+                  "padding:1px 5px;font-size:11px;background:#333;color:#a78bfa;border:1px solid #444;border-radius:2px;cursor:pointer",
+                title: "查看该进程最近日志（后台按需拉取）",
+              },
+              "📄",
+            )
+          : ""),
     );
   });
 
@@ -4708,6 +4772,93 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
   return html;
 }
 
+// ── 弹窗：日志查看（按需拉取：请求入队 → 心跳下发 → 客户端回传落盘 → 轮询读取） ──
+
+var _wdLogs = {
+  clientId: "",
+  cmdId: "",
+  mtime: 0,
+  timer: null,
+  deadline: 0,
+  gotFirst: false,
+};
+
+function wdShowLogsModal(clientId, cmdId, title) {
+  if (!clientId || !cmdId) return;
+  if (_wdLogs.timer) {
+    clearInterval(_wdLogs.timer);
+    _wdLogs.timer = null;
+  }
+  _wdLogs.clientId = clientId;
+  _wdLogs.cmdId = cmdId;
+  _wdLogs.mtime = 0;
+  _wdLogs.deadline = Date.now() + 90000;
+  _wdLogs.gotFirst = false;
+  document.getElementById("wdLogsTitle").textContent = "📄 " + title;
+  document.getElementById("wdLogsStatus").textContent =
+    "⏳ 已请求客户端回传…";
+  document.getElementById("wdLogsContent").textContent =
+    "等待客户端心跳回传日志…\n（心跳周期 ≤15s，最长等待 90s；拿到后会实时刷新）";
+  document.getElementById("wdLogsModal").style.display = "flex";
+
+  // 入队拉取请求（服务端等该客户端下次心跳下发）
+  fetch("/api/watchdog/request-logs", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ clientId: clientId, cmdId: cmdId, tail: 500 }),
+  }).catch(function () {});
+
+  // 立即读一次（可能已有上次的日志），之后每 2s 轮询
+  wdPollLogs();
+  _wdLogs.timer = setInterval(wdPollLogs, 2000);
+}
+
+async function wdPollLogs() {
+  var s = _wdLogs;
+  if (!s.clientId) return;
+  try {
+    var res = await fetch(
+      "/api/watchdog/logs-file?clientId=" +
+        encodeURIComponent(s.clientId) +
+        "&cmdId=" +
+        encodeURIComponent(s.cmdId),
+    );
+    if (!res.ok) return;
+    var d = await res.json();
+    if (d.ok && d.content != null) {
+      if (d.mtimeMs !== s.mtime) {
+        s.mtime = d.mtimeMs;
+        s.gotFirst = true;
+        document.getElementById("wdLogsContent").textContent = d.content;
+        document.getElementById("wdLogsStatus").textContent =
+          "✅ " +
+          new Date(d.mtimeMs).toLocaleTimeString("zh-CN") +
+          " · " +
+          d.size +
+          " 字节 · 每 2s 自动刷新";
+      }
+    } else if (!s.gotFirst && Date.now() > s.deadline) {
+      document.getElementById("wdLogsStatus").textContent =
+        "⚠️ 等待超时：客户端离线或未响应（可关闭后重试）";
+      if (s.timer) {
+        clearInterval(s.timer);
+        s.timer = null;
+      }
+    }
+  } catch (e) {
+    /* 网络抖动忽略，下一轮再试 */
+  }
+}
+
+function wdCloseLogsModal() {
+  if (_wdLogs.timer) {
+    clearInterval(_wdLogs.timer);
+    _wdLogs.timer = null;
+  }
+  _wdLogs.clientId = "";
+  document.getElementById("wdLogsModal").style.display = "none";
+}
+
 // ── 弹窗：添加/编辑命令 ──
 
 var _wdModalUserId = "";

package/src/watch/public/index.html

@@ -686,7 +686,25 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260818"></script>
+  <!-- 日志查看弹窗（按需拉取 + 轮询） -->
+  <div id="wdLogsModal"
+    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:20px;width:90%;max-width:960px;height:85vh;display:flex;flex-direction:column">
+      <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:10px">
+        <div style="font-size:16px;color:#a78bfa" id="wdLogsTitle">📄 日志</div>
+        <div style="font-size:11px;color:#888" id="wdLogsStatus">⏳ 已请求客户端回传…</div>
+      </div>
+      <pre id="wdLogsContent"
+        style="flex:1;overflow:auto;background:#111;border:1px solid #333;border-radius:8px;padding:12px;color:#d4d4d4;font-family:monospace;font-size:12px;line-height:1.5;margin:0;white-space:pre-wrap;word-break:break-all">加载中...</pre>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:12px">
+        <button onclick="wdCloseLogsModal()"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">关闭</button>
+      </div>
+    </div>
+  </div>
+
+  <script src="app.js?v=20260826"></script>
 </body>
 
 </html>