Move injectJS functionality to bidi for Firefox

lib/extensionserver/index.js

@@ -20,7 +20,6 @@ export class ExtensionServer {
         options.block ||
         options.basicAuth ||
         options.cookie ||
-        options.injectJs ||
         options.clearCacheKeepCookies)
       ? true
       : false;

lib/extensionserver/setup.js

@@ -24,10 +24,6 @@ function generateURL(port, testUrl, options) {
     query.ba = options.basicAuth + '@' + testUrl;
   }
 
-  if (options.injectJs && options.browser === 'firefox') {
-    query.js = options.injectJs;
-  }
-
   if (options.cookie) {
     const cookies = toArray(options.cookie);
     query.cookie = [];

lib/firefox/firefoxBidi.js

@@ -0,0 +1,25 @@
+import intel from 'intel';
+const log = intel.getLogger('browsertime.firefox.bidi');
+
+export class FirefoxBidi {
+  constructor(bidi, browsingContextId, options) {
+    this.options = options;
+    this.bidi = bidi;
+    this.browsingContextId = browsingContextId;
+  }
+
+  async injectJavaScript(script) {
+    const params = {
+      method: 'script.addPreloadScript',
+      params: {
+        functionDeclaration: script
+      }
+    };
+
+    try {
+      await this.bidi.send(params);
+    } catch (error) {
+      log.error('Could not inject JavaScript:' + error);
+    }
+  }
+}

lib/firefox/webdriver/builder.js

@@ -202,7 +202,7 @@ export async function configureBuilder(builder, baseDir, options) {
 
   // Enable bidi for HAR support
   if (firefoxConfig.bidihar) {
-    ffOptions.enableBidi();
+    /* We do not need to do anything for bidi har */
   } else {
     if (!options.skipHar) {
       if (isAndroidConfigured(options)) {

lib/firefox/webdriver/firefox.js

@@ -13,6 +13,7 @@ import { GeckoProfiler } from '../geckoProfiler.js';
 import { MemoryReport } from '../memoryReport.js';
 import { PerfStats } from '../perfStats.js';
 import { NetworkManager } from '../networkManager.js';
+import { FirefoxBidi } from '../firefoxBidi.js';
 import { getHAR } from '../getHAR.js';
 
 const log = intel.getLogger('browsertime.firefox');
@@ -61,12 +62,22 @@ export class Firefox {
         driver: runner.getDriver()
       });
     }
+    const windowId = await runner.getDriver().getWindowHandle();
+    this.bidi = new FirefoxBidi(
+      await runner.getDriver().getBidi(),
+      windowId,
+      this.options
+    );
   }
 
   /**
    * Before the first iteration of your tests start.
    */
   async beforeStartIteration(runner) {
+    if (this.options.injectJs) {
+      await this.bidi.injectJavaScript(this.options.injectJs);
+    }
+
     if (
       this.firefoxConfig.appendToUserAgent ||
       this.options.appendToUserAgent

lib/support/cli.js

@@ -1095,7 +1095,7 @@ export function parseCommandLine() {
     })
     .option('injectJs', {
       describe:
-        'Inject JavaScript into the current page at document_start. Works for Firefox and Chrome. More info: https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/contentScripts'
+        'Inject JavaScript into the current page at document_start. Works for Firefox, Chrome and Edge. When injecting to Firefox make sure to wrap the code in a function!'
     })
     .option('block', {
       describe: