@maiyunnet/kebab 2.0.13 → 2.0.15

package/index.d.ts

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "2.0.13";
+export declare const VER = "2.0.15";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -11,7 +11,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOD_CWD = exports.FTMP_CWD = exports.IND_CWD = exports.WWW_CWD = exports.LOG_CWD = exports.LIB_CWD = exports.VHOST_CWD = exports.CERT_CWD = exports.CONF_CWD = exports.ROOT_CWD = exports.SYS_PATH = exports.LIB_PATH = exports.ROOT_PATH = exports.VER = void 0;
 /** --- 当前系统版本号 --- */
-exports.VER = '2.0.13';
+exports.VER = '2.0.15';
 // --- 服务端用的路径 ---
 /** --- /xxx/xxx --- */
 const dirname = __dirname.replace(/\\/g, '/');

package/lib/core.d.ts

@@ -12,6 +12,7 @@ export declare const globalConfig: types.IConfig & {
     'rpcSecret': string;
     'debug': boolean;
     'max': number;
+    'hosts': string[];
 };
 /** --- Cookie 设置的选项 --- */
 export interface ICookieOptions {
@@ -133,23 +134,23 @@ export declare function exec(command: string): Promise<string | false>;
  * --- 向主进程（或局域网同代码机子）发送广播将进行 reload 操作，等待回传 ---
  * --- 主要作用除代码热更新以外的其他情况 ---
  */
-export declare function sendReload(hosts?: string[]): Promise<string[]>;
+export declare function sendReload(hosts?: string[] | 'config'): Promise<string[]>;
 /**
  * --- 向主进程（或局域网同代码机子）发送广播将进行 restart 操作，停止监听并启动新进程，老进程在连接全部断开后自行销毁 ---
  * --- 主要用作不间断的代码热更新 ---
  */
-export declare function sendRestart(hosts?: string[]): Promise<string[]>;
+export declare function sendRestart(hosts?: string[] | 'config'): Promise<string[]>;
 /** --- 跨进程全局变量 --- */
 export declare const global: Record<string, any>;
 /**
- * --- 设置跨线程的全局变量 ---
+ * --- 设置跨线程/跨内网服务器的全局变量 ---
  * @param key 变量名
  * @param data 变量值
  * @param hosts 局域网列表
  */
-export declare function setGlobal(key: string, data: types.Json, hosts?: string[]): Promise<string[]>;
+export declare function setGlobal(key: string, data: types.Json, hosts?: string[] | 'config'): Promise<string[]>;
 /**
- * --- 移除某个跨线程全局变量 ---
+ * --- 移除某个跨线程/跨内网服务器全局变量 ---
  * @param key 变量名
  * @param hosts 局域网列表
  */
@@ -160,20 +161,23 @@ export declare function removeGlobal(key: string, hosts?: string[]): Promise<str
  * @param path 要覆盖到的路径，无所谓是否 / 开头 / 结尾，是对方 kebab 的根据路开始算起
  * @param hosts 局域网多机部署，不设置默认本机部署
  * @param config 是否自动更新 config 的 set.staticVer 为最新，默认更新
+ * @param strict 严格模式，只有存在的文件才会被覆盖，不存在则中途直接报错，默认为 true
  */
-export declare function updateCode(sourcePath: string, path: string, hosts?: string[], config?: boolean): Promise<Record<string, {
+export declare function updateCode(sourcePath: string, path: string, hosts?: string[] | 'config', config?: boolean, strict?: boolean): Promise<Record<string, {
     'result': boolean;
     'return': string;
 }>>;
 /** --- log 设置的选项 --- */
 export interface ILogOptions {
-    'path': string;
-    'urlFull': string;
-    'hostname': string;
-    'req': http2.Http2ServerRequest | http.IncomingMessage | null;
-    'get': Record<string, types.Json>;
-    'cookie': Record<string, string>;
-    'headers': http.IncomingHttpHeaders;
+    'path'?: string;
+    'urlFull'?: string;
+    'hostname'?: string;
+    'req'?: http2.Http2ServerRequest | http.IncomingMessage | null;
+    'get'?: Record<string, types.Json>;
+    'cookie'?: Record<string, string>;
+    'jwt'?: Record<string, any>;
+    'session'?: Record<string, any>;
+    'headers'?: http.IncomingHttpHeaders;
 }
 /**
  * --- 写入文件日志 ---
@@ -181,25 +185,45 @@ export interface ILogOptions {
  * @param fend 文件名追加
  * @param opt 选项
  */
-export declare function log(opt: sCtr.Ctr | ILogOptions, msg: string, fend?: string): Promise<void>;
+export declare function log(opt: sCtr.Ctr | ILogOptions, msg: string, fend?: string): void;
 /**
  * --- 获取日志内容为一个数组 ---
  * @param opt 参数
  */
 export declare function getLog(opt: {
     /** --- 如 127.0.0.1 --- */
-    'host': string;
+    'hostname': string;
     /** --- 如 2024/08/01/22 --- */
     'path': string;
     /** --- 如 -error --- */
     'fend'?: string;
     /** --- 仅显示被搜索到的行 --- */
     'search'?: string;
+    /** --- 跳过的字节数，默认不跳过 --- */
+    'start'?: number;
     /** --- 跳过条数 --- */
     'offset'?: number;
     /** --- 最大限制，默认 100 --- */
     'limit'?: number;
+    /** --- 获取局域网服务器的日志，为空代表获取本机的 --- */
+    'host'?: string;
 }): Promise<string[][] | null | false>;
+/**
+ * --- 获取目录内文件/文件夹列表 ---
+ * @param opt 参数
+ */
+export declare function ls(opt: {
+    /** --- 如 2024/08/01/22，无所谓开头结尾 --- */
+    'path': string;
+    'encoding'?: BufferEncoding;
+    /** --- 获取局域网服务器的目录列表，为空代表获取本机的 --- */
+    'host'?: string;
+}): Promise<Array<{
+    'isFile': boolean;
+    'isDirectory': boolean;
+    'isSymbolicLink': boolean;
+    'name': string;
+}>>;
 /**
  * --- 完整的克隆一份数组/对象，Kebab: yes, Mutton: no ---
  * @param obj 要克隆的对象

package/lib/core.js

@@ -56,6 +56,7 @@ exports.removeGlobal = removeGlobal;
 exports.updateCode = updateCode;
 exports.log = log;
 exports.getLog = getLog;
+exports.ls = ls;
 exports.clone = clone;
 exports.debug = debug;
 exports.display = display;
@@ -457,6 +458,9 @@ async function sendReload(hosts) {
         });
         return [];
     }
+    if (hosts === 'config') {
+        hosts = exports.globalConfig.hosts;
+    }
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
@@ -493,6 +497,9 @@ async function sendRestart(hosts) {
         });
         return [];
     }
+    if (hosts === 'config') {
+        hosts = exports.globalConfig.hosts;
+    }
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
@@ -518,7 +525,7 @@ async function sendRestart(hosts) {
 /** --- 跨进程全局变量 --- */
 exports.global = {};
 /**
- * --- 设置跨线程的全局变量 ---
+ * --- 设置跨线程/跨内网服务器的全局变量 ---
  * @param key 变量名
  * @param data 变量值
  * @param hosts 局域网列表
@@ -533,6 +540,9 @@ async function setGlobal(key, data, hosts) {
         });
         return [];
     }
+    if (hosts === 'config') {
+        hosts = exports.globalConfig.hosts;
+    }
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
@@ -556,7 +566,7 @@ async function setGlobal(key, data, hosts) {
     return rtn;
 }
 /**
- * --- 移除某个跨线程全局变量 ---
+ * --- 移除某个跨线程/跨内网服务器全局变量 ---
  * @param key 变量名
  * @param hosts 局域网列表
  */
@@ -569,8 +579,12 @@ async function removeGlobal(key, hosts) {
  * @param path 要覆盖到的路径，无所谓是否 / 开头 / 结尾，是对方 kebab 的根据路开始算起
  * @param hosts 局域网多机部署，不设置默认本机部署
  * @param config 是否自动更新 config 的 set.staticVer 为最新，默认更新
+ * @param strict 严格模式，只有存在的文件才会被覆盖，不存在则中途直接报错，默认为 true
  */
-async function updateCode(sourcePath, path, hosts, config = true) {
+async function updateCode(sourcePath, path, hosts, config = true, strict = true) {
+    if (hosts === 'config') {
+        hosts = exports.globalConfig.hosts;
+    }
     hosts ??= ['127.0.0.1'];
     /** --- 返回成功的 host --- */
     const rtn = {};
@@ -581,6 +595,7 @@ async function updateCode(sourcePath, path, hosts, config = true) {
         }
         fd.putString('path', path);
         fd.putString('config', config ? '1' : '0');
+        fd.putString('strict', strict ? '1' : '0');
         const res = await lNet.post('http://' + host + ':' + exports.globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'code',
             'time': lTime.stamp()
@@ -609,65 +624,77 @@ async function updateCode(sourcePath, path, hosts, config = true) {
  * @param fend 文件名追加
  * @param opt 选项
  */
-async function log(opt, msg, fend = '') {
-    let req;
-    let headers;
-    let get;
-    let cookie;
-    let wpath;
-    let urlFull;
-    let hostname;
-    if (opt instanceof sCtr.Ctr) {
-        req = opt.getPrototype('_req');
-        headers = opt.getPrototype('_headers');
-        get = opt.getPrototype('_get');
-        cookie = opt.getPrototype('_cookie');
-        const config = opt.getPrototype('_config');
-        wpath = config.const.path;
-        urlFull = config.const.urlFull;
-        hostname = config.const.hostname;
-    }
-    else {
-        req = opt.req;
-        headers = opt.headers;
-        get = opt.get;
-        cookie = opt.cookie;
-        wpath = opt.path;
-        urlFull = opt.urlFull;
-        hostname = opt.hostname;
-    }
-    if (hostname === '') {
-        hostname = 'system';
-    }
-    const realIp = req?.socket.remoteAddress ?? '';
-    const clientIp = req ? ip(headers, req) : '';
-    const [y, m, d, h] = lTime.format(null, 'Y-m-d-H').split('-');
-    let path = kebab.LOG_CWD + hostname + fend + '/' + y + '/' + m + '/' + d + '/';
-    const rtn = await lFs.mkdir(path, 0o777);
-    if (!rtn) {
-        return;
-    }
-    path += h + '.csv';
-    if (!await lFs.isFile(path)) {
-        if (!await lFs.putContent(path, 'TIME,UNIX,URL,COOKIE,USER_AGENT,REALIP,CLIENTIP,MESSAGE\n', {
-            'encoding': 'utf8',
-            'mode': 0o777
-        })) {
+function log(opt, msg, fend = '') {
+    (async () => {
+        let req;
+        let headers;
+        let get;
+        let cookie;
+        let jwt;
+        let session;
+        let wpath;
+        let urlFull;
+        let hostname;
+        if (opt instanceof sCtr.Ctr) {
+            req = opt.getPrototype('_req');
+            headers = opt.getPrototype('_headers');
+            get = opt.getPrototype('_get');
+            cookie = opt.getPrototype('_cookie');
+            jwt = opt.getPrototype('_jwt');
+            session = opt.getPrototype('_session');
+            const config = opt.getPrototype('_config');
+            wpath = config.const.path;
+            urlFull = config.const.urlFull;
+            hostname = config.const.hostname;
+        }
+        else {
+            req = opt.req ?? null;
+            headers = opt.headers ?? {};
+            get = opt.get ?? {};
+            cookie = opt.cookie ?? {};
+            jwt = opt.jwt ?? {};
+            session = opt.session ?? {};
+            wpath = opt.path ?? '';
+            urlFull = opt.urlFull ?? '';
+            hostname = opt.hostname ?? '';
+        }
+        if (hostname === '') {
+            hostname = 'system';
+        }
+        const realIp = req?.socket.remoteAddress ?? '';
+        const clientIp = req ? ip(headers, req) : '';
+        const [y, m, d, h] = lTime.format(null, 'Y-m-d-H').split('-');
+        let path = kebab.LOG_CWD + hostname + fend + '/' + y + '/' + m + '/' + d + '/';
+        const rtn = await lFs.mkdir(path, 0o777);
+        if (!rtn) {
             return;
         }
-    }
-    await lFs.putContent(path, '"' +
-        lTime.format(null, 'H:i:s') + '","' +
-        lTime.stamp().toString() + '","' +
-        urlFull + wpath + (Object.keys(get).length ? '?' + lText.queryStringify(get).replace(/"/g, '""') : '') + '","' +
-        lText.queryStringify(cookie).replace(/"/g, '""') + '","' +
-        (headers['user-agent']?.replace(/"/g, '""') ?? 'No HTTP_USER_AGENT') + '","' +
-        realIp.replace(/"/g, '""') + '","' +
-        clientIp.replace(/"/g, '""') + '",' +
-        JSON.stringify(msg.replace(/"/g, '""')) + '\n', {
-        'encoding': 'utf8',
-        'mode': 0o777,
-        'flag': 'a'
+        path += h + '.csv';
+        if (!await lFs.isFile(path)) {
+            if (!await lFs.putContent(path, 'TIME,UNIX,URL,COOKIE,SESSION,JWT,USER_AGENT,REALIP,CLIENTIP,MESSAGE\n', {
+                'encoding': 'utf8',
+                'mode': 0o777
+            })) {
+                return;
+            }
+        }
+        await lFs.putContent(path, '"' +
+            lTime.format(null, 'H:i:s') + '","' +
+            lTime.stamp().toString() + '","' +
+            urlFull + wpath + (Object.keys(get).length ? '?' + lText.queryStringify(get).replace(/"/g, '""') : '') + '","' +
+            lText.queryStringify(cookie).replace(/"/g, '""') + '","' +
+            lText.stringifyJson(jwt).replace(/"/g, '""') + '","' +
+            lText.stringifyJson(session).replace(/"/g, '""') + '","' +
+            (headers['user-agent']?.replace(/"/g, '""') ?? 'No HTTP_USER_AGENT') + '","' +
+            realIp.replace(/"/g, '""') + '","' +
+            clientIp.replace(/"/g, '""') + '","' +
+            JSON.stringify(msg).slice(1, -1).replace(/"/g, '""') + '"\n', {
+            'encoding': 'utf8',
+            'mode': 0o777,
+            'flag': 'a'
+        });
+    })().catch((e) => {
+        display('[CORE] [log]', e);
     });
 }
 /**
@@ -675,91 +702,59 @@ async function log(opt, msg, fend = '') {
  * @param opt 参数
  */
 async function getLog(opt) {
-    const path = kebab.LOG_CWD + opt.host + (opt.fend ?? '') + '/' + opt.path + '.csv';
-    if (!await lFs.isFile(path)) {
-        return null;
-    }
-    /** --- 剩余 limit --- */
-    let limit = opt.limit ?? 100;
-    /** --- 剩余 offset --- */
-    let offset = opt.offset ?? 0;
-    return new Promise((resolve) => {
-        const list = [];
-        /** --- 当前行号 --- */
-        let line = 0;
-        /** --- 当前行数据 --- */
-        let packet = '';
-        lFs.createReadStream(path, {
-            'encoding': 'utf8'
-        }).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 (!opt.search || packet.includes(opt.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);
-        });
+    opt.host ??= '127.0.0.1';
+    // --- 局域网模式 ---
+    const time = lTime.stamp();
+    const res = await lNet.get('http://' + opt.host + ':' + exports.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,
+    }), exports.globalConfig.rpcSecret), {
+        'timeout': 2
     });
+    const content = await res.getContent();
+    if (!content) {
+        return false;
+    }
+    const str = content.toString();
+    const j = lText.parseJson(str);
+    if (!j) {
+        return false;
+    }
+    return j.data;
+}
+/**
+ * --- 获取目录内文件/文件夹列表 ---
+ * @param opt 参数
+ */
+async function ls(opt) {
+    opt.host ??= '127.0.0.1';
+    // --- 局域网模式 ---
+    const time = lTime.stamp();
+    const res = await lNet.get('http://' + opt.host + ':' + exports.globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
+        'action': 'ls',
+        'time': time,
+        'path': opt.path,
+        'encoding': opt.encoding,
+    }), exports.globalConfig.rpcSecret), {
+        'timeout': 2
+    });
+    const content = await res.getContent();
+    if (!content) {
+        return [];
+    }
+    const str = content.toString();
+    const j = lText.parseJson(str);
+    if (!j) {
+        return [];
+    }
+    return j.data;
 }
 /**
  * --- 完整的克隆一份数组/对象，Kebab: yes, Mutton: no ---

package/lib/db.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47
+ * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47, 2025-8-3 20:24:03
  */
 import * as mysql2 from 'mysql2/promise';
 import * as ctr from '~/sys/ctr';