baja-lite 1.8.7 → 1.8.8

package/sql.js

@@ -238,20 +238,20 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const [_result] = await this[_daoConnection].execute(sql, params);
                 const result = _result;
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(result);
                 }
-                resolve({ affectedRows: result.affectedRows, insertId: result.insertId });
+                return { affectedRows: result.affectedRows, insertId: result.insertId };
             }
             catch (error) {
                 globalThis[_LoggerService].error(error.message, { cause: error });
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     pluck(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -267,16 +267,14 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (result && result[0]) {
                     const r = Object.values(result[0])[0];
-                    resolve(r === null ? null : r);
-                }
-                else {
-                    resolve(null);
+                    return r === null ? null : r;
                 }
+                return null;
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -284,9 +282,9 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     get(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -302,15 +300,16 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(result);
                 }
-                if (result && result[0])
-                    resolve(result[0]);
-                resolve(null);
+                if (result && result[0]) {
+                    return result[0];
+                }
+                return null;
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -318,9 +317,9 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     raw(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -336,15 +335,18 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(result);
                 }
-                if (result)
-                    resolve(result.map((i) => Object.values(i)[0]));
-                resolve([]);
+                // 修复 fall-through：原代码 `if (result) resolve(...); resolve([])` 第二行
+                // 是 no-op，但写法埋雷。
+                if (result) {
+                    return result.map((i) => Object.values(i)[0]);
+                }
+                return [];
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -352,9 +354,9 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     query(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -370,13 +372,13 @@ class MysqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(result);
                 }
-                resolve(result);
+                return result;
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -384,9 +386,9 @@ class MysqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     release(sync) {
         try {
@@ -435,17 +437,17 @@ export class Mysql {
             return null;
         }
         ;
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const connection = await this[_daoDB].getConnection();
                 globalThis[_LoggerService].debug?.('create new connection!');
-                resolve(new MysqlConnection(connection));
+                return new MysqlConnection(connection);
             }
             catch (error) {
                 globalThis[_LoggerService].error(error.message, { cause: error });
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     transaction(sync, fn, conn) {
         if (sync === SyncMode.Sync) {
@@ -453,7 +455,7 @@ export class Mysql {
             return null;
         }
         ;
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             let needCommit = false;
             let newConn = false;
             if (!conn) {
@@ -474,7 +476,7 @@ export class Mysql {
                     await conn[_daoConnection].commit();
                     globalThis[_LoggerService].debug?.('commit end!');
                 }
-                resolve(result);
+                return result;
             }
             catch (error) {
                 if (needCommit) {
@@ -483,7 +485,7 @@ export class Mysql {
                     globalThis[_LoggerService].debug?.('rollback end!');
                 }
                 globalThis[_LoggerService].error(error.message, { cause: error });
-                reject(error);
+                throw error;
             }
             finally {
                 try {
@@ -501,7 +503,7 @@ export class Mysql {
                     globalThis[_LoggerService].warn?.('Failed to release connection in finally block', error);
                 }
             }
-        });
+        })();
     }
     close(sync) {
         this.isClosing = true;
@@ -536,7 +538,7 @@ class PostgresqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const { rowCount } = await this[_daoConnection].query({
                     text: replacePlaceholders(sql),
@@ -546,7 +548,7 @@ class PostgresqlConnection {
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(result);
                 }
-                resolve({ affectedRows: rowCount || 0, insertId: 0n });
+                return { affectedRows: rowCount || 0, insertId: 0n };
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -554,9 +556,9 @@ class PostgresqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     pluck(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -572,20 +574,19 @@ class PostgresqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const { rows } = await this[_daoConnection].query({
                     text: replacePlaceholders(sql),
                     values: params
                 });
+                // 修复 fall-through：原代码 if 分支 resolve 后没 return，导致 resolve(null)
+                // 紧跟其后（虽然第二次 resolve 是 no-op，但写法有歧义）。
                 if (rows && rows[0]) {
                     const r = Object.values(rows[0])[0];
-                    if (r === null)
-                        resolve(r);
-                    else
-                        resolve(r);
+                    return r === null ? null : r;
                 }
-                resolve(null);
+                return null;
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -593,9 +594,9 @@ class PostgresqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     get(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -611,7 +612,7 @@ class PostgresqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const { rows } = await this[_daoConnection].query({
                     text: replacePlaceholders(sql),
@@ -620,9 +621,10 @@ class PostgresqlConnection {
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(rows);
                 }
-                if (rows && rows[0])
-                    resolve(rows[0]);
-                resolve(null);
+                if (rows && rows[0]) {
+                    return rows[0];
+                }
+                return null;
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -630,9 +632,9 @@ class PostgresqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     raw(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -648,7 +650,7 @@ class PostgresqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const { rows } = await this[_daoConnection].query({
                     text: replacePlaceholders(sql),
@@ -657,9 +659,10 @@ class PostgresqlConnection {
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(rows);
                 }
-                if (rows)
-                    resolve(rows.map((i) => Object.values(i)[0]));
-                resolve([]);
+                if (rows) {
+                    return rows.map((i) => Object.values(i)[0]);
+                }
+                return [];
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -667,9 +670,9 @@ class PostgresqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     query(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -685,7 +688,7 @@ class PostgresqlConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const { rows } = await this[_daoConnection].query({
                     text: replacePlaceholders(sql),
@@ -694,7 +697,7 @@ class PostgresqlConnection {
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(rows);
                 }
-                resolve(rows);
+                return rows;
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -702,9 +705,9 @@ class PostgresqlConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     release(sync) {
         try {
@@ -753,16 +756,16 @@ export class Postgresql {
             return null;
         }
         ;
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const connection = await this[_daoDB].connect();
                 globalThis[_LoggerService].debug?.('create new connection!');
-                resolve(new PostgresqlConnection(connection));
+                return new PostgresqlConnection(connection);
             }
             catch (error) {
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     transaction(sync, fn, conn) {
         if (sync === SyncMode.Sync) {
@@ -770,7 +773,7 @@ export class Postgresql {
             return null;
         }
         ;
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             let needCommit = false;
             let newConn = false;
             if (!conn) {
@@ -791,7 +794,7 @@ export class Postgresql {
                     await conn[_daoConnection].query('COMMIT');
                     globalThis[_LoggerService].debug?.('commit end!');
                 }
-                resolve(result);
+                return result;
             }
             catch (error) {
                 if (needCommit) {
@@ -800,7 +803,7 @@ export class Postgresql {
                     globalThis[_LoggerService].debug?.('rollback end!');
                 }
                 globalThis[_LoggerService].error(error.message, { cause: error });
-                reject(error);
+                throw error;
             }
             finally {
                 try {
@@ -818,7 +821,7 @@ export class Postgresql {
                     globalThis[_LoggerService].warn?.('Failed to release connection in finally block', error);
                 }
             }
-        });
+        })();
     }
     close(sync) {
         this.isClosing = true;
@@ -1087,11 +1090,11 @@ export class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const data = await this[_daoConnection].execute(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
                 const { affectedRows, insertId } = decode(data, { extensionCodec });
-                resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
+                return { affectedRows, insertId: insertId ? BigInt(insertId) : 0n };
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -1099,9 +1102,9 @@ export class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     pluck(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -1117,11 +1120,10 @@ export class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
-                const r = decode(data, { extensionCodec });
-                resolve(r);
+                return decode(data, { extensionCodec });
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -1129,9 +1131,9 @@ export class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     get(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -1147,11 +1149,10 @@ export class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const data = await this[_daoConnection].get(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
-                const r = decode(data, { extensionCodec });
-                resolve(r);
+                return decode(data, { extensionCodec });
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -1159,9 +1160,9 @@ export class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     raw(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -1177,11 +1178,10 @@ export class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const data = await this[_daoConnection].raw(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
-                const r = decode(data, { extensionCodec });
-                resolve(r);
+                return decode(data, { extensionCodec });
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -1189,9 +1189,9 @@ export class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     query(sync, sql, params) {
         globalThis[_LoggerService].debug?.(sql, params ?? '');
@@ -1207,11 +1207,10 @@ export class SqliteRemoteConnection {
         if (globalThis[_GlobalSqlOption].log === 'trace') {
             globalThis[_LoggerService].verbose?.(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
-        return new Promise(async (resolve, reject) => {
+        return (async () => {
             try {
                 const data = await this[_daoConnection].query(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
-                const r = decode(data, { extensionCodec });
-                resolve(r);
+                return decode(data, { extensionCodec });
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -1219,9 +1218,9 @@ export class SqliteRemoteConnection {
                     sql: ${sql},
                     params: ${params}
                 `);
-                reject(error);
+                throw error;
             }
-        });
+        })();
     }
     release(sync) {
     }
@@ -1238,17 +1237,10 @@ export class SqliteRemote {
             return null;
         }
         ;
-        return new Promise(async (resolve, reject) => {
-            if (!this.connection) {
-                this.connection = new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]);
-            }
-            try {
-                resolve(this.connection);
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
+        if (!this.connection) {
+            this.connection = new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]);
+        }
+        return Promise.resolve(this.connection);
     }
     transaction(sync, fn, conn) {
         globalThis[_LoggerService].warn(`SQLITEREMOTE not supported transaction`);
@@ -1847,6 +1839,19 @@ function P(skipConn = false) {
             option.dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
             option.dbType = this[_dbType] ?? globalThis[_GlobalSqlOption].dbType ?? DBType.Mysql;
             option.dao = globalThis[_dao][option.dbType][option.dbName];
+            // 错误日志输出函数：原实现里 `let args = ''` 把外层 rest 参数 `args` 给遮蔽了，
+            // 导致 args.length 永远是 0，params 日志永远打不出来，生产排查时丢失关键上下文。
+            const dumpArgs = (callArgs) => {
+                if (callArgs.length > 0 && callArgs[0] && callArgs[0].params) {
+                    try {
+                        return JSON.stringify(callArgs[0].params);
+                    }
+                    catch {
+                        return '<unserializable params>';
+                    }
+                }
+                return '';
+            };
             if (option.dbType === DBType.Sqlite) {
                 if (!option.dao) {
                     const db = new Sqlite(new globalThis[_GlobalSqlOption].BetterSqlite3(option.dbName, { fileMustExist: false }));
@@ -1870,11 +1875,7 @@ function P(skipConn = false) {
                     return result;
                 }
                 catch (error) {
-                    let args = '';
-                    if (args.length > 0 && args[0].params) {
-                        args = JSON.stringify(args[0].params);
-                    }
-                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
+                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${dumpArgs(args)}`);
                     throw error;
                 }
                 finally {
@@ -1898,26 +1899,22 @@ function P(skipConn = false) {
                     option.dao = db;
                 }
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
-                return new Promise(async (resolve, reject) => {
-                    // 连接共享
-                    if (skipConn === false && !option.conn) {
-                        (option).conn = await option.dao.createConnection(SyncMode.Async);
-                    }
-                    else {
-                        needRealseConn = false;
-                    }
+                return (async () => {
                     try {
+                        // 连接共享
+                        if (skipConn === false && !option.conn) {
+                            (option).conn = await option.dao.createConnection(SyncMode.Async);
+                        }
+                        else {
+                            needRealseConn = false;
+                        }
                         const result = await fn.call(this, ...args);
                         globalThis[_LoggerService].log(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
-                        resolve(result);
+                        return result;
                     }
                     catch (error) {
-                        let args = '';
-                        if (args.length > 0 && args[0].params) {
-                            args = JSON.stringify(args[0].params);
-                        }
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
-                        reject(error);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${dumpArgs(args)}`);
+                        throw error;
                     }
                     finally {
                         if (needRealseConn && option && option.conn) {
@@ -1928,11 +1925,11 @@ function P(skipConn = false) {
                             }
                         }
                     }
-                });
+                })();
             }
             else if (option.dbType === DBType.Mysql) {
                 Throw.if(!option.dao, `not found db:${String(option.dbName)}(${option.dbType})`);
-                return new Promise(async (resolve, reject) => {
+                return (async () => {
                     try {
                         // 连接共享
                         if (skipConn === false && !option.conn) {
@@ -1943,15 +1940,11 @@ function P(skipConn = false) {
                         }
                         const result = await fn.call(this, ...args);
                         globalThis[_LoggerService].log(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
-                        resolve(result);
+                        return result;
                     }
                     catch (error) {
-                        let args = '';
-                        if (args.length > 0 && args[0].params) {
-                            args = JSON.stringify(args[0].params);
-                        }
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
-                        reject(error);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${dumpArgs(args)}`);
+                        throw error;
                     }
                     finally {
                         if (needRealseConn && option && option.conn) {
@@ -1962,11 +1955,11 @@ function P(skipConn = false) {
                             }
                         }
                     }
-                });
+                })();
             }
             else if (option.dbType === DBType.Postgresql) {
                 Throw.if(!option.dao, `not found db:${String(option.dbName)}(${option.dbType})`);
-                return new Promise(async (resolve, reject) => {
+                return (async () => {
                     try {
                         // 连接共享
                         if (skipConn === false && !option.conn) {
@@ -1977,15 +1970,11 @@ function P(skipConn = false) {
                         }
                         const result = await fn.call(this, ...args);
                         globalThis[_LoggerService].log(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
-                        resolve(result);
+                        return result;
                     }
                     catch (error) {
-                        let args = '';
-                        if (args.length > 0 && args[0].params) {
-                            args = JSON.stringify(args[0].params);
-                        }
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
-                        reject(error);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${dumpArgs(args)}`);
+                        throw error;
                     }
                     finally {
                         if (needRealseConn && option && option.conn) {
@@ -1996,7 +1985,7 @@ function P(skipConn = false) {
                             }
                         }
                     }
-                });
+                })();
             }
         };
     };
@@ -2368,7 +2357,9 @@ export class SqlService {
                 break;
             }
             case InsertMode.InsertWithTempTable: {
-                const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
+                // 用 snowflake 替代 Math.random()——Math.random() 在高并发下可能碰撞，
+                // 同一连接里多次 InsertWithTempTable 会因为撞名 DDL 报错。
+                const tableTemp = `${option?.tableName}_${snowflake.generate()}`;
                 const tableTempESC = tableTemp;
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
                 const finalColumns = new Set();
@@ -2608,7 +2599,7 @@ export class SqlService {
         Throw.if(!!option.id && !!this[_ids] && this[_ids].length > 1, 'muit id must set where!');
         Throw.if(!!option.id && !!option.where && !option.whereSql, 'id and where only one can set!');
         option.mode ?? (option.mode = DeleteMode.Common);
-        const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
+        const tableTemp = `${option?.tableName}_${snowflake.generate()}`;
         const tableTempESC = tableTemp;
         const tableNameESC = option?.tableName;
         if (option.id) {
@@ -2754,7 +2745,7 @@ export class SqlService {
         option.mode ?? (option.mode = SelectMode.Common);
         option.templateResult ?? (option.templateResult = TemplateResult.AssertOne);
         option.error ?? (option.error = 'error data!');
-        const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
+        const tableTemp = `${option?.tableName}_${snowflake.generate()}`;
         const tableTempESC = tableTemp;
         const tableNameESC = option?.tableName;
         if (option.id) {
@@ -2800,23 +2791,18 @@ export class SqlService {
             return this._template(option.templateResult, result, option.error);
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    let result;
-                    for (let i = 0; i < sqls.length; i++) {
-                        if (i === resultIndex) {
-                            result = await option.conn.query(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
-                        }
-                        else {
-                            await option.conn.execute(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
-                        }
+            return (async () => {
+                let result;
+                for (let i = 0; i < sqls.length; i++) {
+                    if (i === resultIndex) {
+                        result = await option.conn.query(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
+                    }
+                    else {
+                        await option.conn.execute(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
                     }
-                    resolve(this._template(option.templateResult, result, option.error));
-                }
-                catch (error) {
-                    reject(error);
                 }
-            });
+                return this._template(option.templateResult, result, option.error);
+            })();
         }
     }
     _select(templateResult, result, def, errorMsg, hump, mapper, mapperIfUndefined, dataConvert) {
@@ -2931,15 +2917,10 @@ export class SqlService {
             return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert);
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    const result = await option.conn.query(SyncMode.Async, sql, params);
-                    resolve(this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return (async () => {
+                const result = await option.conn.query(SyncMode.Async, sql, params);
+                return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert);
+            })();
         }
     }
     selectBatch(option) {
@@ -2956,15 +2937,10 @@ export class SqlService {
             return result.map(item => this._select(option.selectResult, item, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    const result = await option.conn.query(SyncMode.Async, sql, params);
-                    resolve(result.map(item => this._select(option.selectResult, item, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return (async () => {
+                const result = await option.conn.query(SyncMode.Async, sql, params);
+                return result.map(item => this._select(option.selectResult, item, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
+            })();
         }
     }
     excute(option) {
@@ -2977,15 +2953,10 @@ export class SqlService {
             return result.affectedRows;
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    const result = await option.conn.execute(SyncMode.Async, sql, params);
-                    resolve(result.affectedRows);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return (async () => {
+                const result = await option.conn.execute(SyncMode.Async, sql, params);
+                return result.affectedRows;
+            })();
         }
     }
     transaction(option) {
@@ -2993,15 +2964,7 @@ export class SqlService {
             return option.dao.transaction(SyncMode.Sync, option.fn, option.conn);
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    const rt = await option.dao.transaction(SyncMode.Async, option.fn, option.conn);
-                    resolve(rt);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return option.dao.transaction(SyncMode.Async, option.fn, option.conn);
         }
     }
     stream() {
@@ -3019,7 +2982,9 @@ export class SqlService {
         if (option.hump || (option.hump === undefined && globalThis[_Hump]) && option.sortName) {
             option.sortName = P2C(option.sortName);
         }
-        Object.assign(option.params, {
+        // 不要 Object.assign 进调用方的 params——@P 装饰器对 option 只做了浅拷贝，
+        // option.params 仍指向用户传入的对象，原写法会把分页字段写回去污染下一次调用。
+        option.params = Object.assign({}, option.params, {
             limitStart: calc(option.pageNumber).sub(1).mul(option.pageSize).over(),
             limitEnd: option.pageSize - 0,
             sortName: option.sortName ?? undefined,
@@ -3081,43 +3046,40 @@ export class SqlService {
             return result;
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    if (sqlCount) {
-                        result.total = await this.select({
-                            ...option,
-                            sql: sqlCount,
-                            sync: SyncMode.Async,
-                            selectResult: SelectResult.R_C_Assert
-                        });
-                        result.size = calc(result.total)
-                            .add(option.pageSize ?? 10 - 1)
-                            .div(option.pageSize)
-                            .round(0, 2)
-                            .over();
-                    }
-                    if (sqlSum) {
-                        result.sum = await this.select({
-                            ...option,
-                            sql: sqlSum,
-                            sync: SyncMode.Async,
-                            selectResult: SelectResult.R_CS_Assert
-                        });
-                    }
-                    if (sql) {
-                        result.records = await this.select({
-                            ...option,
-                            sql,
-                            sync: SyncMode.Async,
-                            selectResult: SelectResult.RS_CS
-                        });
-                    }
-                    resolve(result);
+            return (async () => {
+                if (sqlCount) {
+                    result.total = await this.select({
+                        ...option,
+                        sql: sqlCount,
+                        sync: SyncMode.Async,
+                        selectResult: SelectResult.R_C_Assert
+                    });
+                    // 修正运算符优先级：`option.pageSize ?? 10 - 1` 被解析为 `pageSize ?? 9`，
+                    // 而同步分支用的是 `option.pageSize - 1`，行为不一致。
+                    result.size = calc(result.total)
+                        .add((option.pageSize ?? 10) - 1)
+                        .div(option.pageSize)
+                        .round(0, 2)
+                        .over();
                 }
-                catch (error) {
-                    reject(error);
+                if (sqlSum) {
+                    result.sum = await this.select({
+                        ...option,
+                        sql: sqlSum,
+                        sync: SyncMode.Async,
+                        selectResult: SelectResult.R_CS_Assert
+                    });
                 }
-            });
+                if (sql) {
+                    result.records = await this.select({
+                        ...option,
+                        sql,
+                        sync: SyncMode.Async,
+                        selectResult: SelectResult.RS_CS
+                    });
+                }
+                return result;
+            })();
         }
     }
     /**
@@ -3219,48 +3181,25 @@ export class SqlService {
             }
         }
         else if (option.dbType === DBType.SqliteRemote) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    if (option?.force) {
-                        await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${tableES};`);
-                    }
-                    const lastVersion = this[_sqlite_version] ?? '1';
-                    // 检查表
-                    const tableCheckResult = await option.conn.pluck(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
-                    if (tableCheckResult) {
-                        // 旧版本
-                        const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
-                        if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
-                            // 更新版本
-                            const columns = iterate(await option.conn.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
-                                .filter(c => this[_fields].hasOwnProperty(C2P(c.name, globalThis[_Hump])))
-                                .map(c => c.name)
-                                .join(',');
-                            const rtable = `${option.tableName}_${tableVersion.replace(/\./, '_')}`;
-                            await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
-                            await option.conn.execute(SyncMode.Async, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
-                            await option.conn.execute(SyncMode.Async, `
-                            CREATE TABLE IF NOT EXISTS ${tableES}(
-                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
-                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
-                            );
-                        `);
-                            if (this[_index] && this[_index].length) {
-                                for (const index of this[_index]) {
-                                    await option.conn.execute(SyncMode.Async, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
-                                }
-                            }
-                            await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                            await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
-                            // 更新完毕，保存版本号
-                            await option.conn.execute(SyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
-                        }
-                        else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
-                            await option.conn.execute(SyncMode.Async, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
-                        }
-                    }
-                    else { // 表不存在
-                        // 创建表
+            return (async () => {
+                if (option?.force) {
+                    await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${tableES};`);
+                }
+                const lastVersion = this[_sqlite_version] ?? '1';
+                // 检查表
+                const tableCheckResult = await option.conn.pluck(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
+                if (tableCheckResult) {
+                    // 旧版本
+                    const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
+                    if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
+                        // 更新版本
+                        const columns = iterate(await option.conn.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
+                            .filter(c => this[_fields].hasOwnProperty(C2P(c.name, globalThis[_Hump])))
+                            .map(c => c.name)
+                            .join(',');
+                        const rtable = `${option.tableName}_${tableVersion.replace(/\./, '_')}`;
+                        await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
+                        await option.conn.execute(SyncMode.Async, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
                         await option.conn.execute(SyncMode.Async, `
                         CREATE TABLE IF NOT EXISTS ${tableES}(
                             ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
@@ -3269,17 +3208,34 @@ export class SqlService {
                     `);
                         if (this[_index] && this[_index].length) {
                             for (const index of this[_index]) {
-                                await option.conn.execute(SyncMode.Async, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${option.tableName} ("${this[_fields][index]?.C2()}");`);
+                                await option.conn.execute(SyncMode.Async, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
                             }
                         }
-                        await option.conn.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
+                        await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                        await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
+                        // 更新完毕，保存版本号
+                        await option.conn.execute(SyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option.tableName, lastVersion]);
+                    }
+                    else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
+                        await option.conn.execute(SyncMode.Async, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
                     }
-                    resolve();
                 }
-                catch (error) {
-                    reject(error);
+                else { // 表不存在
+                    // 创建表
+                    await option.conn.execute(SyncMode.Async, `
+                    CREATE TABLE IF NOT EXISTS ${tableES}(
+                        ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                        ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
+                    );
+                `);
+                    if (this[_index] && this[_index].length) {
+                        for (const index of this[_index]) {
+                            await option.conn.execute(SyncMode.Async, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${option.tableName} ("${this[_fields][index]?.C2()}");`);
+                        }
+                    }
+                    await option.conn.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
                 }
-            });
+            })();
         }
     }
     close(option) {
@@ -4022,33 +3978,28 @@ class StreamQuery {
             return result;
         }
         else {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    result.total = await this._service.select({
-                        ...option,
-                        params,
-                        sql: sqlCount,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.R_C_Assert
-                    });
-                    result.size = calc(result.total)
-                        .add(this._pageSize - 1)
-                        .div(this._pageSize)
-                        .round(0, 2)
-                        .over();
-                    result.records = await this._service.select({
-                        ...option,
-                        params,
-                        sql,
-                        sync: SyncMode.Async,
-                        selectResult: SelectResult.RS_CS
-                    });
-                    resolve(result);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return (async () => {
+                result.total = await this._service.select({
+                    ...option,
+                    params,
+                    sql: sqlCount,
+                    sync: SyncMode.Async,
+                    selectResult: SelectResult.R_C_Assert
+                });
+                result.size = calc(result.total)
+                    .add(this._pageSize - 1)
+                    .div(this._pageSize)
+                    .round(0, 2)
+                    .over();
+                result.records = await this._service.select({
+                    ...option,
+                    params,
+                    sql,
+                    sync: SyncMode.Async,
+                    selectResult: SelectResult.RS_CS
+                });
+                return result;
+            })();
         }
     }
     excuteUpdate(option) {
@@ -5127,42 +5078,54 @@ export function getRedisDB(db) {
     return rd;
 }
 /**
- redlock
+ redlock —— 用 redlock 做一把元锁（[lockex]key），把"读 count、判断 count、incr"做成原子操作。
+ 原实现失败时 `return await GetRedisLock(...)` 递归调用自己，redis 长时间不可用会栈溢出；
+ 改成循环 + 指数退避 + 最大重试上限，达到上限后抛出（让上层决定是否走降级路径）。
  */
+const GET_REDIS_LOCK_MAX_RETRIES = 10;
+const GET_REDIS_LOCK_BASE_DELAY = 50; // 毫秒
 export async function GetRedisLock(key, lockMaxActive) {
     const lock = globalThis[_dao][DBType.RedisLock];
     Throw.if(!lock, 'not found lock!');
     const db = getRedisDB();
-    let initLock;
-    try {
-        initLock = await lock.acquire([`[lockex]${key}`], 5000);
-        const count = await db.get(key);
-        if (count === null || parseInt(count) < (lockMaxActive ?? 1)) {
-            await db.incr(key);
-            return true;
+    let lastError;
+    for (let attempt = 0; attempt < GET_REDIS_LOCK_MAX_RETRIES; attempt++) {
+        let initLock;
+        try {
+            initLock = await lock.acquire([`[lockex]${key}`], 5000);
+            const count = await db.get(key);
+            if (count === null || parseInt(count) < (lockMaxActive ?? 1)) {
+                await db.incr(key);
+                return true;
+            }
+            else {
+                return false;
+            }
         }
-        else {
-            return false;
+        catch (er) {
+            lastError = er;
+            // 指数退避，避免 redis 抖动时打死服务
+            const delay = Math.min(GET_REDIS_LOCK_BASE_DELAY * Math.pow(2, attempt), 1000);
+            globalThis[_LoggerService].debug?.(`GetRedisLock ${key} attempt ${attempt + 1} failed: ${er?.message}, retry after ${delay}ms`);
+            await sleep(delay);
         }
-    }
-    catch (er) {
-        return await GetRedisLock(key, lockMaxActive);
-    }
-    finally {
-        if (initLock) {
-            try {
-                await initLock.release();
-                // eslint-disable-next-line no-empty
-            }
-            catch (error) {
+        finally {
+            if (initLock) {
+                try {
+                    await initLock.release();
+                    // eslint-disable-next-line no-empty
+                }
+                catch (error) {
+                }
             }
         }
     }
+    throw new Error(`GetRedisLock ${key} failed after ${GET_REDIS_LOCK_MAX_RETRIES} retries: ${lastError?.message ?? lastError}`);
 }
 ;
 /** 对FN加锁、缓存执行 */
 export async function excuteWithLock(config, fn__) {
-    const key = config.key_real ? `[lock]${config.key_real}` : `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
+    const key = `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
     const db = getRedisDB();
     let wait_time = 0;
     const fn = async () => {
@@ -5193,43 +5156,72 @@ export async function excuteWithLock(config, fn__) {
     };
     return await fn();
 }
-/** 与缓存共用时，需要在缓存之前:有缓存则返回缓存,否则加锁执行并缓存,后续队列全部返回缓存,跳过执行 */
+/**
+ * 方法加锁装饰器。
+ * 与 `MethodCache` 组合时，**不要**手工叠装饰器——`MethodCache` 内部已经实现了
+ * "先查缓存 → miss 才加锁 → 锁内二次检查 → 仍 miss 才执行" 的 single-flight 语义，
+ * 直接给方法加 `@MethodCache` 即可。`@MethodLock` 单独使用时仅做并发互斥，不感知缓存。
+ */
 export function MethodLock(config) {
     return function (target, _propertyKey, descriptor) {
         const fn__ = descriptor.value;
         descriptor.value = async function (...args) {
-            config.key_real = typeof config.key === 'function' ? config.key.call(target, ...args) : config.key;
-            return await excuteWithLock(config, async () => await fn__.call(this, ...args));
+            // 注意：装饰器闭包里的 `config` 是所有调用共享的同一个对象，
+            // 不能把 per-call 的状态写回去——必须每次构造一份新的 config 传给 excuteWithLock。
+            const resolvedKey = typeof config.key === 'function' ? config.key.call(this, ...args) : config.key;
+            const perCallConfig = { ...config, key: resolvedKey };
+            return await excuteWithLock(perCallConfig, async () => await fn__.call(this, ...args));
         };
     };
 }
 /** 设置方法缓存 */
 async function setMethodCache(config, devid) {
     const db = getRedisDB();
-    if (config.result !== null && config.result !== undefined) {
-        // 映射关系存放
+    const isNullish = config.result === null || config.result === undefined;
+    // 旧行为：null / undefined 不进缓存；新增 cacheNullValue=true 时写入 'null'（穿透防御）。
+    if (isNullish && !config.cacheNullValue) {
+        return;
+    }
+    // 统一序列化：undefined 不是合法 JSON，归一化成 null。
+    const payload = isNullish ? 'null' : JSON.stringify(config.result);
+    // 负缓存通常用更短 TTL，避免业务恢复后还长时间返回旧的 null。
+    const ttl = isNullish
+        ? (config.nullCacheTime ?? config.autoClearTime)
+        : config.autoClearTime;
+    // 映射关系存放（负缓存也参与关联清除，因为外部清缓存的语义不区分正负）
+    if (config.clearKey && config.clearKey.length > 0) {
+        for (const clear of config.clearKey) {
+            await db.sadd(`[cache-parent]${clear}`, config.key);
+            await db.sadd(`[cache-child]${config.key}`, clear);
+        }
+    }
+    if (ttl) { // 自动清空
+        await db.set(`[cache]${config.key}`, payload, 'EX', ttl * 60);
+        globalThis[_LoggerService].debug?.(`cache ${config.key} seted${isNullish ? ' (null)' : ''}!`);
+        // 订阅：清空 clear list —— 同一 key 在缓存生命周期内只注册一次监听器，
+        // 否则每次 miss 都会 .on 一次，clearMethodCache 触发时回调会被执行 N 遍，
+        // 长期运行造成监听器泄漏。
         if (config.clearKey && config.clearKey.length > 0) {
-            for (const clear of config.clearKey) {
-                await db.sadd(`[cache-parent]${clear}`, config.key);
-                await db.sadd(`[cache-child]${config.key}`, clear);
-            }
-        }
-        if (config.autoClearTime) { // 自动清空
-            await db.set(`[cache]${config.key}`, JSON.stringify(config.result), 'EX', config.autoClearTime * 60);
-            // 订阅：清空 clear list
-            if (config.clearKey && config.clearKey.length > 0) {
-                globalThis[_EventBus].on(`[cache]${config.key}`, async (key) => {
+            const event = `[cache]${config.key}`;
+            if (globalThis[_EventBus].listenerCount(event) === 0) {
+                globalThis[_EventBus].on(event, async (key) => {
                     await clearChild(key, true);
+                    globalThis[_LoggerService].debug?.(`cache ${key} clear by key!`);
                 });
             }
         }
-        else {
-            await db.set(`[cache]${config.key}`, JSON.stringify(config.result));
-        }
-        if (devid) {
-            // 订阅：清空 clear list
-            globalThis[_EventBus].on(`user-${devid}`, async function (key) {
+    }
+    else {
+        await db.set(`[cache]${config.key}`, payload);
+        globalThis[_LoggerService].debug?.(`cache ${config.key} seted${isNullish ? ' (null)' : ''}!`);
+    }
+    if (devid) {
+        // 订阅：清空 clear list —— 同样去重，避免每次 miss 都重复注册。
+        const event = `user-${devid}`;
+        if (globalThis[_EventBus].listenerCount(event) === 0) {
+            globalThis[_EventBus].on(event, async function (key) {
                 await clearChild(key);
+                globalThis[_LoggerService].debug?.(`cache ${key} clear by devid!`);
             });
         }
     }
@@ -5274,53 +5266,93 @@ async function clearParent(clearKey) {
     }
 }
 /**
- * 执行一个方法fn，
- * 如果有缓存，则返回缓存，否则执行方法并缓存
+ * 缓存执行的核心：先查缓存 → miss 才加锁 → 锁内二次检查 → 仍 miss 才执行原方法 → 写缓存。
+ * 这样同一 key 的并发 N 个请求里，只会有 1 个真正穿透到 fn，其余等待者在锁内读到刚写入的缓存。
+ * 锁本身有等待超时和锁 TTL 兜底，redis 不可用时 fallback 到无锁直跑（保留可用性，退化为旧行为）。
+ *
+ * 命中判断用 `cached !== null`（ioredis 在 key 不存在时返回 `null`），
+ * 这样 `cacheNullValue=true` 时存进去的字面量 `'null'` 也会算作命中，达到防穿透效果。
  */
-export async function excuteWithCache(config, fn) {
+async function excuteCacheCore(opts) {
     const db = getRedisDB();
-    const key = typeof config.key === 'function' ? config.key() : config.key;
-    const cache = await db.get(`[cache]${key}`);
-    if (cache) {
-        globalThis[_LoggerService].debug?.(`cache ${key} hit!`);
-        return JSON.parse(cache);
-    }
-    else {
-        const result = await fn();
-        globalThis[_LoggerService].debug?.(`cache ${key} miss!`);
-        await setMethodCache({
-            key,
-            clearKey: config.clearKey,
-            autoClearTime: config.autoClearTime,
-            result
-        });
+    const cacheKey = `[cache]${opts.key}`;
+    const cached = await db.get(cacheKey);
+    if (cached !== null) {
+        globalThis[_LoggerService].debug?.(`cache ${opts.key} hit!`);
+        return JSON.parse(cached);
+    }
+    globalThis[_LoggerService].debug?.(`cache ${opts.key} miss!`);
+    const setOpts = {
+        clearKey: opts.clearKey,
+        autoClearTime: opts.autoClearTime,
+        cacheNullValue: opts.cacheNullValue,
+        nullCacheTime: opts.nullCacheTime
+    };
+    // 没有 redlock 配置时直接退化为旧行为（无锁直跑）。
+    const lockDao = globalThis[_dao][DBType.RedisLock];
+    if (!lockDao) {
+        const result = await opts.fn();
+        await setMethodCache({ key: opts.key, ...setOpts, result }, opts.devid);
         return result;
     }
+    return await excuteWithLock({
+        key: opts.key,
+        // 让等待者尽快读到首飞写入的缓存
+        lockWait: true,
+        lockRetryInterval: 100,
+        // 锁 TTL 给一个相对合理的上限，避免首飞挂掉时其它请求永远卡住
+        lockMaxTime: 30000
+    }, async () => {
+        // 锁内二次检查：等待者醒来后必须再读一次缓存，否则会和首飞一样跑一遍原方法。
+        const recheck = await db.get(cacheKey);
+        if (recheck !== null) {
+            globalThis[_LoggerService].debug?.(`cache ${opts.key} hit after lock!`);
+            return JSON.parse(recheck);
+        }
+        const result = await opts.fn();
+        await setMethodCache({ key: opts.key, ...setOpts, result }, opts.devid);
+        return result;
+    });
+}
+/**
+ * 执行一个方法fn，
+ * 如果有缓存，则返回缓存，否则【加锁、二次检查】后执行方法并缓存，防止缓存击穿。
+ * 可选 `cacheNullValue=true` 开启负缓存，防穿透；负缓存默认沿用 autoClearTime，可单独用 nullCacheTime 设短。
+ */
+export async function excuteWithCache(config, fn) {
+    const key = typeof config.key === 'function' ? config.key() : config.key;
+    return await excuteCacheCore({
+        key,
+        clearKey: config.clearKey,
+        autoClearTime: config.autoClearTime,
+        cacheNullValue: config.cacheNullValue,
+        nullCacheTime: config.nullCacheTime,
+        fn
+    });
 }
-/** 缓存注解 */
+/**
+ * 缓存注解：先查缓存 → miss 才加锁 → 锁内再查一次 → 仍 miss 才执行原方法。
+ * 已内置 single-flight，不需要再叠 `@MethodLock`。
+ * 可选 `cacheNullValue=true` 开启负缓存，防穿透。
+ */
 export function MethodCache(config) {
-    return function (target, _propertyKey, descriptor) {
+    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(`[cache]${key}`);
-            if (cache) {
-                globalThis[_LoggerService].debug?.(`cache ${key} hit!`);
-                return JSON.parse(cache);
-            }
-            else {
-                globalThis[_LoggerService].debug?.(`cache ${key} miss!`);
-                const result = await fn.call(this, ...args);
-                const clearKey = config.clearKey ? typeof config.clearKey === 'function' ? config.clearKey.call(this, ...args) : config.clearKey : undefined;
-                await setMethodCache({
-                    key,
-                    clearKey,
-                    autoClearTime: config.autoClearTime,
-                    result
-                }, config.clearWithSession && this.ctx.me && this.ctx.me.devid);
-                return result;
-            }
+            const clearKey = config.clearKey
+                ? (typeof config.clearKey === 'function' ? config.clearKey.call(this, ...args) : config.clearKey)
+                : undefined;
+            const devid = config.clearWithSession && this.ctx && this.ctx.me && this.ctx.me.devid;
+            return await excuteCacheCore({
+                key,
+                clearKey,
+                autoClearTime: config.autoClearTime,
+                cacheNullValue: config.cacheNullValue,
+                nullCacheTime: config.nullCacheTime,
+                devid,
+                fn: async () => await fn.call(this, ...args)
+            });
         };
     };
 }