@flutry/sequelize 0.1.3 → 0.1.6

package/dist/utils/connect.d.ts

@@ -2,12 +2,13 @@ import { Sequelize } from 'sequelize';
 export declare class Flutry_Connect {
     static sequelize: Sequelize;
     private readonly functions;
-    private retryCount;
-    private maxRetries;
-    private retryDelay;
+    private static readonly MAX_RETRIES;
+    private static readonly RETRY_DELAY;
     constructor();
     static get isConnected(): boolean;
     reconnect(): Promise<void>;
     private init;
-    private connect;
+    private disconnect;
+    private connectWithRetry;
+    private createConnection;
 }

package/dist/utils/connect.js

@@ -8,83 +8,63 @@ const models_1 = require("../models/models");
 class Flutry_Connect {
     constructor() {
         this.functions = new function_1.Functions();
-        this.retryCount = 0;
-        this.maxRetries = 5; // Maximum retry attempts
-        this.retryDelay = 5000; // 5 seconds
-        this.init = async () => {
-            if (await this.functions.DBConfigVerify()) {
-                this.connect();
-            }
-        };
-        this.connect = async () => {
-            Flutry_Connect.sequelize = new sequelize_1.Sequelize(`${process.env.DB_NAME}`, `${process.env.DB_USER}`, `${process.env.DB_PASS}`, {
-                host: `${process.env.DB_HOST}`,
-                dialect: `${process.env.DB_TYPE}`,
-                logging: false,
-                timezone: await this.functions.getTimeZone(),
-                pool: {
-                    max: 5,
-                    min: 0,
-                    acquire: 30000, // 30 seconds timeout for acquiring connection
-                    idle: 10000, // 10 seconds idle timeout
-                },
-                retry: {
-                    match: [/ETIMEDOUT/, /EHOSTUNREACH/, /ECONNRESET/, /ECONNREFUSED/, /TIMEOUT/],
-                    max: 3,
-                },
-                define: {
-                    charset: 'utf8mb4',
-                    collate: 'utf8mb4_bin',
-                },
-            });
-            try {
-                await Flutry_Connect.sequelize.authenticate();
-                main_1.Flutry_Sequelize.logger.info('Connection has been established successfully');
-                await new models_1.Flutry_Models();
-                this.retryCount = 0; // Reset retry count on successful connection
-            }
-            catch (error) {
-                const errorMessage = error instanceof Error ? error.message : String(error);
-                const isTimeoutError = /timeout|ETIMEDOUT|ECONNRESET|EHOSTUNREACH|ECONNREFUSED/i.test(errorMessage);
-                if (isTimeoutError) {
-                    main_1.Flutry_Sequelize.logger.error(`Database connection timeout. Attempt ${this.retryCount + 1}/${this.maxRetries}. Error: ${errorMessage}`);
-                }
-                else {
-                    main_1.Flutry_Sequelize.logger.error(`Database connection error. Attempt ${this.retryCount + 1}/${this.maxRetries}. Error: ${errorMessage}`);
-                }
-                if (this.retryCount < this.maxRetries) {
-                    this.retryCount++;
-                    const waitTime = isTimeoutError ? this.retryDelay * 2 : this.retryDelay; // Longer wait for timeout errors
-                    main_1.Flutry_Sequelize.logger.info(`Retrying connection in ${waitTime / 1000} seconds...`);
-                    setTimeout(() => {
-                        this.connect();
-                    }, waitTime);
-                }
-                else {
-                    main_1.Flutry_Sequelize.logger.error('Maximum retry attempts reached. Unable to connect to database.');
-                    main_1.Flutry_Sequelize.logger.error(`Final error: ${errorMessage}`);
-                    this.retryCount = 0; // Reset for potential future attempts
-                }
-            }
-        };
         this.init();
     }
-    // Getter to check if connection is established
     static get isConnected() {
-        return this.sequelize && this.sequelize.authenticate !== undefined;
+        return this.sequelize?.authenticate !== undefined;
     }
-    // Manual reconnect method
     async reconnect() {
-        if (Flutry_Connect.sequelize) {
-            try {
-                await Flutry_Connect.sequelize.close();
+        await this.disconnect();
+        await this.connectWithRetry();
+    }
+    async init() {
+        if (await this.functions.DBConfigVerify()) {
+            await this.connectWithRetry();
+        }
+    }
+    async disconnect() {
+        try {
+            await Flutry_Connect.sequelize?.close();
+        }
+        catch (error) {
+            main_1.Flutry_Sequelize.logger.warn('Error closing connection:', error);
+        }
+    }
+    async connectWithRetry(attempt = 1) {
+        try {
+            await this.createConnection();
+            await Flutry_Connect.sequelize.authenticate();
+            main_1.Flutry_Sequelize.logger.info('Database connection established');
+            await new models_1.Flutry_Models();
+        }
+        catch (error) {
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            main_1.Flutry_Sequelize.logger.error(`Connection failed (${attempt}/${Flutry_Connect.MAX_RETRIES}): ${errorMsg}`);
+            if (attempt < Flutry_Connect.MAX_RETRIES) {
+                main_1.Flutry_Sequelize.logger.info(`Retrying in ${Flutry_Connect.RETRY_DELAY / 1000}s...`);
+                setTimeout(() => this.connectWithRetry(attempt + 1), Flutry_Connect.RETRY_DELAY);
             }
-            catch (error) {
-                main_1.Flutry_Sequelize.logger.warn('Error closing existing connection:', error);
+            else {
+                main_1.Flutry_Sequelize.logger.error('Max retries reached. Connection failed.');
             }
         }
-        this.retryCount = 0;
-        await this.connect();
+    }
+    async createConnection() {
+        Flutry_Connect.sequelize = new sequelize_1.Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PASS, {
+            host: process.env.DB_HOST,
+            dialect: process.env.DB_TYPE,
+            logging: false,
+            timezone: await this.functions.getTimeZone(),
+            dialectOptions: { connectTimeout: 15000 },
+            pool: { max: 10, min: 2, acquire: 30000, idle: 10000 },
+            retry: {
+                match: [/ETIMEDOUT/, /EHOSTUNREACH/, /ECONNRESET/, /ECONNREFUSED/],
+                max: 3,
+            },
+            define: { charset: 'utf8mb4', collate: 'utf8mb4_bin' },
+        });
     }
 }
 exports.Flutry_Connect = Flutry_Connect;
+Flutry_Connect.MAX_RETRIES = 5;
+Flutry_Connect.RETRY_DELAY = 5000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flutry/sequelize",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -11,13 +11,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "dotenv": "^17.3.1",
-    "mariadb": "^3.5.1",
-    "mysql2": "^3.17.4",
-    "sequelize": "^6.37.7"
+    "dotenv": "^17.4.0",
+    "mariadb": "^3.5.2",
+    "mysql2": "^3.20.0",
+    "sequelize": "^6.37.8"
   },
   "devDependencies": {
-    "@types/node": "^25.3.1",
-    "typescript": "^5.9.3"
+    "@types/node": "^25.5.2",
+    "typescript": "^6.0.2"
   }
 }