@maiyunnet/kebab 9.17.0 → 9.17.1

package/doc/kebab-rag.md

@@ -1428,7 +1428,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.17.0"` = `'9.17.0'`
+> `const` **VER**: `"9.17.1"` = `'9.17.1'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -113464,21 +113464,33 @@ Defined in: [lib/db/conn.ts:64](https://github.com/maiyunnet/kebab/blob/master/l
 
 ### beginTransaction()
 
-> **beginTransaction**(): `Promise`\<`boolean`\>
+> **beginTransaction**(`logError?`): `Promise`\<`boolean`\>
 
-Defined in: [lib/db/conn.ts:326](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L326)
+Defined in: [lib/db/conn.ts:337](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L337)
+
+开启事务，只能在独占连接中使用
+
+#### Parameters
+
+##### logError?
+
+`boolean` = `true`
+
+失败时是否记录错误，连接池在非最后一次重试时传 false
 
 #### Returns
 
 `Promise`\<`boolean`\>
 
+是否开启成功
+
 ***
 
 ### commit()
 
 > **commit**(): `Promise`\<`boolean`\>
 
-Defined in: [lib/db/conn.ts:352](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L352)
+Defined in: [lib/db/conn.ts:367](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L367)
 
 #### Returns
 
@@ -113490,7 +113502,7 @@ Defined in: [lib/db/conn.ts:352](https://github.com/maiyunnet/kebab/blob/master/
 
 > **end**(): `Promise`\<`boolean`\>
 
-Defined in: [lib/db/conn.ts:315](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L315)
+Defined in: [lib/db/conn.ts:320](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L320)
 
 关闭连接，一般情况下不使用
 
@@ -113504,7 +113516,7 @@ Defined in: [lib/db/conn.ts:315](https://github.com/maiyunnet/kebab/blob/master/
 
 > **execute**(`sql`, `values?`): `Promise`\<[`IPacket`](../../interfaces/IPacket.md)\>
 
-Defined in: [lib/db/conn.ts:241](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L241)
+Defined in: [lib/db/conn.ts:246](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L246)
 
 执行一条 SQL 并获得影响行数对象 packet
 
@@ -113588,7 +113600,7 @@ Defined in: [lib/db/conn.ts:78](https://github.com/maiyunnet/kebab/blob/master/l
 
 > **isAvailable**(`last?`): `Promise`\<`boolean`\>
 
-Defined in: [lib/db/conn.ts:159](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L159)
+Defined in: [lib/db/conn.ts:164](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L164)
 
 通过执行一条语句判断当前连接是否可用
 
@@ -113652,7 +113664,7 @@ Defined in: [lib/db/conn.ts:123](https://github.com/maiyunnet/kebab/blob/master/
 
 > **query**(`sql`, `values?`): `Promise`\<[`IData`](../../interfaces/IData.md)\>
 
-Defined in: [lib/db/conn.ts:182](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L182)
+Defined in: [lib/db/conn.ts:187](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L187)
 
 执行一条 SQL 并获得返回数据
 
@@ -113680,7 +113692,7 @@ Defined in: [lib/db/conn.ts:182](https://github.com/maiyunnet/kebab/blob/master/
 
 > **refreshLast**(): `void`
 
-Defined in: [lib/db/conn.ts:151](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L151)
+Defined in: [lib/db/conn.ts:156](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L156)
 
 设定最后使用时间
 
@@ -113694,7 +113706,7 @@ Defined in: [lib/db/conn.ts:151](https://github.com/maiyunnet/kebab/blob/master/
 
 > **rollback**(): `Promise`\<`boolean`\>
 
-Defined in: [lib/db/conn.ts:372](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L372)
+Defined in: [lib/db/conn.ts:387](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L387)
 
 #### Returns
 
@@ -113720,7 +113732,7 @@ Defined in: [lib/db/conn.ts:102](https://github.com/maiyunnet/kebab/blob/master/
 
 > **used**(): `void`
 
-Defined in: [lib/db/conn.ts:144](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L144)
+Defined in: [lib/db/conn.ts:149](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L149)
 
 取消占用
 
@@ -113732,11 +113744,21 @@ Defined in: [lib/db/conn.ts:144](https://github.com/maiyunnet/kebab/blob/master/
 
 ### using()
 
-> **using**(): `boolean`
+> **using**(`opt?`): `boolean`
+
+Defined in: [lib/db/conn.ts:131](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L131)
 
-Defined in: [lib/db/conn.ts:130](https://github.com/maiyunnet/kebab/blob/master/lib/db/conn.ts#L130)
+判断是否可用（丢失的也算不可用），返回 true 代表获取成功
 
-判断是否可用（丢失的也算不可用），返回 true 代表获取成功并自动刷新最后时间
+#### Parameters
+
+##### opt?
+
+获取选项，连接巡检独占时不刷新最后使用时间
+
+###### refreshLast?
+
+`boolean`
 
 #### Returns
 
@@ -114044,7 +114066,7 @@ lib/db/pool/classes/Pool.md
 
 # Class: Pool
 
-Defined in: [lib/db/pool.ts:122](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L122)
+Defined in: [lib/db/pool.ts:127](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L127)
 
 数据库连接池对象
 
@@ -114054,7 +114076,7 @@ Defined in: [lib/db/pool.ts:122](https://github.com/maiyunnet/kebab/blob/master/
 
 > **new Pool**(`etc`, `opt`): `Pool`
 
-Defined in: [lib/db/pool.ts:133](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L133)
+Defined in: [lib/db/pool.ts:138](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L138)
 
 #### Parameters
 
@@ -114080,7 +114102,7 @@ Defined in: [lib/db/pool.ts:133](https://github.com/maiyunnet/kebab/blob/master/
 
 > **beginTransaction**(`ctr`): `Promise`\<[`Transaction`](../../tran/classes/Transaction.md) \| `null`\>
 
-Defined in: [lib/db/pool.ts:201](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L201)
+Defined in: [lib/db/pool.ts:206](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L206)
 
 开启事务，返回事务对象并锁定连接，别人任何人不可用，有 ctr 的话必传 this，独立执行时可传 null
 
@@ -114100,7 +114122,7 @@ Defined in: [lib/db/pool.ts:201](https://github.com/maiyunnet/kebab/blob/master/
 
 > **execute**(`sql`, `values?`): `Promise`\<[`IPacket`](../../interfaces/IPacket.md)\>
 
-Defined in: [lib/db/pool.ts:181](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L181)
+Defined in: [lib/db/pool.ts:186](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L186)
 
 执行一条 SQL 并获得影响行数对象 packet，连接失败抛出错误
 
@@ -114128,7 +114150,7 @@ Defined in: [lib/db/pool.ts:181](https://github.com/maiyunnet/kebab/blob/master/
 
 > **getName**(): `string`
 
-Defined in: [lib/db/pool.ts:147](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L147)
+Defined in: [lib/db/pool.ts:152](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L152)
 
 获取当前连接的数据库名称
 
@@ -114142,7 +114164,7 @@ Defined in: [lib/db/pool.ts:147](https://github.com/maiyunnet/kebab/blob/master/
 
 > **getQueries**(): `number`
 
-Defined in: [lib/db/pool.ts:339](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L339)
+Defined in: [lib/db/pool.ts:346](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L346)
 
 获取 SQL 执行次数
 
@@ -114156,7 +114178,7 @@ Defined in: [lib/db/pool.ts:339](https://github.com/maiyunnet/kebab/blob/master/
 
 > **getService**(): [`ESERVICE`](../../enumerations/ESERVICE.md)
 
-Defined in: [lib/db/pool.ts:142](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L142)
+Defined in: [lib/db/pool.ts:147](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L147)
 
 获取当前连接的服务商
 
@@ -114170,7 +114192,7 @@ Defined in: [lib/db/pool.ts:142](https://github.com/maiyunnet/kebab/blob/master/
 
 > **query**(`sql`, `values?`): `Promise`\<[`IData`](../../interfaces/IData.md)\>
 
-Defined in: [lib/db/pool.ts:157](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L157)
+Defined in: [lib/db/pool.ts:162](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L162)
 
 执行一条 SQL，无视顺序和相同连接，随用随取
 

package/index.d.ts

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

package/index.js

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

package/lib/db/conn.d.ts

@@ -53,9 +53,12 @@ export declare class Connection {
      */
     isUsing(): boolean;
     /**
-     * --- 判断是否可用（丢失的也算不可用），返回 true 代表获取成功并自动刷新最后时间 ---
+     * --- 判断是否可用（丢失的也算不可用），返回 true 代表获取成功 ---
+     * @param opt 获取选项，连接巡检独占时不刷新最后使用时间
      */
-    using(): boolean;
+    using(opt?: {
+        'refreshLast'?: boolean;
+    }): boolean;
     /**
      * --- 取消占用 ---
      */
@@ -85,7 +88,12 @@ export declare class Connection {
      * --- 关闭连接，一般情况下不使用 ---
      */
     end(): Promise<boolean>;
-    beginTransaction(): Promise<boolean>;
+    /**
+     * --- 开启事务，只能在独占连接中使用 ---
+     * @param logError 失败时是否记录错误，连接池在非最后一次重试时传 false
+     * @returns 是否开启成功
+     */
+    beginTransaction(logError?: boolean): Promise<boolean>;
     commit(): Promise<boolean>;
     rollback(): Promise<boolean>;
 }

package/lib/db/conn.js

@@ -99,14 +99,17 @@ export class Connection {
         return this._using;
     }
     /**
-     * --- 判断是否可用（丢失的也算不可用），返回 true 代表获取成功并自动刷新最后时间 ---
+     * --- 判断是否可用（丢失的也算不可用），返回 true 代表获取成功 ---
+     * @param opt 获取选项，连接巡检独占时不刷新最后使用时间
      */
-    using() {
+    using(opt = {}) {
         if (this._lost || this._using) {
             return false;
         }
         else {
-            this.refreshLast();
+            if (opt.refreshLast !== false) {
+                this.refreshLast();
+            }
             this._using = true;
             return true;
         }
@@ -281,6 +284,8 @@ export class Connection {
      * --- 关闭连接，一般情况下不使用 ---
      */
     async end() {
+        // --- 驱动的 end 事件可能在异步关闭完成后才触发，提前标记避免连接池在关闭期间重新取到本连接 ---
+        this._lost = true;
         try {
             await this._link.end();
             return true;
@@ -289,8 +294,12 @@ export class Connection {
             return false;
         }
     }
-    // --- 事务，只能在独占连接中使用，pool 创建事务返回独占连接，commit 或 rollback 释放连接回连接池 ---
-    async beginTransaction() {
+    /**
+     * --- 开启事务，只能在独占连接中使用 ---
+     * @param logError 失败时是否记录错误，连接池在非最后一次重试时传 false
+     * @returns 是否开启成功
+     */
+    async beginTransaction(logError = true) {
         if (this._using) {
             try {
                 this._transaction = true;
@@ -306,12 +315,16 @@ export class Connection {
                 this._transaction = false;
                 this._using = false;
                 this._lost = true;
-                lCore.log({}, '[DB][Connection][beginTransaction] ' + lText.stringifyError(e), '-error');
+                if (logError) {
+                    lCore.log({}, '[DB][Connection][beginTransaction] ' + lText.stringifyError(e), '-error');
+                }
                 return false;
             }
         }
         else {
-            lCore.log({}, '[DB][Connection][beginTransaction] connection is not in use', '-error');
+            if (logError) {
+                lCore.log({}, '[DB][Connection][beginTransaction] connection is not in use', '-error');
+            }
             return false;
         }
     }

package/lib/db/pool.js

@@ -67,6 +67,10 @@ async function checkConnection() {
             }
             continue;
         }
+        // --- 巡检探活或关闭前先独占连接，避免业务在异步操作期间取到同一连接 ---
+        if (!connection.using({ 'refreshLast': false })) {
+            continue;
+        }
         if (connection.getLast() <= now - 30) {
             // --- 超 30 秒未被使用，则关闭 ---
             await connection.end();
@@ -75,8 +79,9 @@ async function checkConnection() {
             continue;
         }
         // --- 30 秒内使用过，看看连接是否正常 ---
-        if (await connection.isAvailable(false)) {
+        if (await connection.isAvailable(false) && !connection.isLost()) {
             // --- 正常 ---
+            connection.used();
             continue;
         }
         // --- 连接有问题，直接关闭 ---
@@ -120,7 +125,7 @@ export class Pool {
      */
     async query(sql, values) {
         ++this._queries;
-        // --- 获取并自动 using  ---
+        // --- 获取并自动 using ---
         const conn = await this._getConnection();
         if (!conn) {
             return {
@@ -167,7 +172,9 @@ export class Pool {
                 lCore.log(ctr ?? {}, `[DB][Pool][beginTransaction] failed to get connection, service: ${lDb.ESERVICE[this._service]}, database: ${this._etc.name ?? ''}`, '-error');
                 return null;
             }
-            if (!await conn.beginTransaction()) {
+            /** --- 只有最后一次尝试仍失败时才记录原始错误，避免已恢复的重试被误判为业务失败 --- */
+            const logError = i === BEGIN_TRANSACTION_MAX_ATTEMPTS - 1;
+            if (!await conn.beginTransaction(logError)) {
                 continue;
             }
             return new Transaction(ctr, conn);

package/lib/undici/response.d.ts

@@ -31,7 +31,7 @@ export declare class Response {
     /**
      * --- 获取响应读取流对象 ---
      */
-    getStream(): (import("undici/types/readable").default & undici.Dispatcher.BodyMixin) | zlib.Gunzip | zlib.Inflate | zlib.BrotliDecompress | null;
+    getStream(): zlib.BrotliDecompress | zlib.Gunzip | zlib.Inflate | (import("undici/types/readable").default & undici.Dispatcher.BodyMixin) | null;
     /**
      * --- 获取原生响应读取流对象 ---
      */

package/package.json

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