@maiyunnet/kebab 7.0.2 → 7.1.1

package/sys/ctr.js

@@ -20,54 +20,46 @@ export function clearLocaleData() {
     localeData = {};
 }
 export class Ctr {
+    /** --- 路由参数序列数组 --- */
+    _param = [];
+    /** --- 当前的 action 名 --- */
+    _action = '';
+    /** --- 请求的 header 列表，key 均为小写 --- */
+    _headers = {};
+    /** --- GET 数据 --- */
+    _get;
+    /** --- 原始 POST 数据 --- */
+    _rawPost = {};
+    /** --- POST 数据 --- */
+    _post = {};
+    /** --- 原始 input 字符串 */
+    _input = '';
+    /** --- 上传的文件列表 --- */
+    _files = {};
+    /** --- Cookie 数组 --- */
+    _cookie = {};
+    /** --- Session 数组 --- */
+    _session = {};
+    /** --- Session --- 对象 */
+    _sess = null;
+    /** --- 页面浏览器客户端缓存 --- */
+    _cacheTTL;
+    /** --- XSRF TOKEN 值 --- */
+    _xsrf = '';
+    /** --- 自定义 http code --- */
+    _httpCode = 0;
+    /** --- 当前语言名 --- */
+    _locale = 'en';
+    /** --- vhost 的 kebab.json 以及全局常量 --- */
+    _config;
+    _req;
+    _res;
+    _socket;
+    /** --- 本 ctr 已加载的语言文件列表 --- */
+    _localeFiles = [];
+    /** --- 本 ctr 的 locale data --- */
+    _localeData = {};
     constructor(config, req, res) {
-        /** --- 路由参数序列数组 --- */
-        this._param = [];
-        /** --- 当前的 action 名 --- */
-        this._action = '';
-        /** --- 请求的 header 列表，key 均为小写 --- */
-        this._headers = {};
-        /** --- 原始 POST 数据 --- */
-        this._rawPost = {};
-        /** --- POST 数据 --- */
-        this._post = {};
-        /** --- 原始 input 字符串 */
-        this._input = '';
-        /** --- 上传的文件列表 --- */
-        this._files = {};
-        /** --- Cookie 数组 --- */
-        this._cookie = {};
-        /** --- Session 数组 --- */
-        this._session = {};
-        /** --- Session --- 对象 */
-        this._sess = null;
-        /** --- XSRF TOKEN 值 --- */
-        this._xsrf = '';
-        /** --- 自定义 http code --- */
-        this._httpCode = 0;
-        /** --- 当前语言名 --- */
-        this._locale = 'en';
-        /** --- 本 ctr 已加载的语言文件列表 --- */
-        this._localeFiles = [];
-        /** --- 本 ctr 的 locale data --- */
-        this._localeData = {};
-        /** --- 一些需要等待的事项的记录（异步任务、事务） --- */
-        this._waitInfo = {
-            'asyncTask': {
-                'count': 0,
-                'resolve': () => {
-                    // --- NOTHING ---
-                },
-                'callback': function () {
-                    return new Promise((resolve) => {
-                        this.resolve = resolve;
-                    });
-                }
-            },
-            'transaction': 0
-        };
-        /** --- auth 对象，user, pwd --- */
-        this._authorization = null;
         this._config = config;
         this._req = req;
         if (res) {
@@ -79,6 +71,8 @@ export class Ctr {
     get _isAvail() {
         return this._req.socket.writable;
     }
+    /** --- timeout 的 timer --- */
+    _timer;
     /** --- 获取当前过期时间 --- */
     get timeout() {
         return this._timer?.timeout ?? 30_000;
@@ -94,6 +88,21 @@ export class Ctr {
         clearTimeout(this._timer.timer);
         this._timer.timer = setTimeout(this._timer.callback, num);
     }
+    /** --- 一些需要等待的事项的记录（异步任务、事务） --- */
+    _waitInfo = {
+        'asyncTask': {
+            'count': 0,
+            'resolve': () => {
+                // --- NOTHING ---
+            },
+            'callback': function () {
+                return new Promise((resolve) => {
+                    this.resolve = resolve;
+                });
+            }
+        },
+        'transaction': 0
+    };
     /**
      * --- 执行一段跳出堆栈的异步代码，代码执行完成前，热更新不会杀死当面进程 且 ftmp 临时文件不会被清除 ---
      * @param func 异步代码
@@ -213,6 +222,19 @@ export class Ctr {
         };
         return lCore.purify(ejs.render(content, data, {}));
     }
+    /**
+     * --- 设置校验错误返回值 ---
+     * @param rtn 返回值数组
+     * @param lastVal 规则最后一项
+     * @param msgSuffix 可选的消息后缀
+     */
+    _setCheckError(rtn, lastVal, msgSuffix) {
+        rtn[0] = lastVal[0];
+        rtn[1] = msgSuffix ? lastVal[1] + msgSuffix : lastVal[1];
+        if (lastVal[2]) {
+            rtn[2] = lastVal[2];
+        }
+    }
     /**
      * --- 检测提交的数据类型 ---
      * @param input 要校验的输入项
@@ -225,10 +247,7 @@ export class Ctr {
         for (const key in rule) {
             const val = rule[key];
             // --- key 就是上面的 xx ---
-            if (input[key] === undefined) {
-                // --- 原值不存在则设定为 null ---
-                input[key] = null;
-            }
+            input[key] ??= null;
             // --- 判断是否需要遍历 val ---
             const c = val.length;
             if (c === 0) {
@@ -236,20 +255,17 @@ export class Ctr {
             }
             // --- ['require', '> 6', [0, 'xx 必须大于 6']] ---
             const lastK = c - 1;
-            if ((val[lastK][0] === undefined) || (val[lastK][1] === undefined) || !Number.isInteger(val[lastK][0]) || (typeof val[lastK][1] !== 'string')) {
+            const lastVal = val[lastK];
+            if ((lastVal[0] === undefined) || (lastVal[1] === undefined) || !Number.isInteger(lastVal[0]) || (typeof lastVal[1] !== 'string')) {
                 rtn[0] = 0;
-                rtn[1] = 'Param error(' + key + ')';
+                rtn[1] = `Param error(${key})`;
                 return false;
             }
             for (let k = 0; k < lastK; ++k) {
                 const v = val[k] ?? '';
                 if (Array.isArray(v)) {
                     if (v.length === 0) {
-                        rtn[0] = val[lastK][0];
-                        rtn[1] = val[lastK][1];
-                        if (val[lastK][2]) {
-                            rtn[2] = val[lastK][2];
-                        }
+                        this._setCheckError(rtn, lastVal);
                         return false;
                     }
                     // --- 判断提交的数据是否在此 array 之内，若没有提交数据，则自动设置为第一个项 ---
@@ -257,23 +273,14 @@ export class Ctr {
                         input[key] = v[0];
                     }
                     else if (!v.includes(input[key])) {
-                        // --- 不在 ---
-                        rtn[0] = val[lastK][0];
-                        rtn[1] = val[lastK][1];
-                        if (val[lastK][2]) {
-                            rtn[2] = val[lastK][2];
-                        }
+                        this._setCheckError(rtn, lastVal);
                         return false;
                     }
                 }
                 else if (v instanceof RegExp) {
                     // --- 正则 ---
                     if (input[key] !== null && !v.test(input[key])) {
-                        rtn[0] = val[lastK][0];
-                        rtn[1] = val[lastK][1];
-                        if (val[lastK][2]) {
-                            rtn[2] = val[lastK][2];
-                        }
+                        this._setCheckError(rtn, lastVal);
                         return false;
                     }
                 }
@@ -282,197 +289,111 @@ export class Ctr {
                     if (input[key] !== null) {
                         const r = lCore.checkType(input[key], v.type);
                         if (r) {
-                            rtn[0] = val[lastK][0];
-                            rtn[1] = typeof val[lastK][1] === 'string' ? val[lastK][1] + '(' + r + ')' : val[lastK][1];
-                            if (val[lastK][2]) {
-                                rtn[2] = val[lastK][2];
-                            }
+                            this._setCheckError(rtn, lastVal, typeof lastVal[1] === 'string' ? `(${r})` : undefined);
                             return false;
                         }
                     }
                 }
                 else {
+                    /** --- 是否需要返回错误 --- */
+                    let needReturn = false;
                     switch (v) {
                         case 'require': {
-                            if ((input[key] === null) || (input[key] === '')) {
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            needReturn = (input[key] === null) || (input[key] === '');
                             break;
                         }
                         case 'int':
                         case 'integer': {
                             // --- 必须是数字型且是整数 ---
-                            if (input[key] && !Number.isSafeInteger(input[key])) {
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            needReturn = input[key] && !Number.isSafeInteger(input[key]);
                             break;
                         }
                         case 'float':
                         case 'double': {
                             // --- 必须是数字型 ---
-                            if (input[key] && (typeof input[key] !== 'number')) {
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            needReturn = input[key] && (typeof input[key] !== 'number');
                             break;
                         }
                         case 'num':
                         case 'number': {
                             // --- 可字符串数字 ---
-                            if (input[key] && (typeof input[key] !== 'number') && !/^[0-9]+\.?[0-9]*$/.test(input[key])) {
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            needReturn = input[key] && (typeof input[key] !== 'number') && !/^[0-9]+\.?[0-9]*$/.test(input[key]);
                             break;
                         }
                         case 'array': {
-                            if (input[key] !== null && !Array.isArray(input[key])) {
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            needReturn = input[key] !== null && !Array.isArray(input[key]);
                             break;
                         }
                         case 'bool':
                         case 'boolean': {
-                            if (input[key] !== null && (typeof input[key] !== 'boolean')) {
-                                // --- 如果不是 bool 直接失败，字符串的 true, false 也会失败 ---
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            // --- 如果不是 bool 直接失败，字符串的 true, false 也会失败 ---
+                            needReturn = input[key] !== null && (typeof input[key] !== 'boolean');
                             break;
                         }
                         case 'string': {
-                            if (input[key] !== null && (typeof input[key] !== 'string')) {
-                                // --- 如果不是 string 直接失败 ---
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            // --- 如果不是 string 直接失败 ---
+                            needReturn = input[key] !== null && (typeof input[key] !== 'string');
                             break;
                         }
                         case 'ascii': {
                             // --- 必须是 ASCII 字符 ---
-                            if (input[key] !== null && !lText.isAscii(input[key])) {
-                                rtn[0] = val[lastK][0];
-                                rtn[1] = val[lastK][1];
-                                if (val[lastK][2]) {
-                                    rtn[2] = val[lastK][2];
-                                }
-                                return false;
-                            }
+                            needReturn = input[key] !== null && !lText.isAscii(input[key]);
                             break;
                         }
                         default: {
-                            let match;
-                            if (input[key] !== null) {
-                                if (v[0] === '/') {
-                                    // --- 正则 ---
-                                    if (!(new RegExp(v.slice(1, -1))).test(input[key])) {
-                                        rtn[0] = val[lastK][0];
-                                        rtn[1] = val[lastK][1];
-                                        if (val[lastK][2]) {
-                                            rtn[2] = val[lastK][2];
-                                        }
-                                        return false;
-                                    }
-                                }
-                                else if ((match = /^([><=]+) *([0-9]+)$/.exec(v))) {
+                            if (input[key] === null) {
+                                break;
+                            }
+                            if (v[0] === '/') {
+                                // --- 正则 ---
+                                needReturn = !(new RegExp(v.slice(1, -1))).test(input[key]);
+                            }
+                            else {
+                                const match = /^([><=]+) *([0-9]+)$/.exec(v);
+                                if (match) {
                                     // --- 判断表达式 ---
-                                    let needReturn = false;
                                     const inputNum = Number(input[key]);
                                     const num = Number(match[2]);
                                     switch (match[1]) {
                                         case '>': {
-                                            if (inputNum <= num) {
-                                                needReturn = true;
-                                            }
+                                            needReturn = inputNum <= num;
                                             break;
                                         }
                                         case '<': {
-                                            if (inputNum >= num) {
-                                                needReturn = true;
-                                            }
+                                            needReturn = inputNum >= num;
                                             break;
                                         }
                                         case '>=': {
-                                            if (inputNum < num) {
-                                                needReturn = true;
-                                            }
+                                            needReturn = inputNum < num;
                                             break;
                                         }
                                         case '<=': {
-                                            if (inputNum > num) {
-                                                needReturn = true;
-                                            }
+                                            needReturn = inputNum > num;
                                             break;
                                         }
                                         case '=':
                                         case '==':
                                         case '===': {
-                                            if (inputNum !== num) {
-                                                needReturn = true;
-                                            }
+                                            needReturn = inputNum !== num;
                                             break;
                                         }
                                         case '!=':
                                         case '<>': {
-                                            if (inputNum === num) {
-                                                needReturn = true;
-                                            }
+                                            needReturn = inputNum === num;
                                             break;
                                         }
                                     }
-                                    if (needReturn) {
-                                        rtn[0] = val[lastK][0];
-                                        rtn[1] = val[lastK][1];
-                                        if (val[lastK][2]) {
-                                            rtn[2] = val[lastK][2];
-                                        }
-                                        return false;
-                                    }
                                 }
                                 else {
-                                    if (input[key] !== v) {
-                                        rtn[0] = val[lastK][0];
-                                        rtn[1] = val[lastK][1];
-                                        if (val[lastK][2]) {
-                                            rtn[2] = val[lastK][2];
-                                        }
-                                        return false;
-                                    }
+                                    needReturn = input[key] !== v;
                                 }
                             }
                         }
                     }
+                    if (needReturn) {
+                        this._setCheckError(rtn, lastVal);
+                        return false;
+                    }
                 }
             }
         }
@@ -532,6 +453,8 @@ export class Ctr {
         }
         return 'unknown';
     }
+    /** --- auth 对象，user, pwd --- */
+    _authorization = null;
     /**
      * --- 通过 header 或 _auth 获取鉴权信息或 JWT 信息（不解析） ---
      */

package/sys/master.js

@@ -138,6 +138,29 @@ function createRpcListener() {
                     lCore.global[msg.key] = msg.data;
                     break;
                 }
+                case 'pm2': {
+                    // --- 执行 PM2 操作 ---
+                    if (!msg.name || typeof msg.name !== 'string') {
+                        res.end('Invalid name');
+                        return;
+                    }
+                    // --- 安全过滤，只允许字母、数字、下划线、短横线 ---
+                    if (!/^[a-zA-Z0-9_-]+$/.test(msg.name)) {
+                        res.end('Invalid name format');
+                        return;
+                    }
+                    // --- 校验 pm2Action ---
+                    if (msg.pm2Action !== 'start' && msg.pm2Action !== 'stop' && msg.pm2Action !== 'restart') {
+                        res.end('Invalid pm2Action');
+                        return;
+                    }
+                    const rtn = await lCore.exec(`pm2 ${msg.pm2Action} ${msg.name}`);
+                    if (rtn === false) {
+                        res.end('Exec failed');
+                        return;
+                    }
+                    break;
+                }
                 case 'code': {
                     // --- 更新 code 代码包 ---
                     const rtn = await sRoute.getFormData(req);

package/sys/mod.js

@@ -9,6 +9,7 @@ import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
 /** --- 条数列表 --- */
 export class Rows {
+    _items;
     constructor(initialItems = []) {
         this._items = initialItems;
     }
@@ -46,32 +47,36 @@ export class Rows {
  */
 export default class Mod {
     /** --- 表名 --- */
-    static { this._$table = ''; }
+    static _$table = '';
     /** --- 主键字段名 --- */
-    static { this._$primary = 'id'; }
+    static _$primary = 'id';
     /** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
-    static { this._$key = ''; }
+    static _$key = '';
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
-    static { this._$index = ''; }
+    static _$index = '';
+    /** --- 前缀，顺序：选项前缀 -> 本前缀 -> 配置文件前缀 --- */
+    static _$pre;
+    /** --- 要 update 的内容 --- */
+    _updates = {};
+    /** --- 模型获取的属性 --- */
+    _data = {};
+    /** --- 当前选择的分表 _ 后缀，多个代表联查 --- */
+    _index = null;
+    /** --- 必须追加的数据筛选 key 与 values，仅单表模式有效 --- */
+    _contain = null;
+    /** --- 已算出的 total --- */
+    _total = [];
+    /** --- 数据库连接对象 --- */
+    _db;
+    /** --- Sql 对象 --- */
+    _sql;
+    /** --- ctr 对象 --- */
+    _ctr = undefined;
     /**
      * --- 构造函数 ---
      * @param opt 选项
      */
     constructor(opt) {
-        /** --- 要 update 的内容 --- */
-        this._updates = {};
-        /** --- 模型获取的属性 --- */
-        this._data = {};
-        /** --- 当前选择的分表 _ 后缀，多个代表联查 --- */
-        this._index = null;
-        /** --- 必须追加的数据筛选 key 与 values，仅单表模式有效 --- */
-        this._contain = null;
-        /** --- 已算出的 total --- */
-        this._total = [];
-        /** --- ctr 对象 --- */
-        this._ctr = undefined;
-        /** --- 设置的 limit --- */
-        this._limit = [0, 0];
         /** --- 导入 ctr 对象 --- */
         this._ctr = opt.ctr;
         /** --- 导入数据库连接 --- */
@@ -1303,6 +1308,8 @@ export default class Mod {
         this._sql.group(c);
         return this;
     }
+    /** --- 设置的 limit --- */
+    _limit = [0, 0];
     /**
      * --- LIMIT ---
      * @param a 起始