@maiyunnet/kebab 2.0.16 → 3.0.0

package/lib/crypto.js

@@ -1,75 +1,19 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SM4_CFB = exports.SM4_CBC = exports.SM4_ECB = exports.AES_256_GCM = exports.AES_256_CFB = exports.AES_256_CBC = exports.AES_256_ECB = void 0;
-exports.generateKeyPair = generateKeyPair;
-exports.sign = sign;
-exports.verify = verify;
-exports.publicEncrypt = publicEncrypt;
-exports.privateEncrypt = privateEncrypt;
-exports.publicDecrypt = publicDecrypt;
-exports.privateDecrypt = privateDecrypt;
-exports.cipherEncrypt = cipherEncrypt;
-exports.aesEncrypt = aesEncrypt;
-exports.gcmEncrypt = gcmEncrypt;
-exports.sm4Encrypt = sm4Encrypt;
-exports.cipherDecrypt = cipherDecrypt;
-exports.aesDecrypt = aesDecrypt;
-exports.gcmDecrypt = gcmDecrypt;
-exports.sm4Decrypt = sm4Decrypt;
-exports.hashHmac = hashHmac;
-exports.hashHmacFile = hashHmacFile;
-exports.base64Encode = base64Encode;
-exports.base64Decode = base64Decode;
-exports.uuid = uuid;
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-2 14:01:06
  * Last: 2020-3-12 14:05:24, 2022-09-12 11:52:35, 2024-9-8 17:09:39, 2024-11-11 00:21:58, 2025-6-18 20:27:47
  */
-const crypto = __importStar(require("crypto"));
+import * as crypto from 'crypto';
 // --- 库和定义 ---
-const lFs = __importStar(require("~/lib/fs"));
-const lCore = __importStar(require("~/lib/core"));
+import * as lFs from '../lib/fs.js';
+import * as lCore from '../lib/core.js';
 // --- 非对称加密 ---
 /**
  * --- 创建非对称秘钥 ---
  * @param type 如 rsa/ec
  * @param options 参数
  */
-function generateKeyPair(type, options = {}) {
+export function generateKeyPair(type, options = {}) {
     return new Promise((resolve) => {
         options.modulusLength ??= 2048;
         if (options.namedCurve !== undefined) {
@@ -102,7 +46,7 @@ function generateKeyPair(type, options = {}) {
  * @param format 输出格式
  * @param algorithm 哈希方式
  */
-function sign(data, privateKey, format = 'buffer', algorithm = 'sha256') {
+export function sign(data, privateKey, format = 'buffer', algorithm = 'sha256') {
     const sign = crypto.createSign(algorithm);
     sign.update(data);
     return format === 'buffer' ? sign.sign(privateKey) : sign.sign(privateKey, format);
@@ -114,7 +58,7 @@ function sign(data, privateKey, format = 'buffer', algorithm = 'sha256') {
  * @param signature 签名
  * @param algorithm 哈希方式
  */
-function verify(data, object, signature, algorithm = 'sha256') {
+export function verify(data, object, signature, algorithm = 'sha256') {
     const verify = crypto.createVerify(algorithm);
     verify.update(data);
     return verify.verify(object, signature);
@@ -124,7 +68,7 @@ function verify(data, object, signature, algorithm = 'sha256') {
  * @param key 公钥
  * @param buffer 数据
  */
-function publicEncrypt(key, buffer) {
+export function publicEncrypt(key, buffer) {
     return crypto.publicEncrypt(key, buffer);
 }
 /**
@@ -132,7 +76,7 @@ function publicEncrypt(key, buffer) {
  * @param key 私钥
  * @param buffer 数据
  */
-function privateEncrypt(key, buffer) {
+export function privateEncrypt(key, buffer) {
     return crypto.privateEncrypt(key, buffer);
 }
 /**
@@ -140,7 +84,7 @@ function privateEncrypt(key, buffer) {
  * @param key 公钥
  * @param buffer 数据
  */
-function publicDecrypt(key, buffer) {
+export function publicDecrypt(key, buffer) {
     return crypto.publicDecrypt(key, buffer);
 }
 /**
@@ -148,17 +92,17 @@ function publicDecrypt(key, buffer) {
  * @param key 私钥
  * @param buffer 数据
  */
-function privateDecrypt(key, buffer) {
+export function privateDecrypt(key, buffer) {
     return crypto.privateDecrypt(key, buffer);
 }
 // --- Cipher (AES/SM4...) 加/解密 ---
-exports.AES_256_ECB = 'aes-256-ecb'; // --- 如果未设置 iv，则默认这个，但强烈不建议 ---
-exports.AES_256_CBC = 'aes-256-cbc';
-exports.AES_256_CFB = 'aes-256-cfb'; // --- 设置 iv，自动就切换成了这个 ---
-exports.AES_256_GCM = 'aes-256-gcm'; // --- 强烈建议使用这个 ---
-exports.SM4_ECB = 'sm4-ecb'; // --- SM4 如果未设置 iv，则默认这个 ---
-exports.SM4_CBC = 'sm4-cbc';
-exports.SM4_CFB = 'sm4-cfb'; // --- SM4 一般用这个，设置 iv，自动就切换成了这个 ---
+export const AES_256_ECB = 'aes-256-ecb'; // --- 如果未设置 iv，则默认这个，但强烈不建议 ---
+export const AES_256_CBC = 'aes-256-cbc';
+export const AES_256_CFB = 'aes-256-cfb'; // --- 设置 iv，自动就切换成了这个 ---
+export const AES_256_GCM = 'aes-256-gcm'; // --- 强烈建议使用这个 ---
+export const SM4_ECB = 'sm4-ecb'; // --- SM4 如果未设置 iv，则默认这个 ---
+export const SM4_CBC = 'sm4-cbc';
+export const SM4_CFB = 'sm4-cfb'; // --- SM4 一般用这个，设置 iv，自动就切换成了这个 ---
 /**
  * --- cipher 加密，强烈不建议使用 AES_256_ECB ---
  * @param original 原始字符串
@@ -166,18 +110,18 @@ exports.SM4_CFB = 'sm4-cfb'; // --- SM4 一般用这个，设置 iv，自动就
  * @param iv 向量 16(CFB) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
-function cipherEncrypt(original, key, iv = '', method = exports.AES_256_ECB, output = 'base64') {
+export function cipherEncrypt(original, key, iv = '', method = AES_256_ECB, output = 'base64') {
     try {
         if ((typeof key === 'string') && (key.length !== 32)) {
             key = hashHmac('md5', key, 'MaiyunSalt');
         }
         if (iv) {
-            if (method === exports.AES_256_CFB) {
+            if (method === AES_256_CFB) {
                 if (iv.length !== 16) {
                     return false;
                 }
             }
-            else if (method === exports.AES_256_GCM) {
+            else if (method === AES_256_GCM) {
                 if (iv.length !== 12) {
                     return false;
                 }
@@ -194,7 +138,7 @@ function cipherEncrypt(original, key, iv = '', method = exports.AES_256_ECB, out
                 r = cip.update(original, undefined, 'base64');
             }
             r += cip.final('base64');
-            if (method === exports.AES_256_GCM) {
+            if (method === AES_256_GCM) {
                 r += cip.getAuthTag().toString('hex');
             }
         }
@@ -207,7 +151,7 @@ function cipherEncrypt(original, key, iv = '', method = exports.AES_256_ECB, out
                 r = cip.update(original);
             }
             r = Buffer.concat([r, cip.final()]);
-            if (method === exports.AES_256_GCM) {
+            if (method === AES_256_GCM) {
                 r = Buffer.concat([r, cip.getAuthTag()]);
             }
         }
@@ -225,9 +169,9 @@ function cipherEncrypt(original, key, iv = '', method = exports.AES_256_ECB, out
  * @param method 加密方法
  * @param output 输出类型
  */
-function aesEncrypt(original, key, iv = '', method = exports.AES_256_ECB, output = 'base64') {
+export function aesEncrypt(original, key, iv = '', method = AES_256_ECB, output = 'base64') {
     if (iv !== '') {
-        method = method === exports.AES_256_ECB ? exports.AES_256_CFB : method;
+        method = method === AES_256_ECB ? AES_256_CFB : method;
     }
     return cipherEncrypt(original, key, iv, method, output);
 }
@@ -237,9 +181,9 @@ function aesEncrypt(original, key, iv = '', method = exports.AES_256_ECB, output
  * @param key 密钥尽量 32 个英文字母和数字，不是 32 个系统会自动处理
  * @param output 输出类型
  */
-function gcmEncrypt(original, key, output = 'base64') {
+export function gcmEncrypt(original, key, output = 'base64') {
     const iv = lCore.random(12, lCore.RANDOM_LUNS);
-    const rtn = cipherEncrypt(original, key, iv, exports.AES_256_GCM, output);
+    const rtn = cipherEncrypt(original, key, iv, AES_256_GCM, output);
     if (!rtn) {
         return false;
     }
@@ -252,9 +196,9 @@ function gcmEncrypt(original, key, output = 'base64') {
  * @param iv 向量 16 个英文字母和数字
  * @param method 加密方法
  */
-function sm4Encrypt(original, key, iv = '', method = exports.SM4_ECB, output = 'base64') {
+export function sm4Encrypt(original, key, iv = '', method = SM4_ECB, output = 'base64') {
     if (iv !== '') {
-        method = method === exports.SM4_ECB ? exports.SM4_CFB : method;
+        method = method === SM4_ECB ? SM4_CFB : method;
     }
     return cipherEncrypt(original, key, iv, method, output);
 }
@@ -265,25 +209,25 @@ function sm4Encrypt(original, key, iv = '', method = exports.SM4_ECB, output = '
  * @param iv 向量 16(CFB) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
-function cipherDecrypt(encrypt, key, iv = '', method = exports.AES_256_ECB, output = 'binary') {
+export function cipherDecrypt(encrypt, key, iv = '', method = AES_256_ECB, output = 'binary') {
     try {
         if ((typeof key === 'string') && (key.length !== 32)) {
             key = hashHmac('md5', key, 'MaiyunSalt');
         }
         if (iv) {
-            if (method === exports.AES_256_CFB) {
+            if (method === AES_256_CFB) {
                 if (iv.length !== 16) {
                     return false;
                 }
             }
-            else if (method === exports.AES_256_GCM) {
+            else if (method === AES_256_GCM) {
                 if (iv.length !== 12) {
                     return false;
                 }
             }
         }
         const cip = crypto.createDecipheriv(method, key, iv);
-        if (method === exports.AES_256_GCM) {
+        if (method === AES_256_GCM) {
             if (typeof encrypt === 'string') {
                 cip.setAuthTag(Buffer.from(encrypt.slice(-32), 'hex'));
                 encrypt = encrypt.slice(0, -32);
@@ -327,9 +271,9 @@ function cipherDecrypt(encrypt, key, iv = '', method = exports.AES_256_ECB, outp
  * @param iv 向量 16 个英文字母和数字
  * @param method 加密方法
  */
-function aesDecrypt(encrypt, key, iv = '', method = exports.AES_256_ECB, output = 'binary') {
+export function aesDecrypt(encrypt, key, iv = '', method = AES_256_ECB, output = 'binary') {
     if (iv !== '') {
-        method = method === exports.AES_256_ECB ? exports.AES_256_CFB : method;
+        method = method === AES_256_ECB ? AES_256_CFB : method;
     }
     return cipherDecrypt(encrypt, key, iv, method, output);
 }
@@ -340,8 +284,8 @@ function aesDecrypt(encrypt, key, iv = '', method = exports.AES_256_ECB, output
  * @param iv 向量 16 个英文字母和数字
  * @param method 加密方法
  */
-function gcmDecrypt(encrypt, key, output = 'binary') {
-    return cipherDecrypt(typeof encrypt === 'string' ? encrypt.slice(12) : encrypt.subarray(12), key, typeof encrypt === 'string' ? encrypt.slice(0, 12) : encrypt.subarray(0, 12).toString(), exports.AES_256_GCM, output);
+export function gcmDecrypt(encrypt, key, output = 'binary') {
+    return cipherDecrypt(typeof encrypt === 'string' ? encrypt.slice(12) : encrypt.subarray(12), key, typeof encrypt === 'string' ? encrypt.slice(0, 12) : encrypt.subarray(0, 12).toString(), AES_256_GCM, output);
 }
 /**
  * --- SM4 解密 ---
@@ -350,9 +294,9 @@ function gcmDecrypt(encrypt, key, output = 'binary') {
  * @param iv 向量 16 个英文字母和数字
  * @param method 加密方法
  */
-function sm4Decrypt(encrypt, key, iv = '', method = exports.SM4_ECB, output = 'binary') {
+export function sm4Decrypt(encrypt, key, iv = '', method = SM4_ECB, output = 'binary') {
     if (iv !== '') {
-        method = method === exports.SM4_ECB ? exports.SM4_CFB : method;
+        method = method === SM4_ECB ? SM4_CFB : method;
     }
     return cipherDecrypt(encrypt, key, iv, method, output);
 }
@@ -362,7 +306,7 @@ function sm4Decrypt(encrypt, key, iv = '', method = exports.SM4_ECB, output = 'b
  * @param data 源数据
  * @param key 设置则采用 hmac 加密
  */
-function hashHmac(algorithm, data, key, format = 'hex') {
+export function hashHmac(algorithm, data, key, format = 'hex') {
     const cry = key ? crypto.createHmac(algorithm, key) : crypto.createHash(algorithm);
     cry.update(data);
     if (format === 'buffer') {
@@ -378,7 +322,7 @@ function hashHmac(algorithm, data, key, format = 'hex') {
  * @param path 文件路径
  * @param key 设置则采用 hmac 加密
  */
-function hashHmacFile(algorithm, path, key, encoding = 'hex') {
+export function hashHmacFile(algorithm, path, key, encoding = 'hex') {
     return new Promise(function (resolve) {
         const cry = key ? crypto.createHmac(algorithm, key) : crypto.createHash(algorithm);
         const rs = lFs.createReadStream(path);
@@ -400,7 +344,7 @@ function hashHmacFile(algorithm, path, key, encoding = 'hex') {
  * --- base64 编码 ---
  * @param data 字符串或 Buffer
  */
-function base64Encode(data) {
+export function base64Encode(data) {
     if (typeof data === 'string') {
         return Buffer.from(data, 'utf8').toString('base64');
     }
@@ -408,7 +352,7 @@ function base64Encode(data) {
         return Buffer.from(data).toString('base64');
     }
 }
-function base64Decode(data, encoding = 'utf8') {
+export function base64Decode(data, encoding = 'utf8') {
     const buffer = Buffer.from(data, 'base64');
     if (encoding === 'buffer') {
         return buffer;
@@ -419,6 +363,6 @@ function base64Decode(data, encoding = 'utf8') {
  * --- 生成 uuid ---
  * @param options 选项
  */
-function uuid(options) {
+export function uuid(options) {
     return crypto.randomUUID(options);
 }

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 ctr from '~/sys/ctr';
-import * as types from '~/types';
+import * as sCtr from '../sys/ctr.js';
+import * as types from '../types/index.js';
 /** --- query 返回的数据 --- */
 export interface IData {
     'rows': any[] | null;
@@ -60,7 +60,7 @@ export declare class Pool {
     /**
      * --- 开启事务，返回事务对象并锁定连接，别人任何人不可用，有 ctr 的话必传 this，独立执行时可传 null ---
      */
-    beginTransaction(ctr: ctr.Ctr | null): Promise<Transaction | null>;
+    beginTransaction(ctr: sCtr.Ctr | null): Promise<Transaction | null>;
     /**
      * --- 获取一个连接，自动变为 using 状态，；连接失败会返回 null ---
      */
@@ -78,7 +78,7 @@ export declare class Transaction {
     private _conn;
     private readonly _ctr;
     private readonly _timer;
-    constructor(ctr: ctr.Ctr | null, conn: Connection, opts?: {
+    constructor(ctr: sCtr.Ctr | null, conn: Connection, opts?: {
         'warning'?: number;
         'danger'?: number;
     });
@@ -185,7 +185,7 @@ export declare class Connection {
  * --- 获取 Db Pool 对象 ---
  * @param etc 配置信息可留空
  */
-export declare function get(ctrEtc: ctr.Ctr | types.IConfigDb): Pool;
+export declare function get(ctrEtc: sCtr.Ctr | types.IConfigDb): Pool;
 /**
  * --- 获取当前连接池中所有连接的信息 ---
  */

package/lib/db.js

@@ -1,62 +1,24 @@
-"use strict";
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = exports.Transaction = exports.Pool = void 0;
-exports.get = get;
-exports.getConnectionList = getConnectionList;
 // --- Pool 是使用时必须要一个用户创建一份的，Connection 是池子里获取的 ---
 // --- 第三方 ---
-const mysql2 = __importStar(require("mysql2/promise"));
+import * as mysql2 from 'mysql2/promise';
 // --- 库和定义 ---
-const time = __importStar(require("~/lib/time"));
-const lSql = __importStar(require("~/lib/sql"));
-const lCore = __importStar(require("~/lib/core"));
-const lText = __importStar(require("~/lib/text"));
-const ctr = __importStar(require("~/sys/ctr"));
+import * as lTime from '../lib/time.js';
+import * as lSql from '../lib/sql.js';
+import * as lCore from '../lib/core.js';
+import * as lText from '../lib/text.js';
+import * as sCtr from '../sys/ctr.js';
 /** --- 连接列表池 --- */
 const connections = [];
 /**
- * --- 计划任务 30 秒一次，关闭超过 3 分钟不活动的连接，回滚独占时间过长的连接 ---
+ * --- 计划任务 10 秒一次，关闭超过 30 秒不活动的连接，回滚独占时间过长的连接 ---
  */
 async function checkConnection() {
-    const now = time.stamp();
+    const now = lTime.stamp();
     for (let i = 0; i < connections.length; ++i) {
         const connection = connections[i];
         if (connection.isLost()) {
@@ -67,9 +29,9 @@ async function checkConnection() {
             continue;
         }
         if (connection.isUsing()) {
-            // --- 连接正在被使用，看看是否空闲了超过 1 分钟，超过则不是正常状态 ---
-            if (connection.getLast() <= now - 60) {
-                // --- 1 分钟之前开始的 ---
+            // --- 连接正在被使用，看看是否空闲了超过 30 秒，超过则不是正常状态 ---
+            if (connection.getLast() <= now - 30) {
+                // --- 30 秒之前开始的 ---
                 const ls = connection.getLastSql();
                 const newarr = ls.map(item => {
                     if (!item.values) {
@@ -77,31 +39,32 @@ async function checkConnection() {
                     }
                     return lSql.format(item.sql, item.values);
                 });
-                lCore.display(`[DB][error] There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`);
-                lCore.log({}, `[DB][checkConnection] There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`, '-error');
+                const msg = `[DB][checkConnection] There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`;
+                lCore.display(msg);
+                lCore.log({}, msg, '-error');
                 await connection.rollback();
             }
             continue;
         }
         // --- 目前未被使用中的连接 ---
-        if (connection.getLast() > now - 180) {
-            // --- 3 分钟内使用过，不管 ---
+        if (connection.getLast() > now - 30) {
+            // --- 30 秒内使用过，不管 ---
             continue;
         }
-        // --- 超 3 分钟未被使用，则关闭 ---
+        // --- 超 30 秒未被使用，则关闭 ---
         await connection.end();
         connections.splice(i, 1);
         --i;
     }
     setTimeout(function () {
         checkConnection().catch(e => { lCore.display('[DB][checkConnection]', e); });
-    }, 30_000);
+    }, 10_000);
 }
 setTimeout(function () {
     checkConnection().catch(e => { lCore.display('[DB][checkConnection]', e); });
-}, 30_000);
+}, 10_000);
 /** --- 数据库连接池对象 --- */
-class Pool {
+export class Pool {
     constructor(etc) {
         /** --- SQL 执行次数 --- */
         this._queries = 0;
@@ -194,7 +157,7 @@ class Pool {
                     'database': this._etc.name,
                     'user': this._etc.user,
                     'password': this._etc.pwd,
-                    'connectTimeout': 3000
+                    'connectTimeout': 3_000,
                 });
                 const c = new Connection(this._etc, link);
                 c.using();
@@ -204,13 +167,16 @@ class Pool {
                     }
                     c.setLost();
                 }).on('end', function () {
+                    lCore.debug('[DB][_getConnection] connection end.');
                     c.setLost();
                 });
                 conn = c;
                 connections.push(conn);
             }
             catch (e) {
-                lCore.log({}, '[DB][Pool][_getConnection]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                const msg = '[DB][_getConnection] ' + lText.stringifyJson(e.stack).slice(1, -1);
+                lCore.debug(msg);
+                lCore.log({}, msg, '-error');
             }
         }
         return conn;
@@ -222,9 +188,8 @@ class Pool {
         return this._queries;
     }
 }
-exports.Pool = Pool;
 /** --- 事务连接对象，commit 和 rollback 后将无法使用 --- */
-class Transaction {
+export class Transaction {
     constructor(ctr, conn, opts = {}) {
         /** --- SQL 执行次数 --- */
         this._queries = 0;
@@ -338,9 +303,8 @@ class Transaction {
         return true;
     }
 }
-exports.Transaction = Transaction;
 /** --- 数据库连接对象 --- */
-class Connection {
+export class Connection {
     constructor(etc, link) {
         /** --- 本连接最后一次使用时间 --- */
         this._last = 0;
@@ -421,7 +385,7 @@ class Connection {
      * --- 设定最后使用时间 ---
      */
     refreshLast() {
-        this._last = time.stamp();
+        this._last = lTime.stamp();
     }
     /**
      * --- 通过执行一条语句判断当前连接是否可用 ---
@@ -573,19 +537,18 @@ class Connection {
         }
     }
 }
-exports.Connection = Connection;
 /**
  * --- 获取 Db Pool 对象 ---
  * @param etc 配置信息可留空
  */
-function get(ctrEtc) {
-    const etc = ctrEtc instanceof ctr.Ctr ? ctrEtc.getPrototype('_config').db : ctrEtc;
+export function get(ctrEtc) {
+    const etc = ctrEtc instanceof sCtr.Ctr ? ctrEtc.getPrototype('_config').db : ctrEtc;
     return new Pool(etc);
 }
 /**
  * --- 获取当前连接池中所有连接的信息 ---
  */
-function getConnectionList() {
+export function getConnectionList() {
     const list = [];
     for (let i = 0; i < connections.length; ++i) {
         const connection = connections[i];

package/lib/dns.d.ts

@@ -3,7 +3,7 @@
  * Date: 2019-6-19
  * Last: 2022-09-12 20:58:07, 2024-2-21 17:55:54, 2025-6-13 19:08:56
  */
-import * as ctr from '~/sys/ctr';
+import * as ctr from '../sys/ctr.js';
 /**
  * 0.DNSPod：https://www.dnspod.cn/docs/index.html（腾讯云也请使用 DNSPod 的 API）
  * 1.阿里云：https://help.aliyun.com/document_detail/29745.html