baja-lite 1.3.42 → 1.3.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.42",
+  "version": "1.3.44",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -49,20 +49,20 @@
     "reflect-metadata": "0.2.2",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "sql-formatter": "15.4.11",
+    "sql-formatter": "15.5.2",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "7.6.12",
+    "@types/better-sqlite3": "7.6.13",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.5",
-    "@types/node": "22.13.10",
+    "@types/node": "22.13.0",
     "@types/pg-pool": "2.0.6",
     "@types/shelljs": "0.8.15",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.27.0",
-    "@typescript-eslint/parser": "8.27.0",
+    "@typescript-eslint/eslint-plugin": "8.29.1",
+    "@typescript-eslint/parser": "8.29.1",
     "better-sqlite3": "11.9.1",
     "ioredis": "5.6.0",
     "mongodb": "6.15.0",

package/sql.d.ts

@@ -1741,6 +1741,7 @@ export declare function getRedisDB<T = any>(db?: string): T;
  redlock
  */
 export declare function GetRedisLock(key: string, lockMaxActive?: number): Promise<boolean>;
+/** 对FN加锁、缓存执行 */
 export declare function excuteWithLock<T>(config: {
     /** 返回缓存key,参数=方法的参数+当前用户对象，可以用来清空缓存。 */
     key: ((...args: any[]) => string) | string;
@@ -1774,7 +1775,12 @@ export declare function MethodLock<T = any>(config: {
     /** 单个锁多少【毫秒】后自动释放?即时任务没有执行完毕或者没有主动释放锁?  */
     lockMaxTime?: number;
 }): (target: T, _propertyKey: string, descriptor: PropertyDescriptor) => void;
+/** 清空方法缓存 */
 export declare function clearMethodCache(key: string): Promise<void>;
+/**
+ * 执行一个方法fn，
+ * 如果有缓存，则返回缓存，否则执行方法并缓存
+ */
 export declare function excuteWithCache<T>(config: {
     /** 返回缓存key,参数=方法的参数+当前用户对象，可以用来清空缓存。 */
     key: string;
@@ -1784,7 +1790,8 @@ export declare function excuteWithCache<T>(config: {
     autoClearTime?: number;
     /** 随着当前用户sesion的清空而一起清空 */
     clearWithSession?: boolean;
-}, fn: () => Promise<T>): Promise<any>;
+}, fn: () => Promise<T>): Promise<T>;
+/** 缓存注解 */
 export declare function MethodCache<T = any>(config: {
     /** 返回缓存key,参数=方法的参数[注意：必须和主方法的参数数量、完全一致，同时会追加一个当前用户对象]+当前用户对象，可以用来清空缓存。 */
     key: ((this: T, ...args: any[]) => string) | string;

package/sql.js

@@ -4567,6 +4567,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 db = getRedisDB();
@@ -4587,13 +4588,13 @@ export async function excuteWithLock(config, fn__) {
         }
         else {
             logger.debug(`get lock ${key} ok!`);
-            await db.get('other').pexpire(key, config.lockMaxTime ?? 60000);
+            await db.pexpire(key, config.lockMaxTime ?? 60000);
             try {
                 return await fn__();
             }
             finally {
                 logger.debug(`unlock ${key} ok!`);
-                await db.get('other').decr(key);
+                await db.decr(key);
             }
         }
     };
@@ -4609,6 +4610,7 @@ export function MethodLock(config) {
         };
     };
 }
+/** 设置方法缓存 */
 async function setMethodCache(config, devid) {
     const db = getRedisDB();
     if (config.result !== null && config.result !== undefined) {
@@ -4639,6 +4641,7 @@ async function setMethodCache(config, devid) {
         }
     }
 }
+/** 清空方法缓存 */
 export async function clearMethodCache(key) {
     const db = getRedisDB();
     let type = await db.type(`[cache-parent]${key}`);
@@ -4677,6 +4680,10 @@ async function clearParent(clearKey) {
         }
     }
 }
+/**
+ * 执行一个方法fn，
+ * 如果有缓存，则返回缓存，否则执行方法并缓存
+ */
 export async function excuteWithCache(config, fn) {
     const db = getRedisDB();
     const cache = await db.get(`[cache]${config.key}`);
@@ -4696,13 +4703,14 @@ export async function excuteWithCache(config, fn) {
         return result;
     }
 }
+/** 缓存注解 */
 export function MethodCache(config) {
     return function (target, _propertyKey, descriptor) {
         const fn = descriptor.value;
         descriptor.value = async function (...args) {
             const key = typeof config.key === 'function' ? config.key.call(this, ...args) : config.key;
             const db = getRedisDB();
-            const cache = await db.get('other').get(`[cache]${key}`);
+            const cache = await db.get(`[cache]${key}`);
             if (cache) {
                 logger.debug(`cache ${key} hit!`);
                 return JSON.parse(cache);