Fix conversion of intermediary timings

firefox-devtools · Oct 8, 2024 · 492ab57 · 492ab57
1 parent 07bb8f8
commit 492ab57
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/src/har-recorder.js b/src/har-recorder.js
@@ -36,6 +36,8 @@ class HarRecorder {
     this.networkEntries = [];
     this.pageTimings = [];
     this.topLevelContexts = [];
+
+    this._isInMicroseconds = undefined;
   }
 
   recordEvent(event) {
@@ -322,9 +324,13 @@ class HarRecorder {
     // Firefox 131 or older returned timings in microseconds whereas Firefox 132
     // or newer returns timings in milliseconds, as expected in the spec.
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1916685
-    if (timing > Date.now() * 100) {
+    if (this._isInMicroseconds === undefined) {
       // If timing is at least a 100 times greater than the current date, we are
       // dealing with microseconds.
+      this._isInMicroseconds = timing > Date.now() * 100;
+    }
+
+    if (this._isInMicroseconds) {
       return timing / 1000;
     }
 

diff --git a/test/har-recorder.simple-har.test.js b/test/har-recorder.simple-har.test.js
@@ -45,6 +45,9 @@ test("HarRecorder generates simple har export", () => {
 
   const isoEntryDate = harExport.log.entries[0].startedDateTime;
   expect(new Date(isoEntryDate) * 1).toBe(startTime + 50);
+
+  const totalTime = harExport.log.entries[0].time;
+  expect(totalTime).toBe(650);
 });
 
 test("HarRecorder generates simple har export with microseconds", () => {
@@ -74,9 +77,8 @@ test("HarRecorder generates simple har export with microseconds", () => {
   expect(harExport.log.entries.length).toBe(1);
 
   const isoEntryDate = harExport.log.entries[0].startedDateTime;
+  expect(new Date(isoEntryDate) * 1).toBe(startTime + 50);
 
-  // Note: the request start time happens 50 microseconds after startTime
-  // which is going to be equal to startTime when converted to milliseconds.
-  // So compare directly with startTime.
-  expect(new Date(isoEntryDate) * 1).toBe(startTime);
+  const totalTime = harExport.log.entries[0].time;
+  expect(totalTime).toBe(650);
 });
diff --git a/test/resources/mock-events.js b/test/resources/mock-events.js
@@ -11,7 +11,8 @@ function getMockEvents(startTime, options = {}) {
     useLegacyHeaderFormat = false,
     useMicroseconds = false,
   } = options;
-  const highResStartTime = startTime * (useMicroseconds ? 1000 : 1);
+  const timeMult = useMicroseconds ? 1000 : 1;
+  const highResStartTime = startTime * timeMult;
   const requestId = (options.requestId || gRequestId++) + "";
 
   if (useLegacyHeaderFormat) {
@@ -39,7 +40,7 @@ function getMockEvents(startTime, options = {}) {
         request: requestId,
         timings: {
           originTime: 0,
-          requestTime: highResStartTime + 50,
+          requestTime: highResStartTime + 50 * timeMult,
           redirectStart: 0,
           redirectEnd: 0,
           fetchStart: 0,
@@ -80,19 +81,19 @@ function getMockEvents(startTime, options = {}) {
         request: requestId,
         timings: {
           originTime: 0,
-          requestTime: highResStartTime + 50,
+          requestTime: highResStartTime + 50 * timeMult,
           redirectStart: 0,
           redirectEnd: 0,
-          fetchStart: highResStartTime + 100,
-          dnsStart: highResStartTime + 150,
-          dnsEnd: highResStartTime + 200,
-          connectStart: highResStartTime + 300,
-          connectEnd: highResStartTime + 400,
-          tlsStart: highResStartTime + 500,
-          tlsEnd: highResStartTime + 600,
-          requestStart: highResStartTime + 700,
-          responseStart: highResStartTime + 800,
-          responseEnd: highResStartTime + 900,
+          fetchStart: highResStartTime + 100 * timeMult,
+          dnsStart: highResStartTime + 150 * timeMult,
+          dnsEnd: highResStartTime + 200 * timeMult,
+          connectStart: highResStartTime + 300 * timeMult,
+          connectEnd: highResStartTime + 400 * timeMult,
+          tlsStart: highResStartTime + 500 * timeMult,
+          tlsEnd: highResStartTime + 600 * timeMult,
+          requestStart: highResStartTime + 700 * timeMult,
+          responseStart: highResStartTime + 800 * timeMult,
+          responseEnd: highResStartTime + 900 * timeMult,
         },
         url: options.url || "https://example.com/",
         rawHeaders: