Merge pull request #10 from the-markup/newlines

Various fixes

package.json

@@ -30,6 +30,7 @@
     "devDependencies": {
         "@types/jest": "^27.5.1",
         "@types/node": "^20.16.1",
+        "@types/progress": "^2.0.7",
         "@types/tough-cookie": "^4.0.5",
         "jest": "^28.1.0",
         "ts-jest": "^28.0.2",

src/main.ts

@@ -14,24 +14,30 @@ if (!fs.existsSync(urlsPath)) {
   exit();
 }
 const urls = fs.readFileSync(urlsPath, "utf8");
-const urlsList = urls.split("\n");
+const urlsList = urls.trim().split(/\r?\n|\r|\n/g);
 const outDir = "../outputs";
 
 let progressBar = progress.create({ total: urlsList.length });
 
 let failedUrls: string[] = [];
 
 // Make output directory
-if (!fs.existsSync(outDir)) {
-  fs.mkdirSync(outDir);
+if (!fs.existsSync(join(__dirname, outDir))) {
+  fs.mkdirSync(join(__dirname, outDir));
 }
 
 // Gather scans
 (async () => {
   for (let url of urlsList) {
     console.log(`Scanning ${url} ...`);
     const urlObj = new URL(url);
-    const folderStructure = `${outDir}/${urlObj.hostname}`;
+    let folderStructure = `${outDir}/${urlObj.hostname}`;
+
+    if (fs.existsSync(join(__dirname, folderStructure))) {
+      const timestamp = Date.now();
+      folderStructure += `-${timestamp}`;
+    }
+
     const config = {
       headless: true,
       outDir: join(__dirname, folderStructure),