@maiyunnet/kebab 8.0.6 → 8.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "8.0.6",
+  "version": "8.2.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.985.0",
-    "@aws-sdk/lib-storage": "^3.985.0",
+    "@aws-sdk/client-s3": "^3.992.0",
+    "@aws-sdk/lib-storage": "^3.992.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.9",
+    "@zilliz/milvus2-sdk-node": "^2.6.10",
     "ejs": "^4.0.1",
     "jszip": "^3.10.1",
-    "mysql2": "^3.16.3",
+    "mysql2": "^3.17.2",
     "node-cron": "^4.2.1",
-    "openai": "^6.18.0",
+    "openai": "^6.22.0",
     "pg": "^8.18.0",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.185"
+    "tencentcloud-sdk-nodejs": "^4.1.186"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^25.2.2",
+    "@types/node": "^25.2.3",
     "@types/pg": "^8.16.0",
-    "typedoc": "^0.28.16",
+    "typedoc": "^0.28.17",
     "typedoc-plugin-markdown": "^4.10.0",
     "typescript": "^5.9.3"
   }

package/sys/cmd.js

@@ -177,6 +177,14 @@ async function run() {
         config.ai['AZURE3'] ??= {};
         config.ai['AZURE3'].endpoint ??= '';
         config.ai['AZURE3'].skey ??= '';
+        config.ai['GEMINI'] ??= {};
+        config.ai['GEMINI'].skey ??= '';
+        config.ai['GROK'] ??= {};
+        config.ai['GROK'].skey ??= '';
+        config.ai['VOLCN'] ??= {};
+        config.ai['VOLCN'].skey ??= '';
+        config.ai['VOLAS'] ??= {};
+        config.ai['VOLAS'].skey ??= '';
         // --- config - vector ---
         config.vector ??= {};
         config.vector.host ??= '127.0.0.1';

package/sys/monitor.js

@@ -82,9 +82,8 @@ export function start(opt) {
     memThreshold = opt?.mem ?? 0;
     eloopThreshold = opt?.eloop ?? 500;
     if (memThreshold === 0) {
-        // --- 自动计算：系统总内存的 80% / CPU 核心数 ---
-        const cpuCount = os.cpus().length;
-        memThreshold = Math.floor((os.totalmem() * 0.8) / cpuCount / 1024 / 1024);
+        // --- 自动计算：系统总内存的 80% ---
+        memThreshold = Math.floor((os.totalmem() * 0.8) / 1024 / 1024);
     }
     lastCpuUsage = process.cpuUsage();
     lastCpuTime = Date.now();
@@ -102,7 +101,7 @@ export function start(opt) {
     timer = setInterval(check, INTERVAL);
     // --- 启动看门狗线程 ---
     startWatchdog();
-    lCore.debug(`[MONITOR] Started, CPU: ${cpuThreshold}%, MEM: ${memThreshold}MB, ELOOP: ${eloopThreshold}ms`);
+    lCore.debug(`[MONITOR] [PARENT] [${process.pid}] Started, CPU Threshold: ${cpuThreshold}%, MEM Threshold: ${memThreshold}MB, ELOOP Threshold: ${eloopThreshold}ms`);
 }
 /**
  * --- 停止性能监控 ---
@@ -162,7 +161,7 @@ function startWatchdog() {
                 watchdog = null;
             }
         });
-        lCore.debug('[MONITOR] Watchdog thread started');
+        lCore.debug(`[MONITOR] [THREAD] [${process.pid}] Watchdog started`);
     }
     catch (e) {
         lCore.debug('[MONITOR] Failed to start watchdog', e);

package/www/example/ctr/test.js

@@ -127,8 +127,12 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/mod-update-list">View "test/mod-update-list"</a>`,
             '<br><br><b>Library test:</b>',
             `<br><br><b>Ai:</b>`,
-            `<br><br><a href="${this._config.const.urlBase}test/ai">View "test/ai"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ai-stream">View "test/ai-stream"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ai?action=chat">View "test/ai?action=chat"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ai?action=text-to-image">View "test/ai?action=text-to-image"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ai?action=image-to-image">View "test/ai?action=image-to-image"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ai?action=text-to-video">View "test/ai?action=text-to-video"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ai?action=image-to-video">View "test/ai?action=image-to-video"</a>`,
             '<br><br><b>Core:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/core-random">View "test/core-random"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-rand">View "test/core-rand"</a>`,
@@ -1796,7 +1800,7 @@ error: ${JSON.stringify(res.error)}`);
 lNet.get(this._internalUrl + 'test/net-cookie1', {
     'cookie': cookie
 });</pre>
-headers: <pre>${JSON.stringify(res.headers, null, 4)}</pre>
+headers: <pre>${lText.htmlescape(JSON.stringify(res.headers, null, 4))}</pre>
 content: <pre>${(await res.getContent())?.toString() ?? 'null'}</pre>
 cookie: <pre>${JSON.stringify(cookie, null, 4)}</pre><hr>`);
         res = await lNet.get(this._internalUrl + 'test/net-cookie2', {
@@ -1868,6 +1872,14 @@ content: <pre>${(await res.getContent())?.toString() ?? 'null'}</pre>`);
             'ttl': 60,
             'httponly': true
         });
+        // --- 用于测试 BUG 的额外 Cookie ---
+        this._res.setHeader('Set-Cookie', [
+            ...this._res.getHeader('Set-Cookie'),
+            'test-del=; Max-Age=0; Path=/',
+            'test-equals=val=with=equals; Path=/',
+            'test-expires=val; Expires=Wed, 21 Oct 2035 07:28:00 GMT; Path=/',
+            'test-invalid=%invalid; Path=/'
+        ]);
         return `lCore.setCookie(this, 'test0', 'session');
 lCore.setCookie(this, 'test1', 'normal', {
     'ttl': 10
@@ -3337,31 +3349,177 @@ rtn.push(reader.readBCDString());</pre>${JSON.stringify(rtn)}`);
         return echo.join('') + '<br>' + this._getEnd();
     }
     async ai() {
-        const ai = lAi.get(this, {
-            'service': lAi.ESERVICE.ALICN,
-        });
         const echo = [`<pre>const ai = lAi.get(this, {
-    'service': lAi.ESERVICE.ALICN,
+    'service': lAi.ESERVICE.${lText.htmlescape(this._get['service']?.toUpperCase() ?? 'ALICN')},
 });</pre>`];
-        const completion = await ai.chat({
-            'model': 'qwen-plus',
-            'messages': [
-                { 'role': 'system', 'content': 'You are Kebab, a friendly and knowledgeable assistant based on an open-source Node framework. You do not mention any model names or AI identity. You can chat casually, answer questions, and provide guidance naturally. Respond in a human-like, approachable manner, as if you are a helpful companion rather than a traditional AI assistant.' },
-                { 'role': 'user', 'content': '你是谁？' },
-            ],
+        const ai = lAi.get(this, {
+            'service': lAi.ESERVICE[this._get['service']?.toUpperCase() ?? 'ALICN'] ?? lAi.ESERVICE.ALICN,
         });
-        echo.push(`<pre>await ai.chat({
-    'model': 'qwen-plus',
+        switch (this._get['action']) {
+            case 'text-to-image': {
+                // --- 文生图 ---
+                let model = 'z-image-turbo';
+                let size = [1280, 720];
+                if (ai.service !== lAi.ESERVICE.ALICN && ai.service !== lAi.ESERVICE.ALIAS) {
+                    switch (ai.service) {
+                        case lAi.ESERVICE.AZURE:
+                        case lAi.ESERVICE.AZURE2:
+                        case lAi.ESERVICE.AZURE3: {
+                            model = 'FLUX.2-pro';
+                            break;
+                        }
+                        default: {
+                            // --- 火山引擎 ---
+                            model = 'doubao-seedream-4-5-251128';
+                            size = [2560, 1440];
+                        }
+                    }
+                }
+                const imgResult = await ai.image({
+                    'model': model,
+                    'prompt': 'A cute cat sitting on a windowsill watching the sunset',
+                    'size': size,
+                    'n': 1,
+                });
+                echo.push(`<pre>await ai.image({
+    'model': '${model}',
+    'prompt': 'A cute cat sitting on a windowsill watching the sunset',
+    'size': [${size[0]}, ${size[1]}],
+    'n': 1,
+});</pre>`);
+                if (imgResult && imgResult.list?.length) {
+                    for (const img of imgResult.list) {
+                        echo.push(`<div><img src="${img.url.startsWith('http') ? img.url : 'data:image/png;base64,' + img.url}" style="max-width: 512px;" /></div>${lText.htmlescape(img.text)}`);
+                    }
+                    echo.push('<br>request: ' + imgResult.request, ', seed: ' + imgResult.seed);
+                }
+                else {
+                    echo.push('Failed');
+                }
+                break;
+            }
+            case 'image-to-image': {
+                // --- 图生图 ---
+                let model = 'wan2.6-image';
+                let size = [1280, 720];
+                const prompt = '用图1的绘画风格重绘图2的场景，桌上增加一盘番茄炒蛋';
+                if (ai.service !== lAi.ESERVICE.ALICN && ai.service !== lAi.ESERVICE.ALIAS) {
+                    switch (ai.service) {
+                        default: {
+                            // --- 火山引擎 ---
+                            model = 'doubao-seedream-4-5-251128';
+                            size = [2560, 1440];
+                        }
+                    }
+                }
+                const imgResult = await ai.image({
+                    'model': model,
+                    'imgs': [
+                        'https://cdn.wanx.aliyuncs.com/tmp/pressure/umbrella1.png',
+                        'https://img.alicdn.com/imgextra/i3/O1CN01SfG4J41UYn9WNt4X1_!!6000000002530-49-tps-1696-960.webp',
+                    ],
+                    'prompt': prompt,
+                    'size': size,
+                    'n': 1,
+                });
+                echo.push(`<pre>await ai.image({
+    'model': '${model}',
+    'imgs': [
+        'https://cdn.wanx.aliyuncs.com/tmp/pressure/umbrella1.png',
+        'https://img.alicdn.com/imgextra/i3/O1CN01SfG4J41UYn9WNt4X1_!!6000000002530-49-tps-1696-960.webp',
+    ],
+    'prompt': '${prompt}',
+    'size': [${size[0]}, ${size[1]}],
+    'n': 1,
+});</pre>`);
+                if (imgResult && imgResult.list?.length) {
+                    echo.push(`<div>Reference Images:</div><div>
+    <img src="https://cdn.wanx.aliyuncs.com/tmp/pressure/umbrella1.png" style="max-width: 256px; margin-right: 5px;" />
+    <img src="https://img.alicdn.com/imgextra/i3/O1CN01SfG4J41UYn9WNt4X1_!!6000000002530-49-tps-1696-960.webp" style="max-width: 256px;" />
+</div>`);
+                    for (const img of imgResult.list) {
+                        echo.push(`<div><img src="${img.url.startsWith('http') ? img.url : 'data:image/png;base64,' + img.url}" style="max-width: 512px;" /></div>${lText.htmlescape(img.text || prompt)}`);
+                    }
+                    echo.push('<br>request: ' + imgResult.request, ', seed: ' + imgResult.seed);
+                }
+                else {
+                    echo.push('Failed');
+                }
+                break;
+            }
+            case 'text-to-video': {
+                // --- 文生视频 ---
+                const model = 'wan2.6-t2v';
+                const vidResult = await ai.video({
+                    'prompt': 'A cat playing with a ball of yarn',
+                    'model': model,
+                });
+                echo.push(`<pre>await aiVid.video({
+    'prompt': 'A cat playing with a ball of yarn',
+    'model': '${model}',
+});</pre>`);
+                if (vidResult) {
+                    echo.push(`<pre>${JSON.stringify(vidResult, null, 4)}</pre><a href="${this._config.const.urlBase}test/ai?action=video-poll&task=${vidResult.task}">poll</a>`);
+                }
+                else {
+                    echo.push('Failed');
+                }
+                break;
+            }
+            case 'image-to-video': {
+                // --- 图生视频 ---
+                echo.push('Not yet implemented');
+                break;
+            }
+            case 'video-poll': {
+                // --- 视频生成轮询 ---
+                if (!this._get['task']) {
+                    echo.push('Task ID not found.');
+                    break;
+                }
+                const pollResult = await ai.poll({
+                    'type': 'video',
+                    'task': this._get['task'],
+                });
+                echo.push(`<pre>await ai.poll({
+    'type': 'video',
+    'task': '${this._get['task']}',
+});</pre>`);
+                if (pollResult) {
+                    echo.push(`<pre>${JSON.stringify(pollResult, null, 4)}</pre>Result.`);
+                }
+                else {
+                    echo.push('Failed');
+                }
+                break;
+            }
+            default: {
+                // --- CHAT ---
+                let model = ai.service === lAi.ESERVICE.ALICN ? 'qwen-plus' : 'doubao-seed-2-0-mini-260215';
+                if (ai.service === lAi.ESERVICE.AZURE) {
+                    model = 'gpt-4.1-nano';
+                }
+                const completion = await ai.chat({
+                    'model': model,
+                    'messages': [
+                        { 'role': 'system', 'content': 'You are Kebab, a friendly and knowledgeable assistant based on an open-source Node framework. You do not mention any model names or AI identity. You can chat casually, answer questions, and provide guidance naturally. Respond in a human-like, approachable manner, as if you are a helpful companion rather than a traditional AI assistant.' },
+                        { 'role': 'user', 'content': '你是谁？' },
+                    ],
+                });
+                echo.push(`<pre>await ai.chat({
+    'model': ${model},
     'messages': [
         { 'role': 'system', 'content': 'You are Kebab, a friendly and knowledgeable assistant based on an open-source Node framework. You do not mention any model names or AI identity. You can chat casually, answer questions, and provide guidance naturally. Respond in a human-like, approachable manner, as if you are a helpful companion rather than a traditional AI assistant.' },
         { 'role': 'user', 'content': '你是谁？' },
     ],
 });</pre>`);
-        if (completion) {
-            echo.push(JSON.stringify(completion.choices[0].message.content));
-        }
-        else {
-            echo.push('Failed');
+                if (completion) {
+                    echo.push(JSON.stringify(completion.choices[0].message.content));
+                }
+                else {
+                    echo.push('Failed');
+                }
+            }
         }
         return echo.join('') + '<br><br>' + this._getEnd();
     }