Skip to content

Commit ca1a266

Browse files
committed
fix overly-persistent timeout
1 parent b7f643a commit ca1a266

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

packages/selenium-ide/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/selenium-ide",
3-
"version": "4.0.0-alpha.3",
3+
"version": "4.0.0-alpha.4",
44
"private": true,
55
"description": "Selenium IDE electron app",
66
"author": "Todd <[email protected]>",
@@ -107,7 +107,7 @@
107107
"@seleniumhq/side-api": "^4.0.0-alpha.2",
108108
"@seleniumhq/side-model": "^4.0.0-alpha.1",
109109
"@seleniumhq/side-plugin-example": "^4.0.0-alpha.1",
110-
"@seleniumhq/side-runtime": "^4.0.0-alpha.4",
110+
"@seleniumhq/side-runtime": "^4.0.0-alpha.5",
111111
"electron-chromedriver": "16.0.0",
112112
"electron-log": "4.4.6",
113113
"electron-store": "^8.0.0",

packages/side-runner/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/side-runner",
3-
"version": "4.0.0-alpha.14",
3+
"version": "4.0.0-alpha.15",
44
"description": "Run Selenium IDE projects in cli",
55
"repository": "https://github.com/SeleniumHQ/selenium-ide",
66
"scripts": {
@@ -24,7 +24,7 @@
2424
"private": false,
2525
"dependencies": {
2626
"@seleniumhq/side-model": "^4.0.0-alpha.1",
27-
"@seleniumhq/side-runtime": "^4.0.0-alpha.4",
27+
"@seleniumhq/side-runtime": "^4.0.0-alpha.5",
2828
"commander": "^9.4.0",
2929
"glob": "^7.2.0",
3030
"jest": "^27.5.1",

packages/side-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@seleniumhq/side-runtime",
3-
"version": "4.0.0-alpha.4",
3+
"version": "4.0.0-alpha.5",
44
"private": false,
55
"description": "Selenium IDE playback and execution",
66
"author": "Tomer <[email protected]>",

packages/side-runtime/src/playback-tree/command-node.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,17 @@ export class CommandNode {
134134
execute: () => Promise<unknown>,
135135
timeout: number
136136
): Promise<unknown> {
137+
const timeLimit = timeout - Date.now()
138+
const expirationTimer = setTimeout(() => {
139+
throw new Error('Operation timed out!')
140+
}, timeLimit)
137141
try {
138-
const timeLimit = timeout - Date.now()
139-
setTimeout(() => {
140-
throw new Error('Operation timed out!')
141-
}, timeLimit)
142-
return await execute()
142+
const result = await execute()
143+
clearTimeout(expirationTimer)
144+
return result
143145
} catch (e) {
144146
this.handleTransientError(e, timeout)
147+
clearTimeout(expirationTimer)
145148
return this.retryCommand(execute, timeout)
146149
}
147150
}
@@ -182,13 +185,13 @@ export class CommandNode {
182185
const notRetrying = Date.now() > timeout
183186
if (isNewErrorMessage) {
184187
this.transientError = thisTransientError
185-
console.debug(
188+
console.warn(
186189
'Unexpected error occured during command:',
187190
thisCommand,
188191
notRetrying ? '' : 'retrying...'
189192
)
190193
if (thisErrorMessage) {
191-
console.debug(thisErrorMessage)
194+
console.error(thisErrorMessage)
192195
}
193196
}
194197

0 commit comments

Comments
 (0)