@maiyunnet/kebab 3.2.29 → 3.2.31

package/index.d.ts

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

package/index.js

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

package/lib/ai.d.ts

@@ -16,7 +16,11 @@ export declare enum ESERVICE {
     /** --- 阿里国际区 --- */
     'ALIAS' = 1,
     /** --- 微软 Azure --- */
-    'AZURE' = 2
+    'AZURE' = 2,
+    /** --- 微软 Azure 2 --- */
+    'AZURE2' = 3,
+    /** --- 微软 Azure 3 --- */
+    'AZURE3' = 4
 }
 /** --- 选项 --- */
 export interface IOptions {

package/lib/ai.js

@@ -17,6 +17,10 @@ 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 = [];
@@ -38,6 +42,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;
             }

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.d.ts

@@ -15,6 +15,8 @@ export interface IData {
         'errno': number;
         [key: string]: any;
     } | null;
+    /** --- 1-正常,-500-服务器错误 --- */
+    'result': number;
 }
 /** --- exec 返回对象 --- */
 export interface IPacket {
@@ -49,6 +51,7 @@ export declare class Pool {
      * --- 执行一条 SQL，无视顺序和相同连接，随用随取 ---
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
+     * @returns error.errno = -500 表示系统错误
      */
     query(sql: string, values?: kebab.DbValue[]): Promise<IData>;
     /**

package/lib/db.js

@@ -79,6 +79,7 @@ export class Pool {
      * --- 执行一条 SQL，无视顺序和相同连接，随用随取 ---
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
+     * @returns error.errno = -500 表示系统错误
      */
     async query(sql, values) {
         ++this._queries;
@@ -89,9 +90,10 @@ export class Pool {
                 'rows': null,
                 'fields': [],
                 'error': {
-                    'message': 'null',
-                    'errno': 0
-                }
+                    'message': 'false',
+                    'errno': 0,
+                },
+                'result': -500,
             };
         }
         // --- 执行一次后自动解除 using ---
@@ -237,9 +239,10 @@ export class Transaction {
                 'rows': null,
                 'fields': [],
                 'error': {
-                    'message': 'null',
+                    'message': 'false',
                     'errno': 0
-                }
+                },
+                'result': -500,
             };
         }
         ++this._queries;
@@ -439,7 +442,8 @@ export class Connection {
             return {
                 'rows': null,
                 'fields': [],
-                'error': e
+                'error': e,
+                'result': -500,
             };
         }
         if (!this._transaction) {
@@ -449,7 +453,8 @@ export class Connection {
         return {
             'rows': res[0],
             'fields': res[1],
-            'error': null
+            'error': null,
+            'result': 1,
         };
     }
     /**

package/lib/kv.d.ts

@@ -62,7 +62,7 @@ export declare class Pool {
      * --- 获取字符串 ---
      * @param key
      */
-    get(key: string): Promise<string | null>;
+    get(key: string): Promise<string | false | null>;
     /**
      * --- 获取相应的剩余有效期秒数 ---
      * @param key
@@ -86,8 +86,9 @@ export declare class Pool {
     /**
      * --- 获取 json 对象 ---
      * @param key
+     * @returns false 表示系统错误, null 表示不存在, 其他值为 json 对象
      */
-    getJson(key: string): Promise<any | null>;
+    getJson(key: string): Promise<any | false | null>;
     /**
      * --- 删除已存在的值 ---
      * @param keys
@@ -301,9 +302,9 @@ export declare class Connection {
      * --- 获取字符串 ---
      * @param key
      * @param etc
-     * @returns 字符串或 null（即使存入时是 number，这个方法也只会返回字符串）
+     * @returns 字符串 / false / null（即使存入时是 number，这个方法也只会返回字符串）
      */
-    get(key: string, etc: kebab.IConfigKv): Promise<string | null>;
+    get(key: string, etc: kebab.IConfigKv): Promise<string | false | null>;
     /**
      * --- 获取相应的剩余有效期秒数 ---
      * @param key
@@ -334,7 +335,7 @@ export declare class Connection {
      * @param key
      * @param etc
      */
-    getJson(key: string, etc: kebab.IConfigKv): Promise<any | null>;
+    getJson(key: string, etc: kebab.IConfigKv): Promise<any | false | null>;
     /**
      * --- 删除已存在的值 ---
      * @param keys

package/lib/kv.js

@@ -236,11 +236,12 @@ export class Pool {
     /**
      * --- 获取 json 对象 ---
      * @param key
+     * @returns false 表示系统错误, null 表示不存在, 其他值为 json 对象
      */
     async getJson(key) {
         const conn = await this._getConnection();
         if (!conn) {
-            return null;
+            return false;
         }
         const r = await conn.getJson(key, this._etc);
         conn.used();
@@ -823,7 +824,7 @@ end`;
      * --- 获取字符串 ---
      * @param key
      * @param etc
-     * @returns 字符串或 null（即使存入时是 number，这个方法也只会返回字符串）
+     * @returns 字符串 / false / null（即使存入时是 number，这个方法也只会返回字符串）
      */
     async get(key, etc) {
         this.refreshLast();
@@ -831,7 +832,7 @@ end`;
             return await this._link.get(etc.pre + key);
         }
         catch {
-            return null;
+            return false;
         }
     }
     /**
@@ -917,11 +918,11 @@ end`;
      */
     async getJson(key, etc) {
         const v = await this.get(key, etc);
-        if (v === null) {
-            return null;
+        if (v === null || v === false) {
+            return v;
         }
         const r = lText.parseJson(v);
-        return r === false ? null : r;
+        return r;
     }
     /**
      * --- 删除已存在的值 ---

package/lib/session.d.ts

@@ -31,6 +31,7 @@ export declare class Session {
      * @param link Kv 或 Db 实例
      * @param auth 设为 true 则优先从头 Authorization 或 post _auth 值读取 token
      * @param opt 选项
+     * @returns false 表示系统错误
      */
     init(ctr: ctr.Ctr, link: db.Pool | kv.Pool, auth?: boolean, opt?: IOptions): Promise<boolean>;
     /**

package/lib/session.js

@@ -36,6 +36,7 @@ export class Session {
      * @param link Kv 或 Db 实例
      * @param auth 设为 true 则优先从头 Authorization 或 post _auth 值读取 token
      * @param opt 选项
+     * @returns false 表示系统错误
      */
     async init(ctr, link, auth = false, opt = {}) {
         const config = ctr.getPrototype('_config');
@@ -68,10 +69,13 @@ export class Session {
             // --- 如果启用了内存加速则在内存找 ---
             if (this._link instanceof kv.Pool) {
                 // --- Kv ---
-                let data;
-                if ((data = await this._link.getJson(this._name + '_' + this._token)) === null) {
+                const data = await this._link.getJson(this._name + '_' + this._token);
+                if (data === null) {
                     needInsert = true;
                 }
+                else if (data === false) {
+                    return false;
+                }
                 else {
                     session = data;
                 }
@@ -86,6 +90,9 @@ export class Session {
                 if (data.rows?.[0]) {
                     session = text.parseJson(data.rows[0].data);
                 }
+                else if (data.result === -500) {
+                    return false;
+                }
                 else {
                     needInsert = true;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.29",
+  "version": "3.2.31",
   "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/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/ctr.d.ts

@@ -206,7 +206,7 @@ export declare class Ctr {
      * @param auth 设为 true 则从头 Authorization 或 post _auth 值读取 token
      * @param opt name, ttl, ssl, sqlPre
      */
-    protected _startSession(link: lDb.Pool | lKv.Pool, auth?: boolean, opt?: lSession.IOptions): Promise<void>;
+    protected _startSession(link: lDb.Pool | lKv.Pool, auth?: boolean, opt?: lSession.IOptions): Promise<boolean>;
     /**
      * --- 设定语言并加载语言包 ---
      * @param loc 要加载的目标语言

package/sys/ctr.js

@@ -603,9 +603,9 @@ export class Ctr {
      * @param auth 设为 true 则从头 Authorization 或 post _auth 值读取 token
      * @param opt name, ttl, ssl, sqlPre
      */
-    async _startSession(link, auth = false, opt = {}) {
+    _startSession(link, auth = false, opt = {}) {
         this._sess = new lSession.Session();
-        await this._sess.init(this, link, auth, opt);
+        return this._sess.init(this, link, auth, opt);
     }
     // --- 本地化 ---
     /**

package/www/example/ctr/test.js

@@ -2134,8 +2134,8 @@ function confirm() {
             echo.push('link = lKv.get(this);\n');
         }
         if (this._get['auth'] === '') {
-            await this._startSession(link, false, { 'ttl': 60 });
-            echo.push(`await this._startSession(link, false, {'ttl': 60});
+            const r = await this._startSession(link, false, { 'ttl': 60 });
+            echo.push(`await this._startSession(link, false, {'ttl': 60});  // ${r}
 JSON.stringify(this._session);</pre>` + lText.htmlescape(JSON.stringify(this._session)));
             this._session['value'] = lText.logicalOr(this._get['value'], 'ok');
             echo.push(`<pre>this._session['value'] = '${lText.logicalOr(this._get['value'], 'ok')}';
@@ -2147,7 +2147,7 @@ JSON.stringify(this._session);</pre>` + lText.htmlescape(JSON.stringify(this._se
         }
         else {
             // --- AUTH 模式 ---
-            await this._startSession(link, true, { 'ttl': 60 });
+            const r = await this._startSession(link, true, { 'ttl': 60 });
             if (Object.keys(this._post).length > 0) {
                 if (this._session['count'] === undefined) {
                     this._session['count'] = 1;
@@ -2158,7 +2158,7 @@ JSON.stringify(this._session);</pre>` + lText.htmlescape(JSON.stringify(this._se
                 return [1, { 'txt': 'this._session: ' + JSON.stringify(this._session) + '\nToken: ' + this._sess.getToken(), 'token': this._sess?.getToken(), '_auth': this._getBasicAuth('token', this._sess.getToken()) }];
             }
             else {
-                echo.push(`await this._startSession(link, true, {'ttl': 60});
+                echo.push(`await this._startSession(link, true, {'ttl': 60});  // ${r}
 JSON.stringify(this._session));</pre>` + lText.htmlescape(JSON.stringify(this._session)));
                 this._session['value'] = lTime.format(this, 'H:i:s');
                 echo.push(`<pre>this._session['value'] = '${lTime.format(this, 'H:i:s')}';
@@ -3153,7 +3153,6 @@ const content = document.getElementById('content');
 send.addEventListener('click', async () => {
     if (send.innerHTML === 'Stop') {
         controller.abort();
-        send.innerHTML = 'Send';
         return;
     }
     if (!text.value) {
@@ -3176,19 +3175,24 @@ send.addEventListener('click', async () => {
     const decoder = new TextDecoder('utf8');
     let buf = '';
     while (true) {
-        const { value, done } = await reader.read();
-        if (done) {
-            break;
-        }
-        buf += decoder.decode(value, { 'stream': true, });
-        if (!buf.includes('\\n\\n')) {
-            // --- 还没接收完 ---
-            continue;
+        try {
+            const { value, done } = await reader.read();
+            if (done) {
+                break;
+            }
+            buf += decoder.decode(value, { 'stream': true, });
+            if (!buf.includes('\\n\\n')) {
+                // --- 还没接收完 ---
+                continue;
+            }
+            const events = buf.split('\\n\\n');
+            buf = events.pop(); // --- 最后一个可能不完整 ---
+            for (const ev of events) {
+                content.textContent += JSON.parse(ev.slice(5).trim());
+            }
         }
-        const events = buf.split('\\n\\n');
-        buf = events.pop(); // --- 最后一个可能不完整 ---
-        for (const ev of events) {
-            content.textContent += JSON.parse(ev.slice(5).trim());
+        catch {
+            break;
         }
     }
     send.innerHTML = 'Send';
@@ -3197,6 +3201,12 @@ send.addEventListener('click', async () => {
         return echo + '<br>' + this._getEnd();
     }
     async aiStream1() {
+        if (!this._cross()) {
+            return '';
+        }
+        if (!this._post['content']) {
+            return '';
+        }
         const ai = lAi.get(this, {
             'service': lAi.ESERVICE.ALICN,
         });
@@ -3224,9 +3234,10 @@ send.addEventListener('click', async () => {
                     continue;
                 }
                 if (!this._isAvail) {
-                    // --- 测试上面 abort 后还会执行到这里吗 ---
-                    // --- 测试结果：确实不会 ---
-                    lCore.debug('Client has been closed');
+                    // --- 测试上面 abort 后不 break 的话还会执行到这里吗 ---
+                    // --- 测试结果：可能会，大概率只有一次，就证明连接确实断开了只不过有延迟 ---
+                    // --- 但上面 break 的话就肯定不会执行到这里了 ---
+                    lCore.debug('Client has been closed', content);
                     continue;
                 }
                 lCore.write(this._res, 'data: ' + JSON.stringify(content) + '\n\n');
@@ -3240,6 +3251,7 @@ send.addEventListener('click', async () => {
             lCore.debug(`Output Tokens: ${chunk.usage.completion_tokens}`);
             lCore.debug(`Total Tokens: ${chunk.usage.total_tokens}`);
         }
+        lCore.debug('AI DONE');
     }
     /**
      * --- END ---