@algolia/ingestion 1.55.0 → 1.55.2

package/dist/src/ingestionClient.js

@@ -6,7 +6,7 @@ import {
   getAlgoliaAgent,
   validateRequired
 } from "@algolia/client-common";
-var apiClientVersion = "1.55.0";
+var apiClientVersion = "1.55.2";
 var REGIONS = ["eu", "us"];
 function getDefaultHosts(region) {
   const url = "data.{region}.algolia.com".replace("{region}", region);
@@ -115,10 +115,41 @@ function createIngestionClient({
       referenceIndexName,
       maxRetries = 100
     }, requestOptions) {
+      if (batchSize < 1) {
+        throw new Error("`batchSize` must be at least 1.");
+      }
       let records = [];
       let offset = 0;
       const responses = [];
       const waitBatchSize = Math.floor(batchSize / 10) || batchSize;
+      const waitForBatch = async (start, end) => {
+        for (const resp of responses.slice(start, end)) {
+          if (!resp.eventID) {
+            throw new Error("received unexpected response from the push endpoint, eventID must not be undefined");
+          }
+          let retryCount = 0;
+          await createIterablePromise({
+            func: async () => {
+              if (resp.eventID === void 0 || !resp.eventID) {
+                throw new Error("received unexpected response from the push endpoint, eventID must not be undefined");
+              }
+              return this.getEvent({ runID: resp.runID, eventID: resp.eventID }).catch((error) => {
+                if (error.status === 404) {
+                  return void 0;
+                }
+                throw error;
+              });
+            },
+            validate: (response) => response !== void 0,
+            aggregator: () => retryCount += 1,
+            error: {
+              validate: () => retryCount >= maxRetries,
+              message: () => `Stopped waiting for the task after ${maxRetries} retries. This does not mean the operation failed; it may still complete. If you need to keep polling, retry with a higher maxRetries.`
+            },
+            timeout: () => Math.min(retryCount * 1500, 5e3)
+          });
+        }
+      };
       const objectEntries = objects.entries();
       for (const [i, obj] of objectEntries) {
         records.push(obj);
@@ -128,36 +159,14 @@ function createIngestionClient({
           );
           records = [];
         }
-        if (waitForTasks && responses.length > 0 && (responses.length % waitBatchSize === 0 || i === objects.length - 1)) {
-          for (const resp of responses.slice(offset, offset + waitBatchSize)) {
-            if (!resp.eventID) {
-              throw new Error("received unexpected response from the push endpoint, eventID must not be undefined");
-            }
-            let retryCount = 0;
-            await createIterablePromise({
-              func: async () => {
-                if (resp.eventID === void 0 || !resp.eventID) {
-                  throw new Error("received unexpected response from the push endpoint, eventID must not be undefined");
-                }
-                return this.getEvent({ runID: resp.runID, eventID: resp.eventID }).catch((error) => {
-                  if (error.status === 404) {
-                    return void 0;
-                  }
-                  throw error;
-                });
-              },
-              validate: (response) => response !== void 0,
-              aggregator: () => retryCount += 1,
-              error: {
-                validate: () => retryCount >= maxRetries,
-                message: () => `Stopped waiting for the task after ${maxRetries} retries. This does not mean the operation failed; it may still complete. If you need to keep polling, retry with a higher maxRetries.`
-              },
-              timeout: () => Math.min(retryCount * 1500, 5e3)
-            });
-          }
+        if (waitForTasks && responses.length - offset >= waitBatchSize) {
+          await waitForBatch(offset, offset + waitBatchSize);
           offset += waitBatchSize;
         }
       }
+      if (waitForTasks) {
+        await waitForBatch(offset, responses.length);
+      }
       return responses;
     },
     /**
@@ -1342,7 +1351,7 @@ function createIngestionClient({
           connect: 18e4,
           read: 18e4,
           write: 18e4,
-          ...requestOptions?.timeouts
+          ...requestOptions == null ? void 0 : requestOptions.timeouts
         }
       };
       return transporter.request(request, requestOptions);
@@ -1383,7 +1392,7 @@ function createIngestionClient({
           connect: 18e4,
           read: 18e4,
           write: 18e4,
-          ...requestOptions?.timeouts
+          ...requestOptions == null ? void 0 : requestOptions.timeouts
         }
       };
       return transporter.request(request, requestOptions);
@@ -1684,7 +1693,7 @@ function createIngestionClient({
           connect: 18e4,
           read: 18e4,
           write: 18e4,
-          ...requestOptions?.timeouts
+          ...requestOptions == null ? void 0 : requestOptions.timeouts
         }
       };
       return transporter.request(request, requestOptions);
@@ -1949,7 +1958,7 @@ function createIngestionClient({
           connect: 18e4,
           read: 18e4,
           write: 18e4,
-          ...requestOptions?.timeouts
+          ...requestOptions == null ? void 0 : requestOptions.timeouts
         }
       };
       return transporter.request(request, requestOptions);
@@ -1984,7 +1993,7 @@ function createIngestionClient({
           connect: 18e4,
           read: 18e4,
           write: 18e4,
-          ...requestOptions?.timeouts
+          ...requestOptions == null ? void 0 : requestOptions.timeouts
         }
       };
       return transporter.request(request, requestOptions);