@crawlee/core 4.0.0-beta.66 → 4.0.0-beta.68
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 +10 -10
- package/autoscaling/snapshotter.js +1 -1
- package/autoscaling/snapshotter.js.map +1 -1
- package/configuration.d.ts +3 -0
- package/configuration.d.ts.map +1 -1
- package/configuration.js +3 -0
- package/configuration.js.map +1 -1
- package/crawlers/statistics.d.ts +1 -1
- package/crawlers/statistics.js +2 -2
- package/crawlers/statistics.js.map +1 -1
- package/events/event_manager.d.ts +26 -2
- package/events/event_manager.d.ts.map +1 -1
- package/events/event_manager.js +1 -0
- package/events/event_manager.js.map +1 -1
- package/index.d.ts +2 -1
- package/index.d.ts.map +1 -1
- package/index.js +1 -0
- package/index.js.map +1 -1
- package/memory-storage/consts.d.ts +5 -0
- package/memory-storage/consts.d.ts.map +1 -0
- package/memory-storage/consts.js +5 -0
- package/memory-storage/consts.js.map +1 -0
- package/memory-storage/index.d.ts +2 -0
- package/memory-storage/index.d.ts.map +1 -0
- package/memory-storage/index.js +2 -0
- package/memory-storage/index.js.map +1 -0
- package/memory-storage/memory-storage.d.ts +47 -0
- package/memory-storage/memory-storage.d.ts.map +1 -0
- package/memory-storage/memory-storage.js +137 -0
- package/memory-storage/memory-storage.js.map +1 -0
- package/memory-storage/resource-clients/common/base-client.d.ts +5 -0
- package/memory-storage/resource-clients/common/base-client.d.ts.map +1 -0
- package/memory-storage/resource-clients/common/base-client.js +7 -0
- package/memory-storage/resource-clients/common/base-client.js.map +1 -0
- package/memory-storage/resource-clients/dataset.d.ts +41 -0
- package/memory-storage/resource-clients/dataset.d.ts.map +1 -0
- package/memory-storage/resource-clients/dataset.js +114 -0
- package/memory-storage/resource-clients/dataset.js.map +1 -0
- package/memory-storage/resource-clients/key-value-store.d.ts +64 -0
- package/memory-storage/resource-clients/key-value-store.d.ts.map +1 -0
- package/memory-storage/resource-clients/key-value-store.js +204 -0
- package/memory-storage/resource-clients/key-value-store.js.map +1 -0
- package/memory-storage/resource-clients/request-queue.d.ts +97 -0
- package/memory-storage/resource-clients/request-queue.d.ts.map +1 -0
- package/memory-storage/resource-clients/request-queue.js +422 -0
- package/memory-storage/resource-clients/request-queue.js.map +1 -0
- package/memory-storage/utils.d.ts +12 -0
- package/memory-storage/utils.d.ts.map +1 -0
- package/memory-storage/utils.js +28 -0
- package/memory-storage/utils.js.map +1 -0
- package/package.json +8 -5
- package/request.d.ts +10 -2
- package/request.d.ts.map +1 -1
- package/request.js +25 -7
- package/request.js.map +1 -1
- package/service_locator.d.ts +17 -17
- package/service_locator.d.ts.map +1 -1
- package/service_locator.js +31 -26
- package/service_locator.js.map +1 -1
- package/session_pool/consts.d.ts +1 -1
- package/session_pool/consts.d.ts.map +1 -1
- package/session_pool/consts.js +1 -1
- package/session_pool/consts.js.map +1 -1
- package/session_pool/session_pool.d.ts +1 -1
- package/storages/access_checking.d.ts.map +1 -1
- package/storages/access_checking.js +5 -1
- package/storages/access_checking.js.map +1 -1
- package/storages/dataset.d.ts +10 -3
- package/storages/dataset.d.ts.map +1 -1
- package/storages/dataset.js +28 -13
- package/storages/dataset.js.map +1 -1
- package/storages/index.d.ts +2 -0
- package/storages/index.d.ts.map +1 -1
- package/storages/index.js +2 -0
- package/storages/index.js.map +1 -1
- package/storages/key_value_store.d.ts +61 -13
- package/storages/key_value_store.d.ts.map +1 -1
- package/storages/key_value_store.js +119 -86
- package/storages/key_value_store.js.map +1 -1
- package/storages/key_value_store_codec.d.ts +33 -0
- package/storages/key_value_store_codec.d.ts.map +1 -0
- package/storages/key_value_store_codec.js +114 -0
- package/storages/key_value_store_codec.js.map +1 -0
- package/storages/request_list.js +2 -2
- package/storages/request_list.js.map +1 -1
- package/storages/request_manager.d.ts +2 -2
- package/storages/request_manager.d.ts.map +1 -1
- package/storages/request_manager_tandem.d.ts +1 -1
- package/storages/request_manager_tandem.d.ts.map +1 -1
- package/storages/request_manager_tandem.js +5 -4
- package/storages/request_manager_tandem.js.map +1 -1
- package/storages/request_queue.d.ts +13 -6
- package/storages/request_queue.d.ts.map +1 -1
- package/storages/request_queue.js +44 -27
- package/storages/request_queue.js.map +1 -1
- package/storages/storage_instance_manager.d.ts +10 -10
- package/storages/storage_instance_manager.d.ts.map +1 -1
- package/storages/storage_instance_manager.js +33 -33
- package/storages/storage_instance_manager.js.map +1 -1
- package/storages/storage_stats.d.ts +49 -0
- package/storages/storage_stats.d.ts.map +1 -0
- package/storages/storage_stats.js +30 -0
- package/storages/storage_stats.js.map +1 -0
- package/storages/utils.d.ts +7 -7
- package/storages/utils.d.ts.map +1 -1
- package/storages/utils.js +4 -4
- package/storages/utils.js.map +1 -1
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import contentTypeParser from 'content-type';
|
|
2
|
+
import { isBuffer, isStream } from '@crawlee/utils';
|
|
3
|
+
import JSON5 from 'json5';
|
|
4
|
+
import { jsonStringifyExtended } from '@apify/utilities';
|
|
5
|
+
const CONTENT_TYPE_JSON = 'application/json';
|
|
6
|
+
const STRINGIFIABLE_CONTENT_TYPE_RXS = [new RegExp(`^${CONTENT_TYPE_JSON}$`, 'i'), /^application\/.*xml$/i, /^text\//i];
|
|
7
|
+
/**
|
|
8
|
+
* Canonical write path for key-value store records.
|
|
9
|
+
*
|
|
10
|
+
* When a content type is provided, the value passes through unchanged — it is the caller's
|
|
11
|
+
* responsibility to supply a String/Buffer/Stream (the frontend validates this).
|
|
12
|
+
*
|
|
13
|
+
* When no content type is provided, it is inferred from the value's shape:
|
|
14
|
+
* - Buffer / typed array / ArrayBuffer / stream → `application/octet-stream` (passthrough)
|
|
15
|
+
* - `string` → `text/plain; charset=utf-8` (passthrough)
|
|
16
|
+
* - anything else → `application/json; charset=utf-8` (serialized via `jsonStringifyExtended`)
|
|
17
|
+
*
|
|
18
|
+
* Does NOT drain streams — that is storage mechanics and stays in the storage backend.
|
|
19
|
+
*
|
|
20
|
+
* Backend-independent.
|
|
21
|
+
*/
|
|
22
|
+
export function serializeValue(value, contentType) {
|
|
23
|
+
if (contentType !== null && contentType !== undefined) {
|
|
24
|
+
return { value: value, contentType };
|
|
25
|
+
}
|
|
26
|
+
if (isStream(value) || isBuffer(value)) {
|
|
27
|
+
return {
|
|
28
|
+
value,
|
|
29
|
+
contentType: 'application/octet-stream',
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
if (typeof value === 'string') {
|
|
33
|
+
return { value, contentType: 'text/plain; charset=utf-8' };
|
|
34
|
+
}
|
|
35
|
+
let serialized;
|
|
36
|
+
try {
|
|
37
|
+
// Format JSON to simplify debugging, the overheads with compression is negligible
|
|
38
|
+
serialized = jsonStringifyExtended(value, null, 2);
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
const error = e;
|
|
42
|
+
// Give more meaningful error message
|
|
43
|
+
if (error.message?.includes('Invalid string length')) {
|
|
44
|
+
error.message = 'Object is too large';
|
|
45
|
+
}
|
|
46
|
+
throw new Error(`The "value" parameter cannot be stringified to JSON: ${error.message}`);
|
|
47
|
+
}
|
|
48
|
+
if (serialized === undefined) {
|
|
49
|
+
throw new Error('The "value" parameter was stringified to JSON and returned undefined. ' +
|
|
50
|
+
"Make sure you're not trying to stringify an undefined value.");
|
|
51
|
+
}
|
|
52
|
+
return { value: serialized, contentType: 'application/json; charset=utf-8' };
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Parses a Buffer or ArrayBuffer using the provided content type header.
|
|
56
|
+
*
|
|
57
|
+
* - application/json is returned as a parsed object.
|
|
58
|
+
* - application/*xml and text/* are returned as strings.
|
|
59
|
+
* - everything else is returned as original body.
|
|
60
|
+
*
|
|
61
|
+
* If the header includes a charset, the body will be stringified only
|
|
62
|
+
* if the charset represents a known encoding to Node.js or Browser.
|
|
63
|
+
*
|
|
64
|
+
* Backend-independent — this is the canonical read path for the {@link KeyValueStore} frontend.
|
|
65
|
+
*/
|
|
66
|
+
export function parseValue(body, contentTypeHeader) {
|
|
67
|
+
// No content type at all → we have no basis for interpretation; hand back the raw value.
|
|
68
|
+
if (contentTypeHeader === null)
|
|
69
|
+
return body;
|
|
70
|
+
let contentType;
|
|
71
|
+
let charset;
|
|
72
|
+
try {
|
|
73
|
+
const result = contentTypeParser.parse(contentTypeHeader);
|
|
74
|
+
contentType = result.type;
|
|
75
|
+
charset = result.parameters.charset;
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
// Unparseable header → keep the original value rather than a mangled string.
|
|
79
|
+
return body;
|
|
80
|
+
}
|
|
81
|
+
// If we can't successfully interpret it, we return the original value rather than mangling it.
|
|
82
|
+
if (!areDataStringifiable(contentType, charset))
|
|
83
|
+
return body;
|
|
84
|
+
// Decode raw bytes using the resolved charset. An already-decoded string passes through (callers
|
|
85
|
+
// may hand us one directly), avoiding a needless re-encode round-trip.
|
|
86
|
+
const dataString = typeof body === 'string' ? body : isomorphicBufferToString(body, charset);
|
|
87
|
+
return contentType === CONTENT_TYPE_JSON ? JSON5.parse(dataString) : dataString;
|
|
88
|
+
}
|
|
89
|
+
function isomorphicBufferToString(buffer, encoding) {
|
|
90
|
+
if (buffer.constructor.name !== ArrayBuffer.name) {
|
|
91
|
+
return buffer.toString(encoding);
|
|
92
|
+
}
|
|
93
|
+
// In Node, wrap the ArrayBuffer in a Buffer so the resolved charset is honored (the caller already
|
|
94
|
+
// checked it via `Buffer.isEncoding`). Only the browser, which lacks Buffer, is limited to UTF-8.
|
|
95
|
+
if (typeof Buffer !== 'undefined') {
|
|
96
|
+
return Buffer.from(buffer).toString(encoding);
|
|
97
|
+
}
|
|
98
|
+
const decoder = new TextDecoder(encoding);
|
|
99
|
+
return decoder.decode(new Uint8Array(buffer));
|
|
100
|
+
}
|
|
101
|
+
function isCharsetStringifiable(charset) {
|
|
102
|
+
if (!charset)
|
|
103
|
+
return true; // hope that it's utf-8
|
|
104
|
+
return Buffer.isEncoding(charset);
|
|
105
|
+
}
|
|
106
|
+
function isContentTypeStringifiable(contentType) {
|
|
107
|
+
if (!contentType)
|
|
108
|
+
return false; // keep buffer
|
|
109
|
+
return STRINGIFIABLE_CONTENT_TYPE_RXS.some((rx) => rx.test(contentType));
|
|
110
|
+
}
|
|
111
|
+
function areDataStringifiable(contentType, charset) {
|
|
112
|
+
return isContentTypeStringifiable(contentType) && isCharsetStringifiable(charset);
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=key_value_store_codec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key_value_store_codec.js","sourceRoot":"","sources":["../../src/storages/key_value_store_codec.ts"],"names":[],"mappings":"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"}
|
package/storages/request_list.js
CHANGED
|
@@ -139,8 +139,8 @@ export class RequestList {
|
|
|
139
139
|
proxyConfiguration: ow.optional.object,
|
|
140
140
|
httpClient: ow.optional.object,
|
|
141
141
|
}));
|
|
142
|
-
this.persistStateKey = persistStateKey ? `
|
|
143
|
-
this.persistRequestsKey = persistRequestsKey ? `
|
|
142
|
+
this.persistStateKey = persistStateKey ? `CRAWLEE_${persistStateKey}` : persistStateKey;
|
|
143
|
+
this.persistRequestsKey = persistRequestsKey ? `CRAWLEE_${persistRequestsKey}` : persistRequestsKey;
|
|
144
144
|
this.initialState = state;
|
|
145
145
|
this.httpClient = httpClient;
|
|
146
146
|
// If this option is set then all requests will get a pre-generated unique ID and duplicate URLs will be kept in the list.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_list.js","sourceRoot":"","sources":["../../src/storages/request_list.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request_list.js","sourceRoot":"","sources":["../../src/storages/request_list.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,10 +25,10 @@ export interface IRequestManager extends IRequestLoader {
|
|
|
25
25
|
* Tells the manager how long a consumer expects to hold a request fetched via `fetchNextRequest()`
|
|
26
26
|
* before marking it handled or reclaiming it (typically the request-handler timeout plus padding).
|
|
27
27
|
*
|
|
28
|
-
* Managers backed by a storage
|
|
28
|
+
* Managers backed by a storage backend that reserves requests via locking use this to avoid handing
|
|
29
29
|
* the same request out again while it is still being processed. Implementations that do not need
|
|
30
30
|
* this hint may leave it `undefined`.
|
|
31
31
|
*/
|
|
32
|
-
setExpectedRequestProcessingTimeSecs?(secs: number): void
|
|
32
|
+
setExpectedRequestProcessingTimeSecs?(secs: number): Promise<void>;
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=request_manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_manager.d.ts","sourceRoot":"","sources":["../../src/storages/request_manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EACR,yBAAyB,EACzB,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC/B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAE5G;;;GAGG;AACH,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACnD;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAC;IAEpH,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAE5G,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAEnH;;;;;OAKG;IACH,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;;;OAOG;IACH,oCAAoC,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"request_manager.d.ts","sourceRoot":"","sources":["../../src/storages/request_manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EACR,yBAAyB,EACzB,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC/B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAE5G;;;GAGG;AACH,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACnD;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAC;IAEpH,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAE5G,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAEnH;;;;;OAKG;IACH,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;;;;;;OAOG;IACH,oCAAoC,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE"}
|
|
@@ -102,6 +102,6 @@ export declare class RequestManagerTandem implements IRequestManager {
|
|
|
102
102
|
* reserved. The manager is opened lazily, so the value is remembered and applied once it resolves.
|
|
103
103
|
* @inheritdoc
|
|
104
104
|
*/
|
|
105
|
-
setExpectedRequestProcessingTimeSecs(secs: number): void
|
|
105
|
+
setExpectedRequestProcessingTimeSecs(secs: number): Promise<void>;
|
|
106
106
|
}
|
|
107
107
|
//# sourceMappingURL=request_manager_tandem.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_manager_tandem.d.ts","sourceRoot":"","sources":["../../src/storages/request_manager_tandem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EACR,yBAAyB,EACzB,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC/B,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,qBAAa,oBAAqB,YAAW,eAAe;IACxD,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAA2B;IACzD,OAAO,CAAC,sBAAsB,CAAC,CAAkB;IAEjD,OAAO,CAAC,qBAAqB,CAAmD;IAEhF;;;OAGG;IACH,OAAO,CAAC,6BAA6B,CAAC,CAAS;IAE/C;;;;;OAKG;gBAEC,aAAa,EAAE,cAAc,EAC7B,cAAc,EAAE,eAAe,GAAG,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAOxF;;;OAGG;YACW,iBAAiB;
|
|
1
|
+
{"version":3,"file":"request_manager_tandem.d.ts","sourceRoot":"","sources":["../../src/storages/request_manager_tandem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EACR,yBAAyB,EACzB,wBAAwB,EACxB,yBAAyB,EACzB,4BAA4B,EAC/B,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,qBAAa,oBAAqB,YAAW,eAAe;IACxD,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAA2B;IACzD,OAAO,CAAC,sBAAsB,CAAC,CAAkB;IAEjD,OAAO,CAAC,qBAAqB,CAAmD;IAEhF;;;OAGG;IACH,OAAO,CAAC,6BAA6B,CAAC,CAAS;IAE/C;;;;;OAKG;gBAEC,aAAa,EAAE,cAAc,EAC7B,cAAc,EAAE,eAAe,GAAG,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAOxF;;;OAGG;YACW,iBAAiB;IAe/B;;;;;;;OAOG;YACW,0BAA0B;IAyBxC;;;;OAIG;IACG,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAmBvF;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAMpC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAKxC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAUtC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IASxC;;OAEG;IACI,CAAC,MAAM,CAAC,aAAa,CAAC;IAQ7B;;OAEG;IACG,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,yBAAyB,GAAG,IAAI,GAAG,IAAI,CAAC;IAI9F;;OAEG;IACG,cAAc,CAChB,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,4BAA4B,GACvC,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAI5C;;OAEG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAIjH;;OAEG;IACG,kBAAkB,CACpB,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,yBAAyB,GACpC,OAAO,CAAC,wBAAwB,CAAC;IAIpC;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAInC;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;;OAIG;IACG,oCAAoC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAI1E"}
|
|
@@ -36,7 +36,7 @@ export class RequestManagerTandem {
|
|
|
36
36
|
this.resolvedRequestManager = await this.requestManagerPromise;
|
|
37
37
|
// Apply any hint received before the manager was resolved.
|
|
38
38
|
if (this.expectedRequestProcessingSecs !== undefined) {
|
|
39
|
-
this.resolvedRequestManager.setExpectedRequestProcessingTimeSecs?.(this.expectedRequestProcessingSecs);
|
|
39
|
+
await this.resolvedRequestManager.setExpectedRequestProcessingTimeSecs?.(this.expectedRequestProcessingSecs);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
return this.resolvedRequestManager;
|
|
@@ -119,7 +119,8 @@ export class RequestManagerTandem {
|
|
|
119
119
|
const requestManager = await this.getRequestManager();
|
|
120
120
|
const [managerTotal, loaderTotal] = await Promise.all([
|
|
121
121
|
requestManager.getTotalCount(),
|
|
122
|
-
|
|
122
|
+
// count only pending to avoid double counting, requests marked as "handled" have been moved to requestManager
|
|
123
|
+
this.requestLoader.getPendingCount(),
|
|
123
124
|
]);
|
|
124
125
|
return managerTotal + loaderTotal;
|
|
125
126
|
}
|
|
@@ -189,9 +190,9 @@ export class RequestManagerTandem {
|
|
|
189
190
|
* reserved. The manager is opened lazily, so the value is remembered and applied once it resolves.
|
|
190
191
|
* @inheritdoc
|
|
191
192
|
*/
|
|
192
|
-
setExpectedRequestProcessingTimeSecs(secs) {
|
|
193
|
+
async setExpectedRequestProcessingTimeSecs(secs) {
|
|
193
194
|
this.expectedRequestProcessingSecs = secs;
|
|
194
|
-
this.resolvedRequestManager?.setExpectedRequestProcessingTimeSecs?.(secs);
|
|
195
|
+
await this.resolvedRequestManager?.setExpectedRequestProcessingTimeSecs?.(secs);
|
|
195
196
|
}
|
|
196
197
|
}
|
|
197
198
|
//# sourceMappingURL=request_manager_tandem.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_manager_tandem.js","sourceRoot":"","sources":["../../src/storages/request_manager_tandem.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAUvD;;;;GAIG;AACH,MAAM,OAAO,oBAAoB;IACrB,GAAG,CAAgB;IACnB,aAAa,CAAiB;IAC9B,qBAAqB,CAA4B;IACjD,sBAAsB,CAAmB;IAEzC,qBAAqB,CAAmD;IAEhF;;;OAGG;IACK,6BAA6B,CAAU;IAE/C;;;;;OAKG;IACH,YACI,aAA6B,EAC7B,cAAoF;QAEpF,IAAI,CAAC,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,qBAAqB,GAAG,OAAO,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC;IAC9G,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,iBAAiB;QAC3B,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,qBAAqB,KAAK,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;YAC7E,IAAI,CAAC,sBAAsB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC;YAE/D,2DAA2D;YAC3D,IAAI,IAAI,CAAC,6BAA6B,KAAK,SAAS,EAAE,CAAC;gBACnD,IAAI,CAAC,sBAAsB,CAAC,oCAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"request_manager_tandem.js","sourceRoot":"","sources":["../../src/storages/request_manager_tandem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BaseHttpClient, BatchAddRequestsResult, Dictionary, ProcessedRequest, QueueOperationInfo,
|
|
1
|
+
import type { BaseHttpClient, BatchAddRequestsResult, Dictionary, ProcessedRequest, QueueOperationInfo, RequestQueueBackend, RequestQueueInfo } from '@crawlee/types';
|
|
2
2
|
import type { ReadonlyDeep } from 'type-fest';
|
|
3
3
|
import { LruCache } from '@apify/datastructures';
|
|
4
4
|
import { Configuration } from '../configuration.js';
|
|
@@ -8,6 +8,7 @@ import type { ProxyConfiguration } from '../proxy_configuration.js';
|
|
|
8
8
|
import type { InternalSource, RequestOptions, Source } from '../request.js';
|
|
9
9
|
import { Request } from '../request.js';
|
|
10
10
|
import type { IRequestManager, RequestsLike } from './request_manager.js';
|
|
11
|
+
import type { RequestQueueStats } from './storage_stats.js';
|
|
11
12
|
import type { IStorage, StorageIdentifier } from './storage_instance_manager.js';
|
|
12
13
|
import type { StorageOpenOptions } from './utils.js';
|
|
13
14
|
/**
|
|
@@ -50,7 +51,7 @@ export declare class RequestQueue implements IStorage, IRequestManager {
|
|
|
50
51
|
name?: string;
|
|
51
52
|
timeoutSecs: number;
|
|
52
53
|
clientKey: string;
|
|
53
|
-
|
|
54
|
+
backend: RequestQueueBackend;
|
|
54
55
|
protected proxyConfiguration?: ProxyConfiguration;
|
|
55
56
|
log: CrawleeLogger;
|
|
56
57
|
private isInitialized;
|
|
@@ -60,11 +61,17 @@ export declare class RequestQueue implements IStorage, IRequestManager {
|
|
|
60
61
|
/**
|
|
61
62
|
* The largest expected request-processing time (in seconds) seen so far via
|
|
62
63
|
* {@link setExpectedRequestProcessingTimeSecs}. Used to ensure that value is only ever raised, never
|
|
63
|
-
* lowered, before being forwarded to the storage
|
|
64
|
+
* lowered, before being forwarded to the storage backend.
|
|
64
65
|
*/
|
|
65
66
|
protected expectedRequestProcessingSecs: number;
|
|
66
67
|
protected httpClient?: BaseHttpClient;
|
|
67
68
|
protected readonly events: EventManager;
|
|
69
|
+
private readonly statsTracker;
|
|
70
|
+
/**
|
|
71
|
+
* Backend-independent usage counters tracked for this request queue (write operations and
|
|
72
|
+
* queue-head reads issued to the underlying storage backend). Counted per backend call.
|
|
73
|
+
*/
|
|
74
|
+
get stats(): RequestQueueStats;
|
|
68
75
|
/**
|
|
69
76
|
* @internal
|
|
70
77
|
*/
|
|
@@ -182,7 +189,7 @@ export declare class RequestQueue implements IStorage, IRequestManager {
|
|
|
182
189
|
isFinished(): Promise<boolean>;
|
|
183
190
|
/**
|
|
184
191
|
* Tells the queue how long a consumer expects to hold a fetched request before marking it handled
|
|
185
|
-
* or reclaiming it (typically the request-handler timeout plus padding), so that a storage
|
|
192
|
+
* or reclaiming it (typically the request-handler timeout plus padding), so that a storage backend
|
|
186
193
|
* that reserves requests via locking does not hand the same request out again while it is still
|
|
187
194
|
* being processed.
|
|
188
195
|
*
|
|
@@ -190,7 +197,7 @@ export declare class RequestQueue implements IStorage, IRequestManager {
|
|
|
190
197
|
* ever raise the reservation duration, never lower it — otherwise a short-lived consumer could cut
|
|
191
198
|
* short the reservation of a long-lived one and have its in-flight request stolen.
|
|
192
199
|
*/
|
|
193
|
-
setExpectedRequestProcessingTimeSecs(secs: number): void
|
|
200
|
+
setExpectedRequestProcessingTimeSecs(secs: number): Promise<void>;
|
|
194
201
|
/**
|
|
195
202
|
* Caches information about request to beware of unneeded addRequest() calls.
|
|
196
203
|
*/
|
|
@@ -282,7 +289,7 @@ interface RequestLruItem {
|
|
|
282
289
|
export interface RequestQueueOptions {
|
|
283
290
|
id: string;
|
|
284
291
|
name?: string;
|
|
285
|
-
|
|
292
|
+
backend: RequestQueueBackend;
|
|
286
293
|
/**
|
|
287
294
|
* Used to pass the proxy configuration for the `requestsFromUrl` objects.
|
|
288
295
|
* Takes advantage of the internal address rotation and authentication process.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_queue.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,cAAc,EACd,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"request_queue.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ import { Configuration } from '../configuration.js';
|
|
|
7
7
|
import { Request } from '../request.js';
|
|
8
8
|
import { serviceLocator } from '../service_locator.js';
|
|
9
9
|
import { checkStorageAccess } from './access_checking.js';
|
|
10
|
+
import { StorageStatsTracker } from './storage_stats.js';
|
|
10
11
|
import { resolveStorageIdentifier } from './storage_instance_manager.js';
|
|
11
12
|
import { getRequestId, purgeDefaultStorages } from './utils.js';
|
|
12
13
|
/**
|
|
13
|
-
* The maximum number of requests cached locally to avoid redundant calls to the storage
|
|
14
|
+
* The maximum number of requests cached locally to avoid redundant calls to the storage backend.
|
|
14
15
|
* @internal
|
|
15
16
|
*/
|
|
16
17
|
const MAX_CACHED_REQUESTS = 2_000_000;
|
|
@@ -54,7 +55,7 @@ export class RequestQueue {
|
|
|
54
55
|
name;
|
|
55
56
|
timeoutSecs = 30;
|
|
56
57
|
clientKey = cryptoRandomObjectId();
|
|
57
|
-
|
|
58
|
+
backend;
|
|
58
59
|
proxyConfiguration;
|
|
59
60
|
log;
|
|
60
61
|
isInitialized = false;
|
|
@@ -64,11 +65,22 @@ export class RequestQueue {
|
|
|
64
65
|
/**
|
|
65
66
|
* The largest expected request-processing time (in seconds) seen so far via
|
|
66
67
|
* {@link setExpectedRequestProcessingTimeSecs}. Used to ensure that value is only ever raised, never
|
|
67
|
-
* lowered, before being forwarded to the storage
|
|
68
|
+
* lowered, before being forwarded to the storage backend.
|
|
68
69
|
*/
|
|
69
70
|
expectedRequestProcessingSecs = 0;
|
|
70
71
|
httpClient;
|
|
71
72
|
events;
|
|
73
|
+
statsTracker = new StorageStatsTracker({
|
|
74
|
+
writeCount: 0,
|
|
75
|
+
headItemReadCount: 0,
|
|
76
|
+
});
|
|
77
|
+
/**
|
|
78
|
+
* Backend-independent usage counters tracked for this request queue (write operations and
|
|
79
|
+
* queue-head reads issued to the underlying storage backend). Counted per backend call.
|
|
80
|
+
*/
|
|
81
|
+
get stats() {
|
|
82
|
+
return this.statsTracker.current;
|
|
83
|
+
}
|
|
72
84
|
/**
|
|
73
85
|
* @internal
|
|
74
86
|
*/
|
|
@@ -77,7 +89,7 @@ export class RequestQueue {
|
|
|
77
89
|
this.id = options.id;
|
|
78
90
|
this.name = options.name;
|
|
79
91
|
this.events = serviceLocator.getEventManager();
|
|
80
|
-
this.
|
|
92
|
+
this.backend = options.backend;
|
|
81
93
|
this.proxyConfiguration = options.proxyConfiguration;
|
|
82
94
|
this.requestCache = new LruCache({ maxLength: MAX_CACHED_REQUESTS });
|
|
83
95
|
this.log = serviceLocator.getLogger().child({ prefix: `RequestQueue(${this.id}, ${this.name ?? 'no-name'})` });
|
|
@@ -148,7 +160,8 @@ export class RequestQueue {
|
|
|
148
160
|
forefront,
|
|
149
161
|
};
|
|
150
162
|
}
|
|
151
|
-
|
|
163
|
+
this.statsTracker.add('writeCount');
|
|
164
|
+
const { processedRequests } = await this.backend.addBatchOfRequests([request], { forefront });
|
|
152
165
|
const queueOperationInfo = {
|
|
153
166
|
...processedRequests[0],
|
|
154
167
|
uniqueKey: request.uniqueKey,
|
|
@@ -230,7 +243,8 @@ export class RequestQueue {
|
|
|
230
243
|
if (!requestsToAdd.size) {
|
|
231
244
|
return results;
|
|
232
245
|
}
|
|
233
|
-
|
|
246
|
+
this.statsTracker.add('writeCount');
|
|
247
|
+
const apiResults = await this.backend.addBatchOfRequests([...requestsToAdd.values()], { forefront });
|
|
234
248
|
// Report unprocessed requests
|
|
235
249
|
results.unprocessedRequests = apiResults.unprocessedRequests;
|
|
236
250
|
// Add all new requests to the requestCache
|
|
@@ -348,7 +362,7 @@ export class RequestQueue {
|
|
|
348
362
|
async getRequest(uniqueKey) {
|
|
349
363
|
checkStorageAccess();
|
|
350
364
|
ow(uniqueKey, ow.string);
|
|
351
|
-
const requestOptions = await this.
|
|
365
|
+
const requestOptions = await this.backend.getRequest(uniqueKey);
|
|
352
366
|
if (!requestOptions)
|
|
353
367
|
return null;
|
|
354
368
|
return new Request(requestOptions);
|
|
@@ -375,7 +389,8 @@ export class RequestQueue {
|
|
|
375
389
|
if (this.queuePausedForMigration) {
|
|
376
390
|
return null;
|
|
377
391
|
}
|
|
378
|
-
|
|
392
|
+
this.statsTracker.add('headItemReadCount');
|
|
393
|
+
const requestOptions = await this.backend.fetchNextRequest();
|
|
379
394
|
if (!requestOptions)
|
|
380
395
|
return null;
|
|
381
396
|
return new Request(requestOptions);
|
|
@@ -395,7 +410,8 @@ export class RequestQueue {
|
|
|
395
410
|
}));
|
|
396
411
|
const forefront = this.requestCache.get(getRequestId(request.uniqueKey))?.forefront ?? false;
|
|
397
412
|
const handledAt = request.handledAt ?? new Date().toISOString();
|
|
398
|
-
|
|
413
|
+
this.statsTracker.add('writeCount');
|
|
414
|
+
const processedRequest = await this.backend.markRequestAsHandled({
|
|
399
415
|
...request,
|
|
400
416
|
handledAt,
|
|
401
417
|
});
|
|
@@ -428,7 +444,8 @@ export class RequestQueue {
|
|
|
428
444
|
forefront: ow.optional.boolean,
|
|
429
445
|
}));
|
|
430
446
|
const { forefront = false } = options;
|
|
431
|
-
|
|
447
|
+
this.statsTracker.add('writeCount');
|
|
448
|
+
const processedRequest = await this.backend.reclaimRequest(request, { forefront });
|
|
432
449
|
// The request was not in progress — nothing to reclaim.
|
|
433
450
|
if (!processedRequest) {
|
|
434
451
|
return null;
|
|
@@ -453,7 +470,7 @@ export class RequestQueue {
|
|
|
453
470
|
*/
|
|
454
471
|
async isEmpty() {
|
|
455
472
|
checkStorageAccess();
|
|
456
|
-
return this.
|
|
473
|
+
return this.backend.isEmpty();
|
|
457
474
|
}
|
|
458
475
|
/**
|
|
459
476
|
* Resolves to `true` if all requests were already handled and there are no more left — including no
|
|
@@ -469,11 +486,11 @@ export class RequestQueue {
|
|
|
469
486
|
if (this.inProgressRequestBatchCount > 0) {
|
|
470
487
|
return false;
|
|
471
488
|
}
|
|
472
|
-
return this.
|
|
489
|
+
return this.backend.isFinished();
|
|
473
490
|
}
|
|
474
491
|
/**
|
|
475
492
|
* Tells the queue how long a consumer expects to hold a fetched request before marking it handled
|
|
476
|
-
* or reclaiming it (typically the request-handler timeout plus padding), so that a storage
|
|
493
|
+
* or reclaiming it (typically the request-handler timeout plus padding), so that a storage backend
|
|
477
494
|
* that reserves requests via locking does not hand the same request out again while it is still
|
|
478
495
|
* being processed.
|
|
479
496
|
*
|
|
@@ -481,12 +498,12 @@ export class RequestQueue {
|
|
|
481
498
|
* ever raise the reservation duration, never lower it — otherwise a short-lived consumer could cut
|
|
482
499
|
* short the reservation of a long-lived one and have its in-flight request stolen.
|
|
483
500
|
*/
|
|
484
|
-
setExpectedRequestProcessingTimeSecs(secs) {
|
|
501
|
+
async setExpectedRequestProcessingTimeSecs(secs) {
|
|
485
502
|
if (secs <= this.expectedRequestProcessingSecs) {
|
|
486
503
|
return;
|
|
487
504
|
}
|
|
488
505
|
this.expectedRequestProcessingSecs = secs;
|
|
489
|
-
this.
|
|
506
|
+
await this.backend.setExpectedRequestProcessingTimeSecs?.(secs);
|
|
490
507
|
}
|
|
491
508
|
/**
|
|
492
509
|
* Caches information about request to beware of unneeded addRequest() calls.
|
|
@@ -509,7 +526,7 @@ export class RequestQueue {
|
|
|
509
526
|
*/
|
|
510
527
|
async drop() {
|
|
511
528
|
checkStorageAccess();
|
|
512
|
-
await this.
|
|
529
|
+
await this.backend.drop();
|
|
513
530
|
serviceLocator.getStorageInstanceManager().removeFromCache(this);
|
|
514
531
|
}
|
|
515
532
|
/**
|
|
@@ -518,7 +535,7 @@ export class RequestQueue {
|
|
|
518
535
|
*/
|
|
519
536
|
async purge() {
|
|
520
537
|
checkStorageAccess();
|
|
521
|
-
await this.
|
|
538
|
+
await this.backend.purge();
|
|
522
539
|
// Reset in-memory bookkeeping so the queue behaves as if freshly opened.
|
|
523
540
|
this.requestCache.clear();
|
|
524
541
|
this.inProgressRequestBatchCount = 0;
|
|
@@ -574,7 +591,7 @@ export class RequestQueue {
|
|
|
574
591
|
*/
|
|
575
592
|
async getInfo() {
|
|
576
593
|
checkStorageAccess();
|
|
577
|
-
return this.
|
|
594
|
+
return this.backend.getMetadata();
|
|
578
595
|
}
|
|
579
596
|
/**
|
|
580
597
|
* Fetches URLs from requestsFromUrl and returns them in format of list of requests
|
|
@@ -646,30 +663,30 @@ export class RequestQueue {
|
|
|
646
663
|
checkStorageAccess();
|
|
647
664
|
ow(options, ow.object.exactShape({
|
|
648
665
|
config: ow.optional.object.instanceOf(Configuration),
|
|
649
|
-
|
|
666
|
+
storageBackend: ow.optional.object,
|
|
650
667
|
proxyConfiguration: ow.optional.object,
|
|
651
668
|
httpClient: ow.optional.object,
|
|
652
669
|
}));
|
|
653
|
-
const
|
|
670
|
+
const storageBackend = options.storageBackend ?? serviceLocator.getStorageBackend();
|
|
654
671
|
const config = options.config ?? serviceLocator.getConfiguration();
|
|
655
|
-
await purgeDefaultStorages({ onlyPurgeOnce: true,
|
|
656
|
-
const resolved = await resolveStorageIdentifier(identifier,
|
|
672
|
+
await purgeDefaultStorages({ onlyPurgeOnce: true, storageBackend, config });
|
|
673
|
+
const resolved = await resolveStorageIdentifier(identifier, storageBackend, 'RequestQueue');
|
|
657
674
|
const queue = await serviceLocator
|
|
658
675
|
.getStorageInstanceManager()
|
|
659
676
|
.openStorage(this, {
|
|
660
677
|
...resolved,
|
|
661
|
-
|
|
662
|
-
|
|
678
|
+
backendOpener: () => storageBackend.createRequestQueueBackend(resolved),
|
|
679
|
+
backendCacheKey: storageBackend.getStorageBackendCacheKey?.() ?? storageBackend.constructor.name,
|
|
663
680
|
});
|
|
664
681
|
queue.proxyConfiguration = options.proxyConfiguration;
|
|
665
682
|
queue.httpClient = options.httpClient;
|
|
666
683
|
if (!queue.isInitialized) {
|
|
667
|
-
// Re-create the request queue
|
|
684
|
+
// Re-create the request queue backend with clientKey and timeoutSecs so that
|
|
668
685
|
// request locking works correctly for API-backed implementations.
|
|
669
686
|
// TODO: clientKey/timeoutSecs are Apify-platform concerns and should eventually be pushed
|
|
670
687
|
// down into the Apify SDK's client implementation, aligning with crawlee-python's approach
|
|
671
|
-
// where locking is handled internally by the
|
|
672
|
-
queue.
|
|
688
|
+
// where locking is handled internally by the backend (see crawlee-python PR #1194).
|
|
689
|
+
queue.backend = await storageBackend.createRequestQueueBackend({
|
|
673
690
|
id: queue.id,
|
|
674
691
|
clientKey: queue.clientKey,
|
|
675
692
|
timeoutSecs: queue.timeoutSecs,
|