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

package/dist/http_clients/base.js

@@ -9,7 +9,7 @@ import { InvalidResponseBodyError } from '../invalid_response_body_error.js';
 import { Statistics } from '../statistics.js';
 import { DEFAULT_TIMEOUT_LONG_SECS, DEFAULT_TIMEOUT_MAX_SECS, DEFAULT_TIMEOUT_MEDIUM_SECS, DEFAULT_TIMEOUT_SHORT_SECS, } from '../timeouts.js';
 import { runtime } from '#runtime';
-import { asArray, getEnv, isBuffer, isCompressibleContentType, isStream, MIN_COMPRESS_BYTES, parseArgument, toBytes, version, } from '../utils.js';
+import { asArray, getEnv, isBuffer, isCompressibleContentType, isStream, MIN_COMPRESS_BYTES, parseArgument, sleep, toBytes, version, } from '../utils.js';
 export const DEFAULT_MAX_RETRIES = 8;
 export const DEFAULT_MIN_DELAY_BETWEEN_RETRIES_MILLIS = 500;
 const RATE_LIMIT_EXCEEDED_STATUS_CODE = 429;
@@ -415,26 +415,6 @@ export class HttpClient {
         }
     }
 }
-/**
- * Resolves after `millis`, or right away once `signal` aborts.
- */
-async function sleep(millis, signal) {
-    return new Promise((resolve) => {
-        if (signal?.aborted) {
-            resolve();
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            resolve();
-        };
-        const timer = setTimeout(() => {
-            signal?.removeEventListener('abort', onAbort);
-            resolve();
-        }, millis);
-        signal?.addEventListener('abort', onAbort, { once: true });
-    });
-}
 /**
  * Looks a header up by name, compared case-insensitively.
  */

package/dist/resource_clients/actor.js

@@ -96,8 +96,8 @@ export class ActorClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/act-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.Actor(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Actor(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the Actor with specified fields.
@@ -110,8 +110,8 @@ export class ActorClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.Actor(), newFields, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Actor(), newFields, timeoutSecs, signal);
     }
     /**
      * Deletes the Actor.
@@ -121,8 +121,8 @@ export class ActorClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/act-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 the Actor and immediately returns the Run object.
@@ -160,7 +160,7 @@ export class ActorClient extends ResourceClient {
      */
     async start(input, options = {}) {
         const parsed = parseArgument(options, startOptionsSchema, 'ActorStartOptions');
-        const { waitForFinish, runTimeoutSecs, memory, build, maxItems, maxTotalChargeUsd, restartOnError, forcePermissionLevel, timeoutSecs, } = parsed;
+        const { waitForFinish, runTimeoutSecs, memory, build, maxItems, maxTotalChargeUsd, restartOnError, forcePermissionLevel, timeoutSecs, signal, } = parsed;
         // The API's `timeout` parameter bounds the run, not the request.
         const params = {
             waitForFinish,
@@ -181,6 +181,7 @@ export class ActorClient extends ResourceClient {
             // Actor input may carry page functions, which plain JSON serialization would drop.
             stringifyFunctions: true,
             timeoutSecs: this.timeoutForWaitForFinish(timeoutSecs, 'medium', waitForFinish),
+            signal,
         };
         if (parsed.contentType) {
             request.headers = {
@@ -229,17 +230,17 @@ export class ActorClient extends ResourceClient {
      */
     async call(input, options = {}) {
         const parsed = parseArgument(options, callOptionsSchema, 'ActorCallOptions');
-        const { waitSecs, log, timeoutSecs = 'noTimeout', ...startOptions } = parsed;
-        const { id } = await this.start(input, { ...startOptions, timeoutSecs });
+        const { waitSecs, log, 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 actor API.
         const newRunClient = this.apifyClient.run(id);
-        const streamedLog = await newRunClient.getStreamedLog({ toLog: log });
+        const streamedLog = await newRunClient.getStreamedLog({ toLog: log, signal });
         streamedLog?.start();
         return this.apifyClient
             .run(id)
-            .waitForFinish({ waitSecs, timeoutSecs })
+            .waitForFinish({ waitSecs, timeoutSecs, signal })
             .finally(async () => {
             await streamedLog?.stop();
         });
@@ -283,6 +284,7 @@ export class ActorClient extends ResourceClient {
             // Actor input may carry page functions, which plain JSON serialization would drop.
             stringifyFunctions: true,
             timeoutSecs: parsed.timeoutSecs ?? 'short',
+            signal: parsed.signal,
         };
         if (parsed.contentType) {
             request.headers = {
@@ -325,7 +327,7 @@ export class ActorClient extends ResourceClient {
      */
     async build(versionNumber, options = {}) {
         parseArgument(versionNumber, versionNumberSchema);
-        const { timeoutSecs, ...params } = parseArgument(options, buildOptionsSchema, 'ActorBuildOptions');
+        const { timeoutSecs, signal, ...params } = parseArgument(options, buildOptionsSchema, 'ActorBuildOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('builds'),
             method: 'POST',
@@ -334,6 +336,7 @@ export class ActorClient extends ResourceClient {
                 ...params,
             }),
             timeoutSecs: this.timeoutForWaitForFinish(timeoutSecs, 'medium', params.waitForFinish),
+            signal,
         });
         return parseResponse(response, schemas.Build());
     }
@@ -365,12 +368,13 @@ export class ActorClient extends ResourceClient {
      * @since Added in 2.12.2
      */
     async defaultBuild(options = {}) {
-        const { timeoutSecs, ...params } = parseArgument(options, defaultBuildOptionsSchema, 'BuildClientGetOptions');
+        const { timeoutSecs, signal, ...params } = parseArgument(options, defaultBuildOptionsSchema, 'BuildClientGetOptions');
         const response = await this.httpClient.call({
             url: this.buildUrl('builds/default'),
             method: 'GET',
             params: this.buildParams(params),
             timeoutSecs: this.timeoutForWaitForFinish(timeoutSecs, 'short', params.waitForFinish),
+            signal,
         });
         const { id } = parseResponse(response, schemas.Build());
         return new BuildClient({

package/dist/resource_clients/actor_collection.js

@@ -73,8 +73,8 @@ export class ActorCollectionClient extends ResourceCollectionClient {
      */
     async create(actor, options = {}) {
         parseArgument(actor, actorCreateSchema);
-        const { timeoutSecs = 'medium' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.createResource(schemas.Actor(), actor, timeoutSecs);
+        const { timeoutSecs = 'medium', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.createResource(schemas.Actor(), actor, timeoutSecs, signal);
     }
 }
 /**

package/dist/resource_clients/actor_env_var.js

@@ -44,8 +44,8 @@ export class ActorEnvVarClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/act-version-env-var-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.EnvVar(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.EnvVar(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the environment variable.
@@ -58,8 +58,8 @@ export class ActorEnvVarClient extends ResourceClient {
      */
     async update(actorEnvVar, options = {}) {
         parseArgument(actorEnvVar, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.EnvVar(), actorEnvVar, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.EnvVar(), actorEnvVar, timeoutSecs, signal);
     }
     /**
      * Deletes the environment variable.
@@ -69,7 +69,7 @@ export class ActorEnvVarClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/act-version-env-var-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);
     }
 }

package/dist/resource_clients/actor_env_var_collection.js

@@ -61,8 +61,8 @@ export class ActorEnvVarCollectionClient extends ResourceCollectionClient {
      * @see https://docs.apify.com/api/v2/act-version-env-vars-get
      */
     list(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.listResourcesPaginated(schemas.ListOfEnvVars(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.listResourcesPaginated(schemas.ListOfEnvVars(), { signal }, timeoutSecs);
     }
     /**
      * Creates a new environment variable for this Actor version.
@@ -75,7 +75,7 @@ export class ActorEnvVarCollectionClient extends ResourceCollectionClient {
      */
     async create(actorEnvVar, options = {}) {
         parseArgument(actorEnvVar, actorEnvVarSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.createResource(schemas.EnvVar(), actorEnvVar, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.createResource(schemas.EnvVar(), actorEnvVar, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/actor_version.js

@@ -47,8 +47,8 @@ export class ActorVersionClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/act-version-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.Version(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Version(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the Actor version with the specified fields.
@@ -61,8 +61,8 @@ export class ActorVersionClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.Version(), newFields, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Version(), newFields, timeoutSecs, signal);
     }
     /**
      * Deletes the Actor version.
@@ -72,8 +72,8 @@ export class ActorVersionClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/act-version-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);
     }
     /**
      * Returns a client for the specified environment variable of this Actor version.

package/dist/resource_clients/actor_version_collection.js

@@ -60,8 +60,8 @@ export class ActorVersionCollectionClient extends ResourceCollectionClient {
      * @see https://docs.apify.com/api/v2/act-versions-get
      */
     list(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.listResourcesPaginated(schemas.ListOfVersions(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.listResourcesPaginated(schemas.ListOfVersions(), { signal }, timeoutSecs);
     }
     /**
      * Creates a new Actor version.
@@ -74,7 +74,7 @@ export class ActorVersionCollectionClient extends ResourceCollectionClient {
      */
     async create(actorVersion, options = {}) {
         parseArgument(actorVersion, actorVersionSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.createResource(schemas.Version(), actorVersion, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.createResource(schemas.Version(), actorVersion, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/build.js

@@ -60,8 +60,8 @@ export class BuildClient extends ResourceClient {
      * ```
      */
     async get(options = {}) {
-        const { timeoutSecs, ...params } = parseArgument(options, getOptionsSchema, 'BuildClientGetOptions');
-        return this.getResource(schemas.Build(), params, this.timeoutForWaitForFinish(timeoutSecs, 'short', params.waitForFinish));
+        const { timeoutSecs, signal, ...params } = parseArgument(options, getOptionsSchema, 'BuildClientGetOptions');
+        return this.getResource(schemas.Build(), params, this.timeoutForWaitForFinish(timeoutSecs, 'short', params.waitForFinish), signal);
     }
     /**
      * Aborts the Actor build.
@@ -79,12 +79,13 @@ export class BuildClient extends ResourceClient {
      * ```
      */
     async abort(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('abort'),
             method: 'POST',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         });
         return parseResponse(response, schemas.Build());
     }
@@ -97,8 +98,8 @@ export class BuildClient 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);
     }
     /**
      * Retrieves the OpenAPI definition for the Actor build.
@@ -110,12 +111,13 @@ export class BuildClient extends ResourceClient {
      * @since Added in 2.11.2
      */
     async getOpenApiDefinition(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('openapi.json'),
             method: 'GET',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         });
         return response.data;
     }

package/dist/resource_clients/dataset.js

@@ -44,8 +44,8 @@ const downloadItemsOptionsSchema = z.strictObject({
     ...timeoutOptionsShape,
 });
 const pushItemsSchema = z.union([itemSchema, z.string(), z.array(itemSchema)]);
-// Apart from `timeoutSecs` and `expiresInSecs`, every option becomes a query parameter of the generated URL, so
-// `chunkSize` (client-side only) and `signature` (which this method produces) are left out. The options type
+// Apart from `timeoutSecs`, `signal` and `expiresInSecs`, every option becomes a query parameter of the generated
+// URL, so `chunkSize` (client-side only) and `signature` (which this method produces) are left out. The options type
 // omits both to match.
 const createItemsPublicUrlOptionsSchema = z.strictObject({
     clean: z.boolean().optional(),
@@ -110,8 +110,8 @@ export class DatasetClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/dataset-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.Dataset(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.Dataset(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the dataset with specified fields.
@@ -124,8 +124,8 @@ export class DatasetClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.Dataset(), newFields, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.Dataset(), newFields, timeoutSecs, signal);
     }
     /**
      * Deletes the dataset.
@@ -135,8 +135,8 @@ export class DatasetClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/dataset-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);
     }
     /**
      * Lists items in the dataset.
@@ -184,13 +184,14 @@ export class DatasetClient extends ResourceClient {
      * ```
      */
     listItems(options = {}) {
-        const { timeoutSecs = 'long', ...listOptions } = parseArgument(options, listItemsOptionsSchema, 'DatasetClientListItemOptions');
+        const { timeoutSecs = 'long', signal, ...listOptions } = parseArgument(options, listItemsOptionsSchema, 'DatasetClientListItemOptions');
         const fetchItems = async (datasetListOptions = {}) => {
             const response = await this.httpClient.call({
                 url: this.buildUrl('items'),
                 method: 'GET',
                 params: this.buildParams(datasetListOptions),
                 timeoutSecs,
+                signal,
             });
             return this.#createPaginationList(response, datasetListOptions.desc ?? false);
         };
@@ -239,7 +240,7 @@ export class DatasetClient extends ResourceClient {
      */
     async downloadItems(format, options = {}) {
         parseArgument(format, itemFormatSchema);
-        const { timeoutSecs = 'long', ...query } = parseArgument(options, downloadItemsOptionsSchema, 'DatasetClientDownloadItemsOptions');
+        const { timeoutSecs = 'long', signal, ...query } = parseArgument(options, downloadItemsOptionsSchema, 'DatasetClientDownloadItemsOptions');
         const { data } = await this.httpClient.call({
             url: this.buildUrl('items'),
             method: 'GET',
@@ -249,6 +250,7 @@ export class DatasetClient extends ResourceClient {
             }),
             responseType: 'buffer',
             timeoutSecs,
+            signal,
         });
         return cast(data);
     }
@@ -286,7 +288,7 @@ export class DatasetClient extends ResourceClient {
      */
     async pushItems(items, options = {}) {
         parseArgument(items, pushItemsSchema);
-        const { timeoutSecs = 'medium' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'medium', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         await this.httpClient.call({
             url: this.buildUrl('items'),
             method: 'POST',
@@ -297,6 +299,7 @@ export class DatasetClient extends ResourceClient {
             params: this.buildParams(),
             doNotRetryTimeouts: true,
             timeoutSecs,
+            signal,
         });
     }
     /**
@@ -312,12 +315,13 @@ export class DatasetClient extends ResourceClient {
      * @since Added in 2.11.2
      */
     async getStatistics(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('statistics'),
             method: 'GET',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         });
         return parseResponse(response, schemas.DatasetStatistics());
     }
@@ -355,8 +359,8 @@ export class DatasetClient extends ResourceClient {
      * @since Added in 2.13.0
      */
     async createItemsPublicUrl(options = {}) {
-        const { timeoutSecs = 'long', expiresInSecs, ...queryOptions } = parseArgument(options, createItemsPublicUrlOptionsSchema, 'DatasetClientCreateItemsUrlOptions');
-        const dataset = await this.get({ timeoutSecs });
+        const { timeoutSecs = 'long', signal, expiresInSecs, ...queryOptions } = parseArgument(options, createItemsPublicUrlOptionsSchema, 'DatasetClientCreateItemsUrlOptions');
+        const dataset = await this.get({ timeoutSecs, signal });
         let createdItemsPublicUrl = new URL(this.buildPublicUrl('items'));
         if (dataset?.urlSigningSecretKey) {
             const signature = await createStorageContentSignatureAsync({

package/dist/resource_clients/dataset_collection.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { STORAGE_OWNERSHIP_FILTER } from '@apify/consts';
 import { ResourceCollectionClient } from '../base/resource_collection_client.js';
 import * as schemas from '../schemas.js';
-import { optionalTimeoutSchema, timeoutOptionsShape } from '../timeouts.js';
+import { optionalSignalSchema, optionalTimeoutSchema, timeoutOptionsShape } from '../timeouts.js';
 import { anyObjectSchema, paginationOptionsShape, parseArgument } from '../utils.js';
 const listOptionsSchema = z.strictObject({
     unnamed: z.boolean().optional(),
@@ -82,10 +82,11 @@ export class DatasetCollectionClient extends ResourceCollectionClient {
         parseArgument(name, nameSchema);
         parseArgument(options?.schema, schemaSchema); // TODO: Add schema validation
         parseArgument(options?.timeoutSecs, optionalTimeoutSchema);
-        // `timeoutSecs` is not part of the resource, so the body carries only the rest, and stays absent when
-        // there is nothing else to send.
-        const { timeoutSecs = 'short', ...resource } = options ?? {};
+        parseArgument(options?.signal, optionalSignalSchema);
+        // `timeoutSecs` and `signal` are not part of the resource, so the body carries only the rest, and stays
+        // absent when there is nothing else to send.
+        const { timeoutSecs = 'short', signal, ...resource } = options ?? {};
         const hasResource = Object.keys(resource).length > 0;
-        return this.getOrCreateResource(schemas.Dataset(), name, hasResource ? resource : undefined, timeoutSecs);
+        return this.getOrCreateResource(schemas.Dataset(), name, hasResource ? resource : undefined, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/key_value_store.js

@@ -96,8 +96,8 @@ export class KeyValueStoreClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/key-value-store-get
      */
     async get(options = {}) {
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.getResource(schemas.KeyValueStore(), {}, timeoutSecs);
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.getResource(schemas.KeyValueStore(), {}, timeoutSecs, signal);
     }
     /**
      * Updates the key-value store with specified fields.
@@ -113,8 +113,8 @@ export class KeyValueStoreClient extends ResourceClient {
      */
     async update(newFields, options = {}) {
         parseArgument(newFields, anyObjectSchema);
-        const { timeoutSecs = 'long' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        return this.updateResource(schemas.KeyValueStore(), newFields, timeoutSecs);
+        const { timeoutSecs = 'long', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        return this.updateResource(schemas.KeyValueStore(), newFields, timeoutSecs, signal);
     }
     /**
      * Deletes the key-value store.
@@ -124,8 +124,8 @@ export class KeyValueStoreClient extends ResourceClient {
      * @see https://docs.apify.com/api/v2/key-value-store-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);
     }
     /**
      * Lists all keys in the key-value store.
@@ -164,13 +164,14 @@ export class KeyValueStoreClient extends ResourceClient {
      * ```
      */
     listKeys(options = {}) {
-        const { timeoutSecs = 'medium', ...parsed } = parseArgument(options, listKeysOptionsSchema, 'KeyValueClientListKeysOptions');
+        const { timeoutSecs = 'medium', signal, ...parsed } = parseArgument(options, listKeysOptionsSchema, 'KeyValueClientListKeysOptions');
         const getPaginatedList = async (kvsListOptions = {}) => {
             const response = await this.httpClient.call({
                 url: this.buildUrl('keys'),
                 method: 'GET',
                 params: this.buildParams(kvsListOptions),
                 timeoutSecs,
+                signal,
             });
             return parseResponse(response, schemas.ListOfKeys());
         };
@@ -223,8 +224,8 @@ export class KeyValueStoreClient extends ResourceClient {
      */
     async getRecordPublicUrl(key, options = {}) {
         parseArgument(key, nonEmptyKeySchema);
-        const { timeoutSecs = 'long' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
-        const store = await this.get({ timeoutSecs });
+        const { timeoutSecs = 'long', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const store = await this.get({ timeoutSecs, signal });
         const recordPublicUrl = new URL(this.buildPublicUrl(['records', key]));
         if (store?.urlSigningSecretKey) {
             const signature = await createHmacSignatureAsync(store.urlSigningSecretKey, key);
@@ -257,8 +258,8 @@ export class KeyValueStoreClient extends ResourceClient {
      * @since Added in 2.13.0
      */
     async createKeysPublicUrl(options = {}) {
-        const { timeoutSecs = 'long', expiresInSecs, ...queryOptions } = parseArgument(options, createKeysPublicUrlOptionsSchema, 'KeyValueClientCreateKeysUrlOptions');
-        const store = await this.get({ timeoutSecs });
+        const { timeoutSecs = 'long', signal, expiresInSecs, ...queryOptions } = parseArgument(options, createKeysPublicUrlOptionsSchema, 'KeyValueClientCreateKeysUrlOptions');
+        const store = await this.get({ timeoutSecs, signal });
         let createdPublicKeysUrl = new URL(this.buildPublicUrl('keys'));
         if (store?.urlSigningSecretKey) {
             const signature = await createStorageContentSignatureAsync({
@@ -292,12 +293,13 @@ export class KeyValueStoreClient extends ResourceClient {
      * @since Added in 2.9.0
      */
     async recordExists(key, options = {}) {
-        const { timeoutSecs = 'long' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'long', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         const requestOpts = {
             url: this.buildUrl(['records', key]),
             method: 'HEAD',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         };
         try {
             await this.httpClient.call(requestOpts);
@@ -326,6 +328,7 @@ export class KeyValueStoreClient extends ResourceClient {
             method: 'GET',
             params: this.buildParams(queryParams),
             timeoutSecs: parsed.timeoutSecs ?? 'long',
+            signal: parsed.signal,
         };
         if (parsed.buffer)
             requestOpts.responseType = 'buffer';
@@ -404,7 +407,7 @@ export class KeyValueStoreClient extends ResourceClient {
         const parsed = parseArgument(options, recordOptionsSchema, 'KeyValueStoreRecordOptions');
         const { key } = record;
         let { value, contentType } = record;
-        const { timeoutSecs = 'long', doNotRetryTimeouts } = parsed;
+        const { timeoutSecs = 'long', signal, doNotRetryTimeouts } = parsed;
         const isValueStreamOrBuffer = isStream(value) || isBuffer(value);
         // To allow saving Objects to JSON without providing content type
         if (!contentType) {
@@ -433,6 +436,7 @@ export class KeyValueStoreClient extends ResourceClient {
             headers: contentType ? { 'content-type': contentType } : undefined,
             doNotRetryTimeouts,
             timeoutSecs,
+            signal,
         };
         await this.httpClient.call(uploadOpts);
     }
@@ -451,12 +455,13 @@ export class KeyValueStoreClient extends ResourceClient {
      */
     async deleteRecord(key, options = {}) {
         parseArgument(key, keySchema);
-        const { timeoutSecs = 'short' } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
         await this.httpClient.call({
             url: this.buildUrl(['records', key]),
             method: 'DELETE',
             params: this.buildParams(),
             timeoutSecs,
+            signal,
         });
     }
 }

package/dist/resource_clients/key_value_store_collection.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { STORAGE_OWNERSHIP_FILTER } from '@apify/consts';
 import { ResourceCollectionClient } from '../base/resource_collection_client.js';
 import * as schemas from '../schemas.js';
-import { optionalTimeoutSchema, timeoutOptionsShape } from '../timeouts.js';
+import { optionalSignalSchema, optionalTimeoutSchema, timeoutOptionsShape } from '../timeouts.js';
 import { anyObjectSchema, paginationOptionsShape, parseArgument } from '../utils.js';
 const listOptionsSchema = z.strictObject({
     unnamed: z.boolean().optional(),
@@ -82,10 +82,11 @@ export class KeyValueStoreCollectionClient extends ResourceCollectionClient {
         parseArgument(name, nameSchema);
         parseArgument(options?.schema, schemaSchema); // TODO: Add schema validation
         parseArgument(options?.timeoutSecs, optionalTimeoutSchema);
-        // `timeoutSecs` is not part of the resource, so the body carries only the rest, and stays absent when
-        // there is nothing else to send.
-        const { timeoutSecs = 'short', ...resource } = options ?? {};
+        parseArgument(options?.signal, optionalSignalSchema);
+        // `timeoutSecs` and `signal` are not part of the resource, so the body carries only the rest, and stays
+        // absent when there is nothing else to send.
+        const { timeoutSecs = 'short', signal, ...resource } = options ?? {};
         const hasResource = Object.keys(resource).length > 0;
-        return this.getOrCreateResource(schemas.KeyValueStore(), name, hasResource ? resource : undefined, timeoutSecs);
+        return this.getOrCreateResource(schemas.KeyValueStore(), name, hasResource ? resource : undefined, timeoutSecs, signal);
     }
 }

package/dist/resource_clients/log.d.ts

@@ -95,4 +95,6 @@ export interface StreamedLogOptions {
     toLog: Log;
     /** Whether to redirect all logs from Actor run start (even logs from the past). */
     fromStart?: boolean;
+    /** Ends the log stream once it aborts. */
+    signal?: AbortSignal;
 }