[js] Finalise JS Binding support for WebDriver Bidi in Firefox

This requires Firefox 87 and Geckodriver 0.29 to be able to work
hath995 · Feb 11, 2021 · bdeac8e · bdeac8e
1 parent 10b1603
commit bdeac8e
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 113 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -40,3 +40,5 @@ build --test_env=SELENIUM_BROWSER
 build --test_env=TRAVIS
 
 test --test_timeout=1800
+
+test:node_debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel
@@ -37,7 +37,7 @@ pkg_npm(
     ],
 )
 
-TEST_FILES = glob(["test/**/*_test.js"])
+TEST_FILES = ["test/**/*_test.js"]
 
 TEST_DATA = SRC_FILES + glob(
     [

diff --git a/javascript/node/selenium-webdriver/chromium.js b/javascript/node/selenium-webdriver/chromium.js
@@ -565,7 +565,7 @@ class Options extends Capabilities {
           return extension.toString('base64')
         }
         return io
-          .read(/** @type {string} */ (extension))
+          .read(/** @type {string} */(extension))
           .then((buffer) => buffer.toString('base64'))
       })
     }
@@ -618,7 +618,7 @@ class Driver extends webdriver.WebDriver {
    * implementation.
    * @override
    */
-  setFileDetector() {}
+  setFileDetector() { }
 
   /**
    * Schedules a command to launch Chrome App with given ID.
@@ -820,10 +820,6 @@ class Driver extends webdriver.WebDriver {
       'Driver.stopCasting(' + deviceName + ')'
     )
   }
-
-  getRandomNumber(min, max) {
-    return Math.floor(Math.random() * (max - min + 1) + min)
-  }
 }
 
 // PUBLIC API

diff --git a/javascript/node/selenium-webdriver/firefox.js b/javascript/node/selenium-webdriver/firefox.js
@@ -223,7 +223,7 @@ async function buildProfile(template, extensions) {
     dir = await io.tmpDir()
     if (template) {
       await io.copyDir(
-        /** @type {string} */ (template),
+        /** @type {string} */(template),
         dir,
         /(parent\.lock|lock|\.parentlock)/
       )
@@ -433,11 +433,11 @@ function findGeckoDriver() {
   if (!exe) {
     throw Error(
       'The ' +
-        GECKO_DRIVER_EXE +
-        ' executable could not be found on the current ' +
-        'PATH. Please download the latest version from ' +
-        'https://github.com/mozilla/geckodriver/releases/ ' +
-        'and ensure it can be found on your PATH.'
+      GECKO_DRIVER_EXE +
+      ' executable could not be found on the current ' +
+      'PATH. Please download the latest version from ' +
+      'https://github.com/mozilla/geckodriver/releases/ ' +
+      'and ensure it can be found on your PATH.'
     )
   }
   return exe
@@ -458,8 +458,8 @@ function findInProgramFiles(file) {
     return exists
       ? files[0]
       : io.exists(files[1]).then(function (exists) {
-          return exists ? files[1] : null
-        })
+        return exists ? files[1] : null
+      })
   })
 }
 
@@ -593,7 +593,7 @@ class Driver extends webdriver.WebDriver {
    * implementation.
    * @override
    */
-  setFileDetector() {}
+  setFileDetector() { }
 
   /**
    * Get the context that is currently in effect.
@@ -667,38 +667,6 @@ class Driver extends webdriver.WebDriver {
       )
     )
   }
-
-  /**
-  * Creates a new WebSocket connection.
-  * @return {!Promise<resolved>} A new CDP instance.
-  */
-  async createCDPConnection(target) {
-    const caps = await this.getCapabilities()
-    const seOptions = caps['map_'].get('se:options') || new Map()
-    const vendorInfo =
-      caps['map_'].get('moz:debuggerAddress') ||
-      new Map()
-    const debuggerUrl = seOptions['cdp'] || vendorInfo['debuggerAddress']
-    this._wsUrl = await this.getWsUrl(debuggerUrl, target)
-
-    return new Promise((resolve, reject) => {
-      try {
-        this._wsConnection = new WebSocket(this._wsUrl)
-      } catch (err) {
-        reject(err)
-        return
-      }
-
-      this._wsConnection.on('open', () => {
-        this._cdpConnection = new cdp.CdpConnection(this._wsConnection)
-        resolve(this._cdpConnection)
-      })
-
-      this._wsConnection.on('error', (error) => {
-        reject(error)
-      })
-    })
-  }
 }
 
 /**

diff --git a/javascript/node/selenium-webdriver/lib/capabilities.js b/javascript/node/selenium-webdriver/lib/capabilities.js
@@ -84,7 +84,7 @@ const Platform = {
  *
  * @record
  */
-function Timeouts() {}
+function Timeouts() { }
 
 /**
  * Defines when, in milliseconds, to interrupt a script that is being
@@ -264,7 +264,7 @@ class Capabilities {
    * @return {!Capabilities} A basic set of capabilities for Firefox.
    */
   static firefox() {
-    return new Capabilities().setBrowserName(Browser.FIREFOX)
+    return new Capabilities().setBrowserName(Browser.FIREFOX).set("moz:debuggerAddress", true)
   }
 
   /**