@maiyunnet/kebab 9.5.0 → 9.7.0

package/index.d.ts

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

package/index.js

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

package/lib/core.d.ts

@@ -167,12 +167,18 @@ export declare function exec(command: string, options?: {
  * --- 向主进程（或局域网同代码机子）发送广播将进行 reload 操作，等待回传 ---
  * --- 主要作用除代码热更新以外的其他情况 ---
  */
-export declare function sendReload(hosts?: string[] | 'config'): Promise<string[]>;
+export declare function sendReload(hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /**
  * --- 向主进程（或局域网同代码机子）发送广播将进行 restart 操作，停止监听并启动新进程，老进程在连接全部断开后自行销毁 ---
  * --- 主要用作不间断的代码热更新 ---
  */
-export declare function sendRestart(hosts?: string[] | 'config'): Promise<string[]>;
+export declare function sendRestart(hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /** --- PM2 操作类型 --- */
 export type TPm2Action = 'start' | 'stop' | 'restart';
 /**
@@ -181,13 +187,19 @@ export type TPm2Action = 'start' | 'stop' | 'restart';
  * @param action PM2 操作类型
  * @param hosts 局域网列表
  */
-export declare function sendPm2(name: string, action?: TPm2Action, hosts?: string[] | 'config'): Promise<string[]>;
+export declare function sendPm2(name: string, action?: TPm2Action, hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /**
  * --- 向本机或局域网 RPC 发送 npm install 操作 ---
  * @param path 路径，如 /home/kebab/
- * @param hosts 局域网列表
+ * @param hosts 局域网列表，不填则代表本机
  */
-export declare function sendNpm(path: string, hosts?: string[] | 'config'): Promise<string[]>;
+export declare function sendNpm(path: string, hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /** --- 跨进程全局变量 --- */
 export declare const global: Record<string, any>;
 /**
@@ -196,13 +208,19 @@ export declare const global: Record<string, any>;
  * @param data 变量值
  * @param hosts 局域网列表
  */
-export declare function setGlobal(key: string, data: any, hosts?: string[] | 'config'): Promise<string[]>;
+export declare function setGlobal(key: string, data: any, hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /**
  * --- 移除某个跨线程/跨内网服务器全局变量 ---
  * @param key 变量名
  * @param hosts 局域网列表
  */
-export declare function removeGlobal(key: string, hosts?: string[]): Promise<string[]>;
+export declare function removeGlobal(key: string, hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /**
  * --- 上传并覆盖代码文件，config.json、kebab.json、.js.map、.ts, .gitignore 不会被覆盖和新创建 ---
  * @param sourcePath zip 文件
@@ -222,13 +240,19 @@ export declare function updateCode(sourcePath: string, path: string, hosts?: str
  * @param value 要更新的值
  * @param hosts 局域网列表
  */
-export declare function sendProject(path: string, key: string, value: string, hosts?: string[] | 'config'): Promise<string[]>;
+export declare function sendProject(path: string, key: string, value: string, hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /**
  * --- 向本机或局域网 RPC 发送 package.json 更新操作 ---
  * @param content package.json 文件内容
  * @param hosts 局域网列表
  */
-export declare function sendPackage(content: string, hosts?: string[] | 'config'): Promise<string[]>;
+export declare function sendPackage(content: string, hosts?: string[] | 'config'): Promise<Record<string, {
+    'result': boolean;
+    'return': string;
+}>>;
 /** --- log 设置的选项 --- */
 export interface ILogOptions {
     'path'?: string;

package/lib/core.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-3 23:54
- * Last: 2020-4-11 22:34:58, 2022-10-2 14:13:06, 2022-12-28 20:33:24, 2023-12-15 11:49:02, 2024-7-2 15:23:35, 2025-6-13 19:45:53
+ * Last: 2020-4-11 22:34:58, 2022-10-2 14:13:06, 2022-12-28 20:33:24, 2023-12-15 11:49:02, 2024-7-2 15:23:35, 2025-6-13 19:45:53, 2026-05-20 09:50:00
  */
 import * as cp from 'child_process';
 import * as http2 from 'http2';
@@ -464,7 +464,9 @@ export async function sendReload(hosts) {
         process.send({
             'action': 'reload'
         });
-        return [];
+        return {
+            '127.0.0.1': { 'result': true, 'return': 'Done' }
+        };
     }
     if (hosts === 'config') {
         hosts = globalConfig.hosts;
@@ -472,7 +474,7 @@ export async function sendReload(hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'reload',
@@ -486,7 +488,10 @@ export async function sendReload(hosts) {
         }
         const str = content.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
+        }
+        else {
+            rtn[host] = { 'result': false, 'return': str };
         }
     }
     return rtn;
@@ -503,7 +508,9 @@ export async function sendRestart(hosts) {
         process.send({
             'action': 'restart'
         });
-        return [];
+        return {
+            '127.0.0.1': { 'result': true, 'return': 'Done' }
+        };
     }
     if (hosts === 'config') {
         hosts = globalConfig.hosts;
@@ -511,7 +518,7 @@ export async function sendRestart(hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'restart',
@@ -525,7 +532,10 @@ export async function sendRestart(hosts) {
         }
         const str = content.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
+        }
+        else {
+            rtn[host] = { 'result': false, 'return': str };
         }
     }
     return rtn;
@@ -547,7 +557,7 @@ export async function sendPm2(name, action = 'restart', hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'pm2',
@@ -563,9 +573,10 @@ export async function sendPm2(name, action = 'restart', hosts) {
         }
         const str = content.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
         }
         else {
+            rtn[host] = { 'result': false, 'return': str };
             debug('[CORE][sendPm2] rpc server content error:', str);
         }
     }
@@ -574,7 +585,7 @@ export async function sendPm2(name, action = 'restart', hosts) {
 /**
  * --- 向本机或局域网 RPC 发送 npm install 操作 ---
  * @param path 路径，如 /home/kebab/
- * @param hosts 局域网列表
+ * @param hosts 局域网列表，不填则代表本机
  */
 export async function sendNpm(path, hosts) {
     if (hosts === 'config') {
@@ -587,7 +598,7 @@ export async function sendNpm(path, hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'npm',
@@ -602,9 +613,10 @@ export async function sendNpm(path, hosts) {
         }
         const str = content.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
         }
         else {
+            rtn[host] = { 'result': false, 'return': str };
             debug('[CORE][sendNpmInstall] rpc server content error:', str);
         }
     }
@@ -626,7 +638,9 @@ export async function setGlobal(key, data, hosts) {
             'key': key,
             'data': data
         });
-        return [];
+        return {
+            '127.0.0.1': { 'result': true, 'return': 'Done' }
+        };
     }
     if (hosts === 'config') {
         hosts = globalConfig.hosts;
@@ -634,7 +648,7 @@ export async function setGlobal(key, data, hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'global',
@@ -648,7 +662,10 @@ export async function setGlobal(key, data, hosts) {
         }
         const str = content.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
+        }
+        else {
+            rtn[host] = { 'result': false, 'return': str };
         }
     }
     return rtn;
@@ -730,7 +747,7 @@ export async function sendProject(path, key, value, hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'project',
@@ -746,9 +763,10 @@ export async function sendProject(path, key, value, hosts) {
         }
         const str = content.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
         }
         else {
+            rtn[host] = { 'result': false, 'return': str };
             debug('[CORE][sendProject] rpc server content error:', str);
         }
     }
@@ -770,7 +788,7 @@ export async function sendPackage(content, hosts) {
     // --- 局域网模式 ---
     const time = lTime.stamp();
     /** --- 返回成功的 host --- */
-    const rtn = [];
+    const rtn = {};
     for (const host of hosts) {
         const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
             'action': 'package',
@@ -785,9 +803,10 @@ export async function sendPackage(content, hosts) {
         }
         const str = resContent.toString();
         if (str === 'Done') {
-            rtn.push(host);
+            rtn[host] = { 'result': true, 'return': 'Done' };
         }
         else {
+            rtn[host] = { 'result': false, 'return': str };
             debug('[CORE][sendPackage] rpc server content error:', str);
         }
     }

package/lib/sql.js

@@ -182,21 +182,24 @@ export class Sql {
         const quotedTable = this.field(table, this._pre);
         const quotedKey = this.field(key);
         if (this._service === ESERVICE.MYSQL) {
-            // --- MySQL 8.0.19+ VALUES ROW() 派生表语法 ---
-            const valueParts = [];
-            for (const row of rows) {
-                const parts = row.map(v => {
+            // --- MySQL 使用 UNION ALL SELECT 子查询，比 VALUES ROW() 更稳定 ---
+            // --- MySQL 8.0 优化器在行数较多时对 VALUES ROW() 派生表会走不同执行路径，
+            //     导致列名别名解析失败，JOIN 静默匹配 0 行；UNION ALL 无此问题 ---
+            const selectParts = [];
+            for (let ri = 0; ri < rows.length; ri++) {
+                const row = rows[ri];
+                const parts = row.map((v, ci) => {
                     const result = this._processValue(v);
                     if (result.data.length > 0) {
                         this._data.push(...result.data);
                     }
-                    return result.sql;
+                    // --- 第一行加列名别名，后续行省略 ---
+                    return ri === 0 ? `${result.sql} AS ${this.field(allCols[ci])}` : result.sql;
                 });
-                valueParts.push(`ROW(${parts.join(', ')})`);
+                selectParts.push(`SELECT ${parts.join(', ')}`);
             }
-            const tmpCols = allCols.map(c => this.field(c)).join(', ');
             const setClauses = cols.map(c => `t.${this.field(c)} = tmp.${this.field(c)}`).join(', ');
-            this._sql = [`UPDATE ${quotedTable} t INNER JOIN (VALUES ${valueParts.join(', ')}) AS tmp(${tmpCols}) ON t.${quotedKey} = tmp.${quotedKey} SET ${setClauses}`];
+            this._sql = [`UPDATE ${quotedTable} t INNER JOIN (${selectParts.join(' UNION ALL ')}) AS tmp ON t.${quotedKey} = tmp.${quotedKey} SET ${setClauses}`];
         }
         else {
             // --- PostgreSQL 使用 UPDATE FROM (VALUES ...) ---
@@ -596,8 +599,18 @@ export class Sql {
                     // --- 3 ---
                     sql += this.field(v[0]) + ' ' + v[1].toUpperCase() + ' (';
                     for (const v1 of v[2]) {
-                        sql += this._placeholder() + ', ';
-                        data.push(v1);
+                        if (Array.isArray(v1)) {
+                            sql += '(';
+                            for (const v2 of v1) {
+                                sql += this._placeholder() + ', ';
+                                data.push(v2);
+                            }
+                            sql = sql.slice(0, -2) + '), ';
+                        }
+                        else {
+                            sql += this._placeholder() + ', ';
+                            data.push(v1);
+                        }
                     }
                     sql = sql.slice(0, -2) + ') AND ';
                 }
@@ -658,8 +671,18 @@ export class Sql {
                         if (v.length > 0) {
                             sql += this.field(k) + ' IN (';
                             for (const v1 of v) {
-                                sql += this._placeholder() + ', ';
-                                data.push(v1);
+                                if (Array.isArray(v1)) {
+                                    sql += '(';
+                                    for (const v2 of v1) {
+                                        sql += this._placeholder() + ', ';
+                                        data.push(v2);
+                                    }
+                                    sql = sql.slice(0, -2) + '), ';
+                                }
+                                else {
+                                    sql += this._placeholder() + ', ';
+                                    data.push(v1);
+                                }
                             }
                             sql = sql.slice(0, -2) + ') AND ';
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.5.0",
+  "version": "9.7.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/master.js

@@ -404,7 +404,7 @@ function createRpcListener() {
                             // --- 特殊文件不能覆盖 ---
                             continue;
                         }
-                        if (fname.endsWith('.js.map') || fname.endsWith('.ts') || fname.endsWith('.scss') || fname.endsWith('.gitignore') || fname.endsWith('.DS_Store')) {
+                        if (fname.endsWith('.js.map') || fname.endsWith('.ts') || fname.endsWith('.tsx') || fname.endsWith('.scss') || fname.endsWith('.gitignore') || fname.endsWith('.DS_Store')) {
                             // --- 测试或开发文件不覆盖 ---
                             continue;
                         }

package/sys/mod.d.ts

@@ -180,8 +180,10 @@ export default class Mod {
     /**
      * --- 批量更新数据 ---
      * @param db 数据库对象
-     * @param data 数据列表
-     * @param key 用于定位的主键或唯一键字段名
+     * @param data 数据列表，每个元素必须包含 key 字段，其余字段为要更新的列；
+     *             支持稀疏数据（不同元素可以拥有不同的列集合），内部会自动按列集合分组批量执行
+     * @param key 用于定位记录的字段名（主键或唯一键），该字段仅用于 WHERE 条件匹配，不会被更新；
+     *            data 中每个元素都必须包含此字段，否则该元素会被跳过
      * @param opt 选项（opt.pre: MySQL 表前缀/PostgreSQL Schema 名）
      */
     static updateList(db: lDb.Pool | lDb.Transaction, data: Array<Record<string, any>>, key: string, opt?: {

package/sys/mod.js

@@ -305,8 +305,10 @@ export default class Mod {
     /**
      * --- 批量更新数据 ---
      * @param db 数据库对象
-     * @param data 数据列表
-     * @param key 用于定位的主键或唯一键字段名
+     * @param data 数据列表，每个元素必须包含 key 字段，其余字段为要更新的列；
+     *             支持稀疏数据（不同元素可以拥有不同的列集合），内部会自动按列集合分组批量执行
+     * @param key 用于定位记录的字段名（主键或唯一键），该字段仅用于 WHERE 条件匹配，不会被更新；
+     *            data 中每个元素都必须包含此字段，否则该元素会被跳过
      * @param opt 选项（opt.pre: MySQL 表前缀/PostgreSQL Schema 名）
      */
     static async updateList(db, data, key, opt = {}) {

package/www/example/ctr/test.js

@@ -1407,7 +1407,10 @@ for (let i = 0; i < 30000; ++i) {
                 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]) {
+                    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>');
                     }
                 }
@@ -1466,12 +1469,12 @@ to: ${to}`
         return echo.join('') + '<br><br>' + this._getEnd();
     }
     async coreReload() {
-        await lCore.sendReload();
-        return 'The reload request has been sent, please review the console.<br><br>' + this._getEnd();
+        const list = await lCore.sendReload();
+        return `The reload request has been sent, please review the console.<br>Hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
     }
     async coreRestart() {
-        await lCore.sendRestart();
-        return 'The restart request has been sent, please review the console.<br><br>' + this._getEnd();
+        const list = await lCore.sendRestart();
+        return `The restart request has been sent, please review the console.<br>Hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
     }
     async corePm2() {
         const name = this._get['name'] ?? '';
@@ -1483,7 +1486,7 @@ to: ${to}`
             return 'Invalid action. Must be: start, stop, restart<br><br>' + this._getEnd();
         }
         const list = await lCore.sendPm2(name, action);
-        return `PM2 ${action} request has been sent for "${name}".<br>Success hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
+        return `PM2 ${action} request has been sent for "${name}".<br>Hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
     }
     async coreNpm() {
         // --- 创建一个临时目录 ---
@@ -1498,7 +1501,7 @@ to: ${to}`
             }
         }));
         const list = await lCore.sendNpm(path);
-        return `NPM request has been sent.<br>Success hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
+        return `NPM request has been sent.<br>Hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
     }
     async coreGlobal() {
         const ts = lTime.stamp().toString();
@@ -3402,12 +3405,14 @@ Result:<pre id="result">Nothing.</pre>`);
                 s = sql.update('order', { 'state': '1' }).where({
                     'user_id': '2',
                     'state': ['1', '2', '3'],
+                    '(a, b, c)': [['1', '2', '3'], ['4', '5', '6']],
                     '$or': [{ 'type': '1', 'find': '0' }, { 'type': '2', 'find': '1' }, [['type', '<', '-1']]]
                 }).getSql();
                 sd = sql.getData();
                 echo.push(`<pre>sql.update('order', { 'state': '1' }).where({
     'user_id': '2',
     'state': ['1', '2', '3'],
+    '(a, b, c)': [['1', '2', '3'], ['4', '5', '6']],
     '$or': [{ 'type': '1', 'find': '0' }, { 'type': '2', 'find': '1' }, [['type', '<', '-1']]]
 });</pre>
 <b>getSql() :</b> ${s}<br>