fix: stabilize ToolHub logging

2026-05-23 02:42:46 +08:00
parent c62328c419
commit 1d49609131
8 changed files with 57 additions and 145 deletions
--- a/code/th_01_base.js
+++ b/code/th_01_base.js
@@ -1188,8 +1188,15 @@ function applyRule(rule, kv) {
 }

 // =======================【日志：文件写入器（尽力落盘 + 自动清理旧日志）】=======================
-// =======================【日志：文件写入器（全局统一目录 + 分级）】=======================
-// 优化后的日志系统（带缓冲，减少文件 IO）
+function sanitizeLogMessage(msg) {
+  try {
+    var s = String(msg == null ? "" : msg);
+    s = s.replace(/(authorization\s*[:=]\s*bearer\s+)[^\s,;]+/ig, "$1[REDACTED]");
+    s = s.replace(/((access_)?token|api[_-]?key|password|passwd|secret)(\s*[=:]\s*)[^\s,;]+/ig, "$1$3[REDACTED]");
+    return s;
+  } catch (e) { return String(msg == null ? "" : msg); }
+}
+
 function ToolHubLogger(procInfo) {
  this.proc = procInfo || {};
  this.dir = PATH_LOG_DIR;
@@ -1199,17 +1206,10 @@ function ToolHubLogger(procInfo) {
  this.debug = false;
  this.initOk = false;
  this.lastInitErr = "";
-
-  // 新增：日志缓冲
-  this._buffer = [];
-  this._bufferSize = 20; // 每 20 条写一次磁盘
-  this._flushTimer = null;
-
  this._initOnce();
 }

 ToolHubLogger.prototype._now = function() { return new Date().getTime(); };
-
 ToolHubLogger.prototype._initOnce = function() {
  try {
    if (FileIO.ensureDir(this.dir)) {
@@ -1224,110 +1224,22 @@ ToolHubLogger.prototype._initOnce = function() {
    this.lastInitErr = String(e);
  }
 };
-
 ToolHubLogger.prototype.updateConfig = function(cfg) {
  if (!cfg) return;
  if (typeof cfg.LOG_KEEP_DAYS === "number") this.keepDays = cfg.LOG_KEEP_DAYS;
  if (typeof cfg.LOG_ENABLE !== "undefined") this.enable = !!cfg.LOG_ENABLE;
  if (typeof cfg.LOG_DEBUG !== "undefined") this.debug = !!cfg.LOG_DEBUG;
 };
-
-ToolHubLogger.prototype._line = function(level, msg) {
-  var ts = this._now();
-  var d = new Date(ts);
-  function pad2(x) { return (x < 10 ? "0" : "") + x; }
-  var t = d.getFullYear() + "-" + pad2(d.getMonth() + 1) + "-" + pad2(d.getDate()) +
-    " " + pad2(d.getHours()) + ":" + pad2(d.getMinutes()) + ":" + pad2(d.getSeconds());
-  return t + " [" + level + "] " + msg + "\n";
-};
-
-ToolHubLogger.prototype._scheduleFlush = function() {
-  if (this._flushTimer) try { this._flushTimer.cancel(); } catch(e) {}
-  var self = this;
-  this._flushTimer = new java.util.Timer();
-  this._flushTimer.schedule(new java.util.TimerTask({
-    run: function() { self._flushBuffer(); }
-  }), 3000); // 3秒后强制刷新
-};
-
-ToolHubLogger.prototype._flushBuffer = function() {
-  if (this._buffer.length === 0) return;
-  var content = this._buffer.join('');
-  this._buffer = [];
-  var path = this.dir + "/" + this.prefix + "_" + this._ymd() + ".log";
-  FileIO.appendText(path, content);
-};
-
 ToolHubLogger.prototype._ymd = function() {
  var d = new Date();
  return "" + d.getFullYear() +
    ((d.getMonth() < 9 ? "0" : "") + (d.getMonth() + 1)) +
    ((d.getDate() < 10 ? "0" : "") + d.getDate());
 };
-
-ToolHubLogger.prototype._write = function(level, msg) {
-  if (!this.enable) return false;
-  this._buffer.push(this._line(level, msg));
-
-  // 缓冲满或错误级别立即写入
-  if (this._buffer.length >= this._bufferSize || level === 'F' || level === 'E') {
-    this._flushBuffer();
-  } else {
-    this._scheduleFlush(); // 延迟写入
-  }
-  return true;
-};
-
-ToolHubLogger.prototype.d = function(msg) { if (this.debug) this._write("D", msg); };
-ToolHubLogger.prototype.i = function(msg) { this._write("I", msg); };
-ToolHubLogger.prototype.w = function(msg) { this._write("W", msg); };
-ToolHubLogger.prototype.e = function(msg) { this._write("E", msg); };
-ToolHubLogger.prototype.fatal = function(msg) { this._write("F", msg); this._flushBuffer(); };
-
-ToolHubLogger.prototype.cleanupOldFiles = function() {
-  try {
-    if (!this.initOk) return false;
-    var dirF = new java.io.File(this.dir);
-    var files = dirF.listFiles();
-    if (!files) return false;
-    var now = this._now();
-    var cutoff = now - this.keepDays * 24 * 60 * 60 * 1000;
-    for (var i = 0; i < files.length; i++) {
-      var f = files[i];
-      if (f && f.isFile() && f.getName().indexOf(this.prefix) === 0 && f.lastModified() < cutoff) {
-        f["delete"]();
-      }
-    }
-    return true;
-  } catch (e) { return false; };
-};
-
 ToolHubLogger.prototype._filePathForToday = function() {
-  var name = this.prefix + "_" + this._ymd(this._now()) + ".log";
+  var name = this.prefix + "_" + this._ymd() + ".log";
  return this.dir + "/" + name;
 };
-ToolHubLogger.prototype._initOnce = function() {
-  try {
-    // # 尝试创建目录
-    if (FileIO.ensureDir(this.dir)) {
-      this.initOk = true;
-      // # 清理旧日志
-      this.cleanupOldFiles();
-    } else {
-      this.initOk = false;
-      this.lastInitErr = "Mkdirs failed: " + this.dir;
-    }
-  } catch (e) {
-    this.initOk = false;
-    this.lastInitErr = String(e);
-  }
-};
-ToolHubLogger.prototype.updateConfig = function(cfg) {
-  if (!cfg) return;
-  if (typeof cfg.LOG_KEEP_DAYS === "number") this.keepDays = cfg.LOG_KEEP_DAYS;
-  if (typeof cfg.LOG_ENABLE !== "undefined") this.enable = !!cfg.LOG_ENABLE;
-  if (typeof cfg.LOG_DEBUG !== "undefined") this.debug = !!cfg.LOG_DEBUG;
-};
 ToolHubLogger.prototype._line = function(level, msg) {
  var ts = this._now();
  var d = new Date(ts);
@@ -1339,7 +1251,7 @@ ToolHubLogger.prototype._line = function(level, msg) {
    proc = " uid=" + String(this.proc.uid) + " pid=" + String(this.proc.pid) + " tid=" + String(this.proc.tid) +
      " th=" + String(this.proc.threadName) + " proc=" + String(this.proc.processName);
  } catch (e0) {}
-  return t + " [" + String(level) + "] " + String(msg) + proc + "\n";
+  return t + " [" + String(level) + "] " + sanitizeLogMessage(msg) + proc + "\n";
 };
 ToolHubLogger.prototype._writeRaw = function(level, msg) {
  if (!this.initOk) return false;
--- a/code/th_05_persistence.js
+++ b/code/th_05_persistence.js
@@ -288,7 +288,6 @@ FloatBallAppWM.prototype.applyImmediateEffectsForKey = function(k) {
      try {
        if (this.L) {
          this.L.enable = !!this.config.LOG_ENABLE;
-          this.L.cfg.LOG_ENABLE = !!this.config.LOG_ENABLE;
          this.L.i("apply LOG_ENABLE=" + String(this.config.LOG_ENABLE));
        }
       } catch(eLE) { safeLog(null, 'e', "catch " + String(eLE)); }
@@ -298,7 +297,6 @@ FloatBallAppWM.prototype.applyImmediateEffectsForKey = function(k) {
      try {
        if (this.L) {
          this.L.debug = !!this.config.LOG_DEBUG;
-          this.L.cfg.LOG_DEBUG = !!this.config.LOG_DEBUG;
          this.L.i("apply LOG_DEBUG=" + String(this.config.LOG_DEBUG));
        }
       } catch(eLD) { safeLog(null, 'e', "catch " + String(eLD)); }
@@ -310,7 +308,6 @@ FloatBallAppWM.prototype.applyImmediateEffectsForKey = function(k) {
        this.config.LOG_KEEP_DAYS = n;
        if (this.L) {
          this.L.keepDays = n;
-          this.L.cfg.LOG_KEEP_DAYS = n;
          this.L.i("apply LOG_KEEP_DAYS=" + String(n));
          this.L.cleanupOldFiles();
        }
--- a/code/th_11_action.js
+++ b/code/th_11_action.js
@@ -21,24 +21,23 @@ FloatBallAppWM.prototype.execButtonAction = function(btn, idx) {
  }

  if (t === "open_viewer") {
-    var logPath = (this.L && this.L._filePathForToday) ? this.L._filePathForToday() : "";
-    if (!logPath) logPath = PATH_LOG_DIR + "/ShortX_ToolHub_" + (new java.text.SimpleDateFormat("yyyyMMdd").format(new java.util.Date())) + ".log";
-
-    var content = FileIO.readText(logPath);
-    if (!content) content = "(日志文件不存在或为空: " + logPath + ")";
-
-    if (content.length > 30000) {
-        content = "[...前略...]\n" + content.substring(content.length - 30000);
+    function tailLogText(path, maxLen) {
+      var txt = FileIO.readText(path);
+      if (!txt) return "(日志文件不存在或为空: " + path + ")";
+      txt = String(txt);
+      if (txt.length > maxLen) txt = "[...前略...]\n" + txt.substring(txt.length - maxLen);
+      try {
+        var lines = txt.split("\n");
+        if (lines.length > 1) txt = lines.reverse().join("\n");
+      } catch(eRev) { safeLog(null, 'e', "catch " + String(eRev)); }
+      return txt;
    }
-
-    // 简单的按行倒序，方便查看最新日志
-    try {
-        var lines = content.split("\n");
-        if (lines.length > 1) {
-             content = lines.reverse().join("\n");
-        }
-     } catch(eRev) { safeLog(null, 'e', "catch " + String(eRev)); }
-
+    var runLogPath = (this.L && this.L._filePathForToday) ? this.L._filePathForToday() : "";
+    if (!runLogPath) runLogPath = PATH_LOG_DIR + "/ShortX_ToolHub_" + (new java.text.SimpleDateFormat("yyyyMMdd").format(new java.util.Date())) + ".log";
+    var initLogPath = PATH_LOG_DIR + "/init.log";
+    var content = "【启动/更新日志】\n" + tailLogText(initLogPath, 15000) +
+      "\n\n【运行日志】\n" + tailLogText(runLogPath, 15000);
+    if (content.length > 32000) content = content.substring(0, 32000) + "\n[...后略...]";
    this.showViewerPanel("今日日志 (倒序)", content);
    return;
  }
@@ -132,7 +131,7 @@ return;
    if (r && r.ok) return;

    this.toast("shell 广播桥发送失败");
-    safeLog(this.L, 'e',  "shell all failed cmd_b64=" + cmdB64 + " ret=" + JSON.stringify(r || {}));
+    safeLog(this.L, 'e',  "shell all failed cmd_b64_len=" + String(cmdB64 ? cmdB64.length : 0) + " ret=" + JSON.stringify(r || {}));
    return;
  }

--- a/code/th_16_entry.js
+++ b/code/th_16_entry.js
@@ -128,17 +128,6 @@ FloatBallAppWM.prototype.close = function() {

  safeLog(this.L, 'i',  "close done");

-  // # 清理日志定时器
-  try {
-    if (this.L) {
-      try { this.L._flushBuffer(); } catch (eFlushLog0) { safeLog(this.L, 'e', "logger flush fail: " + String(eFlushLog0)); }
-      if (this.L._flushTimer) {
-        this.L._flushTimer.cancel();
-        this.L._flushTimer = null;
-      }
-    }
-  } catch (eLog) {}
-
  // # 清空缓存
  try {
    this._iconLru = null;