chatccc 0.2.39 → 0.2.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.39",
+  "version": "0.2.40",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/crash-logging.test.ts

@@ -1,6 +1,9 @@
-import { describe, it, expect, vi } from "vitest";
-
-import { buildCrashLoggingHandlers, installCrashLogging } from "../shared.ts";
+import { mkdtemp, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, it, expect, vi } from "vitest";
+
+import { buildCrashLoggingHandlers, installCrashLogging, setupFileLogging } from "../shared.ts";
 
 describe("buildCrashLoggingHandlers", () => {
   it("uncaughtException: 写诊断、刷新日志、调用 onFatal", () => {
@@ -141,7 +144,7 @@ describe("buildCrashLoggingHandlers", () => {
   });
 });
 
-describe("installCrashLogging", () => {
+describe("installCrashLogging", () => {
   it("注册所有相关事件监听器", () => {
     const before = {
       uncaught: process.listenerCount("uncaughtException"),
@@ -206,5 +209,58 @@ describe("installCrashLogging", () => {
     } finally {
       cleanup();
     }
-  });
-});
+  });
+});
+
+describe("setupFileLogging", () => {
+  it("flush 后继续写日志不会触发 write after end，且日志已落盘", async () => {
+    const originalLog = console.log;
+    const originalError = console.error;
+    console.log = vi.fn() as never;
+    console.error = vi.fn() as never;
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-log-"));
+
+    try {
+      const fileLog = setupFileLogging(dir, "index");
+
+      console.log("before flush");
+      fileLog.flush();
+
+      expect(() => console.error("after flush")).not.toThrow();
+      fileLog.flush();
+
+      const content = await readFile(fileLog.logPath, "utf8");
+      expect(content).toContain("[LOG] before flush");
+      expect(content).toContain("[ERR] after flush");
+    } finally {
+      console.log = originalLog;
+      console.error = originalError;
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+
+  it("日志参数无法 JSON 序列化时也不会让 console 调用抛错", async () => {
+    const originalLog = console.log;
+    const originalError = console.error;
+    console.log = vi.fn() as never;
+    console.error = vi.fn() as never;
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-log-"));
+
+    try {
+      const fileLog = setupFileLogging(dir, "index");
+      const circular: Record<string, unknown> = { name: "root" };
+      circular.self = circular;
+
+      expect(() => console.log("circular", circular)).not.toThrow();
+      fileLog.flush();
+
+      const content = await readFile(fileLog.logPath, "utf8");
+      expect(content).toContain("[LOG] circular");
+      expect(content).toContain("self");
+    } finally {
+      console.log = originalLog;
+      console.error = originalError;
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+});

package/src/shared.ts

@@ -1,17 +1,17 @@
 import { execSync } from "node:child_process";
-import {
-  appendFileSync,
-  createWriteStream,
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  unlinkSync,
-  writeFileSync,
-} from "node:fs";
-import { createServer } from "node:http";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { WebSocketServer, WebSocket } from "ws";
+import {
+  appendFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
+import { createServer } from "node:http";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { inspect } from "node:util";
+import { WebSocketServer, WebSocket } from "ws";
 
 import { printServiceDidNotStart } from "./exit-banner.ts";
 
@@ -355,33 +355,56 @@ export function installCrashLogging(opts: CrashHandlersOptions = {}): InstallCra
 // 文件日志：同时输出到控制台和日志文件
 // ---------------------------------------------------------------------------
 
-export function setupFileLogging(logDir: string, prefix: string): { logPath: string; flush: () => void } {
-  mkdirSync(logDir, { recursive: true });
-  const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-  const logPath = join(logDir, `${prefix}-${ts}.log`);
-  const logStream = createWriteStream(logPath, { flags: "a" });
-  const origConsoleLog = console.log.bind(console);
-  const origConsoleError = console.error.bind(console);
-  let pending = false;
-  const writeLine = (level: string, args: unknown[]) => {
-    const line = args.map((a) => (typeof a === "string" ? a : JSON.stringify(a))).join(" ");
-    pending = true;
-    logStream.write(`[${new Date().toISOString()}] [${level}] ${line}\n`, () => { pending = false; });
-  };
-  console.log = (...args: unknown[]) => {
-    writeLine("LOG", args);
-    origConsoleLog(...args);
-  };
-  console.error = (...args: unknown[]) => {
-    writeLine("ERR", args);
-    origConsoleError(...args);
-  };
-  const flush = () => {
-    if (pending) logStream.end();
-  };
-  origConsoleLog(`Log file: ${logPath}`);
-  return { logPath, flush };
-}
+export function setupFileLogging(logDir: string, prefix: string): { logPath: string; flush: () => void } {
+  mkdirSync(logDir, { recursive: true });
+  const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+  const logPath = join(logDir, `${prefix}-${ts}.log`);
+  writeFileSync(logPath, "", { flag: "a", encoding: "utf8" });
+  const origConsoleLog = console.log.bind(console);
+  const origConsoleError = console.error.bind(console);
+  const formatArg = (arg: unknown): string => {
+    if (typeof arg === "string") return arg;
+    if (arg instanceof Error) return arg.stack ?? arg.message;
+    return inspect(arg, { depth: 6, breakLength: Infinity, maxArrayLength: 200 });
+  };
+  const writeLine = (level: string, args: unknown[]) => {
+    try {
+      const line = args.map(formatArg).join(" ");
+      appendFileSync(logPath, `[${new Date().toISOString()}] [${level}] ${line}\n`, "utf8");
+    } catch (err) {
+      try {
+        appendStartupTrace("fileLog write failed", { level, error: err instanceof Error ? err.message : String(err) });
+      } catch {
+        // 日志系统自身不能影响主流程
+      }
+    }
+  };
+  console.log = (...args: unknown[]) => {
+    writeLine("LOG", args);
+    try {
+      origConsoleLog(...args);
+    } catch {
+      // 控制台输出失败也不能拖垮服务
+    }
+  };
+  console.error = (...args: unknown[]) => {
+    writeLine("ERR", args);
+    try {
+      origConsoleError(...args);
+    } catch {
+      // 控制台输出失败也不能拖垮服务
+    }
+  };
+  const flush = () => {
+    try {
+      appendFileSync(logPath, "", "utf8");
+    } catch (err) {
+      appendStartupTrace("fileLog flush failed", { error: err instanceof Error ? err.message : String(err) });
+    }
+  };
+  origConsoleLog(`Log file: ${logPath}`);
+  return { logPath, flush };
+}
 
 // ---------------------------------------------------------------------------
 // 本地 WebSocket 中继服务器（同一端口、多客户端广播）