apify-client 3.0.0-beta.51 → 3.0.0-beta.52

package/dist/base/resource_client.js

@@ -9,6 +9,8 @@ import { ApiClient } from './api_client.js';
 const MAX_WAIT_FOR_FINISH = 999999;
 /** The API holds a `waitForFinish` response for at most a minute, however long the parameter asks for. */
 const MAX_WAIT_FOR_FINISH_HOLD_SECS = 60;
+/** How long `waitForFinish()` keeps polling a job that returns 404, to ride out replica lag, before it gives up. */
+const MAX_WAIT_WHEN_JOB_NOT_EXIST_MILLIS = 3000;
 /**
  * Resource client.
  * @private
@@ -88,10 +90,14 @@ export class ResourceClient extends ApiClient {
         const { waitSecs = MAX_WAIT_FOR_FINISH, timeoutSecs = 'noTimeout', signal } = options;
         const waitMillis = waitSecs * 1000;
         let job;
+        let notFoundSince;
+        let notFoundError;
         const startedAt = Date.now();
         const shouldRepeat = () => {
-            const millisSinceStart = Date.now() - startedAt;
-            if (millisSinceStart >= waitMillis)
+            const now = Date.now();
+            if (now - startedAt >= waitMillis)
+                return false;
+            if (notFoundSince !== undefined && now - notFoundSince >= MAX_WAIT_WHEN_JOB_NOT_EXIST_MILLIS)
                 return false;
             const hasJobEnded = job && ACT_JOB_TERMINAL_STATUSES.includes(job.status);
             return !hasJobEnded;
@@ -110,10 +116,13 @@ export class ResourceClient extends ApiClient {
             try {
                 const response = await this.httpClient.call(requestOpts);
                 job = parseResponse(response, schema);
+                notFoundSince = undefined;
             }
             catch (err) {
                 catchNotFoundOrThrow(err);
                 job = undefined;
+                notFoundSince ??= Date.now();
+                notFoundError = err;
             }
             // It might take some time for database replicas to get up-to-date,
             // so getRun() might return null. Wait a little bit and try it again.
@@ -122,11 +131,8 @@ export class ResourceClient extends ApiClient {
                 signal?.throwIfAborted();
             }
         } while (shouldRepeat());
-        if (!job) {
-            const constructorName = this.constructor.name;
-            const jobName = constructorName.match(/(\w+)Client/)[1].toLowerCase();
-            throw new Error(`Waiting for ${jobName} to finish failed. Cannot fetch actor ${jobName} details from the server.`);
-        }
+        if (!job)
+            throw notFoundError;
         return job;
     }
 }