refactor: Refactor database connections and pool management

Author: m-mdy-m

src/bot/index.ts

@@ -82,7 +82,6 @@ export class CopBot {
         app.listen(port, async () => {
           logger.info(`Webhook server running on port ${port}`);
           await this.setupWebhook(this.webhookURL);
-          await startBot(this.mode);
         });
       } catch (err: any) {
         console.error('Error setting up webhook:', err);

src/database/ConnectionPool.ts

@@ -11,8 +11,7 @@ export class ConnectionPool {
   }
   async connect(): Promise<boolean> {
     try {
-      const client = await this._pool.connect();
-      client.release();
+      await this._pool.connect();
       logger.info('Database connection successful');
       return true;
     } catch (error: any) {
@@ -23,7 +22,6 @@ export class ConnectionPool {
         await this.reinitializePool();
         try {
           const client = await this._pool.connect();
-          client.release();
           logger.info('Database connection successful after reinitialization');
           return true;
         } catch (reconnectError: any) {
@@ -45,12 +43,8 @@ export class ConnectionPool {
       port,
       database: 'postgres',
     });
-    try {
-      await client.query(`CREATE DATABASE "${databaseName}"`);
-      console.log(`Database "${databaseName}" created successfully.`);
-    } finally {
-      await client.end();
-    }
+    await client.query(`CREATE DATABASE "${databaseName}"`);
+    console.log(`Database "${databaseName}" created successfully.`);
   }
   private getConnectionString(): string {
     const { user, host, databaseName, password, port, url } = Config.database;
@@ -73,7 +67,7 @@ export class ConnectionPool {
       keepAlive: true,
     });
   }
-  private async reinitializePool() {
+  async reinitializePool() {
     await this._pool.end(); // Close old connections
     const newConnectionString = this.getConnectionString();
     this._pool = this.initializePool(newConnectionString);

src/database/service/Database.ts

@@ -18,8 +18,6 @@ export class DatabaseService {
     } catch (error: any) {
       console.error(`Error executing query: ${sql}`, error);
       throw new Error(`Database query failed: ${error.message}`);
-    } finally {
-      this._client.release();
     }
   }
   /**

src/database/service/Tables.ts

@@ -16,8 +16,6 @@ export class TablesService {
       logger.info('Initial tables have been set up successfully.');
     } catch (error) {
       throw error;
-    } finally {
-      client.release(); // Release connection
     }
   }
   async seedTables() {
@@ -36,8 +34,6 @@ export class TablesService {
       logger.info('All tables have been seeded successfully.');
     } catch (error) {
       throw error;
-    } finally {
-      client.release();
     }
   }
 }

src/service/database/ServiceProvider.ts

@@ -41,12 +41,17 @@ export class ServiceProvider {
     await this._connectionPool.close();
   }
   async getPoolClint(): Promise<PoolClient> {
-    const client = await this._connectionPool.getClient();
-    client.on('error', (err: any) => {
-      logger.error('Unexpected client error:', err);
-      client.release();
-    });
-    return client;
+    try {
+      const client = await this._connectionPool.getClient();
+      client.on('error', (err: any) => {
+        logger.error('Unexpected client error:', err);
+      });
+      return client;
+    } catch (err: any) {
+      logger.error('Error getting client from pool:', err);
+      await this._connectionPool.reinitializePool();
+      return this.getPoolClint();
+    }
   }
   async getGroupService() {
     const client = await this.getPoolClint();
@@ -74,8 +79,6 @@ export class ServiceProvider {
     } catch (err: any) {
       logger.error('Database health check failed:', err.message);
       return false;
-    } finally {
-      client.release();
     }
   }
 }