Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[js] Close BiDi websocket connection #14507

Merged
merged 7 commits into from
Oct 4, 2024
+23 −15
Merged

[js] Close BiDi websocket connection #14507

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a37a727
[js] Close BiDi websocket connection
pujagani Sep 17, 2024
61379c9
[js] Fix formatting
pujagani Sep 17, 2024
13b86c2
[js] Rename websocket connection variables
pujagani Sep 17, 2024
c13f232
Merge branch 'trunk' into close-bidi-socket-connection
pujagani Sep 17, 2024
dfa8f8f
[js] Update variable name
pujagani Sep 17, 2024
878dbab
Merge branch 'trunk' into close-bidi-socket-connection
pujagani Sep 17, 2024
243c068
Merge branch 'trunk' into close-bidi-socket-connection
pujagani Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions javascript/node/selenium-webdriver/lib/webdriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,8 +789,13 @@ class WebDriver {
// If the websocket connection is not closed,
// and we are running CDP sessions against the Selenium Grid,
// the node process never exits since the websocket connection is open until the Grid is shutdown.
if (this._wsConnection !== undefined) {
this._wsConnection.close()
if (this._cdpWsConnection !== undefined) {
this._cdpWsConnection.close()
}

// Close the BiDi websocket connection
if (this._bidiConnection !== undefined) {
this._bidiConnection.close()
}
})
}
Expand Down Expand Up @@ -1241,18 +1246,18 @@ class WebDriver {
this._wsUrl = await this.getWsUrl(debuggerUrl, target, caps)
return new Promise((resolve, reject) => {
try {
this._wsConnection = new WebSocket(this._wsUrl.replace('localhost', '127.0.0.1'))
this._cdpConnection = new cdp.CdpConnection(this._wsConnection)
this._cdpWsConnection = new WebSocket(this._wsUrl.replace('localhost', '127.0.0.1'))
this._cdpConnection = new cdp.CdpConnection(this._cdpWsConnection)
} catch (err) {
reject(err)
return
}

this._wsConnection.on('open', async () => {
this._cdpWsConnection.on('open', async () => {
await this.getCdpTargets()
})

this._wsConnection.on('message', async (message) => {
this._cdpWsConnection.on('message', async (message) => {
const params = JSON.parse(message)
if (params.result) {
if (params.result.targetInfos) {
Expand All @@ -1273,7 +1278,7 @@ class WebDriver {
}
})

this._wsConnection.on('error', (error) => {
this._cdpWsConnection.on('error', (error) => {
reject(error)
})
})
Expand All @@ -1288,9 +1293,12 @@ class WebDriver {
* @returns {BIDI}
*/
async getBidi() {
const caps = await this.getCapabilities()
let WebSocketUrl = caps['map_'].get('webSocketUrl')
return new BIDI(WebSocketUrl.replace('localhost', '127.0.0.1'))
if (this._bidiConnection === undefined) {
const caps = await this.getCapabilities()
let WebSocketUrl = caps['map_'].get('webSocketUrl')
this._bidiConnection = new BIDI(WebSocketUrl.replace('localhost', '127.0.0.1'))
}
return this._bidiConnection
}

/**
Expand Down Expand Up @@ -1338,7 +1346,7 @@ class WebDriver {
* @param connection CDP Connection
*/
async register(username, password, connection) {
this._wsConnection.on('message', (message) => {
this._cdpWsConnection.on('message', (message) => {
const params = JSON.parse(message)

if (params.method === 'Fetch.authRequired') {
Expand Down Expand Up @@ -1383,7 +1391,7 @@ class WebDriver {
* @param callback callback called when we intercept requests.
*/
async onIntercept(connection, httpResponse, callback) {
this._wsConnection.on('message', (message) => {
this._cdpWsConnection.on('message', (message) => {
const params = JSON.parse(message)
if (params.method === 'Fetch.requestPaused') {
const requestPausedParams = params['params']
Expand Down Expand Up @@ -1420,7 +1428,7 @@ class WebDriver {
* @returns {Promise<void>}
*/
async onLogEvent(connection, callback) {
this._wsConnection.on('message', (message) => {
this._cdpWsConnection.on('message', (message) => {
const params = JSON.parse(message)
if (params.method === 'Runtime.consoleAPICalled') {
const consoleEventParams = params['params']
Expand Down Expand Up @@ -1457,7 +1465,7 @@ class WebDriver {
async onLogException(connection, callback) {
await connection.execute('Runtime.enable', {}, null)

this._wsConnection.on('message', (message) => {
this._cdpWsConnection.on('message', (message) => {
const params = JSON.parse(message)

if (params.method === 'Runtime.exceptionThrown') {
Expand Down Expand Up @@ -1510,7 +1518,7 @@ class WebDriver {
null,
)

this._wsConnection.on('message', async (message) => {
this._cdpWsConnection.on('message', async (message) => {
const params = JSON.parse(message)
if (params.method === 'Runtime.bindingCalled') {
let payload = JSON.parse(params['params']['payload'])
Expand Down
Loading