@maiyunnet/kebab 4.1.0 → 5.0.1

package/lib/time.d.ts

@@ -70,6 +70,6 @@ export declare function isMs(time: number): boolean;
  * --- 将时间对象转换为时间字符串 ---
  * @param zone 时区小时或 ctr 对象，如 8，设置 null 则以系统时区为准
  * @param f 转换格式
- * @param date 时间对象或秒/毫秒级数字，如果是秒请乘以 1000
+ * @param date 时间对象秒/毫秒级数字均可
  */
 export declare function format(zone: number | sCtr.Ctr | null, f: string, date?: Date | number): string;

package/lib/time.js

@@ -132,7 +132,7 @@ export function isMs(time) {
  * --- 将时间对象转换为时间字符串 ---
  * @param zone 时区小时或 ctr 对象，如 8，设置 null 则以系统时区为准
  * @param f 转换格式
- * @param date 时间对象或秒/毫秒级数字，如果是秒请乘以 1000
+ * @param date 时间对象秒/毫秒级数字均可
  */
 export function format(zone, f, date) {
     const over = [];

package/lib/turnstile.js

@@ -62,7 +62,7 @@ export async function verify(ctr, opt) {
                 'Ticket': opt.token.slice(0, io),
                 'UserIp': opt.ip,
                 'Randstr': opt.token.slice(io + 1),
-                'CaptchaAppId': parseInt(config.turnstile['TENCENT'].aid), // --- 防止后期又不是 number 了还要改config，这样只需要更新代码无损升级 ---
+                'CaptchaAppId': parseInt(config.turnstile['TENCENT'].aid), // --- 防止后期又不是 number 了还要改 config，这样只需要更新代码无损升级 ---
                 'AppSecretKey': config.turnstile['TENCENT'].akey,
             });
             return res.CaptchaCode === 1;

package/lib/vector.d.ts

@@ -4,6 +4,7 @@
  * Last: 2025-10-28 15:18:44
  */
 import * as milvus from '@zilliz/milvus2-sdk-node';
+import * as kebab from '#kebab/index.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 /** --- 选项 --- */
 export interface IOptions {
@@ -19,9 +20,9 @@ export interface IOptions {
     'pwd'?: string;
 }
 export declare class Vector {
-    /** --- milvus 原生对象，建议只读 --- */
-    readonly link: milvus.MilvusClient;
-    constructor(ctr: sCtr.Ctr, opt?: IOptions);
+    /** --- 当前的 vector 连接信息 --- */
+    private readonly _etc;
+    constructor(etc: kebab.IConfigVector);
     /** --- 搜索 --- */
     seach(data: {
         /** --- 表名 --- */
@@ -44,9 +45,13 @@ export declare class Vector {
         metric_type: "L2" | "IP" | "COSINE";
         output_fields: string[] | undefined;
     }>>;
+    /**
+     * --- 从连接池中获取一个符合要求的连接 ---
+     */
+    private _getConnection;
 }
 /**
  * --- 创建一个 Vector 对象 ---
  * @param opt 选项
  */
-export declare function get(ctr: sCtr.Ctr, opt?: IOptions): Vector;
+export declare function get(ctrEtc: sCtr.Ctr | kebab.IConfigVector): Vector;

package/lib/vector.js

@@ -4,39 +4,23 @@
  * Last: 2025-10-28 15:18:44
  */
 import * as milvus from '@zilliz/milvus2-sdk-node';
+import * as lCore from '#kebab/lib/core.js';
+import * as sCtr from '#kebab/sys/ctr.js';
 /** --- 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,
-        });
+    constructor(etc) {
+        this._etc = etc;
     }
     /** --- 搜索 --- */
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
     async seach(data) {
+        const link = await this._getConnection();
+        if (!link) {
+            return false;
+        }
         try {
-            return await this.link.search({
+            const res = await link.search({
                 'collection_name': data.collection,
                 'data': data.data,
                 'filter': data.filter,
@@ -44,16 +28,51 @@ export class Vector {
                 'metric_type': data.metric ?? 'L2',
                 'output_fields': data.fields,
             });
+            return res;
         }
         catch {
             return false;
         }
     }
+    /**
+     * --- 从连接池中获取一个符合要求的连接 ---
+     */
+    async _getConnection() {
+        const token = `${this._etc.host}-${this._etc.port}-${this._etc.name}-${this._etc.user}`;
+        const item = links.find(item => item.token === token);
+        if (item) {
+            return item.link;
+        }
+        // --- 没有找到合适的连接，创建一个 ---
+        try {
+            const link = new milvus.MilvusClient({
+                'address': `${this._etc.host}:${this._etc.port}`,
+                'ssl': false,
+                'database': this._etc.name,
+                'username': this._etc.user,
+                'password': this._etc.pwd,
+            });
+            await link.connectPromise;
+            links.push({
+                'token': token,
+                link,
+            });
+            return link;
+        }
+        catch (e) {
+            lCore.debug('[VECTOR][_getConnection]', e.code, e.message);
+            return null;
+        }
+    }
 }
 /**
  * --- 创建一个 Vector 对象 ---
  * @param opt 选项
  */
-export function get(ctr, opt) {
-    return new Vector(ctr, opt);
+export function get(ctrEtc) {
+    if (ctrEtc instanceof sCtr.Ctr) {
+        const config = ctrEtc.getPrototype('_config');
+        return new Vector(config.vector);
+    }
+    return new Vector(ctrEtc);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "4.1.0",
+  "version": "5.0.1",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -19,8 +19,8 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.925.0",
-    "@aws-sdk/lib-storage": "^3.925.0",
+    "@aws-sdk/client-s3": "^3.927.0",
+    "@aws-sdk/lib-storage": "^3.927.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
@@ -32,15 +32,16 @@
     "mysql2": "^3.15.3",
     "node-cron": "^4.2.1",
     "openai": "^6.8.1",
+    "pg": "^8.16.3",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.138"
+    "tencentcloud-sdk-nodejs": "^4.1.140"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
     "@types/node": "^24.10.0",
-    "tsc-alias": "^1.8.16",
+    "@types/pg": "^8.15.6",
     "typescript": "^5.9.3"
   }
 }

package/sys/cmd.js

@@ -86,12 +86,35 @@ async function run() {
         config.set.staticPath ??= '';
         // --- config - db ---
         config.db ??= {};
-        config.db.host ??= '127.0.0.1';
-        config.db.port ??= 3306;
-        config.db.charset ??= 'utf8mb4';
-        config.db.name ??= 'maiyun';
-        config.db.user ??= 'root';
-        config.db.pwd ??= 'DashAdmin';
+        config.db.default ??= 'PGSQL';
+        config.db['MYSQL'] ??= {};
+        config.db['MYSQL'].default ??= {};
+        config.db['MYSQL'].default.host ??= '127.0.0.1';
+        config.db['MYSQL'].default.port ??= 3306;
+        config.db['MYSQL'].default.charset ??= 'utf8mb4';
+        config.db['MYSQL'].default.name ??= 'maiyun';
+        config.db['MYSQL'].default.user ??= 'root';
+        config.db['MYSQL'].default.pwd ??= 'DashAdmin';
+        config.db['MYSQL'].read ??= {};
+        config.db['MYSQL'].read.host ??= '127.0.0.1';
+        config.db['MYSQL'].read.port ??= 3306;
+        config.db['MYSQL'].read.charset ??= 'utf8mb4';
+        config.db['MYSQL'].read.name ??= 'maiyun';
+        config.db['MYSQL'].read.user ??= 'root';
+        config.db['MYSQL'].read.pwd ??= 'DashAdmin';
+        config.db['PGSQL'] ??= {};
+        config.db['PGSQL'].default ??= {};
+        config.db['PGSQL'].default.host ??= '127.0.0.1';
+        config.db['PGSQL'].default.port ??= 5432;
+        config.db['PGSQL'].default.name ??= 'maiyun';
+        config.db['PGSQL'].default.user ??= 'root';
+        config.db['PGSQL'].default.pwd ??= 'DashAdmin';
+        config.db['PGSQL'].read ??= {};
+        config.db['PGSQL'].read.host ??= '127.0.0.1';
+        config.db['PGSQL'].read.port ??= 5432;
+        config.db['PGSQL'].read.name ??= 'maiyun';
+        config.db['PGSQL'].read.user ??= 'root';
+        config.db['PGSQL'].read.pwd ??= 'DashAdmin';
         // --- config - jwt ---
         config.jwt ??= {};
         config.jwt.name ??= 'KE_JWT';

package/sys/mod.d.ts

@@ -40,8 +40,6 @@ export default class Mod {
     protected static _$key: string;
     /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
     protected static _$index: string;
-    /** ---- 可开启软删软更新软新增 --- */
-    protected static _$soft: boolean;
     /** --- 要 update 的内容 --- */
     protected _updates: Record<string, boolean>;
     /** --- 模型获取的属性 --- */
@@ -101,25 +99,15 @@ export default class Mod {
     }): Promise<boolean | null | false>;
     /**
      * --- 获取添加一个序列的模拟 SQL ---
+     * @param db 数据库对象
      * @param cs 字段列表
      * @param vs 数据列表
      * @param opt 选项
      */
-    static insertSql(cs: string[] | Record<string, any>, vs?: any[] | any[][], opt?: {
+    static insertSql(db: lDb.Pool | lDb.Transaction, cs: string[] | Record<string, any>, vs?: any[] | any[][], opt?: {
         'pre'?: sCtr.Ctr | string;
         'index'?: string;
     }): string;
-    /**
-     * --- 插入数据如果唯一键冲突则更新 ---
-     * @param db 数据库对象
-     * @param data 要插入的数据
-     * @param update 要更新的数据
-     * @param opt 选项
-     */
-    static insertDuplicate(db: lDb.Pool | lDb.Transaction, data: Record<string, any>, update: kebab.Json, opt?: {
-        'pre'?: sCtr.Ctr | string;
-        'index'?: string;
-    }): Promise<boolean | null>;
     /**
      * --- 根据条件移除条目 ---
      * @param db 数据库对象
@@ -162,11 +150,12 @@ export default class Mod {
     }): Promise<number | false | null>;
     /**
      * --- 根据条件更新数据（仅获取 SQL 对象） ---
+     * @param db 数据库对象
      * @param data 要更新的数据
      * @param where 筛选条件
      * @param opt 选项
      */
-    static updateByWhereSql(data: kebab.Json, where: string | kebab.Json, opt?: {
+    static updateByWhereSql(db: lDb.Pool | lDb.Transaction, data: kebab.Json, where: string | kebab.Json, opt?: {
         'raw'?: boolean;
         'pre'?: sCtr.Ctr | string;
         'index'?: string;
@@ -289,14 +278,8 @@ export default class Mod {
     get(n: string): any;
     /**
      * --- 创建数据 ---
-     * @param notWhere 若要不存在才成功，则要传入限定条件
-     * @param table 可对限定条件传入适当的表
-     */
-    create(notWhere?: string | kebab.Json, table?: string): Promise<boolean>;
-    /**
-     * --- 唯一键冲突则替换，不冲突则创建数据 ---
      */
-    replace(): Promise<boolean>;
+    create(): Promise<boolean>;
     /**
      * --- 刷新当前模型获取最新数据 ---
      * @param lock 是否加锁
@@ -308,9 +291,8 @@ export default class Mod {
     save(): Promise<boolean>;
     /**
      * --- 移除本条目 ---
-     * @param raw 是否真实移除
      */
-    remove(raw?: boolean): Promise<boolean>;
+    remove(): Promise<boolean>;
     first(lock: boolean, array: true): Promise<false | null | Record<string, any>>;
     first(lock?: boolean, array?: false): Promise<false | null | (this & Record<string, any>)>;
     /**
@@ -401,13 +383,13 @@ export default class Mod {
      * @param s 筛选条件数组或字符串
      * @param raw 是否包含已被软删除的数据
      */
-    filter(s: kebab.Json, raw?: boolean): this;
+    filter(s: kebab.Json): this;
     /**
      * --- 是 filter 的别名 ---
      * @param s 筛选条件数组或字符串
      * @param raw 是否包含已被软删除的数据
      */
-    where(s: kebab.Json, raw?: boolean): this;
+    where(s: kebab.Json): this;
     /**
      * --- ORDER BY ---
      * @param c 字段字符串或数组