run prettier, cleanup

Author: krausest

server/app.js

@@ -8,8 +8,6 @@ import minifier from "html-minifier";
 import { Stream } from "stream";
 import toArray from "stream-to-array";
 import zlib from "node:zlib";
-import { pipeline } from "node:stream";
-import { promisify } from "node:util";
 import { getSizeRouter } from "./src/responseSize/responseSizeRouter.js";
 
 /**
@@ -64,7 +62,7 @@ function buildServer(options = {}) {
         reply.header("Content-Length", compressed.length);
         reply.header("Content-Encoding", "br");
       }
-      let headers = Object.entries(reply.getHeaders()).reduce((p, [e, v]) => p + `${e}: ${v} \n`, "");
+      // let headers = Object.entries(reply.getHeaders()).reduce((p, [e, v]) => p + `${e}: ${v} \n`, "");
       // console.log(request.url, reply.statusCode, "\n", headers);
       return {
         compressed: compressed.length, // + headers.length + MISSING_HEADERS_AND_HTTP,

webdriver-ts/README.txt

@@ -17,7 +17,6 @@
     "test": "vitest --run",
     "test:watch": "vitest",
     "coverage": "vitest --run --coverage",
-    "lint": "eslint src/ --ext .ts"
   },
   "author": "",
   "license": "Apache-2.0",

webdriver-ts/package.json

@@ -52,13 +52,10 @@ function forkAndCallBenchmark(
       benchmarkId: benchmarkInfo.id,
       benchmarkOptions,
     });
-    forked.on(
-      "message",
-      (msg: ErrorAndWarning<number | CPUBenchmarkResult | StartupBenchmarkResult>) => {
+    forked.on("message", (msg: ErrorAndWarning<number | CPUBenchmarkResult | StartupBenchmarkResult>) => {
       if (config.LOG_DETAILS) console.log("FORKING: main process got message from child", msg);
       resolve(msg);
-      }
-    );
+    });
     forked.on("close", (msg) => {
       if (config.LOG_DETAILS) console.log("FORKING: child closed", msg);
     });
@@ -185,14 +182,14 @@ async function runBenchmakLoop(
         benchmark: benchmarkInfo,
         results: results as CPUBenchmarkResult[],
         type: BenchmarkType.CPU,
-      });  
+      });
     } else {
       await writeResults(benchmarkOptions.resultsDirectory, {
         framework: framework,
         benchmark: benchmarkInfo,
         results: results as number[],
         type: BenchmarkType.MEM,
-      });  
+      });
     }
   }
   return { errors, warnings };
@@ -231,11 +228,25 @@ async function runBench(
         let result;
 
         if (benchmarkInfos[j].type == BenchmarkType.STARTUP_MAIN) {
-          result = await runBenchmakLoopStartup(runFrameworks[i], benchmarkInfos[j] as StartupBenchmarkInfo, benchmarkOptions)
+          result = await runBenchmakLoopStartup(
+            runFrameworks[i],
+            benchmarkInfos[j] as StartupBenchmarkInfo,
+            benchmarkOptions
+          );
         } else if (benchmarkInfos[j].type == BenchmarkType.CPU) {
-          result = await runBenchmakLoop(runFrameworks[i], benchmarkInfos[j] as CPUBenchmarkInfo, benchmarkOptions, plausibilityCheck);
+          result = await runBenchmakLoop(
+            runFrameworks[i],
+            benchmarkInfos[j] as CPUBenchmarkInfo,
+            benchmarkOptions,
+            plausibilityCheck
+          );
         } else {
-          result = await runBenchmakLoop(runFrameworks[i], benchmarkInfos[j] as MemBenchmarkInfo, benchmarkOptions, plausibilityCheck);
+          result = await runBenchmakLoop(
+            runFrameworks[i],
+            benchmarkInfos[j] as MemBenchmarkInfo,
+            benchmarkOptions,
+            plausibilityCheck
+          );
         }
         errors = errors.concat(result.errors);
         warnings = warnings.concat(result.warnings);
@@ -271,34 +282,34 @@ async function runBench(
 }
 
 async function main() {
-// FIXME: Clean up args.
-// What works: npm run bench keyed/react, npm run bench -- keyed/react, npm run bench -- keyed/react --count 1 --benchmark 01_
-// What doesn't work (keyed/react becomes an element of argument benchmark): npm run bench -- --count 1 --benchmark 01_ keyed/react
+  // FIXME: Clean up args.
+  // What works: npm run bench keyed/react, npm run bench -- keyed/react, npm run bench -- keyed/react --count 1 --benchmark 01_
+  // What doesn't work (keyed/react becomes an element of argument benchmark): npm run bench -- --count 1 --benchmark 01_ keyed/react
 
   console.error("PLEASE MAKE SURE THAT YOUR MOUSE IS OUTSIDE OF THE BROWSER WINDOW - and sorry for shouting :-) ");
 
-let args: any = yargs(process.argv)
-  .usage(
-    "$0 [--framework Framework1 Framework2 ...] [--benchmark Benchmark1 Benchmark2 ...] [--chromeBinary path] \n or: $0 [directory1] [directory2] .. [directory3]"
-  )
-  .help("help")
+  let args: any = yargs(process.argv)
+    .usage(
+      "$0 [--framework Framework1 Framework2 ...] [--benchmark Benchmark1 Benchmark2 ...] [--chromeBinary path] \n or: $0 [directory1] [directory2] .. [directory3]"
+    )
+    .help("help")
     .boolean("headless")
     .default("headless", false)
-  .boolean("smoketest")
+    .boolean("smoketest")
     .boolean("nothrottling")
     .default("nothrottling", false)
     .string("runner")
     .default("runner", "puppeteer")
     .string("browser")
     .default("browser", "chrome")
-  .array("framework")
-  .array("benchmark")
-  .number("count")
-  .string("chromeBinary").argv;
+    .array("framework")
+    .array("benchmark")
+    .number("count")
+    .string("chromeBinary").argv;
 
-console.log("args", args);
+  console.log("args", args);
 
-let runner = args.runner;
+  let runner = args.runner;
   if (
     [
       BenchmarkRunner.WEBDRIVER_CDP,
@@ -309,64 +320,61 @@ let runner = args.runner;
     ].includes(runner)
   ) {
     console.log(`INFO: Using ${runner} benchmark runner`);
-  config.BENCHMARK_RUNNER = runner;
-} else {
+    config.BENCHMARK_RUNNER = runner;
+  } else {
     console.log("ERROR: argument driver has illegal value " + runner, [
       BenchmarkRunner.WEBDRIVER_CDP,
       BenchmarkRunner.WEBDRIVER,
       BenchmarkRunner.PLAYWRIGHT,
       BenchmarkRunner.PUPPETEER,
     ]);
-  process.exit(1);
-}
-console.log("HEADLESS*** ", args.headless);
-
-let benchmarkOptions: BenchmarkOptions = {
-  port: 8080,
-  host: "localhost",
-  browser: args.browser,
-  remoteDebuggingPort: 9999,
-  chromePort: 9998,
-  headless: args.headless,
-  chromeBinaryPath: args.chromeBinary,
-  numIterationsForCPUBenchmarks:
-      config.NUM_ITERATIONS_FOR_BENCHMARK_CPU +
-      config.NUM_ITERATIONS_FOR_BENCHMARK_CPU_DROP_SLOWEST_COUNT,
-  numIterationsForMemBenchmarks: config.NUM_ITERATIONS_FOR_BENCHMARK_MEM,
-  numIterationsForStartupBenchmark: config.NUM_ITERATIONS_FOR_BENCHMARK_STARTUP,
-  batchSize: 1,
-  resultsDirectory: "results",
-  tracesDirectory: "traces",
-  allowThrottling: !args.nothrottling,
-};
-
-if (args.count) {
-  benchmarkOptions.numIterationsForCPUBenchmarks = args.count;
-  config.NUM_ITERATIONS_FOR_BENCHMARK_CPU_DROP_SLOWEST_COUNT = 0;
-  benchmarkOptions.numIterationsForMemBenchmarks = args.count;
-  benchmarkOptions.numIterationsForStartupBenchmark = args.count;
-}
+    process.exit(1);
+  }
+  console.log("HEADLESS*** ", args.headless);
+
+  let benchmarkOptions: BenchmarkOptions = {
+    port: 8080,
+    host: "localhost",
+    browser: args.browser,
+    remoteDebuggingPort: 9999,
+    chromePort: 9998,
+    headless: args.headless,
+    chromeBinaryPath: args.chromeBinary,
+    numIterationsForCPUBenchmarks:
+      config.NUM_ITERATIONS_FOR_BENCHMARK_CPU + config.NUM_ITERATIONS_FOR_BENCHMARK_CPU_DROP_SLOWEST_COUNT,
+    numIterationsForMemBenchmarks: config.NUM_ITERATIONS_FOR_BENCHMARK_MEM,
+    numIterationsForStartupBenchmark: config.NUM_ITERATIONS_FOR_BENCHMARK_STARTUP,
+    batchSize: 1,
+    resultsDirectory: "results",
+    tracesDirectory: "traces",
+    allowThrottling: !args.nothrottling,
+  };
+
+  if (args.count) {
+    benchmarkOptions.numIterationsForCPUBenchmarks = args.count;
+    config.NUM_ITERATIONS_FOR_BENCHMARK_CPU_DROP_SLOWEST_COUNT = 0;
+    benchmarkOptions.numIterationsForMemBenchmarks = args.count;
+    benchmarkOptions.numIterationsForStartupBenchmark = args.count;
+  }
 
-let allArgs = args._.length <= 2 ? [] : args._.slice(2, args._.length);
-let frameworkArgument = !args.framework ? allArgs : args.framework;
-console.log("args", args, "allArgs", allArgs);
+  let allArgs = args._.length <= 2 ? [] : args._.slice(2, args._.length);
+  let frameworkArgument = !args.framework ? allArgs : args.framework;
+  console.log("args", args, "allArgs", allArgs);
 
-if (process.env.HOST) {
-  benchmarkOptions.host = process.env.HOST;
-  console.log(`INFO: Using host ${benchmarkOptions.host} instead of localhost`);
-}
-console.log("benchmarkOptions", benchmarkOptions);
+  if (process.env.HOST) {
+    benchmarkOptions.host = process.env.HOST;
+    console.log(`INFO: Using host ${benchmarkOptions.host} instead of localhost`);
+  }
+  console.log("benchmarkOptions", benchmarkOptions);
 
-  let runBenchmarksArgs: string[] =
-    args.benchmark && args.benchmark.length > 0 ? args.benchmark : [""];
+  let runBenchmarksArgs: string[] = args.benchmark && args.benchmark.length > 0 ? args.benchmark : [""];
   let runBenchmarks: Array<BenchmarkInfo> = benchmarkInfos.filter(
     (b) =>
       // afterframe currently only targets CPU benchmarks
-      (config.BENCHMARK_RUNNER !== BenchmarkRunner.WEBDRIVER_AFTERFRAME ||
-        b.type == BenchmarkType.CPU) &&
-    runBenchmarksArgs.some((name) => b.id.toLowerCase().indexOf(name) > -1)
+      (config.BENCHMARK_RUNNER !== BenchmarkRunner.WEBDRIVER_AFTERFRAME || b.type == BenchmarkType.CPU) &&
+      runBenchmarksArgs.some((name) => b.id.toLowerCase().indexOf(name) > -1)
   );
-  
+
   let runFrameworks: FrameworkData[];
   let matchesDirectoryArg = (directoryName: string) =>
     frameworkArgument.length == 0 || frameworkArgument.some((arg: string) => arg == directoryName);
@@ -389,11 +397,9 @@ console.log("benchmarkOptions", benchmarkOptions);
   }
   if (config.BENCHMARK_RUNNER == BenchmarkRunner.WEBDRIVER_AFTERFRAME) {
     benchmarkOptions.resultsDirectory = "results_client_" + benchmarkOptions.browser;
-  }    
-  if (!fs.existsSync(benchmarkOptions.resultsDirectory))
-    fs.mkdirSync(benchmarkOptions.resultsDirectory);
-  if (!fs.existsSync(benchmarkOptions.tracesDirectory))
-    fs.mkdirSync(benchmarkOptions.tracesDirectory);
+  }
+  if (!fs.existsSync(benchmarkOptions.resultsDirectory)) fs.mkdirSync(benchmarkOptions.resultsDirectory);
+  if (!fs.existsSync(benchmarkOptions.tracesDirectory)) fs.mkdirSync(benchmarkOptions.tracesDirectory);
 
   if (args.help) {
     // yargs.showHelp();

webdriver-ts/src/benchmarkRunner.ts

@@ -35,11 +35,7 @@ export interface StartupBenchmarkInfo extends BenchmarkInfoBase {
   fn: (x: number) => number;
 }
 
-export type BenchmarkInfo =
-  | CPUBenchmarkInfo
-  | MemBenchmarkInfo
-  | StartupMainBenchmarkInfo
-  | StartupBenchmarkInfo;
+export type BenchmarkInfo = CPUBenchmarkInfo | MemBenchmarkInfo | StartupMainBenchmarkInfo | StartupBenchmarkInfo;
 
 export interface BenchmarkImpl {
   benchmarkInfo: BenchmarkInfo;
@@ -118,10 +114,7 @@ export const cpuBenchmarkInfosArray: Array<CPUBenchmarkInfo> = [
     id: Benchmark._02,
     label: "replace all rows",
     description: (throttleCPU: number | undefined) =>
-      "updating all 1,000 rows (" +
-      config.WARMUP_COUNT +
-      " warmup runs)." +
-      slowDownNote(throttleCPU),
+      "updating all 1,000 rows (" + config.WARMUP_COUNT + " warmup runs)." + slowDownNote(throttleCPU),
     type: BenchmarkType.CPU,
     allowBatching: true,
     layoutEventRequired: true,
@@ -141,10 +134,7 @@ export const cpuBenchmarkInfosArray: Array<CPUBenchmarkInfo> = [
     id: Benchmark._04,
     label: "select row",
     description: (throttleCPU: number | undefined) =>
-      "highlighting a selected row. (" +
-      config.WARMUP_COUNT +
-      " warmup runs)." +
-      slowDownNote(throttleCPU),
+      "highlighting a selected row. (" + config.WARMUP_COUNT + " warmup runs)." + slowDownNote(throttleCPU),
     type: BenchmarkType.CPU,
     allowBatching: true,
     layoutEventRequired: false,
@@ -154,10 +144,7 @@ export const cpuBenchmarkInfosArray: Array<CPUBenchmarkInfo> = [
     id: Benchmark._05,
     label: "swap rows",
     description: (throttleCPU: number | undefined) =>
-      "swap 2 rows for table with 1,000 rows. (" +
-      config.WARMUP_COUNT +
-      " warmup runs)." +
-      slowDownNote(throttleCPU),
+      "swap 2 rows for table with 1,000 rows. (" + config.WARMUP_COUNT + " warmup runs)." + slowDownNote(throttleCPU),
     type: BenchmarkType.CPU,
     allowBatching: true,
     layoutEventRequired: true,
@@ -177,10 +164,7 @@ export const cpuBenchmarkInfosArray: Array<CPUBenchmarkInfo> = [
     id: Benchmark._07,
     label: "create many rows",
     description: (throttleCPU: number | undefined) =>
-      "creating 10,000 rows. (" +
-      config.WARMUP_COUNT +
-      " warmup runs with 1k rows)." +
-      slowDownNote(throttleCPU),
+      "creating 10,000 rows. (" + config.WARMUP_COUNT + " warmup runs with 1k rows)." + slowDownNote(throttleCPU),
     type: BenchmarkType.CPU,
     allowBatching: true,
     layoutEventRequired: true,
@@ -200,11 +184,7 @@ export const cpuBenchmarkInfosArray: Array<CPUBenchmarkInfo> = [
     id: Benchmark._09,
     label: "clear rows",
     description: (throttleCPU: number | undefined) =>
-      "clearing a table with 1,000 rows." +
-      slowDownNote(throttleCPU) +
-      " (" +
-      config.WARMUP_COUNT +
-      " warmup runs).",
+      "clearing a table with 1,000 rows." + slowDownNote(throttleCPU) + " (" + config.WARMUP_COUNT + " warmup runs).",
     type: BenchmarkType.CPU,
     allowBatching: true,
     layoutEventRequired: true,
@@ -275,8 +255,4 @@ for (let bi of startupBenchmarkInfosArray) {
   startupBenchmarkInfos[bi.id] = bi;
 }
 
-export const benchmarkInfos = [
-  ...cpuBenchmarkInfosArray,
-  ...memBenchmarkInfosArray,
-  ...startupBenchmarkInfosArray,
-];
+export const benchmarkInfos = [...cpuBenchmarkInfosArray, ...memBenchmarkInfosArray, ...startupBenchmarkInfosArray];

webdriver-ts/src/benchmarksCommon.ts

@@ -12,7 +12,8 @@ let toKb = (x: number) => x / 1024;
 export const benchStartupConsistentlyInteractive: StartupBenchmarkInfo = {
   id: "31_startup-ci",
   label: "consistently interactive",
-  description: () => "a pessimistic TTI - when the CPU and network are both definitely very idle. (no more CPU tasks over 50ms)",
+  description: () =>
+    "a pessimistic TTI - when the CPU and network are both definitely very idle. (no more CPU tasks over 50ms)",
   property: "interactive",
   fn: id,
   type: BenchmarkType.STARTUP,