baja-lite 1.8.0 → 1.8.2

package/sql.js

@@ -18,12 +18,12 @@ import pino from 'pino';
 import { formatDialect, mysql, postgresql, sqlite } from 'sql-formatter';
 import tslib from 'tslib';
 import { convert } from './convert-xml.js';
-import { Throw } from './error.js';
+import { DatabaseError, 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';
 import { snowflake } from './snowflake.js';
-import { emptyString } from './string.js';
+import { emptyString, replacePlaceholders } from './string.js';
 const iterate = ite.iterate;
 BigInt.prototype.toJSON = function () { return this.toString(); };
 const BIGINT_EXT_TYPE = 0;
@@ -80,6 +80,9 @@ export const _EventBus = Symbol('EventBus');
 export const _LoggerService = Symbol('LoggerService');
 export const _path = Symbol('path');
 export const _fs = Symbol('fs');
+// 常量定义
+const DEFAULT_KEEPALIVE_INTERVAL = 30000; // 30 秒
+const DEFAULT_MAX_DEAL = 500; // 默认批量处理数量
 // export const logger = pino({
 //     name: 'sql',
 //     transport: {
@@ -210,7 +213,7 @@ export var ColumnMode;
 })(ColumnMode || (ColumnMode = {}));
 export const SqliteMemory = ':memory:';
 export const _defOption = {
-    maxDeal: 500,
+    maxDeal: DEFAULT_MAX_DEAL,
     skipUndefined: true,
     skipNull: true,
     skipEmptyString: true
@@ -228,7 +231,7 @@ class MysqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].warn('MYSQL not supported sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
         ;
@@ -245,12 +248,9 @@ class MysqlConnection {
                 resolve({ affectedRows: result.affectedRows, insertId: result.insertId });
             }
             catch (error) {
-                globalThis[_LoggerService].error(`
-                    error: ${error},
-                    sql: ${sql},
-                    params: ${params}
-                `);
-                reject(error);
+                const dbError = DatabaseError.query('MySQL execute failed', sql, params, error);
+                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
+                reject(dbError);
             }
         });
     }
@@ -261,7 +261,7 @@ class MysqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].warn('MYSQL not supported sync mode');
             return null;
         }
         ;
@@ -273,12 +273,11 @@ class MysqlConnection {
                 const [result] = await this[_daoConnection].query(sql, params);
                 if (result && result[0]) {
                     const r = Object.values(result[0])[0];
-                    if (r === null)
-                        resolve(r);
-                    else
-                        resolve(r);
+                    resolve(r === null ? null : r);
+                }
+                else {
+                    resolve(null);
                 }
-                resolve(null);
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -297,7 +296,7 @@ class MysqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].warn('MYSQL not supported sync mode');
             return null;
         }
         ;
@@ -331,7 +330,7 @@ class MysqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].warn('MYSQL not supported sync mode');
             return [];
         }
         ;
@@ -365,7 +364,7 @@ class MysqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].warn('MYSQL not supported sync mode');
             return [];
         }
         ;
@@ -404,15 +403,20 @@ class MysqlConnection {
 _b = _inTransaction;
 export class Mysql {
     constructor(pool) {
+        this.isClosing = false;
         this[_daoDB] = pool;
         this.keepAlive();
     }
     async keepAlive() {
+        if (this.isClosing)
+            return;
         let connection = null;
         try {
             connection = await this.createConnection(SyncMode.Async);
-            const data = await connection?.query(SyncMode.Async, 'SELECT 1 FROM DUAL');
-            globalThis[_LoggerService].debug?.('keepAlive->', data?.[0]?.[1]);
+            if (connection) {
+                const data = await connection.query(SyncMode.Async, 'SELECT 1 FROM DUAL');
+                globalThis[_LoggerService].debug?.('keepAlive->', data?.[0]?.[1]);
+            }
         }
         catch (error) {
             globalThis[_LoggerService].error('keepAlive error', error);
@@ -421,12 +425,14 @@ export class Mysql {
             if (connection) {
                 await connection.release(SyncMode.Async);
             }
-            setTimeout(() => this.keepAlive(), globalThis[_MysqlKeepAliveTime] ?? 30000);
+            if (!this.isClosing) {
+                this.keepAliveTimer = setTimeout(() => this.keepAlive(), globalThis[_MysqlKeepAliveTime] ?? DEFAULT_KEEPALIVE_INTERVAL);
+            }
         }
     }
     createConnection(sync) {
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].error('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].error('MYSQL not supported sync mode');
             return null;
         }
         ;
@@ -437,13 +443,15 @@ export class Mysql {
                 resolve(new MysqlConnection(connection));
             }
             catch (error) {
-                reject(error);
+                const dbError = DatabaseError.connection('Failed to create MySQL connection', error);
+                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
+                reject(dbError);
             }
         });
     }
     transaction(sync, fn, conn) {
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('MYSQL not suppouted sync mode');
+            globalThis[_LoggerService].warn('MYSQL not supported sync mode');
             return null;
         }
         ;
@@ -466,18 +474,19 @@ export class Mysql {
                 if (needCommit) {
                     globalThis[_LoggerService].debug?.('commit begin!');
                     await conn[_daoConnection].commit();
-                    conn[_inTransaction] = false;
                     globalThis[_LoggerService].debug?.('commit end!');
                 }
                 resolve(result);
             }
             catch (error) {
-                globalThis[_LoggerService].debug?.('rollback begin!');
-                await conn[_daoConnection].rollback();
-                globalThis[_LoggerService].debug?.('rollback end!');
-                conn[_inTransaction] = false;
-                globalThis[_LoggerService].error(error);
-                reject(error);
+                if (needCommit) {
+                    globalThis[_LoggerService].debug?.('rollback begin!');
+                    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);
             }
             finally {
                 try {
@@ -491,15 +500,18 @@ export class Mysql {
                     }
                 }
                 catch (error) {
+                    // 释放连接失败通常不影响业务逻辑，记录日志即可
+                    globalThis[_LoggerService].warn?.('Failed to release connection in finally block', error);
                 }
             }
         });
     }
     close(sync) {
-        if (sync === SyncMode.Sync) {
-            this[_daoDB]?.destroy();
+        this.isClosing = true;
+        if (this.keepAliveTimer) {
+            clearTimeout(this.keepAliveTimer);
         }
-        ;
+        return this[_daoDB]?.destroy();
     }
     backup(sync, name) {
     }
@@ -520,7 +532,7 @@ class PostgresqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].warn('Postgresql not supported sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
         ;
@@ -529,16 +541,15 @@ class PostgresqlConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                let index = 1;
                 const { rowCount } = await this[_daoConnection].query({
-                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    text: replacePlaceholders(sql),
                     values: params
                 });
                 const result = rowCount;
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
                     globalThis[_LoggerService].verbose?.(result);
                 }
-                resolve({ affectedRows: result.affectedRows, insertId: result.insertId });
+                resolve({ affectedRows: rowCount || 0, insertId: 0n });
             }
             catch (error) {
                 globalThis[_LoggerService].error(`
@@ -557,7 +568,7 @@ class PostgresqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].warn('Postgresql not supported sync mode');
             return null;
         }
         ;
@@ -566,9 +577,8 @@ class PostgresqlConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                let index = 1;
                 const { rows } = await this[_daoConnection].query({
-                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    text: replacePlaceholders(sql),
                     values: params
                 });
                 if (rows && rows[0]) {
@@ -597,7 +607,7 @@ class PostgresqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].warn('Postgresql not supported sync mode');
             return null;
         }
         ;
@@ -606,9 +616,8 @@ class PostgresqlConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                let index = 1;
                 const { rows } = await this[_daoConnection].query({
-                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    text: replacePlaceholders(sql),
                     values: params
                 });
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -635,7 +644,7 @@ class PostgresqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].warn('Postgresql not supported sync mode');
             return [];
         }
         ;
@@ -644,9 +653,8 @@ class PostgresqlConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                let index = 1;
                 const { rows } = await this[_daoConnection].query({
-                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    text: replacePlaceholders(sql),
                     values: params
                 });
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -673,7 +681,7 @@ class PostgresqlConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].warn('Postgresql not supported sync mode');
             return [];
         }
         ;
@@ -682,9 +690,8 @@ class PostgresqlConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                let index = 1;
                 const { rows } = await this[_daoConnection].query({
-                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    text: replacePlaceholders(sql),
                     values: params
                 });
                 if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -716,11 +723,36 @@ class PostgresqlConnection {
 _c = _inTransaction;
 export class Postgresql {
     constructor(pool) {
+        this.isClosing = false;
         this[_daoDB] = pool;
+        this.keepAlive();
+    }
+    async keepAlive() {
+        if (this.isClosing)
+            return;
+        let connection = null;
+        try {
+            connection = await this.createConnection(SyncMode.Async);
+            if (connection) {
+                const data = await connection.query(SyncMode.Async, 'SELECT 1 FROM DUAL');
+                globalThis[_LoggerService].debug?.('keepAlive->', data?.[0]?.[1]);
+            }
+        }
+        catch (error) {
+            globalThis[_LoggerService].error('keepAlive error', error);
+        }
+        finally {
+            if (connection) {
+                await connection.release(SyncMode.Async);
+            }
+            if (!this.isClosing) {
+                this.keepAliveTimer = setTimeout(() => this.keepAlive(), globalThis[_MysqlKeepAliveTime] ?? DEFAULT_KEEPALIVE_INTERVAL);
+            }
+        }
     }
     createConnection(sync) {
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].error('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].error('Postgresql not supported sync mode');
             return null;
         }
         ;
@@ -737,7 +769,7 @@ export class Postgresql {
     }
     transaction(sync, fn, conn) {
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('Postgresql not suppouted sync mode');
+            globalThis[_LoggerService].warn('Postgresql not supported sync mode');
             return null;
         }
         ;
@@ -760,18 +792,19 @@ export class Postgresql {
                 if (needCommit) {
                     globalThis[_LoggerService].debug?.('commit begin!');
                     await conn[_daoConnection].query('COMMIT');
-                    conn[_inTransaction] = false;
                     globalThis[_LoggerService].debug?.('commit end!');
                 }
                 resolve(result);
             }
             catch (error) {
-                globalThis[_LoggerService].debug?.('rollback begin!');
-                await conn[_daoConnection].query('ROLLBACK');
-                globalThis[_LoggerService].debug?.('rollback end!');
-                conn[_inTransaction] = false;
-                globalThis[_LoggerService].error(error);
-                reject(error);
+                if (needCommit) {
+                    globalThis[_LoggerService].debug?.('rollback begin!');
+                    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);
             }
             finally {
                 try {
@@ -785,15 +818,18 @@ export class Postgresql {
                     }
                 }
                 catch (error) {
+                    // 释放连接失败通常不影响业务逻辑，记录日志即可
+                    globalThis[_LoggerService].warn?.('Failed to release connection in finally block', error);
                 }
             }
         });
     }
     close(sync) {
-        if (sync === SyncMode.Sync) {
-            this[_daoDB]?.end();
+        this.isClosing = true;
+        if (this.keepAliveTimer) {
+            clearTimeout(this.keepAliveTimer);
         }
-        ;
+        this[_daoDB]?.end();
     }
     backup(sync, name) {
     }
@@ -815,7 +851,7 @@ class SqliteConnection {
             }
             ;
             if (sync === SyncMode.Async) {
-                globalThis[_LoggerService].warn(`SQLITE not suppoted async mode`);
+                globalThis[_LoggerService].warn(`SQLITE not supported async mode`);
                 return { affectedRows: 0, insertId: 0n };
             }
             ;
@@ -846,7 +882,7 @@ class SqliteConnection {
             }
             ;
             if (sync === SyncMode.Async) {
-                globalThis[_LoggerService].warn(`SQLITE not suppoted async mode`);
+                globalThis[_LoggerService].warn(`SQLITE not supported async mode`);
                 return null;
             }
             ;
@@ -897,7 +933,7 @@ class SqliteConnection {
             }
             ;
             if (sync === SyncMode.Async) {
-                globalThis[_LoggerService].warn(`SQLITE not suppoted async mode`);
+                globalThis[_LoggerService].warn(`SQLITE not supported async mode`);
                 return [];
             }
             ;
@@ -923,7 +959,7 @@ class SqliteConnection {
             }
             ;
             if (sync === SyncMode.Async) {
-                globalThis[_LoggerService].warn(`SQLITE not suppoted async mode`);
+                globalThis[_LoggerService].warn(`SQLITE not supported async mode`);
                 return [];
             }
             ;
@@ -961,7 +997,13 @@ export class Sqlite {
         `);
         this[_daoDB].function('UUID_SHORT', { deterministic: false }, () => snowflake.generate());
         this[_daoDB].function('UUID', { deterministic: false }, () => snowflake.generate());
-        this[_daoDB].function('TIME_TO_SEC', { deterministic: true }, (time) => time.split(':').map((v, i) => parseInt(v) * (i === 0 ? 360 : i === 1 ? 60 : 0)).reduce((a, b) => a + b, 0));
+        this[_daoDB].function('TIME_TO_SEC', { deterministic: true }, (time) => {
+            const parts = time.split(':');
+            const hours = parseInt(parts[0] || '0');
+            const minutes = parseInt(parts[1] || '0');
+            const seconds = parseInt(parts[2] || '0');
+            return hours * 3600 + minutes * 60 + seconds;
+        });
         this[_daoDB].function('IF', { deterministic: true }, (condition, v1, v2) => condition ? v1 : v2);
         this[_daoDB].function('RIGHT', { deterministic: true }, (src, p) => src.slice(p * -1));
         this[_daoDB].function('LEFT', { deterministic: true }, (str, len) => str?.substring(0, len) || null);
@@ -984,7 +1026,7 @@ export class Sqlite {
     }
     createConnection(sync) {
         if (sync === SyncMode.Async) {
-            globalThis[_LoggerService].error(`SQLITE not suppoted async mode`);
+            globalThis[_LoggerService].error(`SQLITE not supported async mode`);
             return null;
         }
         ;
@@ -992,7 +1034,7 @@ export class Sqlite {
     }
     transaction(sync, fn, conn) {
         if (sync === SyncMode.Async) {
-            globalThis[_LoggerService].warn(`SQLITE not suppoted async mode`);
+            globalThis[_LoggerService].warn(`SQLITE not supported async mode`);
             return null;
         }
         ;
@@ -1042,7 +1084,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('SqliteRemote not suppouted sync mode');
+            globalThis[_LoggerService].warn('SqliteRemote not supported sync mode');
             return { affectedRows: 0, insertId: 0n };
         }
         ;
@@ -1072,7 +1114,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('SqliteRemote not suppouted sync mode');
+            globalThis[_LoggerService].warn('SqliteRemote not supported sync mode');
             return null;
         }
         ;
@@ -1102,7 +1144,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('SqliteRemote not suppouted sync mode');
+            globalThis[_LoggerService].warn('SqliteRemote not supported sync mode');
             return null;
         }
         ;
@@ -1132,7 +1174,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('SqliteRemote not suppouted sync mode');
+            globalThis[_LoggerService].warn('SqliteRemote not supported sync mode');
             return [];
         }
         ;
@@ -1162,7 +1204,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].warn('SqliteRemote not suppouted sync mode');
+            globalThis[_LoggerService].warn('SqliteRemote not supported sync mode');
             return [];
         }
         ;
@@ -1196,7 +1238,7 @@ export class SqliteRemote {
     }
     createConnection(sync) {
         if (sync === SyncMode.Sync) {
-            globalThis[_LoggerService].error('SQLITEREMOTE not suppouted sync mode');
+            globalThis[_LoggerService].error('SQLITEREMOTE not supported sync mode');
             return null;
         }
         ;
@@ -1213,7 +1255,7 @@ export class SqliteRemote {
         });
     }
     transaction(sync, fn, conn) {
-        globalThis[_LoggerService].warn(`SQLITEREMOTE not suppoted transaction`);
+        globalThis[_LoggerService].warn(`SQLITEREMOTE not supported transaction`);
         return null;
     }
     close(sync) {
@@ -1832,7 +1874,11 @@ function P(skipConn = false) {
                     return result;
                 }
                 catch (error) {
-                    console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
+                    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}`);
                     throw error;
                 }
                 finally {

package/string.d.ts

@@ -18,7 +18,10 @@ export declare const emptyString: (source: any, skipEmptyString?: boolean) => bo
  */
 export declare const notEmptyString: (source: any, skipEmptyString?: boolean) => boolean;
 /**
- * 安全字符串处理（移除单引号，防止简单 SQL 注入）
+ * 安全字符串处理（移除单引号）
+ * @deprecated 不推荐用于 SQL 注入防护，请使用参数化查询
+ * @param source 源字符串
+ * @returns 移除单引号后的字符串
  */
 export declare const safeString: (source?: string) => string;
 /**
@@ -42,3 +45,5 @@ export declare const buildWxStr: (data: {
  * 将字符串中的中文标点符号统一替换为对应的英文标点
  */
 export declare const replaceChineseCode: (str: string) => string;
+/** 更安全的sql 参数占位符替换 */
+export declare function replacePlaceholders(sql: string): string;

package/string.js

@@ -30,7 +30,10 @@ export const notEmptyString = (source, skipEmptyString = true) => {
     return emptyString(source, skipEmptyString) === false;
 };
 /**
- * 安全字符串处理（移除单引号，防止简单 SQL 注入）
+ * 安全字符串处理（移除单引号）
+ * @deprecated 不推荐用于 SQL 注入防护，请使用参数化查询
+ * @param source 源字符串
+ * @returns 移除单引号后的字符串
  */
 export const safeString = (source) => {
     if (source) {
@@ -130,3 +133,22 @@ const table = {
 export const replaceChineseCode = (str) => {
     return str.replace(chinese, (a) => table[a] || '');
 };
+/** 更安全的sql 参数占位符替换 */
+export function replacePlaceholders(sql) {
+    let index = 1;
+    let inString = false;
+    let result = '';
+    for (let i = 0; i < sql.length; i++) {
+        const char = sql[i];
+        if (char === "'" && sql[i - 1] !== '\\') {
+            inString = !inString;
+        }
+        if (char === '?' && !inString) {
+            result += `$${index++}`;
+        }
+        else {
+            result += char;
+        }
+    }
+    return result;
+}