@maiyunnet/kebab 9.3.14 → 9.4.1

package/doc/kebab-rag.md

@@ -1360,7 +1360,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.3.14"` = `'9.3.14'`
+> `const` **VER**: `"9.4.1"` = `'9.4.1'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -3460,7 +3460,7 @@ lib/core/functions/getLog.md
 
 # Function: getLog()
 
-> **getLog**(`opt`): `Promise`\<`false` \| `string`[][] \| `null`\>
+> **getLog**(`opt`): `Promise`\<`false` \| `any`[] \| `string`[][] \| `null`\>
 
 Defined in: [lib/core.ts:1031](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1031)
 
@@ -3522,7 +3522,7 @@ Defined in: [lib/core.ts:1031](https://github.com/maiyunnet/kebab/blob/master/li
 
 ## Returns
 
-`Promise`\<`false` \| `string`[][] \| `null`\>
+`Promise`\<`false` \| `any`[] \| `string`[][] \| `null`\>
 
 lib/core/functions/ip.md
 ---

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "9.3.14";
+export declare const VER = "9.4.1";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 /** --- 框架的 LIB，以 / 结尾 --- */

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '9.3.14';
+export const VER = '9.4.1';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/core.d.ts

@@ -268,7 +268,7 @@ export declare function getLog(opt: {
     'limit'?: number;
     /** --- 获取局域网服务器的日志，为空代表获取本机的 --- */
     'host'?: string;
-}): Promise<string[][] | null | false>;
+}): Promise<string[][] | kebab.Json[] | null | false>;
 /**
  * --- 获取目录内文件/文件夹列表 ---
  * @param opt 参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.3.14",
+  "version": "9.4.1",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [

package/sys/child.js

@@ -45,6 +45,8 @@ let httpServer;
 let http2Server;
 /** --- 当前使用中的连接 --- */
 const linkCount = {};
+/** --- 是否正在停止，停止时对 HTTP/1.1 响应追加 Connection: close，避免请求完成后连接回到保活池 --- */
+let stopping = false;
 /**
  * --- 包装请求处理函数，统一管理 linkCount 计数和错误处理 ---
  * @param key 连接标识
@@ -205,6 +207,10 @@ async function requestHandler(req, res, https) {
     res.setHeader('Server', 'Kebab/' + kebab.VER);
     res.setHeader('expires', 'Mon, 26 Jul 1994 05:00:00 GMT');
     res.setHeader('cache-control', 'no-store');
+    // --- 停止中：通知 HTTP/1.1 客户端不要复用此连接（HTTP/2 由 GOAWAY 帧处理） ---
+    if (stopping && res instanceof http.ServerResponse) {
+        res.setHeader('connection', 'close');
+    }
     // --- 当前 uri ---
     let host = req.headers[':authority'];
     if (host === undefined || typeof host !== 'string') {
@@ -551,26 +557,31 @@ process.on('message', function (msg) {
             }
             case 'stop': {
                 // --- 需要停止监听，等待已有连接全部断开，然后关闭线程 ---
+                stopping = true;
                 httpServer.close();
                 http2Server.close();
+                // --- 立即关闭空闲保活连接（无活跃请求的 keep-alive socket），避免进程长时间等待 ---
+                httpServer.closeIdleConnections();
                 clearInterval(hbTimer);
                 sMonitor.stop();
-                // --- 等待连接全部断开 ---
+                // --- 等待活跃请求全部完成 ---
                 /** --- 当前已等待时间，等待不超过 1 小时 --- */
                 let waiting = 0;
                 while (true) {
                     if (!Object.keys(linkCount).length) {
                         break;
                     }
-                    // --- 有长连接，等待中 ---
+                    // --- 有活跃连接，等待中 ---
                     const str = [];
                     for (const key in linkCount) {
                         str.push(key + ':' + linkCount[key].toString());
                     }
                     lCore.debug(`[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`);
                     lCore.log({}, `[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`, '-warning');
-                    await lCore.sleep(30_000);
-                    waiting += 30_000;
+                    await lCore.sleep(5_000);
+                    waiting += 5_000;
+                    // --- 再次清理已变为空闲的保活连接 ---
+                    httpServer.closeIdleConnections();
                     if (waiting > 3600_000) {
                         break;
                     }

package/sys/master.js

@@ -523,9 +523,15 @@ function createRpcListener() {
                     let limit = msg.limit ?? 100;
                     /** --- 剩余 offset --- */
                     let offset = msg.offset ?? 0;
+                    /**
+                     * --- csv 格式：string[][] 每行是字段数组，顺序与表头一致 ---
+                     * --- [['H:i:s', unix, url, cookie, session, userAgent, realIp, cfIp, xIp, osMem, procMem, message], ...] ---
+                     * --- jsonl 格式：object[] 每行是解析后的 JSON 对象 ---
+                     * --- [{ time, unix, url, cookie, session, userAgent, realIp, cfIp, xIp, osMem, procMem, message }, ...] ---
+                     */
                     const rtn = await new Promise(resolve => {
                         const list = [];
-                        /** --- 当前行号 --- */
+                        /** --- 当前行号（jsonl 无表头，csv 有表头，两者处理逻辑不同）--- */
                         let line = 0;
                         /** --- 当前行数据 --- */
                         let packet = '';
@@ -552,34 +558,44 @@ function createRpcListener() {
                                 buf = buf.slice(index + 1);
                                 ++line;
                                 // --- 先执行下本次完成的 ---
-                                if (line > 1) {
+                                // --- csv：line > 1 跳过表头行；jsonl：无表头，line >= 1 即可处理 ---
+                                if (format === 'jsonl' ? line >= 1 : line > 1) {
                                     if (offset === 0) {
                                         if (!msg.search || packet.includes(msg.search)) {
-                                            const result = [];
-                                            let currentField = '';
-                                            let inQuotes = false;
-                                            for (let i = 0; i < packet.length; ++i) {
-                                                const char = packet[i];
-                                                if (char === '"') {
-                                                    if (inQuotes && packet[i + 1] === '"') {
-                                                        currentField += '"';
-                                                        ++i;
+                                            if (format === 'jsonl') {
+                                                const obj = lText.parseJson(packet);
+                                                if (obj) {
+                                                    list.push(obj);
+                                                    --limit;
+                                                }
+                                            }
+                                            else {
+                                                const result = [];
+                                                let currentField = '';
+                                                let inQuotes = false;
+                                                for (let i = 0; i < packet.length; ++i) {
+                                                    const char = packet[i];
+                                                    if (char === '"') {
+                                                        if (inQuotes && packet[i + 1] === '"') {
+                                                            currentField += '"';
+                                                            ++i;
+                                                        }
+                                                        else {
+                                                            inQuotes = !inQuotes;
+                                                        }
+                                                    }
+                                                    else if (char === ',' && !inQuotes) {
+                                                        result.push(currentField);
+                                                        currentField = '';
                                                     }
                                                     else {
-                                                        inQuotes = !inQuotes;
+                                                        currentField += char;
                                                     }
                                                 }
-                                                else if (char === ',' && !inQuotes) {
-                                                    result.push(currentField);
-                                                    currentField = '';
-                                                }
-                                                else {
-                                                    currentField += char;
-                                                }
+                                                result.push(currentField);
+                                                list.push(result);
+                                                --limit;
                                             }
-                                            result.push(currentField);
-                                            list.push(result);
-                                            --limit;
                                         }
                                     }
                                     else {

package/www/example/ctr/test.js

@@ -1395,11 +1395,21 @@ for (let i = 0; i < 30000; ++i) {
         const echo = [];
         echo.push('<table style="width: 100%;">');
         if (list) {
-            echo.push('<tr><th>TIME</th><th>UNIX</th><th>URL</th><th>COOKIE</th><th>SESSION</th><th>USER_AGENT</th><th>REALIP</th><th>CLIENTIP</th><th>OS</th><th>PROCESS</th><th>MESSAGE</th></tr>');
+            echo.push('<tr><th>TIME</th><th>UNIX</th><th>URL</th><th>COOKIE</th><th>SESSION</th><th>USER_AGENT</th><th>REALIP</th><th>CFIP</th><th>XIP</th><th>OS</th><th>PROCESS</th><th>MESSAGE</th></tr>');
             for (const row of list) {
                 echo.push('<tr>');
-                for (const item of row) {
-                    echo.push('<td>' + lText.htmlescape(item) + '</td>');
+                if (Array.isArray(row)) {
+                    // --- csv 格式：string[] ---
+                    for (const item of row) {
+                        echo.push('<td>' + lText.htmlescape(item) + '</td>');
+                    }
+                }
+                else {
+                    // --- jsonl 格式：object ---
+                    const r = row;
+                    for (const val of [r.time, r.unix, r.url, r.cookie, r.session, r.userAgent, r.realIp, r.cfIp, r.xIp, r.osMem, r.procMem, r.message]) {
+                        echo.push('<td>' + lText.htmlescape(typeof val === 'string' ? val : lText.stringifyJson(val) ?? '') + '</td>');
+                    }
                 }
                 echo.push('</tr>');
             }