refactor couple of things

Author: anonrig

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+fixtures

bench_url.js

@@ -1,10 +1,11 @@
 "use strict";
 
 import { bench, run } from "mitata";
-import { existsSync, createWriteStream, readFileSync } from "node:fs";
+import { existsSync, createWriteStream, readFileSync, mkdirSync } from "node:fs";
 import axios from "axios";
 
-var urls = [
+const fixturesFolderPath = new URL('fixtures', import.meta.url).pathname;
+const urls = [
   "https://raw.githubusercontent.com/ada-url/url-various-datasets/main/files/linux_files.txt",
   "https://raw.githubusercontent.com/ada-url/url-various-datasets/main/others/kasztp.txt",
   "https://raw.githubusercontent.com/ada-url/url-various-datasets/main/others/userbait.txt",
@@ -13,10 +14,10 @@ var urls = [
 ];
 
 function get_filename(url) {
-  return url.substring(url.lastIndexOf("/") + 1);
+  return `fixtures/${url.substring(url.lastIndexOf("/") + 1)}`;
 }
 
-const downloadFile = async (url) => {
+async function downloadFile(url) {
   const response = await axios({
     method: "GET",
     url: url,
@@ -34,67 +35,41 @@ const downloadFile = async (url) => {
       reject(err);
     });
   });
-};
-
-async function download(urls) {
-  const urls_for_download = urls.filter((url) => {
-    return !existsSync(get_filename(url));
-  });
-  var all_promises = urls_for_download.map((url) => downloadFile(url));
-  return axios.all(all_promises);
 }
 
-await download(urls);
-
-async function download_and_run(filename, url) {
-  if (existsSync(filename)) {
-    run_bench(filename);
-  } else {
-    get(url, (res) => {
-      const file = createWriteStream(filename);
-      res.pipe(file);
-      file.on("error", (err) => {
-        console.error(err);
-      });
-      file.on("finish", async () => {
-        file.close();
-        run_bench(filename);
-      });
-    });
-  }
+if (!existsSync(fixturesFolderPath)) {
+  mkdirSync(fixturesFolderPath)
 }
-
-var length = 0;
-var bad_url = 0;
-var good_url = 0;
-
-async function run_bench(urls) {
-  for (let url of urls) {
-    const filename = get_filename(url);
-    const file_content = readFileSync(filename, "utf-8");
-    const lines = file_content.split("\n");
-
-    bench(filename, () => {
-      for (var i = 0; i < lines.length; i++) {
-        try {
-          length += new URL(lines[i]).href.length;
-          good_url++;
-        } catch (e) {
-          bad_url++;
-        }
+const urls_for_download = urls.filter(url => !existsSync(get_filename(url)))
+const all_promises = urls_for_download.map((url) => downloadFile(url));
+await axios.all(all_promises);
+
+let length = 0;
+let bad_url = 0;
+let good_url = 0;
+
+for (let url of urls) {
+  const filename = get_filename(url);
+  const file_content = readFileSync(filename, "utf-8");
+  const lines = file_content.split("\n");
+
+  bench(filename, () => {
+    for (let i = 0; i < lines.length; i++) {
+      try {
+        length += new URL(lines[i]).href.length;
+        good_url++;
+      } catch (e) {
+        bad_url++;
       }
-      return length;
-    });
-  }
-
-  await run();
+    }
+    return length;
+  });
 }
 
-await run_bench(urls);
+await run();
 
-console.log("Average URL size: " + Math.round(length / good_url) + " bytes");
-console.log(
-  "Ratio of bad URLs: " +
-    Math.round((bad_url / (good_url + bad_url)) * 10000) / 100.0 +
-    "%"
+console.info("Average URL size: " + Math.round(length / good_url) + " bytes");
+console.info(
+  "Ratio of bad URLs:",
+  `${Math.round((bad_url / (good_url + bad_url)) * 10000) / 100}%`,
 );

package-lock.json

@@ -1,7 +1,13 @@
 {
+  "name": "@ada-url/js-url-benchmark",
+  "version": "0.1.0",
+  "description": "URL benchmarks in JavaScript",
   "type": "module",
   "dependencies": {
     "axios": "^1.3.6",
     "mitata": "^0.1.6"
+  },
+  "devDependencies": {
+    "@types/node": "^18.16.0"
   }
 }

package.json

@@ -19,22 +19,27 @@ if ! $(command -v deno &> /dev/null); then
 fi 
 
 for version in 16 17 18.15 18.16 20; do
-  nvm install $version 
+  nvm install $version --silent
 done
-npm install
+npm install --ignore-scripts --no-audit --no-fund --silent
 current_node_version=$(nvm current)
 
 function cleanup {
-  echo "Restauring node version to $current_node_version"
+  echo "Restoring node version to $current_node_version"
   nvm use $current_node_version
 }
 
 trap cleanup EXIT
+
+# Clear terminal output
+printf "\033c"
+
 deno run -A bench_url.js
+echo ""
 bun run bench_url.js
+echo ""
 for version in 16 17 18.15 18.16 20; do
-  nvm use  $version
+  nvm use $version
   node bench_url.js
-done
-
-
+  echo ""
+done