merge issue5

Author: PedroFonsecaDEV

src/index.js

@@ -21,20 +21,21 @@ module.exports.main = () => {
   else if(args.bad || args.good || args.unk) {
     let filterResult = args.bad ? 400 : 200;
     filterResult = args.unk ? 9999 : filterResult;
-
+    let displayJson = false;
+    if(args.j || args.json) displayJson = true;
     for(const file of filesToRead){
       initializeStream(file)
-      .then(data => testUrl(data, filterResult))
+      .then(data => testUrl(data, filterResult, displayJson))
       .catch(() => console.log("Error: Please provide a path to a file."));
     } 
   }
-  else if(Object.keys(args).length === 0) {
+  else if(Object.keys(args).length === 0 || args.j || args.json ) {
+    let displayJson = false;
+    if(args.j || args.json) displayJson = true;
     for(const file of filesToRead){
       initializeStream(file)
-      .then(data => testUrl(data))
-      .catch(() => {
-        console.log("Error: Please provide a path to a file.")
-      });
-   }
+      .then(data => testUrl(data,null,displayJson))
+      .catch(() => console.log("Error: Please provide a path to a file."));
+    }
   }
 };

src/url_functions/url-funcs.js

@@ -1,40 +1,64 @@
 const fetch = require("node-fetch");
 const { printLog } = require("../console_messages/console-msg");
 
-const testUrl = async (urlArray, filterResult = null) => {
-  const protocolRegex = /^www(.+)/gi;
-  if(filterResult != 200) process.exitCode = 1;
-  for (let url of urlArray) {
+const testUrl = (urlArray, filterResult = null, output = false) => {
+  const fetchUrl = async(url) => {
+    const protocolRegex = /^www(.+)/gi;
+    
     if (protocolRegex.test(url)) {
       url = "https://" + url;
     }
 
-    fetch(url, { method: "head", timeout: 1500 })
-    .then((urlTest) => {
-      if(filterResult === null){
-        if (urlTest.status == 200) printLog(`URL: ${url} Status: 200`, 200);
-        else if (urlTest.status == 400 || urlTest.status == 404){ 
-         printLog(`URL: ${url} Status: 400`, 400);
-         process.exitCode = 1;
-        }
-        else {
-          process.exitCode = 1;
-          printLog(`URL: ${url} Status: Unknown`, 9999); 
-        }
+    try {
+    const urlResult = await fetch(url, { method: "head", timeout: 1500 });
+    return {url: url, status: urlResult.status};
+    } 
+    catch (error) {
+      return {url: url, status: 400};
+    }
+  };
+
+  const urlPromises = urlArray.map(fetchUrl);
+  Promise.all(urlPromises)
+  .then(finalResults => finalResults.map(urlTest => {
+    if(filterResult === null){
+      if (urlTest.status == 200){
+        printLog(`URL: ${urlTest.url} Status: 200`, 200);
+        return urlTest;
+      } 
+      else if (urlTest.status == 400 || urlTest.status == 404) {
+        printLog(`URL: ${urlTest.url} Status: 400`, 400);
+        return urlTest;
       }
-      else {  
-        if((urlTest.status == filterResult) || (filterResult == 400 && urlTest.status == 404)) printLog(`URL: ${url} Status: ${filterResult}`, filterResult);
-        else if((filterResult == 9999) && urlTest.status != 200 && urlTest.status && 400 && urlTest.status != 404 ) printLog(`URL: ${url} Status: Unknown`, 9999);
+      else { 
+        printLog(`URL: ${urlTest.url} Status: Unknown`, 9999);
+        return urlTest;
       }
-    })
-    .catch((error) => {
-      if(!filterResult){
-        printLog(`URL: ${url} Status: 400`, 400);
+    }
+    else {
+      if((urlTest.status == filterResult) || (filterResult == 400 && urlTest.status == 404)) {
+        printLog(`URL: ${urlTest.url} Status: ${filterResult}`, filterResult);
+        return urlTest;
       }
-    });
-  }
+      else if((filterResult == 9999) && urlTest.status != 200 && urlTest.status != 400 && urlTest.status != 404 ){
+        printLog(`URL: ${urlTest.url} Status: Unknown`, 9999);
+        return urlTest;
+      } 
+    }
+  }))
+  .then((results) => {
+    if(output) {
+    console.log("FINAL RESULT JSON:");
+    console.log(JSON.stringify(results.filter(urlObj => urlObj != null)));
+    }
+  })
+  .catch((urlObj) => {
+    console.log(urlObj);
+    if(!filterResult)printLog(`URL: ${urlObj.url} Status: 400`, 400);
+  });
 };
+    
 
 module.exports = {
-  testUrl,
-};
+  testUrl
+};