Cookie in Bidi for Firefox 125

sitespeedio · Mar 8, 2024 · 6780947 · 6780947
1 parent 7787402
commit 6780947
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/lib/extensionserver/index.js b/lib/extensionserver/index.js
@@ -19,7 +19,6 @@ export class ExtensionServer {
         options.requestheader ||
         options.block ||
         options.basicAuth ||
-        options.cookie ||
         options.clearCacheKeepCookies)
       ? true
       : false;

diff --git a/lib/extensionserver/setup.js b/lib/extensionserver/setup.js
@@ -24,16 +24,6 @@ function generateURL(port, testUrl, options) {
     query.ba = options.basicAuth + '@' + testUrl;
   }
 
-  if (options.cookie) {
-    const cookies = toArray(options.cookie);
-    query.cookie = [];
-    for (const cookie of cookies) {
-      const name = cookie.slice(0, Math.max(0, cookie.indexOf('=')));
-      const value = cookie.slice(Math.max(0, cookie.indexOf('=') + 1));
-      query.cookie.push(name + '@' + value + '@' + testUrl);
-    }
-  }
-
   return format({
     protocol: 'http',
     hostname: '127.0.0.1',

diff --git a/lib/firefox/firefoxBidi.js b/lib/firefox/firefoxBidi.js
@@ -1,4 +1,5 @@
 import intel from 'intel';
+import { toArray } from '../support/util.js';
 const log = intel.getLogger('browsertime.firefox.bidi');
 
 export class FirefoxBidi {
@@ -22,4 +23,33 @@ export class FirefoxBidi {
       log.error('Could not inject JavaScript:' + error);
     }
   }
+
+  async setCookie(url, cookie) {
+    const cookies = toArray(cookie);
+    for (let cookieParts of cookies) {
+      const parts = new Array(
+        cookieParts.slice(0, cookieParts.indexOf('=')),
+        cookieParts.slice(cookieParts.indexOf('=') + 1, cookieParts.length)
+      );
+
+      const params = {
+        method: 'storage.setCookie',
+        params: {
+          cookie: {
+            name: parts[0],
+            value: {
+              type: 'string',
+              value: parts[1]
+            },
+            domain: new URL(url).hostname
+          }
+        }
+      };
+      try {
+        await this.bidi.send(params);
+      } catch (error) {
+        log.error('Could not set cookie:' + error);
+      }
+    }
+  }
 }
diff --git a/lib/firefox/webdriver/firefox.js b/lib/firefox/webdriver/firefox.js
@@ -96,7 +96,7 @@ export class Firefox {
   /**
    * Before each URL/test runs.
    */
-  async beforeEachURL(runner) {
+  async beforeEachURL(runner, url) {
     await runner.runPrivilegedScript(`
       new Promise(async function(resolve) {
         await Services.fog.testFlushAllChildren(); // force any data that wasn't recorded yet to be immediately put in the buffers
@@ -126,6 +126,12 @@ export class Firefox {
       await this.geckoProfiler.start();
     }
 
+    if (this.options.cookie && url) {
+      await this.bidi.setCookie(url, this.options.cookie);
+    } else if (this.options.cookie) {
+      log.info('Could not set cookie because the URL is unknown');
+    }
+
     if (this.firefoxConfig.perfStats) {
       this.perfStats = new PerfStats(runner, this.firefoxConfig);
       return this.perfStats.start();