cleanup

Author: camillobruni

JetStreamDriver.js

@@ -239,6 +239,8 @@ const fileLoader = (function() {
 class Driver {
     constructor() {
         this.isReady = false;
+        this.isDone = false;
+        this.incrementalResults = [];
         this.benchmarks = [];
         this.blobDataCache = { };
         this.loadCache = { };
@@ -282,15 +284,13 @@ class Driver {
             console.log(benchmark.name)
 
             if (isInBrowser) {
-                globalThis.dispatchEvent(new CustomEvent("JetStreamBenchmarkDone", {
-                    detail: {
-                        name: benchmark.name,
-                        results: {
-                            score: benchmark.score,
-                            ...benchmark.subScores(),
-                        }
+                this.incrementalResults.push({
+                    name: benchmark.name,
+                    results: {
+                        Score: benchmark.score,
+                        ...benchmark.subScores(),
                     }
-                }));
+                });
                 const cache = JetStream.blobDataCache;
                 for (const file of benchmark.plan.files) {
                     const blobData = cache[file];
@@ -344,13 +344,20 @@ class Driver {
 
         this.reportScoreToRunBenchmarkRunner();
         this.dumpJSONResultsIfNeeded();
+        this.isDone = true;
         if (isInBrowser) {
             globalThis.dispatchEvent(new CustomEvent("JetStreamDone", {
                 detail: this.resultsObject()
             }));
         }
     }
 
+    drainIncrementalResults() {
+        const currentIncrementalResults = this.incrementalResults;
+        this.incrementalResults = [];
+        return currentIncrementalResults
+    }
+
     runCode(string)
     {
         if (!isInBrowser) {

tests/run.mjs

@@ -80,8 +80,9 @@ async function testEnd2End() {
     const driver = await new Builder().withCapabilities(capabilities).build();
     let results;
     try {
-        console.log("Preparing JetStream");
-        await driver.get(`http://localhost:${PORT}/index.html?worstCaseCount=2&iterationCount=3`);
+        const url = `http://localhost:${PORT}/index.html?worstCaseCount=2&iterationCount=3`;
+        console.log(`JetStream PREPARE ${url}`);
+        await driver.get(url);
         await driver.executeAsyncScript((callback) => {
             globalThis.addEventListener("JetStreamReady", () => callback());
             // We might not get a chance to install the on-ready listener, thus
@@ -99,34 +100,27 @@ async function testEnd2End() {
 }
 
 async function benchmarkResults(driver) {
-    console.log("Starting JetStream");
+    console.log("JetStream START");
     await driver.manage().setTimeouts({ script: 60_000 });
-    await driver.executeScript(() => {
-        globalThis.JetStreamDone = false;
-        globalThis.JetStreamResults = [];
-        globalThis.addEventListener("JetStreamDone", event => {
-            globalThis.JetStreamDone = true;
-        });
-        globalThis.addEventListener("JetStreamBenchmarkDone", event =>  {
-            globalThis.JetStreamResults.push(event.detail);
-        });
-        JetStream.start();
+    await driver.executeAsyncScript((callback) => {
+        globalThis.JetStream.start();
+        callback();
     });
     await new Promise(resolve => pollIncrementalResults(driver, resolve));
     const resultString = await driver.executeScript(() => {
-        return JSON.stringify(JetStream.resultsObject());
+        return JSON.stringify(globalThis.JetStream.resultsObject());
     });
     return  JSON.parse(resultString);
 }
 
 const UPDATE_INTERVAL = 250;
 async function pollIncrementalResults(driver, resolve) {
     const intervalId = setInterval(async function logResult()  {
-        const {done, results} = await driver.executeAsyncScript((callback) => {
-            callback({
-                done: globalThis.JetStreamDone,
-                results: JSON.stringify(globalThis.JetStreamResults.splice(0, Infinity)),
-            });
+        const {done, results} = await driver.executeScript(() => {
+            return {
+                done: globalThis.JetStream.isDone,
+                results: JSON.stringify(globalThis.JetStream.drainIncrementalResults()),
+            };
         });
         JSON.parse(results).forEach(logIncrementalResult);
         if (done) {