@maiyunnet/kebab 3.2.35 → 4.0.0

package/index.d.ts

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

package/index.js

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

package/lib/core.d.ts

@@ -193,7 +193,7 @@ export declare function log(opt: sCtr.Ctr | ILogOptions, msg: string, fend?: str
  * @param opt 参数
  */
 export declare function getLog(opt: {
-    /** --- 如 127.0.0.1 --- */
+    /** --- 要查询的头，如 127.0.0.1、system、www.maiyun.net 等 --- */
     'hostname': string;
     /** --- 如 2024/08/01/22 --- */
     'path': string;

package/lib/core.js

@@ -681,11 +681,15 @@ export async function getLog(opt) {
     });
     const content = await res.getContent();
     if (!content) {
+        // --- 连接失败，系统错误 ---
+        debug('[CORE][getLog] rpc server error');
         return false;
     }
     const str = content.toString();
     const j = lText.parseJson(str);
     if (!j) {
+        // --- 解析失败，系统错误 ---
+        debug('[CORE][getLog] rpc server content error');
         return false;
     }
     return j.data;
@@ -782,7 +786,7 @@ export function debug(message, ...optionalParams) {
         return;
     }
     // eslint-disable-next-line no-console
-    console.debug(message, ...optionalParams);
+    console.debug(`KE-DEBUG ${lTime.format(null, 'Y-m-d H:i:s')}`, message, ...optionalParams);
 }
 /**
  * --- 向控制台直接显示内容，一般情况下禁止使用 ---

package/lib/db.js

@@ -186,8 +186,8 @@ export class Pool {
                     break;
                 }
                 catch (err) {
-                    if (err.message === 'ETIMEOUT') {
-                        lCore.debug('[DB][_getConnection][ETIMEOUT]', err);
+                    if (err.message === 'ETIMEOUT' || err.message === 'EHOSTUNREACH') {
+                        lCore.debug('[DB][_getConnection][TIMEOUT|HOSTUNREACH]', err);
                         await lCore.sleep(300);
                         continue;
                     }

package/lib/jwt.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2023-1-31 20:34:47
- * Last: 2023-1-31 20:34:47, 2023-12-8 13:55:09
+ * Last: 2023-1-31 20:34:47, 2023-12-8 13:55:09, 2025-11-6 16:22:06
  */
 import * as kebab from '#kebab/index.js';
 import * as lKv from '#kebab/lib/kv.js';
@@ -35,7 +35,7 @@ export declare class Jwt {
      * @param auth 设为 true 则优先从头 Authorization 或 post _auth 值读取 token
      * @param opt 选项
      */
-    init(ctr: sCtr.Ctr, opt?: IOptions, link?: lKv.Pool): Promise<boolean>;
+    init(ctr: sCtr.Ctr, opt?: IOptions, link?: lKv.Kv): Promise<boolean>;
     /**
      * --- 将 _jwt 数据封装并返回（创建新的或者续期老的 token），默认会同时设置一个 cookie（data 值会自动设置 token、exp） ---
      */
@@ -60,14 +60,14 @@ export declare function getOrigin(ctr: sCtr.Ctr, name?: string, auth?: boolean):
  * --- decode ---
  * 不传入 link 的话，将不做 block 有效校验，只做本身的 exp 有效校验
  */
-export declare function decode(ctr: sCtr.Ctr, val: string, link?: lKv.Pool, name?: string, secret?: string): Promise<Record<string, kebab.DbValue> | false>;
+export declare function decode(ctr: sCtr.Ctr, val: string, link?: lKv.Kv, name?: string, secret?: string): Promise<Record<string, kebab.DbValue> | false>;
 /**
  * --- 仅往 redis 写禁止相关 token 的数据，一般用于异步通知时在异处的服务器来调用的 ---
  */
-export declare function block(ctr: sCtr.Ctr, token: string, exp: number, link: lKv.Pool, name?: string): Promise<boolean>;
+export declare function block(ctr: sCtr.Ctr, token: string, exp: number, link: lKv.Kv, name?: string): Promise<boolean>;
 /**
  * @param ctr 模型实例
  * @param opt name, ttl, ssl, secret, auth: false, true 则优先从头 Authorization 或 post _auth 值读取 token
  * @param link 实例
  */
-export declare function get(ctr: sCtr.Ctr, opt?: IOptions, link?: lKv.Pool): Promise<Jwt>;
+export declare function get(ctr: sCtr.Ctr, opt?: IOptions, link?: lKv.Kv): Promise<Jwt>;

package/lib/jwt.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2023-1-31 20:34:47
- * Last: 2023-1-31 20:34:47, 2023-12-8 13:55:09
+ * Last: 2023-1-31 20:34:47, 2023-12-8 13:55:09, 2025-11-6 16:22:06
  */
 import * as lCore from '#kebab/lib/core.js';
 import * as lTime from '#kebab/lib/time.js';

package/lib/kv.d.ts

@@ -1,24 +1,22 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-30 19:25:22
- * 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
+ * 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 interface IConnectionInfo {
-    'id': number;
-    'last': number;
-    'host': string;
-    'port': number;
-    'index': number;
-    'lost': boolean;
-}
-export declare class Pool {
-    /** --- 当前 Pool 对象的 kv 连接信息 --- */
-    private readonly _etc;
+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>;
     /**
      * --- 设定一个值 ---
      * @param key
@@ -39,6 +37,7 @@ export declare class Pool {
      * @param key
      * @param val
      * @param ttl 秒，0 为不限制
+     * @param etc
      */
     replace(key: string, val: object | string | number, ttl?: number): Promise<boolean>;
     /**
@@ -55,12 +54,13 @@ export declare class Pool {
     prepend(key: string, val: string): Promise<boolean>;
     /**
      * --- 检测 key 是否存在 ---
-     * @param keys
+     * @param keys 单个或序列
      */
     exists(keys: string | string[]): Promise<number>;
     /**
      * --- 获取字符串 ---
      * @param key
+     * @returns 字符串 / false / null（即使存入时是 number，这个方法也只会返回字符串）
      */
     get(key: string): Promise<string | false | null>;
     /**
@@ -77,16 +77,17 @@ export declare class Pool {
      * --- 批量获取值 ---
      * @param keys key 序列
      */
-    mSet(rows: Record<string, string | Buffer>): Promise<boolean>;
+    mGet(keys: string[]): Promise<Record<string, string | null>>;
     /**
-     * --- 批量获取值 ---
-     * @param keys key 序列
+     * --- 批量设置哈希值 ---
+     * @param key key 名
+     * @param rows key / val 数组
+     * @param etc
      */
-    mGet(keys: string[]): Promise<Record<string, string | null>>;
+    mSet(rows: Record<string, string | Buffer>): Promise<boolean>;
     /**
      * --- 获取 json 对象 ---
      * @param key
-     * @returns false 表示系统错误, null 表示不存在, 其他值为 json 对象
      */
     getJson(key: string): Promise<any | false | null>;
     /**
@@ -130,8 +131,9 @@ export declare class Pool {
     flushDb(): Promise<boolean>;
     /**
      * --- 发送 ping ---
+     * @param last 是否刷新最后使用时间（默认刷新）
      */
-    ping(): Promise<string | false>;
+    ping(): Promise<false | string>;
     /**
      * --- 设置哈希表值 ---
      * @param key key 名
@@ -201,279 +203,19 @@ export declare class Pool {
     bRPop(key: string | string[], timeout: number): Promise<Record<string, string>>;
     lRange(key: string, start: number, stop: number): Promise<string[]>;
     lLen(key: string): Promise<number>;
-    /**
-     * --- 从连接池获取一个连接，会被自动设置为使用中，需要在执行命令后解除占用 ---
-     */
-    private _getConnection;
-}
-export declare class Connection {
-    /** --- 本连接最后一次使用时间 --- */
-    private _last;
-    /** --- kv 缓存连接对象 --- */
-    private readonly _link;
-    /** --- 当前连接是否正在被独占使用 --- */
-    private _using;
-    /** --- 当发生断开，则需从连接池移除连接 --- */
-    private _lost;
-    /** --- 当前的连接配置信息 --- */
-    private readonly _etc;
-    constructor(etc: kebab.IConfigKv, link: redis.ICommandClient);
-    /**
-     * --- 获取连接 etc 信息 ---
-     */
-    getEtc(): kebab.IConfigKv;
-    /**
-     * --- 获取最后一次获取连接的时间 ---
-     */
-    getLast(): number;
-    /**
-     * --- 将本条连接设置为不可用 ---
-     */
-    setLost(): void;
-    /**
-     * --- 是否已经丢失 ---
-     */
-    isLost(): boolean;
-    /**
-     * --- 将本条连接设置占用中 ---
-     */
-    setUsing(): void;
-    /**
-     * --- 获取当前状态是否正在被使用中 ---
-     */
-    isUsing(): boolean;
-    /**
-     * --- 取消占用 ---
-     */
-    used(): void;
-    /**
-     * --- 设定最后使用时间 ---
-     */
-    refreshLast(): void;
-    /**
-     * --- 断开此连接，一般情况下不使用 ---
-     */
-    end(): Promise<void>;
-    /**
-     * --- 设定一个值 ---
-     * @param key
-     * @param val
-     * @param ttl 秒，0 为不限制
-     * @param mod 设置模式: 空,nx（key不存在才建立）,xx（key存在才修改）
-     * @param etc 配置项，主要用 etc.pre
-     */
-    set(key: string, val: object | string | number, ttl: number, mod: '' | 'nx' | 'xx', etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 添加一个值，存在则不变 ---
-     * @param key
-     * @param val
-     * @param ttl 秒，0 为不限制
-     * @param etc
-     */
-    add(key: string, val: object | string | number, ttl: number, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 替换一个存在的值 ---
-     * @param key
-     * @param val
-     * @param ttl 秒，0 为不限制
-     * @param etc
-     */
-    replace(key: string, val: object | string | number, ttl: number, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 向已存在的值后追加数据 ---
-     * @param key
-     * @param val
-     * @param etc
-     */
-    append(key: string, val: string, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 向已存在的值之前追加数据 ---
-     * @param key
-     * @param val
-     */
-    prepend(key: string, val: string, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 检测 key 是否存在 ---
-     * @param keys 单个或序列
-     * @param etc
-     */
-    exists(keys: string | string[], etc: kebab.IConfigKv): Promise<number>;
-    /**
-     * --- 获取字符串 ---
-     * @param key
-     * @param etc
-     * @returns 字符串 / false / null（即使存入时是 number，这个方法也只会返回字符串）
-     */
-    get(key: string, etc: kebab.IConfigKv): Promise<string | false | null>;
-    /**
-     * --- 获取相应的剩余有效期秒数 ---
-     * @param key
-     * @param etc
-     */
-    ttl(key: string, etc: kebab.IConfigKv): Promise<number | null>;
-    /**
-     * --- 获取相应的剩余有效期毫秒数 ---
-     * @param key
-     * @param etc
-     */
-    pttl(key: string, etc: kebab.IConfigKv): Promise<number | null>;
-    /**
-     * --- 批量获取值 ---
-     * @param keys key 序列
-     * @param etc 顺序数组
-     */
-    mGet(keys: string[], etc: kebab.IConfigKv): Promise<Record<string, string | null>>;
-    /**
-     * --- 批量设置哈希值 ---
-     * @param key key 名
-     * @param rows key / val 数组
-     * @param etc
-     */
-    mSet(rows: Record<string, string | Buffer>, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 获取 json 对象 ---
-     * @param key
-     * @param etc
-     */
-    getJson(key: string, etc: kebab.IConfigKv): Promise<any | false | null>;
-    /**
-     * --- 删除已存在的值 ---
-     * @param keys
-     * @param etc
-     */
-    del(keys: string | string[], etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 自增 ---
-     * @param key
-     * @param num 整数或浮点正数
-     * @param etc
-     */
-    incr(key: string, num: number, etc: kebab.IConfigKv): Promise<number | false>;
-    /**
-     * --- 自减 ---
-     * @param key
-     * @param num 整数或浮点正数
-     * @param etc
-     */
-    decr(key: string, num: number, etc: kebab.IConfigKv): Promise<number | false>;
-    /**
-     * --- 仅修改过期时间不修改值 ---
-     * @param key
-     * @param ttl
-     * @param etc
-     */
-    expire(key: string, ttl: number, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 获取服务器上的所有 key 列表 ---
-     * @param pattern
-     */
-    keys(pattern: string, etc: kebab.IConfigKv): Promise<string[] | false>;
-    /**
-     * --- 根据条件获取服务器上的 keys ---
-     * @param cursor
-     * @param pattern 例如 *
-     * @param count 获取的条数
-     * @param etc
-     */
-    scan(cursor: number, pattern: string, count: number, etc: kebab.IConfigKv): Promise<redis.IScanResult<string> | false>;
-    /**
-     * --- 清除当前所选数据库的所有内容 ---
-     */
-    flushDb(): Promise<boolean>;
-    /**
-     * --- 发送 ping ---
-     * @param last 是否刷新最后使用时间（默认刷新）
-     */
-    ping(last?: boolean): Promise<false | string>;
-    /**
-     * --- 设置哈希表值 ---
-     * @param key key 名
-     * @param field 字段名
-     * @param val 值
-     * @param mod 空,nx(key不存在才建立)
-     * @param etc
-     */
-    hSet(key: string, field: string, val: object | string | number, mod: '' | 'nx', etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 批量设置哈希值 ---
-     * @param key key 名
-     * @param rows key / val 数组
-     * @param etc
-     */
-    hMSet(key: string, rows: Record<string, object | string | number>, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 获取哈希值 ---
-     * @param key
-     * @param field
-     * @param etc
-     */
-    hGet(key: string, field: string, etc: kebab.IConfigKv): Promise<string | null>;
-    /**
-     * --- 获取哈希 json 对象 ---
-     * @param key
-     * @param field
-     * @param etc
-     */
-    hGetJson(key: string, field: string, etc: kebab.IConfigKv): Promise<any | null>;
-    /**
-     * --- 批量获取哈希值 ---
-     * @param key
-     * @param fields
-     * @param etc
-     */
-    hMGet(key: string, fields: string[], etc: kebab.IConfigKv): Promise<Record<string, string | null>>;
-    /**
-     * --- 批量获取哈希键值对 ---
-     * @param key
-     * @param etc
-     */
-    hGetAll(key: string, etc: kebab.IConfigKv): Promise<Record<string, string | null> | null>;
-    /**
-     * --- 删除哈希键 ---
-     * @param key
-     * @param fields 值序列
-     * @param etc
-     */
-    hDel(key: string, fields: string | string[], etc: kebab.IConfigKv): Promise<number>;
-    /**
-     * --- 判断哈希字段是否存在 ---
-     * @param key
-     * @param field
-     * @param etc
-     */
-    hExists(key: string, field: string, etc: kebab.IConfigKv): Promise<boolean>;
-    /**
-     * --- 设置哈希自增自减 ---
-     * @param key key
-     * @param field 字段
-     * @param increment 正数或负数，整数或浮点
-     * @param etc
-     */
-    hIncr(key: string, field: string, increment: number, etc: kebab.IConfigKv): Promise<number>;
-    /**
-     * --- 获取哈希所有字段 ---
-     * @param key
-     * @param etc
-     */
-    hKeys(key: string, etc: kebab.IConfigKv): Promise<string[]>;
-    lPush(key: string, values: Array<string | Buffer>, etc: kebab.IConfigKv): Promise<number>;
-    rPush(key: string, values: Array<string | Buffer>, etc: kebab.IConfigKv): Promise<number>;
-    bLMove(sourceKey: string, destKey: string, soo: 'LEFT' | 'RIGHT', deo: 'LEFT' | 'RIGHT', timeout: number, etc: kebab.IConfigKv): Promise<string | null>;
-    lPop(key: string, etc: kebab.IConfigKv): Promise<string | null>;
-    rPop(key: string, etc: kebab.IConfigKv): Promise<string | null>;
-    bRPop(key: string | string[], timeout: number, etc: kebab.IConfigKv): Promise<Record<string, string>>;
-    lRange(key: string, start: number, stop: number, etc: kebab.IConfigKv): Promise<string[]>;
-    lLen(key: string, etc: kebab.IConfigKv): Promise<number>;
 }
 /**
- * --- 获取 Kv Pool 对象 ---
+ * --- 获取 Kv 对象 ---
  * @param etc 配置信息可留空
  */
-export declare function get(ctr: sCtr.Ctr, etc?: IOptions): Pool;
-/**
- * --- 获取当前连接池中所有连接的信息 ---
- */
-export declare function getConnectionList(): IConnectionInfo[];
+export declare function get(ctr: sCtr.Ctr, etc?: IOptions): Promise<Kv | false>;
+/** --- 连接信息 --- */
+export interface IConnectionInfo {
+    'host': string;
+    'port': number;
+    'index': number;
+    'link': redis.ICommandClient;
+}
 /** --- 选项 --- */
 export interface IOptions {
     'host'?: string;