@maiyunnet/kebab 3.2.30 → 3.2.32

package/index.d.ts

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

package/index.js

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

package/lib/ai.d.ts

@@ -4,6 +4,7 @@
  * Last: 2025-10-27 21:31:08
  */
 import * as openai from 'openai';
+import * as streaming from 'openai/streaming';
 import * as sCtr from '#kebab/sys/ctr.js';
 /**
  * --- 参考：https://help.aliyun.com/zh/model-studio/what-is-model-studio ---
@@ -16,7 +17,11 @@ export declare enum ESERVICE {
     /** --- 阿里国际区 --- */
     'ALIAS' = 1,
     /** --- 微软 Azure --- */
-    'AZURE' = 2
+    'AZURE' = 2,
+    /** --- 微软 Azure 2 --- */
+    'AZURE2' = 3,
+    /** --- 微软 Azure 3 --- */
+    'AZURE3' = 4
 }
 /** --- 选项 --- */
 export interface IOptions {
@@ -32,7 +37,12 @@ export interface IOptions {
 export declare class Ai {
     /** --- openai 原生对象，建议只读 --- */
     readonly link: openai.OpenAI;
+    private readonly _ctr;
     constructor(ctr: sCtr.Ctr, opt: IOptions);
+    /** --- 创建非流式对话 --- */
+    chat(body: openai.default.Chat.Completions.ChatCompletionCreateParamsNonStreaming): openai.APIPromise<openai.default.Chat.ChatCompletion> | false;
+    /** --- 创建流式对话 --- */
+    chat(body: openai.default.Chat.Completions.ChatCompletionCreateParamsStreaming): openai.APIPromise<streaming.Stream<openai.default.Chat.ChatCompletionChunk>> | false;
 }
 /**
  * --- 创建一个 AI 对象 ---

package/lib/ai.js

@@ -4,6 +4,7 @@
  * Last: 2025-10-27 21:31:08
  */
 import * as openai from 'openai';
+import * as lCore from '#kebab/lib/core.js';
 /**
  * --- 参考：https://help.aliyun.com/zh/model-studio/what-is-model-studio ---
  * --- 阿里模型：https://help.aliyun.com/zh/model-studio/getting-started/models ---
@@ -17,11 +18,16 @@ export var ESERVICE;
     ESERVICE[ESERVICE["ALIAS"] = 1] = "ALIAS";
     /** --- 微软 Azure --- */
     ESERVICE[ESERVICE["AZURE"] = 2] = "AZURE";
+    /** --- 微软 Azure 2 --- */
+    ESERVICE[ESERVICE["AZURE2"] = 3] = "AZURE2";
+    /** --- 微软 Azure 3 --- */
+    ESERVICE[ESERVICE["AZURE3"] = 4] = "AZURE3";
 })(ESERVICE || (ESERVICE = {}));
 /** --- openai 的连接对象 --- */
 const links = [];
 export class Ai {
     constructor(ctr, opt) {
+        this._ctr = ctr;
         const config = ctr.getPrototype('_config');
         const secretKey = opt.secretKey ?? config.ai?.[ESERVICE[opt.service]]?.skey ?? '';
         let endpoint;
@@ -38,6 +44,14 @@ export class Ai {
                 endpoint = opt.endpoint ?? config.ai?.[ESERVICE[opt.service]]?.endpoint ?? '';
                 break;
             }
+            case ESERVICE.AZURE2: {
+                endpoint = opt.endpoint ?? config.ai?.[ESERVICE[opt.service]]?.endpoint ?? '';
+                break;
+            }
+            case ESERVICE.AZURE3: {
+                endpoint = opt.endpoint ?? config.ai?.[ESERVICE[opt.service]]?.endpoint ?? '';
+                break;
+            }
             default: {
                 endpoint = undefined;
             }
@@ -58,6 +72,17 @@ export class Ai {
             'link': this.link,
         });
     }
+    /** --- 创建对话 --- */
+    chat(body) {
+        try {
+            return this.link.chat.completions.create(body);
+        }
+        catch (e) {
+            lCore.debug('[AI][CHAT]', e);
+            lCore.log(this._ctr, `[AI][CHAT] ${e.message}`, '-error');
+            return false;
+        }
+    }
 }
 /**
  * --- 创建一个 AI 对象 ---

package/lib/core.d.ts

@@ -1,6 +1,7 @@
 import * as http from 'http';
 import * as http2 from 'http2';
 import * as stream from 'stream';
+import * as net from 'net';
 import * as kebab from '#kebab/index.js';
 import * as lResponse from '#kebab/lib/net/response.js';
 import * as sCtr from '#kebab/sys/ctr.js';
@@ -255,4 +256,4 @@ export declare function writeEventStreamHead(res: http2.Http2ServerResponse | ht
  * @param res 响应对象
  * @param data 数据
  */
-export declare function write(res: http2.Http2ServerResponse | http.ServerResponse, data: string | Buffer): void;
+export declare function write(res: http2.Http2ServerResponse | http.ServerResponse | net.Socket, data: string | Buffer): void;

package/lib/core.js

@@ -7,6 +7,7 @@ import * as cp from 'child_process';
 import * as http2 from 'http2';
 import * as stream from 'stream';
 import * as os from 'os';
+import * as net from 'net';
 import * as kebab from '#kebab/index.js';
 import * as lTime from '#kebab/lib/time.js';
 import * as lFs from '#kebab/lib/fs.js';
@@ -821,6 +822,9 @@ export function write(res, data) {
     if (res instanceof http2.Http2ServerResponse) {
         res.write(data);
     }
+    else if (res instanceof net.Socket) {
+        res.write(data);
+    }
     else {
         res.write(data);
     }

package/lib/db.js

@@ -156,36 +156,44 @@ export class Pool {
         }
         if (!conn) {
             // --- 没有找到合适的连接，创建一个 ---
-            try {
-                const link = await mysql2.createConnection({
-                    'host': this._etc.host,
-                    'port': this._etc.port,
-                    'charset': this._etc.charset,
-                    'database': this._etc.name,
-                    'user': this._etc.user,
-                    'password': this._etc.pwd,
-                    'connectTimeout': 3_000,
-                });
-                const c = new Connection(this._etc, link);
-                c.using();
-                link.on('error', function (err) {
-                    c.setLost();
-                    if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
-                        lCore.debug('[DB][_getConnection][error]', err.message);
+            for (let i = 0; i < 3; ++i) {
+                try {
+                    const link = await mysql2.createConnection({
+                        'host': this._etc.host,
+                        'port': this._etc.port,
+                        'charset': this._etc.charset,
+                        'database': this._etc.name,
+                        'user': this._etc.user,
+                        'password': this._etc.pwd,
+                        'connectTimeout': 3_000,
+                    });
+                    const c = new Connection(this._etc, link);
+                    c.using();
+                    link.on('error', function (err) {
+                        c.setLost();
+                        if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
+                            lCore.debug('[DB][_getConnection][error]', err);
+                            lCore.log({}, '[DB][_getConnection][error] ' + err.message, '-error');
+                        }
+                    }).on('end', () => {
+                        // lCore.debug('[DB][_getConnection] connection end.');
+                        c.setLost();
+                    }).on('close', () => {
+                        c.setLost();
+                    });
+                    conn = c;
+                    connections.push(conn);
+                }
+                catch (err) {
+                    if (err.message === 'ETIMEOUT') {
+                        lCore.debug('[DB][_getConnection][ETIMEOUT]', err);
+                        continue;
                     }
-                }).on('end', () => {
-                    // lCore.debug('[DB][_getConnection] connection end.');
-                    c.setLost();
-                }).on('close', () => {
-                    c.setLost();
-                });
-                conn = c;
-                connections.push(conn);
-            }
-            catch (e) {
-                const msg = '[DB][_getConnection] ' + e.message;
-                lCore.debug(msg);
-                lCore.log({}, msg, '-error');
+                    const msg = `[DB][_getConnection] ${err.message}(${this._etc.host}:${this._etc.port})`;
+                    lCore.debug(msg);
+                    lCore.log({}, msg, '-error');
+                    break;
+                }
             }
         }
         return conn;

package/lib/kv.js

@@ -597,7 +597,7 @@ export class Pool {
             // --- 没有找到合适的连接，创建一个 ---
             const link = redis.createCommandClient({
                 'host': this._etc.host,
-                'port': this._etc.port
+                'port': this._etc.port,
             });
             // --- 开始连接 ---
             try {
@@ -622,7 +622,7 @@ export class Pool {
             link.on('error', function (err) {
                 conn.setLost();
                 // console.log(`--- redis [${conn._etc.host}:${conn._etc.port}] error ---`);
-                lCore.debug('[KV][ERROR]', err.message);
+                lCore.debug('[KV][_getConnection][error]', err);
             }).on('end', () => {
                 conn.setLost();
             }).on('close', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.30",
+  "version": "3.2.32",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -24,13 +24,13 @@
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
-    "@litert/websocket": "^0.2.7",
+    "@litert/websocket": "^0.2.8",
     "@types/ssh2": "^1.15.5",
-    "@zilliz/milvus2-sdk-node": "^2.6.3",
+    "@zilliz/milvus2-sdk-node": "^2.6.4",
     "ejs": "^3.1.10",
     "jszip": "^3.10.1",
     "mysql2": "^3.15.3",
-    "openai": "^6.7.0",
+    "openai": "^6.8.0",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs": "^4.1.136"
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^24.9.2",
+    "@types/node": "^24.10.0",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3"
   }

package/sys/cmd.js

@@ -155,6 +155,12 @@ async function run() {
         config.ai['AZURE'] ??= {};
         config.ai['AZURE'].endpoint ??= '';
         config.ai['AZURE'].skey ??= '';
+        config.ai['AZURE2'] ??= {};
+        config.ai['AZURE2'].endpoint ??= '';
+        config.ai['AZURE2'].skey ??= '';
+        config.ai['AZURE3'] ??= {};
+        config.ai['AZURE3'].endpoint ??= '';
+        config.ai['AZURE3'].skey ??= '';
         // --- config - vector ---
         config.vector ??= {};
         config.vector.host ??= '127.0.0.1';

package/sys/mod.js

@@ -45,7 +45,17 @@ class Rows {
 /**
  * --- 开启软更需要在表添加字段：ALTER TABLE `table_name` ADD `time_remove` bigint NOT NULL DEFAULT '0' AFTER `xxx`; ---
  */
-class Mod {
+export default class Mod {
+    /** --- 表名 --- */
+    static { this._$table = ''; }
+    /** --- 主键字段名 --- */
+    static { this._$primary = 'id'; }
+    /** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
+    static { this._$key = ''; }
+    /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
+    static { this._$index = ''; }
+    /** ---- 可开启软删软更新软新增 --- */
+    static { this._$soft = false; }
     /**
      * --- 构造函数 ---
      * @param ctr Ctr 对象
@@ -1427,14 +1437,3 @@ class Mod {
         return '';
     }
 }
-/** --- 表名 --- */
-Mod._$table = '';
-/** --- 主键字段名 --- */
-Mod._$primary = 'id';
-/** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
-Mod._$key = '';
-/** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
-Mod._$index = '';
-/** ---- 可开启软删软更新软新增 --- */
-Mod._$soft = false;
-export default Mod;

package/www/example/ctr/test.js

@@ -3125,20 +3125,26 @@ rtn.push(reader.readBCDString());</pre>${JSON.stringify(rtn)}`);
         const echo = [`<pre>const ai = lAi.get(this, {
     'service': lAi.ESERVICE.ALICN,
 });</pre>`];
-        const completion = await ai.link.chat.completions.create({
+        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': '你是谁？' },
             ],
         });
-        echo.push(`<pre>await ai.link.chat.completions.create({
+        echo.push(`<pre>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': '你是谁？' },
     ],
-});</pre>` + JSON.stringify(completion.choices[0].message.content));
+});</pre>`);
+        if (completion) {
+            echo.push(JSON.stringify(completion.choices[0].message.content));
+        }
+        else {
+            echo.push('Failed');
+        }
         return echo.join('') + '<br><br>' + this._getEnd();
     }
     aiStream() {
@@ -3210,7 +3216,7 @@ send.addEventListener('click', async () => {
         const ai = lAi.get(this, {
             'service': lAi.ESERVICE.ALICN,
         });
-        const stream = await ai.link.chat.completions.create({
+        const stream = await ai.chat({
             'model': 'qwen-plus',
             'stream': true,
             'messages': [
@@ -3222,6 +3228,10 @@ send.addEventListener('click', async () => {
             },
         });
         lCore.writeEventStreamHead(this._res);
+        if (!stream) {
+            lCore.write(this._res, 'data: ' + 'Faild\n\n');
+            return '';
+        }
         for await (const chunk of stream) {
             if (!this._isAvail) {
                 lCore.debug('Client disconnect');

package/www/example/mod/test.js

@@ -15,14 +15,13 @@ CREATE TABLE `m_test`  (
   UNIQUE INDEX `uname`(`name` ASC) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 */
-class default_1 extends sMod {
+export default class default_1 extends sMod {
+    static { this._$table = 'test'; }
+    static { this._$primary = 'id'; }
+    static { this._$key = 'token'; }
+    static { this._$index = 'utoken'; }
     /* eslint-enable */
     _keyGenerator() {
         return 'test_' + lCore.rand(0, 3).toString();
     }
 }
-default_1._$table = 'test';
-default_1._$primary = 'id';
-default_1._$key = 'token';
-default_1._$index = 'utoken';
-export default default_1;

package/www/example/mod/testdata.js

@@ -8,8 +8,7 @@ CREATE TABLE `m_test_data_0` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=ascii COLLATE=ascii_bin;
 */
-class default_1 extends sMod {
+export default class default_1 extends sMod {
+    static { this._$table = 'test_data'; }
+    static { this._$primary = 'id'; }
 }
-default_1._$table = 'test_data';
-default_1._$primary = 'id';
-export default default_1;