@wdio/utils 9.23.0 → 9.23.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.js +11 -3
- package/build/shim.d.ts.map +1 -1
- package/package.json +3 -3
package/build/index.js
CHANGED
|
@@ -1099,15 +1099,16 @@ function wrapCommand(commandName, fn) {
|
|
|
1099
1099
|
}
|
|
1100
1100
|
async function executeAsync(fn, retries, args = [], timeout = 2e4) {
|
|
1101
1101
|
this.wdioRetries = retries.attempts;
|
|
1102
|
+
let done = false;
|
|
1103
|
+
let timer;
|
|
1102
1104
|
try {
|
|
1103
1105
|
const runnableTimeout = this?._runnable?._timeout;
|
|
1104
1106
|
const frameworkTimeout = runnableTimeout ?? globalThis.jasmine?.DEFAULT_TIMEOUT_INTERVAL ?? timeout;
|
|
1105
1107
|
const _timeout = (frameworkTimeout ?? timeout) - TIME_BUFFER;
|
|
1106
|
-
let done = false;
|
|
1107
1108
|
const result = await Promise.race([
|
|
1108
1109
|
fn.apply(this, args),
|
|
1109
1110
|
new Promise((resolve, reject) => {
|
|
1110
|
-
setTimeout(() => {
|
|
1111
|
+
timer = setTimeout(() => {
|
|
1111
1112
|
if (done) {
|
|
1112
1113
|
resolve();
|
|
1113
1114
|
} else {
|
|
@@ -1117,14 +1118,21 @@ async function executeAsync(fn, retries, args = [], timeout = 2e4) {
|
|
|
1117
1118
|
})
|
|
1118
1119
|
]);
|
|
1119
1120
|
done = true;
|
|
1121
|
+
if (timer) {
|
|
1122
|
+
clearTimeout(timer);
|
|
1123
|
+
}
|
|
1120
1124
|
if (result !== null && typeof result === "object" && "finally" in result && typeof result.finally === "function") {
|
|
1121
1125
|
result.catch((err) => err);
|
|
1122
1126
|
}
|
|
1123
1127
|
return await result;
|
|
1124
1128
|
} catch (err) {
|
|
1129
|
+
done = true;
|
|
1130
|
+
if (timer) {
|
|
1131
|
+
clearTimeout(timer);
|
|
1132
|
+
}
|
|
1125
1133
|
if (retries.limit > retries.attempts) {
|
|
1126
1134
|
retries.attempts++;
|
|
1127
|
-
return await executeAsync.call(this, fn, retries, args);
|
|
1135
|
+
return await executeAsync.call(this, fn, retries, args, timeout);
|
|
1128
1136
|
}
|
|
1129
1137
|
throw err;
|
|
1130
1138
|
}
|
package/build/shim.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAuBhE;;;GAGG;AACH,UAAU,mBAAoB,SAAQ,QAAQ,CAAC,KAAK;IAChD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAC,UAAU,CAAA;IAC3B,SAAS,EAAE,QAAQ,CAAA;IACnB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACnC;AAED,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,QAAQ,GAAG,QAAQ,EAAO,EAAE,IAAI,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAuE9J;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAiOpG;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,mBAAmB,EACzB,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,UAAU,CAAC,WAAW,EAC/B,IAAI,GAAE,OAAO,EAAO,EACpB,OAAO,GAAE,MAAc,GACxB,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAuBhE;;;GAGG;AACH,UAAU,mBAAoB,SAAQ,QAAQ,CAAC,KAAK;IAChD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAC,UAAU,CAAA;IAC3B,SAAS,EAAE,QAAQ,CAAA;IACnB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACnC;AAED,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,QAAQ,GAAG,QAAQ,EAAO,EAAE,IAAI,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAuE9J;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAiOpG;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,mBAAmB,EACzB,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,UAAU,CAAC,WAAW,EAC/B,IAAI,GAAE,OAAO,EAAO,EACpB,OAAO,GAAE,MAAc,GACxB,OAAO,CAAC,OAAO,CAAC,CA0DlB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wdio/utils",
|
|
3
|
-
"version": "9.23.
|
|
3
|
+
"version": "9.23.1",
|
|
4
4
|
"description": "A WDIO helper utility to provide several utility functions used across the project.",
|
|
5
5
|
"author": "Christian Bromann <mail@bromann.dev>",
|
|
6
6
|
"homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@puppeteer/browsers": "^2.2.0",
|
|
41
41
|
"@wdio/logger": "9.18.0",
|
|
42
|
-
"@wdio/types": "9.
|
|
42
|
+
"@wdio/types": "9.23.1",
|
|
43
43
|
"decamelize": "^6.0.0",
|
|
44
44
|
"deepmerge-ts": "^7.0.3",
|
|
45
45
|
"edgedriver": "^6.1.2",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"publishConfig": {
|
|
56
56
|
"access": "public"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "19ac2c1dd86f3bdd967bc6c22c5bcdd78907b988"
|
|
59
59
|
}
|