@maiyunnet/kebab 7.7.0 → 7.8.0

package/index.d.ts

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

package/index.js

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

package/lib/crypto.js

@@ -31,6 +31,7 @@ export function generateKeyPair(type, options = {}) {
         };
         options.privateKeyEncoding.type ??= 'pkcs8';
         options.privateKeyEncoding.format ??= 'pem';
+        /** --- 由于 generateKeyPair 重载过多且 options 为 any，此处参数也采用 any --- */
         crypto.generateKeyPair(type, options, (err, publicKey, privateKey) => {
             resolve({
                 'private': privateKey,

package/lib/sql.d.ts

@@ -12,16 +12,18 @@ export declare enum ESERVICE {
 }
 /** --- JSON 查询操作符 --- */
 export declare enum EJSON {
-    /** --- 包含 (MySQL: JSON_CONTAINS, PG: @>) --- */
+    /** --- 包含值 (MySQL: JSON_CONTAINS, PG: @>) --- */
     'CONTAINS' = "json",
-    /** --- 被包含 (MySQL: JSON_CONTAINS, PG: <@) --- */
+    /** --- 被包含值 (MySQL: JSON_CONTAINS, PG: <@) --- */
     'CONTAINED_BY' = "json_in",
-    /** --- 存在 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?) --- */
+    /** --- 存在 Key 不含值 (MySQL: JSON_CONTAINS_PATH one, PG: ?) --- */
     'HAS_KEY' = "json_key",
-    /** --- 存在任意 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?|) --- */
+    /** --- 存在任意 Key 不含值 (MySQL: JSON_CONTAINS_PATH one, PG: ?|) --- */
     'HAS_ANY_KEYS' = "json_any",
-    /** --- 存在所有 Key (MySQL: JSON_CONTAINS_PATH all, PG: ?&) --- */
-    'HAS_ALL_KEYS' = "json_all"
+    /** --- 存在所有 Key 不含值 (MySQL: JSON_CONTAINS_PATH all, PG: ?&) --- */
+    'HAS_ALL_KEYS' = "json_all",
+    /** --- 简单数组重叠 (MySQL: JSON_OVERLAPS, PG: &&) --- */
+    'OVERLAPS' = "json_overlaps"
 }
 export declare class Sql {
     /** --- ctr 对象 --- */

package/lib/sql.js

@@ -11,16 +11,18 @@ export var ESERVICE;
 /** --- JSON 查询操作符 --- */
 export var EJSON;
 (function (EJSON) {
-    /** --- 包含 (MySQL: JSON_CONTAINS, PG: @>) --- */
+    /** --- 包含值 (MySQL: JSON_CONTAINS, PG: @>) --- */
     EJSON["CONTAINS"] = "json";
-    /** --- 被包含 (MySQL: JSON_CONTAINS, PG: <@) --- */
+    /** --- 被包含值 (MySQL: JSON_CONTAINS, PG: <@) --- */
     EJSON["CONTAINED_BY"] = "json_in";
-    /** --- 存在 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?) --- */
+    /** --- 存在 Key 不含值 (MySQL: JSON_CONTAINS_PATH one, PG: ?) --- */
     EJSON["HAS_KEY"] = "json_key";
-    /** --- 存在任意 Key (MySQL: JSON_CONTAINS_PATH one, PG: ?|) --- */
+    /** --- 存在任意 Key 不含值 (MySQL: JSON_CONTAINS_PATH one, PG: ?|) --- */
     EJSON["HAS_ANY_KEYS"] = "json_any";
-    /** --- 存在所有 Key (MySQL: JSON_CONTAINS_PATH all, PG: ?&) --- */
+    /** --- 存在所有 Key 不含值 (MySQL: JSON_CONTAINS_PATH all, PG: ?&) --- */
     EJSON["HAS_ALL_KEYS"] = "json_all";
+    /** --- 简单数组重叠 (MySQL: JSON_OVERLAPS, PG: &&) --- */
+    EJSON["OVERLAPS"] = "json_overlaps";
 })(EJSON || (EJSON = {}));
 /** --- field 用 token --- */
 let columnToken = '';
@@ -452,7 +454,7 @@ export class Sql {
                         data.push(...v[1]);
                     }
                 }
-                else if (typeof v[1] === 'string' && ['json', 'json_in', 'json_key', 'json_any', 'json_all'].includes(v[1].toLowerCase())) {
+                else if (typeof v[1] === 'string' && ['json', 'json_in', 'json_key', 'json_any', 'json_all', 'json_overlaps'].includes(v[1].toLowerCase())) {
                     // --- json ---
                     const op = v[1].toLowerCase();
                     const nv = v[2];
@@ -476,6 +478,16 @@ export class Sql {
                             data.push(lText.stringifyJson(nv));
                         }
                     }
+                    else if (op === 'json_overlaps') {
+                        if (this._service === ESERVICE.MYSQL) {
+                            sql += `JSON_OVERLAPS(${this.field(v[0])}, ${this._placeholder()}) AND `;
+                            data.push(lText.stringifyJson(nv));
+                        }
+                        else {
+                            sql += `${this.field(v[0])} && ${this._placeholder()} AND `;
+                            data.push(nv);
+                        }
+                    }
                     else {
                         // --- json_key, json_any, json_all ---
                         const keys = Array.isArray(nv) ? nv : [nv];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.7.0",
+  "version": "7.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": [
@@ -22,30 +22,30 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.943.0",
-    "@aws-sdk/lib-storage": "^3.943.0",
+    "@aws-sdk/client-s3": "^3.975.0",
+    "@aws-sdk/lib-storage": "^3.975.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.1.0",
     "@litert/websocket": "^0.2.8",
     "@types/ssh2": "^1.15.5",
-    "@zilliz/milvus2-sdk-node": "^2.6.5",
-    "ejs": "^3.1.10",
+    "@zilliz/milvus2-sdk-node": "^2.6.9",
+    "ejs": "^4.0.1",
     "jszip": "^3.10.1",
-    "mysql2": "^3.15.3",
+    "mysql2": "^3.16.1",
     "node-cron": "^4.2.1",
-    "openai": "^6.10.0",
-    "pg": "^8.16.3",
+    "openai": "^6.16.0",
+    "pg": "^8.17.2",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.153"
+    "tencentcloud-sdk-nodejs": "^4.1.175"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^24.10.1",
-    "@types/pg": "^8.15.6",
-    "typedoc": "^0.28.15",
+    "@types/node": "^25.0.10",
+    "@types/pg": "^8.16.0",
+    "typedoc": "^0.28.16",
     "typedoc-plugin-markdown": "^4.9.0",
     "typescript": "^5.9.3"
   }

package/sys/master.js

@@ -3,8 +3,8 @@
  * Date: 2019-5-2 21:03:42
  * Last: 2020-3-7 10:33:17, 2022-07-22 13:40:10, 2022-09-06 22:40:58, 2024-2-7 01:44:59, 2024-7-2 15:17:09, 2025-6-13 13:06:43, 2025-12-5 13:15:03
  */
+import cluster from 'cluster';
 import * as os from 'os';
-import * as cluster from 'cluster';
 import * as http from 'http';
 // --- 库和定义 ---
 import * as kebab from '#kebab/index.js';
@@ -22,7 +22,7 @@ const workerList = {};
  */
 async function run() {
     // --- 设置 cluster 调度策略为 round-robin（在支持的平台上启用负载均衡） ---
-    cluster.default.schedulingPolicy = cluster.default.SCHED_RR;
+    cluster.schedulingPolicy = cluster.SCHED_RR;
     // --- 读取配置文件 ---
     const configContent = await lFs.getContent(kebab.CONF_CWD + 'config.json', 'utf8');
     if (!configContent) {
@@ -48,7 +48,7 @@ async function run() {
     for (let i = 0; i < cpuLengthMax; ++i) {
         await createChildProcess(i);
     }
-    cluster.default.on('listening', function (worker, address) {
+    cluster.on('listening', function (worker, address) {
         // --- 子进程开始监听 ---
         lCore.display(`[master] Listening: worker ${worker.process.pid ?? 'undefined'}, Address: ${address.address}:${address.port}.`);
     }).on('exit', function (worker, code) {
@@ -419,7 +419,7 @@ async function checkWorkerLost() {
  * @param cpu CPU ID
  */
 async function createChildProcess(cpu) {
-    const worker = cluster.default.fork();
+    const worker = cluster.fork();
     if (!worker.process.pid) {
         return;
     }

package/sys/mod.js

@@ -615,8 +615,11 @@ export default class Mod {
                 }
                 // --- 未处理的错误 ---
                 const service = this._db.getService();
-                lCore.debug('[MOD][create0][' + cstr._$table + ']', service !== null ? lDb.ESERVICE[service] : 'NONE', r);
                 lCore.log(this._ctr ?? {}, '[MOD][create0][' + cstr._$table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                if (lCore.globalConfig.debug) {
+                    lCore.debug('[MOD][create0][' + cstr._$table + ']', service !== null ? lDb.ESERVICE[service] : 'NONE', r);
+                    lCore.debug(this._sql.format());
+                }
                 return false;
             }
         }
@@ -626,8 +629,11 @@ export default class Mod {
             r = await this._db.execute(this._sql.getSql(), this._sql.getData());
             if (r.error) {
                 if (r.error.errno !== 1062) {
-                    lCore.debug('[MOD][create1][' + cstr._$table + ']', r);
                     lCore.log(this._ctr ?? {}, '[MOD][create1][' + cstr._$table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    if (lCore.globalConfig.debug) {
+                        lCore.debug('[MOD][create1][' + cstr._$table + ']', r);
+                        lCore.debug(this._sql.format());
+                    }
                     return false;
                 }
                 return null;

package/www/example/ctr/agent.d.ts

@@ -0,0 +1,8 @@
+import * as sCtr from '#kebab/sys/ctr.js';
+export default class extends sCtr.Ctr {
+    /**
+     * --- Agent 示例接口 ---
+     * --- 访问：/agent?q=上海天气怎么样？ ---
+     */
+    index(): Promise<string>;
+}

package/www/example/ctr/agent.js

@@ -0,0 +1,68 @@
+import * as sCtr from '#kebab/sys/ctr.js';
+import * as lAi from '#kebab/lib/ai.js';
+import * as lFs from '#kebab/lib/fs.js';
+import * as lText from '#kebab/lib/text.js';
+/** --- Skill 导入 --- */
+import sWeather from '../skill/weather.js';
+export default class extends sCtr.Ctr {
+    /**
+     * --- Agent 示例接口 ---
+     * --- 访问：/agent?q=上海天气怎么样？ ---
+     */
+    async index() {
+        // --- 1. 获取用户问题 ---
+        const userPrompt = this._get['q'] ?? '你好';
+        // --- 2. 加载系统提示词 ---
+        const systemPrompt = await lFs.getContent(`${this._config.const.rootPath}www/example/prompt/agent.txt`, 'utf8') ?? '';
+        // --- 3. 初始化 AI ---
+        const ai = lAi.get(this, {
+            'service': lAi.ESERVICE.ALICN,
+        });
+        // --- 4. 准备消息 ---
+        const messages = [
+            { 'role': 'system', 'content': systemPrompt },
+            { 'role': 'user', 'content': userPrompt },
+        ];
+        // --- 5. 第一次对话，传入 Skills 定义 ---
+        const res = await ai.chat({
+            'model': 'qwen-plus',
+            'messages': messages,
+            'tools': [sWeather.definition],
+        });
+        if (!res) {
+            return '系统错误';
+        }
+        const message = res.choices[0].message;
+        // --- 6. 如果 AI 决定调用工具 ---
+        if (message.tool_calls && message.tool_calls.length > 0) {
+            messages.push(message);
+            for (const toolCall of message.tool_calls) {
+                if (toolCall.function.name === 'get_weather') {
+                    // --- 解析参数并执行 ---
+                    const args = lText.parseJson(toolCall.function.arguments);
+                    if (args === false) {
+                        continue;
+                    }
+                    const result = await sWeather.execute(args);
+                    // --- 将结果反馈给消息流 ---
+                    messages.push({
+                        'role': 'tool',
+                        'tool_call_id': toolCall.id,
+                        'name': 'get_weather',
+                        'content': result,
+                    });
+                }
+            }
+            // --- 7. 第二次对话，获取最终文本回复 ---
+            const finalRes = await ai.chat({
+                'model': 'qwen-plus',
+                'messages': messages,
+            });
+            if (finalRes) {
+                return finalRes.choices[0].message.content ?? '未能生成回复';
+            }
+        }
+        // --- 如果不需要工具调用，直接返回内容 ---
+        return message.content ?? '未能生成回复';
+    }
+}

package/www/example/ctr/test.js

@@ -2601,6 +2601,13 @@ Result:<pre id="result">Nothing.</pre>`);
                 echo.push(`<pre>sql.select('*', 'user').where([['info', lSql.EJSON.HAS_ALL_KEYS, ['age', 'name']]]);</pre>
 <b>getSql() :</b> ${s}<br>
 <b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                // --- overlaps ---
+                s = sql.select('*', 'test').where([['tags', lSql.EJSON.OVERLAPS, ['a', 'b']]]).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.select('*', 'test').where([['tags', lSql.EJSON.OVERLAPS, ['a', 'b']]]);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}`);
                 break;
             }

package/www/example/skill/weather.d.ts

@@ -0,0 +1,15 @@
+import type * as openai from 'openai';
+/**
+ * --- 获取天气预报的 Skill ---
+ */
+export default class {
+    /** --- Skill 的定义，供 AI 模型识别 --- */
+    static definition: openai.default.Chat.ChatCompletionTool;
+    /**
+     * --- 执行获取天气的逻辑 ---
+     * @param args AI 传过来的参数
+     */
+    static execute(args: {
+        'city': string;
+    }): Promise<string>;
+}

package/www/example/skill/weather.js

@@ -0,0 +1,36 @@
+/**
+ * --- 获取天气预报的 Skill ---
+ */
+export default class default_1 {
+    /** --- Skill 的定义，供 AI 模型识别 --- */
+    static definition = {
+        'type': 'function',
+        'function': {
+            'name': 'get_weather',
+            'description': '获取指定城市的天气信息',
+            'parameters': {
+                'type': 'object',
+                'properties': {
+                    'city': {
+                        'type': 'string',
+                        'description': '城市名称，例如“上海”、“北京”',
+                    },
+                },
+                'required': ['city'],
+            },
+        },
+    };
+    /**
+     * --- 执行获取天气的逻辑 ---
+     * @param args AI 传过来的参数
+     */
+    static async execute(args) {
+        // --- 这里是模拟获取天气的逻辑，实际开发中可以调用第三方 API ---
+        const weathers = {
+            '上海': '晴朗，25℃',
+            '北京': '多云，20℃',
+            '广州': '阵雨，28℃',
+        };
+        return weathers[args.city] ?? `抱歉，暂不支持查询 ${args.city} 的天气。`;
+    }
+}