apify-client 3.0.0-beta.27 → 3.0.0-beta.29

package/dist/resource_clients/log.js

@@ -48,12 +48,13 @@ export class LogClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/log-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'long', ...params } = parseArgument(options, logOptionsSchema, 'LogOptions');
+        const { timeoutSecs = 'long', signal, ...params } = parseArgument(options, logOptionsSchema, 'LogOptions');
         const requestOpts = {
             url: this.buildUrl(),
             method: 'GET',
             params: this.buildParams(params),
             timeoutSecs,
+            signal,
         };
         try {
             const response = await this.httpClient.call(requestOpts);
@@ -75,7 +76,7 @@ export class LogClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/log-get
      */
     async stream(options = {}) {
-        const { timeoutSecs = 'long', raw } = parseArgument(options, logOptionsSchema, 'LogOptions');
+        const { timeoutSecs = 'long', signal, raw } = parseArgument(options, logOptionsSchema, 'LogOptions');
         const params = {
             stream: true,
             raw,
@@ -86,6 +87,7 @@ export class LogClient extends ResourceClient {
             params: this.buildParams(params),
             responseType: 'stream',
             timeoutSecs,
+            signal,
         };
         try {
             const response = await this.httpClient.call(requestOpts);
@@ -136,12 +138,14 @@ export class StreamedLog {
     #splitMarker = /(?:\n|^)(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z)/g;
     #relevancyTimeLimit;
     #logClient;
+    #signal;
     #streamingTask = null;
     #stopLogging = false;
     constructor(options) {
-        const { toLog, logClient, fromStart = true } = options;
+        const { toLog, logClient, fromStart = true, signal } = options;
         this.#destinationLog = toLog;
         this.#logClient = logClient;
+        this.#signal = signal;
         this.#relevancyTimeLimit = fromStart ? null : new Date();
     }
     /**
@@ -179,7 +183,7 @@ export class StreamedLog {
      */
     async #streamLog() {
         try {
-            const logStream = await this.#logClient.stream({ raw: true });
+            const logStream = await this.#logClient.stream({ raw: true, signal: this.#signal });
             if (!logStream) {
                 return;
             }
@@ -191,6 +195,8 @@ export class StreamedLog {
             }
         }
         catch (err) {
+            if (this.#signal?.aborted)
+                return;
             log.warning(`Log redirection stopped due to error`, err);
         }
     }

package/dist/resource_clients/request_queue.js

@@ -4,8 +4,8 @@ import log from '@apify/log';
 import { ResourceClient } from '../base/resource_client.js';
 import { ResponseValidationError } from '../response_validation_error.js';
 import * as schemas from '../schemas.js';
-import { optionalTimeoutSchema, timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
-import { anyObjectSchema, catchNotFoundOrThrow, isNonArrayObject, parseArgument, parseResponse, RequestQueuePaginationIterator, splitIntoJsonArrayBatches, utf8ByteLength, } from '../utils.js';
+import { optionalSignalSchema, optionalTimeoutSchema, timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
+import { anyObjectSchema, catchNotFoundOrThrow, isNonArrayObject, parseArgument, parseResponse, RequestQueuePaginationIterator, sleep, splitIntoJsonArrayBatches, utf8ByteLength, } from '../utils.js';
 const DEFAULT_PARALLEL_BATCH_ADD_REQUESTS = 5;
 const DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS = 3;
 const DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS = 500;
@@ -115,8 +115,8 @@ export class RequestQueueClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-get
      */
     async get(options = {}) {
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.RequestQueue(), {}, this.#resolveTimeout(timeoutSecs, 'short'));
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.RequestQueue(), {}, this.#resolveTimeout(timeoutSecs, 'short'), signal);
     }
     /**
      * Updates the Request queue with specified fields.
@@ -129,8 +129,8 @@ export class RequestQueueClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.RequestQueue(), newFields, this.#resolveTimeout(timeoutSecs, 'short'));
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.RequestQueue(), newFields, this.#resolveTimeout(timeoutSecs, 'short'), signal);
     }
     /**
      * Deletes the Request queue.
@@ -140,8 +140,8 @@ export class RequestQueueClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-delete
      */
     async delete(options = {}) {
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.deleteResource(this.#resolveTimeout(timeoutSecs, 'short'));
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.deleteResource(this.#resolveTimeout(timeoutSecs, 'short'), signal);
     }
     /**
      * Lists requests from the beginning of the queue (head).
@@ -161,6 +161,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl('head'),
             method: 'GET',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'short'),
+            signal: parsed.signal,
             params: this.buildParams({
                 limit: parsed.limit,
                 clientKey: this.#clientKey,
@@ -208,6 +209,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl('head/lock'),
             method: 'POST',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'medium'),
+            signal: parsed.signal,
             params: this.buildParams({
                 limit: parsed.limit,
                 lockSecs: parsed.lockSecs,
@@ -262,6 +264,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl('requests'),
             method: 'POST',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'short'),
+            signal: parsed.signal,
             data: request,
             params: this.buildParams({
                 forefront: parsed.forefront,
@@ -281,6 +284,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl('requests/batch'),
             method: 'POST',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'medium'),
+            signal: parsed.signal,
             // The body is assembled from the requests as `batchAddRequests` serialized them; the explicit content type
             // makes the request interceptor send the string as it is instead of serializing the requests again.
             headers: { 'content-type': 'application/json' },
@@ -293,7 +297,7 @@ export class RequestQueueClient extends ResourceClient {
         return parseResponse(response, schemas.BatchAddResult());
     }
     async addRequestBatchWithRetries(requests, options = {}) {
-        const { forefront, timeoutSecs, maxUnprocessedRequestsRetries = DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS, minDelayBetweenUnprocessedRequestsRetriesMillis = DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS, } = options;
+        const { forefront, timeoutSecs, signal, maxUnprocessedRequestsRetries = DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS, minDelayBetweenUnprocessedRequestsRetriesMillis = DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS, } = options;
         // Keep track of the requests that remain to be processed (in parameter format)
         let remainingRequests = requests;
         // Keep track of the requests that have been processed (in api format)
@@ -306,6 +310,7 @@ export class RequestQueueClient extends ResourceClient {
                 const response = await this.addRequestBatch(remainingRequests, {
                     forefront,
                     timeoutSecs,
+                    signal,
                 });
                 processedRequests.push(...response.processedRequests);
                 unprocessedRequests = response.unprocessedRequests;
@@ -324,6 +329,8 @@ export class RequestQueueClient extends ResourceClient {
                 }
             }
             catch (err) {
+                // An abort rejects the whole call, since the caller asked to stop and not for a partial result.
+                signal?.throwIfAborted();
                 // A response the specification does not describe is reported, as everywhere else: the server may well
                 // have added the batch, so calling it unprocessed would hide the mismatch behind a wrong answer.
                 if (err instanceof ResponseValidationError)
@@ -339,9 +346,8 @@ export class RequestQueueClient extends ResourceClient {
             }
             // Exponential backoff
             const delayMillis = Math.floor((1 + Math.random()) * 2 ** i * minDelayBetweenUnprocessedRequestsRetriesMillis);
-            await new Promise((resolve) => {
-                setTimeout(resolve, delayMillis);
-            });
+            await sleep(delayMillis, signal);
+            signal?.throwIfAborted();
         }
         return { processedRequests, unprocessedRequests };
     }
@@ -385,10 +391,11 @@ export class RequestQueueClient extends ResourceClient {
      * @since Added in 2.1.0
      */
     async batchAddRequests(requests, options = {}) {
-        const { forefront, timeoutSecs, maxUnprocessedRequestsRetries = DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS, maxParallel = DEFAULT_PARALLEL_BATCH_ADD_REQUESTS, minDelayBetweenUnprocessedRequestsRetriesMillis = DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS, } = options;
+        const { forefront, timeoutSecs, signal, maxUnprocessedRequestsRetries = DEFAULT_UNPROCESSED_RETRIES_BATCH_ADD_REQUESTS, maxParallel = DEFAULT_PARALLEL_BATCH_ADD_REQUESTS, minDelayBetweenUnprocessedRequestsRetriesMillis = DEFAULT_MIN_DELAY_BETWEEN_UNPROCESSED_REQUESTS_RETRIES_MILLIS, } = options;
         parseArgument(requests, batchAddRequestsWithRetriesSchema);
         parseArgument(forefront, optionalBooleanSchema);
         parseArgument(timeoutSecs, optionalTimeoutSchema);
+        parseArgument(signal, optionalSignalSchema);
         parseArgument(maxUnprocessedRequestsRetries, optionalNumberSchema);
         parseArgument(maxParallel, optionalNumberSchema);
         parseArgument(minDelayBetweenUnprocessedRequestsRetriesMillis, optionalNumberSchema);
@@ -452,11 +459,12 @@ export class RequestQueueClient extends ResourceClient {
      */
     async batchDeleteRequests(requests, options = {}) {
         parseArgument(requests, batchDeleteRequestsSchema);
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('requests/batch'),
             method: 'DELETE',
             timeoutSecs: this.#resolveTimeout(timeoutSecs, 'short'),
+            signal,
             data: requests,
             params: this.buildParams({
                 clientKey: this.#clientKey,
@@ -475,11 +483,12 @@ export class RequestQueueClient extends ResourceClient {
      */
     async getRequest(id, options = {}) {
         parseArgument(id, requestIdSchema);
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const requestOpts = {
             url: this.buildUrl(['requests', id]),
             method: 'GET',
             timeoutSecs: this.#resolveTimeout(timeoutSecs, 'short'),
+            signal,
             params: this.buildParams(),
         };
         try {
@@ -508,6 +517,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl(['requests', request.id]),
             method: 'PUT',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'medium'),
+            signal: parsed.signal,
             data: request,
             params: this.buildParams({
                 forefront: parsed.forefront,
@@ -525,11 +535,12 @@ export class RequestQueueClient extends ResourceClient {
      */
     async deleteRequest(id, options = {}) {
         parseArgument(id, requestIdSchema);
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         await this.httpClient.call({
             url: this.buildUrl(['requests', id]),
             method: 'DELETE',
             timeoutSecs: this.#resolveTimeout(timeoutSecs, 'short'),
+            signal,
             params: this.buildParams({
                 clientKey: this.#clientKey,
             }),
@@ -568,6 +579,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl(['requests', id, 'lock']),
             method: 'PUT',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'medium'),
+            signal: parsed.signal,
             params: this.buildParams({
                 forefront: parsed.forefront,
                 lockSecs: parsed.lockSecs,
@@ -596,6 +608,7 @@ export class RequestQueueClient extends ResourceClient {
             url: this.buildUrl(['requests', id, 'lock']),
             method: 'DELETE',
             timeoutSecs: this.#resolveTimeout(parsed.timeoutSecs, 'short'),
+            signal: parsed.signal,
             params: this.buildParams({
                 forefront: parsed.forefront,
                 clientKey: this.#clientKey,
@@ -615,14 +628,16 @@ export class RequestQueueClient extends ResourceClient {
      * @since Added in 2.5.1
      */
     listRequests(options = {}) {
-        // `timeoutSecs` times every page request; it is not an API parameter, so it must not reach the query string.
-        const { timeoutSecs, ...parsed } = parseArgument(options, listRequestsOptionsSchema, 'RequestQueueClientListRequestsOptions');
+        // `timeoutSecs` and `signal` apply to every page request; they are not API parameters, so they must not reach
+        // the query string.
+        const { timeoutSecs, signal, ...parsed } = parseArgument(options, listRequestsOptionsSchema, 'RequestQueueClientListRequestsOptions');
         const pageTimeout = this.#resolveTimeout(timeoutSecs, 'medium');
         const getPaginatedList = async (rqListOptions = {}) => {
             const response = await this.httpClient.call({
                 url: this.buildUrl('requests'),
                 method: 'GET',
                 timeoutSecs: pageTimeout,
+                signal,
                 params: this.buildParams({
                     ...rqListOptions,
                     filter: rqListOptions.filter ? rqListOptions.filter.join(',') : undefined,
@@ -671,11 +686,12 @@ export class RequestQueueClient extends ResourceClient {
      * @since Added in 2.12.5
      */
     async unlockRequests(options = {}) {
-        const { timeoutSecs } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs, signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('requests/unlock'),
             method: 'POST',
             timeoutSecs: this.#resolveTimeout(timeoutSecs, 'long'),
+            signal,
             params: this.buildParams({
                 clientKey: this.#clientKey,
             }),
@@ -702,9 +718,9 @@ export class RequestQueueClient extends ResourceClient {
      * @since Added in 2.5.1
      */
     paginateRequests(options = {}) {
-        const { limit, cursor, filter, maxPageLimit, timeoutSecs } = parseArgument(options, paginateRequestsOptionsSchema, 'RequestQueueClientPaginateRequestsOptions');
+        const { limit, cursor, filter, maxPageLimit, timeoutSecs, signal } = parseArgument(options, paginateRequestsOptionsSchema, 'RequestQueueClientPaginateRequestsOptions');
         return new RequestQueuePaginationIterator({
-            getPage: async (pageOptions) => this.listRequests({ ...pageOptions, filter, timeoutSecs }),
+            getPage: async (pageOptions) => this.listRequests({ ...pageOptions, filter, timeoutSecs, signal }),
             limit,
             cursor,
             maxPageLimit,

package/dist/resource_clients/request_queue_collection.js

@@ -78,7 +78,7 @@ export class RequestQueueCollectionClient extends ResourceCollectionClient {
      */
     async getOrCreate(name, options = {}) {
         parseArgument(name, nameSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getOrCreateResource(schemas.RequestQueue(), name, undefined, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getOrCreateResource(schemas.RequestQueue(), name, undefined, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/run.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { LEVELS, Log } from '@apify/log';
 import { ResourceClient } from '../base/resource_client.js';
 import * as schemas from '../schemas.js';
-import { optionalTimeoutSchema, timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
+import { optionalSignalSchema, optionalTimeoutSchema, timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
 import { runtime } from '#runtime';
 import { anyObjectSchema, parseArgument, parseResponse } from '../utils.js';
 import { DatasetClient } from './dataset.js';
@@ -88,8 +88,8 @@ export class RunClient extends ResourceClient {
      * ```
      */
     async get(options = {}) {
-        const { timeoutSecs, ...params } = parseArgument(options, getOptionsSchema, 'RunGetOptions');
-        return this.getResource(schemas.Run(), params, this.timeoutForWaitForFinish(timeoutSecs, 'short', params.waitForFinish));
+        const { timeoutSecs, signal, ...params } = parseArgument(options, getOptionsSchema, 'RunGetOptions');
+        return this.getResource(schemas.Run(), params, this.timeoutForWaitForFinish(timeoutSecs, 'short', params.waitForFinish), signal);
     }
     /**
      * Aborts the Actor run.
@@ -110,12 +110,13 @@ export class RunClient extends ResourceClient {
      * ```
      */
     async abort(options = {}) {
-        const { timeoutSecs = 'medium', ...params } = parseArgument(options, abortOptionsSchema, 'RunAbortOptions');
+        const { timeoutSecs = 'medium', signal, ...params } = parseArgument(options, abortOptionsSchema, 'RunAbortOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('abort'),
             method: 'POST',
             params: this.buildParams(params),
             timeoutSecs,
+            signal,
         });
         return parseResponse(response, schemas.Run());
     }
@@ -128,8 +129,8 @@ export class RunClient extends ResourceClient {
      * @since Added in 2.8.1
      */
     async delete(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.deleteResource(timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.deleteResource(timeoutSecs, signal);
     }
     /**
      * Transforms the Actor run into a run of another Actor (metamorph).
@@ -172,6 +173,7 @@ export class RunClient extends ResourceClient {
             // Actor input may carry page functions, which plain JSON serialization would drop.
             stringifyFunctions: true,
             timeoutSecs: parsed.timeoutSecs ?? 'medium',
+            signal: parsed.signal,
         };
         if (parsed.contentType) {
             request.headers = {
@@ -200,11 +202,12 @@ export class RunClient extends ResourceClient {
      * @since Added in 2.8.0
      */
     async reboot(options = {}) {
-        const { timeoutSecs = 'medium' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'medium', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const request = {
             url: this.buildUrl('reboot'),
             method: 'POST',
             timeoutSecs,
+            signal,
         };
         const response = await this.httpClient.call(request);
         return parseResponse(response, schemas.Run());
@@ -231,8 +234,8 @@ export class RunClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.Run(), newFields, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Run(), newFields, timeoutSecs, signal);
     }
     /**
      * Resurrects a finished Actor run, starting it again with the same settings.
@@ -259,13 +262,14 @@ export class RunClient extends ResourceClient {
      * ```
      */
     async resurrect(options = {}) {
-        const { timeoutSecs = 'medium', runTimeoutSecs, ...params } = parseArgument(options, resurrectOptionsSchema, 'RunResurrectOptions');
+        const { timeoutSecs = 'medium', signal, runTimeoutSecs, ...params } = parseArgument(options, resurrectOptionsSchema, 'RunResurrectOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('resurrect'),
             method: 'POST',
             // The API's `timeout` parameter bounds the run, not the request.
             params: this.buildParams({ ...params, timeout: runTimeoutSecs }),
             timeoutSecs,
+            signal,
         });
         return parseResponse(response, schemas.Run());
     }
@@ -282,7 +286,7 @@ export class RunClient extends ResourceClient {
      * @since Added in 2.11.0
      */
     async charge(options) {
-        const { eventName, count, idempotencyKey: providedIdempotencyKey, timeoutSecs = 'short', } = parseArgument(options, chargeOptionsSchema, 'RunChargeOptions');
+        const { eventName, count, idempotencyKey: providedIdempotencyKey, timeoutSecs = 'short', signal, } = parseArgument(options, chargeOptionsSchema, 'RunChargeOptions');
         /** To avoid duplicates during the same milisecond, doesn't need to by crypto-secure. */
         const randomSuffix = (Math.random() + 1).toString(36).slice(3, 8);
         const idempotencyKey = providedIdempotencyKey ?? `${this.id}-${eventName}-${Date.now()}-${randomSuffix}`;
@@ -297,6 +301,7 @@ export class RunClient extends ResourceClient {
                 [RUN_CHARGE_IDEMPOTENCY_HEADER]: idempotencyKey,
             },
             timeoutSecs,
+            signal,
         };
         const response = await this.httpClient.call(request);
         return response;
@@ -424,7 +429,8 @@ export class RunClient extends ResourceClient {
      */
     async getStreamedLog(options = {}) {
         parseArgument(options.timeoutSecs, optionalTimeoutSchema);
-        const { fromStart = true, timeoutSecs = 'long' } = options;
+        parseArgument(options.signal, optionalSignalSchema);
+        const { fromStart = true, timeoutSecs = 'long', signal } = options;
         let { toLog } = options;
         if (toLog === null || !runtime.isNode) {
             // Explicitly no logging or not in Node.js
@@ -433,15 +439,15 @@ export class RunClient extends ResourceClient {
         if (toLog === undefined || toLog === 'default') {
             // Create default StreamedLog
             // Get actor name and run id
-            const runData = await this.get({ timeoutSecs });
+            const runData = await this.get({ timeoutSecs, signal });
             const runId = runData?.id ?? '';
             const actorId = runData?.actId ?? '';
             // `apifyClient.actor()` rejects an empty ID, which is what a run that could not be read leaves here.
-            const actorData = actorId ? await this.apifyClient.actor(actorId).get({ timeoutSecs }) : undefined;
+            const actorData = actorId ? await this.apifyClient.actor(actorId).get({ timeoutSecs, signal }) : undefined;
             const actorName = actorData?.name ?? '';
             const name = [actorName, `runId:${runId}`].filter(Boolean).join(' ');
             toLog = new Log({ level: LEVELS.DEBUG, prefix: `${name} -> `, logger: new LoggerActorRedirect() });
         }
-        return new StreamedLog({ logClient: this.log(), toLog, fromStart });
+        return new StreamedLog({ logClient: this.log(), toLog, fromStart, signal });
     }
 }

package/dist/resource_clients/schedule.js

@@ -47,8 +47,8 @@ export class ScheduleClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/schedule-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.Schedule(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Schedule(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the schedule with the specified fields.
@@ -61,8 +61,8 @@ export class ScheduleClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.Schedule(), newFields, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Schedule(), newFields, timeoutSecs, signal);
     }
     /**
      * Deletes the schedule.
@@ -72,8 +72,8 @@ export class ScheduleClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/schedule-delete
      */
     async delete(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.deleteResource(timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.deleteResource(timeoutSecs, signal);
     }
     /**
      * Retrieves the schedule's log.
@@ -84,12 +84,13 @@ export class ScheduleClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/schedule-log-get
      */
     async getLog(options = {}) {
-        const { timeoutSecs = 'medium' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'medium', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('log'),
             method: 'GET',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         });
         return parseResponse(response, scheduleLogSchema);
     }

package/dist/resource_clients/schedule_collection.js

@@ -79,7 +79,7 @@ export class ScheduleCollectionClient extends ResourceCollectionClient {
      */
     async create(schedule, options = {}) {
         parseArgument(schedule, scheduleCreateSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.createResource(schemas.Schedule(), schedule, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.createResource(schemas.Schedule(), schedule, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/task.js

@@ -73,8 +73,8 @@ export class TaskClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/actor-task-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.Task(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Task(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the task with the specified fields.
@@ -87,8 +87,8 @@ export class TaskClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.Task(), newFields, timeoutSecs);
+        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
@@ -132,8 +132,8 @@ export class TaskClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/actor-task-delete
      */
     async delete(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.deleteResource(timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.deleteResource(timeoutSecs, signal);
     }
     /**
      * Starts an Actor task and immediately returns the Run object.
@@ -156,7 +156,7 @@ export class TaskClient extends ResourceClient {
     async start(input, options = {}) {
         parseArgument(input, inputSchema);
         const parsed = parseArgument(options, startOptionsSchema, 'TaskStartOptions');
-        const { waitForFinish, runTimeoutSecs, memory, build, maxItems, maxTotalChargeUsd, restartOnError, timeoutSecs, } = parsed;
+        const { waitForFinish, runTimeoutSecs, memory, build, maxItems, maxTotalChargeUsd, restartOnError, timeoutSecs, signal, } = parsed;
         // The API's `timeout` parameter bounds the run, not the request.
         const params = {
             waitForFinish,
@@ -179,6 +179,7 @@ export class TaskClient extends ResourceClient {
                 'Content-Type': 'application/json',
             },
             timeoutSecs: this.timeoutForWaitForFinish(timeoutSecs, 'medium', waitForFinish),
+            signal,
         };
         const response = await this.httpClient.call(request);
         return parseResponse(response, schemas.Run());
@@ -204,12 +205,12 @@ export class TaskClient extends ResourceClient {
     async call(input, options = {}) {
         parseArgument(input, inputSchema);
         const parsed = parseArgument(options, callOptionsSchema, 'TaskCallOptions');
-        const { waitSecs, timeoutSecs = 'noTimeout', ...startOptions } = parsed;
-        const { id } = await this.start(input, { ...startOptions, timeoutSecs });
+        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, timeoutSecs });
+        return this.apifyClient.run(id).waitForFinish({ waitSecs, timeoutSecs, signal });
     }
     /**
      * Retrieves the Actor task's input object.
@@ -220,12 +221,13 @@ export class TaskClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/actor-task-input-get
      */
     async getInput(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('input'),
             method: 'GET',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         });
         return cast(response.data);
     }
@@ -239,13 +241,14 @@ export class TaskClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/actor-task-input-put
      */
     async updateInput(newFields, options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('input'),
             method: 'PUT',
             params: this.buildParams(),
             data: newFields,
             timeoutSecs,
+            signal,
         });
         return cast(response.data);
     }

package/dist/resource_clients/task_collection.js

@@ -78,7 +78,7 @@ export class TaskCollectionClient extends ResourceCollectionClient {
      */
     async create(task, options = {}) {
         parseArgument(task, anyObjectSchema);
-        const { timeoutSecs = 'medium' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.createResource(schemas.Task(), task, timeoutSecs);
+        const { timeoutSecs = 'medium', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.createResource(schemas.Task(), task, timeoutSecs, signal);
     }
 }