@maiyunnet/kebab 3.2.27 → 3.2.29

package/index.d.ts

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

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.2.27';
+export const VER = '3.2.29';
 // --- 服务端用的路径 ---
 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/text.js

@@ -5,6 +5,7 @@
  */
 import * as kebab from '#kebab/index.js';
 import * as lFs from './fs.js';
+import * as lCore from './core.js';
 /**
  * --- 将文件大小格式化为带单位的字符串 ---
  * @param size 文件大小
@@ -521,18 +522,31 @@ export function stringifyBuffer(buf) {
  * --- 递归删除 json 中的字符串首尾空格，会返回一个新的对象 ---
  */
 export function trimJson(json) {
-    json = Object.assign({}, json);
+    json = lCore.clone(json);
     trimJsonRecursion(json);
     return json;
 }
 function trimJsonRecursion(json) {
-    for (const key in json) {
-        const val = json[key];
-        if (typeof val === 'string') {
-            json[key] = val.trim();
+    if (Array.isArray(json)) {
+        for (let i = 0; i < json.length; ++i) {
+            const val = json[i];
+            if (typeof val === 'string') {
+                json[i] = val.trim();
+            }
+            else if (typeof val === 'object') {
+                trimJsonRecursion(val);
+            }
         }
-        else if (typeof val === 'object') {
-            trimJsonRecursion(val);
+    }
+    else {
+        for (const key in json) {
+            const val = json[key];
+            if (typeof val === 'string') {
+                json[key] = val.trim();
+            }
+            else if (typeof val === 'object') {
+                trimJsonRecursion(val);
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.27",
+  "version": "3.2.29",
   "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;

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;
     }
     /** --- 获取当前过期时间 --- */

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>`,
@@ -3128,18 +3129,118 @@ 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();
+        send.innerHTML = 'Send';
+        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) {
+        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());
+        }
+    }
+    send.innerHTML = 'Send';
+});
+</script>`;
+        return echo + '<br>' + this._getEnd();
+    }
+    async aiStream1() {
+        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 后还会执行到这里吗 ---
+                    // --- 测试结果：确实不会 ---
+                    lCore.debug('Client has been closed');
+                    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}`);
+        }
+    }
     /**
      * --- END ---
      */