npm - browsertime - Versions diffs - 26.3.1 → 27.0.0 - Mend

browsertime 26.3.1 → 27.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (106) hide show

package/CHANGELOG.md +71 -2
package/README.md +1 -1
package/browserscripts/timings/softNavigations.js +94 -0
package/lib/chrome/har.js +36 -5
package/lib/chrome/settings/chromeAndroidOptions.js +2 -1
package/lib/chrome/webdriver/chromium.js +39 -0
package/lib/chrome/webdriver/setupChromiumOptions.js +86 -31
package/lib/core/engine/collector.js +340 -317
package/lib/core/engine/command/addText.js +93 -12
package/lib/core/engine/command/click.js +239 -139
package/lib/core/engine/command/commandHelper.js +45 -0
package/lib/core/engine/command/cookie.js +85 -0
package/lib/core/engine/command/element.js +37 -2
package/lib/core/engine/command/javaScript.js +14 -24
package/lib/core/engine/command/measure/screenshots.js +114 -0
package/lib/core/engine/command/measure/video.js +85 -0
package/lib/core/engine/command/measure.js +104 -180
package/lib/core/engine/command/mouse/clickAndHold.js +6 -3
package/lib/core/engine/command/mouse/contextClick.js +56 -4
package/lib/core/engine/command/mouse/doubleClick.js +49 -1
package/lib/core/engine/command/mouse/mouseMove.js +50 -1
package/lib/core/engine/command/mouse/singleClick.js +165 -129
package/lib/core/engine/command/navigation.js +6 -6
package/lib/core/engine/command/select.js +95 -3
package/lib/core/engine/command/selectorParser.js +58 -0
package/lib/core/engine/command/set.js +55 -1
package/lib/core/engine/command/wait.js +41 -2
package/lib/core/engine/commands.js +550 -42
package/lib/core/engine/index.js +206 -150
package/lib/core/engine/iteration.js +269 -137
package/lib/firefox/networkManager.js +22 -30
package/lib/firefox/webdriver/builder.js +14 -0
package/lib/firefox/webdriver/firefox.js +1 -1
package/lib/safari/har.js +131 -0
package/lib/safari/native/ios-capture +0 -0
package/lib/safari/native/ios-capture.m +340 -0
package/lib/safari/safariInspectorClient.js +322 -0
package/lib/safari/webdriver/safari.js +303 -13
package/lib/safari/webkitToCdpAdapter.js +241 -0
package/lib/support/cli.js +13 -0
package/lib/support/engineUtils.js +16 -5
package/lib/support/getViewPort.js +5 -0
package/lib/support/har/index.js +41 -3
package/lib/support/usbPower.js +2 -3
package/lib/video/postprocessing/finetune/addTextToVideo.js +4 -0
package/lib/video/postprocessing/finetune/getFont.js +3 -3
package/lib/video/postprocessing/finetune/getTimingMetrics.js +7 -0
package/lib/video/postprocessing/finetune/index.js +26 -9
package/lib/video/screenRecording/ios/iosDeviceRecorder.js +109 -0
package/lib/video/screenRecording/recorder.js +2 -2
package/lib/video/screenRecording/setOrangeBackground.js +3 -0
package/package.json +12 -12
package/types/core/engine/command/addText.d.ts +35 -6
package/types/core/engine/command/addText.d.ts.map +1 -1
package/types/core/engine/command/click.d.ts +87 -16
package/types/core/engine/command/click.d.ts.map +1 -1
package/types/core/engine/command/commandHelper.d.ts +16 -0
package/types/core/engine/command/commandHelper.d.ts.map +1 -0
package/types/core/engine/command/cookie.d.ts +65 -0
package/types/core/engine/command/cookie.d.ts.map +1 -0
package/types/core/engine/command/element.d.ts +19 -1
package/types/core/engine/command/element.d.ts.map +1 -1
package/types/core/engine/command/javaScript.d.ts +4 -0
package/types/core/engine/command/javaScript.d.ts.map +1 -1
package/types/core/engine/command/measure/screenshots.d.ts +15 -0
package/types/core/engine/command/measure/screenshots.d.ts.map +1 -0
package/types/core/engine/command/measure/video.d.ts +26 -0
package/types/core/engine/command/measure/video.d.ts.map +1 -0
package/types/core/engine/command/measure.d.ts +59 -33
package/types/core/engine/command/measure.d.ts.map +1 -1
package/types/core/engine/command/mouse/clickAndHold.d.ts.map +1 -1
package/types/core/engine/command/mouse/contextClick.d.ts +28 -4
package/types/core/engine/command/mouse/contextClick.d.ts.map +1 -1
package/types/core/engine/command/mouse/doubleClick.d.ts +24 -4
package/types/core/engine/command/mouse/doubleClick.d.ts.map +1 -1
package/types/core/engine/command/mouse/mouseMove.d.ts +30 -5
package/types/core/engine/command/mouse/mouseMove.d.ts.map +1 -1
package/types/core/engine/command/mouse/singleClick.d.ts +50 -13
package/types/core/engine/command/mouse/singleClick.d.ts.map +1 -1
package/types/core/engine/command/navigation.d.ts +3 -3
package/types/core/engine/command/select.d.ts +45 -8
package/types/core/engine/command/select.d.ts.map +1 -1
package/types/core/engine/command/selectorParser.d.ts +20 -0
package/types/core/engine/command/selectorParser.d.ts.map +1 -0
package/types/core/engine/command/set.d.ts +34 -7
package/types/core/engine/command/set.d.ts.map +1 -1
package/types/core/engine/command/wait.d.ts +29 -6
package/types/core/engine/command/wait.d.ts.map +1 -1
package/types/core/engine/commands.d.ts +296 -28
package/types/core/engine/commands.d.ts.map +1 -1
package/types/support/engineUtils.d.ts.map +1 -1
package/types/support/getViewPort.d.ts.map +1 -1
package/types/support/usbPower.d.ts.map +1 -1
package/types/video/postprocessing/finetune/addTextToVideo.d.ts.map +1 -1
package/types/video/postprocessing/finetune/getTimingMetrics.d.ts.map +1 -1
package/types/video/postprocessing/finetune/index.d.ts.map +1 -1
package/types/video/screenRecording/ios/iosDeviceRecorder.d.ts +28 -0
package/types/video/screenRecording/ios/iosDeviceRecorder.d.ts.map +1 -0
package/types/video/screenRecording/recorder.d.ts +2 -2
package/types/video/screenRecording/recorder.d.ts.map +1 -1
package/types/video/screenRecording/setOrangeBackground.d.ts.map +1 -1
package/types/video/video.d.ts +1 -1
package/types/video/video.d.ts.map +1 -1
package/visualmetrics/visualmetrics-portable.py +136 -136
package/lib/video/screenRecording/ios/convertToMp4.js +0 -22
package/lib/video/screenRecording/ios/iosRecorder.js +0 -68

package/lib/core/engine/iteration.js CHANGED Viewed

@@ -84,16 +84,7 @@ export class Iteration {
     const engineDelegate = this.engineDelegate;
     try {
-      if (options.flushDNS) {
-        await flushDNS(options);
-      }
-      if (options.connectivity && options.connectivity.variance) {
-        await addConnectivity(options);
-      }
-      await engineDelegate.beforeBrowserStart();
-      await browser.start();
-      await engineDelegate.afterBrowserStart(browser);
+      await this._startBrowser(browser, engineDelegate, options);
       // The data we push to all selenium scripts
       const context = new Context(
@@ -106,35 +97,23 @@ export class Iteration {
         browser.getDriver()
       );
-      const commands = new Commands(
+      const commands = new Commands({
         browser,
         engineDelegate,
         index,
         result,
-        this.storageManager,
-        this.pageCompleteCheck,
+        storageManager: this.storageManager,
+        pageCompleteCheck: this.pageCompleteCheck,
         context,
         videos,
         screenshotManager,
-        this.scriptsByCategory,
-        this.asyncScriptsByCategory,
-        this.postURLScripts,
+        scriptsByCategory: this.scriptsByCategory,
+        asyncScriptsByCategory: this.asyncScriptsByCategory,
+        postURLScripts: this.postURLScripts,
         options
-      );
+      });
-      // Safari can't load data:text URLs at startup, so you can either choose
-      // your own URL or use the blank one
-      const startURL =
-        options.safari && options.safari.startURL
-          ? options.safari.startURL
-          : 'data:text/html;charset=utf-8,<html><body></body></html>';
-      if (options.spa) {
-        await setResourceTimingBufferSize(startURL, browser.getDriver(), 1000);
-      } else if (!options.processStartTime) {
-        // Before we needed Chrome to open once to get correct values for Chrome HAR
-        // but now Firefox first visual change is slower if we remove this ...
-        await browser.getDriver().get(startURL);
-      }
+      await this._loadStartURL(browser, options);
       // On slowish Android phones it takes some time for the
       // browser to get ready
@@ -150,32 +129,14 @@ export class Iteration {
         await this.video.record(0, index);
       }
-      for (const preScript of this.preScripts) {
-        await preScript(context, commands);
-      }
-      if (options.preURL) {
-        await preURL(browser, engineDelegate, this.pageCompleteCheck, options);
-      }
-      try {
-        await navigationScript(context, commands, this.postURLScripts);
-      } catch (error) {
-        commands.error(error.message);
-        commands.markAsFailure(error.message);
-        throw error;
-      }
-      if (commands.measure.areWeMeasuring === true) {
-        // someone forgot to call stop();
-        log.info(
-          'It looks like you missed to call measure.stop() after calling measure.start(..) (without using a URL). Checkout https://www.sitespeed.io/documentation/sitespeed.io/scripting/#measurestartalias'
-        );
-        await commands.measure.stop();
-      }
-      for (const postScript of this.postScripts) {
-        await postScript(context, commands);
-      }
+      await this._runScripts(
+        navigationScript,
+        context,
+        commands,
+        options,
+        browser,
+        engineDelegate
+      );
       if (recordVideo && options.videoParams.debug) {
         // Just use the first URL
@@ -184,95 +145,32 @@ export class Iteration {
         await this.video.stop(url);
       }
-      await engineDelegate.beforeBrowserStop(browser, index, result);
-      // if we are in debig mode we wait on a continue command
-      if (options.debug) {
-        await commands.debug.breakpoint('End-of-iteration');
-      }
-      if (options.browser === 'firefox' && options.debug) {
-        log.info('Firefox is kept open in debug mode');
-      } else {
-        if (isAndroidConfigured(options) && options.ignoreShutdownFailures) {
-          try {
-            log.info('Ignoring shutdown failures on android...');
-            await browser.stop();
-          } catch {
-            // Ignore shutdown failures on android
-            log.info('Shutdown problem hit, ignoring...');
-          }
-        } else {
-          await browser.stop();
-        }
-      }
-      // Give the browsers some time to stop
-      await delay(2000);
-      await engineDelegate.afterBrowserStopped();
+      await this._stopBrowser(
+        browser,
+        engineDelegate,
+        options,
+        result,
+        index,
+        commands
+      );
       if (isAndroidConfigured(options)) {
         batteryTemperature.stop = await this.android.getTemperature();
         await this.android.removeDevtoolsFw();
       }
-      if (options.visualMetrics && !options.videoParams.debug) {
-        let index_ = 0;
-        for (let myVideo of videos) {
-          try {
-            const videoMetrics = await myVideo.postProcessing(
-              result[index_].browserScripts.timings.pageTimings,
-              result[index_].browserScripts.pageinfo.visualElements
-            );
-            for (let progress of [
-              'VisualProgress',
-              'ContentfulSpeedIndexProgress',
-              'PerceptualSpeedIndexProgress'
-            ]) {
-              if (videoMetrics.visualMetrics[progress]) {
-                videoMetrics.visualMetrics[progress] = jsonifyVisualProgress(
-                  videoMetrics.visualMetrics[progress]
-                );
-              }
-            }
-            if (videoMetrics.visualMetrics['KeyColorFrames']) {
-              videoMetrics.visualMetrics['KeyColorFrames'] =
-                jsonifyKeyColorFrames(
-                  videoMetrics.visualMetrics['KeyColorFrames']
-                );
-            }
-            result[index_].videoRecordingStart =
-              videoMetrics.videoRecordingStart;
-            result[index_].visualMetrics = videoMetrics.visualMetrics;
-            index_++;
-          } catch (error) {
-            // If one of the Visual Metrics runs fail, try the next one
-            log.error('Visual Metrics failed to analyse the video', error);
-            if (result[index_]) {
-              result[index_].error.push(error.message);
-            }
-          }
-        }
-      }
-      result.screenshots = screenshotManager.getSaved();
+      await this._processVisualMetrics(videos, result, options);
-      if (engineDelegate.postWork) {
-        await engineDelegate.postWork(index, result);
-      }
-      if (isAndroidConfigured(options)) {
-        result.batteryTemperature = batteryTemperature;
-      }
-      if (commands.meta.description) {
-        result.description = commands.meta.description;
-      }
-      if (commands.meta.title) {
-        result.title = commands.meta.title;
-      }
+      this._collectResults(
+        result,
+        screenshotManager,
+        engineDelegate,
+        index,
+        options,
+        commands,
+        batteryTemperature
+      );
-      result.processesAtStart = this.processesAtStart;
       return result;
     } catch (error) {
       log.error(error);
@@ -306,6 +204,240 @@ export class Iteration {
       } catch {
         // Most cases the browser been stopped already
       }
+      // Ensure delegate cleanup runs even on failure paths so that
+      // long-lived helpers (e.g. ios-capture, safaridriver) are released.
+      try {
+        await engineDelegate.afterBrowserStopped();
+      } catch {
+        // Idempotent — may have already run via _stopBrowser
+      }
+    }
+  }
+  async _startBrowser(browser, engineDelegate, options) {
+    if (options.flushDNS) {
+      await flushDNS(options);
+    }
+    if (options.connectivity && options.connectivity.variance) {
+      await addConnectivity(options);
+    }
+    await engineDelegate.beforeBrowserStart();
+    await browser.start();
+    // The runner deep-merges options into a fresh object before passing them
+    // to the browser-specific builder, so anything the builder records there
+    // never reaches the engine. Copy it back to the engine's options object
+    // so result.info.browser can pick it up. Issue #1622.
+    if (browser.options && browser.options.recordedBrowserSettings) {
+      this.options.recordedBrowserSettings =
+        browser.options.recordedBrowserSettings;
+    }
+    await engineDelegate.afterBrowserStart(browser);
+  }
+  async _loadStartURL(browser, options) {
+    // Safari can't load data:text URLs at startup, so you can either choose
+    // your own URL or use the blank one
+    const startURL =
+      options.safari && options.safari.startURL
+        ? options.safari.startURL
+        : 'data:text/html;charset=utf-8,<html><body></body></html>';
+    if (options.spa) {
+      await setResourceTimingBufferSize(startURL, browser.getDriver(), 1000);
+    } else if (!options.processStartTime) {
+      // Before we needed Chrome to open once to get correct values for Chrome HAR
+      // but now Firefox first visual change is slower if we remove this ...
+      await browser.getDriver().get(startURL);
+    }
+  }
+  async _runScripts(
+    navigationScript,
+    context,
+    commands,
+    options,
+    browser,
+    engineDelegate
+  ) {
+    for (const preScript of this.preScripts) {
+      await preScript(context, commands);
+    }
+    if (options.preURL) {
+      await preURL(browser, engineDelegate, this.pageCompleteCheck, options);
+    }
+    try {
+      await navigationScript(context, commands, this.postURLScripts);
+    } catch (error) {
+      commands.error(error.message);
+      commands.markAsFailure(error.message);
+      throw error;
+    }
+    if (commands.measure.areWeMeasuring === true) {
+      // someone forgot to call stop();
+      log.info(
+        'It looks like you missed to call measure.stop() after calling measure.start(..) (without using a URL). Checkout https://www.sitespeed.io/documentation/sitespeed.io/scripting/#measurestartalias'
+      );
+      await commands.measure.stop();
+    }
+    for (const postScript of this.postScripts) {
+      await postScript(context, commands);
+    }
+  }
+  async _stopBrowser(
+    browser,
+    engineDelegate,
+    options,
+    result,
+    index,
+    commands
+  ) {
+    await engineDelegate.beforeBrowserStop(browser, index, result);
+    // if we are in debig mode we wait on a continue command
+    if (options.debug) {
+      await commands.debug.breakpoint('End-of-iteration');
+    }
+    if (options.browser === 'firefox' && options.debug) {
+      log.info('Firefox is kept open in debug mode');
+    } else {
+      if (isAndroidConfigured(options) && options.ignoreShutdownFailures) {
+        try {
+          log.info('Ignoring shutdown failures on android...');
+          await browser.stop();
+        } catch {
+          // Ignore shutdown failures on android
+          log.info('Shutdown problem hit, ignoring...');
+        }
+      } else {
+        await browser.stop();
+      }
+    }
+    // Give the browsers some time to stop
+    await delay(2000);
+    await engineDelegate.afterBrowserStopped();
+  }
+  async _processVisualMetrics(videos, result, options) {
+    if (options.visualMetrics && !options.videoParams.debug) {
+      let index_ = 0;
+      for (let myVideo of videos) {
+        try {
+          const videoMetrics = await myVideo.postProcessing(
+            result[index_].browserScripts.timings.pageTimings,
+            result[index_].browserScripts.pageinfo.visualElements
+          );
+          for (let progress of [
+            'VisualProgress',
+            'ContentfulSpeedIndexProgress',
+            'PerceptualSpeedIndexProgress'
+          ]) {
+            if (videoMetrics.visualMetrics[progress]) {
+              videoMetrics.visualMetrics[progress] = jsonifyVisualProgress(
+                videoMetrics.visualMetrics[progress]
+              );
+            }
+          }
+          if (videoMetrics.visualMetrics['KeyColorFrames']) {
+            videoMetrics.visualMetrics['KeyColorFrames'] =
+              jsonifyKeyColorFrames(
+                videoMetrics.visualMetrics['KeyColorFrames']
+              );
+          }
+          result[index_].videoRecordingStart = videoMetrics.videoRecordingStart;
+          result[index_].visualMetrics = videoMetrics.visualMetrics;
+          // iOS real device video has USB mirroring latency (~1s).
+          // Sync visual metrics to FCP so firstVisualChange matches
+          // the browser-reported first contentful paint.
+          if (options.safari?.ios) {
+            syncVisualMetricsToFCP(result[index_]);
+          }
+          index_++;
+        } catch (error) {
+          // If one of the Visual Metrics runs fail, try the next one
+          log.error('Visual Metrics failed to analyse the video', error);
+          if (result[index_]) {
+            result[index_].error.push(error.message);
+          }
+        }
+      }
+    }
+  }
+  _collectResults(
+    result,
+    screenshotManager,
+    engineDelegate,
+    index,
+    options,
+    commands,
+    batteryTemperature
+  ) {
+    result.screenshots = screenshotManager.getSaved();
+    if (engineDelegate.postWork) {
+      engineDelegate.postWork(index, result);
+    }
+    if (isAndroidConfigured(options)) {
+      result.batteryTemperature = batteryTemperature;
+    }
+    if (commands.meta.description) {
+      result.description = commands.meta.description;
+    }
+    if (commands.meta.title) {
+      result.title = commands.meta.title;
+    }
+    result.processesAtStart = this.processesAtStart;
+  }
+}
+/**
+ * Compensate for USB screen mirroring latency on iOS real devices.
+ * The video stream is delayed ~1s compared to what happens on the device.
+ * We align visual metrics to the browser-reported FCP (First Contentful Paint)
+ * since both measure the same event — when content first appears on screen.
+ */
+function syncVisualMetricsToFCP(resultEntry) {
+  const vm = resultEntry.visualMetrics;
+  if (!vm) return;
+  const fcp =
+    resultEntry.browserScripts?.timings?.paintTiming?.[
+      'first-contentful-paint'
+    ];
+  if (!fcp || fcp <= 0) return;
+  if (!vm.FirstVisualChange || vm.FirstVisualChange <= fcp) return;
+  const offset = vm.FirstVisualChange - fcp;
+  for (const key of [
+    'FirstVisualChange',
+    'LastVisualChange',
+    'SpeedIndex',
+    'VisualComplete85',
+    'VisualComplete95',
+    'VisualComplete99'
+  ]) {
+    if (vm[key] > offset) {
+      vm[key] -= offset;
+    }
+  }
+  if (vm.VisualProgress) {
+    for (const entry of vm.VisualProgress) {
+      if (entry.timestamp > offset) {
+        entry.timestamp -= offset;
+      }
     }
   }
 }

package/lib/firefox/networkManager.js CHANGED Viewed

@@ -14,6 +14,21 @@ export class NetworkManager {
     this.idleTime = getProperty(options, 'timeouts.networkIdle', 5000);
   }
+  async _cleanup(messageHandler) {
+    if (messageHandler && this.ws) {
+      this.ws.removeListener('message', messageHandler);
+    }
+    await this.bidi.unsubscribe(
+      'network.beforeRequestSent',
+      this.browsingContextIds
+    );
+    await this.bidi.unsubscribe(
+      'network.responseCompleted',
+      this.browsingContextIds
+    );
+    await this.bidi.unsubscribe('network.fetchError', this.browsingContextIds);
+  }
   async waitForNetworkIdle() {
     await this.bidi.subscribe(
       'network.beforeRequestSent',
@@ -26,10 +41,10 @@ export class NetworkManager {
     await this.bidi.subscribe('network.fetchError', this.browsingContextIds);
     let inflight = 0;
-    let lastRequestTimestamp;
-    let lastResponseTimestamp;
+    let lastRequestTimestamp = Date.now();
+    let lastResponseTimestamp = Date.now();
     this.ws = await this.bidi.socket;
-    this.ws.on('message', function (event) {
+    const messageHandler = function (event) {
       const { method } = JSON.parse(Buffer.from(event.toString()));
       if (method) {
         switch (method) {
@@ -54,7 +69,8 @@ export class NetworkManager {
           // No default
         }
       }
-    });
+    };
+    this.ws.on('message', messageHandler);
     const startTime = Date.now();
@@ -71,20 +87,7 @@ export class NetworkManager {
               inflight
           );
         }
-        await this.bidi.unsubscribe(
-          'network.beforeRequestSent',
-          this.browsingContextIds
-        );
-        await this.bidi.unsubscribe(
-          'network.responseCompleted',
-          this.browsingContextIds
-        );
-        await this.bidi.unsubscribe(
-          'network.fetchError',
-          this.browsingContextIds
-        );
+        await this._cleanup(messageHandler);
         break;
       }
@@ -92,18 +95,7 @@ export class NetworkManager {
         log.info(
           'Timeout waiting for network idle. Inflight requests:' + inflight
         );
-        await this.bidi.unsubscribe(
-          'network.beforeRequestSent',
-          this.browsingContextIds
-        );
-        await this.bidi.unsubscribe(
-          'network.responseCompleted',
-          this.browsingContextIds
-        );
-        await this.bidi.unsubscribe(
-          'network.fetchError',
-          this.browsingContextIds
-        );
+        await this._cleanup(messageHandler);
         break;
       }

package/lib/firefox/webdriver/builder.js CHANGED Viewed

@@ -266,4 +266,18 @@ export async function configureBuilder(builder, baseDir, options) {
   }
   builder.setFirefoxOptions(ffOptions);
+  // Snapshot every argument / preference / capability we just applied so it
+  // can be surfaced in the result JSON for debugging — issue #1622. The
+  // runner deep-merges options into a fresh container before this is called,
+  // so iteration.js threads it back to the engine after browser.start().
+  const ffInternals = ffOptions.firefoxOptions_();
+  options.recordedBrowserSettings = {
+    args: [...(ffInternals.args || [])],
+    preferences: { ...ffInternals.prefs },
+    binary: ffInternals.binary,
+    profile: ffInternals.profile,
+    androidPackage: ffInternals.androidPackage,
+    androidActivity: ffInternals.androidActivity
+  };
 }

package/lib/firefox/webdriver/firefox.js CHANGED Viewed

@@ -65,9 +65,9 @@ export class Firefox {
     if (!this.options.skipHar) {
       this.har = new adapters.SeleniumBiDiHarRecorder({
         browsingContextIds: [this.windowId],
+        skipBodyData: this.includeResponseBodies === 'all' ? false : true,
         debugLogs:
           this.options.verbose >= 2 || this.firefoxConfig.enableBidiHarLog,
-        maxBodySize: this.includeResponseBodies === 'all' ? 10_485_760 : 1,
         driver: runner.getDriver(),
         headerValueFormatter: this.options.cleanSensitiveHeaders
           ? cleanSensitiveHeaders

package/lib/safari/har.js ADDED Viewed

@@ -0,0 +1,131 @@
+import { harFromMessages } from 'chrome-har';
+import { getLogger } from '@sitespeed.io/log';
+import { cleanSensitiveHeaders } from '../support/har/index.js';
+const log = getLogger('browsertime.safari.har');
+export async function getHar(
+  adapter,
+  result,
+  index,
+  inspectorClient,
+  includeResponseBodies,
+  aliasAndUrl,
+  cleanHeaders
+) {
+  const messages = adapter.getMessages();
+  let har;
+  try {
+    har = harFromMessages(messages);
+  } catch (error) {
+    log.error('Failed to generate HAR from messages: %s', error.message);
+    log.verbose(error);
+    return getEmptyHar();
+  }
+  // Fix timing values and remove cached entries without timing data
+  har.log.entries = har.log.entries.filter(entry => {
+    // Remove entries without _requestTime — these are cached resources
+    // that WebKit reported but have no useful timing data
+    const noTiming =
+      entry._requestTime === undefined || entry._requestTime === 0;
+    if (noTiming) {
+      return false;
+    }
+    // Fix any remaining NaN/non-number timing values
+    if (entry.timings) {
+      for (const key of Object.keys(entry.timings)) {
+        if (key === 'comment') {
+          // comment must be a string per HAR spec
+          if (typeof entry.timings[key] !== 'string') {
+            delete entry.timings[key];
+          }
+        } else if (
+          typeof entry.timings[key] !== 'number' ||
+          !Number.isFinite(entry.timings[key])
+        ) {
+          entry.timings[key] = 0;
+        }
+      }
+    }
+    if (typeof entry.time !== 'number' || !Number.isFinite(entry.time)) {
+      entry.time = 0;
+    }
+    return true;
+  });
+  // Add browser info
+  har.log.creator = {
+    name: 'Browsertime',
+    version: '1.0'
+  };
+  har.log.browser = {
+    name: 'Safari',
+    version: ''
+  };
+  // Clean sensitive headers if requested
+  if (cleanHeaders === true) {
+    for (const entry of har.log.entries ?? []) {
+      for (const header of entry.request?.headers ?? []) {
+        header.value = cleanSensitiveHeaders(header.name, header.value);
+      }
+      for (const header of entry.response?.headers ?? []) {
+        header.value = cleanSensitiveHeaders(header.name, header.value);
+      }
+    }
+  }
+  // Handle response bodies
+  if (
+    inspectorClient &&
+    (includeResponseBodies === 'html' || includeResponseBodies === 'all')
+  ) {
+    for (const entry of har.log.entries) {
+      if (
+        includeResponseBodies === 'html' &&
+        !entry.response.content.mimeType?.includes('text/html')
+      ) {
+        continue;
+      }
+      try {
+        const response = await inspectorClient.send('Network.getResponseBody', {
+          requestId: entry._requestId
+        });
+        if (response?.result?.body) {
+          entry.response.content.text = response.result.body;
+          if (response.result.base64Encoded) {
+            entry.response.content.encoding = 'base64';
+          }
+        }
+      } catch {
+        log.debug('Could not get response body for %s', entry.request.url);
+      }
+    }
+  }
+  // Set page title and URL
+  if (har.log.pages.length > 0) {
+    const url = result.url || '';
+    har.log.pages[0].title = `${url} run ${index}`;
+    const alias = aliasAndUrl[url] || url;
+    har.log.pages[0]._url = url;
+    har.log.pages[0]._alias = alias;
+  }
+  return har;
+}
+function getEmptyHar() {
+  return {
+    log: {
+      version: '1.2',
+      creator: { name: 'Browsertime', version: '1.0' },
+      browser: { name: 'Safari', version: '' },
+      pages: [],
+      entries: []
+    }
+  };
+}