@crawlee/core 3.8.2-beta.9 → 3.8.2
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/autoscaling/system_status.d.ts +1 -1
- package/autoscaling/system_status.d.ts.map +1 -1
- package/autoscaling/system_status.js +3 -3
- package/autoscaling/system_status.js.map +1 -1
- package/index.mjs +2 -0
- package/package.json +5 -5
- package/request.js +1 -1
- package/request.js.map +1 -1
- package/storages/access_checking.d.ts +13 -0
- package/storages/access_checking.d.ts.map +1 -0
- package/storages/access_checking.js +19 -0
- package/storages/access_checking.js.map +1 -0
- package/storages/dataset.d.ts.map +1 -1
- package/storages/dataset.js +12 -0
- package/storages/dataset.js.map +1 -1
- package/storages/index.d.ts +1 -0
- package/storages/index.d.ts.map +1 -1
- package/storages/index.js +1 -0
- package/storages/index.js.map +1 -1
- package/storages/key_value_store.d.ts.map +1 -1
- package/storages/key_value_store.js +9 -0
- package/storages/key_value_store.js.map +1 -1
- package/storages/request_provider.d.ts.map +1 -1
- package/storages/request_provider.js +12 -11
- package/storages/request_provider.js.map +1 -1
- package/storages/request_queue.d.ts.map +1 -1
- package/storages/request_queue.js +23 -1
- package/storages/request_queue.js.map +1 -1
- package/storages/request_queue_v2.d.ts.map +1 -1
- package/storages/request_queue_v2.js +29 -0
- package/storages/request_queue_v2.js.map +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
|
@@ -6,6 +6,7 @@ const datastructures_1 = require("@apify/datastructures");
|
|
|
6
6
|
const utilities_1 = require("@apify/utilities");
|
|
7
7
|
const utils_1 = require("@crawlee/utils");
|
|
8
8
|
const ow_1 = tslib_1.__importDefault(require("ow"));
|
|
9
|
+
const access_checking_1 = require("./access_checking");
|
|
9
10
|
const storage_manager_1 = require("./storage_manager");
|
|
10
11
|
const utils_2 = require("./utils");
|
|
11
12
|
const configuration_1 = require("../configuration");
|
|
@@ -168,6 +169,7 @@ class RequestProvider {
|
|
|
168
169
|
* @param [options] Request queue operation options.
|
|
169
170
|
*/
|
|
170
171
|
async addRequest(requestLike, options = {}) {
|
|
172
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
171
173
|
(0, ow_1.default)(requestLike, ow_1.default.object);
|
|
172
174
|
(0, ow_1.default)(options, ow_1.default.object.exactShape({
|
|
173
175
|
forefront: ow_1.default.optional.boolean,
|
|
@@ -221,6 +223,7 @@ class RequestProvider {
|
|
|
221
223
|
* @param [options] Request queue operation options.
|
|
222
224
|
*/
|
|
223
225
|
async addRequests(requestsLike, options = {}) {
|
|
226
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
224
227
|
(0, ow_1.default)(requestsLike, ow_1.default.array);
|
|
225
228
|
(0, ow_1.default)(options, ow_1.default.object.exactShape({
|
|
226
229
|
forefront: ow_1.default.optional.boolean,
|
|
@@ -301,6 +304,7 @@ class RequestProvider {
|
|
|
301
304
|
* @param options Options for the request queue
|
|
302
305
|
*/
|
|
303
306
|
async addRequestsBatched(requests, options = {}) {
|
|
307
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
304
308
|
(0, ow_1.default)(requests, ow_1.default.array.ofType(ow_1.default.any(ow_1.default.string, ow_1.default.object.partialShape({ url: ow_1.default.string, id: ow_1.default.undefined }), ow_1.default.object.partialShape({ requestsFromUrl: ow_1.default.string, regex: ow_1.default.optional.regExp }))));
|
|
305
309
|
(0, ow_1.default)(options, ow_1.default.object.exactShape({
|
|
306
310
|
forefront: ow_1.default.optional.boolean,
|
|
@@ -364,6 +368,7 @@ class RequestProvider {
|
|
|
364
368
|
* @returns Returns the request object, or `null` if it was not found.
|
|
365
369
|
*/
|
|
366
370
|
async getRequest(id) {
|
|
371
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
367
372
|
(0, ow_1.default)(id, ow_1.default.string);
|
|
368
373
|
const requestOptions = await this.client.getRequest(id);
|
|
369
374
|
if (!requestOptions)
|
|
@@ -377,6 +382,7 @@ class RequestProvider {
|
|
|
377
382
|
* Handled requests will never again be returned by the `fetchNextRequest` function.
|
|
378
383
|
*/
|
|
379
384
|
async markRequestHandled(request) {
|
|
385
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
380
386
|
(0, ow_1.default)(request, ow_1.default.object.partialShape({
|
|
381
387
|
id: ow_1.default.string,
|
|
382
388
|
uniqueKey: ow_1.default.string,
|
|
@@ -405,6 +411,7 @@ class RequestProvider {
|
|
|
405
411
|
* For example, this lets you store the number of retries or error messages for the request.
|
|
406
412
|
*/
|
|
407
413
|
async reclaimRequest(request, options = {}) {
|
|
414
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
408
415
|
(0, ow_1.default)(request, ow_1.default.object.partialShape({
|
|
409
416
|
id: ow_1.default.string,
|
|
410
417
|
uniqueKey: ow_1.default.string,
|
|
@@ -422,17 +429,6 @@ class RequestProvider {
|
|
|
422
429
|
const queueOperationInfo = await this.client.updateRequest(request, { forefront });
|
|
423
430
|
queueOperationInfo.uniqueKey = request.uniqueKey;
|
|
424
431
|
this._cacheRequest((0, utils_2.getRequestId)(request.uniqueKey), queueOperationInfo);
|
|
425
|
-
// Wait a little to increase a chance that the next call to fetchNextRequest() will return the request with updated data.
|
|
426
|
-
// This is to compensate for the limitation of DynamoDB, where writes might not be immediately visible to subsequent reads.
|
|
427
|
-
setTimeout(() => {
|
|
428
|
-
if (!this.inProgress.has(request.id)) {
|
|
429
|
-
this.log.debug('The request is no longer marked as in progress in the queue?!', { requestId: request.id });
|
|
430
|
-
return;
|
|
431
|
-
}
|
|
432
|
-
this.inProgress.delete(request.id);
|
|
433
|
-
// Performance optimization: add request straight to head if possible
|
|
434
|
-
this._maybeAddRequestToQueueHead(request.id, forefront);
|
|
435
|
-
}, utils_2.STORAGE_CONSISTENCY_DELAY_MILLIS);
|
|
436
432
|
return queueOperationInfo;
|
|
437
433
|
}
|
|
438
434
|
/**
|
|
@@ -469,6 +465,8 @@ class RequestProvider {
|
|
|
469
465
|
* Caches information about request to beware of unneeded addRequest() calls.
|
|
470
466
|
*/
|
|
471
467
|
_cacheRequest(cacheKey, queueOperationInfo) {
|
|
468
|
+
// Remove the previous entry, as otherwise our cache will never update 👀
|
|
469
|
+
this.requestCache.remove(cacheKey);
|
|
472
470
|
this.requestCache.add(cacheKey, {
|
|
473
471
|
id: queueOperationInfo.requestId,
|
|
474
472
|
isHandled: queueOperationInfo.wasAlreadyHandled,
|
|
@@ -493,6 +491,7 @@ class RequestProvider {
|
|
|
493
491
|
* depending on the mode of operation.
|
|
494
492
|
*/
|
|
495
493
|
async drop() {
|
|
494
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
496
495
|
await this.client.delete();
|
|
497
496
|
const manager = storage_manager_1.StorageManager.getManager(this.constructor, this.config);
|
|
498
497
|
manager.closeStorage(this);
|
|
@@ -536,6 +535,7 @@ class RequestProvider {
|
|
|
536
535
|
* ```
|
|
537
536
|
*/
|
|
538
537
|
async getInfo() {
|
|
538
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
539
539
|
return this.client.get();
|
|
540
540
|
}
|
|
541
541
|
/**
|
|
@@ -597,6 +597,7 @@ class RequestProvider {
|
|
|
597
597
|
* @param [options] Open Request Queue options.
|
|
598
598
|
*/
|
|
599
599
|
static async open(queueIdOrName, options = {}) {
|
|
600
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
600
601
|
(0, ow_1.default)(queueIdOrName, ow_1.default.optional.any(ow_1.default.string, ow_1.default.null));
|
|
601
602
|
(0, ow_1.default)(options, ow_1.default.object.exactShape({
|
|
602
603
|
config: ow_1.default.optional.object.instanceOf(configuration_1.Configuration),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_provider.js","sourceRoot":"","sources":["../../src/storages/request_provider.ts"],"names":[],"mappings":";;;;AAAA,0DAAiE;AAEjE,gDAAwD;AAUxD,0CAAkE;AAClE,oDAAoB;AAGpB,uDAAmD;AACnD,mCAAsH;AACtH,oDAAiD;AAEjD,gCAA6B;AAE7B,wCAAqC;AAIrC,MAAsB,eAAe;IA2BjC,YAAY,OAAuC,EAAW,SAAS,6BAAa,CAAC,eAAe,EAAE;QAAjD;;;;mBAAS,MAAM;WAAkC;QA1BtG;;;;;WAAW;QACX;;;;;WAAc;QACd;;;;mBAAc,EAAE;WAAC;QACjB;;;;mBAAY,IAAA,gCAAoB,GAAE;WAAC;QACnC;;;;;WAA2B;QACjB;;;;;WAAwC;QAElD;;;;;WAAS;QACT;;;;mBAAwB,CAAC,GAAG,KAAM;WAAC,CAAC,4DAA4D;QAChG;;;;mBAAkB,CAAC,GAAG,EAAE;WAAC,CAAC,4DAA4D;QAEtF,mFAAmF;QACnF,mFAAmF;QACnF;;;;mBAAoB,CAAC;WAAC;QACtB;;;;mBAAsB,CAAC;WAAC;QAEhB;;;;mBAAe,CAAC;WAAC;QAEf;;;;mBAAe,IAAI,+BAAc,EAAU;WAAC;QAC5C;;;;;WAAuC;QACjD,gBAAgB;QAChB;;;;mBAAa,IAAI,GAAG,EAAU;WAAC;QACrB;;;;;WAAgD;QAEhD;;;;mBAA0B,KAAK;WAAC;QAGtC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE;YAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,WAAW;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAErD,IAAI,CAAC,YAAY,GAAG,IAAI,yBAAQ,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,4BAA4B,GAAG,IAAI,yBAAQ,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,8BAA8B,EAAE,CAAC,CAAC;QACxG,IAAI,CAAC,GAAG,GAAG,SAAG,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QAEpD,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAE9C,YAAY,CAAC,EAAE,wCAAsB,KAAK,IAAI,EAAE;YAC5C,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,eAAe;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,aAAa;QACT,OAAO,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC;IACtD,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,UAAU,CAAC,WAAmB,EAAE,UAAwC,EAAE;QAC5E,IAAA,YAAE,EAAC,WAAW,EAAE,YAAE,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7B,SAAS,EAAE,YAAE,CAAC,QAAQ,CAAC,OAAO;SACjC,CAAC,CAAC,CAAC;QAEJ,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;QAEtC,IAAI,iBAAiB,IAAI,WAAW,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAA6B,CAAC,CAAC;YACjF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAA6B,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAE3G,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,IAAA,YAAE,EAAC,WAAW,EAAE,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC;YACnC,GAAG,EAAE,YAAE,CAAC,MAAM;YACd,EAAE,EAAE,YAAE,CAAC,SAAS;SACnB,CAAC,CAAC,CAAC;QAEJ,MAAM,OAAO,GAAG,WAAW,YAAY,iBAAO;YAC1C,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAI,iBAAO,CAAC,WAAW,CAAC,CAAC;QAE/B,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEnD,IAAI,UAAU,EAAE,CAAC;YACb,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;YAC3B,OAAO;gBACH,iBAAiB,EAAE,IAAI;gBACvB,mFAAmF;gBACnF,0FAA0F;gBAC1F,iBAAiB,EAAE,UAAU,CAAC,SAAS;gBACvC,SAAS,EAAE,UAAU,CAAC,EAAE;gBACxB,SAAS,EAAE,UAAU,CAAC,SAAS;aAClC,CAAC;QACN,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAA8B,CAAC;QAC7G,kBAAkB,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAEjD,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,kBAAkB,CAAC;QAC5D,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAEjD,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7G,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAEzB,qEAAqE;YACrE,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,WAAW,CACb,YAAsB,EACtB,UAAwC,EAAE;QAE1C,IAAA,YAAE,EAAC,YAAY,EAAE,YAAE,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7B,SAAS,EAAE,YAAE,CAAC,QAAQ,CAAC,OAAO;SACjC,CAAC,CAAC,CAAC;QAEJ,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;QAEtC,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtD,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC7C,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAElD,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;YAE1B,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;YAC5C,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAEhD,OAAO,WAAW,CAAC;QACvB,CAAC,CAAC;QAEF,MAAM,OAAO,GAA2B;YACpC,iBAAiB,EAAE,EAAE;YACrB,mBAAmB,EAAE,EAAE;SAC1B,CAAC;QAEF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACrC,IAAI,iBAAiB,IAAI,WAAW,EAAE,CAAC;gBACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAA6B,CAAC,CAAC;gBACjF,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAA6B,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YACrF,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,YAAY;aACxB,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,IAAI,WAAW,CAAC,CAAC;aAC5D,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;YACjB,OAAO,WAAW,YAAY,iBAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,iBAAO,CAAC,WAA6B,CAAC,CAAC;QACrG,CAAC,CAAC,CAAC;QAEP,MAAM,aAAa,GAAG,IAAI,GAAG,EAAmB,CAAC;QAEjD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEnD,IAAI,UAAU,EAAE,CAAC;gBACb,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC;oBAC3B,iBAAiB,EAAE,IAAI;oBACvB,mFAAmF;oBACnF,0FAA0F;oBAC1F,iBAAiB,EAAE,UAAU,CAAC,SAAS;oBACvC,SAAS,EAAE,UAAU,CAAC,EAAE;oBACxB,SAAS,EAAE,UAAU,CAAC,SAAS;iBAClC,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/C,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;QACL,CAAC;QAED,yDAAyD;QACzD,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACtB,OAAO,OAAO,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAElG,8BAA8B;QAC9B,OAAO,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,CAAC;QAE7D,yCAAyC;QACzC,KAAK,MAAM,UAAU,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC;YACpD,4CAA4C;YAC5C,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE3C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAE1D,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC;YACpD,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAEzC,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7G,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAEzB,qEAAqE;gBACrE,IAAI,CAAC,2BAA2B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAC3D,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,kBAAkB,CAAC,QAA6B,EAAE,UAAqC,EAAE;QAC3F,IAAA,YAAE,EAAC,QAAQ,EAAE,YAAE,CAAC,KAAK,CAAC,MAAM,CAAC,YAAE,CAAC,GAAG,CAC/B,YAAE,CAAC,MAAM,EACT,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,YAAE,CAAC,MAAM,EAAE,EAAE,EAAE,YAAE,CAAC,SAAS,EAAE,CAAC,EAC5D,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,eAAe,EAAE,YAAE,CAAC,MAAM,EAAE,KAAK,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CACpF,CAAC,CAAC,CAAC;QACJ,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7B,SAAS,EAAE,YAAE,CAAC,QAAQ,CAAC,OAAO;YAC9B,2BAA2B,EAAE,YAAE,CAAC,QAAQ,CAAC,OAAO;YAChD,SAAS,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;YAC7B,wBAAwB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;SAC/C,CAAC,CAAC,CAAC;QAEJ,MAAM,EACF,SAAS,GAAG,IAAI,EAChB,wBAAwB,GAAG,IAAI,GAClC,GAAG,OAAO,CAAC;QACZ,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC1B,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;gBAChE,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,IAAI,CAAC,IAAI,iBAAO,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAsB,CAAC,CAAC,CAAC;YACvG,CAAC;QACL,CAAC;QAED,MAAM,uCAAuC,GAAG,KAAK,EAAE,gBAA2B,EAAE,EAAE;YAClF,MAAM,eAAe,GAAuB,EAAE,CAAC;YAC/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YAC7F,eAAe,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAErD,IAAI,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC;gBACvC,MAAM,IAAA,aAAK,EAAC,wBAAwB,CAAC,CAAC;gBAEtC,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,uCAAuC,CACjE,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAC1G,CAAC,CAAC;YACP,CAAC;YAED,OAAO,eAAe,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAExD,8DAA8D;QAC9D,MAAM,aAAa,GAAG,MAAM,uCAAuC,CAAC,YAAY,CAAC,CAAC;QAElF,mDAAmD;QACnD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO;gBACH,aAAa;gBACb,2BAA2B,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;aACnD,CAAC;QACN,CAAC;QAED,qDAAqD;QACrD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAqB,KAAK,EAAE,OAAO,EAAE,EAAE;YAC9D,MAAM,MAAM,GAAG,IAAA,aAAK,EAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YAC/C,MAAM,kBAAkB,GAAuB,EAAE,CAAC;YAElD,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;gBAChC,kBAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,uCAAuC,CAAC,YAAY,CAAC,CAAC,CAAC;gBAExF,MAAM,IAAA,aAAK,EAAC,wBAAwB,CAAC,CAAC;YAC1C,CAAC;YAED,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,0GAA0G;QAC1G,IAAI,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACtC,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,CAAC;QACzC,CAAC;QAED,OAAO;YACH,aAAa;YACb,2BAA2B,EAAE,OAAO;SACvC,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAoC,EAAU;QAC1D,IAAA,YAAE,EAAC,EAAE,EAAE,YAAE,CAAC,MAAM,CAAC,CAAC;QAElB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QAEjC,OAAO,IAAI,iBAAO,CAAC,cAA2C,CAAC,CAAC;IACpE,CAAC;IAID;;;;;OAKG;IACH,KAAK,CAAC,kBAAkB,CAAC,OAAgB;QACrC,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC;YAC/B,EAAE,EAAE,YAAE,CAAC,MAAM;YACb,SAAS,EAAE,YAAE,CAAC,MAAM;YACpB,SAAS,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;SAChC,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,OAAO,CAAC,EAAE,6CAA6C,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1H,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAChE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAA8B,CAAC;QACnH,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QAC9B,kBAAkB,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAEjD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAExD,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;YACxC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAA,oBAAY,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAExE,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,OAAgB,EAAE,UAAwC,EAAE;QAC7E,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC;YAC/B,EAAE,EAAE,YAAE,CAAC,MAAM;YACb,SAAS,EAAE,YAAE,CAAC,MAAM;SACvB,CAAC,CAAC,CAAC;QACJ,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7B,SAAS,EAAE,YAAE,CAAC,QAAQ,CAAC,OAAO;SACjC,CAAC,CAAC,CAAC;QAEJ,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,OAAO,CAAC,EAAE,kCAAkC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAClH,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,oEAAoE;QACpE,wEAAwE;QACxE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAA8B,CAAC;QAChH,kBAAkB,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACjD,IAAI,CAAC,aAAa,CAAC,IAAA,oBAAY,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAExE,yHAAyH;QACzH,2HAA2H;QAC3H,UAAU,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+DAA+D,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3G,OAAO;YACX,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEnC,qEAAqE;YACrE,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC5D,CAAC,EAAE,wCAAgC,CAAC,CAAC;QAErC,OAAO,kBAAkB,CAAC;IAC9B,CAAC;IAID;;;;;OAKG;IACH,KAAK,CAAC,OAAO;QACT,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU;QACZ,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QAE/E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7D,OAAO,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAC1E,CAAC;IAES,MAAM;QACZ,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,CAAC;QAC1C,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,QAAgB,EAAE,kBAA6C;QACnF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC5B,EAAE,EAAE,kBAAkB,CAAC,SAAS;YAChC,SAAS,EAAE,kBAAkB,CAAC,iBAAiB;YAC/C,SAAS,EAAE,kBAAkB,CAAC,SAAS;YACvC,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI;SACtB,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACO,2BAA2B,CAAC,SAAiB,EAAE,SAAkB;QACvE,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,IAAI,CAAC,iBAAiB,GAAG,6BAAqB,EAAE,CAAC;YACxD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,gCAAc,CAAC,UAAU,CAAC,IAAI,CAAC,WAAoC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAClG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,YAAY;QACd,gFAAgF;QAChF,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3D,OAAO,mBAAmB,IAAI,CAAC,CAAC;IACpC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,KAAK,CAAC,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,qBAAqB,CAAC,MAAsB;QACxD,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;QAEzD,2CAA2C;QAC3C,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACD,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC5I,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,eAAe,KAAK,GAAG,EAAE,CAAC,CAAC;QACnF,CAAC;QAED,sCAAsC;QACtC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0CAA0C,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;YACzF,OAAO,EAAE,CAAC;QACd,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,mBAAmB,CAAC,MAAsB,EAAE,eAAiC,EAAE,OAAqC;QAChI,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QAC1C,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAElF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qDAAqD,EAAE;YACjE,eAAe;YACf,KAAK;YACL,YAAY,EAAE,eAAe,CAAC,MAAM;YACpC,aAAa,EAAE,aAAa,CAAC,MAAM;YACnC,cAAc,EAAE,eAAe,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM;YAC7D,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACtD,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IACzB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAA+D;QAC7F,OAAO,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAA6B,EAAE,UAAiC,EAAE;QAChF,IAAA,YAAE,EAAC,aAAa,EAAE,YAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAE,CAAC,MAAM,EAAE,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,IAAA,YAAE,EAAC,OAAO,EAAE,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC7B,MAAM,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,6BAAa,CAAC;YACpD,aAAa,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;YACjC,kBAAkB,EAAE,YAAE,CAAC,QAAQ,CAAC,MAAM;SACzC,CAAC,CAAC,CAAC;QAEJ,OAAO,CAAC,MAAM,KAAd,OAAO,CAAC,MAAM,GAAK,6BAAa,CAAC,eAAe,EAAE,EAAC;QACnD,OAAO,CAAC,aAAa,KAArB,OAAO,CAAC,aAAa,GAAK,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAC;QAE5D,MAAM,IAAA,4BAAoB,EAAC,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3G,MAAM,OAAO,GAAG,gCAAc,CAAC,UAAU,CAAC,IAAmC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/F,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9E,KAAK,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAEtD,wCAAwC;QACxC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,iBAAiB,IAAI,CAAC,CAAC;QAE3E,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA/mBD,0CA+mBC"}
|
|
1
|
+
{"version":3,"file":"request_provider.js","sourceRoot":"","sources":["../../src/storages/request_provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_queue.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EACvB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"request_queue.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EACvB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AASrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAW1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,qBAAa,YAAa,SAAQ,eAAe;IAC7C,OAAO,CAAC,qBAAqB,CAAC,CAMb;IAEjB,OAAO,CAAC,YAAY,CAAc;IAElC;;OAEG;gBACS,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAkC;IASrF;;;;;;;;;;;;;;;;OAgBG;IACY,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;cA4DvE,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9D;;;;;;;;;;OAUG;cACa,qBAAqB,CACjC,iBAAiB,UAAQ,EACzB,KAAK,SAA8E,EACnF,SAAS,SAAI,GACd,OAAO,CAAC,OAAO,CAAC;IA2FJ,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAe9B,UAAU,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAO7D,WAAW,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IAO/D,kBAAkB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAO7E,kBAAkB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAO7E,cAAc,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;cA2BjE,MAAM;WAKH,IAAI,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;CAGtG"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RequestQueue = void 0;
|
|
4
4
|
const promises_1 = require("node:timers/promises");
|
|
5
5
|
const consts_1 = require("@apify/consts");
|
|
6
|
+
const access_checking_1 = require("./access_checking");
|
|
6
7
|
const request_provider_1 = require("./request_provider");
|
|
7
8
|
const utils_1 = require("./utils");
|
|
8
9
|
const configuration_1 = require("../configuration");
|
|
@@ -101,6 +102,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
101
102
|
* Returns the request object or `null` if there are no more pending requests.
|
|
102
103
|
*/
|
|
103
104
|
async fetchNextRequest() {
|
|
105
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
104
106
|
await this.ensureHeadIsNonEmpty();
|
|
105
107
|
const nextRequestId = this.queueHeadIds.removeFirst();
|
|
106
108
|
// We are likely done at this point.
|
|
@@ -243,6 +245,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
243
245
|
}
|
|
244
246
|
// RequestQueue v1 behavior overrides below
|
|
245
247
|
async isFinished() {
|
|
248
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
246
249
|
if ((Date.now() - +this.lastActivity) > this.internalTimeoutMillis) {
|
|
247
250
|
const message = `The request queue seems to be stuck for ${this.internalTimeoutMillis / 1e3}s, resetting internal state.`;
|
|
248
251
|
this.log.warning(message, { inProgress: [...this.inProgress] });
|
|
@@ -254,24 +257,43 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
254
257
|
return isHeadConsistent && this.queueHeadIds.length() === 0 && this.inProgressCount() === 0;
|
|
255
258
|
}
|
|
256
259
|
async addRequest(...args) {
|
|
260
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
257
261
|
this.lastActivity = new Date();
|
|
258
262
|
return super.addRequest(...args);
|
|
259
263
|
}
|
|
260
264
|
async addRequests(...args) {
|
|
265
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
261
266
|
this.lastActivity = new Date();
|
|
262
267
|
return super.addRequests(...args);
|
|
263
268
|
}
|
|
264
269
|
async addRequestsBatched(...args) {
|
|
270
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
265
271
|
this.lastActivity = new Date();
|
|
266
272
|
return super.addRequestsBatched(...args);
|
|
267
273
|
}
|
|
268
274
|
async markRequestHandled(...args) {
|
|
275
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
269
276
|
this.lastActivity = new Date();
|
|
270
277
|
return super.markRequestHandled(...args);
|
|
271
278
|
}
|
|
272
279
|
async reclaimRequest(...args) {
|
|
280
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
273
281
|
this.lastActivity = new Date();
|
|
274
|
-
|
|
282
|
+
const [request, options] = args;
|
|
283
|
+
const forefront = options?.forefront ?? false;
|
|
284
|
+
const result = await super.reclaimRequest(...args);
|
|
285
|
+
// Wait a little to increase a chance that the next call to fetchNextRequest() will return the request with updated data.
|
|
286
|
+
// This is to compensate for the limitation of DynamoDB, where writes might not be immediately visible to subsequent reads.
|
|
287
|
+
setTimeout(() => {
|
|
288
|
+
if (!this.inProgress.has(request.id)) {
|
|
289
|
+
this.log.debug('The request is no longer marked as in progress in the queue?!', { requestId: request.id });
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
292
|
+
this.inProgress.delete(request.id);
|
|
293
|
+
// Performance optimization: add request straight to head if possible
|
|
294
|
+
this._maybeAddRequestToQueueHead(request.id, forefront);
|
|
295
|
+
}, utils_1.STORAGE_CONSISTENCY_DELAY_MILLIS);
|
|
296
|
+
return result;
|
|
275
297
|
}
|
|
276
298
|
_reset() {
|
|
277
299
|
super._reset();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_queue.js","sourceRoot":"","sources":["../../src/storages/request_queue.ts"],"names":[],"mappings":";;;AAAA,mDAA2D;AAE3D,0CAA6D;
|
|
1
|
+
{"version":3,"file":"request_queue.js","sourceRoot":"","sources":["../../src/storages/request_queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_queue_v2.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue_v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"request_queue_v2.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue_v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,KAAK,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAY1C,cAAM,YAAa,SAAQ,eAAe;IACtC,OAAO,CAAC,uBAAuB,CAA8B;gBAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAkC;IAmBrF;;OAEG;cACgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,kBAAkB,EAAE,yBAAyB,GAAG,IAAI;IAgBvG;;;;;;;;;;;;;;;;OAgBG;IACY,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAgEjF,cAAc,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,GAAG,UAAU,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;cAwBpH,oBAAoB;YAoBtB,gBAAgB;YAoChB,mBAAmB;YAoFnB,mBAAmB;cAgBd,MAAM;cAON,2BAA2B;cAI9B,mBAAmB;WAgBb,IAAI,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;CAGtG;AAED,OAAO,EAAE,YAAY,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RequestQueueV2 = void 0;
|
|
4
|
+
const access_checking_1 = require("./access_checking");
|
|
4
5
|
const request_provider_1 = require("./request_provider");
|
|
5
6
|
const utils_1 = require("./utils");
|
|
6
7
|
const configuration_1 = require("../configuration");
|
|
@@ -38,7 +39,9 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
38
39
|
* Caches information about request to beware of unneeded addRequest() calls.
|
|
39
40
|
*/
|
|
40
41
|
_cacheRequest(cacheKey, queueOperationInfo) {
|
|
42
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
41
43
|
super._cacheRequest(cacheKey, queueOperationInfo);
|
|
44
|
+
this.requestCache.remove(queueOperationInfo.requestId);
|
|
42
45
|
this.requestCache.add(queueOperationInfo.requestId, {
|
|
43
46
|
id: queueOperationInfo.requestId,
|
|
44
47
|
isHandled: queueOperationInfo.wasAlreadyHandled,
|
|
@@ -65,6 +68,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
65
68
|
* Returns the request object or `null` if there are no more pending requests.
|
|
66
69
|
*/
|
|
67
70
|
async fetchNextRequest() {
|
|
71
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
68
72
|
await this.ensureHeadIsNonEmpty();
|
|
69
73
|
const nextRequestId = this.queueHeadIds.removeFirst();
|
|
70
74
|
// We are likely done at this point.
|
|
@@ -115,9 +119,14 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
115
119
|
return request;
|
|
116
120
|
}
|
|
117
121
|
async reclaimRequest(...args) {
|
|
122
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
118
123
|
const res = await super.reclaimRequest(...args);
|
|
119
124
|
if (res) {
|
|
120
125
|
const [request, options] = args;
|
|
126
|
+
// Mark the request as no longer in progress,
|
|
127
|
+
// as the moment we delete the lock, we could end up also re-fetching the request in a subsequent ensureHeadIsNonEmpty()
|
|
128
|
+
// which could potentially lock the request again
|
|
129
|
+
this.inProgress.delete(request.id);
|
|
121
130
|
// Try to delete the request lock if possible
|
|
122
131
|
try {
|
|
123
132
|
await this.client.deleteRequestLock(request.id, { forefront: options?.forefront ?? false });
|
|
@@ -129,6 +138,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
129
138
|
return res;
|
|
130
139
|
}
|
|
131
140
|
async ensureHeadIsNonEmpty() {
|
|
141
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
132
142
|
// Stop fetching if we are paused for migration
|
|
133
143
|
if (this.queuePausedForMigration) {
|
|
134
144
|
return;
|
|
@@ -143,10 +153,25 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
143
153
|
await this._listHeadAndLockPromise;
|
|
144
154
|
}
|
|
145
155
|
async _listHeadAndLock() {
|
|
156
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
146
157
|
const headData = await this.client.listAndLockHead({ limit: 25, lockSecs: this.requestLockSecs });
|
|
147
158
|
for (const { id, uniqueKey } of headData.items) {
|
|
148
159
|
// Queue head index might be behind the main table, so ensure we don't recycle requests
|
|
149
160
|
if (!id || !uniqueKey || this.inProgress.has(id) || this.recentlyHandledRequestsCache.get(id)) {
|
|
161
|
+
this.log.debug(`Skipping request from queue head, already in progress or recently handled`, {
|
|
162
|
+
id,
|
|
163
|
+
uniqueKey,
|
|
164
|
+
inProgress: this.inProgress.has(id),
|
|
165
|
+
recentlyHandled: !!this.recentlyHandledRequestsCache.get(id),
|
|
166
|
+
});
|
|
167
|
+
// Remove the lock from the request for now, so that it can be picked up later
|
|
168
|
+
// This may/may not succeed, but that's fine
|
|
169
|
+
try {
|
|
170
|
+
await this.client.deleteRequestLock(id);
|
|
171
|
+
}
|
|
172
|
+
catch {
|
|
173
|
+
// Ignore
|
|
174
|
+
}
|
|
150
175
|
continue;
|
|
151
176
|
}
|
|
152
177
|
this.queueHeadIds.add(id, id, false);
|
|
@@ -159,6 +184,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
159
184
|
}
|
|
160
185
|
}
|
|
161
186
|
async getOrHydrateRequest(requestId) {
|
|
187
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
162
188
|
const cachedEntry = this.requestCache.get(requestId);
|
|
163
189
|
if (!cachedEntry) {
|
|
164
190
|
// 2.1. Attempt to prolong the request lock to see if we still own the request
|
|
@@ -224,6 +250,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
224
250
|
return hydratedRequest;
|
|
225
251
|
}
|
|
226
252
|
async _prolongRequestLock(requestId) {
|
|
253
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
227
254
|
try {
|
|
228
255
|
const res = await this.client.prolongRequestLock(requestId, { lockSecs: this.requestLockSecs });
|
|
229
256
|
return res.lockExpiresAt;
|
|
@@ -237,6 +264,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
237
264
|
}
|
|
238
265
|
}
|
|
239
266
|
_reset() {
|
|
267
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
240
268
|
super._reset();
|
|
241
269
|
this._listHeadAndLockPromise = null;
|
|
242
270
|
}
|
|
@@ -244,6 +272,7 @@ class RequestQueue extends request_provider_1.RequestProvider {
|
|
|
244
272
|
// Do nothing for request queue v2, as we are only able to lock requests when listing the head
|
|
245
273
|
}
|
|
246
274
|
async _clearPossibleLocks() {
|
|
275
|
+
(0, access_checking_1.checkStorageAccess)();
|
|
247
276
|
this.queuePausedForMigration = true;
|
|
248
277
|
let requestId;
|
|
249
278
|
// eslint-disable-next-line no-cond-assign
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_queue_v2.js","sourceRoot":"","sources":["../../src/storages/request_queue_v2.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"request_queue_v2.js","sourceRoot":"","sources":["../../src/storages/request_queue_v2.ts"],"names":[],"mappings":"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"}
|