@maiyunnet/kebab 4.0.1 → 4.0.2

package/index.d.ts

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

package/index.js

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

package/lib/kv.d.ts

@@ -4,19 +4,12 @@
  * Last: 2020-3-28 18:54:04, 2022-09-12 23:24:45, 2022-09-22 01:06:22, 2024-2-21 13:32:56, 2024-8-21 16:59:57, 2025-11-6 14:56:45
  */
 import * as redis from '@litert/redis';
+import * as kebab from '#kebab/index.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 export declare class Kv {
-    /** --- pre --- */
-    private readonly _pre;
-    /** --- 当前连接的 db index --- */
-    private readonly _index;
-    /** --- kv 连接对象 --- */
-    private readonly _link;
-    /** --- 获取之时是新 redis 链接还是老链接 --- */
-    private readonly _new;
-    constructor(ctr: sCtr.Ctr, etc?: IOptions);
-    /** --- 初始化连接 --- */
-    init(ctr: sCtr.Ctr, etc?: IOptions): Promise<boolean>;
+    /** --- 当前的 kv 连接信息 --- */
+    private readonly _etc;
+    constructor(etc: kebab.IConfigKv);
     /**
      * --- 设定一个值 ---
      * @param key
@@ -77,12 +70,10 @@ export declare class Kv {
      * --- 批量获取值 ---
      * @param keys key 序列
      */
-    mGet(keys: string[]): Promise<Record<string, string | null>>;
+    mGet(keys: string[]): Promise<Record<string, string | null> | false>;
     /**
      * --- 批量设置哈希值 ---
-     * @param key key 名
      * @param rows key / val 数组
-     * @param etc
      */
     mSet(rows: Record<string, string | Buffer>): Promise<boolean>;
     /**
@@ -153,30 +144,30 @@ export declare class Kv {
      * @param key
      * @param field
      */
-    hGet(key: string, field: string): Promise<string | null>;
+    hGet(key: string, field: string): Promise<string | false | null>;
     /**
      * --- 获取哈希 json 对象 ---
      * @param key
      * @param field
      */
-    hGetJson(key: string, field: string): Promise<any | null>;
+    hGetJson(key: string, field: string): Promise<any | false | null>;
     /**
      * --- 批量获取哈希值 ---
      * @param key
      * @param fields
      */
-    hMGet(key: string, fields: string[]): Promise<Record<string, string | null>>;
+    hMGet(key: string, fields: string[]): Promise<Record<string, string | null> | false>;
     /**
      * --- 批量获取哈希键值对 ---
      * @param key
      */
-    hGetAll(key: string): Promise<Record<string, string | null> | null>;
+    hGetAll(key: string): Promise<Record<string, string | null> | false>;
     /**
      * --- 删除哈希键 ---
      * @param key
      * @param fields 值序列
      */
-    hDel(key: string, fields: string | string[]): Promise<number>;
+    hDel(key: string, fields: string | string[]): Promise<number | false>;
     /**
      * --- 判断哈希字段是否存在 ---
      * @param key
@@ -189,39 +180,34 @@ export declare class Kv {
      * @param field 字段
      * @param increment 正数或负数，整数或浮点
      */
-    hIncr(key: string, field: string, increment: number): Promise<number>;
+    hIncr(key: string, field: string, increment: number): Promise<number | false>;
     /**
      * --- 获取哈希所有字段 ---
      * @param key
      */
-    hKeys(key: string): Promise<string[]>;
-    lPush(key: string, values: Array<string | Buffer>): Promise<number>;
-    rPush(key: string, values: Array<string | Buffer>): Promise<number>;
-    bLMove(sourceKey: string, destKey: string, soo: 'LEFT' | 'RIGHT', deo: 'LEFT' | 'RIGHT', timeout: number): Promise<string | null>;
-    lPop(key: string): Promise<string | null>;
-    rPop(key: string): Promise<string | null>;
-    bRPop(key: string | string[], timeout: number): Promise<Record<string, string>>;
-    lRange(key: string, start: number, stop: number): Promise<string[]>;
-    lLen(key: string): Promise<number>;
+    hKeys(key: string): Promise<string[] | false>;
+    lPush(key: string, values: Array<string | Buffer>): Promise<number | false>;
+    rPush(key: string, values: Array<string | Buffer>): Promise<number | false>;
+    bLMove(sourceKey: string, destKey: string, soo: 'LEFT' | 'RIGHT', deo: 'LEFT' | 'RIGHT', timeout: number): Promise<string | null | false>;
+    lPop(key: string): Promise<string | null | false>;
+    rPop(key: string): Promise<string | null | false>;
+    bRPop(key: string | string[], timeout: number): Promise<Record<string, string> | false>;
+    lRange(key: string, start: number, stop: number): Promise<string[] | false>;
+    lLen(key: string): Promise<number | false>;
+    /**
+     * --- 从连接池中获取一个符合要求的连接 ---
+     */
+    private _getConnection;
 }
 /**
  * --- 获取 Kv 对象 ---
  * @param etc 配置信息可留空
  */
-export declare function get(ctr: sCtr.Ctr, etc?: IOptions): Promise<Kv | false>;
+export declare function get(ctrEtc: sCtr.Ctr | kebab.IConfigKv): Kv;
 /** --- 连接信息 --- */
 export interface IConnectionInfo {
     'host': string;
     'port': number;
     'index': number;
-    'link': redis.ICommandClient;
-}
-/** --- 选项 --- */
-export interface IOptions {
-    'host'?: string;
-    'port'?: number;
-    'index'?: number;
-    'pre'?: string;
-    'user'?: string;
-    'pwd'?: string;
+    'conn': redis.ICommandClient;
 }

package/lib/kv.js

@@ -5,68 +5,14 @@
  */
 // --- 第三方 ---
 import * as redis from '@litert/redis';
-// --- 库和定义 ---
 import * as lText from '#kebab/lib/text.js';
 import * as lCore from '#kebab/lib/core.js';
+import * as sCtr from '#kebab/sys/ctr.js';
 /** --- 连接列表（同一个 host、port、index 只有一个连接） --- */
 const connections = [];
 export class Kv {
-    constructor(ctr, etc) {
-        const configKv = ctr.getPrototype('_config').kv;
-        const host = etc?.host ?? configKv.host;
-        const port = etc?.port ?? configKv.port;
-        this._index = etc?.index ?? configKv.index;
-        this._pre = etc?.pre ?? configKv.pre;
-        const item = connections.find(item => (item.host === host) && (item.port === port) && (item.index === this._index));
-        if (item) {
-            this._new = false;
-            this._link = item.link;
-            return;
-        }
-        this._new = true;
-        this._link = redis.createCommandClient({
-            'host': host,
-            'port': port,
-        });
-        this._link.on('error', err => {
-            lCore.debug('[KV][constructor][error]', err);
-        }).on('end', () => {
-            // --- 连接断开，不过没关系，执行命令时会自动重连 ---
-        }).on('close', () => {
-            // --- 连接断开，不过没关系，执行命令时会自动重连 ---
-        });
-        connections.push({
-            'host': host,
-            'port': port,
-            'index': this._index,
-            'link': this._link,
-        });
-    }
-    /** --- 初始化连接 --- */
-    async init(ctr, etc) {
-        try {
-            if (!this._new) {
-                // --- 不是新连接，不需要初始化 ---
-                return true;
-            }
-            const configKv = ctr.getPrototype('_config').kv;
-            const user = etc?.user ?? configKv.user;
-            const pwd = etc?.pwd ?? configKv.pwd;
-            if (pwd) {
-                await this._link.auth(pwd, user || undefined);
-            }
-            await this._link.select(this._index);
-            return true;
-        }
-        catch (e) {
-            // --- 初始化失败，移除 ---
-            lCore.debug('[KV][init][error]', e);
-            const item = connections.findIndex(item => item.link === this._link);
-            if (item !== -1) {
-                connections.splice(item, 1);
-            }
-            return false;
-        }
+    constructor(etc) {
+        this._etc = etc;
     }
     /**
      * --- 设定一个值 ---
@@ -76,19 +22,23 @@ export class Kv {
      * @param mod 设置模式: 空,nx（key不存在才建立）,xx（key存在才修改）
      */
     async set(key, val, ttl = 0, mod = '') {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         if (typeof val !== 'string') {
             val = lText.stringifyJson(val);
         }
         try {
             switch (mod) {
                 case '': {
-                    return await this._link.set(this._pre + key, val, ttl === 0 ? undefined : ttl);
+                    return await conn.set(this._etc.pre + key, val, ttl === 0 ? undefined : ttl);
                 }
                 case 'nx': {
-                    return await this._link.setNX(this._pre + key, val, ttl === 0 ? undefined : ttl);
+                    return await conn.setNX(this._etc.pre + key, val, ttl === 0 ? undefined : ttl);
                 }
                 case 'xx': {
-                    return await this._link.replace(this._pre + key, val, ttl === 0 ? undefined : ttl);
+                    return await conn.replace(this._etc.pre + key, val, ttl === 0 ? undefined : ttl);
                 }
             }
         }
@@ -121,8 +71,12 @@ export class Kv {
      * @param val
      */
     async append(key, val) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.append(this._pre + key, val) > 0 ? true : false;
+            return await conn.append(this._etc.pre + key, val) > 0 ? true : false;
         }
         catch {
             return false;
@@ -134,6 +88,10 @@ export class Kv {
      * @param val
      */
     async prepend(key, val) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             const script = `local val = redis.call('GET', KEYS[1])
 if (val == false) then
@@ -145,11 +103,11 @@ if (r) then
 else
     return 0
 end`;
-            let r = await this._link.evalSHA('ea360f3f6508a243824ecda6be15db56df217873', [this._pre + key], [val]);
+            let r = await conn.evalSHA('ea360f3f6508a243824ecda6be15db56df217873', [this._etc.pre + key], [val]);
             r = parseInt(r);
             if (r <= 0) {
-                await this._link.scriptLoad(script);
-                r = await this._link.evalSHA('ea360f3f6508a243824ecda6be15db56df217873', [this._pre + key], [val]);
+                await conn.scriptLoad(script);
+                r = await conn.evalSHA('ea360f3f6508a243824ecda6be15db56df217873', [this._etc.pre + key], [val]);
                 r = parseInt(r);
             }
             return r > 0 ? true : false;
@@ -163,14 +121,18 @@ end`;
      * @param keys 单个或序列
      */
     async exists(keys) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return 0;
+        }
         try {
             if (typeof keys === 'string') {
                 keys = [keys];
             }
             for (let k = 0; k < keys.length; ++k) {
-                keys[k] = this._pre + keys[k];
+                keys[k] = this._etc.pre + keys[k];
             }
-            return await this._link.mExists(keys);
+            return await conn.mExists(keys);
         }
         catch {
             return 0;
@@ -182,8 +144,12 @@ end`;
      * @returns 字符串 / false / null（即使存入时是 number，这个方法也只会返回字符串）
      */
     async get(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return null;
+        }
         try {
-            return await this._link.get(this._pre + key);
+            return await conn.get(this._etc.pre + key);
         }
         catch {
             return false;
@@ -194,8 +160,12 @@ end`;
      * @param key
      */
     async ttl(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return null;
+        }
         try {
-            return await this._link.ttl(this._pre + key);
+            return await conn.ttl(this._etc.pre + key);
         }
         catch {
             return null;
@@ -206,8 +176,12 @@ end`;
      * @param key
      */
     async pttl(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return null;
+        }
         try {
-            return await this._link.pTTL(this._pre + key);
+            return await conn.pTTL(this._etc.pre + key);
         }
         catch {
             return null;
@@ -218,13 +192,17 @@ end`;
      * @param keys key 序列
      */
     async mGet(keys) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         for (let k = 0; k < keys.length; ++k) {
-            keys[k] = this._pre + keys[k];
+            keys[k] = this._etc.pre + keys[k];
         }
         const rtn = {};
         try {
-            const pl = this._pre.length;
-            const r = await this._link.mGet(keys);
+            const pl = this._etc.pre.length;
+            const r = await conn.mGet(keys);
             if (pl === 0) {
                 return r;
             }
@@ -233,25 +211,25 @@ end`;
             }
         }
         catch {
-            for (const key of keys) {
-                rtn[key] = null;
-            }
+            return false;
         }
         return rtn;
     }
     /**
      * --- 批量设置哈希值 ---
-     * @param key key 名
      * @param rows key / val 数组
-     * @param etc
      */
     async mSet(rows) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             const rtn = {};
             for (const key in rows) {
-                rtn[this._pre + key] = rows[key];
+                rtn[this._etc.pre + key] = rows[key];
             }
-            await this._link.mSet(rtn);
+            await conn.mSet(rtn);
             return true;
         }
         catch {
@@ -275,14 +253,18 @@ end`;
      * @param keys
      */
     async del(keys) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         if (typeof keys === 'string') {
             keys = [keys];
         }
         for (let k = 0; k < keys.length; ++k) {
-            keys[k] = this._pre + keys[k];
+            keys[k] = this._etc.pre + keys[k];
         }
         try {
-            return await this._link.del(keys) > 0 ? true : false;
+            return await conn.del(keys) > 0 ? true : false;
         }
         catch {
             return false;
@@ -294,17 +276,21 @@ end`;
      * @param num 整数或浮点正数
      */
     async incr(key, num = 1) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             if (Number.isInteger(num)) {
                 if (num === 1) {
-                    return await this._link.incr(this._pre + key);
+                    return await conn.incr(this._etc.pre + key);
                 }
                 else {
-                    return await this._link.incr(this._pre + key, num);
+                    return await conn.incr(this._etc.pre + key, num);
                 }
             }
             else {
-                return await this._link.incrByFloat(this._pre + key, num);
+                return await conn.incrByFloat(this._etc.pre + key, num);
             }
         }
         catch {
@@ -317,17 +303,21 @@ end`;
      * @param num 整数或浮点正数
      */
     async decr(key, num = 1) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             if (Number.isInteger(num)) {
                 if (num === 1) {
-                    return await this._link.decr(this._pre + key);
+                    return await conn.decr(this._etc.pre + key);
                 }
                 else {
-                    return await this._link.decr(this._pre + key, num);
+                    return await conn.decr(this._etc.pre + key, num);
                 }
             }
             else {
-                return await this._link.incrByFloat(this._pre + key, -num);
+                return await conn.incrByFloat(this._etc.pre + key, -num);
             }
         }
         catch {
@@ -340,8 +330,12 @@ end`;
      * @param ttl
      */
     async expire(key, ttl) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.expire(this._pre + key, ttl);
+            return await conn.expire(this._etc.pre + key, ttl);
         }
         catch {
             return false;
@@ -352,9 +346,13 @@ end`;
      * @param pattern
      */
     async keys(pattern) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            const r = await this._link.keys(this._pre + pattern);
-            const pl = this._pre.length;
+            const r = await conn.keys(this._etc.pre + pattern);
+            const pl = this._etc.pre.length;
             if (pl > 0) {
                 for (let k = 0; k < r.length; ++k) {
                     r[k] = r[k].slice(pl);
@@ -373,10 +371,14 @@ end`;
      * @param count 获取的条数
      */
     async scan(cursor = 0, pattern = '*', count = 10) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            const r = await this._link.scan(cursor, this._pre + pattern, count);
+            const r = await conn.scan(cursor, this._etc.pre + pattern, count);
             for (let i = 0; i < r.items.length; ++i) {
-                r.items[i] = r.items[i].slice(this._pre.length);
+                r.items[i] = r.items[i].slice(this._etc.pre.length);
             }
             return r;
         }
@@ -388,8 +390,12 @@ end`;
      * --- 清除当前所选数据库的所有内容 ---
      */
     async flushDb() {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            await this._link.flushDb();
+            await conn.flushDb();
             return true;
         }
         catch {
@@ -401,8 +407,12 @@ end`;
      * @param last 是否刷新最后使用时间（默认刷新）
      */
     async ping() {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return (await this._link.ping()) === 'PONG' ? 'PONG' : false;
+            return (await conn.ping()) === 'PONG' ? 'PONG' : false;
         }
         catch {
             return false;
@@ -416,15 +426,19 @@ end`;
      * @param mod 空,nx(key不存在才建立)
      */
     async hSet(key, field, val, mod = '') {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             if (typeof val !== 'string') {
                 val = lText.stringifyJson(val);
             }
             if (mod === 'nx') {
-                return await this._link.hSetNX(this._pre + key, field, val);
+                return await conn.hSetNX(this._etc.pre + key, field, val);
             }
             else {
-                return await this._link.hSet(this._pre + key, field, val);
+                return await conn.hSet(this._etc.pre + key, field, val);
             }
         }
         catch {
@@ -437,6 +451,10 @@ end`;
      * @param rows key / val 数组
      */
     async hMSet(key, rows) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             for (const i in rows) {
                 const val = rows[i];
@@ -444,7 +462,7 @@ end`;
                     rows[i] = lText.stringifyJson(val);
                 }
             }
-            await this._link.hMSet(this._pre + key, rows);
+            await conn.hMSet(this._etc.pre + key, rows);
             return true;
         }
         catch {
@@ -457,11 +475,15 @@ end`;
      * @param field
      */
     async hGet(key, field) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.hGet(this._pre + key, field);
+            return await conn.hGet(this._etc.pre + key, field);
         }
         catch {
-            return null;
+            return false;
         }
     }
     /**
@@ -471,6 +493,9 @@ end`;
      */
     async hGetJson(key, field) {
         const v = await this.hGet(key, field);
+        if (v === false) {
+            return false;
+        }
         if (v === null) {
             return null;
         }
@@ -483,15 +508,15 @@ end`;
      * @param fields
      */
     async hMGet(key, fields) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.hMGet(this._pre + key, fields);
+            return await conn.hMGet(this._etc.pre + key, fields);
         }
         catch {
-            const rtn = {};
-            for (const field of fields) {
-                rtn[field] = null;
-            }
-            return rtn;
+            return false;
         }
     }
     /**
@@ -499,11 +524,15 @@ end`;
      * @param key
      */
     async hGetAll(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.hGetAll(this._pre + key);
+            return await conn.hGetAll(this._etc.pre + key);
         }
         catch {
-            return null;
+            return false;
         }
     }
     /**
@@ -512,11 +541,15 @@ end`;
      * @param fields 值序列
      */
     async hDel(key, fields) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.hDel(this._pre + key, fields);
+            return await conn.hDel(this._etc.pre + key, fields);
         }
         catch {
-            return 0;
+            return false;
         }
     }
     /**
@@ -525,8 +558,12 @@ end`;
      * @param field
      */
     async hExists(key, field) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.hExists(this._pre + key, field);
+            return await conn.hExists(this._etc.pre + key, field);
         }
         catch {
             return false;
@@ -539,16 +576,20 @@ end`;
      * @param increment 正数或负数，整数或浮点
      */
     async hIncr(key, field, increment) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             if (Number.isInteger(increment)) {
-                return await this._link.hIncr(this._pre + key, field, increment);
+                return await conn.hIncr(this._etc.pre + key, field, increment);
             }
             else {
-                return await this._link.hIncrByFloat(this._pre + key, field, increment);
+                return await conn.hIncrByFloat(this._etc.pre + key, field, increment);
             }
         }
         catch {
-            return 0;
+            return false;
         }
     }
     /**
@@ -556,78 +597,152 @@ end`;
      * @param key
      */
     async hKeys(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.hKeys(this._pre + key);
+            return await conn.hKeys(this._etc.pre + key);
         }
         catch {
-            return [];
+            return false;
         }
     }
     async lPush(key, values) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.lPush(this._pre + key, values);
+            return await conn.lPush(this._etc.pre + key, values);
         }
         catch {
-            return 0;
+            return false;
         }
     }
     async rPush(key, values) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.rPush(this._pre + key, values);
+            return await conn.rPush(this._etc.pre + key, values);
         }
         catch {
-            return 0;
+            return false;
         }
     }
     async bLMove(sourceKey, destKey, soo, deo, timeout) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.bLMove(this._pre + sourceKey, this._pre + destKey, soo, deo, timeout);
+            return await conn.bLMove(this._etc.pre + sourceKey, this._etc.pre + destKey, soo, deo, timeout);
         }
         catch {
-            return null;
+            return false;
         }
     }
     async lPop(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.lPop(this._pre + key);
+            return await conn.lPop(this._etc.pre + key);
         }
         catch {
-            return null;
+            return false;
         }
     }
     async rPop(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.rPop(this._pre + key);
+            return await conn.rPop(this._etc.pre + key);
         }
         catch {
-            return null;
+            return false;
         }
     }
     async bRPop(key, timeout) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
             if (typeof key === 'string') {
                 key = [key];
             }
-            return await this._link.bRPop(key.map(item => this._pre + item), timeout);
+            return await conn.bRPop(key.map(item => this._etc.pre + item), timeout);
         }
         catch {
-            return {};
+            return false;
         }
     }
     async lRange(key, start, stop) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.lRange(this._pre + key, start, stop);
+            return await conn.lRange(this._etc.pre + key, start, stop);
         }
         catch {
-            return [];
+            return false;
         }
     }
     async lLen(key) {
+        const conn = await this._getConnection();
+        if (!conn) {
+            return false;
+        }
         try {
-            return await this._link.lLen(this._pre + key);
+            return await conn.lLen(this._etc.pre + key);
         }
         catch {
-            return 0;
+            return false;
+        }
+    }
+    /**
+     * --- 从连接池中获取一个符合要求的连接 ---
+     */
+    async _getConnection() {
+        const item = connections.find(item => (item.host === this._etc.host) && (item.port === this._etc.port) && (item.index === this._etc.index));
+        if (item) {
+            return item.conn;
+        }
+        // --- 没有找到合适的连接，创建一个 ---
+        try {
+            const conn = redis.createCommandClient({
+                'host': this._etc.host,
+                'port': this._etc.port,
+            });
+            // --- 认证 ---
+            if (this._etc.pwd) {
+                await conn.auth(this._etc.pwd, this._etc.user || undefined);
+            }
+            await conn.select(this._etc.index);
+            conn.on('error', function (err) {
+                lCore.debug('[KV][_getConnection][error]', err);
+            }).on('end', () => {
+                // --- 断线，不重要，会自动重连 ---
+            }).on('close', () => {
+                // --- 断线，不重要，会自动重连 ---
+            });
+            connections.push({
+                'host': this._etc.host,
+                'port': this._etc.port,
+                'index': this._etc.index,
+                'conn': conn,
+            });
+            return conn;
+        }
+        catch {
+            return null;
         }
     }
 }
@@ -635,9 +750,7 @@ end`;
  * --- 获取 Kv 对象 ---
  * @param etc 配置信息可留空
  */
-export async function get(ctr, etc) {
-    etc ??= ctr.getPrototype('_config').kv;
-    const kv = new Kv(ctr, etc);
-    const r = await kv.init(ctr, etc);
-    return r ? kv : false;
+export function get(ctrEtc) {
+    const etc = ctrEtc instanceof sCtr.Ctr ? ctrEtc.getPrototype('_config').kv : ctrEtc;
+    return new Kv(etc);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [

package/www/example/ctr/test.js

@@ -1357,16 +1357,10 @@ exec: ${JSON.stringify(exec)}<br><br>`);
         return echo.join('') + '<br>' + this._getEnd();
     }
     async kv() {
-        const kv = await lKv.get(this);
-        if (!kv) {
-            return [0, 'Failed.'];
-        }
+        const kv = lKv.get(this);
         const value = this._get['value'] ?? '';
         const ac = this._get['ac'] ?? '';
-        const echo = [`<pre>const kv = await lKv.get(this);
-if (!kv) {
-    return [0, 'Failed.'];
-}
+        const echo = [`<pre>const kv = lKv.get(this);
 JSON.stringify(await kv.ping());</pre>${JSON.stringify(await kv.ping())}`];
         if (ac == 'delete') {
             echo.push("<pre>JSON.stringify(await kv.get('test'));</pre>" + JSON.stringify(await kv.get('test')));
@@ -2103,7 +2097,10 @@ function confirm() {
             link = db;
         }
         else {
-            const kv = await lKv.get(this);
+            const kv = lKv.get(this);
+            if (!await kv.ping()) {
+                return false;
+            }
             if (!kv) {
                 return false;
             }
@@ -2127,11 +2124,11 @@ function confirm() {
             echo.push('link = lDb.get(this);\n');
         }
         else {
-            link = await lKv.get(this);
-            if (!link) {
+            link = lKv.get(this);
+            if (!await link.ping()) {
                 return [0, 'Failed, Redis can not be connected.'];
             }
-            echo.push('link = await lKv.get(this);\n');
+            echo.push('link = lKv.get(this);\n');
         }
         if (this._get['auth'] === '') {
             const r = await this._startSession(link, false, { 'ttl': 60 });
@@ -2181,11 +2178,8 @@ Result:<pre id="result">Nothing.</pre>`);
         const echo = ['<pre>'];
         let link = undefined;
         if (this._get['type'] === 'kv') {
-            link = await lKv.get(this);
-            if (!link) {
-                return [0, 'Failed, Redis can not be connected.'];
-            }
-            echo.push('link = await lKv.get(this);\n');
+            link = lKv.get(this);
+            echo.push('link = lKv.get(this);\n');
         }
         const origin = lJwt.getOrigin(this);
         echo.push(`const origin = lJwt.getOrigin(this);