Skip to content

[js] Replace execSync with spawnSync in seleniumManager.js (#11649) #11873

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

Merged
merged 5 commits into from
Apr 20, 2023
Merged

[js] Replace execSync with spawnSync in seleniumManager.js (#11649) #11873

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a865aa
replace execSync with spawnSync in seleniumManager.js
atrnh Apr 7, 2023
566be7a
Merge branch 'trunk' into atrnh-issue11649
harsha509 Apr 10, 2023
4face98
Merge branch 'trunk' into atrnh-issue11649
diemol Apr 20, 2023
a837c85
Merge branch 'trunk' into atrnh-issue11649
diemol Apr 20, 2023
792944c
[javascript] Refine usage of spawnSync
diemol Apr 20, 2023
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
37 changes: 22 additions & 15 deletions javascript/node/selenium-webdriver/common/seleniumManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
const { platform } = require('process')
const path = require('path')
const fs = require('fs')
const execSync = require('child_process').execSync
const spawnSync = require('child_process').spawnSync

/**
* currently supported browsers for selenium-manager
Expand Down Expand Up @@ -53,7 +53,6 @@ function getBinary() {
} else {
seleniumManagerBasePath = path.join(__dirname, '..', '/bin')
}
console.log(seleniumManagerBasePath)

const filePath = path.join(seleniumManagerBasePath, directory, file)

Expand All @@ -77,7 +76,7 @@ function driverLocation(options) {
)
}

let args = [getBinary(), '--browser', options.getBrowserName(), '--output', 'json']
let args = ['--browser', options.getBrowserName(), '--output', 'json']

if (options.getBrowserVersion() && options.getBrowserVersion() !== "") {
args.push("--browser-version", options.getBrowserVersion())
Expand All @@ -89,22 +88,30 @@ function driverLocation(options) {
args.push("--browser-path", '"' + vendorOptions.binary + '"')
}

const smBinary = getBinary()
const spawnResult = spawnSync(smBinary, args)
let output
try {
output = JSON.parse(execSync(args.join(' ')).toString())
} catch (e) {
let error
try {
error = JSON.parse(e.stdout.toString()).result.message
} catch (e) {
if (e instanceof SyntaxError) {
error = e.stdout.toString()
} else {
error = e.toString()
if (spawnResult.status) {
let errorMessage
if (spawnResult.stderr.toString()) {
errorMessage = spawnResult.stderr.toString()
}
if (spawnResult.stdout.toString()) {
try {
output = JSON.parse(spawnResult.stdout.toString())
errorMessage = output.result.message
} catch (e) {
errorMessage = e.toString()
}
}
throw new Error(`Error executing command with ${args}: ${error}`)
throw new Error(`Error executing command for ${smBinary} with ${args}: ${errorMessage}`)
}
try {
output = JSON.parse(spawnResult.stdout.toString())
} catch (e) {
throw new Error(`Error executing command for ${smBinary} with ${args}: ${e.toString()}`)
}


for (const key in output.logs) {
if (output.logs[key].level === 'WARN') {
Expand Down