@maiyunnet/kebab 3.2.28 → 3.2.30

package/index.d.ts

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

package/index.js

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

package/lib/core.d.ts

@@ -249,3 +249,10 @@ export declare function display(message?: any, ...optionalParams: any[]): void;
  * @param headers 头部
  */
 export declare function writeHead(res: http2.Http2ServerResponse | http.ServerResponse, statusCode: number, headers?: http.OutgoingHttpHeaders): void;
+export declare function writeEventStreamHead(res: http2.Http2ServerResponse | http.ServerResponse): void;
+/**
+ * --- 向 res 发送数据 ---
+ * @param res 响应对象
+ * @param data 数据
+ */
+export declare function write(res: http2.Http2ServerResponse | http.ServerResponse, data: string | Buffer): void;

package/lib/core.js

@@ -806,3 +806,22 @@ export function writeHead(res, statusCode, headers) {
         res.writeHead(statusCode, headers);
     }
 }
+export function writeEventStreamHead(res) {
+    writeHead(res, 200, {
+        'content-type': 'text/event-stream; charset=utf-8',
+        'cache-control': 'no-store',
+    });
+}
+/**
+ * --- 向 res 发送数据 ---
+ * @param res 响应对象
+ * @param data 数据
+ */
+export function write(res, data) {
+    if (res instanceof http2.Http2ServerResponse) {
+        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.28",
+  "version": "3.2.30",
   "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/child.js

@@ -164,6 +164,8 @@ async function run() {
                 delete linkCount[key];
             }
         });
+    }).on('clientError', (err, socket) => {
+        socket.destroy();
     }).on('upgrade', function (req, socket, head) {
         const host = (req.headers['host'] ?? '');
         if (!host) {

package/sys/ctr.d.ts

@@ -58,7 +58,7 @@ export declare class Ctr {
     protected _localeData: Record<string, Record<string, string>>;
     constructor(config: kebab.IConfig, req: http2.Http2ServerRequest | http.IncomingMessage, res?: http2.Http2ServerResponse | http.ServerResponse);
     /** --- 当前用户连接是否还在连接中 --- */
-    get isAvail(): boolean;
+    protected get _isAvail(): boolean;
     /** --- timeout 的 timer --- */
     protected _timer?: {
         'timer': NodeJS.Timeout;
@@ -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

@@ -78,7 +78,7 @@ export class Ctr {
         this._cacheTTL = config.set.cacheTtl;
     }
     /** --- 当前用户连接是否还在连接中 --- */
-    get isAvail() {
+    get _isAvail() {
         return this._req.socket.writable;
     }
     /** --- 获取当前过期时间 --- */
@@ -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/sys/route.js

@@ -505,7 +505,7 @@ export async function run(data) {
             pathRight = pathRight.replace(/-([a-zA-Z0-9])/g, function (t, t1) {
                 return t1.toUpperCase();
             });
-            if (cctr[pathRight] === undefined) {
+            if ((cctr[pathRight] === undefined) || (typeof cctr[pathRight] !== 'function')) {
                 if (config.route['#404']) {
                     data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
                     lCore.writeHead(data.res, 302);

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

@@ -101,6 +101,8 @@ export default class extends sCtr.Ctr {
     lan(): Promise<string>;
     cron(): Promise<string>;
     ai(): Promise<string>;
+    aiStream(): string;
+    aiStream1(): Promise<any>;
     /**
      * --- END ---
      */

package/www/example/ctr/test.js

@@ -128,6 +128,7 @@ export default class extends sCtr.Ctr {
             '<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><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>`,
@@ -2133,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')}';
@@ -2146,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;
@@ -2157,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')}';
@@ -3128,18 +3129,130 @@ rtn.push(reader.readBCDString());</pre>${JSON.stringify(rtn)}`);
             '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': '你是谁？' }
+                { 'role': 'user', 'content': '你是谁？' },
             ],
         });
         echo.push(`<pre>await ai.link.chat.completions.create({
     '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': '你是谁？' }
+        { 'role': 'user', 'content': '你是谁？' },
     ],
 });</pre>` + JSON.stringify(completion.choices[0].message.content));
         return echo.join('') + '<br><br>' + this._getEnd();
     }
+    aiStream() {
+        const echo = `<input id="text" type="text"><button id="send">Send</button>
+<hr>
+<div id="content"></div>
+<script>
+let controller;
+const text = document.getElementById('text');
+const send = document.getElementById('send');
+const content = document.getElementById('content');
+send.addEventListener('click', async () => {
+    if (send.innerHTML === 'Stop') {
+        controller.abort();
+        return;
+    }
+    if (!text.value) {
+        alert('Please input content');
+        return;
+    }
+    send.innerHTML = 'Stop';
+    send.disabled = true;
+    controller = new AbortController();
+    const res = await fetch('http${this._config.const.https ? 's' : ''}://${this._config.const.host}/test/ai-stream1', {
+        'method': 'POST',
+        'headers': { 'content-type': 'application/json' },
+        'body': JSON.stringify({ 'content': text.value, }),
+        'signal': controller.signal,
+    });
+    send.disabled = false;
+    text.value = '';
+    content.textContent = '';
+    const reader = res.body.getReader();
+    const decoder = new TextDecoder('utf8');
+    let buf = '';
+    while (true) {
+        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());
+            }
+        }
+        catch {
+            break;
+        }
+    }
+    send.innerHTML = 'Send';
+});
+</script>`;
+        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,
+        });
+        const stream = await ai.link.chat.completions.create({
+            'model': 'qwen-plus',
+            'stream': true,
+            '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': this._post['content'] },
+            ],
+            'stream_options': {
+                'include_usage': true,
+            },
+        });
+        lCore.writeEventStreamHead(this._res);
+        for await (const chunk of stream) {
+            if (!this._isAvail) {
+                lCore.debug('Client disconnect');
+                stream.controller.abort();
+                break;
+            }
+            if (chunk.choices.length) {
+                const content = chunk.choices[0].delta.content;
+                if (!content) {
+                    continue;
+                }
+                if (!this._isAvail) {
+                    // --- 测试上面 abort 后不 break 的话还会执行到这里吗 ---
+                    // --- 测试结果：可能会，大概率只有一次，就证明连接确实断开了只不过有延迟 ---
+                    // --- 但上面 break 的话就肯定不会执行到这里了 ---
+                    lCore.debug('Client has been closed', content);
+                    continue;
+                }
+                lCore.write(this._res, 'data: ' + JSON.stringify(content) + '\n\n');
+                continue;
+            }
+            if (!chunk.usage) {
+                continue;
+            }
+            lCore.debug('--- All over ---');
+            lCore.debug(`Input Tokens: ${chunk.usage.prompt_tokens}`);
+            lCore.debug(`Output Tokens: ${chunk.usage.completion_tokens}`);
+            lCore.debug(`Total Tokens: ${chunk.usage.total_tokens}`);
+        }
+        lCore.debug('AI DONE');
+    }
     /**
      * --- END ---
      */