chore: small inconsistencies fixed

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

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/core/src/storages/request_queue.ts b/packages/core/src/storages/request_queue.ts
@@ -111,7 +111,7 @@ export class RequestQueue extends RequestProvider {
      *   Returns the request object or `null` if there are no more pending requests.
      */
     override async fetchNextRequest<T extends Dictionary = Dictionary>(): Promise<Request<T> | null> {
-        await this._ensureHeadIsNonEmpty();
+        await this.ensureHeadIsNonEmpty();
 
         const nextRequestId = this.queueHeadIds.removeFirst();
 
@@ -131,7 +131,7 @@ export class RequestQueue extends RequestProvider {
         this.requestIdsInProgress.add(nextRequestId);
         this.lastActivity = new Date();
 
-        let request;
+        let request: Request | null;
         try {
             request = await this.getRequest(nextRequestId);
         } catch (e) {

diff --git a/packages/core/src/storages/request_queue_v2.ts b/packages/core/src/storages/request_queue_v2.ts
@@ -91,7 +91,15 @@ class RequestQueue extends RequestProvider {
         this.requestIdsInProgress.add(nextRequestId);
         this.lastActivity = new Date();
 
-        const request = await this.getOrHydrateRequest(nextRequestId);
+        let request: Request | null;
+
+        try {
+            request = await this.getOrHydrateRequest(nextRequestId);
+        } catch (e) {
+            // On error, remove the request from in progress, otherwise it would be there forever
+            this.requestIdsInProgress.delete(nextRequestId);
+            throw e;
+        }
 
         // NOTE: It can happen that the queue head index is inconsistent with the main queue table. This can occur in two situations: