@crawlee/core 4.0.0-beta.10 → 4.0.0-beta.101
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 +17 -13
- package/autoscaling/autoscaled_pool.d.ts +69 -156
- package/autoscaling/autoscaled_pool.js +97 -252
- package/autoscaling/client_load_signal.d.ts +59 -0
- package/autoscaling/client_load_signal.js +73 -0
- package/autoscaling/concurrency_system.d.ts +283 -0
- package/autoscaling/concurrency_system.js +350 -0
- package/autoscaling/cpu_load_signal.d.ts +44 -0
- package/autoscaling/cpu_load_signal.js +46 -0
- package/autoscaling/event_loop_load_signal.d.ts +54 -0
- package/autoscaling/event_loop_load_signal.js +60 -0
- package/autoscaling/index.d.ts +6 -1
- package/autoscaling/index.js +6 -1
- package/autoscaling/load_signal.d.ts +99 -0
- package/autoscaling/load_signal.js +103 -0
- package/autoscaling/memory_load_signal.d.ts +56 -0
- package/autoscaling/memory_load_signal.js +106 -0
- package/autoscaling/snapshotter.d.ts +61 -163
- package/autoscaling/snapshotter.js +45 -263
- package/autoscaling/system_status.d.ts +63 -83
- package/autoscaling/system_status.js +90 -120
- package/autoscaling/weighted_avg.d.ts +5 -0
- package/autoscaling/weighted_avg.js +14 -0
- package/byte_utils.d.ts +17 -0
- package/byte_utils.js +42 -0
- package/configuration.d.ts +96 -223
- package/configuration.js +170 -222
- package/cookie_utils.d.ts +4 -3
- package/cookie_utils.js +22 -13
- package/crawlers/context_pipeline.d.ts +70 -0
- package/crawlers/context_pipeline.js +122 -0
- package/crawlers/crawler_commons.d.ts +96 -40
- package/crawlers/crawler_commons.js +15 -24
- package/crawlers/error_snapshotter.d.ts +3 -3
- package/crawlers/error_snapshotter.js +2 -3
- package/crawlers/error_tracker.d.ts +2 -2
- package/crawlers/error_tracker.js +0 -1
- package/crawlers/index.d.ts +1 -3
- package/crawlers/index.js +1 -3
- package/crawlers/internals/types.d.ts +7 -0
- package/crawlers/internals/types.js +1 -0
- package/crawlers/statistics.d.ts +28 -23
- package/crawlers/statistics.js +38 -34
- package/debug.d.ts +36 -0
- package/debug.js +70 -0
- package/enqueue_links/enqueue_links.d.ts +59 -68
- package/enqueue_links/enqueue_links.js +57 -62
- package/enqueue_links/index.d.ts +0 -1
- package/enqueue_links/index.js +0 -1
- package/enqueue_links/shared.d.ts +39 -26
- package/enqueue_links/shared.js +89 -67
- package/errors.d.ts +53 -4
- package/errors.js +70 -5
- package/events/event_manager.d.ts +34 -8
- package/events/event_manager.js +8 -10
- package/events/index.d.ts +0 -1
- package/events/index.js +0 -1
- package/events/local_event_manager.d.ts +15 -3
- package/events/local_event_manager.js +37 -11
- package/index.d.ts +6 -4
- package/index.js +5 -3
- package/iterables.d.ts +79 -0
- package/iterables.js +134 -0
- package/log.d.ts +82 -3
- package/log.js +102 -1
- package/memory-storage/consts.d.ts +4 -0
- package/memory-storage/consts.js +4 -0
- package/memory-storage/index.d.ts +1 -0
- package/memory-storage/index.js +1 -0
- package/memory-storage/memory-storage.d.ts +46 -0
- package/memory-storage/memory-storage.js +136 -0
- package/memory-storage/resource-clients/common/base-client.d.ts +4 -0
- package/memory-storage/resource-clients/common/base-client.js +6 -0
- package/memory-storage/resource-clients/dataset.d.ts +40 -0
- package/memory-storage/resource-clients/dataset.js +113 -0
- package/memory-storage/resource-clients/key-value-store.d.ts +63 -0
- package/memory-storage/resource-clients/key-value-store.js +203 -0
- package/memory-storage/resource-clients/request-queue.d.ts +96 -0
- package/memory-storage/resource-clients/request-queue.js +421 -0
- package/memory-storage/utils.d.ts +16 -0
- package/memory-storage/utils.js +41 -0
- package/owned_or_injected.d.ts +60 -0
- package/owned_or_injected.js +98 -0
- package/package.json +13 -12
- package/proxy_configuration.d.ts +29 -152
- package/proxy_configuration.js +21 -173
- package/recoverable_state.d.ts +120 -0
- package/recoverable_state.js +143 -0
- package/request.d.ts +85 -15
- package/request.js +107 -28
- package/router.d.ts +194 -19
- package/router.js +177 -32
- package/serialization.d.ts +0 -1
- package/serialization.js +1 -2
- package/service_locator.d.ts +156 -0
- package/service_locator.js +244 -0
- package/session_pool/consts.d.ts +1 -2
- package/session_pool/consts.js +1 -2
- package/session_pool/errors.d.ts +0 -1
- package/session_pool/errors.js +0 -1
- package/session_pool/fingerprint.d.ts +9 -0
- package/session_pool/fingerprint.js +30 -0
- package/session_pool/index.d.ts +0 -2
- package/session_pool/index.js +0 -2
- package/session_pool/session.d.ts +37 -75
- package/session_pool/session.js +49 -102
- package/session_pool/session_pool.d.ts +85 -90
- package/session_pool/session_pool.js +131 -120
- package/storages/access_checking.d.ts +1 -2
- package/storages/access_checking.js +5 -2
- package/storages/dataset.d.ts +103 -54
- package/storages/dataset.js +174 -132
- package/storages/index.d.ts +8 -7
- package/storages/index.js +6 -7
- package/storages/key_value_store.d.ts +167 -39
- package/storages/key_value_store.js +274 -127
- package/storages/key_value_store_codec.d.ts +32 -0
- package/storages/key_value_store_codec.js +113 -0
- package/storages/request_dedup_cache.d.ts +23 -0
- package/storages/request_dedup_cache.js +48 -0
- package/storages/request_list.d.ts +54 -98
- package/storages/request_list.js +99 -75
- package/storages/request_loader.d.ts +96 -0
- package/storages/request_loader.js +1 -0
- package/storages/request_manager.d.ts +33 -0
- package/storages/request_manager.js +1 -0
- package/storages/request_manager_tandem.d.ts +106 -0
- package/storages/request_manager_tandem.js +197 -0
- package/storages/request_queue.d.ts +287 -47
- package/storages/request_queue.js +620 -215
- package/storages/{sitemap_request_list.d.ts → sitemap_request_loader.d.ts} +38 -46
- package/storages/{sitemap_request_list.js → sitemap_request_loader.js} +58 -65
- package/storages/storage_instance_manager.d.ts +88 -0
- package/storages/storage_instance_manager.js +256 -0
- package/storages/storage_stats.d.ts +48 -0
- package/storages/storage_stats.js +29 -0
- package/storages/utils.d.ts +54 -9
- package/storages/utils.js +64 -13
- package/system-info/cpu-info.d.ts +67 -0
- package/system-info/cpu-info.js +216 -0
- package/system-info/memory-info.d.ts +31 -0
- package/system-info/memory-info.js +115 -0
- package/system-info/ps-tree.d.ts +17 -0
- package/system-info/ps-tree.js +144 -0
- package/system-info/runtime.d.ts +14 -0
- package/system-info/runtime.js +80 -0
- package/typedefs.d.ts +0 -6
- package/typedefs.js +0 -1
- package/validators.d.ts +8 -1
- package/validators.js +10 -3
- package/autoscaling/autoscaled_pool.d.ts.map +0 -1
- package/autoscaling/autoscaled_pool.js.map +0 -1
- package/autoscaling/index.d.ts.map +0 -1
- package/autoscaling/index.js.map +0 -1
- package/autoscaling/snapshotter.d.ts.map +0 -1
- package/autoscaling/snapshotter.js.map +0 -1
- package/autoscaling/system_status.d.ts.map +0 -1
- package/autoscaling/system_status.js.map +0 -1
- package/configuration.d.ts.map +0 -1
- package/configuration.js.map +0 -1
- package/cookie_utils.d.ts.map +0 -1
- package/cookie_utils.js.map +0 -1
- package/crawlers/crawler_commons.d.ts.map +0 -1
- package/crawlers/crawler_commons.js.map +0 -1
- package/crawlers/crawler_extension.d.ts +0 -12
- package/crawlers/crawler_extension.d.ts.map +0 -1
- package/crawlers/crawler_extension.js +0 -14
- package/crawlers/crawler_extension.js.map +0 -1
- package/crawlers/crawler_utils.d.ts +0 -10
- package/crawlers/crawler_utils.d.ts.map +0 -1
- package/crawlers/crawler_utils.js +0 -12
- package/crawlers/crawler_utils.js.map +0 -1
- package/crawlers/error_snapshotter.d.ts.map +0 -1
- package/crawlers/error_snapshotter.js.map +0 -1
- package/crawlers/error_tracker.d.ts.map +0 -1
- package/crawlers/error_tracker.js.map +0 -1
- package/crawlers/index.d.ts.map +0 -1
- package/crawlers/index.js.map +0 -1
- package/crawlers/statistics.d.ts.map +0 -1
- package/crawlers/statistics.js.map +0 -1
- package/enqueue_links/enqueue_links.d.ts.map +0 -1
- package/enqueue_links/enqueue_links.js.map +0 -1
- package/enqueue_links/index.d.ts.map +0 -1
- package/enqueue_links/index.js.map +0 -1
- package/enqueue_links/shared.d.ts.map +0 -1
- package/enqueue_links/shared.js.map +0 -1
- package/errors.d.ts.map +0 -1
- package/errors.js.map +0 -1
- package/events/event_manager.d.ts.map +0 -1
- package/events/event_manager.js.map +0 -1
- package/events/index.d.ts.map +0 -1
- package/events/index.js.map +0 -1
- package/events/local_event_manager.d.ts.map +0 -1
- package/events/local_event_manager.js.map +0 -1
- package/http_clients/base-http-client.d.ts +0 -134
- package/http_clients/base-http-client.d.ts.map +0 -1
- package/http_clients/base-http-client.js +0 -33
- package/http_clients/base-http-client.js.map +0 -1
- package/http_clients/form-data-like.d.ts +0 -67
- package/http_clients/form-data-like.d.ts.map +0 -1
- package/http_clients/form-data-like.js +0 -5
- package/http_clients/form-data-like.js.map +0 -1
- package/http_clients/got-scraping-http-client.d.ts +0 -15
- package/http_clients/got-scraping-http-client.d.ts.map +0 -1
- package/http_clients/got-scraping-http-client.js +0 -69
- package/http_clients/got-scraping-http-client.js.map +0 -1
- package/http_clients/index.d.ts +0 -3
- package/http_clients/index.d.ts.map +0 -1
- package/http_clients/index.js +0 -3
- package/http_clients/index.js.map +0 -1
- package/index.d.ts.map +0 -1
- package/index.js.map +0 -1
- package/log.d.ts.map +0 -1
- package/log.js.map +0 -1
- package/proxy_configuration.d.ts.map +0 -1
- package/proxy_configuration.js.map +0 -1
- package/request.d.ts.map +0 -1
- package/request.js.map +0 -1
- package/router.d.ts.map +0 -1
- package/router.js.map +0 -1
- package/serialization.d.ts.map +0 -1
- package/serialization.js.map +0 -1
- package/session_pool/consts.d.ts.map +0 -1
- package/session_pool/consts.js.map +0 -1
- package/session_pool/errors.d.ts.map +0 -1
- package/session_pool/errors.js.map +0 -1
- package/session_pool/events.d.ts +0 -3
- package/session_pool/events.d.ts.map +0 -1
- package/session_pool/events.js +0 -3
- package/session_pool/events.js.map +0 -1
- package/session_pool/index.d.ts.map +0 -1
- package/session_pool/index.js.map +0 -1
- package/session_pool/session.d.ts.map +0 -1
- package/session_pool/session.js.map +0 -1
- package/session_pool/session_pool.d.ts.map +0 -1
- package/session_pool/session_pool.js.map +0 -1
- package/storages/access_checking.d.ts.map +0 -1
- package/storages/access_checking.js.map +0 -1
- package/storages/dataset.d.ts.map +0 -1
- package/storages/dataset.js.map +0 -1
- package/storages/index.d.ts.map +0 -1
- package/storages/index.js.map +0 -1
- package/storages/key_value_store.d.ts.map +0 -1
- package/storages/key_value_store.js.map +0 -1
- package/storages/request_list.d.ts.map +0 -1
- package/storages/request_list.js.map +0 -1
- package/storages/request_provider.d.ts +0 -307
- package/storages/request_provider.d.ts.map +0 -1
- package/storages/request_provider.js +0 -555
- package/storages/request_provider.js.map +0 -1
- package/storages/request_queue.d.ts.map +0 -1
- package/storages/request_queue.js.map +0 -1
- package/storages/request_queue_v2.d.ts +0 -87
- package/storages/request_queue_v2.d.ts.map +0 -1
- package/storages/request_queue_v2.js +0 -438
- package/storages/request_queue_v2.js.map +0 -1
- package/storages/sitemap_request_list.d.ts.map +0 -1
- package/storages/sitemap_request_list.js.map +0 -1
- package/storages/storage_manager.d.ts +0 -58
- package/storages/storage_manager.d.ts.map +0 -1
- package/storages/storage_manager.js +0 -105
- package/storages/storage_manager.js.map +0 -1
- package/storages/utils.d.ts.map +0 -1
- package/storages/utils.js.map +0 -1
- package/tsconfig.build.tsbuildinfo +0 -1
- package/typedefs.d.ts.map +0 -1
- package/typedefs.js.map +0 -1
- package/validators.d.ts.map +0 -1
- package/validators.js.map +0 -1
|
@@ -1,31 +1,23 @@
|
|
|
1
1
|
import ow from 'ow';
|
|
2
2
|
import { addTimeoutToPromise } from '@apify/timeout';
|
|
3
3
|
import { betterClearInterval, betterSetInterval } from '@apify/utilities';
|
|
4
|
-
import { Configuration } from '../configuration.js';
|
|
5
4
|
import { CriticalError } from '../errors.js';
|
|
6
|
-
import {
|
|
7
|
-
import { Snapshotter } from './snapshotter.js';
|
|
8
|
-
import { SystemStatus } from './system_status.js';
|
|
5
|
+
import { serviceLocator } from '../service_locator.js';
|
|
9
6
|
/**
|
|
10
7
|
* Manages a pool of asynchronous resource-intensive tasks that are executed in parallel.
|
|
11
|
-
* The pool only starts new tasks
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* The information about the CPU and memory usage is obtained by the {@link Snapshotter} class,
|
|
15
|
-
* which makes regular snapshots of system resources that may be either local
|
|
16
|
-
* or from the Apify cloud infrastructure in case the process is running on the Apify platform.
|
|
17
|
-
* Meaningful data gathered from these snapshots is provided to `AutoscaledPool` by the {@link SystemStatus} class.
|
|
8
|
+
* The pool only starts new tasks while its {@link IConcurrencySystem|concurrency system} reports free capacity —
|
|
9
|
+
* that governor is what monitors CPU, memory and event loop load and autoscales the concurrency budget.
|
|
18
10
|
*
|
|
19
11
|
* Before running the pool, you need to implement the following three functions:
|
|
20
|
-
* {@link AutoscaledPoolOptions.runTaskFunction},
|
|
21
|
-
* {@link
|
|
22
|
-
* {@link
|
|
12
|
+
* {@link AutoscaledPoolOptions.runTaskFunction|`runTaskFunction`},
|
|
13
|
+
* {@link TaskLoopPredicates.isTaskReadyFunction|`isTaskReadyFunction`} and
|
|
14
|
+
* {@link TaskLoopPredicates.isFinishedFunction|`isFinishedFunction`}.
|
|
23
15
|
*
|
|
24
16
|
* The auto-scaled pool is started by calling the {@link AutoscaledPool.run} function.
|
|
25
|
-
* The pool periodically queries
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
17
|
+
* The pool periodically queries `isTaskReadyFunction` for more tasks, managing optimal concurrency, until the function
|
|
18
|
+
* resolves to `false`. The pool then queries `isFinishedFunction`. If it resolves to `true`, the run finishes after all
|
|
19
|
+
* running tasks complete. If it resolves to `false`, it assumes there will be more tasks available later and keeps
|
|
20
|
+
* periodically querying for tasks.
|
|
29
21
|
* If any of the tasks throws then the {@link AutoscaledPool.run} function rejects the promise with an error.
|
|
30
22
|
*
|
|
31
23
|
* The pool evaluates whether it should start a new task every time one of the tasks finishes
|
|
@@ -34,8 +26,12 @@ import { SystemStatus } from './system_status.js';
|
|
|
34
26
|
* **Example usage:**
|
|
35
27
|
*
|
|
36
28
|
* ```javascript
|
|
29
|
+
* const concurrencySystem = new ConcurrencySystem({ maxConcurrency: 50 });
|
|
30
|
+
* await concurrencySystem.start();
|
|
31
|
+
*
|
|
37
32
|
* const pool = new AutoscaledPool({
|
|
38
|
-
*
|
|
33
|
+
* concurrencySystem,
|
|
34
|
+
* consumer: { id: 'my-pool' },
|
|
39
35
|
* runTaskFunction: async () => {
|
|
40
36
|
* // Run some resource-intensive asynchronous operation here.
|
|
41
37
|
* },
|
|
@@ -50,177 +46,116 @@ import { SystemStatus } from './system_status.js';
|
|
|
50
46
|
* }
|
|
51
47
|
* });
|
|
52
48
|
*
|
|
53
|
-
*
|
|
49
|
+
* try {
|
|
50
|
+
* await pool.run();
|
|
51
|
+
* } finally {
|
|
52
|
+
* await concurrencySystem.stop();
|
|
53
|
+
* }
|
|
54
54
|
* ```
|
|
55
|
-
*
|
|
55
|
+
*
|
|
56
|
+
* @internal
|
|
56
57
|
*/
|
|
57
58
|
export class AutoscaledPool {
|
|
58
|
-
config;
|
|
59
59
|
log;
|
|
60
60
|
// Configurable properties.
|
|
61
|
-
desiredConcurrencyRatio;
|
|
62
|
-
scaleUpStepRatio;
|
|
63
|
-
scaleDownStepRatio;
|
|
64
61
|
maybeRunIntervalMillis;
|
|
65
|
-
loggingIntervalMillis;
|
|
66
|
-
autoscaleIntervalMillis;
|
|
67
62
|
taskTimeoutMillis;
|
|
68
63
|
runTaskFunction;
|
|
69
64
|
isFinishedFunction;
|
|
70
65
|
isTaskReadyFunction;
|
|
71
|
-
|
|
66
|
+
concurrencySystem;
|
|
67
|
+
consumer;
|
|
72
68
|
// Internal properties.
|
|
73
|
-
_minConcurrency;
|
|
74
|
-
_maxConcurrency;
|
|
75
|
-
_desiredConcurrency;
|
|
76
|
-
_currentConcurrency = 0;
|
|
77
69
|
isStopped = false;
|
|
78
|
-
lastLoggingTime;
|
|
79
70
|
resolve = null;
|
|
80
71
|
reject = null;
|
|
81
|
-
snapshotter;
|
|
82
|
-
systemStatus;
|
|
83
|
-
autoscaleInterval;
|
|
84
72
|
maybeRunInterval;
|
|
85
73
|
queryingIsTaskReady;
|
|
86
74
|
queryingIsFinished;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
75
|
+
/**
|
|
76
|
+
* This pool's *own* in-flight task count, as opposed to {@link AutoscaledPool.currentConcurrency}, which is the
|
|
77
|
+
* (possibly shared) governor's total. `pause()` and `maybeFinish()` care only about this pool draining.
|
|
78
|
+
*/
|
|
79
|
+
ownConcurrency = 0;
|
|
80
|
+
constructor(options) {
|
|
91
81
|
ow(options, ow.object.exactShape({
|
|
92
82
|
runTaskFunction: ow.function,
|
|
93
83
|
isFinishedFunction: ow.function,
|
|
94
84
|
isTaskReadyFunction: ow.function,
|
|
95
|
-
maxConcurrency: ow.optional.number.integer.greaterThanOrEqual(1),
|
|
96
|
-
minConcurrency: ow.optional.number.integer.greaterThanOrEqual(1),
|
|
97
|
-
desiredConcurrency: ow.optional.number.integer.greaterThanOrEqual(1),
|
|
98
|
-
desiredConcurrencyRatio: ow.optional.number.greaterThan(0).lessThan(1),
|
|
99
|
-
scaleUpStepRatio: ow.optional.number.greaterThan(0).lessThan(1),
|
|
100
|
-
scaleDownStepRatio: ow.optional.number.greaterThan(0).lessThan(1),
|
|
101
85
|
maybeRunIntervalSecs: ow.optional.number.greaterThan(0),
|
|
102
|
-
loggingIntervalSecs: ow.any(ow.number.greaterThan(0), ow.nullOrUndefined),
|
|
103
|
-
autoscaleIntervalSecs: ow.optional.number.greaterThan(0),
|
|
104
86
|
taskTimeoutSecs: ow.optional.number.greaterThanOrEqual(0),
|
|
105
|
-
systemStatusOptions: ow.optional.object,
|
|
106
|
-
snapshotterOptions: ow.optional.object,
|
|
107
87
|
log: ow.optional.object,
|
|
108
|
-
|
|
88
|
+
concurrencySystem: ow.object,
|
|
89
|
+
consumer: ow.object.partialShape({ id: ow.string.nonEmpty }),
|
|
109
90
|
}));
|
|
110
|
-
const { runTaskFunction, isFinishedFunction, isTaskReadyFunction,
|
|
91
|
+
const { runTaskFunction, isFinishedFunction, isTaskReadyFunction, maybeRunIntervalSecs = 0.5, taskTimeoutSecs = 0, log = serviceLocator.getLogger(), concurrencySystem, consumer, } = options;
|
|
111
92
|
this.log = log.child({ prefix: 'AutoscaledPool' });
|
|
112
93
|
// Configurable properties.
|
|
113
|
-
this.desiredConcurrencyRatio = desiredConcurrencyRatio;
|
|
114
|
-
this.scaleUpStepRatio = scaleUpStepRatio;
|
|
115
|
-
this.scaleDownStepRatio = scaleDownStepRatio;
|
|
116
94
|
this.maybeRunIntervalMillis = maybeRunIntervalSecs * 1000;
|
|
117
|
-
this.loggingIntervalMillis = loggingIntervalSecs * 1000;
|
|
118
|
-
this.autoscaleIntervalMillis = autoscaleIntervalSecs * 1000;
|
|
119
95
|
this.taskTimeoutMillis = taskTimeoutSecs * 1000;
|
|
120
96
|
this.runTaskFunction = runTaskFunction;
|
|
121
97
|
this.isFinishedFunction = isFinishedFunction;
|
|
122
98
|
this.isTaskReadyFunction = isTaskReadyFunction;
|
|
123
|
-
this.
|
|
99
|
+
this.concurrencySystem = concurrencySystem;
|
|
100
|
+
this.consumer = consumer;
|
|
124
101
|
// Internal properties.
|
|
125
|
-
this._minConcurrency = minConcurrency;
|
|
126
|
-
this._maxConcurrency = maxConcurrency;
|
|
127
|
-
this._desiredConcurrency = Math.min(desiredConcurrency ?? minConcurrency, maxConcurrency);
|
|
128
|
-
this._currentConcurrency = 0;
|
|
129
102
|
this.isStopped = false;
|
|
130
103
|
this.resolve = null;
|
|
131
104
|
this.reject = null;
|
|
132
|
-
this.
|
|
133
|
-
this._maybeRunTask = this._maybeRunTask.bind(this);
|
|
134
|
-
this._incrementTasksDonePerSecond = this._incrementTasksDonePerSecond.bind(this);
|
|
135
|
-
// Create instances with correct options.
|
|
136
|
-
const ssoCopy = { ...systemStatusOptions };
|
|
137
|
-
ssoCopy.snapshotter ??= new Snapshotter({
|
|
138
|
-
...snapshotterOptions,
|
|
139
|
-
log: this.log,
|
|
140
|
-
config: this.config,
|
|
141
|
-
client: this.config.getStorageClient(),
|
|
142
|
-
});
|
|
143
|
-
ssoCopy.config ??= this.config;
|
|
144
|
-
this.snapshotter = ssoCopy.snapshotter;
|
|
145
|
-
this.systemStatus = new SystemStatus(ssoCopy);
|
|
105
|
+
this.maybeRunTask = this.maybeRunTask.bind(this);
|
|
146
106
|
}
|
|
147
107
|
/**
|
|
148
|
-
*
|
|
149
|
-
|
|
150
|
-
get minConcurrency() {
|
|
151
|
-
return this._minConcurrency;
|
|
152
|
-
}
|
|
153
|
-
/**
|
|
154
|
-
* Sets the minimum number of tasks running in parallel.
|
|
108
|
+
* The governor backing this pool, as supplied to the constructor — exposed as the read-only
|
|
109
|
+
* {@link IConcurrencySystem} contract.
|
|
155
110
|
*
|
|
156
|
-
*
|
|
157
|
-
*
|
|
158
|
-
*/
|
|
159
|
-
set minConcurrency(value) {
|
|
160
|
-
ow(value, ow.optional.number.integer.greaterThanOrEqual(1));
|
|
161
|
-
this._minConcurrency = value;
|
|
162
|
-
}
|
|
163
|
-
/**
|
|
164
|
-
* Gets the maximum number of tasks running in parallel.
|
|
165
|
-
*/
|
|
166
|
-
get maxConcurrency() {
|
|
167
|
-
return this._maxConcurrency;
|
|
168
|
-
}
|
|
169
|
-
/**
|
|
170
|
-
* Sets the maximum number of tasks running in parallel.
|
|
111
|
+
* This and the two getters below are telemetry only: concurrency is configured and tuned on the concrete
|
|
112
|
+
* {@link ConcurrencySystem} its owner holds, never through the pool.
|
|
171
113
|
*/
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
this._maxConcurrency = value;
|
|
114
|
+
get system() {
|
|
115
|
+
return this.concurrencySystem;
|
|
175
116
|
}
|
|
176
|
-
/**
|
|
177
|
-
* Gets the desired concurrency for the pool,
|
|
178
|
-
* which is an estimated number of parallel tasks that the system can currently support.
|
|
179
|
-
*/
|
|
117
|
+
/** The estimated number of parallel tasks the governor can currently support. */
|
|
180
118
|
get desiredConcurrency() {
|
|
181
|
-
return this.
|
|
182
|
-
}
|
|
183
|
-
/**
|
|
184
|
-
* Sets the desired concurrency for the pool, i.e. the number of tasks that should be running
|
|
185
|
-
* in parallel if there's large enough supply of tasks.
|
|
186
|
-
*/
|
|
187
|
-
set desiredConcurrency(value) {
|
|
188
|
-
ow(value, ow.optional.number.integer.greaterThanOrEqual(1));
|
|
189
|
-
this._desiredConcurrency = value;
|
|
119
|
+
return this.concurrencySystem.desiredConcurrency;
|
|
190
120
|
}
|
|
191
121
|
/**
|
|
192
|
-
*
|
|
122
|
+
* The number of parallel tasks currently booked against the governor. When it is shared, this counts every
|
|
123
|
+
* borrowing pool's tasks, not just this one's.
|
|
193
124
|
*/
|
|
194
125
|
get currentConcurrency() {
|
|
195
|
-
return this.
|
|
126
|
+
return this.concurrencySystem.currentConcurrency;
|
|
196
127
|
}
|
|
197
128
|
/**
|
|
198
129
|
* Runs the auto-scaled pool. Returns a promise that gets resolved or rejected once
|
|
199
130
|
* all the tasks are finished or one of them fails.
|
|
131
|
+
*
|
|
132
|
+
* Throws if the {@link IConcurrencySystem|concurrency system} it borrows was never started — the pool assumes
|
|
133
|
+
* a running governor and cannot start one it does not own.
|
|
200
134
|
*/
|
|
201
135
|
async run() {
|
|
136
|
+
// Checked here, on an awaited path — the capacity queries inside the task loop run from intervals and
|
|
137
|
+
// `setImmediate`, where a throw would become an unhandled rejection and hang `run()` forever.
|
|
138
|
+
if (!this.concurrencySystem.isRunning) {
|
|
139
|
+
throw new CriticalError('The ConcurrencySystem this AutoscaledPool borrows has not been started, so system load would not be ' +
|
|
140
|
+
'monitored and the concurrency would never be adjusted. Whoever creates a ConcurrencySystem owns ' +
|
|
141
|
+
'its lifecycle: call `await concurrencySystem.start()` before running the pools or crawlers that ' +
|
|
142
|
+
'use it, and `await concurrencySystem.stop()` once they are all done.');
|
|
143
|
+
}
|
|
202
144
|
const poolPromise = new Promise((resolve, reject) => {
|
|
203
145
|
this.resolve = resolve;
|
|
204
146
|
this.reject = reject;
|
|
205
147
|
});
|
|
206
|
-
await this.snapshotter.start();
|
|
207
|
-
// This interval checks the system status and updates the desired concurrency accordingly.
|
|
208
|
-
this.autoscaleInterval = betterSetInterval(this._autoscale, this.autoscaleIntervalMillis);
|
|
209
148
|
// This is here because if we scale down to let's say 1, then after each promise is finished
|
|
210
|
-
// this.
|
|
149
|
+
// this.maybeRunTask() doesn't trigger another one. So if that 1 instance gets stuck it results
|
|
211
150
|
// in the crawler getting stuck and even after scaling up it never triggers another promise.
|
|
212
|
-
this.maybeRunInterval = betterSetInterval(this.
|
|
213
|
-
if (this.maxTasksPerMinute !== Infinity) {
|
|
214
|
-
// Start the interval that resets the counter of tasks per minute.
|
|
215
|
-
this.tasksDonePerSecondInterval = betterSetInterval(this._incrementTasksDonePerSecond, 1000);
|
|
216
|
-
}
|
|
151
|
+
this.maybeRunInterval = betterSetInterval(this.maybeRunTask, this.maybeRunIntervalMillis);
|
|
217
152
|
try {
|
|
218
153
|
await poolPromise;
|
|
219
154
|
}
|
|
220
155
|
finally {
|
|
221
156
|
// If resolve is null, the pool is already destroyed.
|
|
222
157
|
if (this.resolve)
|
|
223
|
-
await this.
|
|
158
|
+
await this.destroy();
|
|
224
159
|
}
|
|
225
160
|
}
|
|
226
161
|
/**
|
|
@@ -238,7 +173,7 @@ export class AutoscaledPool {
|
|
|
238
173
|
this.isStopped = true;
|
|
239
174
|
if (this.resolve) {
|
|
240
175
|
this.resolve();
|
|
241
|
-
await this.
|
|
176
|
+
await this.destroy();
|
|
242
177
|
}
|
|
243
178
|
}
|
|
244
179
|
/**
|
|
@@ -251,6 +186,10 @@ export class AutoscaledPool {
|
|
|
251
186
|
*
|
|
252
187
|
* The promise returned from the {@link AutoscaledPool.run} function will not resolve
|
|
253
188
|
* when `.pause()` is invoked (unlike abort, which resolves it).
|
|
189
|
+
*
|
|
190
|
+
* > *NOTE:* Pausing the pool does not suspend the (possibly shared) {@link ConcurrencySystem} — its
|
|
191
|
+
* autoscaling and resource monitoring keep running, since other pools borrowing it may still be active. To silence
|
|
192
|
+
* it during a long pause, its owner can `stop()` and `start()` it again.
|
|
254
193
|
*/
|
|
255
194
|
async pause(timeoutSecs) {
|
|
256
195
|
if (this.isStopped)
|
|
@@ -258,15 +197,18 @@ export class AutoscaledPool {
|
|
|
258
197
|
this.isStopped = true;
|
|
259
198
|
await new Promise((resolve, reject) => {
|
|
260
199
|
let timeout;
|
|
200
|
+
let interval;
|
|
261
201
|
if (timeoutSecs) {
|
|
262
202
|
timeout = setTimeout(() => {
|
|
203
|
+
// Clean up the polling interval to prevent it from leaking on timeout.
|
|
204
|
+
clearInterval(interval);
|
|
263
205
|
const err = new Error("The pool's running tasks did not finish" +
|
|
264
206
|
`in ${timeoutSecs} secs after pool.pause() invocation.`);
|
|
265
207
|
reject(err);
|
|
266
208
|
}, timeoutSecs);
|
|
267
209
|
}
|
|
268
|
-
|
|
269
|
-
if (this.
|
|
210
|
+
interval = setInterval(() => {
|
|
211
|
+
if (this.ownConcurrency <= 0) {
|
|
270
212
|
// Clean up timeout and interval to prevent process hanging.
|
|
271
213
|
if (timeout)
|
|
272
214
|
clearTimeout(timeout);
|
|
@@ -290,7 +232,7 @@ export class AutoscaledPool {
|
|
|
290
232
|
* every `maybeRunIntervalSecs` seconds. If you want to trigger the processing immediately, use this method.
|
|
291
233
|
*/
|
|
292
234
|
async notify() {
|
|
293
|
-
setImmediate(this.
|
|
235
|
+
setImmediate(this.maybeRunTask);
|
|
294
236
|
}
|
|
295
237
|
/**
|
|
296
238
|
* Starts a new task
|
|
@@ -300,7 +242,7 @@ export class AutoscaledPool {
|
|
|
300
242
|
*
|
|
301
243
|
* It doesn't allow multiple concurrent runs of this method.
|
|
302
244
|
*/
|
|
303
|
-
async
|
|
245
|
+
async maybeRunTask(intervalCallback) {
|
|
304
246
|
this.log.perf('Attempting to run a task.');
|
|
305
247
|
// Check if the function was invoked by the maybeRunInterval and use an empty function if not.
|
|
306
248
|
const done = intervalCallback || (() => { });
|
|
@@ -315,17 +257,14 @@ export class AutoscaledPool {
|
|
|
315
257
|
this.log.perf('Task will not run. Waiting for a ready task.');
|
|
316
258
|
return done();
|
|
317
259
|
}
|
|
318
|
-
// -
|
|
319
|
-
if (this.
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
if (!isSystemIdle && this._currentConcurrency >= this._minConcurrency) {
|
|
327
|
-
this.log.perf('Task will not be run. System is overloaded.', currentStatus);
|
|
328
|
-
return done();
|
|
260
|
+
// - the budget has room for us.
|
|
261
|
+
if (!this.concurrencySystem.hasCapacityForTask(this.consumer)) {
|
|
262
|
+
done();
|
|
263
|
+
// A shared governor's budget can stay saturated by another pool indefinitely, so we still have to be able
|
|
264
|
+
// to notice that *this* pool has run out of work — `maybeFinish()` is the only thing that ever resolves
|
|
265
|
+
// `run()`. It no-ops while this pool has tasks of its own in flight, which is every case in which an
|
|
266
|
+
// unshared governor reports no capacity.
|
|
267
|
+
return this.maybeFinish();
|
|
329
268
|
}
|
|
330
269
|
// - a task is ready.
|
|
331
270
|
this.queryingIsTaskReady = true;
|
|
@@ -351,22 +290,19 @@ export class AutoscaledPool {
|
|
|
351
290
|
this.log.perf('Task will not run. No tasks are ready.');
|
|
352
291
|
done();
|
|
353
292
|
// No tasks could mean that we're finished with all tasks.
|
|
354
|
-
return this.
|
|
293
|
+
return this.maybeFinish();
|
|
355
294
|
}
|
|
356
|
-
// -
|
|
357
|
-
//
|
|
358
|
-
|
|
359
|
-
if (this._isOverMaxRequestLimit) {
|
|
360
|
-
this.log.perf('Task will not run. Maximum tasks per minute reached.');
|
|
295
|
+
// - the budget still has room. Re-checked atomically, because another pool sharing the governor may have taken
|
|
296
|
+
// the last free slot while we awaited `isTaskReadyFunction` above.
|
|
297
|
+
if (!this.concurrencySystem.tryRegisterTaskStart(this.consumer)) {
|
|
361
298
|
return done();
|
|
362
299
|
}
|
|
300
|
+
this.ownConcurrency++;
|
|
363
301
|
try {
|
|
364
302
|
// Everything's fine. Run task.
|
|
365
|
-
this._currentConcurrency++;
|
|
366
|
-
this._tasksPerMinute[0]++;
|
|
367
303
|
// Try to run next task to build up concurrency,
|
|
368
304
|
// but defer it so it doesn't create a cycle.
|
|
369
|
-
setImmediate(this.
|
|
305
|
+
setImmediate(this.maybeRunTask);
|
|
370
306
|
// We need to restart interval here, so that it doesn't get blocked by a stalled task.
|
|
371
307
|
done();
|
|
372
308
|
// Execute the current task.
|
|
@@ -378,9 +314,9 @@ export class AutoscaledPool {
|
|
|
378
314
|
await this.runTaskFunction();
|
|
379
315
|
}
|
|
380
316
|
this.log.perf('Task finished.');
|
|
381
|
-
|
|
382
|
-
//
|
|
383
|
-
setImmediate(this.
|
|
317
|
+
// Run task after the previous one finished. Only on success: a failed task rejects the pool, and
|
|
318
|
+
// nudging the loop afterwards could start work on an already destroyed pool.
|
|
319
|
+
setImmediate(this.maybeRunTask);
|
|
384
320
|
}
|
|
385
321
|
catch (e) {
|
|
386
322
|
const err = e;
|
|
@@ -396,85 +332,11 @@ export class AutoscaledPool {
|
|
|
396
332
|
this.reject(err);
|
|
397
333
|
}
|
|
398
334
|
}
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
* Gets called every autoScaleIntervalSecs and evaluates the current system status.
|
|
403
|
-
* If the system IS NOT overloaded and the settings allow it, it scales up.
|
|
404
|
-
* If the system IS overloaded and the settings allow it, it scales down.
|
|
405
|
-
*/
|
|
406
|
-
_autoscale(intervalCallback) {
|
|
407
|
-
// Don't scale if paused.
|
|
408
|
-
if (this.isStopped)
|
|
409
|
-
return intervalCallback();
|
|
410
|
-
// Don't scale if we've hit the maximum requests per minute
|
|
411
|
-
if (this._isOverMaxRequestLimit)
|
|
412
|
-
return intervalCallback();
|
|
413
|
-
// Only scale up if:
|
|
414
|
-
// - system has not been overloaded lately.
|
|
415
|
-
const systemStatus = this.systemStatus.getHistoricalStatus();
|
|
416
|
-
const { isSystemIdle } = systemStatus;
|
|
417
|
-
// - we're not already at max concurrency.
|
|
418
|
-
const weAreNotAtMax = this._desiredConcurrency < this._maxConcurrency;
|
|
419
|
-
// - current concurrency reaches at least the given ratio of desired concurrency.
|
|
420
|
-
const minCurrentConcurrency = Math.floor(this._desiredConcurrency * this.desiredConcurrencyRatio);
|
|
421
|
-
const weAreReachingDesiredConcurrency = this._currentConcurrency >= minCurrentConcurrency;
|
|
422
|
-
if (isSystemIdle && weAreNotAtMax && weAreReachingDesiredConcurrency)
|
|
423
|
-
this._scaleUp(systemStatus);
|
|
424
|
-
// Always scale down if:
|
|
425
|
-
// - the system has been overloaded lately.
|
|
426
|
-
const isSystemOverloaded = !isSystemIdle;
|
|
427
|
-
// - we're over min concurrency.
|
|
428
|
-
const weAreNotAtMin = this._desiredConcurrency > this._minConcurrency;
|
|
429
|
-
if (isSystemOverloaded && weAreNotAtMin)
|
|
430
|
-
this._scaleDown(systemStatus);
|
|
431
|
-
// On periodic intervals, print comprehensive log information
|
|
432
|
-
if (this.loggingIntervalMillis > 0) {
|
|
433
|
-
const now = Date.now();
|
|
434
|
-
if (this.lastLoggingTime == null) {
|
|
435
|
-
this.lastLoggingTime = now;
|
|
436
|
-
}
|
|
437
|
-
else if (now > this.lastLoggingTime + this.loggingIntervalMillis) {
|
|
438
|
-
this.lastLoggingTime = now;
|
|
439
|
-
this.log.info('state', {
|
|
440
|
-
currentConcurrency: this._currentConcurrency,
|
|
441
|
-
desiredConcurrency: this._desiredConcurrency,
|
|
442
|
-
systemStatus,
|
|
443
|
-
});
|
|
444
|
-
}
|
|
335
|
+
finally {
|
|
336
|
+
this.concurrencySystem.registerTaskEnd(this.consumer);
|
|
337
|
+
this.ownConcurrency--;
|
|
445
338
|
}
|
|
446
|
-
|
|
447
|
-
return intervalCallback();
|
|
448
|
-
}
|
|
449
|
-
/**
|
|
450
|
-
* Scales the pool up by increasing
|
|
451
|
-
* the desired concurrency by the scaleUpStepRatio.
|
|
452
|
-
*
|
|
453
|
-
* @param systemStatus for logging
|
|
454
|
-
*/
|
|
455
|
-
_scaleUp(systemStatus) {
|
|
456
|
-
const step = Math.ceil(this._desiredConcurrency * this.scaleUpStepRatio);
|
|
457
|
-
this._desiredConcurrency = Math.min(this._maxConcurrency, this._desiredConcurrency + step);
|
|
458
|
-
this.log.debug('scaling up', {
|
|
459
|
-
oldConcurrency: this._desiredConcurrency - step,
|
|
460
|
-
newConcurrency: this._desiredConcurrency,
|
|
461
|
-
systemStatus,
|
|
462
|
-
});
|
|
463
|
-
}
|
|
464
|
-
/**
|
|
465
|
-
* Scales the pool down by decreasing
|
|
466
|
-
* the desired concurrency by the scaleDownStepRatio.
|
|
467
|
-
*
|
|
468
|
-
* @param systemStatus for logging
|
|
469
|
-
*/
|
|
470
|
-
_scaleDown(systemStatus) {
|
|
471
|
-
const step = Math.ceil(this._desiredConcurrency * this.scaleDownStepRatio);
|
|
472
|
-
this._desiredConcurrency = Math.max(this._minConcurrency, this._desiredConcurrency - step);
|
|
473
|
-
this.log.debug('scaling down', {
|
|
474
|
-
oldConcurrency: this._desiredConcurrency + step,
|
|
475
|
-
newConcurrency: this._desiredConcurrency,
|
|
476
|
-
systemStatus,
|
|
477
|
-
});
|
|
339
|
+
return undefined;
|
|
478
340
|
}
|
|
479
341
|
/**
|
|
480
342
|
* If there are no running tasks and this.isFinishedFunction() returns true then closes
|
|
@@ -482,10 +344,10 @@ export class AutoscaledPool {
|
|
|
482
344
|
*
|
|
483
345
|
* It doesn't allow multiple concurrent runs of this method.
|
|
484
346
|
*/
|
|
485
|
-
async
|
|
347
|
+
async maybeFinish() {
|
|
486
348
|
if (this.queryingIsFinished)
|
|
487
349
|
return;
|
|
488
|
-
if (this.
|
|
350
|
+
if (this.ownConcurrency > 0)
|
|
489
351
|
return;
|
|
490
352
|
this.queryingIsFinished = true;
|
|
491
353
|
try {
|
|
@@ -508,26 +370,9 @@ export class AutoscaledPool {
|
|
|
508
370
|
/**
|
|
509
371
|
* Cleans up resources.
|
|
510
372
|
*/
|
|
511
|
-
async
|
|
373
|
+
async destroy() {
|
|
512
374
|
this.resolve = null;
|
|
513
375
|
this.reject = null;
|
|
514
|
-
betterClearInterval(this.autoscaleInterval);
|
|
515
376
|
betterClearInterval(this.maybeRunInterval);
|
|
516
|
-
if (this.tasksDonePerSecondInterval)
|
|
517
|
-
betterClearInterval(this.tasksDonePerSecondInterval);
|
|
518
|
-
if (this.snapshotter)
|
|
519
|
-
await this.snapshotter.stop();
|
|
520
|
-
}
|
|
521
|
-
_incrementTasksDonePerSecond(intervalCallback) {
|
|
522
|
-
this._tasksPerMinute.unshift(0);
|
|
523
|
-
this._tasksPerMinute.pop();
|
|
524
|
-
return intervalCallback();
|
|
525
|
-
}
|
|
526
|
-
get _isOverMaxRequestLimit() {
|
|
527
|
-
if (this.maxTasksPerMinute === Infinity) {
|
|
528
|
-
return false;
|
|
529
|
-
}
|
|
530
|
-
return this._tasksPerMinute.reduce((acc, curr) => acc + curr, 0) >= this.maxTasksPerMinute;
|
|
531
377
|
}
|
|
532
378
|
}
|
|
533
|
-
//# sourceMappingURL=autoscaled_pool.js.map
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import type { LoadSignal, LoadSignalStartContext, LoadSnapshot } from './load_signal.js';
|
|
2
|
+
/**
|
|
3
|
+
* A snapshot produced by the built-in client (rate-limit) signal.
|
|
4
|
+
* @internal
|
|
5
|
+
*/
|
|
6
|
+
export interface ClientSnapshot extends LoadSnapshot {
|
|
7
|
+
rateLimitErrorCount: number;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Tuning for the built-in **client** (rate-limit) load signal, as accepted both by {@link ClientLoadSignal} and by
|
|
11
|
+
* the {@link LoadSignalsOptions.client|`client`} shorthand on {@link LoadSignalsOptions}.
|
|
12
|
+
*/
|
|
13
|
+
export interface ClientLoadSignalOptions {
|
|
14
|
+
/**
|
|
15
|
+
* Defines the interval of checking the current state of the remote API client, in seconds.
|
|
16
|
+
* @default 1
|
|
17
|
+
*/
|
|
18
|
+
snapshotIntervalSecs?: number;
|
|
19
|
+
/**
|
|
20
|
+
* Defines the maximum number of new rate limit errors within the given interval.
|
|
21
|
+
* @default 3
|
|
22
|
+
*/
|
|
23
|
+
maxErrors?: number;
|
|
24
|
+
/**
|
|
25
|
+
* Maximum ratio of overloaded snapshots in a sample before the client counts as overloaded.
|
|
26
|
+
* @default 0.3
|
|
27
|
+
*/
|
|
28
|
+
overloadedRatio?: number;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Periodically checks the storage backend for rate-limit errors (HTTP 429) and reports overload when the error delta
|
|
32
|
+
* exceeds a threshold.
|
|
33
|
+
*
|
|
34
|
+
* Built by default; construct one yourself only to wrap or adapt it — see {@link LoadSignal}.
|
|
35
|
+
*
|
|
36
|
+
* Switch it off entirely ({@link LoadSignalsOptions.client|`client: false`}) if the storage backend reports no
|
|
37
|
+
* rate-limit statistics, since it otherwise polls it every second to no purpose.
|
|
38
|
+
*
|
|
39
|
+
* @category Scaling
|
|
40
|
+
*/
|
|
41
|
+
export declare class ClientLoadSignal implements LoadSignal {
|
|
42
|
+
readonly name = "clientInfo";
|
|
43
|
+
readonly overloadedRatio: number;
|
|
44
|
+
private readonly store;
|
|
45
|
+
private readonly intervalMillis;
|
|
46
|
+
private readonly maxErrors;
|
|
47
|
+
private interval?;
|
|
48
|
+
private client?;
|
|
49
|
+
constructor(options?: ClientLoadSignalOptions);
|
|
50
|
+
start(context: LoadSignalStartContext): Promise<void>;
|
|
51
|
+
stop(): Promise<void>;
|
|
52
|
+
getSample(sampleDurationMillis?: number): LoadSnapshot[];
|
|
53
|
+
/**
|
|
54
|
+
* Records one snapshot, overloaded when rate-limit errors grew by more than the configured limit since the
|
|
55
|
+
* previous one.
|
|
56
|
+
* @internal Also lets tests drive the measurement without waiting on a timer.
|
|
57
|
+
*/
|
|
58
|
+
handle(intervalCallback: () => unknown): void;
|
|
59
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { betterClearInterval, betterSetInterval } from '@apify/utilities';
|
|
2
|
+
import { serviceLocator } from '../service_locator.js';
|
|
3
|
+
import { SnapshotStore } from './load_signal.js';
|
|
4
|
+
const CLIENT_RATE_LIMIT_ERROR_RETRY_COUNT = 2;
|
|
5
|
+
/**
|
|
6
|
+
* Periodically checks the storage backend for rate-limit errors (HTTP 429) and reports overload when the error delta
|
|
7
|
+
* exceeds a threshold.
|
|
8
|
+
*
|
|
9
|
+
* Built by default; construct one yourself only to wrap or adapt it — see {@link LoadSignal}.
|
|
10
|
+
*
|
|
11
|
+
* Switch it off entirely ({@link LoadSignalsOptions.client|`client: false`}) if the storage backend reports no
|
|
12
|
+
* rate-limit statistics, since it otherwise polls it every second to no purpose.
|
|
13
|
+
*
|
|
14
|
+
* @category Scaling
|
|
15
|
+
*/
|
|
16
|
+
export class ClientLoadSignal {
|
|
17
|
+
name = 'clientInfo';
|
|
18
|
+
overloadedRatio;
|
|
19
|
+
store = new SnapshotStore();
|
|
20
|
+
intervalMillis;
|
|
21
|
+
maxErrors;
|
|
22
|
+
interval;
|
|
23
|
+
client;
|
|
24
|
+
constructor(options = {}) {
|
|
25
|
+
this.overloadedRatio = options.overloadedRatio ?? 0.3;
|
|
26
|
+
this.intervalMillis = (options.snapshotIntervalSecs ?? 1) * 1000;
|
|
27
|
+
this.maxErrors = options.maxErrors ?? 3;
|
|
28
|
+
this.handle = this.handle.bind(this);
|
|
29
|
+
}
|
|
30
|
+
async start(context) {
|
|
31
|
+
this.store.useSampleWindow(context.maxSampleWindowMillis);
|
|
32
|
+
// A new session starts from a clean slate, or its first measurement diffs the error count against the previous
|
|
33
|
+
// session's — possibly against a different backend, since the client is resolved afresh just below.
|
|
34
|
+
this.store.clear();
|
|
35
|
+
// Resolved here rather than in the constructor, where asking for the backend would instantiate a default one
|
|
36
|
+
// as a side effect - long before the crawler that owns the run has had a chance to register its own.
|
|
37
|
+
this.client = serviceLocator.getStorageBackend();
|
|
38
|
+
this.interval = betterSetInterval(this.handle, this.intervalMillis);
|
|
39
|
+
}
|
|
40
|
+
async stop() {
|
|
41
|
+
if (this.interval)
|
|
42
|
+
betterClearInterval(this.interval);
|
|
43
|
+
this.interval = undefined;
|
|
44
|
+
this.client = undefined;
|
|
45
|
+
}
|
|
46
|
+
getSample(sampleDurationMillis) {
|
|
47
|
+
return this.store.getSample(sampleDurationMillis);
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Records one snapshot, overloaded when rate-limit errors grew by more than the configured limit since the
|
|
51
|
+
* previous one.
|
|
52
|
+
* @internal Also lets tests drive the measurement without waiting on a timer.
|
|
53
|
+
*/
|
|
54
|
+
handle(intervalCallback) {
|
|
55
|
+
const now = new Date();
|
|
56
|
+
const allErrorCounts = this.client?.stats?.rateLimitErrors ?? [];
|
|
57
|
+
const currentErrCount = allErrorCounts[CLIENT_RATE_LIMIT_ERROR_RETRY_COUNT] || 0;
|
|
58
|
+
const snapshot = {
|
|
59
|
+
createdAt: now,
|
|
60
|
+
isOverloaded: false,
|
|
61
|
+
rateLimitErrorCount: currentErrCount,
|
|
62
|
+
};
|
|
63
|
+
const all = this.store.getAll();
|
|
64
|
+
const previousSnapshot = all[all.length - 1];
|
|
65
|
+
if (previousSnapshot) {
|
|
66
|
+
const delta = currentErrCount - previousSnapshot.rateLimitErrorCount;
|
|
67
|
+
if (delta > this.maxErrors)
|
|
68
|
+
snapshot.isOverloaded = true;
|
|
69
|
+
}
|
|
70
|
+
this.store.push(snapshot, now);
|
|
71
|
+
intervalCallback();
|
|
72
|
+
}
|
|
73
|
+
}
|