refactor(database): Refactor database initialization, connection, and error handling; update config and decorators

Author: m-mdy-m

src/app.ts

@@ -3,9 +3,13 @@ import { ServiceProvider } from './service/database/ServiceProvider';
 import logger from './utils/logger';
 async function main() {
   const cop = CopBot.getInstance();
-  await ServiceProvider.initialize();
+  const db = await ServiceProvider.initialize();
   logger.info('initialize Database');
   await cop.initial();
   logger.info('initial bot');
+  process.on('SIGTERM', async () => {
+    await db.close();
+    process.exit(0);
+  });
 }
-main();
+main().catch((error) => console.error('Application error:', error));

src/config/index.ts

@@ -22,10 +22,7 @@ class Config {
     const dbName = process.env.DB_NAME!;
     const dbPassword = process.env.DB_PASSWORD!;
     const dbPort = parseInt(process.env.DB_PORT!, 10);
-    let dbUrl = process.env.DB_URL!;
-    if (environment === 'production') {
-      dbUrl = process.env.DATABASE_URL!;
-    }
+    const dbUrl = environment === 'production' ? process.env.DATABASE_URL! : process.env.DB_URL!;
     this.token = token;
     this.environment = environment;
     // Initialize the database configuration

src/database/ConnectionPool.ts

@@ -3,11 +3,13 @@ import Config from '../config';
 import { Catch } from '../decorators/Catch';
 export class ConnectionPool {
   private _pool: Pool;
+  private _isProduction: 'development' | 'production';
   constructor() {
     const connectionString = this.getConnectionString();
+    this._isProduction = Config.environment;
     this._pool = new Pool({
       connectionString,
-      ssl: { rejectUnauthorized: false },
+      ssl: this._isProduction === 'production' ? { rejectUnauthorized: false } : false,
     });
   }
   @Catch({
@@ -17,17 +19,20 @@ export class ConnectionPool {
   })
   async connect(): Promise<void> {
     try {
-      await this._pool.connect();
+      const client = await this._pool.connect();
+      client.release(); // Verify and release immediately
     } catch (error: any) {
-      console.log('error:', error.code);
+      console.error('Database connection error:', error.message);
       if (error.code === '3D000') {
         console.log(`Database does not exist. Creating database ${Config.database.databaseName}...`);
         await this.createDatabase();
         await this._pool.end(); // End the current pool connection
         const newConnectionString = this.getConnectionString();
         this._pool = new Pool({
           connectionString: newConnectionString,
+          ssl: this._isProduction === 'production' ? { rejectUnauthorized: false } : false,
         });
+        console.log('Retrying connection after creating the database...');
         await this._pool.connect();
       }
     }
@@ -46,7 +51,12 @@ export class ConnectionPool {
       port,
       database: 'postgres',
     });
-    await client.query(`CREATE DATABASE ${databaseName}`);
+    try {
+      await client.query(`CREATE DATABASE "${databaseName}"`);
+      console.log(`Database "${databaseName}" created successfully.`);
+    } finally {
+      await client.end();
+    }
   }
   private getConnectionString(): string {
     const { user, host, databaseName, password, port, url } = Config.database;

src/decorators/Catch.ts

@@ -29,6 +29,7 @@ export function Catch(customResponse?: ErrorResponse) {
         if (ctx && typeof ctx.reply === 'function') {
           await ctx.reply(errorResponse.message);
         }
+        throw error
       }
     };