apify · janbuchar · Jun 11, 2025 · Jun 9, 2025 · Jun 10, 2025 · Jun 10, 2025
diff --git a/src/apify_client.ts b/src/apify_client.ts
@@ -33,6 +33,8 @@ import { WebhookDispatchClient } from './resource_clients/webhook_dispatch';
 import { WebhookDispatchCollectionClient } from './resource_clients/webhook_dispatch_collection';
 import { Statistics } from './statistics';
 
+const DEFAULT_TIMEOUT_SECS = 360;
+
 /**
  * ApifyClient is the official library to access [Apify API](https://docs.apify.com/api/v2) from your
  * JavaScript applications. It runs both in Node.js and browser.
@@ -67,7 +69,7 @@ export class ApifyClient {
             maxRetries = 8,
             minDelayBetweenRetriesMillis = 500,
             requestInterceptors = [],
-            timeoutSecs = 360,
+            timeoutSecs = DEFAULT_TIMEOUT_SECS,
             token,
         } = options;
 

diff --git a/src/base/resource_client.ts b/src/base/resource_client.ts
@@ -13,16 +13,21 @@ import { ApiClient } from './api_client';
  */
 const MAX_WAIT_FOR_FINISH = 999999;
 
+export const SMALL_TIMEOUT_MILLIS = 5 * 1000; // For fast and common actions. Suitable for idempotent actions.
+export const MEDIUM_TIMEOUT_MILLIS = 30 * 1000; // For actions that may take longer.
+export const DEFAULT_TIMEOUT_MILLIS = 360 * 1000; // 6 minutes
+
 /**
  * Resource client.
  * @private
  */
 export class ResourceClient extends ApiClient {
-    protected async _get<T, R>(options: T = {} as T): Promise<R | undefined> {
+    protected async _get<T, R>(options: T = {} as T, timeoutMillis?: number): Promise<R | undefined> {
         const requestOpts: ApifyRequestConfig = {
             url: this._url(),
             method: 'GET',
             params: this._params(options),
+            timeout: timeoutMillis,
         };
         try {
             const response = await this.httpClient.call(requestOpts);
@@ -34,22 +39,24 @@ export class ResourceClient extends ApiClient {
         return undefined;
     }
 
-    protected async _update<T, R>(newFields: T): Promise<R> {
+    protected async _update<T, R>(newFields: T, timeoutMillis?: number): Promise<R> {
         const response = await this.httpClient.call({
             url: this._url(),
             method: 'PUT',
             params: this._params(),
             data: newFields,
+            timeout: timeoutMillis,
         });
         return parseDateFields(pluckData(response.data)) as R;
     }
 
-    protected async _delete(): Promise<void> {
+    protected async _delete(timeoutMillis?: number): Promise<void> {
         try {
             await this.httpClient.call({
                 url: this._url(),
                 method: 'DELETE',
                 params: this._params(),
+                timeout: timeoutMillis,
             });
         } catch (err) {
             catchNotFoundOrThrow(err as ApifyApiError);

diff --git a/src/http_client.ts b/src/http_client.ts
@@ -152,13 +152,21 @@ export class HttpClient {
             this.stats.requests++;
             let response: ApifyResponse;
             const requestIsStream = isStream(config.data);
+
             try {
                 if (requestIsStream) {
                     // Handling redirects is not possible without buffering - part of the stream has already been sent and can't be recovered
                     // when server sends the redirect. Therefore we need to override this in Axios config to prevent it from buffering the body.
                     // see also axios/axios#1045
                     config = { ...config, maxRedirects: 0 };
                 }
+
+                // Increase timeout with each attempt. Max timeout is bounded by the client timeout.
+                config.timeout = Math.min(
+                    this.timeoutMillis,
+                    (config.timeout ?? this.timeoutMillis) * 2 ** (attempt - 1),
+                );
+
                 response = await this.axios.request(config);
                 if (this._isStatusOk(response.status)) return response;
             } catch (err) {

diff --git a/src/resource_clients/dataset.ts b/src/resource_clients/dataset.ts
@@ -4,7 +4,12 @@ import type { STORAGE_GENERAL_ACCESS } from '@apify/consts';
 
 import type { ApifyApiError } from '../apify_api_error';
 import type { ApiClientSubResourceOptions } from '../base/api_client';
-import { ResourceClient } from '../base/resource_client';
+import {
+    DEFAULT_TIMEOUT_MILLIS,
+    MEDIUM_TIMEOUT_MILLIS,
+    ResourceClient,
+    SMALL_TIMEOUT_MILLIS,
+} from '../base/resource_client';
 import type { ApifyRequestConfig, ApifyResponse } from '../http_client';
 import type { PaginatedList } from '../utils';
 import { cast, catchNotFoundOrThrow, pluckData } from '../utils';
@@ -26,7 +31,7 @@ export class DatasetClient<
      * https://docs.apify.com/api/v2#/reference/datasets/dataset/get-dataset
      */
     async get(): Promise<Dataset | undefined> {
-        return this._get();
+        return this._get({}, SMALL_TIMEOUT_MILLIS);
     }
 
     /**
@@ -35,14 +40,14 @@ export class DatasetClient<
     async update(newFields: DatasetClientUpdateOptions): Promise<Dataset> {
         ow(newFields, ow.object);
 
-        return this._update(newFields);
+        return this._update(newFields, SMALL_TIMEOUT_MILLIS);
     }
 
     /**
      * https://docs.apify.com/api/v2#/reference/datasets/dataset/delete-dataset
      */
     async delete(): Promise<void> {
-        return this._delete();
+        return this._delete(SMALL_TIMEOUT_MILLIS);
     }
 
     /**
@@ -70,6 +75,7 @@ export class DatasetClient<
             url: this._url('items'),
             method: 'GET',
             params: this._params(options),
+            timeout: DEFAULT_TIMEOUT_MILLIS,
         });
 
         return this._createPaginationList(response, options.desc ?? false);
@@ -113,6 +119,7 @@ export class DatasetClient<
                 ...options,
             }),
             forceBuffer: true,
+            timeout: DEFAULT_TIMEOUT_MILLIS,
         });
 
         return cast(data);
@@ -133,6 +140,7 @@ export class DatasetClient<
             data: items,
             params: this._params(),
             doNotRetryTimeouts: true, // see timeout handling in http-client
+            timeout: MEDIUM_TIMEOUT_MILLIS,
         });
     }
 
@@ -144,6 +152,7 @@ export class DatasetClient<
             url: this._url('statistics'),
             method: 'GET',
             params: this._params(),
+            timeout: SMALL_TIMEOUT_MILLIS,
         };
         try {
             const response = await this.httpClient.call(requestOpts);

diff --git a/src/resource_clients/key_value_store.ts b/src/resource_clients/key_value_store.ts
@@ -8,7 +8,12 @@ import log from '@apify/log';
 
 import type { ApifyApiError } from '../apify_api_error';
 import type { ApiClientSubResourceOptions } from '../base/api_client';
-import { ResourceClient } from '../base/resource_client';
+import {
+    DEFAULT_TIMEOUT_MILLIS,
+    MEDIUM_TIMEOUT_MILLIS,
+    ResourceClient,
+    SMALL_TIMEOUT_MILLIS,
+} from '../base/resource_client';
 import type { ApifyRequestConfig } from '../http_client';
 import { cast, catchNotFoundOrThrow, isBuffer, isNode, isStream, parseDateFields, pluckData } from '../utils';
 
@@ -27,7 +32,7 @@ export class KeyValueStoreClient extends ResourceClient {
      * https://docs.apify.com/api/v2#/reference/key-value-stores/store-object/get-store
      */
     async get(): Promise<KeyValueStore | undefined> {
-        return this._get();
+        return this._get({}, SMALL_TIMEOUT_MILLIS);
     }
 
     /**
@@ -36,14 +41,14 @@ export class KeyValueStoreClient extends ResourceClient {
     async update(newFields: KeyValueClientUpdateOptions): Promise<KeyValueStore> {
         ow(newFields, ow.object);
 
-        return this._update(newFields);
+        return this._update(newFields, DEFAULT_TIMEOUT_MILLIS);
     }
 
     /**
      * https://docs.apify.com/api/v2#/reference/key-value-stores/store-object/delete-store
      */
     async delete(): Promise<void> {
-        return this._delete();
+        return this._delete(SMALL_TIMEOUT_MILLIS);
     }
 
     /**
@@ -64,6 +69,7 @@ export class KeyValueStoreClient extends ResourceClient {
             url: this._url('keys'),
             method: 'GET',
             params: this._params(options),
+            timeout: MEDIUM_TIMEOUT_MILLIS,
         });
 
         return cast(parseDateFields(pluckData(response.data)));
@@ -138,6 +144,7 @@ export class KeyValueStoreClient extends ResourceClient {
             url: this._url(`records/${key}`),
             method: 'GET',
             params: this._params(),
+            timeout: DEFAULT_TIMEOUT_MILLIS,
         };
 
         if (options.buffer) requestOpts.forceBuffer = true;
@@ -215,12 +222,9 @@ export class KeyValueStoreClient extends ResourceClient {
             data: value,
             headers: contentType ? { 'content-type': contentType } : undefined,
             doNotRetryTimeouts,
+            timeout: timeoutSecs !== undefined ? timeoutSecs * 1000 : DEFAULT_TIMEOUT_MILLIS,
         };
 
-        if (timeoutSecs != null) {
-            uploadOpts.timeout = timeoutSecs * 1000;
-        }
-
         await this.httpClient.call(uploadOpts);
     }
 
@@ -234,6 +238,7 @@ export class KeyValueStoreClient extends ResourceClient {
             url: this._url(`records/${key}`),
             method: 'DELETE',
             params: this._params(),
+            timeout: SMALL_TIMEOUT_MILLIS,
         });
     }
 }

diff --git a/src/resource_clients/request_queue.ts b/src/resource_clients/request_queue.ts
@@ -7,7 +7,7 @@ import log from '@apify/log';
 
 import type { ApifyApiError } from '../apify_api_error';
 import type { ApiClientSubResourceOptions } from '../base/api_client';
-import { ResourceClient } from '../base/resource_client';
+import { MEDIUM_TIMEOUT_MILLIS, ResourceClient, SMALL_TIMEOUT_MILLIS } from '../base/resource_client';
 import type { ApifyRequestConfig } from '../http_client';
 import {
     cast,
@@ -46,7 +46,7 @@ export class RequestQueueClient extends ResourceClient {
      * https://docs.apify.com/api/v2#/reference/request-queues/queue/get-request-queue
      */
     async get(): Promise<RequestQueue | undefined> {
-        return this._get();
+        return this._get({}, SMALL_TIMEOUT_MILLIS);
     }
 
     /**
@@ -55,14 +55,14 @@ export class RequestQueueClient extends ResourceClient {
     async update(newFields: RequestQueueClientUpdateOptions): Promise<RequestQueue> {
         ow(newFields, ow.object);
 
-        return this._update(newFields);
+        return this._update(newFields, SMALL_TIMEOUT_MILLIS);
     }
 
     /**
      * https://docs.apify.com/api/v2#/reference/request-queues/queue/delete-request-queue
      */
     async delete(): Promise<void> {
-        return this._delete();
+        return this._delete(SMALL_TIMEOUT_MILLIS);
     }
 
     /**
@@ -79,7 +79,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('head'),
             method: 'GET',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 limit: options.limit,
                 clientKey: this.clientKey,
@@ -106,7 +106,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('head/lock'),
             method: 'POST',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 limit: options.limit,
                 lockSecs: options.lockSecs,
@@ -141,7 +141,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('requests'),
             method: 'POST',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: request,
             params: this._params({
                 forefront: options.forefront,
@@ -182,7 +182,7 @@ export class RequestQueueClient extends ResourceClient {
         const { data } = await this.httpClient.call({
             url: this._url('requests/batch'),
             method: 'POST',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: requests,
             params: this._params({
                 forefront: options.forefront,
@@ -343,7 +343,7 @@ export class RequestQueueClient extends ResourceClient {
         const { data } = await this.httpClient.call({
             url: this._url('requests/batch'),
             method: 'DELETE',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: requests,
             params: this._params({
                 clientKey: this.clientKey,
@@ -361,7 +361,7 @@ export class RequestQueueClient extends ResourceClient {
         const requestOpts: ApifyRequestConfig = {
             url: this._url(`requests/${id}`),
             method: 'GET',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params(),
         };
         try {
@@ -398,7 +398,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url(`requests/${request.id}`),
             method: 'PUT',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: request,
             params: this._params({
                 forefront: options.forefront,
@@ -415,7 +415,7 @@ export class RequestQueueClient extends ResourceClient {
         await this.httpClient.call({
             url: this._url(`requests/${id}`),
             method: 'DELETE',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 clientKey: this.clientKey,
             }),
@@ -441,7 +441,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url(`requests/${id}/lock`),
             method: 'PUT',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 forefront: options.forefront,
                 lockSecs: options.lockSecs,
@@ -467,7 +467,7 @@ export class RequestQueueClient extends ResourceClient {
         await this.httpClient.call({
             url: this._url(`requests/${id}/lock`),
             method: 'DELETE',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 forefront: options.forefront,
                 clientKey: this.clientKey,
@@ -492,7 +492,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('requests'),
             method: 'GET',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 limit: options.limit,
                 exclusiveStartId: options.exclusiveStartId,
@@ -510,7 +510,7 @@ export class RequestQueueClient extends ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('requests/unlock'),
             method: 'POST',
-            timeout: this.timeoutMillis,
+            timeout: Math.min(MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 clientKey: this.clientKey,
             }),