@maiyunnet/kebab 9.15.6 → 9.16.0

package/sys/monitor.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2026-02-07
- * Last: 2026-02-08
+ * Last: 2026-08-22
  * --- 性能监控库，用于检测 CPU/内存骤升并记录可疑请求、堆栈、CPU Profile、堆快照 ---
  * --- 包含 Worker 看门狗线程，用于在事件循环完全阻塞时实时检测并记录 ---
  */
@@ -16,12 +16,14 @@ import * as lText from '#kebab/lib/text.js';
 import * as lTime from '#kebab/lib/time.js';
 import * as lFs from '#kebab/lib/fs.js';
 // --- 阈值配置 ---
-/** --- CPU 使用率阈值，0-100 --- */
+/** --- CPU 使用率阈值，100 代表占满一个逻辑核心 --- */
 let cpuThreshold = 80;
 /** --- 内存使用率阈值，单位 MB --- */
 let memThreshold = 0;
 /** --- 事件循环延迟阈值，单位 ms --- */
 let eloopThreshold = 500;
+/** --- 是否在内存超阈值时自动采集堆快照 --- */
+let heapSnapshotEnabled = false;
 /** --- 监控间隔，单位 ms --- */
 const INTERVAL = 5_000;
 /** --- 连续超阈值次数达到此值才记录日志，防止瞬间波动 --- */
@@ -30,15 +32,23 @@ const SPIKE_COUNT = 2;
 const PROFILE_DURATION = 5_000;
 /** --- 两次诊断采集的最小间隔，防止频繁写磁盘，单位 ms --- */
 const DIAGNOSTIC_COOLDOWN = 60_000;
+/** --- 单次快照或日志最多输出的活跃请求详情数 --- */
+const MAX_ACTIVE_REQUEST_DETAILS = 100;
 // --- 内部状态 ---
 /** --- 定时器 --- */
 let timer = null;
-/** --- 上次 CPU 累计用量 --- */
-let lastCpuUsage = null;
-/** --- 上次 CPU 采样的时间戳 --- */
-let lastCpuTime = 0;
-/** --- 上次系统各核 CPU 时间快照 --- */
-let lastOsCpus = null;
+/** --- 周期检查的上次 CPU 累计用量 --- */
+let lastCheckCpuUsage = null;
+/** --- 周期检查的上次 CPU 采样时间戳 --- */
+let lastCheckCpuTime = 0;
+/** --- 周期检查的上次系统各核 CPU 时间快照 --- */
+let lastCheckOsCpus = null;
+/** --- 对外快照的上次 CPU 累计用量 --- */
+let lastSnapshotCpuUsage = null;
+/** --- 对外快照的上次 CPU 采样时间戳 --- */
+let lastSnapshotCpuTime = 0;
+/** --- 对外快照的上次系统各核 CPU 时间快照 --- */
+let lastSnapshotOsCpus = null;
 /** --- 事件循环延迟直方图 --- */
 let eloopHistogram = null;
 /** --- 连续超阈值计数 --- */
@@ -47,6 +57,8 @@ let spikeCounter = 0;
 let requestCounter = 0;
 /** --- 上次诊断采集时间 --- */
 let lastDiagnosticTime = 0;
+/** --- 是否正在采集诊断数据 --- */
+let diagnosing = false;
 /** --- 是否正在进行 CPU Profile 采集 --- */
 let profiling = false;
 /**
@@ -58,7 +70,7 @@ function isDebugMode() {
 // --- 看门狗相关 ---
 /** --- 看门狗 Worker 实例 --- */
 let watchdog = null;
-/** --- 心跳共享内存（Int32: 秒级时间戳） --- */
+/** --- 心跳共享内存（Uint32: 秒级时间戳） --- */
 let heartbeatBuffer = null;
 /** --- 心跳共享内存视图 --- */
 let heartbeatView = null;
@@ -68,6 +80,10 @@ const WATCHDOG_THRESHOLD = 15;
 const WATCHDOG_INTERVAL = 5_000;
 /** --- 看门狗告警冷却时间，持续阻塞时不会每次都写日志，单位秒 --- */
 const WATCHDOG_COOLDOWN = 30;
+/** --- 看门狗异常退出后的重启延迟，单位 ms --- */
+const WATCHDOG_RESTART_DELAY = 5_000;
+/** --- 看门狗重启定时器 --- */
+let watchdogRestartTimer = null;
 /** --- 活跃请求池 --- */
 const activeRequests = new Map();
 /**
@@ -78,21 +94,45 @@ export function start(opt) {
     if (timer) {
         return;
     }
-    cpuThreshold = opt?.cpu ?? 80;
-    memThreshold = opt?.mem ?? 0;
-    eloopThreshold = opt?.eloop ?? 500;
+    const nextCpuThreshold = opt?.cpu ?? 80;
+    const nextMemThreshold = opt?.mem ?? 0;
+    const nextEloopThreshold = opt?.eloop ?? 500;
+    if (!Number.isFinite(nextCpuThreshold) || nextCpuThreshold <= 0) {
+        throw new RangeError('Monitor CPU threshold must be greater than 0.');
+    }
+    if (!Number.isFinite(nextMemThreshold) || nextMemThreshold < 0) {
+        throw new RangeError('Monitor memory threshold cannot be negative.');
+    }
+    if (!Number.isFinite(nextEloopThreshold) || nextEloopThreshold <= 0) {
+        throw new RangeError('Monitor event loop threshold must be greater than 0.');
+    }
+    cpuThreshold = nextCpuThreshold;
+    memThreshold = nextMemThreshold;
+    eloopThreshold = nextEloopThreshold;
+    heapSnapshotEnabled = opt?.heapSnapshot ?? false;
     if (memThreshold === 0) {
-        // --- 自动计算：系统总内存的 80% ---
-        memThreshold = Math.floor((os.totalmem() * 0.8) / 1024 / 1024);
+        // --- 同时考虑容器/系统约束和 V8 堆上限，避免默认阈值高于进程实际可用范围 ---
+        const constrainedMemory = process.constrainedMemory();
+        const systemLimit = constrainedMemory > 0
+            ? Math.min(constrainedMemory, os.totalmem())
+            : os.totalmem();
+        const heapLimit = v8.getHeapStatistics().heap_size_limit;
+        memThreshold = Math.floor(Math.min(systemLimit * 0.8, heapLimit * 0.9) / 1024 / 1024);
     }
-    lastCpuUsage = process.cpuUsage();
-    lastCpuTime = Date.now();
-    lastOsCpus = os.cpus();
+    const cpuUsage = process.cpuUsage();
+    const cpuTime = Date.now();
+    const osCpus = os.cpus();
+    lastCheckCpuUsage = cpuUsage;
+    lastCheckCpuTime = cpuTime;
+    lastCheckOsCpus = osCpus;
+    lastSnapshotCpuUsage = cpuUsage;
+    lastSnapshotCpuTime = cpuTime;
+    lastSnapshotOsCpus = osCpus;
     spikeCounter = 0;
     lastDiagnosticTime = 0;
     // --- 初始化心跳共享内存（索引 0: 秒级时间戳, 索引 1: 调试模式标志） ---
     heartbeatBuffer = new SharedArrayBuffer(8);
-    heartbeatView = new Int32Array(heartbeatBuffer);
+    heartbeatView = new Uint32Array(heartbeatBuffer);
     Atomics.store(heartbeatView, 0, Math.floor(Date.now() / 1000));
     Atomics.store(heartbeatView, 1, isDebugMode() ? 1 : 0);
     // --- 启用事件循环延迟直方图 ---
@@ -121,7 +161,18 @@ export function stop() {
         });
         watchdog = null;
     }
+    if (watchdogRestartTimer) {
+        clearTimeout(watchdogRestartTimer);
+        watchdogRestartTimer = null;
+    }
     activeRequests.clear();
+    lastCheckCpuUsage = null;
+    lastCheckCpuTime = 0;
+    lastCheckOsCpus = null;
+    lastSnapshotCpuUsage = null;
+    lastSnapshotCpuTime = 0;
+    lastSnapshotOsCpus = null;
+    spikeCounter = 0;
     heartbeatBuffer = null;
     heartbeatView = null;
 }
@@ -160,13 +211,28 @@ function startWatchdog() {
             if (watchdog === worker) {
                 watchdog = null;
             }
+            scheduleWatchdogRestart();
         });
         lCore.debug(`[MONITOR] [THREAD] [${process.pid}] Watchdog started`);
     }
     catch (e) {
         lCore.debug('[MONITOR] Failed to start watchdog', e);
+        scheduleWatchdogRestart();
     }
 }
+/**
+ * --- 看门狗异常退出后延迟重启，避免失去阻塞检测能力 ---
+ */
+function scheduleWatchdogRestart() {
+    if (!timer || watchdog || watchdogRestartTimer) {
+        return;
+    }
+    watchdogRestartTimer = setTimeout(() => {
+        watchdogRestartTimer = null;
+        startWatchdog();
+    }, WATCHDOG_RESTART_DELAY);
+    watchdogRestartTimer.unref();
+}
 /**
  * --- 注册一个活跃请求，返回追踪 ID ---
  * @param url 请求 URL
@@ -175,12 +241,14 @@ function startWatchdog() {
 export function track(url, method) {
     const now = Date.now();
     const id = `${++requestCounter}-${now}`;
+    const queryIndex = url.search(/[?#]/u);
     activeRequests.set(id, {
-        'url': url,
+        // --- 查询参数可能含凭据或个人信息，诊断中只保留请求路径 ---
+        'url': queryIndex === -1 ? url : url.slice(0, queryIndex),
         'method': method,
         'start': now,
         'startCpu': process.cpuUsage(),
-        'startMem': process.memoryUsage().rss,
+        'startMem': process.memoryUsage.rss(),
     });
     return id;
 }
@@ -201,15 +269,21 @@ export function getSnapshot() {
     const now = Date.now();
     // --- 计算进程 CPU 使用率（单核基准） ---
     let cpuProcess = 0;
-    if (lastCpuUsage && lastCpuTime) {
+    if (lastSnapshotCpuUsage && lastSnapshotCpuTime) {
         /** --- 经过的时间（微秒） --- */
-        const elapsed = (now - lastCpuTime) * 1_000;
-        const userDiff = cpuUsage.user - lastCpuUsage.user;
-        const sysDiff = cpuUsage.system - lastCpuUsage.system;
-        cpuProcess = Math.min(100, ((userDiff + sysDiff) / elapsed) * 100);
+        const elapsed = (now - lastSnapshotCpuTime) * 1_000;
+        const userDiff = cpuUsage.user - lastSnapshotCpuUsage.user;
+        const sysDiff = cpuUsage.system - lastSnapshotCpuUsage.system;
+        if (elapsed > 0) {
+            cpuProcess = ((userDiff + sysDiff) / elapsed) * 100;
+        }
     }
+    lastSnapshotCpuUsage = cpuUsage;
+    lastSnapshotCpuTime = now;
     // --- 计算系统总 CPU 使用率 ---
-    const cpuOs = getOsCpuPercent();
+    const osCpus = os.cpus();
+    const cpuOs = getOsCpuPercent(lastSnapshotOsCpus, osCpus);
+    lastSnapshotOsCpus = osCpus;
     // --- 计算事件循环延迟（P99，纳秒转毫秒） ---
     let eloopLag = 0;
     if (eloopHistogram) {
@@ -218,6 +292,9 @@ export function getSnapshot() {
     // --- 收集活跃请求 ---
     const requests = [];
     for (const [, req] of activeRequests) {
+        if (requests.length >= MAX_ACTIVE_REQUEST_DETAILS) {
+            break;
+        }
         const reqCpu = process.cpuUsage(req.startCpu);
         requests.push({
             'url': req.url,
@@ -228,8 +305,6 @@ export function getSnapshot() {
             'memDelta': mem.rss - req.startMem,
         });
     }
-    // --- 按持续时间降序排序 ---
-    requests.sort((a, b) => b.duration - a.duration);
     return {
         'pid': process.pid,
         'time': now,
@@ -272,18 +347,22 @@ function check() {
     let cpuPercent = 0;
     /** --- 实际经过的时间（ms），用于检测事件循环阻塞 --- */
     let actualElapsed = INTERVAL;
-    if (lastCpuUsage && lastCpuTime) {
-        actualElapsed = now - lastCpuTime;
+    if (lastCheckCpuUsage && lastCheckCpuTime) {
+        actualElapsed = now - lastCheckCpuTime;
         const elapsedUs = actualElapsed * 1_000;
-        const userDiff = cpuUsage.user - lastCpuUsage.user;
-        const sysDiff = cpuUsage.system - lastCpuUsage.system;
-        cpuPercent = Math.min(100, ((userDiff + sysDiff) / elapsedUs) * 100);
+        const userDiff = cpuUsage.user - lastCheckCpuUsage.user;
+        const sysDiff = cpuUsage.system - lastCheckCpuUsage.system;
+        if (elapsedUs > 0) {
+            cpuPercent = ((userDiff + sysDiff) / elapsedUs) * 100;
+        }
     }
-    lastCpuUsage = cpuUsage;
-    lastCpuTime = now;
+    lastCheckCpuUsage = cpuUsage;
+    lastCheckCpuTime = now;
     // --- 计算系统总 CPU 使用率 ---
-    const cpuOs = getOsCpuPercent();
-    const memMB = process.memoryUsage().rss / 1024 / 1024;
+    const osCpus = os.cpus();
+    const cpuOs = getOsCpuPercent(lastCheckOsCpus, osCpus);
+    lastCheckOsCpus = osCpus;
+    const memMB = process.memoryUsage.rss() / 1024 / 1024;
     let eloopLag = 0;
     if (eloopHistogram) {
         eloopLag = Math.round(eloopHistogram.percentile(99) / 1_000_000);
@@ -345,50 +424,34 @@ function logSpike(alerts, cpuPercent, cpuOs, eloopLag, blocked = false) {
     const now = Date.now();
     const requestDetails = [];
     for (const [, req] of activeRequests) {
+        if (requestDetails.length >= MAX_ACTIVE_REQUEST_DETAILS) {
+            break;
+        }
         const reqCpu = process.cpuUsage(req.startCpu);
         const duration = now - req.start;
         const cpuTotal = reqCpu.user + reqCpu.system;
         const memDelta = mem.rss - req.startMem;
-        requestDetails.push(`[${req.method}] ${req.url} (${duration}ms, CPU: ${cpuTotal}us, MEM_DELTA: ${memDelta >= 0 ? '+' : '-'}${lText.sizeFormat(Math.abs(memDelta), '')})`);
+        requestDetails.push(`[${req.method}] ${req.url} (${duration}ms, PROC_CPU_DELTA: ${cpuTotal}us, PROC_RSS_DELTA: ${memDelta >= 0 ? '+' : '-'}${lText.sizeFormat(Math.abs(memDelta), '')})`);
+    }
+    const omittedRequests = activeRequests.size - requestDetails.length;
+    if (omittedRequests > 0) {
+        requestDetails.push(`... ${omittedRequests} more`);
     }
     // --- 诊断采集策略 ---
     // --- blocked=true：阻塞期间 watchdog 已通过 connectToMainThread() 远程采集了精确堆栈和 Profile ---
     // --- blocked=false：持续性骤升，此处由主线程自行采集 Report/Profile/HeapSnapshot ---
-    if (!blocked && now - lastDiagnosticTime >= DIAGNOSTIC_COOLDOWN) {
+    if (!blocked && !diagnosing && now - lastDiagnosticTime >= DIAGNOSTIC_COOLDOWN) {
         lastDiagnosticTime = now;
+        diagnosing = true;
         const hasCpuSpike = cpuPercent >= cpuThreshold;
         const hasMemSpike = (mem.rss / 1024 / 1024) >= memThreshold;
-        const ts = lTime.format(null, 'YmdHis');
-        const diagDir = `${kebab.LOG_CWD}monitor/${process.pid}/`;
-        lFs.mkdir(diagDir, 0o777).then(() => {
-            // --- 1. Diagnostic Report（包含 JS 堆栈、libuv handles、系统信息） ---
-            try {
-                process.report.directory = diagDir;
-                const reportName = `report-${ts}.json`;
-                process.report.writeReport(reportName);
-                lCore.display(`[MONITOR] Diagnostic report: ${diagDir}${reportName}`);
-            }
-            catch (e) {
-                lCore.debug('[MONITOR] Diagnostic report failed', e);
-            }
-            // --- 2. CPU Profile（精确到函数+行号的 CPU 消耗定位） ---
-            if (hasCpuSpike) {
-                collectCpuProfile(diagDir, ts).catch((e) => {
-                    lCore.debug('[MONITOR] CPU profile failed', e);
-                });
-            }
-            // --- 3. Heap Snapshot（内存泄漏定位到对象分配源） ---
-            if (hasMemSpike) {
-                try {
-                    const heapFile = v8.writeHeapSnapshot(`${diagDir}heap-${ts}.heapsnapshot`);
-                    lCore.display(`[MONITOR] Heap snapshot: ${heapFile}`);
-                }
-                catch (e) {
-                    lCore.debug('[MONITOR] Heap snapshot failed', e);
-                }
-            }
-        }).catch((e) => {
-            lCore.debug('[MONITOR] Failed to create diagnostic directory', e);
+        const diagnosticTime = new Date();
+        const ts = lTime.format(null, 'YmdHis', diagnosticTime);
+        const diagDir = `${kebab.LOG_CWD}monitor/${lTime.format(null, 'Y/m/d/His', diagnosticTime)}-pid-${process.pid}/`;
+        collectDiagnostics(diagDir, ts, hasCpuSpike, hasMemSpike && heapSnapshotEnabled).catch((e) => {
+            lCore.debug('[MONITOR] Diagnostic collection failed', e);
+        }).finally(() => {
+            diagnosing = false;
         });
     }
     const msg = `SPIKE [${alerts.join(', ')}] ` +
@@ -407,19 +470,19 @@ function logSpike(alerts, cpuPercent, cpuOs, eloopLag, blocked = false) {
 }
 /**
  * --- 通过 os.cpus() 两次采样的 Delta 计算系统总 CPU 使用率 ---
+ * @param previous 上次系统各核 CPU 时间快照
+ * @param current 当前系统各核 CPU 时间快照
  * @returns 0-100 的百分比值，和任务管理器/top 命令一致
  */
-function getOsCpuPercent() {
-    const cpus = os.cpus();
-    if (lastOsCpus?.length !== cpus.length) {
-        lastOsCpus = cpus;
+function getOsCpuPercent(previous, current) {
+    if (previous?.length !== current.length) {
         return 0;
     }
     let totalIdle = 0;
     let totalTick = 0;
-    for (let i = 0; i < cpus.length; ++i) {
-        const cur = cpus[i].times;
-        const prev = lastOsCpus[i].times;
+    for (let i = 0; i < current.length; ++i) {
+        const cur = current[i].times;
+        const prev = previous[i].times;
         const idleDiff = cur.idle - prev.idle;
         const totalDiff = (cur.user - prev.user) +
             (cur.nice - prev.nice) +
@@ -429,11 +492,58 @@ function getOsCpuPercent() {
         totalIdle += idleDiff;
         totalTick += totalDiff;
     }
-    lastOsCpus = cpus;
-    if (totalTick === 0) {
+    if (totalTick <= 0) {
         return 0;
     }
-    return Math.round((1 - totalIdle / totalTick) * 10000) / 100;
+    const percent = (1 - totalIdle / totalTick) * 100;
+    return Math.round(Math.max(0, Math.min(100, percent)) * 100) / 100;
+}
+/**
+ * --- 采集诊断报告及按需 Profile，避免并行采集互相污染数据 ---
+ * @param dir 诊断文件输出目录
+ * @param ts 时间戳字符串
+ * @param hasCpuSpike 是否发生 CPU 骤升
+ * @param collectHeapSnapshot 是否采集堆快照
+ */
+async function collectDiagnostics(dir, ts, hasCpuSpike, collectHeapSnapshot) {
+    if (!await lFs.mkdir(dir, 0o700)) {
+        throw new Error(`Failed to create diagnostic directory: ${dir}`);
+    }
+    if (!await lFs.chmod(dir, 0o700)) {
+        throw new Error(`Failed to secure diagnostic directory: ${dir}`);
+    }
+    // --- Diagnostic Report 默认会包含命令行、环境变量和网络端点，落盘前显式脱敏 ---
+    const reportName = `report-${ts}.json`;
+    const report = process.report.getReport();
+    if (report.header) {
+        report.header.commandLine = [];
+        delete report.header.networkInterfaces;
+    }
+    delete report.environmentVariables;
+    for (const handle of report.libuv ?? []) {
+        delete handle.localEndpoint;
+        delete handle.remoteEndpoint;
+    }
+    const reportPath = `${dir}${reportName}`;
+    const written = await lFs.putContent(reportPath, lText.stringifyJson(report, 2), { 'encoding': 'utf8', 'mode': 0o600 });
+    if (!written) {
+        throw new Error(`Failed to write diagnostic report: ${reportPath}`);
+    }
+    if (!await lFs.chmod(reportPath, 0o600)) {
+        throw new Error(`Failed to secure diagnostic report: ${reportPath}`);
+    }
+    lCore.display(`[MONITOR] Diagnostic report: ${reportPath}`);
+    if (hasCpuSpike) {
+        await collectCpuProfile(dir, ts);
+    }
+    // --- 堆快照会同步阻塞并额外占用大量内存，仅在调用方明确开启时采集 ---
+    if (collectHeapSnapshot) {
+        const heapFile = v8.writeHeapSnapshot(`${dir}heap-${ts}.heapsnapshot`);
+        if (!await lFs.chmod(heapFile, 0o600)) {
+            throw new Error(`Failed to secure heap snapshot: ${heapFile}`);
+        }
+        lCore.display(`[MONITOR] Heap snapshot: ${heapFile}`);
+    }
 }
 /**
  * --- 通过 Inspector 协议采集 CPU Profile ---
@@ -478,9 +588,16 @@ async function collectCpuProfile(dir, ts) {
             });
         });
         const filePath = `${dir}cpu-${ts}.cpuprofile`;
-        await lFs.putContent(filePath, lText.stringifyJson(profile), {
+        const written = await lFs.putContent(filePath, lText.stringifyJson(profile), {
             'encoding': 'utf8',
+            'mode': 0o600,
         });
+        if (!written) {
+            throw new Error(`Failed to write CPU profile: ${filePath}`);
+        }
+        if (!await lFs.chmod(filePath, 0o600)) {
+            throw new Error(`Failed to secure CPU profile: ${filePath}`);
+        }
         lCore.display(`[MONITOR] CPU profile: ${filePath}`);
     }
     finally {

package/sys/route.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41, 2026-8-22
  */
 import * as http from 'http';
 import * as http2 from 'http2';

package/sys/route.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41, 2026-8-22
  */
 import * as http from 'http';
 import * as stream from 'stream';
@@ -300,7 +300,7 @@ export async function run(data) {
             cctr.setPrototype('_socket', wsSocket);
         }
         catch (e) {
-            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, lText.stringifyError(e), '-error');
             data.socket?.destroy();
             return true;
         }
@@ -314,7 +314,7 @@ export async function run(data) {
             rtn = await cctr.onLoad();
         }
         catch (e) {
-            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, lText.stringifyError(e), '-error');
             data.socket?.destroy();
             return true;
         }
@@ -323,7 +323,7 @@ export async function run(data) {
                 rtn = await cctr.onReady();
             }
             catch (e) {
-                lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log(cctr, lText.stringifyError(e), '-error');
                 data.socket?.destroy();
                 return true;
             }
@@ -380,7 +380,7 @@ export async function run(data) {
                                     }
                                 }
                                 catch (e) {
-                                    lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                                    lCore.log(cctr, lText.stringifyError(e), '-error');
                                 }
                                 break;
                             }
@@ -393,23 +393,23 @@ export async function run(data) {
                             await cctr['onDrain']();
                         }
                         catch (e) {
-                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                            lCore.log(cctr, lText.stringifyError(e), '-error');
                         }
                     }).on('error', (e) => {
-                        lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        lCore.log(cctr, lText.stringifyError(e), '-error');
                     }).on('end', async () => {
                         try {
                             await cctr['onEnd']();
                         }
                         catch (e) {
-                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                            lCore.log(cctr, lText.stringifyError(e), '-error');
                         }
                     }).on('close', async () => {
                         try {
                             await cctr['onClose']();
                         }
                         catch (e) {
-                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                            lCore.log(cctr, lText.stringifyError(e), '-error');
                         }
                         resolve();
                     });
@@ -467,7 +467,7 @@ export async function run(data) {
         rtn = await middle.onLoad();
     }
     catch (e) {
-        lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        lCore.log(middle, '(E03)' + lText.stringifyError(e), '-error');
         respond500(data.res);
         return true;
     }
@@ -479,7 +479,7 @@ export async function run(data) {
             rtn = await middle.onReady();
         }
         catch (e) {
-            lCore.log(middle, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(middle, '(E05)' + lText.stringifyError(e), '-error');
             respond500(data.res);
             return true;
         }
@@ -556,7 +556,7 @@ export async function run(data) {
                         }
                     }
                     catch (e) {
-                        lCore.log(cctr, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        lCore.log(cctr, '(E05)' + lText.stringifyError(e), '-error');
                         respond500(data.res);
                         await waitCtr(cctr);
                         return true;
@@ -567,7 +567,7 @@ export async function run(data) {
                 httpCode = cctr.getPrototype('_httpCode');
             }
             catch (e) {
-                lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log(cctr, '(E04)' + lText.stringifyError(e), '-error');
                 respond500(data.res);
                 await waitCtr(cctr);
                 return true;
@@ -1291,7 +1291,7 @@ export function getFormData(req, events = {}, limits = {}) {
             clearTimer();
             cleanupActiveFile();
             lCore.debug('[ROUTE][GETFORMDATA] request error before getFormData: ' + e.message);
-            lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + (e.stack ?? ''), '-error');
+            lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + lText.stringifyError(e), '-error');
             cleanupFiles();
             resolve(false);
         });

package/www/example/ctr/test.d.ts

@@ -87,6 +87,8 @@ export default class extends sCtr.Ctr {
     undiciFollow2(): kebab.Json;
     undiciReuse(): Promise<string>;
     undiciError(): Promise<string>;
+    undiciRetry(): Promise<string>;
+    undiciRetrySource(): Promise<string | boolean>;
     undiciHosts(): Promise<string>;
     undiciMproxy(): Promise<string | boolean>;
     undiciMproxy1(): Promise<string | boolean>;

package/www/example/ctr/test.js

@@ -186,6 +186,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/undici-follow">View "test/undici-follow"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-reuse">View "test/undici-reuse"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-error">View "test/undici-error"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/undici-retry">View "test/undici-retry"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-hosts">View "test/undici-hosts"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-rproxy/dist/core.js">View "test/undici-rproxy/dist/core.js"</a> <a href="${this._config.const.urlBase}test/undici-rproxy/package.json">View "package.json"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-mproxy">View "test/undici-mproxy"</a>`,
@@ -2212,6 +2213,46 @@ content: <pre>${(await res.getContent())?.toString() ?? 'null'}</pre>
 error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         return echo.join('') + this._getEnd();
     }
+    async undiciRetry() {
+        const url = `${this._internalUrl}test/undici-retry-source`;
+        const time = Date.now();
+        const res = await lUndici.get(url, {
+            'retry': 1,
+            'log': false,
+        });
+        const content = await res.getContent();
+        return `<pre>const res = await lUndici.get('${url}', {
+    'retry': 1,
+    'log': false,
+});
+const content = await res.getContent();</pre>
+time: ${Date.now() - time}ms
+headers: <pre>${lText.htmlescape(lText.stringifyJson(res.headers))}</pre>
+content: <pre>${lText.htmlescape(content?.toString() ?? 'null')}</pre>
+error: <pre>${lText.htmlescape(res.error ? lText.stringifyError(res.error) : 'null')}</pre>` + this._getEnd();
+    }
+    async undiciRetrySource() {
+        const etag = '"undici-retry"';
+        if ((this._headers['range'] === 'bytes=1-1') && (this._headers['if-match'] === etag)) {
+            this._httpCode = 206;
+            this._res.setHeader('content-length', '1');
+            this._res.setHeader('content-range', 'bytes 1-1/2');
+            this._res.setHeader('etag', etag);
+            return 'K';
+        }
+        lCore.writeHead(this._res, 200, {
+            'content-length': '2',
+            etag,
+        });
+        lCore.write(this._res, 'O');
+        await new Promise(resolve => {
+            setImmediate(() => {
+                this._res.destroy();
+                resolve();
+            });
+        });
+        return false;
+    }
     async undiciHosts() {
         const echo = [];
         const res = await lUndici.get('http://nodejs.org:' + this._config.const.hostport.toString() + this._config.const.urlBase + 'test', {
@@ -4083,7 +4124,7 @@ send.addEventListener('click', async () => {
             '<b>Monitor Snapshot</b>',
             '<hr>',
             `<b>PID:</b> ${snapshot.pid}`,
-            `<br><b>Process CPU (single core):</b> ${snapshot.cpuProcess}%`,
+            `<br><b>Process CPU (100% per core):</b> ${snapshot.cpuProcess}%`,
             `<br><b>System CPU (total):</b> ${snapshot.cpuOs}%`,
             `<br><b>Event Loop Lag:</b> ${snapshot.eloopLag}ms`,
             '<br><br><b>Memory:</b>',
@@ -4102,7 +4143,7 @@ send.addEventListener('click', async () => {
             `<br><br><b>Active Requests:</b> ${snapshot.activeCount}`,
         ];
         for (const req of snapshot.activeRequests) {
-            echo.push(`<br>[${req.method}] ${lText.htmlescape(req.url)} - ${req.duration}ms, CPU: ${req.cpuUser + req.cpuSystem}us, MEM_DELTA: ${lText.sizeFormat(req.memDelta)}`);
+            echo.push(`<br>[${req.method}] ${lText.htmlescape(req.url)} - ${req.duration}ms, PROCESS_CPU_DELTA: ${req.cpuUser + req.cpuSystem}us, PROCESS_MEM_DELTA: ${lText.sizeFormat(req.memDelta)}`);
         }
         echo.push('<br><br>' + this._getEnd());
         return echo.join('');
@@ -4156,7 +4197,7 @@ send.addEventListener('click', async () => {
             `System CPU ${after.cpuOs}%, ` +
             `RSS ${lText.sizeFormat(after.mem.rss)}, ` +
             `Iterations: ${count}`);
-        echo.push('<br><br>Check <code>log/monitor/{pid}/</code> for' +
+        echo.push('<br><br>Check <code>log/monitor/YYYY/MM/DD/HHmmss-pid-{pid}/</code> for' +
             ' diagnostic files.');
         echo.push('<br><br>' + this._getEnd());
         return echo.join('');