baja-lite 1.8.3 → 1.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -43,7 +43,7 @@
     "pino": "10.3.1",
     "pino-pretty": "13.1.3",
     "reflect-metadata": "0.2.2",
-    "sql-formatter": "15.7.3",
+    "sql-formatter": "15.8.0",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },

package/sql.d.ts

@@ -2139,7 +2139,7 @@ export declare function clearMethodCache(key: string): Promise<void>;
  */
 export declare function excuteWithCache<T>(config: {
     /** 返回缓存key,参数=方法的参数+当前用户对象，可以用来清空缓存。 */
-    key: string;
+    key: ((...args: any[]) => string) | string;
     /** 返回缓存清除key,参数=方法的参数+当前用户对象，可以用来批量清空缓存 */
     clearKey?: string[];
     /** 自动清空缓存的时间，单位分钟 */

package/sql.js

@@ -18,7 +18,7 @@ import pino from 'pino';
 import { formatDialect, mysql, postgresql, sqlite } from 'sql-formatter';
 import tslib from 'tslib';
 import { convert } from './convert-xml.js';
-import { DatabaseError, Throw } from './error.js';
+import { Throw } from './error.js';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
 import { add, calc, ten2Any } from './math.js';
 import { C2P, C2P2, P2C } from './object.js';
@@ -248,9 +248,8 @@ class MysqlConnection {
                 resolve({ affectedRows: result.affectedRows, insertId: result.insertId });
             }
             catch (error) {
-                const dbError = DatabaseError.query('MySQL execute failed', sql, params, error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
         });
     }
@@ -443,9 +442,8 @@ export class Mysql {
                 resolve(new MysqlConnection(connection));
             }
             catch (error) {
-                const dbError = DatabaseError.connection('Failed to create MySQL connection', error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
         });
     }
@@ -484,9 +482,8 @@ export class Mysql {
                     await conn[_daoConnection].rollback();
                     globalThis[_LoggerService].debug?.('rollback end!');
                 }
-                const dbError = error instanceof DatabaseError ? error : DatabaseError.transaction('MySQL transaction failed', error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
             finally {
                 try {
@@ -802,9 +799,8 @@ export class Postgresql {
                     await conn[_daoConnection].query('ROLLBACK');
                     globalThis[_LoggerService].debug?.('rollback end!');
                 }
-                const dbError = error instanceof DatabaseError ? error : DatabaseError.transaction('PostgreSQL transaction failed', error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
             finally {
                 try {
@@ -5166,7 +5162,7 @@ export async function GetRedisLock(key, lockMaxActive) {
 ;
 /** 对FN加锁、缓存执行 */
 export async function excuteWithLock(config, fn__) {
-    const key = `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
+    const key = config.key_real ? `[lock]${config.key_real}` : `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
     const db = getRedisDB();
     let wait_time = 0;
     const fn = async () => {
@@ -5202,7 +5198,7 @@ export function MethodLock(config) {
     return function (target, _propertyKey, descriptor) {
         const fn__ = descriptor.value;
         descriptor.value = async function (...args) {
-            config.key = typeof config.key === 'function' ? config.key.call(target, ...args) : config.key;
+            config.key_real = typeof config.key === 'function' ? config.key.call(target, ...args) : config.key;
             return await excuteWithLock(config, async () => await fn__.call(this, ...args));
         };
     };
@@ -5283,16 +5279,17 @@ async function clearParent(clearKey) {
  */
 export async function excuteWithCache(config, fn) {
     const db = getRedisDB();
-    const cache = await db.get(`[cache]${config.key}`);
+    const key = typeof config.key === 'function' ? config.key() : config.key;
+    const cache = await db.get(`[cache]${key}`);
     if (cache) {
-        globalThis[_LoggerService].debug?.(`cache ${config.key} hit!`);
+        globalThis[_LoggerService].debug?.(`cache ${key} hit!`);
         return JSON.parse(cache);
     }
     else {
-        globalThis[_LoggerService].debug?.(`cache ${config.key} miss!`);
         const result = await fn();
+        globalThis[_LoggerService].debug?.(`cache ${key} miss!`);
         await setMethodCache({
-            key: config.key,
+            key,
             clearKey: config.clearKey,
             autoClearTime: config.autoClearTime,
             result