Add support for retry-after header

.github/workflows/pull_request.yaml

@@ -20,6 +20,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2
         with:
+          version: 9.15.0
           run_install: false
 
       - name: Use Node.js ${{ matrix.node-version }}

packages/js-client-grpc/src/api-client.ts

@@ -1,10 +1,11 @@
-import {Transport, Interceptor, createPromiseClient, PromiseClient} from '@bufbuild/connect';
-import {createGrpcTransport, compressionGzip} from '@bufbuild/connect-node';
+import {Code, ConnectError, createPromiseClient, Interceptor, PromiseClient, Transport} from '@bufbuild/connect';
+import {compressionGzip, createGrpcTransport} from '@bufbuild/connect-node';
 import {Collections} from './proto/collections_service_connect.js';
 import {Points} from './proto/points_service_connect.js';
 import {Snapshots} from './proto/snapshots_service_connect.js';
 import {Qdrant} from './proto/qdrant_connect.js';
 import {PACKAGE_VERSION} from './client-version.js';
+import {ResourceExhaustedError} from './errors.js';
 
 type Clients = {
     collections: PromiseClient<typeof Collections>;
@@ -54,6 +55,16 @@ export function createApis(baseUrl: string, {timeout, apiKey}: {timeout: number;
             req.header.set('user-agent', 'qdrant-js/' + String(PACKAGE_VERSION));
             return next(req);
         },
+        (next) => (req) =>
+            next(req)
+                .then((response) => response)
+                .catch((error) => {
+                    if (error instanceof ConnectError && error.code === Code.ResourceExhausted) {
+                        const retryAfterHeader = error.metadata.get('retry-after')?.[0] ?? '';
+                        throw new ResourceExhaustedError(retryAfterHeader);
+                    }
+                    throw error;
+                }),
     ];
     if (apiKey !== undefined) {
         interceptors.push((next) => (req) => {

packages/js-client-grpc/src/errors.ts

@@ -1,3 +1,5 @@
+import {Code, ConnectError} from '@bufbuild/connect';
+
 class CustomError extends Error {
     constructor(message: string) {
         super(message);
@@ -7,3 +9,16 @@ class CustomError extends Error {
 }
 
 export class QdrantClientConfigError extends CustomError {}
+
+class CustomConnectError extends ConnectError {
+    retry_after: string;
+
+    constructor(retryAfter: string) {
+        super('Resource exhausted: Retry after specified duration', Code.ResourceExhausted);
+        this.name = this.constructor.name;
+        this.retry_after = retryAfter;
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+
+export class ResourceExhaustedError extends CustomConnectError {}

packages/js-client-rest/package.json

@@ -55,7 +55,7 @@
     "dependencies": {
         "@qdrant/openapi-typescript-fetch": "1.2.6",
         "@sevinf/maybe": "0.5.0",
-        "undici": "~5.28.4"
+        "undici": "~5.28.5"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^24.1.0",

packages/js-client-rest/src/api-client.ts

@@ -1,4 +1,4 @@
-import {Fetcher, Middleware} from '@qdrant/openapi-typescript-fetch';
+import {ApiError, Fetcher, Middleware} from '@qdrant/openapi-typescript-fetch';
 import {paths} from './openapi/generated_schema.js';
 import {createDispatcher} from './dispatcher.js';
 import {createClusterApi} from './api/cluster-api.js';
@@ -7,7 +7,11 @@ import {createPointsApi} from './api/points-api.js';
 import {createServiceApi} from './api/service-api.js';
 import {createSnapshotsApi} from './api/snapshots-api.js';
 import {createShardsApi} from './api/shards-api.js';
-import {QdrantClientTimeoutError, QdrantClientUnexpectedResponseError} from './errors.js';
+import {
+    QdrantClientResourceExhaustedError,
+    QdrantClientTimeoutError,
+    QdrantClientUnexpectedResponseError,
+} from './errors.js';
 import {RestArgs} from './types.js';
 
 export type Client = ReturnType<typeof Fetcher.for<paths>>;
@@ -47,10 +51,21 @@ export function createClient(baseUrl: string, {headers, timeout, connections}: R
     }
 
     use.push(async (url, init, next) => {
-        const response = await next(url, init);
-        if (response.status === 200 || response.status === 201) {
-            return response;
+        let response;
+        try {
+            response = await next(url, init);
+
+            if (response.status === 200 || response.status === 201) {
+                return response;
+            }
+        } catch (error) {
+            if (error instanceof ApiError && error.status === 429) {
+                const retryAfterHeader = error.headers.get('retry-after')?.[0] ?? '';
+                throw new QdrantClientResourceExhaustedError(retryAfterHeader);
+            }
+            throw error;
         }
+
         throw QdrantClientUnexpectedResponseError.forResponse(response);
     });
 

packages/js-client-rest/src/errors.ts

@@ -29,3 +29,14 @@ export class QdrantClientUnexpectedResponseError extends CustomError {
 export class QdrantClientConfigError extends CustomError {}
 
 export class QdrantClientTimeoutError extends CustomError {}
+
+export class QdrantClientResourceExhaustedError extends CustomError {
+    retry_after: string;
+
+    constructor(retryAfter: string) {
+        super('Resource exhausted: Retry after specified duration');
+        this.name = this.constructor.name;
+        this.retry_after = retryAfter;
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}