fix: abort scan feature

GovTechSG · Jun 6, 2024 · b4868d0 · b4868d0
1 parent cf84ae7
commit b4868d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/public/electron/preload.js b/public/electron/preload.js
@@ -26,7 +26,7 @@ contextBridge.exposeInMainWorld("services", {
     const results = await ipcRenderer.invoke("startScan", scanDetails);
     return results;
   },
-  abortScan: async (scanDetails) => {
+  abortScan: async () => {
     await ipcRenderer.invoke("abortScan");
   },
 

diff --git a/public/electron/scanManager.js b/public/electron/scanManager.js
@@ -132,8 +132,8 @@ const validateUrlConnectivity = async (scanDetails) => {
 
   const response = await new Promise(async (resolve) => {
     const check = spawn(
-      "npm",
-      ["-C", enginePath, "run", "cli", "--", ...getScanOptions(scanDetails)],
+      "node",
+      [`${enginePath}/dist/cli.js`, ...getScanOptions(scanDetails)],
       {
         cwd: resultsPath,
         env: {
@@ -193,8 +193,8 @@ const startScan = async (scanDetails, scanEvent) => {
   const response = await new Promise(async (resolve) => {
     let intermediateFolderName;
     const scan = spawn(
-      "npm",
-      ["-C", enginePath, "run", "cli", "--", ...getScanOptions(scanDetails)],
+      "node",
+      [`${enginePath}/dist/cli.js`, ...getScanOptions(scanDetails)],
       {
         cwd: resultsPath,
         env: {

diff --git a/src/services.js b/src/services.js
@@ -53,10 +53,6 @@ const validateUrlConnectivity = async (scanDetails) => {
   return response;
 };
 
-const abortScan = async () => {
-  await window.services.abortScan()
-};
-
 const startScan = async (scanDetails) => {
   const {
     scanType: selectedScanType,
@@ -240,7 +236,6 @@ const isValidName = (name) => {
 };
 
 const services = {
-  abortScan,
   startScan,
   openReport,
   getResultsFolderPath,