Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-02 21:45:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(utils): adjust scheduleAction to stricter tests

Browse Source
This commit is contained in:
Marek Polak
2024-07-24 14:13:01 +02:00
committed by Marek Polák
parent 7c960dc1ed
commit cc5641f9b8
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/utils/src/scheduleAction.ts
View File

@@ -27,27 +27,38 @@ const resolveAfterMs = (ms: number | undefined, clear: AbortSignal) =>
new Promise<void>((resolve, reject) => {
if (clear.aborted) return reject();
if (ms === undefined) return resolve();
const timeout = setTimeout(resolve, ms);
let timeout: ReturnType<typeof setTimeout>;
const onClear = () => {
clearTimeout(timeout);
clear.removeEventListener('abort', onClear);
reject();
};
timeout = setTimeout(() => {
clear.removeEventListener('abort', onClear);
resolve();
}, ms);
clear.addEventListener('abort', onClear);
});
const rejectAfterMs = (ms: number | undefined, reason: () => Error, clear: AbortSignal) =>
const rejectAfterMs = (ms: number, reason: () => Error, clear: AbortSignal) =>
new Promise<never>((_, reject) => {
if (clear.aborted) return reject();
const timeout = ms !== undefined ? setTimeout(() => reject(reason()), ms) : undefined;
let timeout: ReturnType<typeof setTimeout> | undefined;
const onClear = () => {
clearTimeout(timeout);
clear.removeEventListener('abort', onClear);
reject();
};
timeout = setTimeout(() => {
clear.removeEventListener('abort', onClear);
reject(reason());
}, ms);
clear.addEventListener('abort', onClear);
});
const maybeRejectAfterMs = (ms: number | undefined, reason: () => Error, clear: AbortSignal) =>
ms === undefined ? [] : [rejectAfterMs(ms, reason, clear)];
const rejectWhenAborted = (signal: AbortSignal | undefined, clear: AbortSignal) =>
new Promise<never>((_, reject) => {
if (clear.aborted) return reject();
@@ -118,13 +129,17 @@ export const scheduleAction = async <T>(
try {
return await Promise.race([
rejectWhenAborted(signal, clear),
rejectAfterMs(deadlineMs, abortedByDeadline, clear),
...maybeRejectAfterMs(deadlineMs, abortedByDeadline, clear),
resolveAfterMs(delay, clear).then(() =>
attemptLoop(
attemptCount,
(attempt, abort) =>
Promise.race([
rejectAfterMs(getParams(attempt).timeout, abortedByTimeout, clear),
...maybeRejectAfterMs(
getParams(attempt).timeout,
abortedByTimeout,
clear,
),
resolveAction(action, abort),
]),
(attempt, error) => {