Merge branch 'main' of https://github.com/italia/validator-handler

command/scanManager.ts

@@ -27,6 +27,8 @@ import {
 } from "../controller/PA2026/integrationController";
 import { urlExists } from "../utils/utils";
 import { entityController } from "../controller/entityController";
+import psList from "ps-list";
+import treeKill from "tree-kill";
 
 dbSM
   .authenticate()
@@ -171,6 +173,9 @@ const scan = async (jobId) => {
     );
     console.log("JOB DELETED: ", jobDeleted);
 
+    const pidKilled = await killProcessByName("Chromium");
+    console.log("PID KILLED: ", pidKilled);
+
     return true;
   } catch (e) {
     console.log("SCAN EXCEPTION: ", e.toString());
@@ -180,6 +185,9 @@ const scan = async (jobId) => {
       end_at: Date.now(),
     });
 
+    const pidKilled = await killProcessByName("Chromium");
+    console.log("PID KILLED: ", pidKilled);
+
     return false;
   }
 };
@@ -247,3 +255,29 @@ const uploadFiles = async (
     };
   }
 };
+
+const killProcessByName = async (name: string) => {
+  const pidKilled = [];
+
+  try {
+    const list = await psList();
+
+    for (const element of list) {
+      try {
+        if (element.name === name) {
+          await treeKill(element.pid);
+          pidKilled.push(element.pid);
+        }
+      } catch (e) {
+        console.log("ELEMENT IN ERROR: ", element);
+        console.log("KILL PROCESS BY NAME FOR-STATEMENT EXCEPTION: ", e);
+      }
+    }
+
+    return pidKilled;
+  } catch (e) {
+    console.log("KILL PROCESS BY NAME EXCEPTION: ", e);
+
+    return pidKilled;
+  }
+};

controller/PA2026/integrationController.ts

@@ -19,6 +19,7 @@ import {
   mapPA2026Body,
   mapPA2026BodyUrlNotExists,
 } from "../../utils/utils";
+import { Op } from "sequelize";
 
 const retrieveToken = async () => {
   try {
@@ -185,6 +186,8 @@ const pushResult = async (
       const countJobsFromEntityId = await jobDefine(dbSM).count({
         where: {
           entity_id: entity.id,
+          [Op.not]: [{ preserve_reason: preserveReasons[0] }],
+          data_sent_status: "COMPLETED",
         },
       });
 

package.json

@@ -41,12 +41,14 @@
     "mysql2": "^2.3.3",
     "nodemon": "^2.0.16",
     "npm-run-all": "^4.1.5",
-    "pa-website-validator": "github:italia/pa-website-validator#v2.3.0",
+    "pa-website-validator": "github:italia/pa-website-validator#v2.3.2",
     "pg": "^8.7.3",
+    "ps-list": "^8.1.1",
     "redis": "^4.1.0",
     "sequelize": "^6.6.5",
     "swagger-jsdoc": "^6.1.0",
     "swagger-ui-express": "^4.4.0",
+    "tree-kill": "^1.2.2",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.4",
     "winston": "^3.7.2",