selenium-webdriver 4.9.0 → 4.9.1

package/CHANGES.md

@@ -1,3 +1,9 @@
+## v4.9.1
+
+#### :nail_care: Polish
+
+* Add CDP files for v113 and remove v110
+
 ## v4.9.0
 
 #### :nail_care: Polish

package/bidi/browsingContext.js

@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+const { BrowsingContextInfo } = require('./browsingContextTypes')
 class BrowsingContext {
   constructor(driver) {
     this._driver = driver
@@ -145,31 +146,6 @@ class NavigateResult {
   }
 }
 
-class BrowsingContextInfo {
-  constructor(id, url, children, parentBrowsingContext) {
-    this._id = id
-    this._url = url
-    this._children = children
-    this._parentBrowsingContext = parentBrowsingContext
-  }
-
-  get id() {
-    return this._id
-  }
-
-  get url() {
-    return this._url
-  }
-
-  get children() {
-    return this._children
-  }
-
-  get parentBrowsingContext() {
-    return this._parentBrowsingContext
-  }
-}
-
 /**
  * initiate browsing context instance and return
  * @param driver

package/bidi/browsingContextInspector.js

@@ -0,0 +1,95 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+const {
+  BrowsingContextInfo,
+  NavigationInfo,
+} = require('./browsingContextTypes')
+
+class BrowsingContextInspector {
+  constructor(driver, browsingContextIds) {
+    this._driver = driver
+    this._browsingContextIds = browsingContextIds
+  }
+
+  async init() {
+    this.bidi = await this._driver.getBidi()
+  }
+
+  async onBrowsingContextCreated(callback) {
+    await this.subscribeAndHandleEvent(
+      'browsingContext.contextCreated',
+      callback
+    )
+  }
+
+  async onDomContentLoaded(callback) {
+    await this.subscribeAndHandleEvent(
+      'browsingContext.domContentLoaded',
+      callback
+    )
+  }
+
+  async onBrowsingContextLoaded(callback) {
+    await this.subscribeAndHandleEvent('browsingContext.load', callback)
+  }
+
+  async subscribeAndHandleEvent(eventType, callback) {
+    if (this._browsingContextIds != null) {
+      await this.bidi.subscribe(eventType, this._browsingContextIds)
+    } else {
+      await this.bidi.subscribe(eventType)
+    }
+    this._on(callback)
+  }
+
+  async _on(callback) {
+    this.ws = await this.bidi.socket
+    this.ws.on('message', (event) => {
+      const { params } = JSON.parse(Buffer.from(event.toString()))
+      if (params) {
+        let response = null
+        if ('navigation' in params) {
+          response = new NavigationInfo(
+            params.context,
+            params.navigation,
+            params.timestamp,
+            params.url
+          )
+        } else if ('accepted' in params) {
+          /* Needs to be updated when browsers implement other events */
+        } else {
+          response = new BrowsingContextInfo(
+            params.context,
+            params.url,
+            params.children,
+            params.parent
+          )
+        }
+        callback(response)
+      }
+    })
+  }
+}
+
+async function getBrowsingContextInstance(driver, browsingContextIds = null) {
+  let instance = new BrowsingContextInspector(driver, browsingContextIds)
+  await instance.init()
+  return instance
+}
+
+module.exports = getBrowsingContextInstance

package/bidi/browsingContextTypes.js

@@ -0,0 +1,52 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+class BrowsingContextInfo {
+  constructor(id, url, children, parentBrowsingContext) {
+    this._id = id
+    this._url = url
+    this._children = children
+    this._parentBrowsingContext = parentBrowsingContext
+  }
+
+  get id() {
+    return this._id
+  }
+
+  get url() {
+    return this._url
+  }
+
+  get children() {
+    return this._children
+  }
+
+  get parentBrowsingContext() {
+    return this._parentBrowsingContext
+  }
+}
+
+class NavigationInfo {
+  constructor(browsingContextId, navigationId, timestamp, url) {
+    this.browsingContextId = browsingContextId
+    this.navigationId = navigationId
+    this.timestamp = timestamp
+    this.url = url
+  }
+}
+
+module.exports = { BrowsingContextInfo, NavigationInfo }

package/index.js

@@ -41,6 +41,7 @@ const webdriver = require('./lib/webdriver')
 const select = require('./lib/select')
 const LogInspector = require('./bidi/logInspector')
 const BrowsingContext = require('./bidi/browsingContext')
+const BrowsingConextInspector = require('./bidi/browsingContextInspector')
 const ScriptManager = require('./bidi/scriptManager')
 
 const Browser = capabilities.Browser
@@ -800,4 +801,5 @@ exports.until = until
 exports.Select = select.Select
 exports.LogInspector = LogInspector
 exports.BrowsingContext = BrowsingContext
+exports.BrowsingConextInspector = BrowsingConextInspector
 exports.ScriptManager = ScriptManager

package/package.json

@@ -1,7 +1,7 @@
 
 {
   "name": "selenium-webdriver",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [