2.0.1

aaferna · Jun 25, 2023 · 4b3eb0f · 4b3eb0f
1 parent 3eb17e9
commit 4b3eb0f
Show file tree

Hide file tree

Showing 15 changed files with 146 additions and 307 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-PORT=1800
+PORT=1900
 DDOSSTATUS=0
-DDOSINTENTOS=3
-DDOSTIMOUT=600000
+DDOSINTENTOS=10
+DDOSTIMOUT=10000 # 86400000 es un dia
diff --git a/db/.DS_Store b/db/.DS_Store
diff --git a/db/datastores.json b/db/datastores.json
@@ -1,14 +1,17 @@
 {
     "datastore":[
         {
-            "name": "manager",
+            "name": "test",
             "conn":{
                 "server": "localhost",
                 "user": "root",
                 "password": "",
                 "port": 3306,
                 "connectionreintent": 5,
-                "database": ""
+                "database": "test",
+                "connectionLimit": 10,
+                "waitForConnections": 10,
+                "queueLimit": 10
             }
         }
     ]

diff --git a/db/endpoint_stats.db b/db/endpoint_stats.db
diff --git a/index.js b/index.js
@@ -2,6 +2,7 @@ require("dotenv").config();
 
 global.datetoDay = require("./modules/date").datetoDay
 global.dateNow = require("./modules/date").dateNow
+global.dateDB = require("./modules/date").dateDB
 global.datetoJSON = require("./modules/date").datetoJSON
 global.log = require("./modules/log4j").log
 global.port = parseInt(process.env.PORT) || 3000;

diff --git a/modules/date.js b/modules/date.js
@@ -4,6 +4,11 @@ const formatearFecha = (fecha) => {
     return fecha.setZone('America/Argentina/Buenos_Aires');
 };
 
+const dateDB = () => {
+    let date = formatearFecha(DateTime.local());
+    return date.toFormat('yyyy-MM-dd HH:mm:ss');
+};
+
 const dateNow = () => {
     let date = formatearFecha(DateTime.local());
     return date.toLocaleString(DateTime.DATETIME_FULL);
@@ -29,5 +34,6 @@ const datetoJSON = () => {
 module.exports = {
     datetoDay,
     dateNow,
-    datetoJSON
+    datetoJSON,
+    dateDB
 };
diff --git a/modules/expressHandle.js b/modules/expressHandle.js
@@ -5,7 +5,7 @@ const blockedIPs = [];
 exports.reqInfo = (req) =>{
   return {
     id: randomUUID(),
-    ip: req.headers['x-forwarded-for'] || req.socket.remoteAddress,
+    ip: req.headers['x-forwarded-for'],
     uri: req.originalUrl,
     method: req.method
   }
@@ -82,9 +82,6 @@ exports.DDOSBlock = (req, res, next) => {
   next();
 }
 
-
-
-
   setInterval(() => {
     const currentTime = new Date();
     blockedIPs.forEach((ip, index) => {

diff --git a/modules/sql.js b/modules/sql.js
@@ -1,78 +1,93 @@
-const mysql = require("mysql2");
-const mysqlSy = require('sync-mysql')
 const dbconect = require("../db/datastores.json").datastore
+const mysql = require('mysql2/promise');
 
-function executeSQL(database, sql) {
-  let dataconnection;
-  const selectedDB = dbconect.find(item => item.name === database);
+async function executeSQLS(database, sql) {
+  try {
+    const selectedDB = dbconect.find(item => item.name === database);
+
+    if (!selectedDB) {
+      log("error", `El Conector "${database}" no es correcto o no existe`, "SQL");
+      return { status: 0 };
+    }
 
-  if (selectedDB) {
-    dataconnection = mysql.createConnection({
+    const pool = mysql.createPool({
+      connectionLimit: selectedDB.conn.connectionLimit,
       host: selectedDB.conn.server,
       user: selectedDB.conn.user,
       password: selectedDB.conn.password,
-      connectTimeout: selectedDB.conn.connectTimeout,
       database: selectedDB.conn.database,
-      multipleStatements: true
+      waitForConnections: true,
+      queueLimit: 0
     });
-  } else {
-    log("error", `El Conector "${database}" no es correcto o no existe`, "SQL");
-    return Promise.resolve({ status: 0 });
-  }
-
-  return new Promise((resolve, reject) => {
-    try {
-      dataconnection.query(sql, (error, results) => {
-        if (error) {
-          log("error", `Existe un error en la consulta :: ${error}`, "SQL");
-          resolve({ status: 0 });
-        }
-        resolve(results);
-      });
-    } catch (error) {
-      log("error", `Existe un error en la consulta :: ${error}`, "SQL");
-      resolve({ status: 0 });
-    }
-  });
-}
-
-function executeSQLS (database, sql) {
-  try{
 
-    let connection;
-    let response;
-
-    const selectedDB = dbconect.find(item => item.name === database);
+    const [rows, fields] = await pool.execute(sql);
 
-    if (selectedDB) {
+    await pool.end();
 
-      connection = new mysqlSy({
-        host: selectedDB.conn.server,
-        user: selectedDB.conn.user,
-        password: selectedDB.conn.password,
-        connectTimeout: selectedDB.conn.connectTimeout,
-        database: selectedDB.conn.database
-      });
+    return rows;
+  } catch (error) {
+    log("error", `Existe un error en la consulta :: ${error}`, "SQL");
 
+    if (error.code === 'PROTOCOL_CONNECTION_LOST') {
+      // Si la conexión se pierde, se vuelve a intentar una vez
+      log("warning", `Se perdió la conexión con la base de datos. Reintentando la consulta...`, "SQL");
+      return executeSQLS(database, sql);
+    } else if (error.code === 'POOL_ENQUEUELIMIT') {
+      // Si se alcanza el límite de la pool, se muestra una advertencia y se espera antes de reintentar
+      log("warning", `Se alcanzó el límite de conexiones permitido. Esperando antes de reintentar...`, "SQL");
+      await new Promise(resolve => setTimeout(resolve, 5000));
+      return executeSQLS(database, sql);
     } else {
+      // Cualquier otro error se maneja como una falla
+      return { status: 0 };
+    }
+  }
+}
+
+async function executeSQL(database, sql, values) {
+  try {
+    const selectedDB = dbconect.find(item => item.name === database);
 
+    if (!selectedDB) {
       log("error", `El Conector "${database}" no es correcto o no existe`, "SQL");
       return { status: 0 };
-
     }
 
-    response = connection.query(sql)
-    connection.finishAll()
+    const pool = mysql.createPool({
+      connectionLimit: selectedDB.conn.connectionLimit,
+      host: selectedDB.conn.server,
+      user: selectedDB.conn.user,
+      password: selectedDB.conn.password,
+      database: selectedDB.conn.database,
+      waitForConnections: true,
+      queueLimit: 0
+    });
+
+    const [rows, fields] = await pool.execute(sql, values);
 
-    return response;
+    await pool.end();
 
+    return rows;
   } catch (error) {
-    log("error", `Existe un error en la consulta :: ${error}`, "SQL")
-    return { status: 0 };
+    log("error", `Existe un error en la consulta :: ${error}`, "SQL");
+
+    if (error.code === 'PROTOCOL_CONNECTION_LOST') {
+      // Si la conexión se pierde, se vuelve a intentar una vez
+      log("warning", `Se perdió la conexión con la base de datos. Reintentando la consulta...`, "SQL");
+      return executeSQLS(database, sql, values);
+    } else if (error.code === 'POOL_ENQUEUELIMIT') {
+      // Si se alcanza el límite de la pool, se muestra una advertencia y se espera antes de reintentar
+      log("warning", `Se alcanzó el límite de conexiones permitido. Esperando antes de reintentar...`, "SQL");
+      await new Promise(resolve => setTimeout(resolve, 5000));
+      return executeSQLS(database, sql, values);
+    } else {
+      // Cualquier otro error se maneja como una falla
+      return { status: 0 };
+    }
   }
 }
 
-module.exports = {
-  executeSQL,
-  executeSQLS
-};
+
+exports.executeSQLS = executeSQLS;
+
+exports.executeSQL = executeSQL