apify 4.0.0-beta.38 → 4.0.0-beta.39

package/dist/actor.d.ts

@@ -1,7 +1,7 @@
 import type { EventManager, EventTypeName, RecordOptions, UseStateOptions } from '@crawlee/core';
 import { Dataset, KeyValueStore, RequestQueue } from '@crawlee/core';
 import type { Awaitable, Dictionary, StorageBackend } from '@crawlee/types';
-import type { ActorCallOptions, ActorStartOptions, ApifyClientOptions, RunAbortOptions, TaskCallOptions, Webhook, WebhookEventType } from 'apify-client';
+import type { ActorCallOptions, ActorInput, ActorStartOptions, ApifyClientOptions, RunAbortOptions, TaskCallOptions, Webhook, WebhookEventType } from 'apify-client';
 import { ActorRun as ClientActorRun, ApifyClient } from 'apify-client';
 import { type ACTOR_PERMISSION_LEVEL } from '@apify/consts';
 import type { RequestQueueAccessMode } from './apify_request_queue_backend.js';
@@ -222,11 +222,11 @@ export interface Timeout {
      */
     timeout?: number | 'inherit';
 }
-export interface CallOptions extends Omit<ActorCallOptions, 'timeout'>, Token, Timeout {
+export interface CallOptions extends Omit<ActorCallOptions, 'runTimeoutSecs'>, Token, Timeout {
 }
-export interface StartOptions extends Omit<ActorStartOptions, 'waitForFinish' | 'timeout'>, Token, Timeout {
+export interface StartOptions extends Omit<ActorStartOptions, 'waitForFinish' | 'runTimeoutSecs'>, Token, Timeout {
 }
-export interface CallTaskOptions extends Omit<TaskCallOptions, 'timeout'>, Token, Timeout {
+export interface CallTaskOptions extends Omit<TaskCallOptions, 'runTimeoutSecs'>, Token, Timeout {
 }
 export interface AbortOptions extends RunAbortOptions, Token {
     /** Exit with given status message */
@@ -293,7 +293,7 @@ export interface MetamorphOptions {
      * Content type for the `input`. If not specified,
      * `input` is expected to be an object that will be stringified to JSON and content type set to
      * `application/json; charset=utf-8`. If `options.contentType` is specified, then `input` must be a
-     * `String` or `Buffer`.
+     * `Buffer`.
      */
     contentType?: string;
     /**
@@ -446,13 +446,12 @@ export declare class Actor<Data extends Dictionary = Dictionary> {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      * @ignore
      */
-    call(actorId: string, input?: unknown, options?: CallOptions): Promise<ClientActorRun>;
+    call(actorId: string, input?: ActorInput, options?: CallOptions): Promise<ClientActorRun>;
     /**
      * Runs an Actor on the Apify platform using the current user account (determined by the `APIFY_TOKEN` environment variable),
      * unlike `Actor.call`, this method just starts the run without waiting for finish.
@@ -471,13 +470,12 @@ export declare class Actor<Data extends Dictionary = Dictionary> {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      * @ignore
      */
-    start(actorId: string, input?: unknown, options?: StartOptions): Promise<ClientActorRun>;
+    start(actorId: string, input?: ActorInput, options?: StartOptions): Promise<ClientActorRun>;
     /**
      * Aborts given Actor run on the Apify platform using the current user account (determined by the `APIFY_TOKEN` environment variable).
      *
@@ -529,13 +527,12 @@ export declare class Actor<Data extends Dictionary = Dictionary> {
      * @param targetActorId
      *  Either `username/actor-name` or Actor ID of an Actor to which we want to metamorph.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise, the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      * @ignore
      */
-    metamorph(targetActorId: string, input?: unknown, options?: MetamorphOptions): Promise<void>;
+    metamorph(targetActorId: string, input?: ActorInput, options?: MetamorphOptions): Promise<void>;
     /**
      * Internally reboots this Actor. The system stops the current container and starts
      * a new container with the same run ID.
@@ -978,12 +975,11 @@ export declare class Actor<Data extends Dictionary = Dictionary> {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      */
-    static call(actorId: string, input?: unknown, options?: CallOptions): Promise<ClientActorRun>;
+    static call(actorId: string, input?: ActorInput, options?: CallOptions): Promise<ClientActorRun>;
     /**
      * Runs an Actor task on the Apify platform using the current user account (determined by the `APIFY_TOKEN` environment variable).
      *
@@ -1028,9 +1024,8 @@ export declare class Actor<Data extends Dictionary = Dictionary> {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      */
     static start(actorId: string, input?: Dictionary, options?: StartOptions): Promise<ClientActorRun>;
@@ -1057,12 +1052,11 @@ export declare class Actor<Data extends Dictionary = Dictionary> {
      * @param targetActorId
      *  Either `username/actor-name` or Actor ID of an Actor to which we want to metamorph.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise, the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      */
-    static metamorph(targetActorId: string, input?: unknown, options?: MetamorphOptions): Promise<void>;
+    static metamorph(targetActorId: string, input?: ActorInput, options?: MetamorphOptions): Promise<void>;
     /**
      * Internally reboots this Actor run. The system stops the current container and starts
      * a new container with the same run id.

package/dist/actor.js

@@ -378,17 +378,16 @@ export class Actor {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      * @ignore
      */
     async call(actorId, input, options = {}) {
-        const timeout = options.timeout === 'inherit' ? this.getRemainingTimeSecs() : options.timeout;
-        const { token, ...rest } = options;
+        const runTimeoutSecs = options.timeout === 'inherit' ? this.getRemainingTimeSecs() : options.timeout;
+        const { token, timeout: _timeout, ...rest } = options;
         const client = token ? this.newClient({ token }) : this.apifyClient;
-        return client.actor(actorId).call(input, { ...rest, timeout });
+        return client.actor(actorId).call(input, { ...rest, runTimeoutSecs });
     }
     /**
      * Runs an Actor on the Apify platform using the current user account (determined by the `APIFY_TOKEN` environment variable),
@@ -408,17 +407,16 @@ export class Actor {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      * @ignore
      */
     async start(actorId, input, options = {}) {
-        const timeout = options.timeout === 'inherit' ? this.getRemainingTimeSecs() : options.timeout;
-        const { token, ...rest } = options;
+        const runTimeoutSecs = options.timeout === 'inherit' ? this.getRemainingTimeSecs() : options.timeout;
+        const { token, timeout: _timeout, ...rest } = options;
         const client = token ? this.newClient({ token }) : this.apifyClient;
-        return client.actor(actorId).start(input, { ...rest, timeout });
+        return client.actor(actorId).start(input, { ...rest, runTimeoutSecs });
     }
     /**
      * Aborts given Actor run on the Apify platform using the current user account (determined by the `APIFY_TOKEN` environment variable).
@@ -472,10 +470,10 @@ export class Actor {
      * @ignore
      */
     async callTask(taskId, input, options = {}) {
-        const timeout = options.timeout === 'inherit' ? this.getRemainingTimeSecs() : options.timeout;
-        const { token, ...rest } = options;
+        const runTimeoutSecs = options.timeout === 'inherit' ? this.getRemainingTimeSecs() : options.timeout;
+        const { token, timeout: _timeout, ...rest } = options;
         const client = token ? this.newClient({ token }) : this.apifyClient;
-        return client.task(taskId).call(input, { ...rest, timeout });
+        return client.task(taskId).call(input, { ...rest, runTimeoutSecs });
     }
     /**
      * Transforms this Actor run to an Actor run of a given Actor. The system stops the current container and starts
@@ -485,9 +483,8 @@ export class Actor {
      * @param targetActorId
      *  Either `username/actor-name` or Actor ID of an Actor to which we want to metamorph.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise, the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      * @ignore
      */
@@ -1224,9 +1221,8 @@ export class Actor {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      */
     static async call(actorId, input, options = {}) {
@@ -1278,9 +1274,8 @@ export class Actor {
      * @param actorId
      *  Allowed formats are `username/actor-name`, `userId/actor-name` or Actor ID.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      */
     static async start(actorId, input, options = {}) {
@@ -1311,9 +1306,8 @@ export class Actor {
      * @param targetActorId
      *  Either `username/actor-name` or Actor ID of an Actor to which we want to metamorph.
      * @param [input]
-     *  Input for the Actor. If it is an object, it will be stringified to
-     *  JSON and its content type set to `application/json; charset=utf-8`.
-     *  Otherwise, the `options.contentType` parameter must be provided.
+     *  Input for the Actor. A plain object is stringified to JSON with content type
+     *  `application/json; charset=utf-8`. A `Buffer` is sent as-is and needs `options.contentType`.
      * @param [options]
      */
     static async metamorph(targetActorId, input, options = {}) {

package/dist/apify_dataset_backend.js

@@ -22,7 +22,7 @@ export class ApifyDatasetBackend {
         if (!metadata) {
             throw new Error('Dataset not found or has been deleted.');
         }
-        return metadata;
+        return { ...metadata, name: metadata.name ?? undefined };
     }
     async drop() {
         await this.#client.delete();

package/dist/apify_key_value_store_backend.js

@@ -16,7 +16,7 @@ export class ApifyKeyValueStoreBackend {
         if (!metadata) {
             throw new Error('Key-value store not found or has been deleted.');
         }
-        return metadata;
+        return { ...metadata, name: metadata.name ?? undefined };
     }
     async drop() {
         await this.#client.delete();
@@ -42,6 +42,8 @@ export class ApifyKeyValueStoreBackend {
         // requires the field, so it is left undefined via the cast.
         return {
             ...result,
+            exclusiveStartKey: result.exclusiveStartKey ?? undefined,
+            nextExclusiveStartKey: result.nextExclusiveStartKey ?? undefined,
             items: result.items.map(({ key, size }) => ({ key, size })),
         };
     }

package/dist/apify_request_queue_backend.js

@@ -42,7 +42,7 @@ export class ApifyRequestQueueBackend {
         }
         return {
             id: metadata.id,
-            name: metadata.name,
+            name: metadata.name ?? undefined,
             createdAt: metadata.createdAt,
             modifiedAt: metadata.modifiedAt,
             accessedAt: metadata.accessedAt,

package/dist/charging.js

@@ -102,9 +102,9 @@ export class ChargingManager {
         }
         // Load per-event pricing information
         if (pricingInfo?.pricingModel === 'PAY_PER_EVENT') {
-            for (const [eventName, eventPricing] of Object.entries(pricingInfo.pricingPerEvent.actorChargeEvents)) {
+            for (const [eventName, eventPricing] of Object.entries(pricingInfo.pricingPerEvent.actorChargeEvents ?? {})) {
                 this.#pricingInfo[eventName] = {
-                    price: eventPricing.eventPriceUsd,
+                    price: eventPricing.eventPriceUsd ?? 0,
                     title: eventPricing.eventTitle,
                 };
             }

package/dist/configuration.d.ts

@@ -2,13 +2,13 @@ import type { ConfigField, FieldsInput, FieldsOutput } from '@crawlee/core';
 import { Configuration as CoreConfiguration } from '@crawlee/core';
 import { z } from 'zod';
 export declare const apifyConfigFields: {
-    maxUsedCpuRatio: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber>>>;
-    internalTimeoutMillis: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodNumber>>>;
-    systemInfoIntervalMillis: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber>>>;
-    logLevel: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodEnum<typeof import("@crawlee/core").LogLevel>>>>;
-    persistStorage: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodBoolean>>>;
+    maxUsedCpuRatio: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber, unknown>>>;
+    internalTimeoutMillis: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodNumber, unknown>>>;
+    systemInfoIntervalMillis: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber, unknown>>>;
+    logLevel: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodEnum<typeof import("@crawlee/core").LogLevel>, unknown>>>;
+    persistStorage: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodBoolean, unknown>>>;
     storageDir: ConfigField<z.ZodDefault<z.ZodString>>;
-    containerized: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodBoolean>>>;
+    containerized: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodBoolean, unknown>>>;
     inputKey: ConfigField<z.ZodDefault<z.ZodString>>;
     memoryMbytes: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodNumber, unknown>>>;
     availableMemoryRatio: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber, unknown>>>;

package/dist/enqueue_links_filters.d.ts

@@ -1,4 +1,4 @@
-import type { RequestOptions, RequestTransform } from '@crawlee/core';
+import type { RequestOptions } from '@crawlee/core';
 /** Request options that the `globs` and `pseudoUrls` input editors can attach to a single URL pattern. */
 export interface UrlPatternRequestOptions extends Pick<RequestOptions, 'method' | 'payload' | 'label' | 'userData' | 'headers'> {
 }
@@ -26,4 +26,4 @@ export interface UrlPatternFilters {
  * await enqueueLinks({ transformRequestFunction: createTransformRequestFunction({ globs: input.globs }) });
  * ```
  */
-export declare function createTransformRequestFunction({ globs, pseudoUrls }: UrlPatternFilters): RequestTransform;
+export declare function createTransformRequestFunction({ globs, pseudoUrls, }: UrlPatternFilters): (request: RequestOptions) => RequestOptions | false | 'unchanged';

package/dist/enqueue_links_filters.js

@@ -10,7 +10,7 @@ import { purlToRegExp } from '@apify/pseudo_url';
  * await enqueueLinks({ transformRequestFunction: createTransformRequestFunction({ globs: input.globs }) });
  * ```
  */
-export function createTransformRequestFunction({ globs = [], pseudoUrls = [] }) {
+export function createTransformRequestFunction({ globs = [], pseudoUrls = [], }) {
     const patterns = [
         ...globs.flatMap((item) => {
             if (item == null) {

package/dist/proxy_configuration.d.ts

@@ -8,7 +8,6 @@ interface ProxyStatus {
     connectionError: string;
     isManInTheMiddle: boolean;
 }
-type NewUrlOptions = Parameters<CoreProxyConfiguration['newProxyInfo']>[0];
 export interface ProxyConfigurationOptions extends CoreProxyConfigurationOptions {
     /**
      * User's password for the proxy. By default, it is taken from the `APIFY_PROXY_PASSWORD`
@@ -153,7 +152,7 @@ export interface ProxyInfo extends CoreProxyInfo {
 export declare class ProxyConfiguration extends CoreProxyConfiguration {
     #private;
     readonly configuration: Configuration;
-    protected readonly log: import("@apify/log").Log;
+    protected readonly log: import("@crawlee/core").Log;
     /**
      * @internal
      */
@@ -174,13 +173,13 @@ export declare class ProxyConfiguration extends CoreProxyConfiguration {
      * independent URL; for Apify Proxy a random session id is embedded so consecutive
      * calls resolve to different IPs.
      */
-    newProxyInfo(options?: NewUrlOptions): Promise<ProxyInfo | undefined>;
+    newProxyInfo(): Promise<ProxyInfo | undefined>;
     /**
      * Returns a new proxy URL. For Apify Proxy, each call generates a URL with a fresh
      * random session id, so consecutive calls return independent URLs. For custom
      * `proxyUrls`, the URLs are rotated round-robin.
      */
-    newUrl(options?: NewUrlOptions): Promise<string | undefined>;
+    newUrl(): Promise<string | undefined>;
     /**
      * Returns proxy username.
      */

package/dist/proxy_configuration.js

@@ -147,8 +147,8 @@ export class ProxyConfiguration extends CoreProxyConfiguration {
      * independent URL; for Apify Proxy a random session id is embedded so consecutive
      * calls resolve to different IPs.
      */
-    async newProxyInfo(options) {
-        const url = await this.newUrl(options);
+    async newProxyInfo() {
+        const url = await this.newUrl();
         if (!url)
             return undefined;
         const parsed = new URL(url);
@@ -173,9 +173,9 @@ export class ProxyConfiguration extends CoreProxyConfiguration {
      * random session id, so consecutive calls return independent URLs. For custom
      * `proxyUrls`, the URLs are rotated round-robin.
      */
-    async newUrl(options) {
+    async newUrl() {
         if (!this.#usesApifyProxy) {
-            return super.newUrl(options);
+            return super.newUrl();
         }
         return this.composeDefaultUrl(cryptoRandomObjectId(SESSION_ID_LENGTH));
     }
@@ -213,7 +213,7 @@ export class ProxyConfiguration extends CoreProxyConfiguration {
             return;
         try {
             const user = await Actor.apifyClient.user().get();
-            this.#password = user.proxy?.password;
+            this.#password = user?.proxy?.password;
         }
         catch (error) {
             if (Actor.isAtHome()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify",
-  "version": "4.0.0-beta.38",
+  "version": "4.0.0-beta.39",
   "description": "The scalable web crawling and scraping library for JavaScript/Node.js. Enables development of data extraction and web automation jobs (not only) with headless Chrome and Puppeteer.",
   "engines": {
     "node": ">=22.0.0"
@@ -61,10 +61,10 @@
     "@apify/timeout": "^1.0.1",
     "@apify/utilities": "^3.0.1",
     "@apify/validations": "^1.1.0",
-    "@crawlee/core": "^4.0.0-rc.0",
-    "@crawlee/types": "^4.0.0-rc.0",
-    "@crawlee/utils": "^4.0.0-rc.0",
-    "apify-client": "^2.25.0",
+    "@crawlee/core": ">=4.0.0-beta.194 <4.0.0-rc.0 || >4.0.0-rc.0 <5.0.0",
+    "@crawlee/types": ">=4.0.0-beta.194 <4.0.0-rc.0 || >4.0.0-rc.0 <5.0.0",
+    "@crawlee/utils": ">=4.0.0-beta.194 <4.0.0-rc.0 || >4.0.0-rc.0 <5.0.0",
+    "apify-client": "^3.0.0-beta.26",
     "minimatch": "^10.2.6",
     "semver": "^7.8.5",
     "tslib": "^2.8.1",
@@ -81,7 +81,7 @@
     "@types/tough-cookie": "^4.0.5",
     "@types/ws": "^8.18.1",
     "commitlint": "^21.2.2",
-    "crawlee": "^4.0.0-rc.0",
+    "crawlee": ">=4.0.0-beta.194 <4.0.0-rc.0 || >4.0.0-rc.0 <5.0.0",
     "husky": "^9.1.7",
     "lint-staged": "^17.3.0",
     "oxfmt": "0.64.0",