selenium-webdriver 4.0.0-rc-2 → 4.0.0

package/CHANGES.md

@@ -1,3 +1,10 @@
+## v4.0.0
+
+* Fixes cdp for Chrome and Firefox (#9909)
+* Add cdp 95 to python and JS
+* Removing unused target for cdpConnection
+
+
 ## v4.0.0-rc-2
 
 * Fix builder test

package/firefox.js

@@ -411,6 +411,13 @@ class Options extends Capabilities {
     }
     return this
   }
+
+  /**
+   * Enables moz:debuggerAddress for firefox cdp
+   */
+  enableDebugger() {
+    return this.set('moz:debuggerAddress', true)
+  }
 }
 
 /**

package/lib/webdriver.js

@@ -29,7 +29,6 @@ const input = require('./input')
 const logging = require('./logging')
 const promise = require('./promise')
 const Symbols = require('./symbols')
-const cdpTargets = ['page', 'browser']
 const cdp = require('../devtools/CDPConnection')
 const WebSocket = require('ws')
 const http = require('../http/index')
@@ -37,6 +36,7 @@ const fs = require('fs')
 const { Capabilities } = require('./capabilities')
 const path = require('path')
 const { NoSuchElementError } = require('./error')
+const cdpTargets = ['page', 'browser']
 
 // Capability names that are defined in the W3C spec.
 const W3C_CAPABILITY_NAMES = new Set([
@@ -1199,8 +1199,7 @@ class WebDriver {
       caps['map_'].get('moz:debuggerAddress') ||
       new Map()
     const debuggerUrl = seCdp || vendorInfo['debuggerAddress'] || vendorInfo
-    this._wsUrl = await this.getWsUrl(debuggerUrl, target)
-
+    this._wsUrl = await this.getWsUrl(debuggerUrl, target, caps)
     return new Promise((resolve, reject) => {
       try {
         this._wsConnection = new WebSocket(this._wsUrl)
@@ -1223,32 +1222,38 @@ class WebDriver {
   /**
    * Retrieves 'webSocketDebuggerUrl' by sending a http request using debugger address
    * @param {string} debuggerAddress
-   * @param {string} target
+   * @param target
+   * @param caps
    * @return {string} Returns parsed webSocketDebuggerUrl obtained from the http request
    */
-  async getWsUrl(debuggerAddress, target) {
+  async getWsUrl(debuggerAddress, target, caps) {
     if (target && cdpTargets.indexOf(target.toLowerCase()) === -1) {
       throw new error.InvalidArgumentError('invalid target value')
     }
 
     if (debuggerAddress.match(/\/se\/cdp/)) {
-      if (debuggerAddress.match("ws:\/\/", "http:\/\/")) {
-        return debuggerAddress.replace("ws:\/\/", "http:\/\/")
-      }
-      else if (debuggerAddress.match("wss:\/\/", "https:\/\/")) {
-        return debuggerAddress.replace("wss:\/\/", "https:\/\/")
-      }
-      else {
-        return debuggerAddress
-      }
+      return debuggerAddress;
+    }
+
+    let path
+    if (target === 'page' && caps['map_'].get('browserName')!=='firefox' ){
+      path = '/json'
+    } else if(target === 'page' && caps['map_'].get('browserName')==='firefox'){
+      path = '/json/list'
+    }
+    else {
+      path = '/json/version'
     }
 
-    const path = '/json/version'
     let request = new http.Request('GET', path)
     let client = new http.HttpClient('http://' + debuggerAddress)
     let response = await client.send(request)
 
-    return JSON.parse(response.body)['webSocketDebuggerUrl']
+    if (target.toLowerCase() === 'page') {
+      return JSON.parse(response.body)[0]['webSocketDebuggerUrl']
+    } else {
+      return JSON.parse(response.body)['webSocketDebuggerUrl']
+    }
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "4.0.0-rc-2",
+  "version": "4.0.0",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [