dynamic-throttled-queue 2.3.0-rc.120625e → 2.3.0-rc.494c954
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 +1 -1
- package/dist/adaptive-rate.d.ts +13 -15
- package/dist/adaptive-rate.js +65 -24
- package/dist/adaptive-rate.js.map +1 -1
- package/dist/dynamic-throttled-queue.d.ts +2 -8
- package/dist/dynamic-throttled-queue.js +5 -19
- package/dist/dynamic-throttled-queue.js.map +1 -1
- package/dist/retry-policy.d.ts +25 -0
- package/dist/retry-policy.js +73 -0
- package/dist/retry-policy.js.map +1 -0
- package/dist/scheduler.d.ts +2 -1
- package/dist/scheduler.js +20 -62
- package/dist/scheduler.js.map +1 -1
- package/package.json +8 -10
- package/dist/retry-backoff.d.ts +0 -2
- package/dist/retry-backoff.js +0 -31
- package/dist/retry-backoff.js.map +0 -1
package/README.md
CHANGED
|
@@ -62,7 +62,7 @@ Set `maxQueueSize` to bound accepted work. Capacity is reserved from enqueue thr
|
|
|
62
62
|
| `retryClassifier` | `RetryClassifier` | — | Decides whether a failed callback outcome is eligible for another attempt |
|
|
63
63
|
| `onRateChange` | `(rate: number) => void` | — | Called when the current rate changes |
|
|
64
64
|
|
|
65
|
-
`retry`, `errors_per_interval`, `compact_threshold`, and `maxQueueSize` reject fractional and non-finite values. `errors_per_interval` must be at least `1`; `retry` and `compact_threshold` may be `0`. `retryBackoff.baseDelay` and optional `maxDelay` are finite non-negative millisecond values (fractional values are accepted); optional `jitter` is finite from `0` through `1`.
|
|
65
|
+
`retry`, `errors_per_interval`, `compact_threshold`, and `maxQueueSize` reject fractional and non-finite values. `errors_per_interval` must be at least `1`; `retry` and `compact_threshold` may be `0`. `retryBackoff.strategy` must be `fixed`, `linear`, or `exponential`. `retryBackoff.baseDelay` and optional `maxDelay` are finite non-negative millisecond values (fractional values are accepted); optional `jitter` is finite from `0` through `1`.
|
|
66
66
|
|
|
67
67
|
`retryBackoff` is `{ strategy: "fixed" | "linear" | "exponential"; baseDelay: number; maxDelay?: number; jitter?: number; random?: () => number }`. The first retry has index `1`: fixed uses `baseDelay`, linear uses `baseDelay × retryIndex`, and exponential uses `baseDelay × 2^(retryIndex - 1)`. The calculated delay is capped at `maxDelay`, when supplied, then optional symmetric percentage jitter is applied and capped again. `random` makes jitter deterministic for tests; a thrown, non-finite, or out-of-range result safely falls back to no jitter. Retry backoff begins when the failed attempt settles and is independent of adaptive-rate `back_off`.
|
|
68
68
|
|
package/dist/adaptive-rate.d.ts
CHANGED
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
import type { AdjustmentTiming, RateFailureOutcome, RateOutcomeClassifier, RateStrategy } from "./dynamic-throttled-queue.js";
|
|
2
|
-
/**
|
|
3
|
-
* Whether callbacks may start. `open` allows paced starts, `held` blocks starts until the module
|
|
4
|
-
* reopens them, and `idle` means the module is not observing and waits for `start()`.
|
|
5
|
-
*/
|
|
6
|
-
export type Pacing = "idle" | "open" | "held";
|
|
7
2
|
/** Reports how one started callback settled: `undefined` for success, otherwise the failure. */
|
|
8
3
|
export type SettlementReporter = (outcome: RateFailureOutcome | undefined) => void;
|
|
9
4
|
export type AdaptiveRateOptions = {
|
|
10
5
|
min_rpi: number;
|
|
11
6
|
max_rpi: number;
|
|
12
7
|
interval: number;
|
|
8
|
+
/** Makes one start due every `interval / rate` ms instead of `rate` starts once per interval. */
|
|
9
|
+
evenly_spaced: boolean;
|
|
13
10
|
errors_per_interval: number;
|
|
14
11
|
back_off: boolean;
|
|
15
12
|
adjustmentTiming: AdjustmentTiming;
|
|
@@ -20,12 +17,12 @@ export type AdaptiveRateOptions = {
|
|
|
20
17
|
export type AdaptiveRateHost = {
|
|
21
18
|
/** Whether accepted work is waiting to start. */
|
|
22
19
|
hasPendingWork: () => boolean;
|
|
23
|
-
/**
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
20
|
+
/**
|
|
21
|
+
* Starts are due: start up to `limit` queued callbacks as concurrency allows, calling `started()` for each.
|
|
22
|
+
* Returns whether a slot is still free. When none is, no further start becomes due until `start()`
|
|
23
|
+
* reports a freed slot.
|
|
24
|
+
*/
|
|
25
|
+
startsDue: (limit: number) => boolean;
|
|
29
26
|
/** The rate strategy failed; the host must call `stop()`. The error is rethrown after this returns. */
|
|
30
27
|
failed: (error: unknown) => void;
|
|
31
28
|
};
|
|
@@ -33,11 +30,12 @@ export type AdaptiveRate = {
|
|
|
33
30
|
readonly rate: number;
|
|
34
31
|
readonly rateIncreases: number;
|
|
35
32
|
readonly rateDecreases: number;
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
/**
|
|
34
|
+
* Ends a pause, then begins observing if idle and work is pending. While starts are open and no start
|
|
35
|
+
* is scheduled (concurrency was full), makes starts due now once a spacing has passed since the last
|
|
36
|
+
* start, or schedules them for when it has. During `startsDue`, the batch's own follow-up covers it.
|
|
37
|
+
*/
|
|
38
38
|
start: () => void;
|
|
39
|
-
/** Reports that every queued callback has started. */
|
|
40
|
-
drained: () => void;
|
|
41
39
|
/** Ends observation. Settled timing discards its in-progress window. */
|
|
42
40
|
stop: () => void;
|
|
43
41
|
/** Stops and discards the observation. Settlements are ignored until `start()` or `stop()`. */
|
package/dist/adaptive-rate.js
CHANGED
|
@@ -49,6 +49,7 @@ function settledTiming(context) {
|
|
|
49
49
|
let timer;
|
|
50
50
|
let window = 0;
|
|
51
51
|
let collecting = false;
|
|
52
|
+
let starts = 0;
|
|
52
53
|
let outstanding = 0;
|
|
53
54
|
function open() {
|
|
54
55
|
timer = undefined;
|
|
@@ -58,12 +59,18 @@ function settledTiming(context) {
|
|
|
58
59
|
}
|
|
59
60
|
window++;
|
|
60
61
|
collecting = true;
|
|
62
|
+
starts = 0;
|
|
61
63
|
outstanding = 0;
|
|
62
64
|
context.resume();
|
|
63
65
|
timer = setTimeout(close, context.interval);
|
|
64
66
|
}
|
|
65
67
|
function close() {
|
|
66
68
|
timer = undefined;
|
|
69
|
+
// An empty collection interval makes no decision; collect again, or go idle when nothing is pending.
|
|
70
|
+
if (starts === 0) {
|
|
71
|
+
open();
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
67
74
|
collecting = false;
|
|
68
75
|
context.hold();
|
|
69
76
|
if (outstanding === 0)
|
|
@@ -75,22 +82,17 @@ function settledTiming(context) {
|
|
|
75
82
|
if (current !== window)
|
|
76
83
|
return;
|
|
77
84
|
if (hold)
|
|
78
|
-
timer = setTimeout(
|
|
85
|
+
timer = setTimeout(open, context.interval);
|
|
79
86
|
else
|
|
80
87
|
open();
|
|
81
88
|
}
|
|
82
|
-
function endBackoff() {
|
|
83
|
-
timer = undefined;
|
|
84
|
-
context.endBackoff();
|
|
85
|
-
if (context.hasPendingWork())
|
|
86
|
-
open();
|
|
87
|
-
}
|
|
88
89
|
return {
|
|
89
90
|
start: open,
|
|
90
91
|
started() {
|
|
91
92
|
if (!collecting)
|
|
92
93
|
return ignoreSettlement;
|
|
93
94
|
const startedIn = window;
|
|
95
|
+
starts++;
|
|
94
96
|
outstanding++;
|
|
95
97
|
return outcome => {
|
|
96
98
|
if (startedIn !== window)
|
|
@@ -112,7 +114,7 @@ function settledTiming(context) {
|
|
|
112
114
|
};
|
|
113
115
|
}
|
|
114
116
|
export function createAdaptiveRate(options, host) {
|
|
115
|
-
const { min_rpi, max_rpi, errors_per_interval, back_off, rateStrategy, rateOutcomeClassifier, onRateChange } = options;
|
|
117
|
+
const { min_rpi, max_rpi, interval, evenly_spaced, errors_per_interval, back_off, rateStrategy, rateOutcomeClassifier, onRateChange, } = options;
|
|
116
118
|
let rate = Math.ceil((max_rpi + min_rpi) / 2);
|
|
117
119
|
let rateIncreases = 0;
|
|
118
120
|
let rateDecreases = 0;
|
|
@@ -120,6 +122,10 @@ export function createAdaptiveRate(options, host) {
|
|
|
120
122
|
let wasBackedOff = false;
|
|
121
123
|
let ignoringSettlements = false;
|
|
122
124
|
let pacing = "idle";
|
|
125
|
+
let lastStart = 0;
|
|
126
|
+
let startTimer;
|
|
127
|
+
let dispatching = false;
|
|
128
|
+
let batchStarts = 0;
|
|
123
129
|
function isRateReducing(outcome) {
|
|
124
130
|
try {
|
|
125
131
|
return rateOutcomeClassifier?.(outcome) ?? true;
|
|
@@ -162,8 +168,41 @@ export function createAdaptiveRate(options, host) {
|
|
|
162
168
|
applyRate(Math.min(max_rpi, Math.max(min_rpi, decision.nextRate)));
|
|
163
169
|
return hold;
|
|
164
170
|
}
|
|
171
|
+
function spacing() {
|
|
172
|
+
return evenly_spaced ? interval / rate : interval;
|
|
173
|
+
}
|
|
174
|
+
function scheduleStart(delay) {
|
|
175
|
+
clearTimeout(startTimer);
|
|
176
|
+
startTimer = setTimeout(startDue, delay);
|
|
177
|
+
}
|
|
178
|
+
function cancelStart() {
|
|
179
|
+
clearTimeout(startTimer);
|
|
180
|
+
startTimer = undefined;
|
|
181
|
+
}
|
|
182
|
+
/** Makes a batch of starts due once one spacing has passed since the last start. */
|
|
183
|
+
function startDue() {
|
|
184
|
+
startTimer = undefined;
|
|
185
|
+
const wait = lastStart + spacing() - Date.now();
|
|
186
|
+
if (wait > 0) {
|
|
187
|
+
scheduleStart(wait);
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
dispatching = true;
|
|
191
|
+
batchStarts = 0;
|
|
192
|
+
let slotFree;
|
|
193
|
+
try {
|
|
194
|
+
slotFree = host.startsDue(evenly_spaced ? 1 : rate);
|
|
195
|
+
}
|
|
196
|
+
finally {
|
|
197
|
+
dispatching = false;
|
|
198
|
+
}
|
|
199
|
+
if (!host.hasPendingWork())
|
|
200
|
+
timing.drained();
|
|
201
|
+
if (pacing === "open" && slotFree)
|
|
202
|
+
scheduleStart(spacing());
|
|
203
|
+
}
|
|
165
204
|
const context = {
|
|
166
|
-
interval
|
|
205
|
+
interval,
|
|
167
206
|
get pacing() {
|
|
168
207
|
return pacing;
|
|
169
208
|
},
|
|
@@ -175,22 +214,23 @@ export function createAdaptiveRate(options, host) {
|
|
|
175
214
|
decide,
|
|
176
215
|
resume() {
|
|
177
216
|
pacing = "open";
|
|
178
|
-
|
|
217
|
+
lastStart = Date.now();
|
|
218
|
+
scheduleStart(spacing());
|
|
179
219
|
},
|
|
180
220
|
hold(deferBy) {
|
|
181
221
|
pacing = "held";
|
|
182
|
-
|
|
222
|
+
if (deferBy === undefined)
|
|
223
|
+
cancelStart();
|
|
224
|
+
else
|
|
225
|
+
scheduleStart(spacing() + deferBy);
|
|
183
226
|
},
|
|
184
227
|
reopen() {
|
|
185
228
|
pacing = "open";
|
|
186
229
|
},
|
|
187
|
-
endBackoff() {
|
|
188
|
-
wasBackedOff = false;
|
|
189
|
-
},
|
|
190
230
|
idle() {
|
|
191
231
|
wasBackedOff = false;
|
|
192
232
|
pacing = "idle";
|
|
193
|
-
|
|
233
|
+
cancelStart();
|
|
194
234
|
},
|
|
195
235
|
};
|
|
196
236
|
const timing = options.adjustmentTiming === "settled" ? settledTiming(context) : intervalTiming(context);
|
|
@@ -204,17 +244,14 @@ export function createAdaptiveRate(options, host) {
|
|
|
204
244
|
get rateDecreases() {
|
|
205
245
|
return rateDecreases;
|
|
206
246
|
},
|
|
207
|
-
get pacing() {
|
|
208
|
-
return pacing;
|
|
209
|
-
},
|
|
210
247
|
start() {
|
|
211
248
|
ignoringSettlements = false;
|
|
212
|
-
if (
|
|
249
|
+
if (!host.hasPendingWork())
|
|
213
250
|
return;
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
251
|
+
if (pacing === "idle")
|
|
252
|
+
timing.start();
|
|
253
|
+
else if (pacing === "open" && startTimer === undefined && !dispatching)
|
|
254
|
+
startDue();
|
|
218
255
|
},
|
|
219
256
|
stop() {
|
|
220
257
|
ignoringSettlements = false;
|
|
@@ -225,7 +262,11 @@ export function createAdaptiveRate(options, host) {
|
|
|
225
262
|
errorCount = 0;
|
|
226
263
|
ignoringSettlements = true;
|
|
227
264
|
},
|
|
228
|
-
started
|
|
265
|
+
started() {
|
|
266
|
+
if (dispatching && batchStarts++ === 0)
|
|
267
|
+
lastStart = Date.now();
|
|
268
|
+
return timing.started();
|
|
269
|
+
},
|
|
229
270
|
};
|
|
230
271
|
}
|
|
231
272
|
//# sourceMappingURL=adaptive-rate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adaptive-rate.js","sourceRoot":"","sources":["../src/adaptive-rate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adaptive-rate.js","sourceRoot":"","sources":["../src/adaptive-rate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
baseDelay: number;
|
|
4
|
-
maxDelay?: number;
|
|
5
|
-
jitter?: number;
|
|
6
|
-
random?: () => number;
|
|
7
|
-
};
|
|
1
|
+
import type { RetryBackoff, RetryClassifier } from "./retry-policy.js";
|
|
2
|
+
export type { RetryBackoff, RetryClassifier } from "./retry-policy.js";
|
|
8
3
|
export type RateStrategyObservation = Readonly<{
|
|
9
4
|
currentRate: number;
|
|
10
5
|
minRate: number;
|
|
@@ -33,7 +28,6 @@ export type RateFailureOutcome = Readonly<{
|
|
|
33
28
|
error: unknown;
|
|
34
29
|
}>;
|
|
35
30
|
export type RateOutcomeClassifier = (outcome: RateFailureOutcome) => boolean;
|
|
36
|
-
export type RetryClassifier = (outcome: RateFailureOutcome, attempt: number) => boolean;
|
|
37
31
|
export type AdjustmentTiming = "interval" | "settled";
|
|
38
32
|
export declare const linear: RateStrategy;
|
|
39
33
|
export declare function aimd({ increaseBy, decreaseFactor }?: AimdOptions): RateStrategy;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createRetryPolicy } from "./retry-policy.js";
|
|
1
2
|
import { createScheduler } from "./scheduler.js";
|
|
2
3
|
const adjustmentTimings = new Set(["interval", "settled"]);
|
|
3
4
|
export const linear = ({ minRate, maxRate, currentRate, errorCount, errorThreshold, hasPendingWork, wasBackedOff, }) => {
|
|
@@ -26,21 +27,8 @@ export function aimd({ increaseBy = 1, decreaseFactor = 0.5 } = {}) {
|
|
|
26
27
|
return { nextRate: currentRate, shouldBackOff: false };
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
|
-
function validateRetryBackoff(retryBackoff) {
|
|
30
|
-
if (retryBackoff === undefined)
|
|
31
|
-
return;
|
|
32
|
-
if (!Number.isFinite(retryBackoff.baseDelay) || retryBackoff.baseDelay < 0) {
|
|
33
|
-
throw new Error("retryBackoff.baseDelay must be a finite non-negative number");
|
|
34
|
-
}
|
|
35
|
-
if (retryBackoff.maxDelay !== undefined && (!Number.isFinite(retryBackoff.maxDelay) || retryBackoff.maxDelay < 0)) {
|
|
36
|
-
throw new Error("retryBackoff.maxDelay must be a finite non-negative number");
|
|
37
|
-
}
|
|
38
|
-
if (retryBackoff.jitter !== undefined && (!Number.isFinite(retryBackoff.jitter) || retryBackoff.jitter < 0 || retryBackoff.jitter > 1)) {
|
|
39
|
-
throw new Error("retryBackoff.jitter must be a finite number from 0 through 1");
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
30
|
export function createThrottledQueue(options) {
|
|
43
|
-
const { min_rpi, interval, max_rpi = min_rpi, concurrency, maxQueueSize,
|
|
31
|
+
const { min_rpi, interval, max_rpi = min_rpi, concurrency, maxQueueSize, compact_threshold = 512 } = options;
|
|
44
32
|
const errors_per_interval = options.errors_per_interval ?? 5;
|
|
45
33
|
if (!Number.isInteger(min_rpi) || min_rpi < 1) {
|
|
46
34
|
throw new Error("min_rpi must be a positive integer");
|
|
@@ -60,26 +48,24 @@ export function createThrottledQueue(options) {
|
|
|
60
48
|
if (!Number.isInteger(errors_per_interval) || errors_per_interval < 1) {
|
|
61
49
|
throw new Error("errors_per_interval must be a positive integer");
|
|
62
50
|
}
|
|
63
|
-
if (!Number.isInteger(retry) || retry < 0) {
|
|
64
|
-
throw new Error("retry must be a non-negative integer");
|
|
65
|
-
}
|
|
66
51
|
if (!Number.isInteger(compact_threshold) || compact_threshold < 0) {
|
|
67
52
|
throw new Error("compact_threshold must be a non-negative integer");
|
|
68
53
|
}
|
|
69
54
|
if (options.adjustmentTiming !== undefined && !adjustmentTimings.has(options.adjustmentTiming)) {
|
|
70
55
|
throw new Error("adjustmentTiming must be either interval or settled");
|
|
71
56
|
}
|
|
72
|
-
|
|
57
|
+
const retryPolicy = createRetryPolicy(options);
|
|
73
58
|
return createScheduler(options, {
|
|
74
59
|
min_rpi,
|
|
75
60
|
max_rpi,
|
|
76
61
|
interval,
|
|
62
|
+
evenly_spaced: options.evenly_spaced ?? true,
|
|
77
63
|
errors_per_interval,
|
|
78
64
|
back_off: options.back_off ?? false,
|
|
79
65
|
adjustmentTiming: options.adjustmentTiming ?? "interval",
|
|
80
66
|
rateStrategy: options.rateStrategy ?? linear,
|
|
81
67
|
rateOutcomeClassifier: options.rateOutcomeClassifier,
|
|
82
68
|
onRateChange: options.onRateChange,
|
|
83
|
-
});
|
|
69
|
+
}, retryPolicy);
|
|
84
70
|
}
|
|
85
71
|
//# sourceMappingURL=dynamic-throttled-queue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-throttled-queue.js","sourceRoot":"","sources":["../src/dynamic-throttled-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"dynamic-throttled-queue.js","sourceRoot":"","sources":["../src/dynamic-throttled-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { RateFailureOutcome } from "./dynamic-throttled-queue.js";
|
|
2
|
+
export type RetryBackoff = {
|
|
3
|
+
strategy: "fixed" | "linear" | "exponential";
|
|
4
|
+
baseDelay: number;
|
|
5
|
+
maxDelay?: number;
|
|
6
|
+
jitter?: number;
|
|
7
|
+
random?: () => number;
|
|
8
|
+
};
|
|
9
|
+
export type RetryClassifier = (outcome: RateFailureOutcome, attempt: number) => boolean;
|
|
10
|
+
export type RetryPolicyOptions = {
|
|
11
|
+
retry?: number;
|
|
12
|
+
retryBackoff?: RetryBackoff;
|
|
13
|
+
retryClassifier?: RetryClassifier;
|
|
14
|
+
};
|
|
15
|
+
/** How a failed attempt continues: `{}` retries now, `{ delay }` retries after `delay` ms. */
|
|
16
|
+
type RetryDecision = Readonly<{
|
|
17
|
+
delay?: number;
|
|
18
|
+
}>;
|
|
19
|
+
export type RetryPolicy = {
|
|
20
|
+
/** Decides whether failed attempt `attempt` (one-based) gets another attempt. `undefined` drops it. */
|
|
21
|
+
decide: (outcome: RateFailureOutcome, attempt: number) => RetryDecision | undefined;
|
|
22
|
+
};
|
|
23
|
+
/** Validates the retry options, then decides each failed attempt: drop, retry now, or retry after a delay. */
|
|
24
|
+
export declare function createRetryPolicy({ retry, retryBackoff, retryClassifier }: RetryPolicyOptions): RetryPolicy;
|
|
25
|
+
export {};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
const strategies = { fixed: true, linear: true, exponential: true };
|
|
2
|
+
const retryNow = Object.freeze({});
|
|
3
|
+
function validate(retry, retryBackoff) {
|
|
4
|
+
if (!Number.isInteger(retry) || retry < 0) {
|
|
5
|
+
throw new Error("retry must be a non-negative integer");
|
|
6
|
+
}
|
|
7
|
+
if (retryBackoff === undefined)
|
|
8
|
+
return;
|
|
9
|
+
if (!Object.hasOwn(strategies, retryBackoff.strategy)) {
|
|
10
|
+
throw new Error("retryBackoff.strategy must be fixed, linear, or exponential");
|
|
11
|
+
}
|
|
12
|
+
if (!Number.isFinite(retryBackoff.baseDelay) || retryBackoff.baseDelay < 0) {
|
|
13
|
+
throw new Error("retryBackoff.baseDelay must be a finite non-negative number");
|
|
14
|
+
}
|
|
15
|
+
if (retryBackoff.maxDelay !== undefined && (!Number.isFinite(retryBackoff.maxDelay) || retryBackoff.maxDelay < 0)) {
|
|
16
|
+
throw new Error("retryBackoff.maxDelay must be a finite non-negative number");
|
|
17
|
+
}
|
|
18
|
+
if (retryBackoff.jitter !== undefined && (!Number.isFinite(retryBackoff.jitter) || retryBackoff.jitter < 0 || retryBackoff.jitter > 1)) {
|
|
19
|
+
throw new Error("retryBackoff.jitter must be a finite number from 0 through 1");
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
function readRandom(random) {
|
|
23
|
+
try {
|
|
24
|
+
// eslint-disable-next-line sonarjs/pseudo-random -- Default jitter requires a random source.
|
|
25
|
+
const value = random?.() ?? Math.random();
|
|
26
|
+
return Number.isFinite(value) && value >= 0 && value <= 1 ? value : undefined;
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function calculateRetryDelay(policy, retryIndex) {
|
|
33
|
+
let delay;
|
|
34
|
+
switch (policy.strategy) {
|
|
35
|
+
case "linear":
|
|
36
|
+
delay = policy.baseDelay * retryIndex;
|
|
37
|
+
break;
|
|
38
|
+
case "exponential":
|
|
39
|
+
delay = policy.baseDelay * 2 ** (retryIndex - 1);
|
|
40
|
+
break;
|
|
41
|
+
default: delay = policy.baseDelay;
|
|
42
|
+
}
|
|
43
|
+
const cappedDelay = policy.maxDelay === undefined ? delay : Math.min(delay, policy.maxDelay);
|
|
44
|
+
if (policy.jitter === undefined)
|
|
45
|
+
return cappedDelay;
|
|
46
|
+
const random = readRandom(policy.random);
|
|
47
|
+
if (random === undefined)
|
|
48
|
+
return cappedDelay;
|
|
49
|
+
const jitteredDelay = cappedDelay * (1 + (random * 2 - 1) * policy.jitter);
|
|
50
|
+
return policy.maxDelay === undefined ? jitteredDelay : Math.min(jitteredDelay, policy.maxDelay);
|
|
51
|
+
}
|
|
52
|
+
/** Validates the retry options, then decides each failed attempt: drop, retry now, or retry after a delay. */
|
|
53
|
+
export function createRetryPolicy({ retry = 0, retryBackoff, retryClassifier }) {
|
|
54
|
+
validate(retry, retryBackoff);
|
|
55
|
+
function isRetryable(outcome, attempt) {
|
|
56
|
+
if (!retryClassifier)
|
|
57
|
+
return true;
|
|
58
|
+
try {
|
|
59
|
+
return retryClassifier(outcome, attempt) === true;
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return true;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return {
|
|
66
|
+
decide(outcome, attempt) {
|
|
67
|
+
if (attempt > retry || !isRetryable(outcome, attempt))
|
|
68
|
+
return undefined;
|
|
69
|
+
return retryBackoff === undefined ? retryNow : { delay: calculateRetryDelay(retryBackoff, attempt) };
|
|
70
|
+
},
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=retry-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retry-policy.js","sourceRoot":"","sources":["../src/retry-policy.ts"],"names":[],"mappings":"AA0BA,MAAM,UAAU,GAAqD,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AACtH,MAAM,QAAQ,GAAkB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAElD,SAAS,QAAQ,CAAC,KAAa,EAAE,YAAsC;IACrE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO;IACvC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,YAAY,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;QAClH,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAChF,CAAC;IACD,IAAI,YAAY,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QACvI,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IAClF,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,MAAkC;IACpD,IAAI,CAAC;QACH,6FAA6F;QAC7F,MAAM,KAAK,GAAG,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,CAAC;IACD,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAoB,EAAE,UAAkB;IACnE,IAAI,KAAa,CAAC;IAClB,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,QAAQ;YAAE,KAAK,GAAG,MAAM,CAAC,SAAS,GAAG,UAAU,CAAC;YAAC,MAAM;QAC5D,KAAK,aAAa;YAAE,KAAK,GAAG,MAAM,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAAC,MAAM;QAC5E,OAAO,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7F,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IACpD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAC7C,MAAM,aAAa,GAAG,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;AAClG,CAAC;AAED,8GAA8G;AAC9G,MAAM,UAAU,iBAAiB,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,YAAY,EAAE,eAAe,EAAsB;IAChG,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAE9B,SAAS,WAAW,CAAC,OAA2B,EAAE,OAAe;QAC/D,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,CAAC;YACH,OAAO,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;QACpD,CAAC;QACD,MAAM,CAAC;YACL,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,CAAC,OAAO,EAAE,OAAO;YACrB,IAAI,OAAO,GAAG,KAAK,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;gBAAE,OAAO,SAAS,CAAC;YACxE,OAAO,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;QACvG,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/scheduler.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { AdaptiveRateOptions } from "./adaptive-rate.js";
|
|
2
2
|
import type { ThrottleHandle, ThrottleOptions } from "./dynamic-throttled-queue.js";
|
|
3
|
-
|
|
3
|
+
import type { RetryPolicy } from "./retry-policy.js";
|
|
4
|
+
export declare function createScheduler(options: ThrottleOptions, adaptiveRateOptions: AdaptiveRateOptions, retryPolicy: RetryPolicy): ThrottleHandle;
|
package/dist/scheduler.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createAdaptiveRate } from "./adaptive-rate.js";
|
|
2
2
|
import { createPendingWork } from "./pending-work.js";
|
|
3
|
-
import { calculateRetryDelay } from "./retry-backoff.js";
|
|
4
3
|
/** The state each event leads to. An event missing from the current state's row is a no-op. */
|
|
5
4
|
const lifecycleTransitions = {
|
|
6
5
|
running: { pause: "paused", stop: "stopped", abort: "aborted", fail: "failed" },
|
|
@@ -9,10 +8,8 @@ const lifecycleTransitions = {
|
|
|
9
8
|
aborted: {},
|
|
10
9
|
failed: {},
|
|
11
10
|
};
|
|
12
|
-
export function createScheduler(options, adaptiveRateOptions) {
|
|
13
|
-
const {
|
|
14
|
-
let last_called = 0;
|
|
15
|
-
let timeout;
|
|
11
|
+
export function createScheduler(options, adaptiveRateOptions, retryPolicy) {
|
|
12
|
+
const { concurrency, maxQueueSize, compact_threshold = 512, } = options;
|
|
16
13
|
let lifecycle = { state: "running" };
|
|
17
14
|
let cnt_started = 0;
|
|
18
15
|
let cnt_succeeded = 0;
|
|
@@ -23,26 +20,20 @@ export function createScheduler(options, adaptiveRateOptions) {
|
|
|
23
20
|
const work = createPendingWork({ capacity: maxQueueSize ?? Infinity, compactThreshold: compact_threshold }, { retryQueued: start });
|
|
24
21
|
const adaptiveRate = createAdaptiveRate(adaptiveRateOptions, {
|
|
25
22
|
hasPendingWork: () => work.queued > 0,
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
idle() {
|
|
36
|
-
clearTimeout(timeout);
|
|
37
|
-
timeout = undefined;
|
|
23
|
+
startsDue(limit) {
|
|
24
|
+
const batch = Math.min(limit, work.queued);
|
|
25
|
+
for (let started = 0; started < batch && work.active < max_concurrency; started++) {
|
|
26
|
+
const item = work.take();
|
|
27
|
+
if (item === undefined)
|
|
28
|
+
break;
|
|
29
|
+
execute(item);
|
|
30
|
+
}
|
|
31
|
+
return work.active < max_concurrency;
|
|
38
32
|
},
|
|
39
33
|
failed(error) {
|
|
40
34
|
transition("fail", error);
|
|
41
35
|
},
|
|
42
36
|
});
|
|
43
|
-
function spacing() {
|
|
44
|
-
return evenly_spaced ? interval / adaptiveRate.rate : interval;
|
|
45
|
-
}
|
|
46
37
|
/** Moves the lifecycle for `event` and runs the cleanup that entering the new state requires. */
|
|
47
38
|
function transition(event, error) {
|
|
48
39
|
const next = lifecycleTransitions[lifecycle.state][event];
|
|
@@ -72,24 +63,14 @@ export function createScheduler(options, adaptiveRateOptions) {
|
|
|
72
63
|
work.fail(error);
|
|
73
64
|
}
|
|
74
65
|
}
|
|
75
|
-
function isRetryable(item, outcome) {
|
|
76
|
-
if (!outcome || item.retries === 0)
|
|
77
|
-
return false;
|
|
78
|
-
try {
|
|
79
|
-
return retryClassifier ? retryClassifier(outcome, retry - item.retries + 1) === true : true;
|
|
80
|
-
}
|
|
81
|
-
catch {
|
|
82
|
-
return true;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
66
|
function nextAttempt(item, outcome) {
|
|
86
|
-
if (!
|
|
67
|
+
if (!outcome)
|
|
68
|
+
return undefined;
|
|
69
|
+
const decision = retryPolicy.decide(outcome, item.attempt);
|
|
70
|
+
if (!decision)
|
|
87
71
|
return undefined;
|
|
88
72
|
cnt_retried++;
|
|
89
|
-
|
|
90
|
-
if (retryBackoff === undefined)
|
|
91
|
-
return { item: retryItem };
|
|
92
|
-
return { item: retryItem, delay: calculateRetryDelay(retryBackoff, retry - item.retries + 1) };
|
|
73
|
+
return { item: { fn: item.fn, attempt: item.attempt + 1 }, ...decision };
|
|
93
74
|
}
|
|
94
75
|
function handleSettlement(item, outcome, reportSettlement, resume = false) {
|
|
95
76
|
if (lifecycle.state === "aborted" || lifecycle.state === "failed") {
|
|
@@ -102,8 +83,9 @@ export function createScheduler(options, adaptiveRateOptions) {
|
|
|
102
83
|
cnt_succeeded++;
|
|
103
84
|
work.settle(() => nextAttempt(item, outcome), () => {
|
|
104
85
|
reportSettlement(outcome);
|
|
105
|
-
|
|
106
|
-
|
|
86
|
+
// An async settlement frees a slot; a start may be due if concurrency held one back.
|
|
87
|
+
if (resume)
|
|
88
|
+
start();
|
|
107
89
|
});
|
|
108
90
|
}
|
|
109
91
|
function execute(item) {
|
|
@@ -123,30 +105,6 @@ export function createScheduler(options, adaptiveRateOptions) {
|
|
|
123
105
|
}
|
|
124
106
|
handleSettlement(item, result === false ? { kind: "returned-false" } : undefined, reportSettlement);
|
|
125
107
|
}
|
|
126
|
-
function dequeue() {
|
|
127
|
-
const threshold = last_called + spacing();
|
|
128
|
-
const now = Date.now();
|
|
129
|
-
if (now < threshold) {
|
|
130
|
-
clearTimeout(timeout);
|
|
131
|
-
timeout = setTimeout(dequeue, threshold - now);
|
|
132
|
-
return;
|
|
133
|
-
}
|
|
134
|
-
const batch = Math.min(evenly_spaced ? 1 : adaptiveRate.rate, work.queued);
|
|
135
|
-
let started = 0;
|
|
136
|
-
while (started < batch && work.active < max_concurrency) {
|
|
137
|
-
const item = work.take();
|
|
138
|
-
if (item === undefined)
|
|
139
|
-
break;
|
|
140
|
-
if (started++ === 0)
|
|
141
|
-
last_called = Date.now();
|
|
142
|
-
execute(item);
|
|
143
|
-
}
|
|
144
|
-
if (work.queued === 0)
|
|
145
|
-
adaptiveRate.drained();
|
|
146
|
-
if (adaptiveRate.pacing !== "open" || work.active >= max_concurrency)
|
|
147
|
-
return;
|
|
148
|
-
timeout = setTimeout(dequeue, spacing());
|
|
149
|
-
}
|
|
150
108
|
function start() {
|
|
151
109
|
if (lifecycle.state === "running")
|
|
152
110
|
adaptiveRate.start();
|
|
@@ -156,7 +114,7 @@ export function createScheduler(options, adaptiveRateOptions) {
|
|
|
156
114
|
throw new Error("Cannot enqueue work after the queue has been aborted");
|
|
157
115
|
if (lifecycle.state === "failed")
|
|
158
116
|
throw lifecycle.error;
|
|
159
|
-
work.accept({ fn: callback,
|
|
117
|
+
work.accept({ fn: callback, attempt: 1 });
|
|
160
118
|
if (lifecycle.state === "stopped")
|
|
161
119
|
transition("restart");
|
|
162
120
|
else
|
package/dist/scheduler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,2BAA2B;AAGxD,OAAO,EAAE,iBAAiB,EAAE,0BAA0B;
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dynamic-throttled-queue",
|
|
3
|
-
"version": "2.3.0-rc.
|
|
3
|
+
"version": "2.3.0-rc.494c954",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Dynamically throttles arbitrary code to execute between a minimum and maximum number of times per interval. Best for making throttled API requests.",
|
|
6
6
|
"files": [
|
|
@@ -30,19 +30,20 @@
|
|
|
30
30
|
"url": "https://github.com/adrianbrowning/dynamic-throttled-queue/issues"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@commitlint/cli": "
|
|
33
|
+
"@commitlint/cli": "21.2.3",
|
|
34
34
|
"@commitlint/config-conventional": "20.0.0",
|
|
35
|
-
"@gingacodemonkey/config": "^0.0.
|
|
35
|
+
"@gingacodemonkey/config": "^0.0.38",
|
|
36
36
|
"@types/node": "^24.13.3",
|
|
37
|
+
"@varlock/bumpy": "^1.18.1",
|
|
37
38
|
"eslint": "^9.39.5",
|
|
38
|
-
"husky": "9.
|
|
39
|
+
"husky": "9.1.7",
|
|
39
40
|
"jscpd": "^4.2.5",
|
|
40
41
|
"knip": "5.70.1",
|
|
41
|
-
"lint-staged": "
|
|
42
|
+
"lint-staged": "17.6.0",
|
|
42
43
|
"only-allow": "^1.2.2",
|
|
43
44
|
"typescript": "^6.0.3",
|
|
44
|
-
"vitest": "^
|
|
45
|
-
"zshy": "^0.
|
|
45
|
+
"vitest": "^5.0.2",
|
|
46
|
+
"zshy": "^0.8.0"
|
|
46
47
|
},
|
|
47
48
|
"engines": {
|
|
48
49
|
"node": ">=24.0.0",
|
|
@@ -56,9 +57,6 @@
|
|
|
56
57
|
"default": "./dist/dynamic-throttled-queue.js"
|
|
57
58
|
}
|
|
58
59
|
},
|
|
59
|
-
"dependencies": {
|
|
60
|
-
"@varlock/bumpy": "^1.18.1"
|
|
61
|
-
},
|
|
62
60
|
"scripts": {
|
|
63
61
|
"build": "zshy",
|
|
64
62
|
"test": "vitest run",
|
package/dist/retry-backoff.d.ts
DELETED
package/dist/retry-backoff.js
DELETED
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
function readRandom(random) {
|
|
2
|
-
try {
|
|
3
|
-
// eslint-disable-next-line sonarjs/pseudo-random -- Default jitter requires a random source.
|
|
4
|
-
const value = random?.() ?? Math.random();
|
|
5
|
-
return Number.isFinite(value) && value >= 0 && value <= 1 ? value : undefined;
|
|
6
|
-
}
|
|
7
|
-
catch {
|
|
8
|
-
return undefined;
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
export function calculateRetryDelay(policy, retryIndex) {
|
|
12
|
-
let delay;
|
|
13
|
-
switch (policy.strategy) {
|
|
14
|
-
case "linear":
|
|
15
|
-
delay = policy.baseDelay * retryIndex;
|
|
16
|
-
break;
|
|
17
|
-
case "exponential":
|
|
18
|
-
delay = policy.baseDelay * 2 ** (retryIndex - 1);
|
|
19
|
-
break;
|
|
20
|
-
default: delay = policy.baseDelay;
|
|
21
|
-
}
|
|
22
|
-
const cappedDelay = policy.maxDelay === undefined ? delay : Math.min(delay, policy.maxDelay);
|
|
23
|
-
if (policy.jitter === undefined)
|
|
24
|
-
return cappedDelay;
|
|
25
|
-
const random = readRandom(policy.random);
|
|
26
|
-
if (random === undefined)
|
|
27
|
-
return cappedDelay;
|
|
28
|
-
const jitteredDelay = cappedDelay * (1 + (random * 2 - 1) * policy.jitter);
|
|
29
|
-
return policy.maxDelay === undefined ? jitteredDelay : Math.min(jitteredDelay, policy.maxDelay);
|
|
30
|
-
}
|
|
31
|
-
//# sourceMappingURL=retry-backoff.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"retry-backoff.js","sourceRoot":"","sources":["../src/retry-backoff.ts"],"names":[],"mappings":"AAEA,SAAS,UAAU,CAAC,MAAkC;IACpD,IAAI,CAAC;QACH,6FAA6F;QAC7F,MAAM,KAAK,GAAG,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,CAAC;IACD,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAoB,EAAE,UAAkB;IAC1E,IAAI,KAAa,CAAC;IAClB,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,QAAQ;YAAE,KAAK,GAAG,MAAM,CAAC,SAAS,GAAG,UAAU,CAAC;YAAC,MAAM;QAC5D,KAAK,aAAa;YAAE,KAAK,GAAG,MAAM,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAAC,MAAM;QAC5E,OAAO,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7F,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IACpD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAC7C,MAAM,aAAa,GAAG,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;AAClG,CAAC"}
|