befly 3.9.38 → 3.9.40

package/lib/connect.ts

@@ -1,13 +1,13 @@
-/**
+/**
  * 数据库连接管理器
  * 统一管理 SQL 和 Redis 连接
  * 配置从 beflyConfig 全局对象获取
  */
 
-import { SQL, RedisClient } from 'bun';
+import { SQL, RedisClient } from "bun";
 
-import { beflyConfig } from '../befly.config.js';
-import { Logger } from './logger.js';
+import { beflyConfig } from "../befly.config.js";
+import { Logger } from "./logger.js";
 
 /**
  * 数据库连接管理器
@@ -36,26 +36,26 @@ export class Connect {
         const config = beflyConfig.db || {};
 
         // 构建数据库连接字符串
-        const type = config.type || 'mysql';
-        const host = config.host || '127.0.0.1';
+        const type = config.type || "mysql";
+        const host = config.host || "127.0.0.1";
         const port = config.port || 3306;
-        const user = encodeURIComponent(config.username || 'root');
-        const password = encodeURIComponent(config.password || 'root');
-        const database = encodeURIComponent(config.database || 'befly_demo');
+        const user = encodeURIComponent(config.username || "root");
+        const password = encodeURIComponent(config.password || "root");
+        const database = encodeURIComponent(config.database || "befly_demo");
 
         let finalUrl: string;
-        if (type === 'sqlite') {
+        if (type === "sqlite") {
             finalUrl = database;
         } else {
             if (!host || !database) {
-                throw new Error('数据库配置不完整，请检查配置参数');
+                throw new Error("数据库配置不完整，请检查配置参数");
             }
             finalUrl = `${type}://${user}:${password}@${host}:${port}/${database}`;
         }
 
         let sql: SQL;
 
-        if (type === 'sqlite') {
+        if (type === "sqlite") {
             sql = new SQL(finalUrl);
         } else {
             sql = new SQL({
@@ -69,11 +69,11 @@ export class Connect {
             const timeout = 30000;
 
             const healthCheckPromise = (async () => {
-                let version = '';
-                if (type === 'sqlite') {
+                let version = "";
+                if (type === "sqlite") {
                     const v = await sql`SELECT sqlite_version() AS version`;
                     version = v?.[0]?.version;
-                } else if (type === 'postgresql' || type === 'postgres') {
+                } else if (type === "postgresql" || type === "postgres") {
                     const v = await sql`SELECT version() AS version`;
                     version = v?.[0]?.version;
                 } else {
@@ -89,17 +89,17 @@ export class Connect {
                 }, timeout);
             });
 
-            const version = await Promise.race([healthCheckPromise, timeoutPromise]);
+            await Promise.race([healthCheckPromise, timeoutPromise]);
 
             this.sqlClient = sql;
             this.sqlConnectedAt = Date.now();
             this.sqlPoolMax = config.poolMax ?? 1;
             return sql;
         } catch (error: any) {
-            Logger.error({ err: error }, '[Connect] SQL 连接失败');
+            Logger.error({ err: error }, "[Connect] SQL 连接失败");
             try {
                 await sql?.close();
-            } catch (cleanupError) {}
+            } catch {}
 
             throw error;
         }
@@ -113,7 +113,7 @@ export class Connect {
             try {
                 await this.sqlClient.close();
             } catch (error: any) {
-                Logger.error({ err: error }, '[Connect] 关闭 SQL 连接时出错');
+                Logger.error({ err: error }, "[Connect] 关闭 SQL 连接时出错");
             }
             this.sqlClient = null;
             this.sqlConnectedAt = null;
@@ -126,7 +126,7 @@ export class Connect {
      */
     static getSql(): SQL {
         if (!this.sqlClient) {
-            throw new Error('SQL 客户端未连接，请先调用 Connect.connectSql()');
+            throw new Error("SQL 客户端未连接，请先调用 Connect.connectSql()");
         }
         return this.sqlClient;
     }
@@ -145,13 +145,13 @@ export class Connect {
 
         try {
             // 构建 Redis URL
-            const host = config.host || '127.0.0.1';
+            const host = config.host || "127.0.0.1";
             const port = config.port || 6379;
-            const username = config.username || '';
-            const password = config.password || '';
+            const username = config.username || "";
+            const password = config.password || "";
             const db = config.db || 0;
 
-            let auth = '';
+            let auth = "";
             if (username && password) {
                 auth = `${username}:${password}@`;
             } else if (password) {
@@ -175,7 +175,7 @@ export class Connect {
             this.redisConnectedAt = Date.now();
             return redis;
         } catch (error: any) {
-            Logger.error({ err: error }, '[Connect] Redis 连接失败');
+            Logger.error({ err: error }, "[Connect] Redis 连接失败");
             throw new Error(`Redis 连接失败: ${error.message}`);
         }
     }
@@ -189,7 +189,7 @@ export class Connect {
                 this.redisClient.close();
                 this.redisConnectedAt = null;
             } catch (error: any) {
-                Logger.error({ err: error }, '[Connect] 关闭 Redis 连接时出错');
+                Logger.error({ err: error }, "[Connect] 关闭 Redis 连接时出错");
             }
             this.redisClient = null;
         }
@@ -201,7 +201,7 @@ export class Connect {
      */
     static getRedis(): RedisClient {
         if (!this.redisClient) {
-            throw new Error('Redis 客户端未连接，请先调用 Connect.connectRedis()');
+            throw new Error("Redis 客户端未连接，请先调用 Connect.connectRedis()");
         }
         return this.redisClient;
     }
@@ -222,7 +222,7 @@ export class Connect {
             // 连接 Redis
             await this.connectRedis();
         } catch (error: any) {
-            Logger.error({ err: error }, '数据库初始化失败');
+            Logger.error({ err: error }, "数据库初始化失败");
             await this.disconnect();
             throw error;
         }