agrs-sequelize-sdk 1.1.0 → 1.1.1

package/index.js

@@ -1,111 +1,10 @@
-// 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: 100,
-//         //   min: 0,
-//         //   acquire: 30000,
-//         //   idle: 10000,
-//         // },
-//         pool: {
-//           max: 20, // Reduced to a more reasonable number
-//           min: 5, // Keep some connections alive
-//           acquire: 60000, // Increased timeout for acquiring connections
-//           idle: 20000, // Increased idle time
-//           evict: 30000, // Added eviction running time
-//           handleDisconnects: true, // Add automatic handling of disconnected connections
-//         },
-//         retry: {
-//           max: 3,
-//           timeout: 6000, // Increase timeout to 60 seconds
-//           match: [
-//             /Connection terminated/,
-//             /Connection timed out/,
-//             /Operation timeout/,
-//             /unknown timed out/,
-//             /TimeoutError/,
-//           ],
-//           backoffBase: 1000,
-//           backoffExponent: 1.5,
-//         },
-//       }
-//     );
-
-//     // 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) {
-    // Validate config
-    const requiredFields = [
-      "database",
-      "username",
-      "password",
-      "host",
-      "dialect",
-      "port",
-    ];
-    for (const field of requiredFields) {
-      if (!config[field]) {
-        throw new Error(`Missing required database config field: ${field}`);
-      }
-    }
-
-    const sanitizedConfig = { ...config, password: "****" };
-    console.log("Initializing DB with config:", sanitizedConfig);
-
     this.config = config;
     this.db = {};
 
@@ -118,37 +17,30 @@ class DBModels {
         host: this.config.host,
         dialect: this.config.dialect,
         port: this.config.port,
-        logging: (msg) => {
-          if (msg.includes("authentication") || msg.includes("connection")) {
-            console.log("DB Operation:", msg);
-          }
-        },
+        logging: false, // Enable logging to console
         dialectOptions: {
           ssl: {
-            require: true,
-            rejectUnauthorized: false,
+            require: true, // Require SSL
+            rejectUnauthorized: false, // For self-signed or unverified certificates
           },
         },
+        // pool: {
+        //   max: 100,
+        //   min: 0,
+        //   acquire: 30000,
+        //   idle: 10000,
+        // },
         pool: {
-          max: 20,
-          min: 5,
-          acquire: 60000,
-          idle: 20000,
-          evict: 30000,
-          handleDisconnects: true,
-          validate: async (connection) => {
-            try {
-              await connection.query("SELECT 1");
-              return true;
-            } catch (err) {
-              console.error("Connection validation failed:", err);
-              return false;
-            }
-          },
+          max: 20, // Reduced to a more reasonable number
+          min: 5, // Keep some connections alive
+          acquire: 60000, // Increased timeout for acquiring connections
+          idle: 20000, // Increased idle time
+          evict: 30000, // Added eviction running time
+          handleDisconnects: true, // Add automatic handling of disconnected connections
         },
         retry: {
           max: 3,
-          timeout: 60000,
+          timeout: 6000, // Increase timeout to 60 seconds
           match: [
             /Connection terminated/,
             /Connection timed out/,
@@ -159,46 +51,9 @@ class DBModels {
           backoffBase: 1000,
           backoffExponent: 1.5,
         },
-        hooks: {
-          beforeConnect: (config) => {
-            console.log("Attempting to connect with user:", config.username);
-          },
-          afterConnect: (connection) => {
-            console.log("Connection established successfully");
-          },
-        },
       }
     );
 
-    // Add periodic connection health check
-    const healthCheckInterval = setInterval(async () => {
-      try {
-        const [results] = await sequelize.query(
-          `
-          SELECT count(*) as connection_count 
-          FROM pg_stat_activity 
-          WHERE datname = $1
-        `,
-          {
-            bind: [this.config.database],
-            type: Sequelize.QueryTypes.SELECT,
-          }
-        );
-        console.log("Current database connections:", results.connection_count);
-
-        // Check pool status
-        await this.checkConnection();
-      } catch (error) {
-        console.error("Pool health check failed:", error);
-      }
-    }, 30000);
-
-    // Cleanup on application shutdown
-    process.on("SIGTERM", () => {
-      clearInterval(healthCheckInterval);
-      sequelize.close().catch(console.error);
-    });
-
     // Load all models
     fs.readdirSync(path.join(__dirname, "models"))
       .filter((file) => {
@@ -222,35 +77,6 @@ class DBModels {
     // Export the db object with Sequelize and models
     this.db.sequelize = sequelize;
     this.db.Sequelize = Sequelize;
-
-    // Initial connection test
-    sequelize
-      .authenticate()
-      .then(() => {
-        console.log("Database connection established successfully");
-      })
-      .catch((err) => {
-        console.error("Unable to connect to the database:", err);
-      });
-  }
-
-  // Helper method to check connection health
-  async checkConnection() {
-    try {
-      await this.db.sequelize.authenticate();
-      const [results] = await this.db.sequelize.query(
-        "SELECT COUNT(*) as pool_size FROM pg_stat_activity WHERE state = $1",
-        {
-          bind: ["active"],
-          type: this.db.Sequelize.QueryTypes.SELECT,
-        }
-      );
-      console.log("Active connections:", results.pool_size);
-      return true;
-    } catch (error) {
-      console.error("Database connection check failed:", error);
-      return false;
-    }
   }
 }
 

package/package.json

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