@celljs/retry 4.3.0 → 4.4.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/README.md +12 -1
- package/esm/common/back-off/back-off-policy.d.ts +9 -0
- package/esm/common/back-off/back-off-policy.js +25 -19
- package/esm/common/back-off/back-off-policy.js.map +1 -1
- package/esm/common/retry/retry-operations.d.ts +3 -1
- package/esm/common/retry/retry-operations.js +9 -3
- package/esm/common/retry/retry-operations.js.map +1 -1
- package/lib/common/back-off/back-off-policy.d.ts +9 -0
- package/lib/common/back-off/back-off-policy.d.ts.map +1 -1
- package/lib/common/back-off/back-off-policy.js +26 -20
- package/lib/common/back-off/back-off-policy.js.map +1 -1
- package/lib/common/back-off/back-off-policy.spec.js +16 -2
- package/lib/common/back-off/back-off-policy.spec.js.map +1 -1
- package/lib/common/retry/retry-operations.d.ts +3 -1
- package/lib/common/retry/retry-operations.d.ts.map +1 -1
- package/lib/common/retry/retry-operations.js +9 -3
- package/lib/common/retry/retry-operations.js.map +1 -1
- package/lib/common/retry/retry-operations.spec.js +41 -26
- package/lib/common/retry/retry-operations.spec.js.map +1 -1
- package/package.json +3 -4
- package/src/common/back-off/back-off-policy.spec.ts +18 -3
- package/src/common/back-off/back-off-policy.ts +27 -17
- package/src/common/retry/retry-operations.spec.ts +43 -22
- package/src/common/retry/retry-operations.ts +11 -5
- package/cell.yml +0 -0
package/README.md
CHANGED
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
@Component()
|
|
23
23
|
export class Service {
|
|
24
|
+
@Autowired(RetryOperations)
|
|
24
25
|
protected retryOperations: RetryOperations;
|
|
25
26
|
|
|
26
27
|
service(): void {
|
|
@@ -38,7 +39,7 @@ export class Service {
|
|
|
38
39
|
}
|
|
39
40
|
```
|
|
40
41
|
|
|
41
|
-
|
|
42
|
+
这个示例在第一次尝试之后最多重试三次(`maxAttempts` 是重试次数,不含第一次,所以最多执行四次),如果仍然失败,则调用`recoveryCallback`,它的返回值就是 `execute` 的结果;没有恢复回调或恢复回调也失败时,`execute` 抛出 `RetryError`,`cause` 是最后一次的错误。
|
|
42
43
|
在`execute`方法中有各种选项,可以包括或排除错误类型,限制重试次数以及设置退避策略。
|
|
43
44
|
|
|
44
45
|
## 安装
|
|
@@ -114,6 +115,7 @@ export interface RetryCallback<T> {
|
|
|
114
115
|
```typescript
|
|
115
116
|
@Component()
|
|
116
117
|
export class Service {
|
|
118
|
+
@Autowired(RetryOperations)
|
|
117
119
|
protected retryOperations: RetryOperations;
|
|
118
120
|
|
|
119
121
|
service(): void {
|
|
@@ -150,6 +152,7 @@ export class Service {
|
|
|
150
152
|
```typescript
|
|
151
153
|
@Component()
|
|
152
154
|
export class Service {
|
|
155
|
+
@Autowired(RetryOperations)
|
|
153
156
|
protected retryOperations: RetryOperations;
|
|
154
157
|
|
|
155
158
|
service(): void {
|
|
@@ -190,3 +193,11 @@ export interface BackOffPolicy {
|
|
|
190
193
|
|
|
191
194
|
`BackoffPolicy`可以以任何方式自由实现退避。Cell Retry 提供的策略都使用`timeout`。常见的用例是指数递增的等待周期进行退避,以避免两次重试进入锁步并且都失败(从以太网中学到的教训)。Cell Retry还提供了具有随机化的延迟策略的版本,这对于避免复杂系统中相关故障之间的共振非常有用。
|
|
192
195
|
|
|
196
|
+
默认的 `BackOffPolicy` 按 `backOffOptions` 计算两次尝试之间的等待时间(毫秒):
|
|
197
|
+
|
|
198
|
+
| 选项 | 等待时间 |
|
|
199
|
+
| --- | --- |
|
|
200
|
+
| 不设 `backOffOptions` | 不等待 |
|
|
201
|
+
| 只有 `delay`(默认 100) | 每次等 `delay` |
|
|
202
|
+
| `multiplier` | 每次乘以 `multiplier`(`random: true` 时在上一次与它乘以 `multiplier` 之间随机取),不超过 `maxDelay`;不设 `maxDelay` 时上限是 30000(`DEFAULT_MAX_DELAY`) |
|
|
203
|
+
| `maxDelay`,不设 `multiplier` | 在 `delay` 与 `maxDelay` 之间随机取 |
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import { BackOffContext, BackOffPolicy } from './back-off-protocol.js';
|
|
2
2
|
import { RetryContext } from '../retry/index.js';
|
|
3
|
+
/** The cap of exponential back off when `maxDelay` is not set, as in Spring Retry. */
|
|
4
|
+
export declare const DEFAULT_MAX_DELAY = 30000;
|
|
5
|
+
/**
|
|
6
|
+
* Waits between attempts: `delay` (default 100 ms) every time; with `multiplier`, a delay that grows by
|
|
7
|
+
* that factor each time (randomly between the previous one and that with `random`), at most `maxDelay`
|
|
8
|
+
* (default 30 s); with `maxDelay` and no multiplier, a random delay between `delay` and `maxDelay`.
|
|
9
|
+
*/
|
|
3
10
|
export declare class DefaultBackOffPolicyImpl implements BackOffPolicy {
|
|
4
11
|
start(ctx: RetryContext): Promise<BackOffContext>;
|
|
5
12
|
backOff(ctx: BackOffContext): Promise<void>;
|
|
13
|
+
/** How long to wait before the next attempt; `undefined` (no wait) without back off options. */
|
|
14
|
+
protected nextDelay(ctx: BackOffContext): Promise<number | undefined>;
|
|
6
15
|
}
|
|
@@ -6,6 +6,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { Component, timeout } from '@celljs/core';
|
|
8
8
|
import { BackOffPolicy } from './back-off-protocol.js';
|
|
9
|
+
/** The cap of exponential back off when `maxDelay` is not set, as in Spring Retry. */
|
|
10
|
+
export const DEFAULT_MAX_DELAY = 30000;
|
|
11
|
+
/**
|
|
12
|
+
* Waits between attempts: `delay` (default 100 ms) every time; with `multiplier`, a delay that grows by
|
|
13
|
+
* that factor each time (randomly between the previous one and that with `random`), at most `maxDelay`
|
|
14
|
+
* (default 30 s); with `maxDelay` and no multiplier, a random delay between `delay` and `maxDelay`.
|
|
15
|
+
*/
|
|
9
16
|
let DefaultBackOffPolicyImpl = class DefaultBackOffPolicyImpl {
|
|
10
17
|
async start(ctx) {
|
|
11
18
|
const { backOffOptions } = ctx;
|
|
@@ -17,33 +24,32 @@ let DefaultBackOffPolicyImpl = class DefaultBackOffPolicyImpl {
|
|
|
17
24
|
};
|
|
18
25
|
}
|
|
19
26
|
async backOff(ctx) {
|
|
27
|
+
const nextDelay = await this.nextDelay(ctx);
|
|
28
|
+
if (nextDelay === undefined) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
ctx.delay = nextDelay;
|
|
32
|
+
await timeout(nextDelay);
|
|
33
|
+
}
|
|
34
|
+
/** How long to wait before the next attempt; `undefined` (no wait) without back off options. */
|
|
35
|
+
async nextDelay(ctx) {
|
|
20
36
|
var _a;
|
|
21
37
|
const { retryContext, delay } = ctx;
|
|
22
38
|
const { backOffOptions } = retryContext;
|
|
23
39
|
if (!backOffOptions) {
|
|
24
|
-
return;
|
|
40
|
+
return undefined;
|
|
25
41
|
}
|
|
26
|
-
const
|
|
42
|
+
const { multiplier, random } = backOffOptions;
|
|
27
43
|
const maxDelay = typeof backOffOptions.maxDelay === 'function' ? await backOffOptions.maxDelay() : backOffOptions.maxDelay;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
44
|
+
if (multiplier) {
|
|
45
|
+
const grown = random ? Math.floor(delay * (1 + Math.random() * (multiplier - 1))) : delay * multiplier;
|
|
46
|
+
return Math.min(maxDelay || DEFAULT_MAX_DELAY, grown);
|
|
47
|
+
}
|
|
31
48
|
if (maxDelay) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
nextDelay = Math.floor(nextDelay * (1 + Math.random() * (multiplier - 1)));
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
nextDelay = nextDelay * multiplier;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
nextDelay = minDelay + Math.floor(Math.random() * (maxDelay - minDelay));
|
|
42
|
-
}
|
|
43
|
-
nextDelay = Math.min(maxDelay, nextDelay);
|
|
49
|
+
const minDelay = typeof backOffOptions.delay === 'function' ? await backOffOptions.delay() : ((_a = backOffOptions.delay) !== null && _a !== void 0 ? _a : 100);
|
|
50
|
+
return Math.min(maxDelay, minDelay + Math.floor(Math.random() * (maxDelay - minDelay)));
|
|
44
51
|
}
|
|
45
|
-
|
|
46
|
-
await timeout(nextDelay);
|
|
52
|
+
return delay;
|
|
47
53
|
}
|
|
48
54
|
};
|
|
49
55
|
DefaultBackOffPolicyImpl = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"back-off-policy.js","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAkB,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"back-off-policy.js","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAkB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpE,sFAAsF;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEvC;;;;GAIG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,KAAK,CAAC,KAAK,CAAC,GAAiB;QACzB,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QAC/B,MAAM,KAAK,GAAG,QAAO,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,CAAA,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,CAAC;QACjH,OAAO;YACH,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,GAAG;YACnB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,YAAY,EAAE,GAAG;SACpB,CAAC;IACN,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,GAAmB;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QACD,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;QACtB,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,gGAAgG;IACtF,KAAK,CAAC,SAAS,CAAC,GAAmB;;QACzC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QACpC,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC;QACxC,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,OAAO,cAAc,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC3H,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC;YACvG,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,OAAO,cAAc,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAC,cAAc,CAAC,KAAK,mCAAI,GAAG,CAAC,CAAC;YAC3H,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ,CAAA;AAvCY,wBAAwB;IADpC,SAAS,CAAC,aAAa,CAAC;GACZ,wBAAwB,CAuCpC"}
|
|
@@ -8,7 +8,9 @@ export declare class RetryOperationsImpl implements RetryOperations {
|
|
|
8
8
|
protected readonly backOffPolicy: BackOffPolicy;
|
|
9
9
|
protected readonly logger: Logger;
|
|
10
10
|
protected initRetryContext(options: RetryOptions<any>): RetryContext;
|
|
11
|
+
/** The value of `recoveryCallback` when there is one; otherwise, or when it fails too, the last error as a RetryError. */
|
|
11
12
|
protected handleRetryExhausted<T>(ctx: RetryContext, recoveryCallback?: RecoveryCallback<T>): Promise<T>;
|
|
12
|
-
|
|
13
|
+
/** A RetryError with `error` as its cause; a RetryError stays as it is. */
|
|
14
|
+
protected wrapError(error?: unknown): RetryError;
|
|
13
15
|
execute<T>(callback: RetryCallback<T>, options?: RetryOptions<T>): Promise<T>;
|
|
14
16
|
}
|
|
@@ -28,19 +28,25 @@ let RetryOperationsImpl = class RetryOperationsImpl {
|
|
|
28
28
|
notRetryErrors: (_b = options.notRetryErrors) !== null && _b !== void 0 ? _b : []
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
|
+
/** The value of `recoveryCallback` when there is one; otherwise, or when it fails too, the last error as a RetryError. */
|
|
31
32
|
async handleRetryExhausted(ctx, recoveryCallback) {
|
|
32
33
|
if (recoveryCallback && !ctx.noRecovery) {
|
|
33
34
|
try {
|
|
34
|
-
return recoveryCallback(ctx);
|
|
35
|
+
return await recoveryCallback(ctx);
|
|
35
36
|
}
|
|
36
|
-
catch (
|
|
37
|
+
catch (_a) {
|
|
37
38
|
throw this.wrapError(ctx.lastError);
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
41
|
throw this.wrapError(ctx.lastError);
|
|
41
42
|
}
|
|
43
|
+
/** A RetryError with `error` as its cause; a RetryError stays as it is. */
|
|
42
44
|
wrapError(error) {
|
|
43
|
-
|
|
45
|
+
if (error instanceof RetryError) {
|
|
46
|
+
return error;
|
|
47
|
+
}
|
|
48
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
49
|
+
return new RetryError(`Error occurred during retry: ${message}`, { cause: error });
|
|
44
50
|
}
|
|
45
51
|
async execute(callback, options = {}) {
|
|
46
52
|
const retryContext = this.initRetryContext(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-operations.js","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAiD,eAAe,EAAgB,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGjD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAWlB,gBAAgB,CAAC,OAA0B;;QACjD,OAAO;YACH,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,SAAS;YACpB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,WAAW,QAAE,OAAO,CAAC,WAAW,mCAAI,EAAE;YACtC,cAAc,QAAE,OAAO,CAAC,cAAc,mCAAI,EAAE;SAC/C,CAAC;IACN,CAAC;
|
|
1
|
+
{"version":3,"file":"retry-operations.js","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
import { BackOffContext, BackOffPolicy } from './back-off-protocol';
|
|
2
2
|
import { RetryContext } from '../retry';
|
|
3
|
+
/** The cap of exponential back off when `maxDelay` is not set, as in Spring Retry. */
|
|
4
|
+
export declare const DEFAULT_MAX_DELAY = 30000;
|
|
5
|
+
/**
|
|
6
|
+
* Waits between attempts: `delay` (default 100 ms) every time; with `multiplier`, a delay that grows by
|
|
7
|
+
* that factor each time (randomly between the previous one and that with `random`), at most `maxDelay`
|
|
8
|
+
* (default 30 s); with `maxDelay` and no multiplier, a random delay between `delay` and `maxDelay`.
|
|
9
|
+
*/
|
|
3
10
|
export declare class DefaultBackOffPolicyImpl implements BackOffPolicy {
|
|
4
11
|
start(ctx: RetryContext): Promise<BackOffContext>;
|
|
5
12
|
backOff(ctx: BackOffContext): Promise<void>;
|
|
13
|
+
/** How long to wait before the next attempt; `undefined` (no wait) without back off options. */
|
|
14
|
+
protected nextDelay(ctx: BackOffContext): Promise<number | undefined>;
|
|
6
15
|
}
|
|
7
16
|
//# sourceMappingURL=back-off-policy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"back-off-policy.d.ts","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,qBACa,wBAAyB,YAAW,aAAa;IACpD,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAQtD;IACK,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"back-off-policy.d.ts","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,sFAAsF;AACtF,eAAO,MAAM,iBAAiB,QAAQ,CAAC;AAEvC;;;;GAIG;AACH,qBACa,wBAAyB,YAAW,aAAa;IACpD,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAQtD;IACK,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhD;IAED,gGAAgG;IAChG,UAAgB,SAAS,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiB1E;CAEJ"}
|
|
@@ -6,9 +6,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.DefaultBackOffPolicyImpl = void 0;
|
|
9
|
+
exports.DefaultBackOffPolicyImpl = exports.DEFAULT_MAX_DELAY = void 0;
|
|
10
10
|
const core_1 = require("@celljs/core");
|
|
11
11
|
const back_off_protocol_1 = require("./back-off-protocol");
|
|
12
|
+
/** The cap of exponential back off when `maxDelay` is not set, as in Spring Retry. */
|
|
13
|
+
exports.DEFAULT_MAX_DELAY = 30000;
|
|
14
|
+
/**
|
|
15
|
+
* Waits between attempts: `delay` (default 100 ms) every time; with `multiplier`, a delay that grows by
|
|
16
|
+
* that factor each time (randomly between the previous one and that with `random`), at most `maxDelay`
|
|
17
|
+
* (default 30 s); with `maxDelay` and no multiplier, a random delay between `delay` and `maxDelay`.
|
|
18
|
+
*/
|
|
12
19
|
let DefaultBackOffPolicyImpl = class DefaultBackOffPolicyImpl {
|
|
13
20
|
async start(ctx) {
|
|
14
21
|
const { backOffOptions } = ctx;
|
|
@@ -20,33 +27,32 @@ let DefaultBackOffPolicyImpl = class DefaultBackOffPolicyImpl {
|
|
|
20
27
|
};
|
|
21
28
|
}
|
|
22
29
|
async backOff(ctx) {
|
|
30
|
+
const nextDelay = await this.nextDelay(ctx);
|
|
31
|
+
if (nextDelay === undefined) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
ctx.delay = nextDelay;
|
|
35
|
+
await (0, core_1.timeout)(nextDelay);
|
|
36
|
+
}
|
|
37
|
+
/** How long to wait before the next attempt; `undefined` (no wait) without back off options. */
|
|
38
|
+
async nextDelay(ctx) {
|
|
23
39
|
var _a;
|
|
24
40
|
const { retryContext, delay } = ctx;
|
|
25
41
|
const { backOffOptions } = retryContext;
|
|
26
42
|
if (!backOffOptions) {
|
|
27
|
-
return;
|
|
43
|
+
return undefined;
|
|
28
44
|
}
|
|
29
|
-
const
|
|
45
|
+
const { multiplier, random } = backOffOptions;
|
|
30
46
|
const maxDelay = typeof backOffOptions.maxDelay === 'function' ? await backOffOptions.maxDelay() : backOffOptions.maxDelay;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
47
|
+
if (multiplier) {
|
|
48
|
+
const grown = random ? Math.floor(delay * (1 + Math.random() * (multiplier - 1))) : delay * multiplier;
|
|
49
|
+
return Math.min(maxDelay || exports.DEFAULT_MAX_DELAY, grown);
|
|
50
|
+
}
|
|
34
51
|
if (maxDelay) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
nextDelay = Math.floor(nextDelay * (1 + Math.random() * (multiplier - 1)));
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
nextDelay = nextDelay * multiplier;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
nextDelay = minDelay + Math.floor(Math.random() * (maxDelay - minDelay));
|
|
45
|
-
}
|
|
46
|
-
nextDelay = Math.min(maxDelay, nextDelay);
|
|
52
|
+
const minDelay = typeof backOffOptions.delay === 'function' ? await backOffOptions.delay() : ((_a = backOffOptions.delay) !== null && _a !== void 0 ? _a : 100);
|
|
53
|
+
return Math.min(maxDelay, minDelay + Math.floor(Math.random() * (maxDelay - minDelay)));
|
|
47
54
|
}
|
|
48
|
-
|
|
49
|
-
await (0, core_1.timeout)(nextDelay);
|
|
55
|
+
return delay;
|
|
50
56
|
}
|
|
51
57
|
};
|
|
52
58
|
exports.DefaultBackOffPolicyImpl = DefaultBackOffPolicyImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"back-off-policy.js","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAkD;AAClD,2DAAoE;
|
|
1
|
+
{"version":3,"file":"back-off-policy.js","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAkD;AAClD,2DAAoE;AAGpE,sFAAsF;AACzE,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAEvC;;;;GAIG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,KAAK,CAAC,KAAK,CAAC,GAAiB;QACzB,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QAC/B,MAAM,KAAK,GAAG,QAAO,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,CAAA,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,CAAC;QACjH,OAAO;YACH,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,GAAG;YACnB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,YAAY,EAAE,GAAG;SACpB,CAAC;IACN,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,GAAmB;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO;QACX,CAAC;QACD,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;QACtB,MAAM,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,gGAAgG;IACtF,KAAK,CAAC,SAAS,CAAC,GAAmB;;QACzC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QACpC,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC;QACxC,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,OAAO,cAAc,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC3H,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC;YACvG,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAA,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,OAAO,cAAc,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAC,cAAc,CAAC,KAAK,mCAAI,GAAG,CAAC,CAAC;YAC3H,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ,CAAA;;mCAvCY,wBAAwB;IADpC,IAAA,gBAAS,EAAC,iCAAa,CAAC;GACZ,wBAAwB,CAuCpC"}
|
|
@@ -157,7 +157,7 @@ const expect = chai.expect;
|
|
|
157
157
|
await backOffPolicy.backOff(ctx);
|
|
158
158
|
expect(ctx.delay).equals(100);
|
|
159
159
|
});
|
|
160
|
-
(0, bun_test_1.it)('should
|
|
160
|
+
(0, bun_test_1.it)('should grow the delay with multiplier when maxDelay is not provided', async () => {
|
|
161
161
|
const ctx = {
|
|
162
162
|
startTime: Date.now(),
|
|
163
163
|
delay: 100,
|
|
@@ -174,7 +174,21 @@ const expect = chai.expect;
|
|
|
174
174
|
}
|
|
175
175
|
};
|
|
176
176
|
await backOffPolicy.backOff(ctx);
|
|
177
|
-
expect(ctx.delay).equals(
|
|
177
|
+
expect(ctx.delay).equals(200);
|
|
178
|
+
});
|
|
179
|
+
(0, bun_test_1.it)('should cap the delay at DEFAULT_MAX_DELAY when maxDelay is not provided', async () => {
|
|
180
|
+
const ctx = {
|
|
181
|
+
startTime: Date.now(),
|
|
182
|
+
delay: 20000,
|
|
183
|
+
retryContext: {
|
|
184
|
+
startTime: Date.now(),
|
|
185
|
+
retryCount: 0,
|
|
186
|
+
retryErrors: [],
|
|
187
|
+
notRetryErrors: [],
|
|
188
|
+
backOffOptions: { delay: 100, multiplier: 2 }
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
expect(await backOffPolicy['nextDelay'](ctx)).equals(back_off_policy_1.DEFAULT_MAX_DELAY);
|
|
178
192
|
});
|
|
179
193
|
(0, bun_test_1.it)('should not update the delay in the BackOffContext if delay is greater than or equal to maxDelay', async () => {
|
|
180
194
|
const ctx = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"back-off-policy.spec.js","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAoD;AACpD,MAAY,IAAI,iCAAa;AAC7B,MAAY,KAAK,kCAAc;AAC/B,
|
|
1
|
+
{"version":3,"file":"back-off-policy.spec.js","sourceRoot":"","sources":["../../../src/common/back-off/back-off-policy.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,10 @@ export declare class RetryOperationsImpl implements RetryOperations {
|
|
|
8
8
|
protected readonly backOffPolicy: BackOffPolicy;
|
|
9
9
|
protected readonly logger: Logger;
|
|
10
10
|
protected initRetryContext(options: RetryOptions<any>): RetryContext;
|
|
11
|
+
/** The value of `recoveryCallback` when there is one; otherwise, or when it fails too, the last error as a RetryError. */
|
|
11
12
|
protected handleRetryExhausted<T>(ctx: RetryContext, recoveryCallback?: RecoveryCallback<T>): Promise<T>;
|
|
12
|
-
|
|
13
|
+
/** A RetryError with `error` as its cause; a RetryError stays as it is. */
|
|
14
|
+
protected wrapError(error?: unknown): RetryError;
|
|
13
15
|
execute<T>(callback: RetryCallback<T>, options?: RetryOptions<T>): Promise<T>;
|
|
14
16
|
}
|
|
15
17
|
//# sourceMappingURL=retry-operations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-operations.d.ts","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,qBACa,mBAAoB,YAAW,eAAe;IAGvD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAanE;IAED,UAAgB,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAS7G;IAED,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"retry-operations.d.ts","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,qBACa,mBAAoB,YAAW,eAAe;IAGvD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAanE;IAED,0HAA0H;IAC1H,UAAgB,oBAAoB,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAS7G;IAED,2EAA2E;IAC3E,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,UAAU,CAM/C;IAEK,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,YAAY,CAAC,CAAC,CAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CA2BtF;CAEJ"}
|
|
@@ -31,19 +31,25 @@ let RetryOperationsImpl = class RetryOperationsImpl {
|
|
|
31
31
|
notRetryErrors: (_b = options.notRetryErrors) !== null && _b !== void 0 ? _b : []
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
+
/** The value of `recoveryCallback` when there is one; otherwise, or when it fails too, the last error as a RetryError. */
|
|
34
35
|
async handleRetryExhausted(ctx, recoveryCallback) {
|
|
35
36
|
if (recoveryCallback && !ctx.noRecovery) {
|
|
36
37
|
try {
|
|
37
|
-
return recoveryCallback(ctx);
|
|
38
|
+
return await recoveryCallback(ctx);
|
|
38
39
|
}
|
|
39
|
-
catch (
|
|
40
|
+
catch (_a) {
|
|
40
41
|
throw this.wrapError(ctx.lastError);
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
44
|
throw this.wrapError(ctx.lastError);
|
|
44
45
|
}
|
|
46
|
+
/** A RetryError with `error` as its cause; a RetryError stays as it is. */
|
|
45
47
|
wrapError(error) {
|
|
46
|
-
|
|
48
|
+
if (error instanceof error_1.RetryError) {
|
|
49
|
+
return error;
|
|
50
|
+
}
|
|
51
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
52
|
+
return new error_1.RetryError(`Error occurred during retry: ${message}`, { cause: error });
|
|
47
53
|
}
|
|
48
54
|
async execute(callback, options = {}) {
|
|
49
55
|
const retryContext = this.initRetryContext(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-operations.js","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA4D;AAC5D,qDAAgH;AAChH,oCAAsC;AACtC,qEAA8D;AAC9D,+DAAwD;AAGjD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAWlB,gBAAgB,CAAC,OAA0B;;QACjD,OAAO;YACH,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,SAAS;YACpB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,WAAW,QAAE,OAAO,CAAC,WAAW,mCAAI,EAAE;YACtC,cAAc,QAAE,OAAO,CAAC,cAAc,mCAAI,EAAE;SAC/C,CAAC;IACN,CAAC;
|
|
1
|
+
{"version":3,"file":"retry-operations.js","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,16 @@ const error_1 = require("../error");
|
|
|
7
7
|
const chai_1 = require("chai");
|
|
8
8
|
const core_1 = require("@celljs/core");
|
|
9
9
|
require("../index");
|
|
10
|
+
/** The error `promise` rejects with; fails when it resolves. */
|
|
11
|
+
async function rejection(promise) {
|
|
12
|
+
try {
|
|
13
|
+
await promise;
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
return error;
|
|
17
|
+
}
|
|
18
|
+
throw new Error('expected a rejection');
|
|
19
|
+
}
|
|
10
20
|
(0, bun_test_1.describe)('RetryOperationsImpl', () => {
|
|
11
21
|
let retryOperations;
|
|
12
22
|
(0, bun_test_1.beforeAll)(() => {
|
|
@@ -68,13 +78,18 @@ require("../index");
|
|
|
68
78
|
(0, chai_1.expect)(result).to.equal(2);
|
|
69
79
|
});
|
|
70
80
|
(0, bun_test_1.it)('should throw the last error if no recovery callback is provided', async () => {
|
|
71
|
-
const error = new Error();
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
81
|
+
const error = new Error('boom');
|
|
82
|
+
const e = await rejection(retryOperations['handleRetryExhausted']({ lastError: error }));
|
|
83
|
+
(0, chai_1.expect)(e).to.be.instanceOf(error_1.RetryError);
|
|
84
|
+
(0, chai_1.expect)(e.cause).to.equal(error);
|
|
85
|
+
});
|
|
86
|
+
(0, bun_test_1.it)('should throw the last error when the recovery callback rejects', async () => {
|
|
87
|
+
const error = new Error('boom');
|
|
88
|
+
const e = await rejection(retryOperations['handleRetryExhausted']({ lastError: error }, async () => {
|
|
89
|
+
throw new Error('recovery failed');
|
|
90
|
+
}));
|
|
91
|
+
(0, chai_1.expect)(e).to.be.instanceOf(error_1.RetryError);
|
|
92
|
+
(0, chai_1.expect)(e.cause).to.equal(error);
|
|
78
93
|
});
|
|
79
94
|
});
|
|
80
95
|
(0, bun_test_1.describe)('wrapError', () => {
|
|
@@ -82,6 +97,11 @@ require("../index");
|
|
|
82
97
|
const error = new Error();
|
|
83
98
|
const result = retryOperations['wrapError'](error);
|
|
84
99
|
(0, chai_1.expect)(result).to.be.instanceOf(error_1.RetryError);
|
|
100
|
+
(0, chai_1.expect)(result.cause).to.equal(error);
|
|
101
|
+
});
|
|
102
|
+
(0, bun_test_1.it)('should not wrap a RetryError again', () => {
|
|
103
|
+
const error = new error_1.RetryError('once');
|
|
104
|
+
(0, chai_1.expect)(retryOperations['wrapError'](error)).to.equal(error);
|
|
85
105
|
});
|
|
86
106
|
});
|
|
87
107
|
(0, bun_test_1.describe)('execute', () => {
|
|
@@ -107,34 +127,29 @@ require("../index");
|
|
|
107
127
|
const callback = async () => {
|
|
108
128
|
throw new Error();
|
|
109
129
|
};
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
113
|
-
catch (e) {
|
|
114
|
-
(0, chai_1.expect)(e).to.be.instanceOf(error_1.RetryError);
|
|
115
|
-
}
|
|
130
|
+
const e = await rejection(retryOperations.execute(callback, { maxAttempts: 1 }));
|
|
131
|
+
(0, chai_1.expect)(e).to.be.instanceOf(error_1.RetryError);
|
|
116
132
|
});
|
|
117
133
|
(0, bun_test_1.it)('should handle the retry exhausted case', async () => {
|
|
118
134
|
const callback = async () => {
|
|
119
135
|
throw new Error();
|
|
120
136
|
};
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
}
|
|
124
|
-
catch (e) {
|
|
125
|
-
(0, chai_1.expect)(e).to.equal(2);
|
|
126
|
-
}
|
|
137
|
+
const result = await retryOperations.execute(callback, { maxAttempts: 2, recoveryCallback: async () => 2 });
|
|
138
|
+
(0, chai_1.expect)(result).to.equal(2);
|
|
127
139
|
});
|
|
128
140
|
(0, bun_test_1.it)('should handle the retry exhausted case with no recovery callback', async () => {
|
|
129
141
|
const callback = async () => {
|
|
130
|
-
throw new Error();
|
|
142
|
+
throw new Error('last');
|
|
131
143
|
};
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
144
|
+
let attempts = 0;
|
|
145
|
+
const e = await rejection(retryOperations.execute(async () => {
|
|
146
|
+
attempts++;
|
|
147
|
+
return callback();
|
|
148
|
+
}, { maxAttempts: 2 }));
|
|
149
|
+
(0, chai_1.expect)(e).to.be.instanceOf(error_1.RetryError);
|
|
150
|
+
(0, chai_1.expect)(e.message).to.equal('Error occurred during retry: last');
|
|
151
|
+
// maxAttempts counts the retries after the first attempt.
|
|
152
|
+
(0, chai_1.expect)(attempts).to.equal(3);
|
|
138
153
|
});
|
|
139
154
|
});
|
|
140
155
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-operations.spec.js","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"retry-operations.spec.js","sourceRoot":"","sources":["../../../src/common/retry/retry-operations.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/retry",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -22,8 +22,7 @@
|
|
|
22
22
|
"files": [
|
|
23
23
|
"lib",
|
|
24
24
|
"esm",
|
|
25
|
-
"src"
|
|
26
|
-
"cell.yml"
|
|
25
|
+
"src"
|
|
27
26
|
],
|
|
28
27
|
"scripts": {
|
|
29
28
|
"build": "tsc -b && bun ../../scripts/build-esm.ts",
|
|
@@ -32,7 +31,7 @@
|
|
|
32
31
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
33
32
|
},
|
|
34
33
|
"dependencies": {
|
|
35
|
-
"@celljs/core": "4.
|
|
34
|
+
"@celljs/core": "4.4.1"
|
|
36
35
|
},
|
|
37
36
|
"publishConfig": {
|
|
38
37
|
"access": "public"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { describe, it, beforeEach } from 'bun:test';
|
|
2
2
|
import * as chai from 'chai';
|
|
3
3
|
import * as sinon from 'sinon';
|
|
4
|
-
import { DefaultBackOffPolicyImpl } from './back-off-policy';
|
|
4
|
+
import { DefaultBackOffPolicyImpl, DEFAULT_MAX_DELAY } from './back-off-policy';
|
|
5
5
|
import { RetryContext } from '../retry';
|
|
6
6
|
import { BackOffContext } from './back-off-protocol';
|
|
7
7
|
|
|
@@ -149,7 +149,7 @@ describe('DefaultBackOffPolicyImpl', () => {
|
|
|
149
149
|
expect(ctx.delay).equals(100);
|
|
150
150
|
});
|
|
151
151
|
|
|
152
|
-
it('should
|
|
152
|
+
it('should grow the delay with multiplier when maxDelay is not provided', async () => {
|
|
153
153
|
const ctx: BackOffContext = {
|
|
154
154
|
startTime: Date.now(),
|
|
155
155
|
delay: 100,
|
|
@@ -168,7 +168,22 @@ describe('DefaultBackOffPolicyImpl', () => {
|
|
|
168
168
|
|
|
169
169
|
await backOffPolicy.backOff(ctx);
|
|
170
170
|
|
|
171
|
-
expect(ctx.delay).equals(
|
|
171
|
+
expect(ctx.delay).equals(200);
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
it('should cap the delay at DEFAULT_MAX_DELAY when maxDelay is not provided', async () => {
|
|
175
|
+
const ctx: BackOffContext = {
|
|
176
|
+
startTime: Date.now(),
|
|
177
|
+
delay: 20000,
|
|
178
|
+
retryContext: {
|
|
179
|
+
startTime: Date.now(),
|
|
180
|
+
retryCount: 0,
|
|
181
|
+
retryErrors: [],
|
|
182
|
+
notRetryErrors: [],
|
|
183
|
+
backOffOptions: { delay: 100, multiplier: 2 }
|
|
184
|
+
}
|
|
185
|
+
};
|
|
186
|
+
expect(await backOffPolicy['nextDelay'](ctx)).equals(DEFAULT_MAX_DELAY);
|
|
172
187
|
});
|
|
173
188
|
|
|
174
189
|
it('should not update the delay in the BackOffContext if delay is greater than or equal to maxDelay', async () => {
|
|
@@ -2,6 +2,14 @@ import { Component, timeout } from '@celljs/core';
|
|
|
2
2
|
import { BackOffContext, BackOffPolicy } from './back-off-protocol';
|
|
3
3
|
import { RetryContext } from '../retry';
|
|
4
4
|
|
|
5
|
+
/** The cap of exponential back off when `maxDelay` is not set, as in Spring Retry. */
|
|
6
|
+
export const DEFAULT_MAX_DELAY = 30000;
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Waits between attempts: `delay` (default 100 ms) every time; with `multiplier`, a delay that grows by
|
|
10
|
+
* that factor each time (randomly between the previous one and that with `random`), at most `maxDelay`
|
|
11
|
+
* (default 30 s); with `maxDelay` and no multiplier, a random delay between `delay` and `maxDelay`.
|
|
12
|
+
*/
|
|
5
13
|
@Component(BackOffPolicy)
|
|
6
14
|
export class DefaultBackOffPolicyImpl implements BackOffPolicy {
|
|
7
15
|
async start(ctx: RetryContext): Promise<BackOffContext> {
|
|
@@ -14,30 +22,32 @@ export class DefaultBackOffPolicyImpl implements BackOffPolicy {
|
|
|
14
22
|
};
|
|
15
23
|
}
|
|
16
24
|
async backOff(ctx: BackOffContext): Promise<void> {
|
|
25
|
+
const nextDelay = await this.nextDelay(ctx);
|
|
26
|
+
if (nextDelay === undefined) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
ctx.delay = nextDelay;
|
|
30
|
+
await timeout(nextDelay);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** How long to wait before the next attempt; `undefined` (no wait) without back off options. */
|
|
34
|
+
protected async nextDelay(ctx: BackOffContext): Promise<number | undefined> {
|
|
17
35
|
const { retryContext, delay } = ctx;
|
|
18
36
|
const { backOffOptions } = retryContext;
|
|
19
37
|
if (!backOffOptions) {
|
|
20
|
-
return;
|
|
38
|
+
return undefined;
|
|
21
39
|
}
|
|
22
|
-
const
|
|
40
|
+
const { multiplier, random } = backOffOptions;
|
|
23
41
|
const maxDelay = typeof backOffOptions.maxDelay === 'function' ? await backOffOptions.maxDelay() : backOffOptions.maxDelay;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
42
|
+
if (multiplier) {
|
|
43
|
+
const grown = random ? Math.floor(delay * (1 + Math.random() * (multiplier - 1))) : delay * multiplier;
|
|
44
|
+
return Math.min(maxDelay || DEFAULT_MAX_DELAY, grown);
|
|
45
|
+
}
|
|
27
46
|
if (maxDelay) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
nextDelay = Math.floor(nextDelay * (1 + Math.random() * (multiplier - 1)));
|
|
31
|
-
} else {
|
|
32
|
-
nextDelay = nextDelay * multiplier;
|
|
33
|
-
}
|
|
34
|
-
} else {
|
|
35
|
-
nextDelay = minDelay + Math.floor(Math.random() * (maxDelay - minDelay));
|
|
36
|
-
}
|
|
37
|
-
nextDelay = Math.min(maxDelay, nextDelay);
|
|
47
|
+
const minDelay = typeof backOffOptions.delay === 'function' ? await backOffOptions.delay() : (backOffOptions.delay ?? 100);
|
|
48
|
+
return Math.min(maxDelay, minDelay + Math.floor(Math.random() * (maxDelay - minDelay)));
|
|
38
49
|
}
|
|
39
|
-
|
|
40
|
-
await timeout(nextDelay);
|
|
50
|
+
return delay;
|
|
41
51
|
}
|
|
42
52
|
|
|
43
53
|
}
|
|
@@ -7,6 +7,16 @@ import { expect } from 'chai';
|
|
|
7
7
|
import { autoBind, Container, ContainerProvider, ContainerUtil } from '@celljs/core';
|
|
8
8
|
import '../index';
|
|
9
9
|
|
|
10
|
+
/** The error `promise` rejects with; fails when it resolves. */
|
|
11
|
+
async function rejection(promise: Promise<unknown>): Promise<any> {
|
|
12
|
+
try {
|
|
13
|
+
await promise;
|
|
14
|
+
} catch (error) {
|
|
15
|
+
return error;
|
|
16
|
+
}
|
|
17
|
+
throw new Error('expected a rejection');
|
|
18
|
+
}
|
|
19
|
+
|
|
10
20
|
describe('RetryOperationsImpl', () => {
|
|
11
21
|
let retryOperations: RetryOperationsImpl;
|
|
12
22
|
|
|
@@ -80,12 +90,19 @@ describe('RetryOperationsImpl', () => {
|
|
|
80
90
|
});
|
|
81
91
|
|
|
82
92
|
it('should throw the last error if no recovery callback is provided', async () => {
|
|
83
|
-
const error = new Error();
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
93
|
+
const error = new Error('boom');
|
|
94
|
+
const e = await rejection(retryOperations['handleRetryExhausted']({ lastError: error } as RetryContext));
|
|
95
|
+
expect(e).to.be.instanceOf(RetryError);
|
|
96
|
+
expect(e.cause).to.equal(error);
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
it('should throw the last error when the recovery callback rejects', async () => {
|
|
100
|
+
const error = new Error('boom');
|
|
101
|
+
const e = await rejection(retryOperations['handleRetryExhausted']({ lastError: error } as RetryContext, async () => {
|
|
102
|
+
throw new Error('recovery failed');
|
|
103
|
+
}));
|
|
104
|
+
expect(e).to.be.instanceOf(RetryError);
|
|
105
|
+
expect(e.cause).to.equal(error);
|
|
89
106
|
});
|
|
90
107
|
});
|
|
91
108
|
|
|
@@ -94,6 +111,12 @@ describe('RetryOperationsImpl', () => {
|
|
|
94
111
|
const error = new Error();
|
|
95
112
|
const result = retryOperations['wrapError'](error);
|
|
96
113
|
expect(result).to.be.instanceOf(RetryError);
|
|
114
|
+
expect(result.cause).to.equal(error);
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it('should not wrap a RetryError again', () => {
|
|
118
|
+
const error = new RetryError('once');
|
|
119
|
+
expect(retryOperations['wrapError'](error)).to.equal(error);
|
|
97
120
|
});
|
|
98
121
|
});
|
|
99
122
|
|
|
@@ -122,33 +145,31 @@ describe('RetryOperationsImpl', () => {
|
|
|
122
145
|
const callback = async () => {
|
|
123
146
|
throw new Error();
|
|
124
147
|
};
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
} catch (e) {
|
|
128
|
-
expect(e).to.be.instanceOf(RetryError);
|
|
129
|
-
}
|
|
148
|
+
const e = await rejection(retryOperations.execute(callback, { maxAttempts: 1 }));
|
|
149
|
+
expect(e).to.be.instanceOf(RetryError);
|
|
130
150
|
});
|
|
131
151
|
|
|
132
152
|
it('should handle the retry exhausted case', async () => {
|
|
133
153
|
const callback = async () => {
|
|
134
154
|
throw new Error();
|
|
135
155
|
};
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
} catch (e) {
|
|
139
|
-
expect(e).to.equal(2);
|
|
140
|
-
}
|
|
156
|
+
const result = await retryOperations.execute(callback, { maxAttempts: 2, recoveryCallback: async () => 2 });
|
|
157
|
+
expect(result).to.equal(2);
|
|
141
158
|
});
|
|
142
159
|
|
|
143
160
|
it('should handle the retry exhausted case with no recovery callback', async () => {
|
|
144
161
|
const callback = async () => {
|
|
145
|
-
throw new Error();
|
|
162
|
+
throw new Error('last');
|
|
146
163
|
};
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
}
|
|
164
|
+
let attempts = 0;
|
|
165
|
+
const e = await rejection(retryOperations.execute(async () => {
|
|
166
|
+
attempts++;
|
|
167
|
+
return callback();
|
|
168
|
+
}, { maxAttempts: 2 }));
|
|
169
|
+
expect(e).to.be.instanceOf(RetryError);
|
|
170
|
+
expect(e.message).to.equal('Error occurred during retry: last');
|
|
171
|
+
// maxAttempts counts the retries after the first attempt.
|
|
172
|
+
expect(attempts).to.equal(3);
|
|
152
173
|
});
|
|
153
174
|
});
|
|
154
175
|
|
|
@@ -31,19 +31,25 @@ export class RetryOperationsImpl implements RetryOperations {
|
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
/** The value of `recoveryCallback` when there is one; otherwise, or when it fails too, the last error as a RetryError. */
|
|
34
35
|
protected async handleRetryExhausted<T>(ctx: RetryContext, recoveryCallback?: RecoveryCallback<T>): Promise<T> {
|
|
35
36
|
if (recoveryCallback && !ctx.noRecovery) {
|
|
36
37
|
try {
|
|
37
|
-
return recoveryCallback(ctx);
|
|
38
|
-
} catch
|
|
38
|
+
return await recoveryCallback(ctx);
|
|
39
|
+
} catch {
|
|
39
40
|
throw this.wrapError(ctx.lastError);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
throw this.wrapError(ctx.lastError);
|
|
43
44
|
}
|
|
44
45
|
|
|
45
|
-
|
|
46
|
-
|
|
46
|
+
/** A RetryError with `error` as its cause; a RetryError stays as it is. */
|
|
47
|
+
protected wrapError(error?: unknown): RetryError {
|
|
48
|
+
if (error instanceof RetryError) {
|
|
49
|
+
return error;
|
|
50
|
+
}
|
|
51
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
52
|
+
return new RetryError(`Error occurred during retry: ${message}`, { cause: error });
|
|
47
53
|
}
|
|
48
54
|
|
|
49
55
|
async execute<T>(callback: RetryCallback<T>, options: RetryOptions<T> = {}): Promise<T> {
|
|
@@ -55,7 +61,7 @@ export class RetryOperationsImpl implements RetryOperations {
|
|
|
55
61
|
try {
|
|
56
62
|
return await callback(retryContext);
|
|
57
63
|
} catch (error) {
|
|
58
|
-
retryContext.lastError = error;
|
|
64
|
+
retryContext.lastError = error as Error;
|
|
59
65
|
retryContext.retryCount++;
|
|
60
66
|
if (await retryPolicy.canRetry(retryContext) && !retryContext.exhaustedOnly) {
|
|
61
67
|
await this.backOffPolicy.backOff(backOffContext);
|
package/cell.yml
DELETED
|
File without changes
|