apify 3.7.1-beta.6 → 3.7.1-beta.7
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.
|
@@ -26,14 +26,25 @@ export interface ProxyConfigurationOptions extends CoreProxyConfigurationOptions
|
|
|
26
26
|
countryCode?: string;
|
|
27
27
|
/**
|
|
28
28
|
* Same option as `groups` which can be used to
|
|
29
|
-
*
|
|
29
|
+
* configure the proxy by UI input schema. You should use the `groups` option in your crawler code.
|
|
30
30
|
*/
|
|
31
31
|
apifyProxyGroups?: string[];
|
|
32
32
|
/**
|
|
33
33
|
* Same option as `countryCode` which can be used to
|
|
34
|
-
*
|
|
34
|
+
* configure the proxy by UI input schema. You should use the `countryCode` option in your crawler code.
|
|
35
35
|
*/
|
|
36
36
|
apifyProxyCountry?: string;
|
|
37
|
+
/**
|
|
38
|
+
* If set, all proxied requests will use IP addresses geolocated to the specified subdivision (e.g. US state).
|
|
39
|
+
* Requires `countryCode` to be set. The value must follow the ISO 3166-2 subdivision code format,
|
|
40
|
+
* e.g. `'CA'` for California when `countryCode` is `'US'`.
|
|
41
|
+
*/
|
|
42
|
+
subdivisionCode?: string;
|
|
43
|
+
/**
|
|
44
|
+
* Same option as `subdivisionCode` which can be used to
|
|
45
|
+
* configure the proxy by UI input schema. You should use the `subdivisionCode` option in your crawler code.
|
|
46
|
+
*/
|
|
47
|
+
apifyProxySubdivision?: string;
|
|
37
48
|
/**
|
|
38
49
|
* Multiple different ProxyConfigurationOptions stratified into tiers. Crawlee crawlers will switch between those tiers
|
|
39
50
|
* based on the blocked request statistics.
|
|
@@ -94,6 +105,11 @@ export interface ProxyInfo extends CoreProxyInfo {
|
|
|
94
105
|
* This parameter is optional, by default, the proxy uses all available proxy servers from all countries.
|
|
95
106
|
*/
|
|
96
107
|
countryCode?: string;
|
|
108
|
+
/**
|
|
109
|
+
* If set, all proxied requests use IP addresses geolocated to the specified subdivision (e.g. US state).
|
|
110
|
+
* ISO 3166-2 subdivision code, e.g. `'CA'` when `countryCode` is `'US'`.
|
|
111
|
+
*/
|
|
112
|
+
subdivisionCode?: string;
|
|
97
113
|
/**
|
|
98
114
|
* User's password for the proxy. By default, it is taken from the `APIFY_PROXY_PASSWORD`
|
|
99
115
|
* environment variable, which is automatically set by the system when running the Actors
|
|
@@ -138,6 +154,7 @@ export declare class ProxyConfiguration extends CoreProxyConfiguration {
|
|
|
138
154
|
readonly config: Configuration;
|
|
139
155
|
private groups;
|
|
140
156
|
private countryCode?;
|
|
157
|
+
private subdivisionCode?;
|
|
141
158
|
private password?;
|
|
142
159
|
private hostname;
|
|
143
160
|
private port?;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy_configuration.d.ts","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,yBAAyB,IAAI,6BAA6B,EAC1D,SAAS,IAAI,aAAa,EAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQ7E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy_configuration.d.ts","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,yBAAyB,IAAI,6BAA6B,EAC1D,SAAS,IAAI,aAAa,EAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAQ7E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUnD,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;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,IAAI,CACpB,yBAAyB,EACzB,MAAM,6BAA6B,GAAG,mBAAmB,CAC5D,EAAE,CAAC;IAEJ;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;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;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,kBAAmB,SAAQ,sBAAsB;IActD,QAAQ,CAAC,MAAM;IAbnB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,cAAc,CAAC,CAAU;IAEjC;;OAEG;gBAEC,OAAO,GAAE,yBAA8B,EAC9B,MAAM,gBAAkC;IA6FrD;;;;;;;;;;OAUG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BvE;;;;;;;;;;;;;;;;OAgBG;IACY,YAAY,CACvB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAC3B,OAAO,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAChE,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAsCjC;;;;;;;;;;;;OAYG;IACY,MAAM,CACjB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAC3B,OAAO,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAC1D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA+B9B,SAAS,CAAC,wBAAwB,CAC9B,iBAAiB,EAAE,WAAW,CAC1B,yBAAyB,CAAC,mBAAmB,CAAC,CACjD,EACD,aAAa,EAAE,yBAAyB;IAW5C;;OAEG;IACH,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAwBlD,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAUvD;;OAEG;cAEa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBpD;;;;OAIG;cACa,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IA6BhD;;OAEG;cACa,YAAY,IAAI,OAAO,CACjC;QACI,SAAS,EAAE,OAAO,CAAC;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,gBAAgB,EAAE,OAAO,CAAC;KAC7B,GACD,SAAS,CACd;IA4BD;;;OAGG;IACH,SAAS,CAAC,kCAAkC;CAQ/C"}
|
|
@@ -14,6 +14,8 @@ const MAX_SESSION_ID_LENGTH = 50;
|
|
|
14
14
|
const CHECK_ACCESS_REQUEST_TIMEOUT_MILLIS = 4000;
|
|
15
15
|
const CHECK_ACCESS_MAX_ATTEMPTS = 2;
|
|
16
16
|
const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/;
|
|
17
|
+
// ISO 3166-2 subdivision codes are 1–3 uppercase alphanumeric characters, e.g. 'CA' (California), 'NSW' (New South Wales), '9' (Wien, AT-9)
|
|
18
|
+
const SUBDIVISION_CODE_REGEX = /^[A-Z0-9]{1,3}$/;
|
|
17
19
|
/**
|
|
18
20
|
* Configures connection to a proxy server with the provided options. Proxy servers are used to prevent target websites from blocking
|
|
19
21
|
* your crawlers based on IP address rate limits or blacklists. Setting proxy configuration in your crawlers automatically configures
|
|
@@ -76,6 +78,12 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
76
78
|
writable: true,
|
|
77
79
|
value: void 0
|
|
78
80
|
});
|
|
81
|
+
Object.defineProperty(this, "subdivisionCode", {
|
|
82
|
+
enumerable: true,
|
|
83
|
+
configurable: true,
|
|
84
|
+
writable: true,
|
|
85
|
+
value: void 0
|
|
86
|
+
});
|
|
79
87
|
Object.defineProperty(this, "password", {
|
|
80
88
|
enumerable: true,
|
|
81
89
|
configurable: true,
|
|
@@ -100,33 +108,40 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
100
108
|
writable: true,
|
|
101
109
|
value: void 0
|
|
102
110
|
});
|
|
103
|
-
(0, ow_1.default)(rest, ow_1.default.object.
|
|
111
|
+
(0, ow_1.default)(rest, ow_1.default.object.partialShape({
|
|
104
112
|
groups: ow_1.default.optional.array.ofType(ow_1.default.string.matches(consts_1.APIFY_PROXY_VALUE_REGEX)),
|
|
105
113
|
apifyProxyGroups: ow_1.default.optional.array.ofType(ow_1.default.string.matches(consts_1.APIFY_PROXY_VALUE_REGEX)),
|
|
106
114
|
countryCode: ow_1.default.optional.string.matches(COUNTRY_CODE_REGEX),
|
|
107
115
|
apifyProxyCountry: ow_1.default.optional.string.matches(COUNTRY_CODE_REGEX),
|
|
116
|
+
subdivisionCode: ow_1.default.optional.string.matches(SUBDIVISION_CODE_REGEX),
|
|
117
|
+
apifyProxySubdivision: ow_1.default.optional.string.matches(SUBDIVISION_CODE_REGEX),
|
|
108
118
|
password: ow_1.default.optional.string,
|
|
109
119
|
tieredProxyUrls: ow_1.default.optional.array.ofType(ow_1.default.array.ofType(ow_1.default.string)),
|
|
110
120
|
tieredProxyConfig: ow_1.default.optional.array.ofType(ow_1.default.object),
|
|
111
121
|
}));
|
|
112
|
-
const { groups = [], apifyProxyGroups = [], countryCode, apifyProxyCountry, password = config.get('proxyPassword'), tieredProxyConfig, tieredProxyUrls, } = options;
|
|
122
|
+
const { groups = [], apifyProxyGroups = [], countryCode, apifyProxyCountry, subdivisionCode, apifyProxySubdivision, password = config.get('proxyPassword'), tieredProxyConfig, tieredProxyUrls, } = options;
|
|
113
123
|
this.tieredProxyUrls ?? (this.tieredProxyUrls = tieredProxyUrls);
|
|
114
124
|
if (tieredProxyConfig) {
|
|
115
125
|
this.tieredProxyUrls = this._generateTieredProxyUrls(tieredProxyConfig, options);
|
|
116
126
|
}
|
|
117
127
|
const groupsToUse = groups.length ? groups : apifyProxyGroups;
|
|
118
128
|
const countryCodeToUse = countryCode || apifyProxyCountry;
|
|
129
|
+
const subdivisionCodeToUse = subdivisionCode || apifyProxySubdivision;
|
|
119
130
|
const hostname = config.get('proxyHostname');
|
|
120
131
|
const port = config.get('proxyPort');
|
|
132
|
+
if (subdivisionCodeToUse && !countryCodeToUse) {
|
|
133
|
+
throw new Error('ProxyConfiguration: "subdivisionCode" requires "countryCode" to be set.');
|
|
134
|
+
}
|
|
121
135
|
// Validation
|
|
122
136
|
if ((proxyUrls || newUrlFunction) &&
|
|
123
|
-
(groupsToUse.length || countryCodeToUse)) {
|
|
137
|
+
(groupsToUse.length || countryCodeToUse || subdivisionCodeToUse)) {
|
|
124
138
|
this._throwCannotCombineCustomWithApify();
|
|
125
139
|
}
|
|
126
140
|
if (proxyUrls && newUrlFunction)
|
|
127
141
|
this._throwCannotCombineCustomMethods();
|
|
128
142
|
this.groups = groupsToUse;
|
|
129
143
|
this.countryCode = countryCodeToUse;
|
|
144
|
+
this.subdivisionCode = subdivisionCodeToUse;
|
|
130
145
|
this.password = password;
|
|
131
146
|
this.hostname = hostname;
|
|
132
147
|
this.port = port;
|
|
@@ -197,12 +212,13 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
197
212
|
const proxyInfo = await super.newProxyInfo(sessionId, options);
|
|
198
213
|
if (!proxyInfo)
|
|
199
214
|
return proxyInfo;
|
|
200
|
-
const { groups, countryCode, password, port, hostname } = (this.usesApifyProxy ? this : new URL(proxyInfo.url));
|
|
215
|
+
const { groups, countryCode, subdivisionCode, password, port, hostname, } = (this.usesApifyProxy ? this : new URL(proxyInfo.url));
|
|
201
216
|
return {
|
|
202
217
|
...proxyInfo,
|
|
203
218
|
sessionId,
|
|
204
219
|
groups,
|
|
205
220
|
countryCode,
|
|
221
|
+
subdivisionCode,
|
|
206
222
|
// this.password is not encoded, but the password from the URL will be, we need to normalize
|
|
207
223
|
password: this.usesApifyProxy
|
|
208
224
|
? (password ?? '')
|
|
@@ -257,7 +273,7 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
257
273
|
*/
|
|
258
274
|
_getUsername(sessionId) {
|
|
259
275
|
let username;
|
|
260
|
-
const { groups, countryCode } = this;
|
|
276
|
+
const { groups, countryCode, subdivisionCode } = this;
|
|
261
277
|
const parts = [];
|
|
262
278
|
if (groups && groups.length) {
|
|
263
279
|
parts.push(`groups-${groups.join('+')}`);
|
|
@@ -265,7 +281,10 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
265
281
|
if (sessionId) {
|
|
266
282
|
parts.push(`session-${sessionId}`);
|
|
267
283
|
}
|
|
268
|
-
if (
|
|
284
|
+
if (subdivisionCode) {
|
|
285
|
+
parts.push(`country-${countryCode}_${subdivisionCode}`);
|
|
286
|
+
}
|
|
287
|
+
else if (countryCode) {
|
|
269
288
|
parts.push(`country-${countryCode}`);
|
|
270
289
|
}
|
|
271
290
|
username = parts.join(',');
|
|
@@ -359,7 +378,8 @@ class ProxyConfiguration extends core_1.ProxyConfiguration {
|
|
|
359
378
|
_throwCannotCombineCustomWithApify() {
|
|
360
379
|
throw new Error('Cannot combine custom proxies with Apify Proxy! ' +
|
|
361
380
|
'It is not allowed to set "options.proxyUrls" or "options.newUrlFunction" combined with ' +
|
|
362
|
-
'"options.groups"
|
|
381
|
+
'"options.groups", "options.apifyProxyGroups", "options.countryCode", "options.apifyProxyCountry", ' +
|
|
382
|
+
'"options.subdivisionCode" or "options.apifyProxySubdivision".');
|
|
363
383
|
}
|
|
364
384
|
}
|
|
365
385
|
exports.ProxyConfiguration = ProxyConfiguration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy_configuration.js","sourceRoot":"","sources":["../src/proxy_configuration.ts"],"names":[],"mappings":";;;;AAIA,wCAA6E;AAC7E,0CAA6C;AAC7C,oDAAoB;AAEpB,0CAAwE;AACxE,gDAAwD;AAExD,yCAAmC;AACnC,yDAAmD;AAEnD,oEAAoE;AACpE,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,mCAAmC,GAAG,IAAK,CAAC;AAClD,MAAM,yBAAyB,GAAG,CAAC,CAAC;AACpC,MAAM,kBAAkB,GAAG,YAAY,CAAC;
|
|
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.7.1-beta.
|
|
3
|
+
"version": "3.7.1-beta.7",
|
|
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"
|