@crawlee/http-client 4.0.0-beta.62 → 4.0.0-beta.63
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/base-http-client.d.ts +25 -1
- package/base-http-client.d.ts.map +1 -1
- package/base-http-client.js +9 -2
- package/base-http-client.js.map +1 -1
- package/package.json +3 -3
package/base-http-client.d.ts
CHANGED
|
@@ -1,6 +1,30 @@
|
|
|
1
|
-
import type { BaseHttpClient as BaseHttpClientInterface, CrawleeLogger, SendRequestOptions } from '@crawlee/types';
|
|
1
|
+
import type { BaseHttpClient as BaseHttpClientInterface, CrawleeLogger, SendRequestOptions, SessionFingerprint } from '@crawlee/types';
|
|
2
|
+
import { CookieJar } from 'tough-cookie';
|
|
3
|
+
/**
|
|
4
|
+
* Per-request options handed to a concrete client's `fetch` implementation.
|
|
5
|
+
*/
|
|
2
6
|
export interface CustomFetchOptions {
|
|
7
|
+
/**
|
|
8
|
+
* Effective proxy URL for this request. `sendRequest` populates this from
|
|
9
|
+
* the explicit `SendRequestOptions.proxyUrl` override when set, falling back
|
|
10
|
+
* to `session.proxyInfo.url`.
|
|
11
|
+
*/
|
|
3
12
|
proxyUrl?: string;
|
|
13
|
+
/**
|
|
14
|
+
* Effective cookie jar for this request. `sendRequest` populates this from
|
|
15
|
+
* the explicit `SendRequestOptions.cookieJar` override when set, falling
|
|
16
|
+
* back to `session.cookieJar` (or a fresh jar when neither is provided).
|
|
17
|
+
*/
|
|
18
|
+
cookieJar?: CookieJar;
|
|
19
|
+
/**
|
|
20
|
+
* Hints about which browser-like setup this request should be impersonating —
|
|
21
|
+
* `browser`, `platform`, `device`, and an opaque `details` slot for richer
|
|
22
|
+
* payloads (e.g. a full browser fingerprint from `fingerprint-generator`).
|
|
23
|
+
* These are *suggestions*, not requirements: each client applies what it can
|
|
24
|
+
* (e.g. impit maps `browser` to its impersonation profile) and ignores the
|
|
25
|
+
* rest on a best-effort basis. Sourced from `SendRequestOptions.session.fingerprint`.
|
|
26
|
+
*/
|
|
27
|
+
fingerprint?: SessionFingerprint;
|
|
4
28
|
}
|
|
5
29
|
/**
|
|
6
30
|
* Base HTTP client that provides fetch-like `sendRequest` with Crawlee-managed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-http-client.d.ts","sourceRoot":"","sources":["../src/base-http-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"base-http-client.d.ts","sourceRoot":"","sources":["../src/base-http-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,cAAc,IAAI,uBAAuB,EACzC,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAC;CACpC;AAED;;;;GAIG;AACH,8BAAsB,cAAe,YAAW,uBAAuB;IACnE,SAAS,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC;gBAElB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,aAAa,CAAA;KAAE;IAIhD;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;YAEtF,YAAY;YAmCZ,UAAU;IAYxB,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,oBAAoB;IA+B5B;;OAEG;IACG,WAAW,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;CAgC9F"}
|
package/base-http-client.js
CHANGED
|
@@ -52,7 +52,12 @@ export class BaseHttpClient {
|
|
|
52
52
|
const proxyUrl = options?.proxyUrl ?? options?.session?.proxyInfo?.url;
|
|
53
53
|
const cookieJar = options?.cookieJar ?? options?.session?.cookieJar ?? new CookieJar();
|
|
54
54
|
const signal = this.createAbortSignal(options?.signal, options?.timeoutMillis);
|
|
55
|
-
return {
|
|
55
|
+
return {
|
|
56
|
+
proxyUrl,
|
|
57
|
+
cookieJar: cookieJar,
|
|
58
|
+
signal,
|
|
59
|
+
fingerprint: options?.session?.fingerprint,
|
|
60
|
+
};
|
|
56
61
|
}
|
|
57
62
|
createAbortSignal(signal, timeoutMillis) {
|
|
58
63
|
if (signal && timeoutMillis) {
|
|
@@ -99,13 +104,15 @@ export class BaseHttpClient {
|
|
|
99
104
|
const maxRedirects = 10;
|
|
100
105
|
let currentRequest = initialRequest;
|
|
101
106
|
let redirectCount = 0;
|
|
102
|
-
const { proxyUrl, cookieJar, signal } = this.resolveRequestContext(options);
|
|
107
|
+
const { proxyUrl, cookieJar, signal, fingerprint } = this.resolveRequestContext(options);
|
|
103
108
|
currentRequest = initialRequest.clone();
|
|
104
109
|
while (true) {
|
|
105
110
|
await this.applyCookies(currentRequest, cookieJar);
|
|
106
111
|
const response = await this.fetch(currentRequest, {
|
|
107
112
|
signal,
|
|
108
113
|
proxyUrl,
|
|
114
|
+
cookieJar,
|
|
115
|
+
fingerprint,
|
|
109
116
|
redirect: 'manual',
|
|
110
117
|
});
|
|
111
118
|
await this.setCookies(response, cookieJar);
|
package/base-http-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-http-client.js","sourceRoot":"","sources":["../src/base-http-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"base-http-client.js","sourceRoot":"","sources":["../src/base-http-client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crawlee/http-client",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.63",
|
|
4
4
|
"description": "The scalable web crawling and scraping library for JavaScript/Node.js. Enables development of data extraction and web automation jobs (not only) with headless Chrome and Puppeteer.",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=22.0.0"
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"access": "public"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@crawlee/types": "4.0.0-beta.
|
|
50
|
+
"@crawlee/types": "4.0.0-beta.63",
|
|
51
51
|
"tough-cookie": "^6.0.0"
|
|
52
52
|
},
|
|
53
53
|
"lerna": {
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "6255e805b2d2ae85024897a2738315ae04df4424"
|
|
61
61
|
}
|