bot-functions 1.7.0 → 1.8.1

package/index.js

@@ -909,11 +909,18 @@ const sendDataClickHouse = async (params, dataJSON) => {
   return new Promise(async function (resolve, reject) {
     actualFunction = "sendDataClickHouse";
     try {
+      payload = {
+        params,
+        data: dataJSON
+      }
       const batchPromises = [];
       const stringData = JSON.stringify(dataJSON);
       const response = await axios({
-        method: 'post', url: process.env.INSERT_CLICKHOUSE, data: {params, dataJSON: stringData },
-        maxBodyLength: Infinity, headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' }
+        method: 'post', 
+        url: process.env.INSERT_CLICKHOUSE, 
+        data: payload,
+        maxBodyLength: Infinity, 
+        headers: { 'Accept': 'application/json', 'Content-Type': 'application/json'}
       });
       batchPromises.push(response.status);
       batchPromises.map(reg => log.info('Insert status', reg));
@@ -1478,6 +1485,78 @@ const uploadEvidence = async (pathDownloads, params, reintentos = 3) => {
   throw new Error(`[S3] Upload fallido tras ${reintentos} intentos: ${ultimoError.message}`);
 };
 
+const insertBotEvidence = async (rutaFile, params) => {
+  return new Promise(async function (resolve) {
+    
+    await axios.post(process.env.INSERT_BOT_EVIDENCE, { 
+      idgfc: params.robot.idgfc,
+      idpc: params.robot.idPC,
+      proyecto: params.robot.proyecto.toUpperCase(),
+      grupo: params.robot.cadena.toUpperCase(),
+      cadena: params.robot.cadena.toUpperCase(),
+      fecha: params.reporte.date1,
+      tipo: params.reporte.type,
+      fileInsert: rutaFile
+    });
+    resolve(true);
+  });
+}
+
+const uploadBotEvidence = async (pathDownloads, params, reintentos = 3) => {
+
+  log.info(`[S3] Región: ${process.env.AWS_REGION_BUCKET} | Bucket: ${process.env.S3_BUCKET}`);
+  const s3 = new S3Client({ region: process.env.AWS_REGION_BUCKET });
+
+  const zipPath = `${pathDownloads}/${params.reporte.filename}.zip`;
+  const key = `${params.reporte.pathS3}/${params.reporte.filename}.zip`;
+
+  // Armar el zip
+  const zip = new AdmZip();
+  zip.addLocalFile(`${pathDownloads}/${params.reporte.filename}${process.env.EXTENSION_FILE}`);
+  zip.writeZip(zipPath);
+
+  // Validar antes de intentar subir
+  validarZip(zipPath);
+
+  let ultimoError;
+
+  for (let intento = 1; intento <= reintentos; intento++) {
+    try {
+      log.info(`[S3] Intento ${intento}/${reintentos} — subiendo ${key}`);
+
+      const upload = new Upload({
+        client: s3,
+        params: {
+          Bucket: process.env.S3_BUCKET,
+          Key: key,
+          Body: fs.createReadStream(zipPath),
+          ContentType: "application/zip",
+          ACL: "public-read",
+        },
+        queueSize: 4,
+        partSize: 10 * 1024 * 1024,
+      });
+
+      await upload.done();
+      const url = `https://${process.env.S3_BUCKET}.s3.${process.env.AWS_REGION_BUCKET}.amazonaws.com/${key}`;
+      log.info(`[S3] Upload exitoso en intento ${intento} — ${key}`);
+      await insertBotEvidence(url, params);
+      await insertLog2(params, 305);
+      return key;
+
+    } catch (error) {
+      ultimoError = error;
+      log.error(`[S3] Intento ${intento} fallido: ${error.message}`);
+
+      if (intento < reintentos) {
+        const espera = 2000 * intento;
+        log.info(`[S3] Reintentando en ${espera / 1000}s...`);
+        await sleepFile(espera);
+      }
+    }
+  }
+  throw new Error(`[S3] Upload fallido tras ${reintentos} intentos: ${ultimoError.message}`);
+};
 
 module.exports = {
   waitNtype,
@@ -1535,5 +1614,6 @@ module.exports = {
   uploadImageToS3,
   insertCatspecs,
   uploadEvidence,
-  sendDataClickHouse
+  sendDataClickHouse,
+  uploadBotEvidence
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bot-functions",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "Bot functions",
   "main": "index.js",
   "scripts": {