apify-client 3.0.0-beta.5 → 3.0.0-beta.50

package/dist/resource_clients/schedule.js

@@ -1,7 +1,8 @@
 import { z } from 'zod';
 import { ResourceClient } from '../base/resource_client.js';
 import * as schemas from '../schemas.js';
-import { anyObjectSchema, catchNotFoundOrThrow, parseArgument, parseResponse } from '../utils.js';
+import { timeoutOptionsSchema } from '../timeouts.js';
+import { anyObjectSchema, parseArgument, parseResponse } from '../utils.js';
 export { ScheduleActions } from '../models.js';
 const scheduleLogSchema = z.array(schemas.ScheduleInvoked());
 /**
@@ -40,50 +41,57 @@ export class ScheduleClient extends ResourceClient {
     /**
      * Retrieves the schedule.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The schedule object, or `undefined` if it does not exist.
      * @see https://docs.apify.com/api/v2/schedule-get
      */
-    async get() {
-        return this._get(schemas.Schedule());
+    async get(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Schedule(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the schedule with the specified fields.
      *
      * @param newFields - Fields to update.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The updated schedule object.
      * @see https://docs.apify.com/api/v2/schedule-put
      */
-    async update(newFields) {
+    async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        return this._update(schemas.Schedule(), newFields);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Schedule(), newFields, timeoutSecs, signal);
     }
     /**
      * Deletes the schedule.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @see https://docs.apify.com/api/v2/schedule-delete
      */
-    async delete() {
-        return this._delete();
+    async delete(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.deleteResource(timeoutSecs, signal);
     }
     /**
      * Retrieves the schedule's log.
      *
-     * @returns The schedule log, one entry per invocation, or `undefined` if the schedule does not exist.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'medium'`.
+     * @returns The schedule log, one entry per invocation.
      * @see https://docs.apify.com/api/v2/schedule-log-get
      */
-    async getLog() {
-        const requestOpts = {
-            url: this._url('log'),
+    async getLog(options = {}) {
+        const { timeoutSecs = 'medium', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const response = await this.httpClient.call({
+            url: this.buildUrl('log'),
             method: 'GET',
-            params: this._params(),
-        };
-        try {
-            const response = await this.httpClient.call(requestOpts);
-            return parseResponse(response, scheduleLogSchema);
-        }
-        catch (err) {
-            catchNotFoundOrThrow(err);
-        }
-        return undefined;
+            params: this.buildParams(),
+            timeoutSecs,
+            signal,
+        });
+        return parseResponse(response, scheduleLogSchema);
     }
 }

package/dist/resource_clients/schedule_collection.d.ts

@@ -1,5 +1,6 @@
 import type { ApiClientSubResourceOptions } from '../base/api_client.js';
 import { ResourceCollectionClient } from '../base/resource_collection_client.js';
+import type { TimeoutOptions } from '../timeouts.js';
 import type { PaginatedIterator, PaginationOptions } from '../utils.js';
 import type { Schedule, ScheduleCreateOrUpdateData } from './schedule.js';
 /**
@@ -48,6 +49,7 @@ export declare class ScheduleCollectionClient extends ResourceCollectionClient {
      * ```
      *
      * @param options - Pagination and sorting options.
+     * @param options.timeoutSecs - Timeout for each API request. Default is `'medium'`.
      * @returns A paginated iterator of schedules.
      * @see https://docs.apify.com/api/v2/schedules-get
      */
@@ -56,11 +58,13 @@ export declare class ScheduleCollectionClient extends ResourceCollectionClient {
      * Creates a new schedule.
      *
      * @param schedule - The schedule data.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The created schedule object.
      * @see https://docs.apify.com/api/v2/schedules-post
      */
-    create(schedule?: ScheduleCreateOrUpdateData): Promise<Schedule>;
+    create(schedule?: ScheduleCreateOrUpdateData, options?: TimeoutOptions): Promise<Schedule>;
 }
-export interface ScheduleCollectionListOptions extends PaginationOptions {
+export interface ScheduleCollectionListOptions extends PaginationOptions, TimeoutOptions {
     desc?: boolean;
 }

package/dist/resource_clients/schedule_collection.js

@@ -1,10 +1,12 @@
 import { z } from 'zod';
 import { ResourceCollectionClient } from '../base/resource_collection_client.js';
 import * as schemas from '../schemas.js';
+import { timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
 import { anyObjectSchema, paginationOptionsShape, parseArgument } from '../utils.js';
 const listOptionsSchema = z.strictObject({
     ...paginationOptionsShape,
     desc: z.boolean().optional(),
+    ...timeoutOptionsShape,
 });
 const scheduleCreateSchema = anyObjectSchema.optional();
 /**
@@ -58,22 +60,26 @@ export class ScheduleCollectionClient extends ResourceCollectionClient {
      * ```
      *
      * @param options - Pagination and sorting options.
+     * @param options.timeoutSecs - Timeout for each API request. Default is `'medium'`.
      * @returns A paginated iterator of schedules.
      * @see https://docs.apify.com/api/v2/schedules-get
      */
     list(options = {}) {
         const parsed = parseArgument(options, listOptionsSchema, 'ScheduleCollectionListOptions');
-        return this._listPaginated(schemas.ListOfSchedules(), parsed);
+        return this.listResourcesPaginated(schemas.ListOfSchedules(), parsed, 'medium');
     }
     /**
      * Creates a new schedule.
      *
      * @param schedule - The schedule data.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The created schedule object.
      * @see https://docs.apify.com/api/v2/schedules-post
      */
-    async create(schedule) {
+    async create(schedule, options = {}) {
         parseArgument(schedule, scheduleCreateSchema);
-        return this._create(schemas.Schedule(), schedule);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.createResource(schemas.Schedule(), schedule, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/store_collection.d.ts

@@ -1,6 +1,7 @@
 import type { ApiClientSubResourceOptions } from '../base/api_client.js';
 import { ResourceCollectionClient } from '../base/resource_collection_client.js';
 import type { ActorStoreList } from '../models.js';
+import type { TimeoutOptions } from '../timeouts.js';
 import type { PaginatedIterator, PaginationOptions } from '../utils.js';
 export type { ActorStoreList, PricingInfo } from '../models.js';
 /**
@@ -46,6 +47,7 @@ export declare class StoreCollectionClient extends ResourceCollectionClient {
      * ```
      *
      * @param options - Search and pagination options.
+     * @param options.timeoutSecs - Timeout for each API request. Default is `'medium'`.
      * @returns A paginated iterator of store Actors.
      * @see https://docs.apify.com/api/v2/store-get
      */
@@ -54,7 +56,7 @@ export declare class StoreCollectionClient extends ResourceCollectionClient {
 /**
  * @since Added in 2.7.2
  */
-export interface StoreCollectionListOptions extends PaginationOptions {
+export interface StoreCollectionListOptions extends PaginationOptions, TimeoutOptions {
     search?: string;
     sortBy?: string;
     category?: string;

package/dist/resource_clients/store_collection.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { ResourceCollectionClient } from '../base/resource_collection_client.js';
 import * as schemas from '../schemas.js';
+import { timeoutOptionsShape } from '../timeouts.js';
 import { paginationOptionsShape, parseArgument } from '../utils.js';
 const listOptionsSchema = z.strictObject({
     ...paginationOptionsShape,
@@ -10,6 +11,7 @@ const listOptionsSchema = z.strictObject({
     username: z.string().optional(),
     pricingModel: z.string().optional(),
     includeUnrunnableActors: z.boolean().optional(),
+    ...timeoutOptionsShape,
 });
 /**
  * Client for browsing Actors in the Apify Store.
@@ -59,11 +61,12 @@ export class StoreCollectionClient extends ResourceCollectionClient {
      * ```
      *
      * @param options - Search and pagination options.
+     * @param options.timeoutSecs - Timeout for each API request. Default is `'medium'`.
      * @returns A paginated iterator of store Actors.
      * @see https://docs.apify.com/api/v2/store-get
      */
     list(options = {}) {
         const parsed = parseArgument(options, listOptionsSchema, 'StoreCollectionListOptions');
-        return this._listPaginated(schemas.ListOfStoreActors(), parsed);
+        return this.listResourcesPaginated(schemas.ListOfStoreActors(), parsed, 'medium');
     }
 }

package/dist/resource_clients/task.d.ts

@@ -1,6 +1,7 @@
 import type { ApiClientSubResourceOptions } from '../base/api_client.js';
 import { ResourceClient } from '../base/resource_client.js';
 import type { Task, TaskPublicConfig } from '../models.js';
+import type { TimeoutOptions } from '../timeouts.js';
 import type { Dictionary } from '../utils.js';
 import type { ActorLastRunOptions, ActorRun, ActorStartOptions } from './actor.js';
 import { RunClient } from './run.js';
@@ -35,18 +36,22 @@ export declare class TaskClient extends ResourceClient {
     /**
      * Retrieves the Actor task.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The task object, or `undefined` if it does not exist.
      * @see https://docs.apify.com/api/v2/actor-task-get
      */
-    get(): Promise<Task | undefined>;
+    get(options?: TimeoutOptions): Promise<Task | undefined>;
     /**
      * Updates the task with the specified fields.
      *
      * @param newFields - Fields to update.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The updated task object.
      * @see https://docs.apify.com/api/v2/actor-task-put
      */
-    update(newFields: TaskUpdateData): Promise<Task>;
+    update(newFields: TaskUpdateData, options?: TimeoutOptions): Promise<Task>;
     /**
      * Publishes the task on its public landing page, by setting `isPublic` through
      * {@apilink TaskClient.update}.
@@ -55,11 +60,13 @@ export declare class TaskClient extends ResourceClient {
      * (`publicConfig`) set up first. Requires write permission to both the task and its Actor.
      * Publishing an already published task does nothing.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The task object.
      * @see https://docs.apify.com/api/v2/actor-task-put
      * @since Added in 2.25.0
      */
-    publish(): Promise<Task>;
+    publish(options?: TimeoutOptions): Promise<Task>;
     /**
      * Unpublishes the task from its public landing page, by setting `isPublic` through
      * {@apilink TaskClient.update}.
@@ -68,17 +75,21 @@ export declare class TaskClient extends ResourceClient {
      * published again without re-entering it. Requires write permission to both the task and its
      * Actor. Unpublishing a task that is not published does nothing.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The task object.
      * @see https://docs.apify.com/api/v2/actor-task-put
      * @since Added in 2.25.0
      */
-    unpublish(): Promise<Task>;
+    unpublish(options?: TimeoutOptions): Promise<Task>;
     /**
      * Deletes the Task.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @see https://docs.apify.com/api/v2/actor-task-delete
      */
-    delete(): Promise<void>;
+    delete(options?: TimeoutOptions): Promise<void>;
     /**
      * Starts an Actor task and immediately returns the Run object.
      *
@@ -86,12 +97,16 @@ export declare class TaskClient extends ResourceClient {
      * @param options - Run options.
      * @param options.build - Tag or number of the Actor build to run (e.g., `'beta'` or `'1.2.345'`).
      * @param options.memory - Memory in megabytes allocated for the run.
-     * @param options.timeout - Timeout for the run in seconds. Zero means no timeout.
+     * @param options.runTimeoutSecs - Timeout for the run in seconds. Zero means no timeout.
      * @param options.waitForFinish - Maximum time to wait (in seconds, max 60s) for the run to finish before returning.
      * @param options.webhooks - Webhooks to trigger for specific Actor run events.
      * @param options.maxItems - Maximum number of dataset items (for pay-per-result Actors).
      * @param options.maxTotalChargeUsd - Maximum cost in USD (for pay-per-event Actors).
      * @param options.restartOnError - Whether to restart the run on error.
+     * @param options.waitForResources - Retry the start while the account lacks the memory or a concurrent-run slot for
+     * the run. `true` retries until the run starts, a number stops retrying after that many seconds.
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'medium'`, extended to cover `waitForFinish`
+     * when the API is asked to hold the response.
      * @returns The Actor Run object.
      * @see https://docs.apify.com/api/v2/actor-task-runs-post
      */
@@ -104,12 +119,16 @@ export declare class TaskClient extends ResourceClient {
      * @param options - Run and wait options.
      * @param options.build - Tag or number of the Actor build to run.
      * @param options.memory - Memory in megabytes allocated for the run.
-     * @param options.timeout - Timeout for the run in seconds.
+     * @param options.runTimeoutSecs - Timeout for the run in seconds.
      * @param options.waitSecs - Maximum time to wait for the run to finish, in seconds. If omitted, waits indefinitely.
      * @param options.webhooks - Webhooks to trigger for specific Actor run events.
      * @param options.maxItems - Maximum number of dataset items (for pay-per-result Actors).
      * @param options.maxTotalChargeUsd - Maximum cost in USD (for pay-per-event Actors).
      * @param options.restartOnError - Whether to restart the run on error.
+     * @param options.waitForResources - Retry the start while the account lacks the memory or a concurrent-run slot for
+     * the run. `true` retries until the run starts, a number stops retrying after that many seconds. The time spent
+     * retrying doesn't count toward `waitSecs`.
+     * @param options.timeoutSecs - Timeout for each API request, the start and every poll alike. Default is `'noTimeout'`.
      * @returns The Actor run object.
      * @see https://docs.apify.com/api/v2/actor-task-runs-post
      */
@@ -117,18 +136,22 @@ export declare class TaskClient extends ResourceClient {
     /**
      * Retrieves the Actor task's input object.
      *
-     * @returns The Task's input, or `undefined` if it does not exist.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
+     * @returns The Task's input.
      * @see https://docs.apify.com/api/v2/actor-task-input-get
      */
-    getInput(): Promise<Dictionary | Dictionary[] | undefined>;
+    getInput(options?: TimeoutOptions): Promise<Dictionary | Dictionary[]>;
     /**
      * Updates the Actor task's input object.
      *
      * @param newFields - New input data for the task.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The updated task input.
      * @see https://docs.apify.com/api/v2/actor-task-input-put
      */
-    updateInput(newFields: Dictionary | Dictionary[]): Promise<Dictionary | Dictionary[]>;
+    updateInput(newFields: Dictionary | Dictionary[], options?: TimeoutOptions): Promise<Dictionary | Dictionary[]>;
     /**
      * Returns a client for the last run of this task.
      *

package/dist/resource_clients/task.js

@@ -2,7 +2,9 @@ import { z } from 'zod';
 import { ACT_JOB_STATUSES, META_ORIGINS } from '@apify/consts';
 import { ResourceClient } from '../base/resource_client.js';
 import * as schemas from '../schemas.js';
-import { anyObjectSchema, cast, catchNotFoundOrThrow, parseArgument, parseResponse, stringifyWebhooksToBase64, } from '../utils.js';
+import { timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
+import { anyObjectSchema, cast, isStream, parseArgument, parseResponse, stringifyWebhooksToBase64 } from '../utils.js';
+import { startWaitingForResources } from '../wait_for_resources.js';
 import { RunClient } from './run.js';
 import { RunCollectionClient } from './run_collection.js';
 import { WebhookCollectionClient } from './webhook_collection.js';
@@ -10,22 +12,26 @@ const inputSchema = anyObjectSchema.optional();
 const startOptionsSchema = z.strictObject({
     build: z.string().optional(),
     memory: z.number().optional(),
-    timeout: z.number().optional(),
+    runTimeoutSecs: z.number().min(0).optional(),
     waitForFinish: z.number().optional(),
     webhooks: z.array(anyObjectSchema).optional(),
     maxItems: z.number().min(0).optional(),
     maxTotalChargeUsd: z.number().min(0).optional(),
     restartOnError: z.boolean().optional(),
+    waitForResources: z.union([z.boolean(), z.number().min(0)]).optional(),
+    ...timeoutOptionsShape,
 });
 const callOptionsSchema = z.strictObject({
     build: z.string().optional(),
     memory: z.number().optional(),
-    timeout: z.number().min(0).optional(),
+    runTimeoutSecs: z.number().min(0).optional(),
     waitSecs: z.number().min(0).optional(),
     webhooks: z.array(anyObjectSchema).optional(),
     maxItems: z.number().min(0).optional(),
     maxTotalChargeUsd: z.number().min(0).optional(),
     restartOnError: z.boolean().optional(),
+    waitForResources: z.union([z.boolean(), z.number().min(0)]).optional(),
+    ...timeoutOptionsShape,
 });
 const lastRunOptionsSchema = z.strictObject({
     status: z.enum(ACT_JOB_STATUSES).optional(),
@@ -64,22 +70,28 @@ export class TaskClient extends ResourceClient {
     /**
      * Retrieves the Actor task.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The task object, or `undefined` if it does not exist.
      * @see https://docs.apify.com/api/v2/actor-task-get
      */
-    async get() {
-        return this._get(schemas.Task());
+    async get(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Task(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the task with the specified fields.
      *
      * @param newFields - Fields to update.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The updated task object.
      * @see https://docs.apify.com/api/v2/actor-task-put
      */
-    async update(newFields) {
+    async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        return this._update(schemas.Task(), newFields);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Task(), newFields, timeoutSecs, signal);
     }
     /**
      * Publishes the task on its public landing page, by setting `isPublic` through
@@ -89,12 +101,14 @@ export class TaskClient extends ResourceClient {
      * (`publicConfig`) set up first. Requires write permission to both the task and its Actor.
      * Publishing an already published task does nothing.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The task object.
      * @see https://docs.apify.com/api/v2/actor-task-put
      * @since Added in 2.25.0
      */
-    async publish() {
-        return this.update({ isPublic: true });
+    async publish(options = {}) {
+        return this.update({ isPublic: true }, options);
     }
     /**
      * Unpublishes the task from its public landing page, by setting `isPublic` through
@@ -104,20 +118,25 @@ export class TaskClient extends ResourceClient {
      * published again without re-entering it. Requires write permission to both the task and its
      * Actor. Unpublishing a task that is not published does nothing.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The task object.
      * @see https://docs.apify.com/api/v2/actor-task-put
      * @since Added in 2.25.0
      */
-    async unpublish() {
-        return this.update({ isPublic: false });
+    async unpublish(options = {}) {
+        return this.update({ isPublic: false }, options);
     }
     /**
      * Deletes the Task.
      *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @see https://docs.apify.com/api/v2/actor-task-delete
      */
-    async delete() {
-        return this._delete();
+    async delete(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.deleteResource(timeoutSecs, signal);
     }
     /**
      * Starts an Actor task and immediately returns the Run object.
@@ -126,22 +145,27 @@ export class TaskClient extends ResourceClient {
      * @param options - Run options.
      * @param options.build - Tag or number of the Actor build to run (e.g., `'beta'` or `'1.2.345'`).
      * @param options.memory - Memory in megabytes allocated for the run.
-     * @param options.timeout - Timeout for the run in seconds. Zero means no timeout.
+     * @param options.runTimeoutSecs - Timeout for the run in seconds. Zero means no timeout.
      * @param options.waitForFinish - Maximum time to wait (in seconds, max 60s) for the run to finish before returning.
      * @param options.webhooks - Webhooks to trigger for specific Actor run events.
      * @param options.maxItems - Maximum number of dataset items (for pay-per-result Actors).
      * @param options.maxTotalChargeUsd - Maximum cost in USD (for pay-per-event Actors).
      * @param options.restartOnError - Whether to restart the run on error.
+     * @param options.waitForResources - Retry the start while the account lacks the memory or a concurrent-run slot for
+     * the run. `true` retries until the run starts, a number stops retrying after that many seconds.
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'medium'`, extended to cover `waitForFinish`
+     * when the API is asked to hold the response.
      * @returns The Actor Run object.
      * @see https://docs.apify.com/api/v2/actor-task-runs-post
      */
     async start(input, options = {}) {
         parseArgument(input, inputSchema);
         const parsed = parseArgument(options, startOptionsSchema, 'TaskStartOptions');
-        const { waitForFinish, timeout, memory, build, maxItems, maxTotalChargeUsd, restartOnError } = parsed;
+        const { waitForFinish, runTimeoutSecs, memory, build, maxItems, maxTotalChargeUsd, restartOnError, waitForResources, timeoutSecs, signal, } = parsed;
+        // The API's `timeout` parameter bounds the run, not the request.
         const params = {
             waitForFinish,
-            timeout,
+            timeout: runTimeoutSecs,
             memory,
             build,
             webhooks: stringifyWebhooksToBase64(parsed.webhooks),
@@ -150,18 +174,20 @@ export class TaskClient extends ResourceClient {
             restartOnError,
         };
         const request = {
-            url: this._url('runs'),
+            url: this.buildUrl('runs'),
             method: 'POST',
             data: input,
-            params: this._params(params),
-            // Apify internal property. Tells the request serialization interceptor
-            // to stringify functions to JSON, instead of omitting them.
+            params: this.buildParams(params),
+            // Actor input may carry page functions, which plain JSON serialization would drop.
             stringifyFunctions: true,
             headers: {
                 'Content-Type': 'application/json',
             },
+            timeoutSecs: this.timeoutForWaitForFinish(timeoutSecs, 'medium', waitForFinish),
+            signal,
         };
-        const response = await this.httpClient.call(request);
+        // A `Readable` input is consumed by the first attempt, so a retry would start the run with an empty input.
+        const response = await startWaitingForResources(async () => this.httpClient.call(request), isStream(input) ? false : waitForResources, this.httpClient.logger, signal);
         return parseResponse(response, schemas.Run());
     }
     /**
@@ -172,59 +198,66 @@ export class TaskClient extends ResourceClient {
      * @param options - Run and wait options.
      * @param options.build - Tag or number of the Actor build to run.
      * @param options.memory - Memory in megabytes allocated for the run.
-     * @param options.timeout - Timeout for the run in seconds.
+     * @param options.runTimeoutSecs - Timeout for the run in seconds.
      * @param options.waitSecs - Maximum time to wait for the run to finish, in seconds. If omitted, waits indefinitely.
      * @param options.webhooks - Webhooks to trigger for specific Actor run events.
      * @param options.maxItems - Maximum number of dataset items (for pay-per-result Actors).
      * @param options.maxTotalChargeUsd - Maximum cost in USD (for pay-per-event Actors).
      * @param options.restartOnError - Whether to restart the run on error.
+     * @param options.waitForResources - Retry the start while the account lacks the memory or a concurrent-run slot for
+     * the run. `true` retries until the run starts, a number stops retrying after that many seconds. The time spent
+     * retrying doesn't count toward `waitSecs`.
+     * @param options.timeoutSecs - Timeout for each API request, the start and every poll alike. Default is `'noTimeout'`.
      * @returns The Actor run object.
      * @see https://docs.apify.com/api/v2/actor-task-runs-post
      */
     async call(input, options = {}) {
         parseArgument(input, inputSchema);
         const parsed = parseArgument(options, callOptionsSchema, 'TaskCallOptions');
-        const { waitSecs, ...startOptions } = parsed;
-        const { id } = await this.start(input, startOptions);
+        const { waitSecs, timeoutSecs = 'noTimeout', signal, ...startOptions } = parsed;
+        const { id } = await this.start(input, { ...startOptions, timeoutSecs, signal });
         // Calling root client because we need access to top level API.
         // Creating a new instance of RunClient here would only allow
         // setting it up as a nested route under task API.
-        return this.apifyClient.run(id).waitForFinish({ waitSecs });
+        return this.apifyClient.run(id).waitForFinish({ waitSecs, timeoutSecs, signal });
     }
     /**
      * Retrieves the Actor task's input object.
      *
-     * @returns The Task's input, or `undefined` if it does not exist.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
+     * @returns The Task's input.
      * @see https://docs.apify.com/api/v2/actor-task-input-get
      */
-    async getInput() {
-        const requestOpts = {
-            url: this._url('input'),
+    async getInput(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const response = await this.httpClient.call({
+            url: this.buildUrl('input'),
             method: 'GET',
-            params: this._params(),
-        };
-        try {
-            const response = await this.httpClient.call(requestOpts);
-            return cast(response.data);
-        }
-        catch (err) {
-            catchNotFoundOrThrow(err);
-        }
-        return undefined;
+            params: this.buildParams(),
+            timeoutSecs,
+            signal,
+        });
+        return cast(response.data);
     }
     /**
      * Updates the Actor task's input object.
      *
      * @param newFields - New input data for the task.
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
      * @returns The updated task input.
      * @see https://docs.apify.com/api/v2/actor-task-input-put
      */
-    async updateInput(newFields) {
+    async updateInput(newFields, options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const response = await this.httpClient.call({
-            url: this._url('input'),
+            url: this.buildUrl('input'),
             method: 'PUT',
-            params: this._params(),
+            params: this.buildParams(),
             data: newFields,
+            timeoutSecs,
+            signal,
         });
         return cast(response.data);
     }
@@ -239,9 +272,9 @@ export class TaskClient extends ResourceClient {
      */
     lastRun(options = {}) {
         const parsed = parseArgument(options, lastRunOptionsSchema, 'TaskLastRunOptions');
-        return new RunClient(this._subResourceOptions({
+        return new RunClient(this.subResourceOptions({
             id: 'last',
-            params: this._params(parsed),
+            params: this.buildParams(parsed),
             resourcePath: 'runs',
         }));
     }
@@ -252,7 +285,7 @@ export class TaskClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/actor-task-runs-get
      */
     runs() {
-        return new RunCollectionClient(this._subResourceOptions({
+        return new RunCollectionClient(this.subResourceOptions({
             resourcePath: 'runs',
         }));
     }
@@ -263,6 +296,6 @@ export class TaskClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/actor-task-webhooks-get
      */
     webhooks() {
-        return new WebhookCollectionClient(this._subResourceOptions());
+        return new WebhookCollectionClient(this.subResourceOptions());
     }
 }