apify 3.1.16-beta.15 → 3.1.17-beta.16
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/.turbo/turbo-build.log +5 -5
- package/.turbo/turbo-copy.log +1 -1
- package/dist/package.json +5 -5
- package/dist/proxy_configuration.d.ts +9 -2
- package/dist/proxy_configuration.d.ts.map +1 -1
- package/dist/proxy_configuration.js +35 -10
- package/dist/proxy_configuration.js.map +1 -1
- package/package.json +5 -5
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
|
|
2
|
-
> apify@3.1.
|
|
2
|
+
> apify@3.1.16 build
|
|
3
3
|
> npm run clean && npm run compile && npm run copy && npm run fixApifyExport
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
> apify@3.1.
|
|
6
|
+
> apify@3.1.16 clean
|
|
7
7
|
> rimraf ./dist
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
> apify@3.1.
|
|
10
|
+
> apify@3.1.16 compile
|
|
11
11
|
> tsc -p tsconfig.build.json && gen-esm-wrapper ./dist/index.js ./dist/index.mjs
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
> apify@3.1.
|
|
14
|
+
> apify@3.1.16 copy
|
|
15
15
|
> tsx ../../scripts/copy.ts --readme=local
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
> apify@3.1.
|
|
18
|
+
> apify@3.1.16 fixApifyExport
|
|
19
19
|
> tsx ../../scripts/temp_fix_apify_exports.ts
|
|
20
20
|
|
package/.turbo/turbo-copy.log
CHANGED
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apify",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.17-beta.16+fff3a66d3a",
|
|
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": ">=16.0.0"
|
|
@@ -59,9 +59,9 @@
|
|
|
59
59
|
"@apify/log": "^2.4.3",
|
|
60
60
|
"@apify/timeout": "^0.3.0",
|
|
61
61
|
"@apify/utilities": "^2.9.3",
|
|
62
|
-
"@crawlee/core": "^3.
|
|
63
|
-
"@crawlee/types": "^3.
|
|
64
|
-
"@crawlee/utils": "^3.
|
|
62
|
+
"@crawlee/core": "^3.9.0",
|
|
63
|
+
"@crawlee/types": "^3.9.0",
|
|
64
|
+
"@crawlee/utils": "^3.9.0",
|
|
65
65
|
"apify-client": "^2.9.0",
|
|
66
66
|
"ow": "^0.28.2",
|
|
67
67
|
"semver": "^7.5.4",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "fff3a66d3a0fe5080121cc083e27f59db3d979b5"
|
|
79
79
|
}
|
|
@@ -34,6 +34,11 @@ export interface ProxyConfigurationOptions extends CoreProxyConfigurationOptions
|
|
|
34
34
|
* configurate the proxy by UI input schema. You should use the `countryCode` option in your crawler code.
|
|
35
35
|
*/
|
|
36
36
|
apifyProxyCountry?: string;
|
|
37
|
+
/**
|
|
38
|
+
* Multiple different ProxyConfigurationOptions stratified into tiers. Crawlee crawlers will switch between those tiers
|
|
39
|
+
* based on the blocked request statistics.
|
|
40
|
+
*/
|
|
41
|
+
tieredProxyConfig?: Omit<ProxyConfigurationOptions, keyof CoreProxyConfigurationOptions | 'tieredProxyConfig'>[];
|
|
37
42
|
}
|
|
38
43
|
/**
|
|
39
44
|
* The main purpose of the ProxyInfo object is to provide information
|
|
@@ -162,7 +167,7 @@ export declare class ProxyConfiguration extends CoreProxyConfiguration {
|
|
|
162
167
|
* The identifier must not be longer than 50 characters and include only the following: `0-9`, `a-z`, `A-Z`, `"."`, `"_"` and `"~"`.
|
|
163
168
|
* @return Represents information about used proxy and its configuration.
|
|
164
169
|
*/
|
|
165
|
-
newProxyInfo(sessionId?: string | number): Promise<ProxyInfo>;
|
|
170
|
+
newProxyInfo(sessionId?: string | number, options?: Parameters<CoreProxyConfiguration['newProxyInfo']>[1]): Promise<ProxyInfo | undefined>;
|
|
166
171
|
/**
|
|
167
172
|
* Returns a new proxy URL based on provided configuration options and the `sessionId` parameter.
|
|
168
173
|
* @param [sessionId]
|
|
@@ -176,11 +181,13 @@ export declare class ProxyConfiguration extends CoreProxyConfiguration {
|
|
|
176
181
|
* @return A string with a proxy URL, including authentication credentials and port number.
|
|
177
182
|
* For example, `http://bob:password123@proxy.example.com:8000`
|
|
178
183
|
*/
|
|
179
|
-
newUrl(sessionId?: string | number): Promise<string>;
|
|
184
|
+
newUrl(sessionId?: string | number, options?: Parameters<CoreProxyConfiguration['newUrl']>[1]): Promise<string | undefined>;
|
|
185
|
+
protected _generateTieredProxyUrls(tieredProxyConfig: NonNullable<ProxyConfigurationOptions['tieredProxyConfig']>, globalOptions: ProxyConfigurationOptions): string[][];
|
|
180
186
|
/**
|
|
181
187
|
* Returns proxy username.
|
|
182
188
|
*/
|
|
183
189
|
protected _getUsername(sessionId?: string): string;
|
|
190
|
+
protected composeDefaultUrl(sessionId?: string): string;
|
|
184
191
|
/**
|
|
185
192
|
* Checks if Apify Token is provided in env and gets the password via API and sets it to env
|
|
186
193
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy_configuration.d.ts","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy_configuration.d.ts","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,yBAAyB,IAAI,6BAA6B,EAC1D,SAAS,IAAI,aAAa,EAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,EACH,kBAAkB,IAAI,sBAAsB,EAC/C,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAQhD,MAAM,WAAW,yBAA0B,SAAQ,6BAA6B;IAC5E;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE5B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,IAAI,CAAC,yBAAyB,EAAE,MAAM,6BAA6B,GAAG,mBAAmB,CAAC,EAAE,CAAC;CACpH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC5C;;;OAGG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,kBAAmB,SAAQ,sBAAsB;IAWL,QAAQ,CAAC,MAAM;IAVpE,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,cAAc,CAAC,CAAU;IAEjC;;OAEG;gBACS,OAAO,GAAE,yBAA8B,EAAW,MAAM,gBAAkC;IAuDtG;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IASpC;;;;;;;;;;;;;;;;OAgBG;IACY,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAoBzJ;;;;;;;;;;;;OAYG;IACY,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoB1I,SAAS,CAAC,wBAAwB,CAC9B,iBAAiB,EAAE,WAAW,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,CAAC,EAC9E,aAAa,EAAE,yBAAyB;IAc5C;;OAEG;IACH,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAsBlD,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAOvD;;OAEG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0CpD;;;;OAIG;cACa,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IA2BhD;;OAEG;cACa,YAAY,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;IAqB/H;;;OAGG;IACH,SAAS,CAAC,kCAAkC;CAK/C"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ProxyConfiguration = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const consts_1 = require("@apify/consts");
|
|
6
|
+
const utilities_1 = require("@apify/utilities");
|
|
6
7
|
const core_1 = require("@crawlee/core");
|
|
7
8
|
const utils_1 = require("@crawlee/utils");
|
|
8
9
|
const ow_1 = tslib_1.__importDefault(require("ow"));
|
|
@@ -101,8 +102,14 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
101
102
|
countryCode: ow_1.default.optional.string.matches(COUNTRY_CODE_REGEX),
|
|
102
103
|
apifyProxyCountry: ow_1.default.optional.string.matches(COUNTRY_CODE_REGEX),
|
|
103
104
|
password: ow_1.default.optional.string,
|
|
105
|
+
tieredProxyUrls: ow_1.default.optional.array.ofType(ow_1.default.array.ofType(ow_1.default.string)),
|
|
106
|
+
tieredProxyConfig: ow_1.default.optional.array.ofType(ow_1.default.object),
|
|
104
107
|
}));
|
|
105
|
-
const { groups = [], apifyProxyGroups = [], countryCode, apifyProxyCountry, password = config.get('proxyPassword'), } = options;
|
|
108
|
+
const { groups = [], apifyProxyGroups = [], countryCode, apifyProxyCountry, password = config.get('proxyPassword'), tieredProxyConfig, tieredProxyUrls, } = options;
|
|
109
|
+
this.tieredProxyUrls ?? (this.tieredProxyUrls = tieredProxyUrls);
|
|
110
|
+
if (tieredProxyConfig) {
|
|
111
|
+
this.tieredProxyUrls = this._generateTieredProxyUrls(tieredProxyConfig, options);
|
|
112
|
+
}
|
|
106
113
|
const groupsToUse = groups.length ? groups : apifyProxyGroups;
|
|
107
114
|
const countryCodeToUse = countryCode || apifyProxyCountry;
|
|
108
115
|
const hostname = config.get('proxyHostname');
|
|
@@ -156,15 +163,17 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
156
163
|
* The identifier must not be longer than 50 characters and include only the following: `0-9`, `a-z`, `A-Z`, `"."`, `"_"` and `"~"`.
|
|
157
164
|
* @return Represents information about used proxy and its configuration.
|
|
158
165
|
*/
|
|
159
|
-
async newProxyInfo(sessionId) {
|
|
166
|
+
async newProxyInfo(sessionId, options) {
|
|
160
167
|
if (typeof sessionId === 'number')
|
|
161
168
|
sessionId = `${sessionId}`;
|
|
162
169
|
(0, ow_1.default)(sessionId, ow_1.default.optional.string.maxLength(MAX_SESSION_ID_LENGTH).matches(consts_1.APIFY_PROXY_VALUE_REGEX));
|
|
163
|
-
const
|
|
164
|
-
|
|
170
|
+
const proxyInfo = await super.newProxyInfo(sessionId, options);
|
|
171
|
+
if (!proxyInfo)
|
|
172
|
+
return proxyInfo;
|
|
173
|
+
const { groups, countryCode, password, port, hostname } = (this.usesApifyProxy ? this : new URL(proxyInfo.url));
|
|
165
174
|
return {
|
|
175
|
+
...proxyInfo,
|
|
166
176
|
sessionId,
|
|
167
|
-
url,
|
|
168
177
|
groups,
|
|
169
178
|
countryCode,
|
|
170
179
|
password: password ?? '',
|
|
@@ -185,19 +194,30 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
185
194
|
* @return A string with a proxy URL, including authentication credentials and port number.
|
|
186
195
|
* For example, `http://bob:password123@proxy.example.com:8000`
|
|
187
196
|
*/
|
|
188
|
-
async newUrl(sessionId) {
|
|
197
|
+
async newUrl(sessionId, options) {
|
|
189
198
|
if (typeof sessionId === 'number')
|
|
190
199
|
sessionId = `${sessionId}`;
|
|
191
200
|
(0, ow_1.default)(sessionId, ow_1.default.optional.string.maxLength(MAX_SESSION_ID_LENGTH).matches(consts_1.APIFY_PROXY_VALUE_REGEX));
|
|
192
201
|
if (this.newUrlFunction) {
|
|
193
|
-
return this._callNewUrlFunction(sessionId);
|
|
202
|
+
return (await this._callNewUrlFunction(sessionId, { request: options?.request }) ?? undefined);
|
|
194
203
|
}
|
|
195
204
|
if (this.proxyUrls) {
|
|
196
205
|
return this._handleCustomUrl(sessionId);
|
|
197
206
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
207
|
+
if (this.tieredProxyUrls) {
|
|
208
|
+
return this._handleTieredUrl(sessionId ?? (0, utilities_1.cryptoRandomObjectId)(6), options).proxyUrl;
|
|
209
|
+
}
|
|
210
|
+
return this.composeDefaultUrl(sessionId);
|
|
211
|
+
}
|
|
212
|
+
_generateTieredProxyUrls(tieredProxyConfig, globalOptions) {
|
|
213
|
+
return tieredProxyConfig
|
|
214
|
+
.map((config) => [
|
|
215
|
+
new ProxyConfiguration({
|
|
216
|
+
...globalOptions,
|
|
217
|
+
...config,
|
|
218
|
+
tieredProxyConfig: undefined,
|
|
219
|
+
}).composeDefaultUrl(),
|
|
220
|
+
]);
|
|
201
221
|
}
|
|
202
222
|
/**
|
|
203
223
|
* Returns proxy username.
|
|
@@ -220,6 +240,11 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
220
240
|
username = 'auto';
|
|
221
241
|
return username;
|
|
222
242
|
}
|
|
243
|
+
composeDefaultUrl(sessionId) {
|
|
244
|
+
const username = this._getUsername(sessionId);
|
|
245
|
+
const { password, hostname, port } = this;
|
|
246
|
+
return `http://${username}:${password}@${hostname}:${port}`;
|
|
247
|
+
}
|
|
223
248
|
/**
|
|
224
249
|
* Checks if Apify Token is provided in env and gets the password via API and sets it to env
|
|
225
250
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy_configuration.js","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":";;;;AAAA,0CAAwE;
|
|
1
|
+
{"version":3,"file":"proxy_configuration.js","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apify",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.17-beta.16+fff3a66d3a",
|
|
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": ">=16.0.0"
|
|
@@ -59,9 +59,9 @@
|
|
|
59
59
|
"@apify/log": "^2.4.3",
|
|
60
60
|
"@apify/timeout": "^0.3.0",
|
|
61
61
|
"@apify/utilities": "^2.9.3",
|
|
62
|
-
"@crawlee/core": "^3.
|
|
63
|
-
"@crawlee/types": "^3.
|
|
64
|
-
"@crawlee/utils": "^3.
|
|
62
|
+
"@crawlee/core": "^3.9.0",
|
|
63
|
+
"@crawlee/types": "^3.9.0",
|
|
64
|
+
"@crawlee/utils": "^3.9.0",
|
|
65
65
|
"apify-client": "^2.9.0",
|
|
66
66
|
"ow": "^0.28.2",
|
|
67
67
|
"semver": "^7.5.4",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "fff3a66d3a0fe5080121cc083e27f59db3d979b5"
|
|
79
79
|
}
|