@maiyunnet/kebab 3.1.3 → 3.1.5

package/index.d.ts

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.1.3";
+export declare const VER = "3.1.5";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;
@@ -24,3 +24,149 @@ export declare const WWW_CWD: string;
 export declare const IND_CWD: string;
 export declare const FTMP_CWD: string;
 export declare const MOD_CWD: string;
+/** --- 除非确定是不可知的 Json，否则不能使用 --- */
+export type Json = any;
+/** --- 数据库值的类型 --- */
+export type DbValue = string | number | null | Record<string, Json>;
+/** --- 动态目录配置文件 --- */
+export interface IConfig {
+    'set': {
+        'timezone': number;
+        'mustHttps': boolean;
+        'cacheTtl': number;
+        'staticVer': string;
+        'staticPath': string;
+        'staticPathFull': string;
+        [key: string]: Json;
+    };
+    'const': IConfigConst;
+    'db': IConfigDb;
+    'jwt': IConfigJwt;
+    'kv': IConfigKv;
+    'route': Record<string, string>;
+    'session': {
+        'name': string;
+        'ttl': number;
+        'ssl': boolean;
+    };
+    'sql': IConfigSql;
+    'dns': Record<string, IConfigDns>;
+    'lang': IConfigLang;
+    's3': Record<string, IConfigS3>;
+    'turnstile': IConfigTurnstile;
+    [key: string]: Record<string, Json>;
+}
+export interface IUrlParse {
+    'protocol': string | null;
+    'auth': string | null;
+    'user': string | null;
+    'pass': string | null;
+    'host': string | null;
+    'hostname': string | null;
+    'port': string | null;
+    'pathname': string;
+    'path': string | null;
+    'query': string | null;
+    'hash': string | null;
+}
+/** --- 语言 --- */
+export interface IConfigLang {
+    'list': string[];
+    'direct': string[];
+}
+/** --- 对象存储 --- */
+export interface IConfigS3 {
+    /** --- cf r2 要用 --- */
+    'account'?: string;
+    'sid': string;
+    'skey': string;
+    'region': string;
+    'bucket': string;
+}
+/** --- 人机码信息 --- */
+export interface IConfigTurnstile {
+    'CF': {
+        'sid': string;
+        'skey': string;
+    };
+    'TENCENT': {
+        'sid': string;
+        'skey': string;
+        'aid': string;
+        'akey': string;
+    };
+}
+/** --- 数据库 --- */
+export interface IConfigDb {
+    'host': string;
+    'port': number;
+    'charset': string;
+    'name': string;
+    'user': string;
+    'pwd': string;
+}
+/** --- Jwt 信息 --- */
+export interface IConfigJwt {
+    'name': string;
+    'ttl': number;
+    'ssl': boolean;
+    'secret': string;
+    'auth': boolean;
+}
+/** --- DNS --- */
+export interface IConfigDns {
+    'sid': string;
+    'skey': string;
+}
+/** --- kv --- */
+export interface IConfigKv {
+    'host': string;
+    'port': number;
+    'index': number;
+    'pre': string;
+    'user': string;
+    'pwd': string;
+}
+/** --- sql --- */
+export interface IConfigSql {
+    'pre': string;
+}
+/** --- 常量 --- */
+export interface IConfigConst {
+    'path': string;
+    'qs': string;
+    'startTime': bigint;
+    'startMemory': number;
+    'mobile': boolean;
+    'wechat': boolean;
+    'miniprogram': '' | 'wechat';
+    'https': boolean;
+    'host': string;
+    'hostname': string;
+    'hostport': number;
+    'uri': IUrlParse;
+    'rootPath': string;
+    'modPath': string;
+    'ctrPath': string;
+    'viewPath': string;
+    'dataPath': string;
+    'wsPath': string;
+    'urlBase': string;
+    'urlStc': string;
+    'urlFull': string;
+    'urlStcFull': string;
+}
+/** --- 虚拟机配置对象 --- */
+export interface IVhost {
+    readonly 'name': string;
+    readonly 'domains': string[];
+    readonly 'root': string;
+    readonly 'remark': string;
+}
+/** --- 上传的文件信息对象 --- */
+export interface IPostFile {
+    readonly 'name': string;
+    readonly 'origin': string;
+    readonly 'size': number;
+    readonly 'path': string;
+}

package/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-3-30 12:46:41
@@ -8,7 +9,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.1.3';
+export const VER = '3.1.5';
 // --- 服务端用的路径 ---
 const imu = import.meta.url.replace('file://', '').replace(/^\/(\w:)/, '$1').replace(/\\/g, '/');
 /** --- /xxx/xxx --- */

package/lib/core.d.ts

@@ -1,11 +1,11 @@
 import * as http from 'http';
 import * as http2 from 'http2';
 import * as stream from 'stream';
+import * as kebab from '#index.js';
 import * as lResponse from '#lib/net/response.js';
 import * as sCtr from '#sys/ctr.js';
-import * as types from '#types/index.js';
 /** --- 全局参数 --- */
-export declare const globalConfig: types.IConfig & {
+export declare const globalConfig: kebab.IConfig & {
     'httpPort': number;
     'httpsPort': number;
     'rpcPort': number;
@@ -117,7 +117,7 @@ export declare function objectSort<T extends Record<string, any>>(o: T): T;
  * @param obj 要清除的对象
  * @patam deep 也将子项都清空，如果子项有独立引用的话也要清空的话则要设置为 true
  */
-export declare function emptyObject(obj: Record<string, types.Json>, deep?: boolean): void;
+export declare function emptyObject(obj: Record<string, kebab.Json>, deep?: boolean): void;
 /**
  * --- 调用前自行创建 passThrough，并且调用 pipe 绑定到应该绑定的对象，然后再调用本函数 ---
  * @param passThrough passThrough 对象
@@ -148,7 +148,7 @@ export declare const global: Record<string, any>;
  * @param data 变量值
  * @param hosts 局域网列表
  */
-export declare function setGlobal(key: string, data: types.Json, hosts?: string[] | 'config'): Promise<string[]>;
+export declare function setGlobal(key: string, data: kebab.Json, hosts?: string[] | 'config'): Promise<string[]>;
 /**
  * --- 移除某个跨线程/跨内网服务器全局变量 ---
  * @param key 变量名
@@ -173,7 +173,7 @@ export interface ILogOptions {
     'urlFull'?: string;
     'hostname'?: string;
     'req'?: http2.Http2ServerRequest | http.IncomingMessage | null;
-    'get'?: Record<string, types.Json>;
+    'get'?: Record<string, kebab.Json>;
     'cookie'?: Record<string, string>;
     'jwt'?: Record<string, any>;
     'session'?: Record<string, any>;

package/lib/core.js

@@ -5,6 +5,7 @@
  */
 import * as cp from 'child_process';
 import * as stream from 'stream';
+import * as kebab from '#index.js';
 import * as lTime from '#lib/time.js';
 import * as lFs from '#lib/fs.js';
 import * as lText from '#lib/text.js';
@@ -12,7 +13,6 @@ import * as lNet from '#lib/net.js';
 import * as lCrypto from '#lib/crypto.js';
 import * as lResponse from '#lib/net/response.js';
 import * as sCtr from '#sys/ctr.js';
-import * as kebab from '#index.js';
 /** --- 全局参数 --- */
 export const globalConfig = {};
 /**

package/lib/db.d.ts

@@ -4,8 +4,8 @@
  * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47, 2025-8-3 20:24:03
  */
 import * as mysql2 from 'mysql2/promise';
+import * as kebab from '#index.js';
 import * as sCtr from '#sys/ctr.js';
-import * as types from '#types/index.js';
 /** --- query 返回的数据 --- */
 export interface IData {
     'rows': any[] | null;
@@ -44,19 +44,19 @@ export declare class Pool {
     private _queries;
     /** --- 当前 Pool 对象的数据库连接信息 --- */
     private readonly _etc;
-    constructor(etc: types.IConfigDb);
+    constructor(etc: kebab.IConfigDb);
     /**
      * --- 执行一条 SQL，无视顺序和相同连接，随用随取 ---
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
      */
-    query(sql: string, values?: types.DbValue[]): Promise<IData>;
+    query(sql: string, values?: kebab.DbValue[]): Promise<IData>;
     /**
      * --- 执行一条 SQL 并获得影响行数对象 packet，连接失败抛出错误 ---
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
      */
-    execute(sql: string, values?: types.DbValue[]): Promise<IPacket>;
+    execute(sql: string, values?: kebab.DbValue[]): Promise<IPacket>;
     /**
      * --- 开启事务，返回事务对象并锁定连接，别人任何人不可用，有 ctr 的话必传 this，独立执行时可传 null ---
      */
@@ -87,13 +87,13 @@ export declare class Transaction {
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
      */
-    query(sql: string, values?: types.DbValue[]): Promise<IData>;
+    query(sql: string, values?: kebab.DbValue[]): Promise<IData>;
     /**
      * --- 执行一条 SQL 并获得影响行数对象 packet，连接失败抛出错误 ---
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
      */
-    execute(sql: string, values?: types.DbValue[]): Promise<IPacket>;
+    execute(sql: string, values?: kebab.DbValue[]): Promise<IPacket>;
     commit(): Promise<boolean>;
     rollback(): Promise<boolean>;
 }
@@ -113,11 +113,11 @@ export declare class Connection {
     private _transaction;
     /** --- 当前的连接配置信息 --- */
     private readonly _etc;
-    constructor(etc: types.IConfigDb, link: mysql2.Connection);
+    constructor(etc: kebab.IConfigDb, link: mysql2.Connection);
     /**
      * --- 获取连接 etc 信息 ---
      */
-    getEtc(): types.IConfigDb;
+    getEtc(): kebab.IConfigDb;
     /**
      * --- 获取最后一次获取连接的时间 ---
      */
@@ -127,7 +127,7 @@ export declare class Connection {
      */
     getLastSql(): Array<{
         'sql': string;
-        'values'?: types.DbValue[];
+        'values'?: kebab.DbValue[];
     }>;
     /**
      * --- 将本条连接设置为不可用 ---
@@ -167,13 +167,13 @@ export declare class Connection {
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
      */
-    query(sql: string, values?: types.DbValue[]): Promise<IData>;
+    query(sql: string, values?: kebab.DbValue[]): Promise<IData>;
     /**
      * --- 执行一条 SQL 并获得影响行数对象 packet ---
      * @param sql 执行的 SQL 字符串
      * @param values 要替换的 data 数据
      */
-    execute(sql: string, values?: types.DbValue[]): Promise<IPacket>;
+    execute(sql: string, values?: kebab.DbValue[]): Promise<IPacket>;
     /**
      * --- 关闭连接，一般情况下不使用 ---
      */
@@ -186,7 +186,7 @@ export declare class Connection {
  * --- 获取 Db Pool 对象 ---
  * @param etc 配置信息可留空
  */
-export declare function get(ctrEtc: sCtr.Ctr | types.IConfigDb): Pool;
+export declare function get(ctrEtc: sCtr.Ctr | kebab.IConfigDb): Pool;
 /**
  * --- 获取当前连接池中所有连接的信息 ---
  */

package/lib/db.js

@@ -6,7 +6,6 @@
 // --- Pool 是使用时必须要一个用户创建一份的，Connection 是池子里获取的 ---
 // --- 第三方 ---
 import * as mysql2 from 'mysql2/promise';
-// --- 库和定义 ---
 import * as lTime from '#lib/time.js';
 import * as lSql from '#lib/sql.js';
 import * as lCore from '#lib/core.js';

package/lib/jwt.d.ts

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

package/lib/jwt.js

@@ -3,7 +3,6 @@
  * Date: 2023-1-31 20:34:47
  * Last: 2023-1-31 20:34:47, 2023-12-8 13:55:09
  */
-// --- 库和定义 ---
 import * as lCore from '#lib/core.js';
 import * as lTime from '#lib/time.js';
 import * as lText from '#lib/text.js';

package/lib/kv.d.ts

@@ -4,8 +4,8 @@
  * 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
  */
 import * as redis from '@litert/redis';
+import * as kebab from '#index.js';
 import * as sCtr from '#sys/ctr.js';
-import * as types from '#types/index.js';
 /** --- 连接信息 --- */
 export interface IConnectionInfo {
     'id': number;
@@ -18,7 +18,7 @@ export interface IConnectionInfo {
 export declare class Pool {
     /** --- 当前 Pool 对象的 kv 连接信息 --- */
     private readonly _etc;
-    constructor(ctr: sCtr.Ctr, etc?: types.IConfigKv);
+    constructor(ctr: sCtr.Ctr, etc?: kebab.IConfigKv);
     /**
      * --- 设定一个值 ---
      * @param key
@@ -216,11 +216,11 @@ export declare class Connection {
     private _lost;
     /** --- 当前的连接配置信息 --- */
     private readonly _etc;
-    constructor(etc: types.IConfigKv, link: redis.ICommandClient);
+    constructor(etc: kebab.IConfigKv, link: redis.ICommandClient);
     /**
      * --- 获取连接 etc 信息 ---
      */
-    getEtc(): types.IConfigKv;
+    getEtc(): kebab.IConfigKv;
     /**
      * --- 获取最后一次获取连接的时间 ---
      */
@@ -261,7 +261,7 @@ export declare class Connection {
      * @param mod 设置模式: 空,nx（key不存在才建立）,xx（key存在才修改）
      * @param etc 配置项，主要用 etc.pre
      */
-    set(key: string, val: object | string | number, ttl: number, mod: '' | 'nx' | 'xx', etc: types.IConfigKv): Promise<boolean>;
+    set(key: string, val: object | string | number, ttl: number, mod: '' | 'nx' | 'xx', etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 添加一个值，存在则不变 ---
      * @param key
@@ -269,7 +269,7 @@ export declare class Connection {
      * @param ttl 秒，0 为不限制
      * @param etc
      */
-    add(key: string, val: object | string | number, ttl: number, etc: types.IConfigKv): Promise<boolean>;
+    add(key: string, val: object | string | number, ttl: number, etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 替换一个存在的值 ---
      * @param key
@@ -277,95 +277,95 @@ export declare class Connection {
      * @param ttl 秒，0 为不限制
      * @param etc
      */
-    replace(key: string, val: object | string | number, ttl: number, etc: types.IConfigKv): Promise<boolean>;
+    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: types.IConfigKv): Promise<boolean>;
+    append(key: string, val: string, etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 向已存在的值之前追加数据 ---
      * @param key
      * @param val
      */
-    prepend(key: string, val: string, etc: types.IConfigKv): Promise<boolean>;
+    prepend(key: string, val: string, etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 检测 key 是否存在 ---
      * @param keys 单个或序列
      * @param etc
      */
-    exists(keys: string | string[], etc: types.IConfigKv): Promise<number>;
+    exists(keys: string | string[], etc: kebab.IConfigKv): Promise<number>;
     /**
      * --- 获取字符串 ---
      * @param key
      * @param etc
      */
-    get(key: string, etc: types.IConfigKv): Promise<string | null>;
+    get(key: string, etc: kebab.IConfigKv): Promise<string | null>;
     /**
      * --- 获取相应的剩余有效期秒数 ---
      * @param key
      * @param etc
      */
-    ttl(key: string, etc: types.IConfigKv): Promise<number | null>;
+    ttl(key: string, etc: kebab.IConfigKv): Promise<number | null>;
     /**
      * --- 获取相应的剩余有效期毫秒数 ---
      * @param key
      * @param etc
      */
-    pttl(key: string, etc: types.IConfigKv): Promise<number | null>;
+    pttl(key: string, etc: kebab.IConfigKv): Promise<number | null>;
     /**
      * --- 批量获取值 ---
      * @param keys key 序列
      * @param etc 顺序数组
      */
-    mGet(keys: string[], etc: types.IConfigKv): Promise<Record<string, string | null>>;
+    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: types.IConfigKv): Promise<boolean>;
+    mSet(rows: Record<string, string | Buffer>, etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 获取 json 对象 ---
      * @param key
      * @param etc
      */
-    getJson(key: string, etc: types.IConfigKv): Promise<any | null>;
+    getJson(key: string, etc: kebab.IConfigKv): Promise<any | null>;
     /**
      * --- 删除已存在的值 ---
      * @param keys
      * @param etc
      */
-    del(keys: string | string[], etc: types.IConfigKv): Promise<boolean>;
+    del(keys: string | string[], etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 自增 ---
      * @param key
      * @param num 整数或浮点正数
      * @param etc
      */
-    incr(key: string, num: number, etc: types.IConfigKv): Promise<number | false>;
+    incr(key: string, num: number, etc: kebab.IConfigKv): Promise<number | false>;
     /**
      * --- 自减 ---
      * @param key
      * @param num 整数或浮点正数
      * @param etc
      */
-    decr(key: string, num: number, etc: types.IConfigKv): Promise<number | false>;
+    decr(key: string, num: number, etc: kebab.IConfigKv): Promise<number | false>;
     /**
      * --- 仅修改过期时间不修改值 ---
      * @param key
      * @param ttl
      * @param etc
      */
-    expire(key: string, ttl: number, etc: types.IConfigKv): Promise<boolean>;
+    expire(key: string, ttl: number, etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 获取服务器上的所有 key 列表 ---
      * @param pattern
      */
-    keys(pattern: string, etc: types.IConfigKv): Promise<string[] | false>;
+    keys(pattern: string, etc: kebab.IConfigKv): Promise<string[] | false>;
     /**
      * --- 根据条件获取服务器上的 keys ---
      * @param cursor
@@ -373,7 +373,7 @@ export declare class Connection {
      * @param count 获取的条数
      * @param etc
      */
-    scan(cursor: number, pattern: string, count: number, etc: types.IConfigKv): Promise<redis.IScanResult<string> | false>;
+    scan(cursor: number, pattern: string, count: number, etc: kebab.IConfigKv): Promise<redis.IScanResult<string> | false>;
     /**
      * --- 清除当前所选数据库的所有内容 ---
      */
@@ -391,55 +391,55 @@ export declare class Connection {
      * @param mod 空,nx(key不存在才建立)
      * @param etc
      */
-    hSet(key: string, field: string, val: object | string | number, mod: '' | 'nx', etc: types.IConfigKv): Promise<boolean>;
+    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: types.IConfigKv): Promise<boolean>;
+    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: types.IConfigKv): Promise<string | null>;
+    hGet(key: string, field: string, etc: kebab.IConfigKv): Promise<string | null>;
     /**
      * --- 获取哈希 json 对象 ---
      * @param key
      * @param field
      * @param etc
      */
-    hGetJson(key: string, field: string, etc: types.IConfigKv): Promise<any | null>;
+    hGetJson(key: string, field: string, etc: kebab.IConfigKv): Promise<any | null>;
     /**
      * --- 批量获取哈希值 ---
      * @param key
      * @param fields
      * @param etc
      */
-    hMGet(key: string, fields: string[], etc: types.IConfigKv): Promise<Record<string, string | null>>;
+    hMGet(key: string, fields: string[], etc: kebab.IConfigKv): Promise<Record<string, string | null>>;
     /**
      * --- 批量获取哈希键值对 ---
      * @param key
      * @param etc
      */
-    hGetAll(key: string, etc: types.IConfigKv): Promise<Record<string, string | null> | null>;
+    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: types.IConfigKv): Promise<number>;
+    hDel(key: string, fields: string | string[], etc: kebab.IConfigKv): Promise<number>;
     /**
      * --- 判断哈希字段是否存在 ---
      * @param key
      * @param field
      * @param etc
      */
-    hExists(key: string, field: string, etc: types.IConfigKv): Promise<boolean>;
+    hExists(key: string, field: string, etc: kebab.IConfigKv): Promise<boolean>;
     /**
      * --- 设置哈希自增自减 ---
      * @param key key
@@ -447,27 +447,27 @@ export declare class Connection {
      * @param increment 正数或负数，整数或浮点
      * @param etc
      */
-    hIncr(key: string, field: string, increment: number, etc: types.IConfigKv): Promise<number>;
+    hIncr(key: string, field: string, increment: number, etc: kebab.IConfigKv): Promise<number>;
     /**
      * --- 获取哈希所有字段 ---
      * @param key
      * @param etc
      */
-    hKeys(key: string, etc: types.IConfigKv): Promise<string[]>;
-    lPush(key: string, values: Array<string | Buffer>, etc: types.IConfigKv): Promise<number>;
-    rPush(key: string, values: Array<string | Buffer>, etc: types.IConfigKv): Promise<number>;
-    bLMove(sourceKey: string, destKey: string, soo: 'LEFT' | 'RIGHT', deo: 'LEFT' | 'RIGHT', timeout: number, etc: types.IConfigKv): Promise<string | null>;
-    lPop(key: string, etc: types.IConfigKv): Promise<string | null>;
-    rPop(key: string, etc: types.IConfigKv): Promise<string | null>;
-    bRPop(key: string | string[], timeout: number, etc: types.IConfigKv): Promise<Record<string, string>>;
-    lRange(key: string, start: number, stop: number, etc: types.IConfigKv): Promise<string[]>;
-    lLen(key: string, etc: types.IConfigKv): Promise<number>;
+    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 对象 ---
  * @param etc 配置信息可留空
  */
-export declare function get(ctr: sCtr.Ctr, etc?: types.IConfigKv): Pool;
+export declare function get(ctr: sCtr.Ctr, etc?: kebab.IConfigKv): Pool;
 /**
  * --- 获取当前连接池中所有连接的信息 ---
  */

package/lib/kv.js

@@ -7,7 +7,6 @@
 // --- 为啥 Pool 要独立，因为有些配置项目不能存在 Connection 是用户单独使用的，例如 pre ---
 // --- 第三方 ---
 import * as redis from '@litert/redis';
-// --- 库和定义 ---
 import * as lTime from '#lib/time.js';
 import * as lText from '#lib/text.js';
 import * as lCore from '#lib/core.js';