agrs-sequelize-sdk 1.1.3 → 1.1.5

package/index.js

@@ -1,14 +1,87 @@
+// const Sequelize = require("sequelize");
+// const path = require("path");
+// const fs = require("fs");
+
+// // const env = process.env.NODE_ENV || "development";
+// class DBModels {
+//   constructor(config) {
+//     this.config = config;
+//     this.db = {};
+
+//     // Initialize Sequelize
+//     const sequelize = new Sequelize(
+//       this.config.database,
+//       this.config.username,
+//       this.config.password,
+//       {
+//         host: this.config.host,
+//         dialect: this.config.dialect,
+//         port: this.config.port,
+//         logging: false, // Enable logging to console
+//         dialectOptions: {
+//           ssl: {
+//             require: true, // Require SSL
+//             rejectUnauthorized: false, // For self-signed or unverified certificates
+//           },
+//         },
+//         pool: {
+//           max: 150, // Increase from 50, but stay under max_connections (200)
+//           min: 5, // Increase minimum connections
+//           acquire: 60000, // Double acquire timeout
+//           idle: 30000, // Align with idle_in_transaction_session_timeout
+//         },
+
+//         retry: {
+//           max: 5,
+//           timeout: 60000,
+//           match: [
+//             /Connection terminated/,
+//             /Connection timed out/,
+//             /Operation timeout/,
+//             /password authentication failed/,
+//             /canceling authentication/,
+//           ],
+//         },
+//       }
+//     );
+
+//     // Load all models
+//     fs.readdirSync(path.join(__dirname, "models"))
+//       .filter((file) => {
+//         return file.indexOf(".") !== 0 && file.slice(-3) === ".js";
+//       })
+//       .forEach((file) => {
+//         const model = require(path.join(__dirname, "models", file))(
+//           sequelize,
+//           Sequelize.DataTypes
+//         );
+//         this.db[model.name] = model;
+//       });
+
+//     // Set up associations
+//     Object.keys(this.db).forEach((modelName) => {
+//       if (this.db[modelName].associate) {
+//         this.db[modelName].associate(this.db);
+//       }
+//     });
+
+//     // Export the db object with Sequelize and models
+//     this.db.sequelize = sequelize;
+//     this.db.Sequelize = Sequelize;
+//   }
+// }
+
+// module.exports = DBModels;
+
 const Sequelize = require("sequelize");
 const path = require("path");
 const fs = require("fs");
 
-// const env = process.env.NODE_ENV || "development";
 class DBModels {
   constructor(config) {
     this.config = config;
     this.db = {};
 
-    // Initialize Sequelize
     const sequelize = new Sequelize(
       this.config.database,
       this.config.username,
@@ -17,39 +90,45 @@ class DBModels {
         host: this.config.host,
         dialect: this.config.dialect,
         port: this.config.port,
-        logging: false, // Enable logging to console
+        logging: false,
         dialectOptions: {
           ssl: {
-            require: true, // Require SSL
-            rejectUnauthorized: false, // For self-signed or unverified certificates
+            require: true,
+            rejectUnauthorized: false,
           },
+          statement_timeout: 30000,
+          idle_in_transaction_session_timeout: 30000,
+          connectTimeout: 30000,
         },
-        // pool: {
-        //   max: 100,
-        //   min: 0,
-        //   acquire: 30000,
-        //   idle: 10000,
-        // },
         pool: {
-          max: 5, // Fewer connections for debugging
-          min: 1,
-          acquire: 30000,
-          idle: 10000,
+          max: 50, // Quarter of max connections (200)
+          min: 0, // Start from 0 and scale up as needed
+          acquire: 30000, // Maximum time to wait for a connection
+          idle: 10000, // How long a connection can remain idle
+        },
+        retry: {
+          max: 3,
+          timeout: 20000,
+          match: [
+            /Connection terminated/,
+            /Connection timed out/,
+            /Operation timeout/,
+            /ECONNRESET/,
+            /PROTOCOL_CONNECTION_LOST/,
+          ],
         },
-
-        // retry: {
-        //   // Add retry logic for failed connections
-        //   max: 3,
-        //   timeout: 30000,
-        //   match: [
-        //     /Connection terminated/,
-        //     /Connection timed out/,
-        //     /Operation timeout/,
-        //   ],
-        // },
       }
     );
 
+    // Add connection monitoring listeners
+    sequelize.connectionManager.on("acquire", function (connection) {
+      console.log("Connection %d acquired", connection.threadId);
+    });
+
+    sequelize.connectionManager.on("release", function (connection) {
+      console.log("Connection %d released", connection.threadId);
+    });
+
     // Load all models
     fs.readdirSync(path.join(__dirname, "models"))
       .filter((file) => {
@@ -74,6 +153,17 @@ class DBModels {
     this.db.sequelize = sequelize;
     this.db.Sequelize = Sequelize;
   }
+
+  // Add method for pool monitoring
+  async getConnectionPoolStats() {
+    const pool = this.db.sequelize.connectionManager.pool;
+    return {
+      all: pool.size,
+      available: pool.available,
+      borrowed: pool.borrowed,
+      pending: pool.pending,
+    };
+  }
 }
 
 module.exports = DBModels;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agrs-sequelize-sdk",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "main": "index.js",
   "scripts": {
     "start": "node index.js",

package/config/config.json

@@ -1,24 +0,0 @@
-{
-  "development": {
-    "username": "postgres",
-    "password": "1234",
-    "database": "dev-db",
-    "host": "localhost",
-    "port": 5432,
-    "dialect": "postgres"
-  },
-  "test": {
-    "username": "root",
-    "password": "1234",
-    "database": "test-db",
-    "host": "127:0.0.1",
-    "dialect": "postgres"
-  },
-  "production": {
-    "username": "root",
-    "password": "1234",
-    "database": "prod-db",
-    "host": "127:0.0.1",
-    "dialect": "postgres"
-  }
-}