@maiyunnet/kebab 9.7.2 → 9.8.0

package/doc/kebab-rag.md

@@ -1360,7 +1360,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.7.2"` = `'9.7.2'`
+> `const` **VER**: `"9.8.0"` = `'9.8.0'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -3258,7 +3258,7 @@ lib/core/functions/clone.md
 
 > **clone**\<`T`\>(`obj`): `T`
 
-Defined in: [lib/core.ts:1167](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1167)
+Defined in: [lib/core.ts:1162](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1162)
 
 完整的克隆一份数组/对象
 
@@ -3322,7 +3322,7 @@ lib/core/functions/debug.md
 
 > **debug**(`message?`, ...`optionalParams`): `void`
 
-Defined in: [lib/core.ts:1201](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1201)
+Defined in: [lib/core.ts:1196](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1196)
 
 打印调试信息，线上环境不会打印
 
@@ -3357,7 +3357,7 @@ lib/core/functions/display.md
 
 > **display**(`message?`, ...`optionalParams`): `void`
 
-Defined in: [lib/core.ts:1214](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1214)
+Defined in: [lib/core.ts:1209](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1209)
 
 向控制台直接显示内容，一般情况下禁止使用
 
@@ -3460,7 +3460,7 @@ lib/core/functions/getLog.md
 
 # Function: getLog()
 
-> **getLog**(`opt`): `Promise`\<`false` \| `any`[] \| `string`[][] \| `null`\>
+> **getLog**(`opt`): `Promise`\<`false` \| \{ `list`: `any`[] \| `string`[][]; `total`: `number`; \}\>
 
 Defined in: [lib/core.ts:1074](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1074)
 
@@ -3514,15 +3514,9 @@ Defined in: [lib/core.ts:1074](https://github.com/maiyunnet/kebab/blob/master/li
 
 仅显示被搜索到的行
 
-#### start?
-
-`number`
-
-跳过的字节数，默认不跳过
-
 ## Returns
 
-`Promise`\<`false` \| `any`[] \| `string`[][] \| `null`\>
+`Promise`\<`false` \| \{ `list`: `any`[] \| `string`[][]; `total`: `number`; \}\>
 
 lib/core/functions/ip.md
 ---
@@ -3603,7 +3597,7 @@ lib/core/functions/loadEnv.md
 
 > **loadEnv**(`dir`): `Promise`\<`void`\>
 
-Defined in: [lib/core.ts:1266](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1266)
+Defined in: [lib/core.ts:1261](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1261)
 
 加载 .env 文件到 process.env，若文件不存在则跳过
 
@@ -3673,7 +3667,7 @@ lib/core/functions/ls.md
 
 > **ls**(`opt`): `Promise`\<`object`[]\>
 
-Defined in: [lib/core.ts:1128](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1128)
+Defined in: [lib/core.ts:1123](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1123)
 
 获取目录内文件/文件夹列表
 
@@ -4034,7 +4028,7 @@ lib/core/functions/resolveEnvVars.md
 
 > **resolveEnvVars**(`obj`): `void`
 
-Defined in: [lib/core.ts:1296](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1296)
+Defined in: [lib/core.ts:1291](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1291)
 
 将配置对象中的 ${ENV_VAR} 占位符替换为 process.env 的值
 
@@ -4476,7 +4470,7 @@ lib/core/functions/writeEventStreamHead.md
 
 > **writeEventStreamHead**(`res`): `void`
 
-Defined in: [lib/core.ts:1236](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1236)
+Defined in: [lib/core.ts:1231](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1231)
 
 ## Parameters
 
@@ -4501,7 +4495,7 @@ lib/core/functions/writeHead.md
 
 > **writeHead**(`res`, `statusCode`, `headers?`): `void`
 
-Defined in: [lib/core.ts:1225](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1225)
+Defined in: [lib/core.ts:1220](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1220)
 
 让 res 发送头部（前提是头部没有被发送才能调用本方法
 
@@ -4542,7 +4536,7 @@ lib/core/functions/write.md
 
 > **write**(`res`, `data`): `void`
 
-Defined in: [lib/core.ts:1248](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1248)
+Defined in: [lib/core.ts:1243](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1243)
 
 向 res 发送数据
 

package/index.d.ts

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

package/index.js

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

package/lib/core.d.ts

@@ -284,15 +284,16 @@ export declare function getLog(opt: {
     'fend'?: string;
     /** --- 仅显示被搜索到的行 --- */
     'search'?: string;
-    /** --- 跳过的字节数，默认不跳过 --- */
-    'start'?: number;
     /** --- 跳过条数 --- */
     'offset'?: number;
     /** --- 最大限制，默认 100 --- */
     'limit'?: number;
     /** --- 获取局域网服务器的日志，为空代表获取本机的 --- */
     'host'?: string;
-}): Promise<string[][] | kebab.Json[] | null | false>;
+}): Promise<{
+    'list': string[][] | kebab.Json[];
+    'total': number;
+} | false>;
 /**
  * --- 获取目录内文件/文件夹列表 ---
  * @param opt 参数

package/lib/core.js

@@ -929,33 +929,27 @@ export async function getLog(opt) {
     opt.host ??= '127.0.0.1';
     // --- 局域网模式 ---
     const time = lTime.stamp();
-    const res = await lUndici.get('http://' + opt.host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
+    const res = await lUndici.getResponseJson('http://' + opt.host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
         'action': 'log',
         'time': time,
         'hostname': opt.hostname,
         'path': opt.path,
         'fend': opt.fend,
         'search': opt.search,
-        'start': opt.start,
         'offset': opt.offset,
         'limit': opt.limit,
     }), globalConfig.rpcSecret), {
         'timeout': 2
     });
-    const content = await res.getContent();
-    if (!content) {
-        // --- 连接失败，系统错误 ---
-        debug('[CORE][getLog] rpc server error');
-        return false;
-    }
-    const str = content.toString();
-    const j = lText.parseJson(str);
-    if (!j) {
+    if (!res) {
         // --- 解析失败，系统错误 ---
         debug('[CORE][getLog] rpc server content error');
         return false;
     }
-    return j.data;
+    return {
+        'list': res.list,
+        'total': res.total,
+    };
 }
 /**
  * --- 获取目录内文件/文件夹列表 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.7.2",
+  "version": "9.8.0",
   "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

@@ -558,10 +558,10 @@ process.on('message', function (msg) {
             case 'stop': {
                 // --- 需要停止监听，等待已有连接全部断开，然后关闭线程 ---
                 stopping = true;
-                httpServer.close();
-                http2Server.close();
+                httpServer?.close();
+                http2Server?.close();
                 // --- 立即关闭空闲保活连接（无活跃请求的 keep-alive socket），避免进程长时间等待 ---
-                httpServer.closeIdleConnections();
+                httpServer?.closeIdleConnections();
                 clearInterval(hbTimer);
                 sMonitor.stop();
                 // --- 等待活跃请求全部完成 ---
@@ -581,7 +581,7 @@ process.on('message', function (msg) {
                     await lCore.sleep(5_000);
                     waiting += 5_000;
                     // --- 再次清理已变为空闲的保活连接 ---
-                    httpServer.closeIdleConnections();
+                    httpServer?.closeIdleConnections();
                     if (waiting > 3600_000) {
                         break;
                     }

package/sys/master.js

@@ -519,10 +519,52 @@ function createRpcListener() {
                         }));
                         return;
                     }
+                    // --- 用 wc -l 高效获取总行数 ---
+                    let total = 0;
+                    const wclRtn = await lCore.exec(`wc -l "${path}"`);
+                    if (wclRtn !== false) {
+                        const wclMatch = /^\s*(\d+)/.exec(wclRtn);
+                        if (wclMatch) {
+                            total = parseInt(wclMatch[1]);
+                            if (format === 'csv') {
+                                // --- csv 有表头，数据行数减 1 ---
+                                total = Math.max(0, total - 1);
+                            }
+                        }
+                    }
                     /** --- 剩余 limit --- */
                     let limit = msg.limit ?? 100;
-                    /** --- 剩余 offset --- */
-                    let offset = msg.offset ?? 0;
+                    /** --- offset --- */
+                    const offset = msg.offset ?? 0;
+                    /**
+                     * --- 用 grep -b '^' 获取目标行的字节偏移，直接传给 createReadStream start 跳过 offset ---
+                     * --- jsonl 无表头：跳过 offset 行，从第 offset+1 行开始读 ---
+                     * --- csv  有表头：跳过表头+offset 行，从第 offset+2 行开始读 ---
+                     */
+                    let startByte = 0;
+                    /** --- offset 定位是否成功（offset=0 直接成功；offset>0 需 grep 定位）--- */
+                    let offsetLocated = offset === 0;
+                    if (offset > 0) {
+                        const skipLines = format === 'jsonl' ? offset : offset + 1;
+                        // --- sed -n '${N}{p;q}' 找到第 N 行后立即退出，使 grep 收到 SIGPIPE 提前终止 ---
+                        const grepRtn = await lCore.exec(`grep -b '^' "${path}" | sed -n '${skipLines + 1}{p;q}'`);
+                        if (grepRtn !== false) {
+                            const grepMatch = /^(\d+):/.exec(grepRtn.trim());
+                            if (grepMatch) {
+                                startByte = parseInt(grepMatch[1]);
+                                offsetLocated = true;
+                            }
+                        }
+                    }
+                    if (!offsetLocated) {
+                        // --- offset 超出文件范围，返回空列表 ---
+                        res.end(lText.stringifyJson({
+                            'result': 1,
+                            'data': [],
+                            'total': total,
+                        }));
+                        return;
+                    }
                     /**
                      * --- csv 格式：string[][] 每行是字段数组，顺序与表头一致 ---
                      * --- [['H:i:s', unix, url, cookie, session, userAgent, realIp, cfIp, xIp, osMem, procMem, message], ...] ---
@@ -531,14 +573,14 @@ function createRpcListener() {
                      */
                     const rtn = await new Promise(resolve => {
                         const list = [];
-                        /** --- 当前行号（jsonl 无表头，csv 有表头，两者处理逻辑不同）--- */
+                        /** --- 当前行号 --- */
                         let line = 0;
                         /** --- 当前行数据 --- */
                         let packet = '';
                         lFs.createReadStream(path, {
                             'encoding': 'utf8',
-                            'start': msg.start,
-                        }).on('data', (buf) => {
+                            'start': startByte,
+                        }).on('data', buf => {
                             if (typeof buf !== 'string') {
                                 return;
                             }
@@ -557,50 +599,45 @@ function createRpcListener() {
                                 packet += buf.slice(0, index);
                                 buf = buf.slice(index + 1);
                                 ++line;
-                                // --- 先执行下本次完成的 ---
-                                // --- csv：line > 1 跳过表头行；jsonl：无表头，line >= 1 即可处理 ---
-                                if (format === 'jsonl' ? line >= 1 : line > 1) {
-                                    if (offset === 0) {
-                                        if (!msg.search || packet.includes(msg.search)) {
-                                            if (format === 'jsonl') {
-                                                const obj = lText.parseJson(packet);
-                                                if (obj) {
-                                                    list.push(obj);
-                                                    --limit;
-                                                }
+                                // --- startByte > 0 时已跳过 offset（及 csv 表头），从第一行起均为数据行 ---
+                                // --- startByte === 0 且 csv 时仍需跳过表头（line > 1）---
+                                if (format === 'csv' && startByte === 0 ? line > 1 : line >= 1) {
+                                    if (!msg.search || packet.includes(msg.search)) {
+                                        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 {
+                                            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 {
-                                                        currentField += char;
+                                                        inQuotes = !inQuotes;
                                                     }
                                                 }
-                                                result.push(currentField);
-                                                list.push(result);
-                                                --limit;
+                                                else if (char === ',' && !inQuotes) {
+                                                    result.push(currentField);
+                                                    currentField = '';
+                                                }
+                                                else {
+                                                    currentField += char;
+                                                }
                                             }
+                                            result.push(currentField);
+                                            list.push(result);
+                                            --limit;
                                         }
                                     }
-                                    else {
-                                        --offset;
-                                    }
                                 }
                                 // --- 处理结束 ---
                                 packet = '';
@@ -619,7 +656,8 @@ function createRpcListener() {
                     });
                     res.end(lText.stringifyJson({
                         'result': 1,
-                        'data': rtn,
+                        'list': rtn,
+                        'total': total,
                     }));
                     return;
                 }

package/www/example/ctr/test.js

@@ -1387,16 +1387,16 @@ for (let i = 0; i < 30000; ++i) {
     }
     async coreGetlog() {
         const path = lTime.format(null, 'Y/m/d/H');
-        const list = await lCore.getLog({
+        const log = await lCore.getLog({
             'hostname': this._config.const.hostname,
             'path': path,
             'fend': '-visit',
         });
         const echo = [];
-        echo.push('<table style="width: 100%;">');
-        if (list) {
+        echo.push(`total: ${log ? log.total : 0}<br><table style="width: 100%;">`);
+        if (log) {
             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) {
+            for (const row of log.list) {
                 echo.push('<tr>');
                 if (Array.isArray(row)) {
                     // --- csv 格式：string[] ---
@@ -1418,7 +1418,7 @@ for (let i = 0; i < 30000; ++i) {
             }
         }
         else {
-            echo.push('<tr><th>' + JSON.stringify(list) + '</th></tr>');
+            echo.push('<tr><th>' + JSON.stringify(log) + '</th></tr>');
         }
         echo.push('</table>');
         return echo.join('') + '<br>' + this._getEnd();