baja-lite 1.7.5 → 1.7.7

package/boot.js

@@ -1,6 +1,6 @@
 import { _Hump, DBType, getEnums } from 'baja-lite-field';
 import events from 'events';
-import { _Context, _dao, _DataConvert, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _LoggerService, _path, _primaryDB, _sqlCache, ColumnMode, Mysql, Postgresql, PrinterLogger, SqlCache, Sqlite, SqliteRemote } from './sql.js';
+import { _Context, _dao, _DataConvert, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _LoggerService, _MysqlKeepAliveTime, _path, _primaryDB, _sqlCache, ColumnMode, Mysql, Postgresql, PrinterLogger, SqlCache, Sqlite, SqliteRemote } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -48,6 +48,9 @@ export const Boot = async function (options) {
     if (options.ctx) {
         globalThis[_Context] = options.ctx;
     }
+    if (options.MysqlKeepAlive) {
+        globalThis[_MysqlKeepAliveTime] = options.MysqlKeepAlive;
+    }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');
         if (options.Mysql['host']) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -37,7 +37,6 @@
   "dependencies": {
     "@msgpack/msgpack": "3.1.3",
     "@types/request-promise": "4.1.51",
-    "axios": "1.13.6",
     "baja-lite-field": "1.5.0",
     "decimal.js": "10.6.0",
     "html-parse-stringify": "3.0.1",
@@ -60,6 +59,7 @@
     "@types/sqlstring": "2.3.2",
     "@typescript-eslint/eslint-plugin": "8.57.2",
     "@typescript-eslint/parser": "8.57.2",
+    "axios": "1.14.0",
     "better-sqlite3": "12.8.0",
     "ioredis": "5.10.1",
     "mongodb": "7.1.1",
@@ -77,4 +77,4 @@
     "access": "public"
   },
   "models": "./index.js"
-}
+}

package/sql.d.ts

@@ -21,6 +21,7 @@ declare const _sqliteRemoteName: unique symbol;
 declare const _SqlOption: unique symbol;
 export declare const _DataConvert: unique symbol;
 export declare const _Context: unique symbol;
+export declare const _MysqlKeepAliveTime: unique symbol;
 export declare const _enum: unique symbol;
 export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
@@ -301,6 +302,10 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
        ```
       */
     Mysql?: Record<string, Record<string, any>> | Record<string, any>;
+    /**
+     * MYSQL保持心跳的间隔，默认30秒
+     */
+    MysqlKeepAlive?: number;
     /**
          初始化postgresql链接 支持多数据源
          ## 单一数据源: 直接传入postgresql的连接配置
@@ -551,7 +556,6 @@ export declare class Mysql implements Dao {
 export declare class Postgresql implements Dao {
     [_daoDB]: any;
     constructor(pool: any);
-    keepAlive(): Promise<void>;
     createConnection(sync: SyncMode.Sync): Connection | null;
     createConnection(sync: SyncMode.Async): Promise<Connection | null>;
     transaction<T = any>(sync: SyncMode.Sync, fn: (conn: Connection) => T, conn?: Connection | null): T | null;

package/sql.js

@@ -71,6 +71,7 @@ const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
 export const _DataConvert = Symbol('DataConvert');
 export const _Context = Symbol('Context');
+export const _MysqlKeepAliveTime = Symbol('MysqlKeepAliveTime');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
 export const _enum = Symbol('_enum');
@@ -407,9 +408,10 @@ export class Mysql {
         this.keepAlive();
     }
     async keepAlive() {
-        const connection = await this[_daoDB].getConnection();
-        connection.query('SELECT 1 FROM DUAL');
-        setTimeout(async () => await this.keepAlive(), 60000);
+        const connection = await this.createConnection(SyncMode.Async);
+        const data = await connection?.query(SyncMode.Async, 'SELECT 1 FROM DUAL');
+        globalThis[_LoggerService].debug?.('keepAlive->', data?.[0]?.[1]);
+        setTimeout(() => this.keepAlive(), globalThis[_MysqlKeepAliveTime] ?? 30000);
     }
     createConnection(sync) {
         if (sync === SyncMode.Sync) {
@@ -704,12 +706,6 @@ _c = _inTransaction;
 export class Postgresql {
     constructor(pool) {
         this[_daoDB] = pool;
-        this.keepAlive();
-    }
-    async keepAlive() {
-        const connection = await this[_daoDB].connect();
-        connection.query('SELECT 1');
-        setTimeout(async () => await this.keepAlive(), 60000);
     }
     createConnection(sync) {
         if (sync === SyncMode.Sync) {