apify-client 3.0.0-beta.85 → 3.0.0-beta.87

package/dist/base/api_client.js

@@ -1,4 +1,4 @@
-import { minForLimitParam, SCANNED_COUNT, toPath, toPathSegment } from '../utils.js';
+import { minForLimitParam, toPath, toPathSegment } from '../utils.js';
 /** @private */
 export class ApiClient {
     id;
@@ -60,14 +60,14 @@ export class ApiClient {
         const { chunkSize, ...listOptions } = options;
         const firstPageLimit = minForLimitParam(options.limit, chunkSize);
         const paginatedListPromise = getPaginatedList({ ...listOptions, limit: firstPageLimit });
-        // A page can return more or fewer items than the rows it scanned (see `SCANNED_COUNT`). The next offset and
-        // the stop condition follow the scanned rows: advancing by `items.length` would re-scan rows after a filter
-        // dropped some and skip rows after `unwind` multiplied them, and stopping at an empty page would end the
-        // iteration in front of rows a filter hid. The scanned number is derived from a dataset's item count, which
-        // lags a fresh push, so the larger of it and `items.length` is taken, capped at the rows the request asked for
-        // so that an unwound page does not advance past rows the next request would then never read.
+        // A page of dataset items can return more or fewer items than the rows it scanned (see `PaginatedList.count`).
+        // The next offset and the stop condition follow the scanned rows: advancing by `items.length` would re-scan
+        // rows after a filter dropped some and skip rows after `unwind` multiplied them, and stopping at an empty page
+        // would end the iteration in front of rows a filter hid. The step is the larger of `count` and `items.length`,
+        // capped at the rows the request asked for, which keeps an unwound page from advancing past rows the next
+        // request would then never read.
         const scannedRows = (page, requestedLimit) => {
-            const scanned = Math.max(page[SCANNED_COUNT] ?? 0, page.items.length);
+            const scanned = Math.max(page.count ?? 0, page.items.length);
             return requestedLimit ? Math.min(scanned, requestedLimit) : scanned;
         };
         // `total` is not consulted, as it changes when the listed resource grows during the iteration.

package/dist/base/resource_client.js

@@ -102,7 +102,7 @@ export class ResourceClient extends ApiClient {
             const hasJobEnded = job && ACT_JOB_TERMINAL_STATUSES.includes(job.status);
             return !hasJobEnded;
         };
-        do {
+        while (true) {
             const millisSinceStart = Date.now() - startedAt;
             const remainingWaitSeconds = Math.round((waitMillis - millisSinceStart) / 1000);
             const waitForFinish = Math.max(0, remainingWaitSeconds);
@@ -124,13 +124,13 @@ export class ResourceClient extends ApiClient {
                 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.
-            if (!job) {
-                await sleep(250, signal);
-                signal?.throwIfAborted();
-            }
-        } while (shouldRepeat());
+            if (!shouldRepeat())
+                break;
+            // The API answers right away when the remaining wait rounds to 0 seconds, and database replicas may not see
+            // a new job for a short while, so pause before the next poll.
+            await sleep(250, signal);
+            signal?.throwIfAborted();
+        }
         if (!job)
             throw notFoundError;
         return job;