apify 2.1.0-beta.3 → 2.1.0
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/build/configuration.d.ts +3 -2
- package/build/configuration.d.ts.map +1 -1
- package/build/configuration.js +2 -2
- package/build/configuration.js.map +1 -1
- package/build/crawlers/cheerio_crawler.d.ts +28 -5
- package/build/crawlers/cheerio_crawler.d.ts.map +1 -1
- package/build/crawlers/cheerio_crawler.js +51 -11
- package/build/crawlers/cheerio_crawler.js.map +1 -1
- package/build/crawlers/crawler_utils.d.ts +18 -0
- package/build/crawlers/crawler_utils.d.ts.map +1 -1
- package/build/crawlers/crawler_utils.js +53 -1
- package/build/crawlers/crawler_utils.js.map +1 -1
- package/build/storages/dataset.d.ts +3 -2
- package/build/storages/dataset.d.ts.map +1 -1
- package/build/storages/key_value_store.d.ts +3 -2
- package/build/storages/key_value_store.d.ts.map +1 -1
- package/build/storages/request_queue.d.ts +3 -2
- package/build/storages/request_queue.d.ts.map +1 -1
- package/build/storages/storage_manager.d.ts +3 -2
- package/build/storages/storage_manager.d.ts.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/utils.d.ts +2 -1
- package/build/utils.d.ts.map +1 -1
- package/build/utils.js +2 -2
- package/build/utils.js.map +1 -1
- package/build/utils_request.js +2 -1
- package/build/utils_request.js.map +1 -1
- package/package.json +127 -127
package/build/configuration.d.ts
CHANGED
|
@@ -155,7 +155,7 @@ export class Configuration {
|
|
|
155
155
|
token?: string | undefined;
|
|
156
156
|
maxRetries?: string | undefined;
|
|
157
157
|
minDelayBetweenRetriesMillis?: string | undefined;
|
|
158
|
-
} | undefined):
|
|
158
|
+
} | undefined): ApifyClient;
|
|
159
159
|
/**
|
|
160
160
|
* Returns cached instance of {@link ApifyStorageLocal} using options as defined in the environment variables or in
|
|
161
161
|
* this {@link Configuration} instance. Only first call of this method will create the client, following calls will return
|
|
@@ -199,7 +199,7 @@ export class Configuration {
|
|
|
199
199
|
token?: string | undefined;
|
|
200
200
|
maxRetries?: string | undefined;
|
|
201
201
|
minDelayBetweenRetriesMillis?: string | undefined;
|
|
202
|
-
} | undefined):
|
|
202
|
+
} | undefined): ApifyClient;
|
|
203
203
|
/**
|
|
204
204
|
* Creates an instance of ApifyStorageLocal using options as defined in the environment variables or in this `Configuration` instance.
|
|
205
205
|
*
|
|
@@ -214,5 +214,6 @@ export class Configuration {
|
|
|
214
214
|
enableWalMode?: boolean | undefined;
|
|
215
215
|
} | undefined): ApifyStorageLocal;
|
|
216
216
|
}
|
|
217
|
+
import { ApifyClient } from "apify-client/dist/apify_client";
|
|
217
218
|
import { ApifyStorageLocal } from "@apify/storage-local";
|
|
218
219
|
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../src/configuration.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH;IAEI;;;;;;;;;;;;;;;;;;;;;;;;MA8BE;IAGF,4BAGO;IAEP,8BAAoD;IAEpD,8BAAqE;IAErE;;;;;;;;;;;;;;MAcE;IAmLF;;;;;OAKG;IACH,0BAFY,aAAa,CAQxB;IA7LD;;;;OAIG;IACH,sBAFW,OAAO,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EAYnD;IATG,gDAA+C;IAC/C,wBAAyB;IAU7B;;;;;;;;OAQG;IACH,SAJW,MAAM,yDAEL,MAAM,GAAG,MAAM,GAAG,OAAO,CAkBpC;IAED;;;;;OAKG;IACH,sBAWC;IAED;;;;;;OAMG;IACH,SAHW,MAAM,uDAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH;;;;
|
|
1
|
+
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../src/configuration.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH;IAEI;;;;;;;;;;;;;;;;;;;;;;;;MA8BE;IAGF,4BAGO;IAEP,8BAAoD;IAEpD,8BAAqE;IAErE;;;;;;;;;;;;;;MAcE;IAmLF;;;;;OAKG;IACH,0BAFY,aAAa,CAQxB;IA7LD;;;;OAIG;IACH,sBAFW,OAAO,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EAYnD;IATG,gDAA+C;IAC/C,wBAAyB;IAU7B;;;;;;;;OAQG;IACH,SAJW,MAAM,yDAEL,MAAM,GAAG,MAAM,GAAG,OAAO,CAkBpC;IAED;;;;;OAKG;IACH,sBAWC;IAED;;;;;;OAMG;IACH,SAHW,MAAM,uDAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH;;;;oBAHY,WAAW,CAStB;IAED;;;;;;;;;;;;;OAaG;IACH;;;oBAHY,iBAAiB,CAM5B;IAED;;;;;;;;;OASG;IACH,oBAQC;IAED;;;;;;;;;OASG;IACH;;;;oBAHY,WAAW,CAStB;IAED;;;;;;;;OAQG;IACH;;;oBAHY,iBAAiB,CAe5B;CAeJ"}
|
package/build/configuration.js
CHANGED
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const consts_1 = require("@apify/consts");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const storage_local_1 = require("@apify/storage-local");
|
|
8
|
-
const apify_client_1 =
|
|
8
|
+
const apify_client_1 = require("apify-client");
|
|
9
9
|
const utils_log_1 = (0, tslib_1.__importDefault)(require("./utils_log"));
|
|
10
10
|
/**
|
|
11
11
|
* `Configuration` is a value object holding the SDK configuration. We can use it in two ways:
|
|
@@ -193,7 +193,7 @@ class Configuration {
|
|
|
193
193
|
* @internal
|
|
194
194
|
*/
|
|
195
195
|
createClient(options = {}) {
|
|
196
|
-
return new apify_client_1.
|
|
196
|
+
return new apify_client_1.ApifyClient({
|
|
197
197
|
baseUrl: this.get('apiBaseUrl'),
|
|
198
198
|
token: this.get('token'),
|
|
199
199
|
...options, // allow overriding the instance configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.js"],"names":[],"mappings":";;;;AAAA,0CAAyD;AACzD,+BAA4B;AAC5B,wDAAyD;AACzD
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.js"],"names":[],"mappings":"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"}
|
|
@@ -708,11 +708,6 @@ declare class CheerioCrawler extends BasicCrawler {
|
|
|
708
708
|
* @ignore
|
|
709
709
|
* */
|
|
710
710
|
postNavigationHooks: Array<any>;
|
|
711
|
-
/**
|
|
712
|
-
* @type {RequestAsBrowserOptions}
|
|
713
|
-
* @ignore
|
|
714
|
-
* */
|
|
715
|
-
defaultRequestAsBrowserOptions: any;
|
|
716
711
|
persistCookiesPerSession: boolean;
|
|
717
712
|
/**
|
|
718
713
|
* **EXPERIMENTAL**
|
|
@@ -727,6 +722,22 @@ declare class CheerioCrawler extends BasicCrawler {
|
|
|
727
722
|
* @internal
|
|
728
723
|
*/
|
|
729
724
|
protected _handleNavigation(crawlingContext: CrawlingContext): Promise<void>;
|
|
725
|
+
/**
|
|
726
|
+
* When users change `request.headers.cookie` inside preNavigationHook, the change would be ignored,
|
|
727
|
+
* as `request.headers` are already merged into the `requestAsBrowserOptions`. This method is using
|
|
728
|
+
* old `request.headers` snapshot (before hooks are executed), makes a diff with the cookie value
|
|
729
|
+
* after hooks are executed, and merges any new cookies back to `requestAsBrowserOptions`.
|
|
730
|
+
*
|
|
731
|
+
* This way we can still use both `requestAsBrowserOptions` and `context.request` in the hooks (not both).
|
|
732
|
+
*
|
|
733
|
+
* @param {Request} request
|
|
734
|
+
* @param {string} cookieSnapshot
|
|
735
|
+
* @param {RequestAsBrowserOptions} requestAsBrowserOptions
|
|
736
|
+
* @private
|
|
737
|
+
* @ignore
|
|
738
|
+
* @internal
|
|
739
|
+
*/
|
|
740
|
+
private _mergeRequestCookieDiff;
|
|
730
741
|
/**
|
|
731
742
|
* Function to make the HTTP request. It performs optimizations
|
|
732
743
|
* on the request such as only downloading the request body if the
|
|
@@ -748,6 +759,18 @@ declare class CheerioCrawler extends BasicCrawler {
|
|
|
748
759
|
proxyUrl: string;
|
|
749
760
|
requestAsBrowserOptions: any;
|
|
750
761
|
}): Promise<IncomingMessage | Readable>;
|
|
762
|
+
/**
|
|
763
|
+
* Sets the cookie header to `requestAsBrowserOptions` based on provided session and request. If some cookies were already set,
|
|
764
|
+
* the session cookie will be merged with them. User provided cookies on `request` object have precedence.
|
|
765
|
+
*
|
|
766
|
+
* @param {CrawlingContext} crawlingContext
|
|
767
|
+
* @param {RequestAsBrowserOptions} requestAsBrowserOptions
|
|
768
|
+
* @return {void}
|
|
769
|
+
* @ignore
|
|
770
|
+
* @private
|
|
771
|
+
* @internal
|
|
772
|
+
*/
|
|
773
|
+
private _applySessionCookie;
|
|
751
774
|
/**
|
|
752
775
|
* Encodes and parses response according to the provided content type
|
|
753
776
|
* @param {Request} request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cheerio_crawler.d.ts","sourceRoot":"","sources":["../../src/crawlers/cheerio_crawler.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cheerio_crawler.d.ts","sourceRoot":"","sources":["../../src/crawlers/cheerio_crawler.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAiDc,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA82BjB,OAAO;;;;;;;;;;;;sCAYV,oBAAoB,KAClB,CAAC,IAAI,GAAC,QAAQ,IAAI,CAAC,CAAC;;;;;cAKnB,CAAC,eAAe,GAAC,QAAQ,CAAC;;;;aAC1B,OAAO;;;;;;;;;;aAON,cAAc;;oCAKlB,kBAAkB,KAChB,CAAC,IAAI,GAAC,QAAQ,IAAI,CAAC,CAAC;;;;;;;;;UAOnB,CAAC,MAAM,GAAC,MAAM,CAAC;;;;;;;;aAIf,OAAO;;;;iBAEP;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;;;;cAElC,eAAe;aAEf,OAAO;;;;;eACP,SAAS;aAGT,cAAc;;yCAKjB,uBAAuB,KACrB,QAAQ,IAAI,CAAC;AA36B1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkOG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgHG;AACH;IA0BI;;;OAGG;IACH,qBAHW,qBAAqB,EA2E/B;IAlCG,gCAA2F;IAO3F,gCAA2D;IAC3D,6BAAqD;IACrD,yBAAsC;IACtC,4CAAsD;IACtD,0CAAkD;IAClD,mDAAoD;IACpD,+CAAgD;IAChD,mDAA4C;IAC5C;;;SAGK;IACL,oBAHU,UAAW,CAGuB;IAC5C;;;SAGK;IACL,qBAHU,UAAW,CAMpB;IAGG,kCAAwG;IAMhH;;;;OAIG;IACH,eAFW,gBAAgB,QA+B1B;IAuED;;;;;OAKG;IACH,6CALW,eAAe,iBAmCzB;IAED;;;;;;;;;;;;;;OAcG;IACH,gCASC;IAED;;;;;;;;;;;;;;OAcG;IACH;QAT4B,OAAO,EAAxB,OAAO;QACU,OAAO,EAAxB,OAAO;QACS,QAAQ,EAAxB,MAAM;QAC2B,uBAAuB;QACtD,QAAQ,eAAe,GAAC,QAAQ,CAAC,CAoB7C;IAED;;;;;;;;;;OAUG;IACH,4BAQC;IAED;;;;;;;;OAQG;IACH,kCAPW,OAAO,kBACP,eAAe,GAAC,QAAQ,GACtB,QAAQ,MAAM,CAAC,CAgC3B;IAED;;;;;;;;;OASG;IACH,sCARW,OAAO,oGAsCjB;IAED;;;;;;;OAOG;IACH;;;MA+BC;IAED;;;;;OAKG;IACH,uDAYC;IAED;;;;;;OAMG;IACH,yDALW,MAAM,CAAC,MAAM,GAAC,MAAM,CAAC,CAAC,QAchC;IAED;;;;;;;OAOG;IACH,0CANW,OAAO,cACP,MAAM,QAWhB;IAED;;;;;;OAMG;IACH,yCALW,OAAO,QAQjB;IAED;;;;OAIG;IACH,6BAcC;CACJ"}
|
|
@@ -14,6 +14,7 @@ const got_scraping_1 = require("got-scraping");
|
|
|
14
14
|
const constants_1 = require("../constants");
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
16
|
const utils_request_1 = require("../utils_request");
|
|
17
|
+
const crawler_utils_1 = require("./crawler_utils");
|
|
17
18
|
const basic_crawler_1 = require("./basic_crawler"); // eslint-disable-line import/no-duplicates
|
|
18
19
|
const crawler_extension_1 = (0, tslib_1.__importDefault)(require("./crawler_extension"));
|
|
19
20
|
const validators_1 = require("../validators");
|
|
@@ -422,11 +423,6 @@ class CheerioCrawler extends basic_crawler_1.BasicCrawler {
|
|
|
422
423
|
({ request, response }) => this._abortDownloadOfBody(request, response),
|
|
423
424
|
...postNavigationHooks,
|
|
424
425
|
];
|
|
425
|
-
/**
|
|
426
|
-
* @type {RequestAsBrowserOptions}
|
|
427
|
-
* @ignore
|
|
428
|
-
* */
|
|
429
|
-
this.defaultRequestAsBrowserOptions = {};
|
|
430
426
|
if (this.useSessionPool) {
|
|
431
427
|
this.persistCookiesPerSession = persistCookiesPerSession !== undefined ? persistCookiesPerSession : true;
|
|
432
428
|
}
|
|
@@ -528,10 +524,15 @@ class CheerioCrawler extends basic_crawler_1.BasicCrawler {
|
|
|
528
524
|
this.log.deprecated('Option "prepareRequestFunction" is deprecated. Use "preNavigationHooks" instead.');
|
|
529
525
|
await this.prepareRequestFunction(crawlingContext);
|
|
530
526
|
}
|
|
531
|
-
const requestAsBrowserOptions = {
|
|
532
|
-
|
|
527
|
+
const requestAsBrowserOptions = {};
|
|
528
|
+
if (this.useSessionPool) {
|
|
529
|
+
this._applySessionCookie(crawlingContext, requestAsBrowserOptions);
|
|
530
|
+
}
|
|
533
531
|
const { request, session } = crawlingContext;
|
|
532
|
+
const cookieSnapshot = request.headers.Cookie ?? request.headers.cookie;
|
|
533
|
+
await this._executeHooks(this.preNavigationHooks, crawlingContext, requestAsBrowserOptions);
|
|
534
534
|
const proxyUrl = crawlingContext.proxyInfo && crawlingContext.proxyInfo.url;
|
|
535
|
+
this._mergeRequestCookieDiff(request, cookieSnapshot, requestAsBrowserOptions);
|
|
535
536
|
crawlingContext.response = await (0, utils_1.addTimeoutToPromise)(this._requestFunction({ request, session, proxyUrl, requestAsBrowserOptions }), this.requestTimeoutMillis, `request timed out after ${this.requestTimeoutMillis / 1000} seconds.`);
|
|
536
537
|
await this._executeHooks(this.postNavigationHooks, crawlingContext, requestAsBrowserOptions);
|
|
537
538
|
if (this.postResponseFunction) {
|
|
@@ -539,6 +540,30 @@ class CheerioCrawler extends basic_crawler_1.BasicCrawler {
|
|
|
539
540
|
await this.postResponseFunction(crawlingContext);
|
|
540
541
|
}
|
|
541
542
|
}
|
|
543
|
+
/**
|
|
544
|
+
* When users change `request.headers.cookie` inside preNavigationHook, the change would be ignored,
|
|
545
|
+
* as `request.headers` are already merged into the `requestAsBrowserOptions`. This method is using
|
|
546
|
+
* old `request.headers` snapshot (before hooks are executed), makes a diff with the cookie value
|
|
547
|
+
* after hooks are executed, and merges any new cookies back to `requestAsBrowserOptions`.
|
|
548
|
+
*
|
|
549
|
+
* This way we can still use both `requestAsBrowserOptions` and `context.request` in the hooks (not both).
|
|
550
|
+
*
|
|
551
|
+
* @param {Request} request
|
|
552
|
+
* @param {string} cookieSnapshot
|
|
553
|
+
* @param {RequestAsBrowserOptions} requestAsBrowserOptions
|
|
554
|
+
* @private
|
|
555
|
+
* @ignore
|
|
556
|
+
* @internal
|
|
557
|
+
*/
|
|
558
|
+
_mergeRequestCookieDiff(request, cookieSnapshot, requestAsBrowserOptions) {
|
|
559
|
+
const cookieDiff = (0, crawler_utils_1.diffCookies)(request.url, cookieSnapshot, request.headers.Cookie ?? request.headers.cookie);
|
|
560
|
+
if (cookieDiff.length > 0) {
|
|
561
|
+
requestAsBrowserOptions.headers.Cookie = (0, crawler_utils_1.mergeCookies)(request.url, [
|
|
562
|
+
requestAsBrowserOptions.headers.Cookie,
|
|
563
|
+
cookieDiff,
|
|
564
|
+
]);
|
|
565
|
+
}
|
|
566
|
+
}
|
|
542
567
|
/**
|
|
543
568
|
* Function to make the HTTP request. It performs optimizations
|
|
544
569
|
* on the request such as only downloading the request body if the
|
|
@@ -555,10 +580,6 @@ class CheerioCrawler extends basic_crawler_1.BasicCrawler {
|
|
|
555
580
|
* @internal
|
|
556
581
|
*/
|
|
557
582
|
async _requestFunction({ request, session, proxyUrl, requestAsBrowserOptions }) {
|
|
558
|
-
if (this.useSessionPool) {
|
|
559
|
-
const { headers } = request;
|
|
560
|
-
headers.Cookie = session.getCookieString(request.url);
|
|
561
|
-
}
|
|
562
583
|
const opts = this._getRequestOptions(request, session, proxyUrl, requestAsBrowserOptions);
|
|
563
584
|
let responseWithStream;
|
|
564
585
|
try {
|
|
@@ -574,6 +595,25 @@ class CheerioCrawler extends basic_crawler_1.BasicCrawler {
|
|
|
574
595
|
}
|
|
575
596
|
return responseWithStream;
|
|
576
597
|
}
|
|
598
|
+
/**
|
|
599
|
+
* Sets the cookie header to `requestAsBrowserOptions` based on provided session and request. If some cookies were already set,
|
|
600
|
+
* the session cookie will be merged with them. User provided cookies on `request` object have precedence.
|
|
601
|
+
*
|
|
602
|
+
* @param {CrawlingContext} crawlingContext
|
|
603
|
+
* @param {RequestAsBrowserOptions} requestAsBrowserOptions
|
|
604
|
+
* @return {void}
|
|
605
|
+
* @ignore
|
|
606
|
+
* @private
|
|
607
|
+
* @internal
|
|
608
|
+
*/
|
|
609
|
+
_applySessionCookie({ request, session }, requestAsBrowserOptions) {
|
|
610
|
+
const userCookie = request.headers.Cookie ?? request.headers.cookie;
|
|
611
|
+
const sessionCookie = session.getCookieString(request.url);
|
|
612
|
+
// merge cookies from all possible sources
|
|
613
|
+
requestAsBrowserOptions.headers = {
|
|
614
|
+
Cookie: (0, crawler_utils_1.mergeCookies)(request.url, [sessionCookie, userCookie]),
|
|
615
|
+
};
|
|
616
|
+
}
|
|
577
617
|
/**
|
|
578
618
|
* Encodes and parses response according to the provided content type
|
|
579
619
|
* @param {Request} request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cheerio_crawler.js","sourceRoot":"","sources":["../../src/crawlers/cheerio_crawler.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cheerio_crawler.js","sourceRoot":"","sources":["../../src/crawlers/cheerio_crawler.js"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,23 @@ export function handleRequestTimeout(session: Session, errorMessage: string): vo
|
|
|
12
12
|
* @private
|
|
13
13
|
*/
|
|
14
14
|
export function throwOnBlockedRequest(session: Session, statusCode: number): void;
|
|
15
|
+
/**
|
|
16
|
+
* Merges multiple cookie strings. Keys are compared case-sensitively, warning will be logged
|
|
17
|
+
* if we see two cookies with same keys but different casing.
|
|
18
|
+
*
|
|
19
|
+
* @param {string} url
|
|
20
|
+
* @param {string[]} sourceCookies
|
|
21
|
+
* @return {string}
|
|
22
|
+
* @private
|
|
23
|
+
*/
|
|
24
|
+
export function mergeCookies(url: string, sourceCookies: string[]): string;
|
|
25
|
+
/**
|
|
26
|
+
* @param {string} url
|
|
27
|
+
* @param {string} cookieString1
|
|
28
|
+
* @param {string} cookieString2
|
|
29
|
+
* @return {string}
|
|
30
|
+
* @private
|
|
31
|
+
*/
|
|
32
|
+
export function diffCookies(url: string, cookieString1: string, cookieString2: string): string;
|
|
15
33
|
import { Session } from "../session_pool/session";
|
|
16
34
|
//# sourceMappingURL=crawler_utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawler_utils.d.ts","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"crawler_utils.d.ts","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,8CAJW,OAAO,gBACP,MAAM,QAQhB;AAED;;;;;GAKG;AACH,+CAJW,OAAO,cACP,MAAM,QAShB;AAED;;;;;;;;GAQG;AACH,kCALW,MAAM,iBACN,MAAM,EAAE,GACP,MAAM,CAyBjB;AAED;;;;;;GAMG;AACH,iCANW,MAAM,iBACN,MAAM,iBACN,MAAM,GACL,MAAM,CAkBjB"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.throwOnBlockedRequest = exports.handleRequestTimeout = void 0;
|
|
3
|
+
exports.diffCookies = exports.mergeCookies = exports.throwOnBlockedRequest = exports.handleRequestTimeout = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const tough_cookie_1 = require("tough-cookie");
|
|
6
|
+
const utils_log_1 = (0, tslib_1.__importDefault)(require("../utils_log"));
|
|
4
7
|
/* eslint-enable no-unused-vars,import/named,import/no-duplicates,import/order */
|
|
5
8
|
/**
|
|
6
9
|
* Handles timeout request
|
|
@@ -29,4 +32,53 @@ function throwOnBlockedRequest(session, statusCode) {
|
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
34
|
exports.throwOnBlockedRequest = throwOnBlockedRequest;
|
|
35
|
+
/**
|
|
36
|
+
* Merges multiple cookie strings. Keys are compared case-sensitively, warning will be logged
|
|
37
|
+
* if we see two cookies with same keys but different casing.
|
|
38
|
+
*
|
|
39
|
+
* @param {string} url
|
|
40
|
+
* @param {string[]} sourceCookies
|
|
41
|
+
* @return {string}
|
|
42
|
+
* @private
|
|
43
|
+
*/
|
|
44
|
+
function mergeCookies(url, sourceCookies) {
|
|
45
|
+
const jar = new tough_cookie_1.CookieJar();
|
|
46
|
+
// ignore empty cookies
|
|
47
|
+
for (const sourceCookieString of sourceCookies.filter((c) => c)) {
|
|
48
|
+
const cookies = sourceCookieString.split(/ *; */); // ignore extra spaces
|
|
49
|
+
for (const cookieString of cookies) {
|
|
50
|
+
const cookie = tough_cookie_1.Cookie.parse(cookieString);
|
|
51
|
+
const similarKeyCookie = jar.getCookiesSync(url).find((c) => {
|
|
52
|
+
return cookie.key !== c.key && cookie.key.toLowerCase() === c.key.toLowerCase();
|
|
53
|
+
});
|
|
54
|
+
if (similarKeyCookie) {
|
|
55
|
+
utils_log_1.default.deprecated(`Found cookies with similar name during cookie merging: '${cookie.key}' and '${similarKeyCookie.key}'`);
|
|
56
|
+
}
|
|
57
|
+
jar.setCookieSync(cookie, url);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return jar.getCookieStringSync(url);
|
|
61
|
+
}
|
|
62
|
+
exports.mergeCookies = mergeCookies;
|
|
63
|
+
/**
|
|
64
|
+
* @param {string} url
|
|
65
|
+
* @param {string} cookieString1
|
|
66
|
+
* @param {string} cookieString2
|
|
67
|
+
* @return {string}
|
|
68
|
+
* @private
|
|
69
|
+
*/
|
|
70
|
+
function diffCookies(url, cookieString1, cookieString2) {
|
|
71
|
+
if (cookieString1 === cookieString2) {
|
|
72
|
+
return '';
|
|
73
|
+
}
|
|
74
|
+
const cookies1 = cookieString1.split(/ *; */).map((cookie) => tough_cookie_1.Cookie.parse(cookie));
|
|
75
|
+
const cookies2 = cookieString2.split(/ *; */).map((cookie) => tough_cookie_1.Cookie.parse(cookie));
|
|
76
|
+
const added = cookies2.filter((newCookie) => {
|
|
77
|
+
return !cookies1.find((oldCookie) => newCookie.toString() === oldCookie.toString());
|
|
78
|
+
});
|
|
79
|
+
const jar = new tough_cookie_1.CookieJar();
|
|
80
|
+
added.forEach((cookie) => jar.setCookieSync(cookie, url));
|
|
81
|
+
return jar.getCookieStringSync(url);
|
|
82
|
+
}
|
|
83
|
+
exports.diffCookies = diffCookies;
|
|
32
84
|
//# sourceMappingURL=crawler_utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawler_utils.js","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"crawler_utils.js","sourceRoot":"","sources":["../../src/crawlers/crawler_utils.js"],"names":[],"mappings":"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"}
|
|
@@ -61,13 +61,13 @@ export class Dataset {
|
|
|
61
61
|
constructor(options: {
|
|
62
62
|
id: string;
|
|
63
63
|
name?: string | undefined;
|
|
64
|
-
client:
|
|
64
|
+
client: ApifyClient | ApifyStorageLocal;
|
|
65
65
|
isLocal: boolean;
|
|
66
66
|
});
|
|
67
67
|
id: string;
|
|
68
68
|
name: string | undefined;
|
|
69
69
|
isLocal: boolean;
|
|
70
|
-
client:
|
|
70
|
+
client: import("@apify/storage-local/dist/resource_clients/dataset").DatasetClient | import("apify-client").DatasetClient;
|
|
71
71
|
log: import("@apify/log/log").Log;
|
|
72
72
|
/**
|
|
73
73
|
* Stores an object or an array of objects to the dataset.
|
|
@@ -282,6 +282,7 @@ export type DatasetMapper = (item: object, index: number) => object;
|
|
|
282
282
|
* User-function used in the `Dataset.reduce()` API.
|
|
283
283
|
*/
|
|
284
284
|
export type DatasetReducer = (memo: object, item: object, index: number) => object;
|
|
285
|
+
import { ApifyClient } from "apify-client/dist/apify_client";
|
|
285
286
|
import { ApifyStorageLocal } from "@apify/storage-local";
|
|
286
287
|
import { Configuration } from "../configuration";
|
|
287
288
|
//# sourceMappingURL=dataset.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../src/storages/dataset.js"],"names":[],"mappings":"AAcA,oDAAqD;AACrD,sCAAuC;AAchC,yDALI,MAAM,+BAEJ,MAAM,CAuBlB;AAeM,mCALI,MAAM,MAAM,CAAC,cACb,MAAM,GACJ,MAAM,MAAM,CAAC,CA6BzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH;IACI;;;;;;OAMG;IACH;QAL2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACkB,MAAM,EAA7C,
|
|
1
|
+
{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../src/storages/dataset.js"],"names":[],"mappings":"AAcA,oDAAqD;AACrD,sCAAuC;AAchC,yDALI,MAAM,+BAEJ,MAAM,CAuBlB;AAeM,mCALI,MAAM,MAAM,CAAC,cACb,MAAM,GACJ,MAAM,MAAM,CAAC,CA6BzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH;IACI;;;;;;OAMG;IACH;QAL2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACkB,MAAM,EAA7C,WAAW,GAAC,iBAAiB;QACZ,OAAO,EAAxB,OAAO;OAQjB;IALG,WAAoB;IACpB,yBAAwB;IACxB,iBAA8B;IAC9B,0HAA6C;IAC7C,kCAA2C;IAG/C;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,eAJW,MAAM,GAAC,MAAM,MAAM,CAAC,GAEnB,QAAQ,IAAI,CAAC,CAsBxB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH;;;;;;;;;oBAFY,QAAQ,cAAc,CAAC,CAWlC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,WAFa,QAAQ,MAAM,CAAC,CAI3B;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,kBATW,eAAe;;;;gDAOd,QAAQ,IAAI,CAAC,CAkBxB;IAED;;;;;;;;;;;;;OAaG;IACH,cARW,aAAa;;;;oBAMZ,QAAQ,MAAM,MAAM,CAAC,CAAC,CAejC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,iBATW,cAAc,QACd,MAAM;;;;oBAML,QAAQ,MAAM,CAAC,CAqB1B;IAED;;;;;OAKG;IACH,QAFY,QAAQ,IAAI,CAAC,CAMxB;CACJ;AAwBM;;;gBALM,QAAQ,OAAO,CAAC,CAc5B;AA8BM,+BARI,MAAM,GAEJ,QAAQ,IAAI,CAAC,CAUzB;;;;;WAIa,MAAM,MAAM,CAAC;;;;WACb,MAAM;;;;YACN,MAAM;;;;WACN,MAAM;;;;WACN,MAAM;;;;;qCAOT,MAAM,SACN,MAAM,KACJ,MAAM;;;;mCAOR,MAAM,SACN,MAAM,KACJ,MAAM;;;;oCAMR,MAAM,QACN,MAAM,SACN,MAAM,KACJ,MAAM"}
|
|
@@ -76,13 +76,13 @@ export class KeyValueStore {
|
|
|
76
76
|
constructor(options: {
|
|
77
77
|
id: string;
|
|
78
78
|
name?: string | undefined;
|
|
79
|
-
client:
|
|
79
|
+
client: ApifyClient | ApifyStorageLocal;
|
|
80
80
|
isLocal: boolean;
|
|
81
81
|
}, config?: Configuration | undefined);
|
|
82
82
|
id: string;
|
|
83
83
|
name: string | undefined;
|
|
84
84
|
isLocal: boolean;
|
|
85
|
-
client:
|
|
85
|
+
client: import("@apify/storage-local/dist/resource_clients/key_value_store").KeyValueStoreClient | import("apify-client").KeyValueStoreClient;
|
|
86
86
|
log: import("@apify/log/log").Log;
|
|
87
87
|
config: Configuration;
|
|
88
88
|
/**
|
|
@@ -238,5 +238,6 @@ export type KeyValueStoreValueTypes = ({
|
|
|
238
238
|
*/
|
|
239
239
|
export type KeyConsumer = (key: string, index: number, info: any, size: number) => any;
|
|
240
240
|
import { Configuration } from "../configuration";
|
|
241
|
+
import { ApifyClient } from "apify-client/dist/apify_client";
|
|
241
242
|
import { ApifyStorageLocal } from "@apify/storage-local";
|
|
242
243
|
//# sourceMappingURL=key_value_store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key_value_store.d.ts","sourceRoot":"","sources":["../../src/storages/key_value_store.js"],"names":[],"mappings":"AAwBO,8DAuBN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AACH;IACI;;;;;;;OAOG;IACH;QAN2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACkB,MAAM,EAA7C,
|
|
1
|
+
{"version":3,"file":"key_value_store.d.ts","sourceRoot":"","sources":["../../src/storages/key_value_store.js"],"names":[],"mappings":"AAwBO,8DAuBN;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AACH;IACI;;;;;;;OAOG;IACH;QAN2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACkB,MAAM,EAA7C,WAAW,GAAC,iBAAiB;QACZ,OAAO,EAAxB,OAAO;2CAUjB;IANG,WAAoB;IACpB,yBAAwB;IACxB,iBAA8B;IAC9B,8IAAmD;IACnD,kCAAiD;IACjD,sBAAoB;IAGxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,cARW,MAAM,GAGJ,QAAQ,uBAAuB,CAAC,CAa5C;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,cAfW,MAAM,SAGN,uBAAuB;;oBASrB,QAAQ,IAAI,CAAC,CA+BzB;IAED;;;;;OAKG;IACH,QAFY,QAAQ,IAAI,CAAC,CAMxB;IAED;;;;;;OAMG;IACH,kBAHW,MAAM,GACL,MAAM,CAIjB;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,qBANW,WAAW;;oBAIV,QAAQ,IAAI,CAAC,CAIxB;IAED;;;;;;OAMG;IACH,oBAeC;CACJ;AAwBM;;;gBALM,QAAQ,aAAa,CAAC,CAclC;AAiCM,8BAXI,MAAM,GAEJ,QAAQ;QAAO,MAAM;IAAK,MAAM,GAAC,MAAM,GAAC,IAAI,CAAC,CAazD;AAsCM,8BAhBI,MAAM;;gBAWL,QAAQ,IAAI,CAAC,CASxB;AAiCM,4BATM,QAAQ;QAAO,MAAM;IAAK,MAAM,GAAC,MAAM,GAAC,IAAI,CAAC,CASiD;sCApc9F,CAAC;QAAO,MAAM;IAAK,IAAI,GAAC,MAAM,GAAC,MAAM,CAAC;;;;gCAycxC,MAAM,SAEN,MAAM,mBAIN,MAAM"}
|
|
@@ -74,13 +74,13 @@ export class RequestQueue {
|
|
|
74
74
|
id: string;
|
|
75
75
|
name?: string | undefined;
|
|
76
76
|
isLocal: boolean;
|
|
77
|
-
client:
|
|
77
|
+
client: ApifyClient | ApifyStorageLocal;
|
|
78
78
|
});
|
|
79
79
|
id: string;
|
|
80
80
|
name: string | undefined;
|
|
81
81
|
isLocal: boolean;
|
|
82
82
|
clientKey: string;
|
|
83
|
-
client:
|
|
83
|
+
client: import("@apify/storage-local/dist/resource_clients/request_queue").RequestQueueClient | import("apify-client").RequestQueueClient;
|
|
84
84
|
log: import("@apify/log/log").Log;
|
|
85
85
|
/**
|
|
86
86
|
* @type {*}
|
|
@@ -306,5 +306,6 @@ export type RequestQueueInfo = {
|
|
|
306
306
|
import { LruCache } from "@apify/datastructures/lru_cache";
|
|
307
307
|
import Request from "../request";
|
|
308
308
|
import { RequestOptions } from "../request";
|
|
309
|
+
import { ApifyClient } from "apify-client/dist/apify_client";
|
|
309
310
|
import { ApifyStorageLocal } from "@apify/storage-local";
|
|
310
311
|
//# sourceMappingURL=request_queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_queue.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue.js"],"names":[],"mappings":"AAoBA,wCAAyC;AACzC,kCAAmC;AAInC,yDAA6D;AAG7D,4CAA6C;AAQ7C,oDAAqD;AAW9C,qDAQN;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACI;;;;;;OAMG;IACH;QAL2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACJ,OAAO,EAAxB,OAAO;QACgC,MAAM,EAA7C,
|
|
1
|
+
{"version":3,"file":"request_queue.d.ts","sourceRoot":"","sources":["../../src/storages/request_queue.js"],"names":[],"mappings":"AAoBA,wCAAyC;AACzC,kCAAmC;AAInC,yDAA6D;AAG7D,4CAA6C;AAQ7C,oDAAqD;AAW9C,qDAQN;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACI;;;;;;OAMG;IACH;QAL2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACJ,OAAO,EAAxB,OAAO;QACgC,MAAM,EAA7C,WAAW,GAAC,iBAAiB;OAyCvC;IAtCG,WAAoB;IACpB,yBAAwB;IACxB,iBAA8B;IAC9B,kBAAuC;IACvC,0IAEE;IACF,kCAAgD;IAKhD;;;OAGG;IACH,mBAAyC;IACzC,2BAAiC;IAIjC,qBAA2B;IAK3B,+BAA+E;IAI/E,0BAA0B;IAC1B,4BAA4B;IAM5B,6BAAqE;IAGzE;;OAEG;IACH,0BAEC;IAED;;;;;;;;;;;;;;;OAeG;IACH,wBANW,CAAC,OAAO,GAAC,cAAc,CAAC;;oBAIvB,QAAQ,kBAAkB,CAAC,CA8CtC;IAED;;;;;OAKG;IACH,eAHW,MAAM,GACL,QAAQ,CAAC,OAAO,GAAC,IAAI,CAAC,CAAC,CAmBlC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,oBAHa,QAAQ,CAAC,OAAO,GAAC,IAAI,CAAC,CAAC,CA0DnC;IAED;;;;;;;;OAQG;IACH,4BAHW,OAAO,GACN,QAAQ,kBAAkB,CAAC,CA6BtC;IAED;;;;;;;;;;;;;OAaG;IACH,wBARW,OAAO;;oBAMN,QAAQ,kBAAkB,CAAC,CAsCtC;IAED;;;;;;;OAOG;IACH,WAFa,QAAQ,OAAO,CAAC,CAK5B;IAED;;;;;;;OAOG;IACH,cAFa,QAAQ,OAAO,CAAC,CAO5B;IAED;;;;;;;;;OASG;IACH,kCARW,MAAM;QAEqB,SAAS,EAApC,MAAM;QACsB,iBAAiB,EAA7C,OAAO;aAUjB;IAED;;;;;;;;;;;;OAYG;IACH,sIALY,QAAQ,OAAO,CAAC,CAqF3B;IAED;;;OAGG;IACH,oCAMC;IAED;;;;;OAKG;IACH,QAFY,QAAQ,IAAI,CAAC,CAMxB;IAED;;;;;;;;;;OAUG;IACH,gBAFY,QAAQ,MAAM,CAAC,CAM1B;IAED;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,WAFa,QAAQ,gBAAgB,CAAC,CAIrC;CACJ;AAyBM;;gBALM,QAAQ,YAAY,CAAC,CAYjC;;;;;;;;;;uBA1lBa,OAAO;;;;uBACP,OAAO;;;;eACP,MAAM;;;;aACN,OAAO;;;QA2lBP,MAAM;UACN,MAAM;YACN,MAAM;eACN,IAAI;gBACJ,IAAI;gBACJ,IAAI;uBACJ,MAAM;yBACN,MAAM;yBACN,MAAM"}
|
|
@@ -54,7 +54,7 @@ export class StorageManager<T> {
|
|
|
54
54
|
* @protected
|
|
55
55
|
* @internal
|
|
56
56
|
*/
|
|
57
|
-
protected _getOrCreateStorage(storageIdOrName: string, storageConstructorName: string, apiClient:
|
|
57
|
+
protected _getOrCreateStorage(storageIdOrName: string, storageConstructorName: string, apiClient: ApifyClient | ApifyStorageLocal): Promise<any>;
|
|
58
58
|
/**
|
|
59
59
|
* @param {ApifyClient|ApifyStorageLocal} client
|
|
60
60
|
* @param {string} storageConstructorName
|
|
@@ -62,7 +62,7 @@ export class StorageManager<T> {
|
|
|
62
62
|
* @protected
|
|
63
63
|
* @internal
|
|
64
64
|
*/
|
|
65
|
-
protected _getStorageClientFactories(client:
|
|
65
|
+
protected _getStorageClientFactories(client: ApifyClient | ApifyStorageLocal, storageConstructorName: string): {
|
|
66
66
|
createStorageClient: any;
|
|
67
67
|
createStorageCollectionClient: any;
|
|
68
68
|
};
|
|
@@ -82,5 +82,6 @@ export class StorageManager<T> {
|
|
|
82
82
|
}): void;
|
|
83
83
|
}
|
|
84
84
|
import { Configuration } from "../configuration";
|
|
85
|
+
import { ApifyClient } from "apify-client/dist/apify_client";
|
|
85
86
|
import { ApifyStorageLocal } from "@apify/storage-local";
|
|
86
87
|
//# sourceMappingURL=storage_manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage_manager.d.ts","sourceRoot":"","sources":["../../src/storages/storage_manager.js"],"names":[],"mappings":"AAyBA;;;;;;;GAOG;AACH;IACI;;;OAGG;IACH,gCAHW,CAAC,sCAQX;IAJG,sBAA4C;IAC5C,UAAmC;IACnC,qDAAqE;IACrE,sBAAoB;IAGxB;;;;;OAKG;IACH;;oBAFY,QAAQ,CAAC,CAAC,CA4BrB;IAED;;;;;OAKG;IACH;QAJ2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACH,OAAO;aASnC;IAED;;;;;;;OAOG;IACH,oCAPW,MAAM,WACN,OAAO,GACN,MAAM,CASjB;IAED;;;;;;;;OAQG;IACH,+CAPW,MAAM,0BACN,MAAM,aACN,
|
|
1
|
+
{"version":3,"file":"storage_manager.d.ts","sourceRoot":"","sources":["../../src/storages/storage_manager.js"],"names":[],"mappings":"AAyBA;;;;;;;GAOG;AACH;IACI;;;OAGG;IACH,gCAHW,CAAC,sCAQX;IAJG,sBAA4C;IAC5C,UAAmC;IACnC,qDAAqE;IACrE,sBAAoB;IAGxB;;;;;OAKG;IACH;;oBAFY,QAAQ,CAAC,CAAC,CA4BrB;IAED;;;;;OAKG;IACH;QAJ2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACH,OAAO;aASnC;IAED;;;;;;;OAOG;IACH,oCAPW,MAAM,WACN,OAAO,GACN,MAAM,CASjB;IAED;;;;;;;;OAQG;IACH,+CAPW,MAAM,0BACN,MAAM,aACN,WAAW,GAAC,iBAAiB,gBAiBvC;IAED;;;;;;OAMG;IACH,6CANW,WAAW,GAAC,iBAAiB,0BAC7B,MAAM;;;MAchB;IAED;;;;;;;;OAQG;IACH;QAP2B,EAAE,EAAlB,MAAM;QACW,IAAI;QACH,OAAO;aAYnC;CACJ"}
|