chore: fix build

apify · Aug 25, 2023 · ac164d6 · ac164d6
1 parent e04e3ae
commit ac164d6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/packages/basic-crawler/src/internals/basic-crawler.ts b/packages/basic-crawler/src/internals/basic-crawler.ts
@@ -1034,13 +1034,15 @@ export class BasicCrawler<Context extends CrawlingContext = BasicCrawlingContext
             return false;
         }
 
-        source.inProgress.delete(request.id!);
+        // eslint-disable-next-line dot-notation
+        source['requestIdsInProgress'].delete(request.id!);
         const delay = lastAccessTime + this.sameDomainDelayMillis - now;
         this.log.debug(`Request ${request.url} (${request.id}) will be reclaimed after ${delay} milliseconds due to same domain delay`);
         setTimeout(async () => {
             this.log.debug(`Adding request ${request.url} (${request.id}) back to the queue`);
-            source?.inProgress.add(request.id!);
-            await source?.reclaimRequest(request);
+            // eslint-disable-next-line dot-notation
+            source['requestIdsInProgress'].add(request.id!);
+            await source.reclaimRequest(request);
         }, delay);
 
         return true;

diff --git a/packages/core/src/storages/request_list.ts b/packages/core/src/storages/request_list.ts
@@ -253,7 +253,7 @@ export class RequestList {
      * Set of `uniqueKey`s of requests that were returned by fetchNextRequest().
      * @internal
      */
-    inProgress = new Set<string>();
+    requestIdsInProgress = new Set<string>();
 
     /**
      * Set of `uniqueKey`s of requests for which reclaimRequest() was called.
@@ -492,7 +492,7 @@ export class RequestList {
         });
 
         this.nextIndex = state.nextIndex;
-        this.inProgress = new Set(state.inProgress);
+        this.requestIdsInProgress = new Set(state.inProgress);
 
         // WORKAROUND:
         // It happened to some users that state object contained something like:
@@ -512,12 +512,12 @@ export class RequestList {
                 deleteFromInProgress,
             });
             for (const uniqueKey of deleteFromInProgress) {
-                this.inProgress.delete(uniqueKey);
+                this.requestIdsInProgress.delete(uniqueKey);
             }
         }
 
         // All in-progress requests need to be re-crawled
-        this.reclaimed = new Set(this.inProgress);
+        this.reclaimed = new Set(this.requestIdsInProgress);
     }
 
     /**
@@ -556,7 +556,7 @@ export class RequestList {
             nextUniqueKey: this.nextIndex < this.requests.length
                 ? this.requests[this.nextIndex].uniqueKey
                 : null,
-            inProgress: [...this.inProgress],
+            inProgress: [...this.requestIdsInProgress],
         };
     }
 
@@ -577,7 +577,7 @@ export class RequestList {
     async isFinished(): Promise<boolean> {
         this._ensureIsInitialized();
 
-        return this.inProgress.size === 0 && this.nextIndex >= this.requests.length;
+        return this.requestIdsInProgress.size === 0 && this.nextIndex >= this.requests.length;
     }
 
     /**
@@ -602,7 +602,7 @@ export class RequestList {
         // Otherwise return next request.
         if (this.nextIndex < this.requests.length) {
             const request = this.requests[this.nextIndex];
-            this.inProgress.add(request.uniqueKey);
+            this.requestIdsInProgress.add(request.uniqueKey);
             this.nextIndex++;
             this.isStatePersisted = false;
             return request;
@@ -621,7 +621,7 @@ export class RequestList {
         this._ensureInProgressAndNotReclaimed(uniqueKey);
         this._ensureIsInitialized();
 
-        this.inProgress.delete(uniqueKey);
+        this.requestIdsInProgress.delete(uniqueKey);
         this.isStatePersisted = false;
     }
 
@@ -742,7 +742,7 @@ export class RequestList {
      * Checks that request is not reclaimed and throws an error if so.
      */
     protected _ensureInProgressAndNotReclaimed(uniqueKey: string): void {
-        if (!this.inProgress.has(uniqueKey)) {
+        if (!this.requestIdsInProgress.has(uniqueKey)) {
             throw new Error(`The request is not being processed (uniqueKey: ${uniqueKey})`);
         }
         if (this.reclaimed.has(uniqueKey)) {
@@ -774,7 +774,7 @@ export class RequestList {
     handledCount(): number {
         this._ensureIsInitialized();
 
-        return this.nextIndex - this.inProgress.size;
+        return this.nextIndex - this.requestIdsInProgress.size;
     }
 
     /**

diff --git a/packages/core/src/storages/request_provider.ts b/packages/core/src/storages/request_provider.ts
@@ -42,7 +42,8 @@ export abstract class RequestProvider implements IStorage {
 
     protected queueHeadIds = new ListDictionary<string>();
     protected requestCache: LruCache<RequestLruItem>;
-    protected requestIdsInProgress = new Set<string>();
+    /** @internal */
+    requestIdsInProgress = new Set<string>();
     protected recentlyHandledRequestsCache: LruCache<boolean>;
 
     // TODO: RQv1 logic for stuck queues, this might not be needed anymore