fix(database): The problem of connecting to the database has been solved, and if it fails once, it tries several times to connect

Author: m-mdy-m

src/bot/service/admin/Ban.ts

@@ -19,8 +19,8 @@ export class BanService {
       // Remove the user from the group's approved_users and members arrays
       const updatedGroup = {
         ...group,
-        approved_users: group.approved_users.filter((id) => Number(id) !== userId),
-        members: group.members.filter((id) => Number(id) !== userId),
+        approved_users: group.approved_users.filter((id: number) => Number(id) !== userId),
+        members: group.members.filter((id: number) => Number(id) !== userId),
       };
       await groupService.update(updatedGroup);
       await userService.delete(userId);

src/bot/service/admin/Blacklist.ts

@@ -53,7 +53,7 @@ export class BlackListService {
       }
     } else {
       // Remove the specified word
-      group.black_list = group.black_list.filter((item) => item !== word);
+      group.black_list = group.black_list.filter((item:string) => item !== word);
     }
     await groupService.update({
       ...group,

src/bot/service/admin/Warn.ts

@@ -50,7 +50,7 @@ export class WarnService {
       // Reset the warnings count and clear the user from the group's warning list
       const updatedGroup = {
         ...group,
-        warnings: group.warnings.filter((id) => Number(id) !== Number(user.telegram_id)),
+        warnings: group.warnings.filter((id: number) => Number(id) !== Number(user.telegram_id)),
       };
       const updatedUser = {
         ...user,
@@ -109,6 +109,8 @@ export class WarnService {
     const userId = replyMessage!.id!;
     const chat = ctx.chat;
     const groupId = chat?.id!;
+
+    // Initialize services
     const services = ServiceProvider.getInstance();
     const [groupService, userService, warnService] = await Promise.all([services.getGroupService(), services.getUserService(), services.getWarnsService()]);
     let group = await groupService.getByGroupId(groupId);
@@ -138,6 +140,7 @@ export class WarnService {
         });
       }
     }
+    console.log('usersWithWarnings', JSON.stringify(usersWithWarnings, null, 2));
 
     // Generate structured output
     let output = `**Group Warning Report**\n`;
@@ -150,8 +153,6 @@ export class WarnService {
       output += `   Warnings: ${user.warnings}\n`;
       output += `   Last Reason: ${user.reason}\n`;
     });
-
-    // Add summary
     output += `\n---\nTotal Users with Warnings: ${usersWithWarnings.length}\n`;
 
     return output;

src/database/ConnectionPool.ts

@@ -47,9 +47,6 @@ export class ConnectionPool {
     try {
       await client.query(`CREATE DATABASE "${databaseName}"`);
       console.log(`Database "${databaseName}" created successfully.`);
-    } catch (error: any) {
-      console.error('Failed to create database:', error.message);
-      throw error; // Re-throw the error for better logging and troubleshooting
     } finally {
       await client.end();
     }
@@ -69,9 +66,10 @@ export class ConnectionPool {
     return new Pool({
       connectionString,
       ssl: this._isProduction === 'production' ? { rejectUnauthorized: false } : false,
-      connectionTimeoutMillis: 60000,
-      max: 15,
-      idleTimeoutMillis: 60000,
+      max: 20,
+      idleTimeoutMillis: 30000,
+      connectionTimeoutMillis: 30000,
+      keepAlive: true,
     });
   }
   private async reinitializePool() {

src/decorators/Bot.ts

@@ -24,6 +24,6 @@ export function ReplyToBot() {
       close();
       return;
     }
-    return next();
+    await next();
   });
 }

src/decorators/Catch.ts

@@ -6,6 +6,7 @@ export function Catch(customResponse?: ErrorResponse) {
   return createDecorator(async (ctx, next) => {
     try {
       await next();
+      return;
     } catch (error: any) {
       if (isGrammyError(error)) {
         if (error.error_code === 400 && error.description === 'Bad Request: message to be replied not found') {

src/decorators/Context.ts

@@ -1,6 +1,5 @@
 import { BotReply } from '../utils/chat/BotReply';
 import { MessagesService } from '../service/messages';
-import { RateLimitConfig } from '../types/CommandTypes';
 import { createDecorator } from './index';
 /**
  * A decorator to restrict commands to group chats.
@@ -14,7 +13,6 @@ export function RestrictToGroupChats() {
     try {
       if (chat.type === 'supergroup' || chat.type === 'group') {
         await next();
-        return;
       } else if (chat.type === 'private') {
         await reply.textReply('This command can only be used in group chats.');
         close();

src/decorators/Database.ts

@@ -26,8 +26,6 @@ export function EnsureUserAndGroup(userSource: 'from' | 'reply' = 'reply') {
   return createDecorator(async (ctx: Context, next, close) => {
     try {
       const service = ServiceProvider.getInstance();
-      const userService = await service.getUserService();
-      const groupService = await service.getGroupService();
       const userContext = userSource === 'reply' && ctx.message?.reply_to_message?.from && !ctx.message.reply_to_message.forum_topic_created ? ctx.message.reply_to_message.from : ctx.from;
       const userId = userContext?.id;
       const groupId = ctx.chat?.id;
@@ -41,14 +39,7 @@ export function EnsureUserAndGroup(userSource: 'from' | 'reply' = 'reply') {
         id: userId,
         username: userContext!.username!,
       };
-      let user = await userService.getByTelegramId(userId);
-      if (!user) {
-        user = await userService.save(userData);
-      }
-      let group = await groupService.getByGroupId(groupId);
-      if (!group) {
-        group = await groupService.save(ctx);
-      }
+      await Promise.all([service.getUserService().then((userService) => userService.save(userData)), service.getGroupService().then((groupService) => groupService.save(ctx))]);
       await next();
     } catch (error) {
       console.error('Error in EnsureUserAndGroup decorator:', error);

src/service/database/ServiceProvider.ts

@@ -5,6 +5,7 @@ import { GroupService } from '../../database/models/Group';
 import { UserService } from '../../database/models/User';
 import { GroupRuleService } from '../../database/models/GroupRule';
 import { WarningDatabaseService } from '../../database/models/Warning';
+import logger from '../../utils/logger';
 
 export class ServiceProvider {
   private static instance: ServiceProvider;
@@ -40,20 +41,28 @@ export class ServiceProvider {
     return await this._connectionPool.getClient();
   }
   async getGroupService() {
-    const client = await this.getPoolClint();
-    return new GroupService(client);
+    return await this.retryConnect(async () => {
+      const client = await this.getPoolClint();
+      return new GroupService(client);
+    });
   }
   async getUserService() {
-    const client = await this.getPoolClint();
-    return new UserService(client);
+    return await this.retryConnect(async () => {
+      const client = await this.getPoolClint();
+      return new UserService(client);
+    });
   }
   async getRulesService() {
-    const client = await this.getPoolClint();
-    return new GroupRuleService(client);
+    return await this.retryConnect(async () => {
+      const client = await this.getPoolClint();
+      return new GroupRuleService(client);
+    });
   }
   async getWarnsService() {
-    const clint = await this.getPoolClint();
-    return new WarningDatabaseService(clint);
+    return await this.retryConnect(async () => {
+      const clint = await this.getPoolClint();
+      return new WarningDatabaseService(clint);
+    });
   }
   async healthCheck(): Promise<boolean> {
     try {
@@ -67,4 +76,17 @@ export class ServiceProvider {
       return false;
     }
   }
+  private async retryConnect(fn: Function, retries = 3, delay = 5000) {
+    for (let attempt = 0; attempt < retries; attempt++) {
+      try {
+        return await fn();
+      } catch (error: any) {
+        logger.error(`Database Retry Attempt ${attempt + 1}: ${error.message}`, 'Database');
+        if (attempt < retries - 1) {
+          await new Promise((res) => setTimeout(res, delay));
+        }
+      }
+    }
+    throw new Error('Failed to connect to the database after retries');
+  }
 }

src/service/messages/index.ts

@@ -90,7 +90,7 @@ export class MessagesService {
       return;
     }
     const blacklist = group.black_list;
-    const isForbidden = blacklist.some((word) => {
+    const isForbidden = blacklist.some((word: string) => {
       const regex = new RegExp(`(^|\\s)${word}($|\\s|[.,!?;])`, 'i'); // \b is a word boundary, 'i' is for case-insensitive matching
       return regex.test(messageText);
     });