@maiyunnet/kebab 2.0.14 → 2.0.16

package/sys/child.js

@@ -43,13 +43,13 @@ const tls = __importStar(require("tls"));
 const http = __importStar(require("http"));
 const crypto = __importStar(require("crypto"));
 // --- 库和定义 ---
-const fs = __importStar(require("../lib/fs"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
-const sCtr = __importStar(require("../sys/ctr"));
-const kebab = __importStar(require("../index"));
+const fs = __importStar(require("~/lib/fs"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const kebab = __importStar(require("~/index"));
 // --- 初始化 ---
-const sRoute = __importStar(require("../sys/route"));
+const sRoute = __importStar(require("~/sys/route"));
 /** --- 10 秒往主线程发送一次心跳的 Timer --- */
 const hbTimer = setInterval(function () {
     if (!process.connected || !process.send) {
@@ -61,9 +61,11 @@ const hbTimer = setInterval(function () {
     });
 }, 10_000);
 /** --- 加载的证书列表（path: { sc, cert }） --- */
-const certList = [];
+let certList = [];
 /** --- server: index --- */
 let certHostIndex = {};
+/** --- 最后一次加载证书到内存的时间 --- */
+let certLastLoad = 0;
 /** --- 当前的虚拟主机配置列表 - 读取于 conf/vhost/*.json --- */
 let vhosts = [];
 /** --- http 服务器 --- */
@@ -82,6 +84,12 @@ async function run() {
     http2Server = http2.createSecureServer({
         // eslint-disable-next-line @typescript-eslint/naming-convention
         'SNICallback': (servername, cb) => {
+            if (Date.now() - certLastLoad > 60_000 * 60 * 24) {
+                // --- 不能用异步，不要干扰 SNI 进程 ---
+                reloadCert().catch(e => {
+                    lCore.display('[CHILD][run] reloadCert error', e);
+                });
+            }
             const i = certHostIndex[servername];
             if (i !== undefined) {
                 cb(null, certList[i].sc);
@@ -119,16 +127,8 @@ async function run() {
             if (!linkCount[key]) {
                 delete linkCount[key];
             }
-        })().catch(async function (e) {
-            await lCore.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': req,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[child][http2][request]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        })().catch(function (e) {
+            lCore.log({}, '[CHILD][http2][request] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             --linkCount[key];
             if (!linkCount[key]) {
                 delete linkCount[key];
@@ -153,16 +153,8 @@ async function run() {
             if (!linkCount[key]) {
                 delete linkCount[key];
             }
-        })().catch(async function (e) {
-            await lCore.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': req,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[child][http2][upgrade]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        })().catch(function (e) {
+            lCore.log({}, '[CHILD][http2][upgrade] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             --linkCount[key];
             if (!linkCount[key]) {
                 delete linkCount[key];
@@ -186,16 +178,8 @@ async function run() {
             if (!linkCount[key]) {
                 delete linkCount[key];
             }
-        })().catch(async function (e) {
-            await lCore.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': req,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[child][http][request]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        })().catch(function (e) {
+            lCore.log({}, '[CHILD][http][request] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             --linkCount[key];
             if (!linkCount[key]) {
                 delete linkCount[key];
@@ -218,16 +202,8 @@ async function run() {
             if (!linkCount[key]) {
                 delete linkCount[key];
             }
-        })().catch(async function (e) {
-            await lCore.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': req,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[child][http][upgrade]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        })().catch(function (e) {
+            lCore.log({}, '[CHILD][http][upgrade] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             --linkCount[key];
             if (!linkCount[key]) {
                 delete linkCount[key];
@@ -335,7 +311,7 @@ async function requestHandler(req, res, https) {
                         }
                     }
                     catch (e) {
-                        await lCore.log({
+                        lCore.log({
                             'path': path.slice(('/' + pathList.slice(0, i).join('/')).length + 1),
                             'urlFull': (uri.protocol ?? '') + '//' + (uri.host ?? '') + '/' + now,
                             'hostname': uri.hostname ?? '',
@@ -343,7 +319,7 @@ async function requestHandler(req, res, https) {
                             'get': uri.query ? lText.queryParse(uri.query) : {},
                             'cookie': {},
                             'headers': {}
-                        }, '(E01)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        }, '[CHILD][requestHandler][E0]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                         res.setHeader('content-type', 'text/html; charset=utf-8');
                         res.setHeader('content-length', 25);
                         res.writeHead(500);
@@ -381,15 +357,7 @@ async function requestHandler(req, res, https) {
                     }
                 }
                 catch (e) {
-                    await lCore.log({
-                        'path': path.slice(1),
-                        'urlFull': (uri.protocol ?? '') + '//' + (uri.host ?? '') + '/' + now,
-                        'hostname': uri.hostname ?? '',
-                        'req': req,
-                        'get': uri.query ? lText.queryParse(uri.query) : {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '(E02)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                    lCore.log({}, '[CHILD][requestHandler][E1]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                     res.setHeader('content-type', 'text/html; charset=utf-8');
                     res.setHeader('content-length', 25);
                     res.writeHead(500);
@@ -540,7 +508,17 @@ async function reload() {
         }
     }
     // --- 重新加载证书对 ---
-    certList.length = 0;
+    await reloadCert();
+    // --- 其他操作 ---
+    sRoute.clearKebabConfigs();
+    sCtr.clearLocaleData();
+}
+/**
+ * --- 重新加载证书对 ---
+ */
+async function reloadCert() {
+    certLastLoad = Date.now();
+    const cl = [];
     try {
         const certConfig = await fs.getContent(kebab.CONF_CWD + 'cert.json', 'utf8');
         if (certConfig) {
@@ -556,7 +534,7 @@ async function reload() {
                     'key': key,
                     'cert': cert
                 });
-                certList.push({
+                cl.push({
                     'cert': certo,
                     'sc': sc
                 });
@@ -566,10 +544,8 @@ async function reload() {
     catch {
         // --- NOTHING ---
     }
+    certList = cl;
     certHostIndex = {};
-    // --- 其他操作 ---
-    sRoute.clearKebabConfigs();
-    sCtr.clearLocaleData();
 }
 // --- 接收主进程回传信号，主要用来 reload，restart ---
 process.on('message', function (msg) {
@@ -598,17 +574,8 @@ process.on('message', function (msg) {
                     for (const key in linkCount) {
                         str.push(key + ':' + linkCount[key].toString());
                     }
-                    // eslint-disable-next-line no-console
-                    console.log(`[child] Worker ${process.pid} busy: ${str.join(',')}.`);
-                    await lCore.log({
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, `[child] Worker ${process.pid} busy: ${str.join(',')}.`, '-error');
+                    lCore.display(`[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`);
+                    lCore.log({}, `[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`, '-error');
                     await lCore.sleep(30_000);
                     waiting += 30_000;
                     if (waiting > 3600_000) {
@@ -635,16 +602,8 @@ process.on('message', function (msg) {
                 break;
             }
         }
-    })().catch(async function (e) {
-        await lCore.log({
-            'path': '',
-            'urlFull': '',
-            'hostname': '',
-            'req': null,
-            'get': {},
-            'cookie': {},
-            'headers': {}
-        }, '[child][process][message]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+    })().catch(function (e) {
+        lCore.log({}, '[CHILD][process][message] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
     });
 });
 /**

package/sys/cmd.js

@@ -39,12 +39,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Last: 2020-3-7 23:51:18, 2022-07-22 14:14:09, 2022-9-27 14:52:19, 2023-5-23 21:42:46, 2024-7-2 15:12:28
  */
 const http = __importStar(require("http"));
-const lFs = __importStar(require("../lib/fs"));
-const lText = __importStar(require("../lib/text"));
-const lTime = __importStar(require("../lib/time"));
-const lCore = __importStar(require("../lib/core"));
-const lCrypto = __importStar(require("../lib/crypto"));
-const kebab = __importStar(require("../index"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lTime = __importStar(require("~/lib/time"));
+const lCore = __importStar(require("~/lib/core"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const kebab = __importStar(require("~/index"));
 /** --- 解析命令 --- */
 const cmds = process.argv.slice(2);
 /** --- 批量创建目录 --- */
@@ -110,6 +110,7 @@ async function run() {
         config.rpcSecret ??= 'MUSTCHANGE';
         config.debug ??= true;
         config.max ??= 64;
+        config.hosts ??= [];
         // --- config - set ---
         config.set ??= {};
         config.set.timezone ??= 8;

package/sys/ctr.d.ts

@@ -34,9 +34,9 @@ export declare class Ctr {
     /** --- Cookie 数组 --- */
     protected _cookie: Record<string, string>;
     /** --- Jwt 数组 --- */
-    protected _jwt: Record<string, types.Json>;
+    protected _jwt: Record<string, any>;
     /** --- Session 数组 --- */
-    protected _session: Record<string, types.Json>;
+    protected _session: Record<string, any>;
     /** --- Session --- 对象 */
     protected _sess: session.Session | null;
     /** --- 页面浏览器客户端缓存 --- */

package/sys/ctr.js

@@ -147,9 +147,9 @@ class Ctr {
                 if (!this._waitInfo.asyncTask.count) {
                     this._waitInfo.asyncTask.resolve();
                 }
-            })().catch(async (e) => {
+            })().catch(e => {
                 lCore.display('[ERROR][CTR][ASYNCTASK]', e);
-                await lCore.log(this, '(ctr.asyncTask)' + text.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log(this, '[CTR][_asyncTask] ' + text.stringifyJson(e.stack).slice(1, -1), '-error');
                 --this._waitInfo.asyncTask.count;
                 if (!this._waitInfo.asyncTask.count) {
                     this._waitInfo.asyncTask.resolve();

package/sys/master.js

@@ -42,14 +42,14 @@ const os = __importStar(require("os"));
 const cluster = __importStar(require("cluster"));
 const http = __importStar(require("http"));
 // --- 库和定义 ---
-const kebab = __importStar(require("../index"));
-const sRoute = __importStar(require("../sys/route"));
-const lCore = __importStar(require("../lib/core"));
-const lFs = __importStar(require("../lib/fs"));
-const lText = __importStar(require("../lib/text"));
-const lCrypto = __importStar(require("../lib/crypto"));
-const lTime = __importStar(require("../lib/time"));
-const lZip = __importStar(require("../lib/zip"));
+const kebab = __importStar(require("~/index"));
+const sRoute = __importStar(require("~/sys/route"));
+const lCore = __importStar(require("~/lib/core"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const lTime = __importStar(require("~/lib/time"));
+const lZip = __importStar(require("~/lib/zip"));
 /** --- 当前运行中的子进程列表 --- */
 const workerList = {};
 /**
@@ -130,7 +130,7 @@ function createRpcListener() {
                 return;
             }
             if (lCore.globalConfig.rpcSecret === 'MUSTCHANGE') {
-                res.end('rpcSecret need be "' + lCore.random(32, lCore.RANDOM_LUN) + '"');
+                res.end(`The rpcSecret is not set. It's recommended to set it to: ${lCore.random(32, lCore.RANDOM_LUN)}`);
                 return;
             }
             switch (msg.action) {
@@ -235,9 +235,19 @@ function createRpcListener() {
                         }
                         // --- 看文件夹是否存在 ---
                         if (pat && !await lFs.isDir(to + pat)) {
+                            if (rtn.post['strict'] === '1') {
+                                res.end('Path not found: ' + to + pat);
+                                await sRoute.unlinkUploadFiles(rtn.files);
+                                return;
+                            }
                             await lFs.mkdir(to + pat);
                         }
                         // --- 覆盖或创建文件 ---
+                        if ((rtn.post['strict'] === '1') && !await lFs.isFile(to + pat + fname)) {
+                            res.end('Path not found: ' + to + pat + fname);
+                            await sRoute.unlinkUploadFiles(rtn.files);
+                            return;
+                        }
                         await lFs.putContent(to + pat + fname, ls[path]);
                     }
                     await sRoute.unlinkUploadFiles(rtn.files);
@@ -252,6 +262,118 @@ function createRpcListener() {
                     }
                     break;
                 }
+                case 'log': {
+                    // --- 获取日志信息 ---
+                    const path = kebab.LOG_CWD + msg.hostname + (msg.fend ?? '') + '/' + msg.path + '.csv';
+                    if (!await lFs.isFile(path)) {
+                        res.end(lText.stringifyJson({
+                            'result': 1,
+                            'data': false,
+                        }));
+                        return;
+                    }
+                    /** --- 剩余 limit --- */
+                    let limit = msg.limit ?? 100;
+                    /** --- 剩余 offset --- */
+                    let offset = msg.offset ?? 0;
+                    const rtn = await new Promise((resolve) => {
+                        const list = [];
+                        /** --- 当前行号 --- */
+                        let line = 0;
+                        /** --- 当前行数据 --- */
+                        let packet = '';
+                        lFs.createReadStream(path, {
+                            'encoding': 'utf8',
+                            'start': msg.start,
+                        }).on('data', (buf) => {
+                            if (typeof buf !== 'string') {
+                                return;
+                            }
+                            while (true) {
+                                // --- 分包 ---
+                                const index = buf.indexOf('\n');
+                                if (index === -1) {
+                                    // --- 本次包还没有结束 ---
+                                    packet += buf;
+                                    break;
+                                }
+                                // --- 本次行结束了 ---
+                                if (limit === 0) {
+                                    break;
+                                }
+                                packet += buf.slice(0, index);
+                                buf = buf.slice(index + 1);
+                                ++line;
+                                // --- 先执行下本次完成的 ---
+                                if (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;
+                                                    }
+                                                    else {
+                                                        inQuotes = !inQuotes;
+                                                    }
+                                                }
+                                                else if (char === ',' && !inQuotes) {
+                                                    result.push(currentField);
+                                                    currentField = '';
+                                                }
+                                                else {
+                                                    currentField += char;
+                                                }
+                                            }
+                                            result.push(currentField);
+                                            list.push(result);
+                                            --limit;
+                                        }
+                                    }
+                                    else {
+                                        --offset;
+                                    }
+                                }
+                                // --- 处理结束 ---
+                                packet = '';
+                                // --- 看看还有没有后面的粘连包 ---
+                                if (!buf.length) {
+                                    // --- 没粘连包 ---
+                                    break;
+                                }
+                                // --- 有粘连包 ---
+                            }
+                        }).on('end', () => {
+                            resolve(list);
+                        }).on('error', () => {
+                            resolve(false);
+                        });
+                    });
+                    res.end(lText.stringifyJson({
+                        'result': 1,
+                        'data': rtn,
+                    }));
+                    return;
+                }
+                case 'ls': {
+                    // --- 获取目录内文件/文件夹列表 ---
+                    const path = lText.urlResolve(kebab.ROOT_CWD, msg.path);
+                    res.end(lText.stringifyJson({
+                        'result': 1,
+                        'data': (await lFs.readDir(path, msg.encoding)).map(item => ({
+                            'isFile': item.isFile(),
+                            'isDirectory': item.isDirectory(),
+                            'isSymbolicLink': item.isSymbolicLink(),
+                            'name': item.name,
+                        })),
+                    }));
+                    return;
+                }
                 default: {
                     res.end('Not command: ' + msg.action);
                     return;

package/sys/mod.d.ts

@@ -3,10 +3,10 @@
  * Date: 2019-6-4 21:35
  * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34
  */
-import * as lSql from '../lib/sql';
-import * as lDb from '../lib/db';
-import * as sCtr from '../sys/ctr';
-import * as types from '../types';
+import * as lSql from '~/lib/sql';
+import * as lDb from '~/lib/db';
+import * as sCtr from '~/sys/ctr';
+import * as types from '~/types';
 /** --- 条数列表 --- */
 declare class Rows<T extends Mod> implements types.Rows<T> {
     private readonly _items;