@maiyunnet/kebab 9.10.0 → 9.11.0

package/index.d.ts

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

package/index.js

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

package/lib/ai.d.ts

@@ -32,7 +32,11 @@ export declare enum ESERVICE {
     /** --- 火山引擎中国大陆区 --- */
     'VOLCN' = 8,
     /** --- 火山引擎国际区 --- */
-    'VOLAS' = 9
+    'VOLAS' = 9,
+    /** --- OpenRouter --- */
+    'OPENROUTER' = 10,
+    /** --- OfoxAI --- */
+    'OFOX' = 11
 }
 /** --- 选项 --- */
 export interface IOptions {
@@ -59,6 +63,10 @@ export declare class Ai {
     chat(body: openai.default.Chat.Completions.ChatCompletionCreateParamsNonStreaming): Promise<openai.APIPromise<openai.default.Chat.ChatCompletion> | false>;
     /** --- 创建流式对话 --- */
     chat(body: openai.default.Chat.Completions.ChatCompletionCreateParamsStreaming): Promise<openai.APIPromise<streaming.Stream<openai.default.Chat.ChatCompletionChunk>> | false>;
+    /** --- 创建非流式 Response --- */
+    response(body: openai.default.Responses.ResponseCreateParamsNonStreaming): Promise<openai.APIPromise<openai.default.Responses.Response> | false>;
+    /** --- 创建流式 Response --- */
+    response(body: openai.default.Responses.ResponseCreateParamsStreaming): Promise<openai.APIPromise<streaming.Stream<openai.default.Responses.ResponseStreamEvent>> | false>;
     /** --- 创建向量 --- */
     embedding(body: openai.default.EmbeddingCreateParams): Promise<openai.APIPromise<openai.default.CreateEmbeddingResponse> | false>;
     /** --- 生成图像，不支持 GEMINI、GROK 服务商 --- */

package/lib/ai.js

@@ -34,6 +34,11 @@ export var ESERVICE;
     ESERVICE[ESERVICE["VOLCN"] = 8] = "VOLCN";
     /** --- 火山引擎国际区 --- */
     ESERVICE[ESERVICE["VOLAS"] = 9] = "VOLAS";
+    // --- 以下为第三方服务商 ---
+    /** --- OpenRouter --- */
+    ESERVICE[ESERVICE["OPENROUTER"] = 10] = "OPENROUTER";
+    /** --- OfoxAI --- */
+    ESERVICE[ESERVICE["OFOX"] = 11] = "OFOX";
 })(ESERVICE || (ESERVICE = {}));
 /** --- openai 的连接对象 --- */
 const links = [];
@@ -94,6 +99,14 @@ export class Ai {
                 endpoint = opt.endpoint ?? `https://ark.ap-southeast.bytepluses.com/api/v3`;
                 break;
             }
+            case ESERVICE.OPENROUTER: {
+                endpoint = opt.endpoint ?? `https://openrouter.ai/api/v1`;
+                break;
+            }
+            case ESERVICE.OFOX: {
+                endpoint = opt.endpoint ?? `https://api.ofox.ai/v1`;
+                break;
+            }
             default: {
                 // --- ESERVICE.AZURE3 ---
                 endpoint = opt.endpoint ?? configAi.endpoint ?? '';
@@ -136,6 +149,19 @@ export class Ai {
             return false;
         }
     }
+    /** --- 创建 Response --- */
+    async response(body) {
+        try {
+            return await this.link.responses.create(body);
+        }
+        catch (e) {
+            if (!e.message.includes('Input data may contain inappropriate content')) {
+                lCore.debug('[AI][RESPONSE]', e);
+                lCore.log(this._ctr ?? {}, `[AI][RESPONSE] ${e.message}`, '-error');
+            }
+            return false;
+        }
+    }
     /** --- 创建向量 --- */
     async embedding(body) {
         try {
@@ -151,6 +177,9 @@ export class Ai {
     }
     /** --- 生成图像，不支持 GEMINI、GROK 服务商 --- */
     async image(opt) {
+        if (!this.link.apiKey) {
+            return false;
+        }
         const seed = opt.seed ?? lCore.rand(0, 2147483647);
         switch (this._service) {
             case ESERVICE.ALICN:
@@ -300,6 +329,12 @@ export class Ai {
                     return false;
                 }
             }
+            case ESERVICE.OPENROUTER: {
+                return false;
+            }
+            case ESERVICE.OFOX: {
+                return false;
+            }
         }
     }
     /** --- 异步生成视频，仅支持 ALICN、ALIAS、ALINE --- */
@@ -307,6 +342,9 @@ export class Ai {
         if (this._service !== ESERVICE.ALICN && this._service !== ESERVICE.ALIAS && this._service !== ESERVICE.ALINE) {
             return false;
         }
+        if (!this.link.apiKey) {
+            return false;
+        }
         const mode = opt.mode ?? 'text';
         const imgs = opt.imgs ?? [];
         const resolution = opt.resolution ?? '720p';
@@ -442,6 +480,9 @@ export class Ai {
         if (this._service !== ESERVICE.ALICN && this._service !== ESERVICE.ALIAS && this._service !== ESERVICE.ALINE) {
             return false;
         }
+        if (!this.link.apiKey) {
+            return false;
+        }
         try {
             const res = await this._fetch(`https://dashscope${this._service === ESERVICE.ALIAS ? '-intl' : (this._service === ESERVICE.ALINE ? '-us' : '')}.aliyuncs.com/api/v1/tasks/${opt.task}`, {
                 'method': 'GET',

package/lib/core.d.ts

@@ -299,7 +299,7 @@ export declare function getLog(opt: {
  * @param opt 参数
  */
 export declare function ls(opt: {
-    /** --- 如 2024/08/01/22，无所谓开头结尾 --- */
+    /** --- 如 2024/08/01/22，无所谓开头结尾是否有 /，不会逃逸出 cwd 路径 --- */
     'path': string;
     'encoding'?: BufferEncoding;
     /** --- 获取局域网服务器的目录列表，为空代表获取本机的 --- */

package/lib/text.d.ts

@@ -28,8 +28,9 @@ export declare function parseUrl(url: string): kebab.IUrlParse;
  * --- 将相对路径根据基准路径进行转换 ---
  * @param from 基准路径
  * @param to 相对路径
+ * @param limit 是否限定结果不能逃逸出基准路径
  */
-export declare function urlResolve(from: string, to: string): string;
+export declare function urlResolve(from: string, to: string, limit?: boolean): string;
 /**
  * --- 将路径中的 ../ ./ 都按规范妥善处理 ---
  * @param url 要处理的地址

package/lib/text.js

@@ -117,14 +117,30 @@ export function parseUrl(url) {
     rtn['path'] = rtn['pathname'] + (rtn['query'] ? '?' + rtn['query'] : '');
     return rtn;
 }
+/** --- 限定结果不能逃逸出基准路径 --- */
+function urlResolveLimit(from, limit, rtn) {
+    if (!limit) {
+        return rtn;
+    }
+    const base = urlAtom(from).replace(/\/+$/, '') + '/';
+    if ((rtn === base.slice(0, -1)) || rtn.startsWith(base)) {
+        return rtn;
+    }
+    return base;
+}
 /**
  * --- 将相对路径根据基准路径进行转换 ---
  * @param from 基准路径
  * @param to 相对路径
+ * @param limit 是否限定结果不能逃逸出基准路径
  */
-export function urlResolve(from, to) {
-    from = from.replace('\\', '/');
-    to = to.replace('\\', '/');
+export function urlResolve(from, to, limit = false) {
+    from = from.replace(/\\/g, '/');
+    to = to.replace(/\\/g, '/');
+    if (limit) {
+        // --- 限定模式下，开头的 / 代表从 from 内部开始，而不是系统根目录 ---
+        to = to.replace(/^\/+/, '');
+    }
     // --- to 为空，直接返回 form ---
     if (to === '') {
         return urlAtom(from);
@@ -144,7 +160,7 @@ export function urlResolve(from, to) {
     // --- 已经是绝对路径，直接返回 ---
     if (t.protocol) {
         // --- 获取小写的 protocol ---
-        return urlAtom(t.protocol + to.slice(t.protocol.length));
+        return urlResolveLimit(from, limit, urlAtom(t.protocol + to.slice(t.protocol.length)));
     }
     // --- # 或 ? 替换后返回 ---
     if (to.startsWith('#') || to.startsWith('?')) {
@@ -172,11 +188,11 @@ export function urlResolve(from, to) {
     // --- 返回最终结果 ---
     if (f.protocol && (f.protocol !== 'file:') && !f.host) {
         // --- 类似 c:/ ---
-        return urlAtom(f.protocol + abs);
+        return urlResolveLimit(from, limit, urlAtom(f.protocol + abs));
     }
     else {
         // --- 类似 http:// ---
-        return urlAtom((f.protocol ? f.protocol + '//' : '') + abs);
+        return urlResolveLimit(from, limit, urlAtom((f.protocol ? f.protocol + '//' : '') + abs));
     }
 }
 /**

package/lib/undici/response.js

@@ -1,5 +1,6 @@
 import * as zlib from 'zlib';
 import * as lBuffer from '#kebab/lib/buffer.js';
+import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
 export class Response {
     /** --- httpClient 请求对象 --- */
@@ -26,7 +27,8 @@ export class Response {
             }
             return this._req ? await lBuffer.getFull(stream) : null;
         }
-        catch {
+        catch (e) {
+            lCore.log({}, '[Undici][Response][getContent] ' + e.message, '-error');
             return null;
         }
     }
@@ -39,7 +41,8 @@ export class Response {
             }
             return buf.toString('utf-8');
         }
-        catch {
+        catch (e) {
+            lCore.log({}, '[Undici][Response][getText] ' + e.message, '-error');
             return null;
         }
     }
@@ -52,7 +55,8 @@ export class Response {
             }
             return lText.parseJson(text);
         }
-        catch {
+        catch (e) {
+            lCore.log({}, '[Undici][Response][getJson] ' + e.message, '-error');
             return null;
         }
     }

package/package.json

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

@@ -191,6 +191,10 @@ async function run() {
         config.ai['VOLCN'].skey ??= '';
         config.ai['VOLAS'] ??= {};
         config.ai['VOLAS'].skey ??= '';
+        config.ai['OPENROUTER'] ??= {};
+        config.ai['OPENROUTER'].skey ??= '';
+        config.ai['OFOX'] ??= {};
+        config.ai['OFOX'].skey ??= '';
         // --- config - vector ---
         config.vector ??= {};
         config.vector.host ??= '127.0.0.1';

package/sys/master.js

@@ -386,6 +386,7 @@ function createRpcListener() {
                         '.nyc_output',
                         'tmp',
                         'temp',
+                        'AGENTS.md',
                     ]);
                     for (const path in ls) {
                         /** --- 带 / 开头的 zip 中文件完整路径，例如 "/www/pika/ctr/api.js" --- */
@@ -737,7 +738,11 @@ function createRpcListener() {
                 }
                 case 'ls': {
                     // --- 获取目录内文件/文件夹列表 ---
-                    const path = lText.urlResolve(kebab.ROOT_CWD, msg.path);
+                    if (typeof msg.path !== 'string') {
+                        res.end('Invalid path');
+                        return;
+                    }
+                    const path = lText.urlResolve(kebab.ROOT_CWD, msg.path, true);
                     res.end(lText.stringifyJson({
                         'result': 1,
                         'data': (await lFs.readDir(path, msg.encoding)).map(item => ({

package/sys/mod.js

@@ -681,6 +681,10 @@ export default class Mod {
      */
     async refresh(lock = false) {
         const cstr = this.constructor;
+        if (!this._data[cstr._$primary]) {
+            lCore.log(this._ctr ?? {}, '[MOD][refresh] primary key not found', '-error');
+            return false;
+        }
         this._sql.select('*', cstr._$table + (this._index ? ('_' + this._index[0]) : '')).where([{
                 [cstr._$primary]: this._data[cstr._$primary]
             }]);
@@ -711,6 +715,10 @@ export default class Mod {
             return true;
         }
         const cstr = this.constructor;
+        if (!this._data[cstr._$primary]) {
+            lCore.log(this._ctr ?? {}, '[MOD][save] primary key not found', '-error');
+            return false;
+        }
         const updates = {};
         for (const k in this._updates) {
             updates[k] = this._data[k];
@@ -736,6 +744,10 @@ export default class Mod {
      */
     async remove() {
         const cstr = this.constructor;
+        if (!this._data[cstr._$primary]) {
+            lCore.log(this._ctr ?? {}, '[MOD][remove] primary key not found', '-error');
+            return false;
+        }
         this._sql.delete(cstr._$table + (this._index ? ('_' + this._index[0]) : '')).where([{
                 [cstr._$primary]: this._data[cstr._$primary]
             }]);

package/www/example/ctr/test.js

@@ -140,6 +140,7 @@ export default class extends sCtr.Ctr {
             `<br><br><b>Ai:</b>`,
             `<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=response">View "test/ai?action=response"</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>`,
@@ -3692,6 +3693,8 @@ ${lText.htmlescape(lText.urlResolve('C:\\Windows\\Misc', '/'))}
 ${lText.htmlescape(lText.urlResolve('C:\\Windows\\Misc', '/xxx/yyy'))}
 <pre>lText.urlResolve('/abc/def/', '');</pre>
 ${lText.htmlescape(lText.urlResolve('/abc/def/', ''))}
+<pre>lText.urlResolve('/abc/def/', '../1/2/3', true);</pre>
+${lText.htmlescape(lText.urlResolve('/abc/def/', '../1/2/3', true))}
 <pre>lText.isEMail('test@gmail.com');</pre>
 ${JSON.stringify(lText.isEMail('test@gmail.com'))}
 <pre>lText.isEMail('test@x');</pre>
@@ -4093,11 +4096,13 @@ rtn.push(reader.readBCDString());</pre>${JSON.stringify(rtn)}`);
         return echo.join('') + '<br>' + this._getEnd();
     }
     async ai() {
+        this.timeout = 60_000 * 10;
         const echo = [`<pre>const ai = lAi.get(this, {
     'service': lAi.ESERVICE.${lText.htmlescape(this._get['service']?.toUpperCase() ?? 'ALICN')},
 });</pre>`];
         const ai = lAi.get(this, {
             'service': lAi.ESERVICE[this._get['service']?.toUpperCase() ?? 'ALICN'] ?? lAi.ESERVICE.ALICN,
+            'endpoint': this._get['service'] === 'ofox' ? 'https://api.ofox.io/v1' : undefined,
         });
         switch (this._get['action']) {
             case 'text-to-image': {
@@ -4241,6 +4246,128 @@ rtn.push(reader.readBCDString());</pre>${JSON.stringify(rtn)}`);
                 }
                 break;
             }
+            case 'response': {
+                // --- Responses API：多轮对话 + Function Calling + 数据库存储方案 ---
+                let model = ai.service === lAi.ESERVICE.ALICN ? 'qwen3.5-flash' : 'openai/gpt-5-nano';
+                const responseInstructions = 'You are Kebab, a helpful assistant. Do not mention any model names or AI identity. Respond in Chinese.';
+                // --- 工具定义 ---
+                const responseTools = [
+                    {
+                        'type': 'function',
+                        'name': 'get_weather',
+                        'description': '获取指定城市的当前天气，返回 `false`: 调用失败, `null`: 无数据, 成功: 温度和天气',
+                        'parameters': {
+                            'type': 'object',
+                            'required': ['city'],
+                            'properties': {
+                                'city': { 'type': 'string', 'description': '城市名称，如"北京"' },
+                            },
+                        },
+                    },
+                ];
+                // --- 模拟本地工具执行 ---
+                const execTool = (name, argsJson) => {
+                    const args = lText.parseJson(argsJson);
+                    if (!args) {
+                        return 'false';
+                    }
+                    if (name === 'get_weather') {
+                        const table = {
+                            '北京': { 'temp': '22°C', 'condition': '晴' },
+                            '上海': { 'temp': '28°C', 'condition': '多云' },
+                        };
+                        return table[args['city']] ? lText.stringifyJson(table[args['city']]) : 'null';
+                    }
+                    return 'false';
+                };
+                // --- 完整对话历史（同时作为数据库存储内容） ---
+                const conversation = [];
+                // --- 运行一轮（自动处理 function_call 循环） ---
+                const runTurn = async (userMsg) => {
+                    conversation.push({ 'role': 'user', 'content': userMsg });
+                    let data = await ai.response({
+                        'model': model,
+                        'store': false,
+                        'reasoning': {
+                            'effort': 'minimal',
+                        },
+                        'instructions': responseInstructions,
+                        'input': conversation,
+                        'tools': responseTools,
+                    });
+                    while (data) {
+                        const calls = data.output.filter(item => item.type === 'function_call');
+                        if (!calls.length) {
+                            // --- 无工具调用，追加 assistant 回复，供下一轮使用 ---
+                            conversation.push({ 'role': 'assistant', 'content': data.output_text });
+                            return data;
+                        }
+                        // --- 将 function_call 追加到 conversation ---
+                        for (const call of calls) {
+                            conversation.push({
+                                'type': 'function_call',
+                                'name': call.name,
+                                'arguments': call.arguments,
+                                'call_id': call.call_id,
+                            });
+                        }
+                        // --- 全部追加完后再统一执行工具，将结果追加到 conversation，再次调用 ---
+                        for (const call of calls) {
+                            conversation.push({
+                                'type': 'function_call_output',
+                                'call_id': call.call_id,
+                                'output': execTool(call.name, call.arguments),
+                            });
+                        }
+                        data = await ai.response({
+                            'model': model,
+                            'store': false,
+                            'reasoning': {
+                                'effort': 'minimal',
+                            },
+                            'instructions': responseInstructions,
+                            'input': conversation,
+                            'tools': responseTools,
+                        });
+                    }
+                    return false;
+                };
+                // --- 第一轮：自我介绍 + 查北京天气（触发 Function Calling） ---
+                const d1str = '你是谁？今天北京天气怎么样？';
+                const d1 = await runTurn(d1str);
+                if (!d1) {
+                    echo.push('Turn 1 Failed');
+                    break;
+                }
+                echo.push(`<b>第一轮（触发 get_weather 工具）：</b><br>${d1str + '<br>' + lText.htmlescape(d1.output_text)}<br><br>`);
+                // --- 第二轮：续接上文，查上海天气 ---
+                const d2str = '那上海呢？';
+                const d2 = await runTurn(d2str);
+                if (!d2) {
+                    echo.push('Turn 2 Failed');
+                    break;
+                }
+                echo.push(`<b>第二轮（conversation 续接，自动触发工具）：</b><br>${d2str + '<br>' + lText.htmlescape(d2.output_text)}<br><br>`);
+                // --- 第三轮：基于前两轮结果直接推理，无需工具 ---
+                const d3str = '两个城市比较，今天哪个更适合出行？';
+                const d3 = await runTurn(d3str);
+                if (!d3) {
+                    echo.push('Turn 3 Failed');
+                    break;
+                }
+                echo.push(`<b>第三轮（直接推理）：</b><br>${d3str + '<br>' + lText.htmlescape(d3.output_text)}<br>`);
+                // --- 数据库存储格式 ---
+                // --- conversation 顺序：user → function_call → function_call_output → assistant → user → ... ---
+                echo.push(`<hr><b>数据库存储 input：</b><pre>${lText.htmlescape(lText.stringifyJson(conversation, 4))}</pre>`);
+                // --- 从头重建（直接将 dbRecord.input 发送即可） ---
+                echo.push(`<hr><b>从头重建：</b><pre>${lText.htmlescape(`const replay = await ai.response({
+    'model': model,
+    'instructions': instructions,
+    'input': conversation,
+    'tools': tools,
+});`)}</pre>`);
+                break;
+            }
             default: {
                 // --- CHAT ---
                 let model = ai.service === lAi.ESERVICE.ALICN ? 'qwen-plus' : 'doubao-seed-2-0-mini-260215';