@maiyunnet/kebab 3.2.22 → 3.2.24

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.22";
+export declare const VER = "3.2.24";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;
@@ -52,7 +52,7 @@ export interface IConfig {
     's3': Record<string, IConfigS3>;
     'turnstile': IConfigTurnstile;
     'ai': Record<string, IConfigAi>;
-    'vector': Record<string, IConfigVector>;
+    'vector': IConfigVector;
     [key: string]: Record<string, Json>;
 }
 export interface IUrlParse {

package/index.js

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

package/lib/ai.d.ts

@@ -26,7 +26,6 @@ export interface IOptions {
 export declare class Ai {
     /** --- openai 原生对象，建议只读 --- */
     readonly link: openai.OpenAI;
-    private readonly _ctr;
     constructor(ctr: sCtr.Ctr, opt: IOptions);
 }
 /**

package/lib/ai.js

@@ -20,7 +20,6 @@ export var ESERVICE;
 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;

package/lib/kv.d.ts

@@ -301,6 +301,7 @@ export declare class Connection {
      * --- 获取字符串 ---
      * @param key
      * @param etc
+     * @returns 字符串或 null（即使存入时是 number，这个方法也只会返回字符串）
      */
     get(key: string, etc: kebab.IConfigKv): Promise<string | null>;
     /**

package/lib/kv.js

@@ -823,6 +823,7 @@ end`;
      * --- 获取字符串 ---
      * @param key
      * @param etc
+     * @returns 字符串或 null（即使存入时是 number，这个方法也只会返回字符串）
      */
     async get(key, etc) {
         this.refreshLast();

package/lib/net.js

@@ -155,7 +155,7 @@ export async function request(u, data, opt = {}) {
             const res = new lResponse.Response(null);
             res.error = {
                 'name': 'Possible mProxy error',
-                'message': 'host not found'
+                'message': 'host not found',
             };
             return res;
         }
@@ -165,7 +165,7 @@ export async function request(u, data, opt = {}) {
             const res = new lResponse.Response(null);
             res.error = {
                 'name': 'hosts error',
-                'message': 'hosts param error'
+                'message': 'hosts param error',
             };
             return res;
         }
@@ -176,7 +176,7 @@ export async function request(u, data, opt = {}) {
             'url': opt.mproxy ? opt.mproxy.url + (opt.mproxy.url.includes('?') ? '&' : '?') + lText.queryStringify({
                 'url': u,
                 'auth': opt.mproxy.auth,
-                'data': opt.mproxy.data ? lText.stringifyJson(opt.mproxy.data) : '{}'
+                'data': opt.mproxy.data ? lText.stringifyJson(opt.mproxy.data) : '{}',
             }) : u,
             'method': method,
             'data': data,

package/lib/vector.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Project: Kebab, User: JianSuoQiYue
+ * Date: 2025-10-28 15:18:41
+ * Last: 2025-10-28 15:18:44
+ */
+import * as milvus from '@zilliz/milvus2-sdk-node';
+import * as sCtr from '#kebab/sys/ctr.js';
+/** --- 选项 --- */
+export interface IOptions {
+    /** --- 主机地址 --- */
+    'host'?: string;
+    /** --- 端口号 --- */
+    'port'?: number;
+    /** --- 数据库名称 --- */
+    'name'?: string;
+    /** --- 用户名 --- */
+    'user'?: string;
+    /** --- 密码 --- */
+    'pwd'?: string;
+}
+export declare class Vector {
+    /** --- milvus 原生对象，建议只读 --- */
+    readonly link: milvus.MilvusClient;
+    constructor(ctr: sCtr.Ctr, opt?: IOptions);
+    /** --- 搜索 --- */
+    seach(data: {
+        /** --- 表名 --- */
+        'collection': string;
+        /** --- 查询的向量 --- */
+        'data': number[];
+        /** --- 过滤器，如 word_count > 0 --- */
+        'filter'?: string;
+        /** --- 返回的结果数量，默认为 20 --- */
+        'limit'?: number;
+        /** --- 计算两个向量相似度的度量，默认 L2 --- */
+        'metric'?: 'L2' | 'IP' | 'COSINE';
+        /** --- 输出的字段，如 ['book_id', 'word_count']，默认全部 --- */
+        'fields'?: string[];
+    }): Promise<false | milvus.SearchResults<{
+        collection_name: string;
+        data: number[];
+        filter: string | undefined;
+        limit: number;
+        metric_type: "L2" | "IP" | "COSINE";
+        output_fields: string[] | undefined;
+    }>>;
+}
+/**
+ * --- 创建一个 Vector 对象 ---
+ * @param opt 选项
+ */
+export declare function get(ctr: sCtr.Ctr, opt?: IOptions): Vector;

package/lib/vector.js

@@ -0,0 +1,59 @@
+/**
+ * Project: Kebab, User: JianSuoQiYue
+ * Date: 2025-10-28 15:18:41
+ * Last: 2025-10-28 15:18:44
+ */
+import * as milvus from '@zilliz/milvus2-sdk-node';
+/** --- milvus 的连接对象 --- */
+const links = [];
+export class Vector {
+    constructor(ctr, opt) {
+        const config = ctr.getPrototype('_config');
+        const host = opt?.host ?? config.vector?.host ?? '127.0.0.1';
+        const port = opt?.port ?? config.vector?.port ?? 19530;
+        const name = opt?.name ?? config.vector?.name ?? 'default';
+        const user = opt?.user ?? config.vector?.user ?? 'root';
+        const pwd = opt?.pwd ?? config.vector?.pwd ?? 'Milvue';
+        const token = `${host}-${port}-${name}-${user}`;
+        const link = links.find((item) => item.token === token);
+        if (link) {
+            this.link = link.link;
+            return;
+        }
+        this.link = new milvus.MilvusClient({
+            'address': `${host}:${port}`,
+            'ssl': false,
+            'database': name,
+            'username': user,
+            'password': pwd,
+        });
+        links.push({
+            'token': token,
+            'link': this.link,
+        });
+    }
+    /** --- 搜索 --- */
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    async seach(data) {
+        try {
+            return await this.link.search({
+                'collection_name': data.collection,
+                'data': data.data,
+                'filter': data.filter,
+                'limit': data.limit ?? 20,
+                'metric_type': data.metric ?? 'L2',
+                'output_fields': data.fields,
+            });
+        }
+        catch {
+            return false;
+        }
+    }
+}
+/**
+ * --- 创建一个 Vector 对象 ---
+ * @param opt 选项
+ */
+export function get(ctr, opt) {
+    return new Vector(ctr, opt);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.22",
+  "version": "3.2.24",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -26,6 +26,7 @@
     "@litert/redis": "^3.0.5",
     "@litert/websocket": "^0.2.7",
     "@types/ssh2": "^1.15.5",
+    "@zilliz/milvus2-sdk-node": "^2.6.2",
     "ejs": "^3.1.10",
     "jszip": "^3.10.1",
     "mysql2": "^3.15.3",

package/sys/child.js

@@ -90,7 +90,7 @@ async function run() {
         const host = (req.headers[':authority'] ?? req.headers['host'] ?? '');
         if (!host) {
             lCore.writeHead(res, 403);
-            res.end();
+            res.end('403 Forbidden');
             return;
         }
         const key = host + req.url;
@@ -141,6 +141,7 @@ async function run() {
     httpServer = http.createServer(function (req, res) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
+            res.setHeader('x-kebab-error', '0');
             lCore.writeHead(res, 403);
             res.end();
             return;
@@ -233,6 +234,7 @@ async function requestHandler(req, res, https) {
     /** --- 当前的 vhost 配置文件 --- */
     const vhost = await getVhostByHostname(uri.hostname ?? '');
     if (!vhost) {
+        res.setHeader('x-kebab-error', '1');
         lCore.writeHead(res, 403);
         res.end();
         return;
@@ -553,7 +555,7 @@ process.on('message', function (msg) {
                     for (const key in linkCount) {
                         str.push(key + ':' + linkCount[key].toString());
                     }
-                    lCore.display(`[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`);
+                    lCore.debug(`[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`);
                     lCore.log({}, `[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`, '-warning');
                     await lCore.sleep(30_000);
                     waiting += 30_000;

package/sys/mod.d.ts

@@ -342,6 +342,10 @@ export default class Mod {
      * --- 根据当前条件，筛选出当前条目该有的数据条数 ---
      */
     count(): Promise<number>;
+    /**
+     * --- 获取当前条件下的 count 的 SQL 语句 ---
+     */
+    countSql(): string;
     /**
      * @param f 表名
      * @param s ON 信息

package/sys/mod.js

@@ -1184,7 +1184,7 @@ class Mod {
      * --- 根据当前条件，筛选出当前条目该有的数据条数 ---
      */
     async count() {
-        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(*) AS `count` FROM');
+        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(0) AS `count` FROM');
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
             lCore.log(this._ctr ?? {}, '[count, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
@@ -1196,6 +1196,13 @@ class Mod {
         }
         return count;
     }
+    /**
+     * --- 获取当前条件下的 count 的 SQL 语句 ---
+     */
+    countSql() {
+        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(0) AS `count` FROM');
+        return this._sql.format(sql, this._sql.getData());
+    }
     /**
      * @param f 表名
      * @param s ON 信息

package/sys/route.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
  */
 import * as http from 'http';
 import * as http2 from 'http2';

package/sys/route.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
  */
 import * as http from 'http';
 import * as stream from 'stream';
@@ -12,7 +12,6 @@ import * as lFs from '#kebab/lib/fs.js';
 import * as lZlib from '#kebab/lib/zlib.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
-import * as lTime from '#kebab/lib/time.js';
 import * as lResponse from '#kebab/lib/net/response.js';
 import * as lWs from '#kebab/lib/ws.js';
 import * as lLang from '#kebab/lib/lang.js';
@@ -567,7 +566,7 @@ export async function run(data) {
     }
     // --- 设置缓存 ---
     if (!data.res.headersSent && (cacheTTL > 0)) {
-        data.res.setHeader('expires', lTime.format(0, 'D, d M Y H:i:s', Date.now() + cacheTTL * 1000) + ' GMT');
+        data.res.setHeader('expires', new Date(Date.now() + cacheTTL * 1_000).toUTCString());
         data.res.setHeader('cache-control', 'max-age=' + cacheTTL.toString());
     }
     // --- 设置自定义 hcode ---

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

@@ -49,6 +49,7 @@ export default class extends sCtr.Ctr {
     crypto(): Promise<string>;
     db(): Promise<kebab.Json>;
     private _dbTable;
+    vector(): Promise<any>;
     kv(): Promise<kebab.Json>;
     net(): Promise<string>;
     netPipe(): Promise<kebab.Json>;
@@ -72,6 +73,7 @@ export default class extends sCtr.Ctr {
     netHosts(): Promise<string>;
     netMproxy(): Promise<string | boolean>;
     netMproxy1(): Promise<string | boolean>;
+    netMproxy2(): any[];
     netFilterheaders(): string;
     scan(): Promise<kebab.Json>;
     scan1(): Promise<kebab.Json>;

package/www/example/ctr/test.js

@@ -3,6 +3,7 @@ import * as kebab from '#kebab/index.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lNet from '#kebab/lib/net.js';
 import * as lDb from '#kebab/lib/db.js';
+import * as lVector from '#kebab/lib/vector.js';
 import * as lFs from '#kebab/lib/fs.js';
 import * as lText from '#kebab/lib/text.js';
 import * as lCrypto from '#kebab/lib/crypto.js';
@@ -144,6 +145,8 @@ export default class extends sCtr.Ctr {
             `<br><br><a href="${this._config.const.urlBase}test/crypto">View "test/crypto"</a>`,
             '<br><br><b>Db:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/db">View "test/db"</a>`,
+            `<br><br><b>Vector:</b>`,
+            `<br><br><a href="${this._config.const.urlBase}test/vector">View "test/vector"</a>`,
             '<br><br><b>Kv:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/kv">View "test/kv"</a>`,
             '<br><br><b>Net:</b>',
@@ -1337,6 +1340,20 @@ exec: ${JSON.stringify(exec)}<br><br>`);
         }
         echo.push('</table>');
     }
+    async vector() {
+        const vector = lVector.get(this);
+        const res = await vector.seach({
+            'collection': 'oas_wiki',
+            'metric': 'COSINE',
+            'data': [0.4100031323819555, 0.7188991736586672, 0.32890290245747833, 0.9187961849628559, 0.023142186415922916, 0.45239563148580797, 0.23537591588175988, 0.6848990771759962, 0.9865744633216178, 0.8239142304110896, 0.997768380245414, 0.3012929412655765, 0.13731236076734943, 0.5126131685642945, 0.9806290097015617, 0.1870468071764284, 0.17178642706602143, 0.4016660911946244, 0.15484433366942607, 0.29719222215610386, 0.3103748731148619, 0.6892950176658315, 0.01785695346759608, 0.08539564964986557, 0.2655959514380064, 0.9964617086704073, 0.2838371937684081, 0.14987010598298633, 0.6228479079557896, 0.8080833516756243, 0.15438562173495285, 0.5078008662168574, 0.27262149922940804, 0.23104911473240675, 0.6266656488428926, 0.8553958245035254, 0.11699454830789868, 0.2300336351244865, 0.3042943975707315, 0.20182231286864427, 0.14334825938359863, 0.5272057735967806, 0.6568390179350452, 0.11388912236667226, 0.4916225414998463, 0.4913046496135085, 0.6301252401085475, 0.26051075673874036, 0.17023441587522825, 0.371755148312803, 0.5831318953846139, 0.9756820442368113, 0.6818893859710211, 0.5188330204766185, 0.7868335112863099, 0.7263293211859105, 0.15777067513918275, 0.25071428052177835, 0.9055952502390328, 0.39066574162485046, 0.6694768856781026, 0.904527206408617, 0.5359679189729842, 0.42923033393177423, 0.6959492373261136, 0.4721197667950616, 0.6861043448179791, 0.05188999799541438, 0.7346607591003518, 0.1574483630625012, 0.9141756884547747, 0.9116789303557802, 0.7609450526832306, 0.7763073356227885, 0.7334996162535046, 0.8036447394427264, 0.21291521237560262, 0.4628513517221038, 0.005054981316060525, 0.6289756103407573, 0.9376033918403373, 0.79713161153396, 0.1795021378890418, 0.32421299215073773, 0.5585715705291334, 0.1964507020528392, 0.9170965358836494, 0.44199069294404825, 0.46924875851341463, 0.005915168915280544, 0.4519648598811945, 0.7817208441823769, 0.39630447274483926, 0.874803477246406, 0.02593537985516514, 0.03494415508402371, 0.6948556600612117, 0.02531235612016558, 0.3252859275909026, 0.6124602304575255, 0.6662991517754546, 0.054786469959723805, 0.09541281916656552, 0.047971618444194286, 0.9888851535738363, 0.09923862294731634, 0.37389883211204245, 0.0510449762242422, 0.5140187522339308, 0.9165108670272317, 0.473682888066292, 0.7553395418192084, 0.48450479101753663, 0.22080081972551513, 0.8461012374988566, 0.32711442729081885, 0.46740436391036244, 0.9330234279632854, 0.7456194346850014, 0.8575560505025164, 0.2617623984893922, 0.6418053194775086, 0.607749877895083, 0.2176063100000032, 0.5366633111896186, 0.9689538808794083, 0.8226310778269623, 0.4813948057818185]
+        });
+        const echo = [`<pre>const res = await vector.seach({
+    'collection': 'oas_wiki',
+    'metric': 'COSINE',
+    'data': [0.4100031323819555, 0.7188991736586672, 0.32890290245747833, ...]
+});</pre>res:<pre>${JSON.stringify(res, null, 4)}</pre>`];
+        return echo.join('') + '<br>' + this._getEnd();
+    }
     async kv() {
         const kv = lKv.get(this);
         if (!await kv.ping()) {
@@ -1802,14 +1819,16 @@ error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
     }
     async netMproxy() {
         const echo = [];
-        const res = await lNet.get('https://cdn.jsdelivr.net/npm/deskrt@2.0.10/package.json', {
+        const res = await lNet.postJson(this._internalUrl + 'test/net-mproxy2', {
+            'abc': 'ok',
+        }, {
             'mproxy': {
                 'url': this._internalUrl + 'test/net-mproxy1',
                 'auth': '123456',
                 'data': { 'test': '123' },
             }
         });
-        echo.push(`<pre>lNet.get('https://cdn.jsdelivr.net/npm/deskrt@2.0.10/package.json', {
+        echo.push(`<pre>lNet.get('${this._internalUrl}test/net-mproxy2', {
     'mproxy': {
         'url': '${this._internalUrl}test/net-mproxy1',
         'auth': '123456',
@@ -1830,6 +1849,11 @@ error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         }
         return 'Nothing(' + rtn + ')';
     }
+    netMproxy2() {
+        return [1, {
+                'data': this._post,
+            }];
+    }
     netFilterheaders() {
         const echo = [];
         const headers = {