Do use client-side timeout for import endpoint

typesense · Jul 6, 2023 · 7342a6f · 7342a6f
1 parent a4d3330
commit 7342a6f
Show file tree

Hide file tree

Showing 10 changed files with 270 additions and 253 deletions.
diff --git a/dist/typesense.js b/dist/typesense.js
diff --git a/dist/typesense.min.js b/dist/typesense.min.js
diff --git a/dist/typesense.min.js.map b/dist/typesense.min.js.map
diff --git a/lib/Typesense/ApiCall.d.ts b/lib/Typesense/ApiCall.d.ts
@@ -27,12 +27,13 @@ export default class ApiCall {
     post<T>(endpoint: string, bodyParameters?: any, queryParameters?: any, additionalHeaders?: any): Promise<T>;
     put<T>(endpoint: string, bodyParameters?: any, queryParameters?: any): Promise<T>;
     patch<T>(endpoint: string, bodyParameters?: any, queryParameters?: any): Promise<T>;
-    performRequest<T>(requestType: Method, endpoint: string, { queryParameters, bodyParameters, additionalHeaders, abortSignal, responseType, }: {
+    performRequest<T>(requestType: Method, endpoint: string, { queryParameters, bodyParameters, additionalHeaders, abortSignal, responseType, skipConnectionTimeout, }: {
         queryParameters?: any;
         bodyParameters?: any;
         additionalHeaders?: any;
         abortSignal?: any;
         responseType?: AxiosRequestConfig["responseType"] | undefined;
+        skipConnectionTimeout?: boolean;
     }): Promise<T>;
     getNextNode(requestNumber?: number): Node;
     nodeDueForHealthcheck(node: any, requestNumber?: number): boolean;

diff --git a/lib/Typesense/ApiCall.js b/lib/Typesense/ApiCall.js
diff --git a/lib/Typesense/ApiCall.js.map b/lib/Typesense/ApiCall.js.map
diff --git a/lib/Typesense/Documents.js b/lib/Typesense/Documents.js
diff --git a/lib/Typesense/Documents.js.map b/lib/Typesense/Documents.js.map
diff --git a/src/Typesense/ApiCall.ts b/src/Typesense/ApiCall.ts
@@ -125,12 +125,14 @@ export default class ApiCall {
       additionalHeaders = {},
       abortSignal = null,
       responseType = undefined,
+      skipConnectionTimeout = false,
     }: {
       queryParameters?: any;
       bodyParameters?: any;
       additionalHeaders?: any;
       abortSignal?: any;
       responseType?: AxiosRequestConfig["responseType"] | undefined;
+      skipConnectionTimeout?: boolean;
     }
   ): Promise<T> {
     this.configuration.validate();
@@ -168,7 +170,6 @@ export default class ApiCall {
             additionalHeaders,
             this.additionalUserHeaders
           ),
-          timeout: this.connectionTimeoutSeconds * 1000,
           maxContentLength: Infinity,
           maxBodyLength: Infinity,
           responseType,
@@ -195,6 +196,10 @@ export default class ApiCall {
           ],
         };
 
+        if (skipConnectionTimeout !== true) {
+          requestOptions.timeout = this.connectionTimeoutSeconds * 1000;
+        }
+
         if (queryParameters && Object.keys(queryParameters).length !== 0) {
           requestOptions.params = queryParameters;
         }

diff --git a/src/Typesense/Documents.ts b/src/Typesense/Documents.ts
@@ -297,6 +297,7 @@ export default class Documents<T extends DocumentSchema = object>
         queryParameters: options,
         bodyParameters: documentsInJSONLFormat,
         additionalHeaders: { "Content-Type": "text/plain" },
+        skipConnectionTimeout: true, // We never want to client-side-timeout on an import and retry, since imports are syncronous and we want to let them take as long as it takes to complete fully
       }
     );