apify 3.7.3-beta.9 → 4.0.0-beta.13

package/dist/configuration.d.ts

@@ -1,37 +1,62 @@
-import type { ConfigurationOptions as CoreConfigurationOptions } from '@crawlee/core';
+import type { ConfigField, FieldsInput, FieldsOutput } from '@crawlee/core';
 import { Configuration as CoreConfiguration } from '@crawlee/core';
-import type { META_ORIGINS } from '@apify/consts';
-export interface ConfigurationOptions extends CoreConfigurationOptions {
-    metamorphAfterSleepMillis?: number;
-    actorEventsWsUrl?: string;
-    token?: string;
-    actorId?: string;
-    actorRunId?: string;
-    actorTaskId?: string;
-    apiBaseUrl?: string;
-    apiPublicBaseUrl?: string;
-    containerPort?: number;
-    containerUrl?: string;
-    proxyHostname?: string;
-    proxyPassword?: string;
-    proxyPort?: number;
-    proxyStatusUrl?: string;
-    /**
-     * @deprecated use `containerPort` instead
-     */
-    standbyPort?: number;
-    standbyUrl?: string;
-    isAtHome?: boolean;
-    userId?: string;
-    inputSecretsPrivateKeyPassphrase?: string;
-    inputSecretsPrivateKeyFile?: string;
-    maxTotalChargeUsd?: number;
-    metaOrigin?: (typeof META_ORIGINS)[keyof typeof META_ORIGINS];
-    testPayPerEvent?: boolean;
-    useChargingLogDataset?: boolean;
-    actorPricingInfo?: string;
-    chargedEventCounts?: string;
-    actorStoragesJson?: string;
+import { z } from 'zod';
+export declare const apifyConfigFields: {
+    defaultDatasetId: ConfigField<z.ZodDefault<z.ZodString>>;
+    defaultKeyValueStoreId: ConfigField<z.ZodDefault<z.ZodString>>;
+    defaultRequestQueueId: ConfigField<z.ZodDefault<z.ZodString>>;
+    inputKey: ConfigField<z.ZodDefault<z.ZodString>>;
+    memoryMbytes: ConfigField<z.ZodOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>>>;
+    availableMemoryRatio: ConfigField<any>;
+    disableBrowserSandbox: ConfigField<any>;
+    persistStateIntervalMillis: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>>>;
+    headless: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodBoolean>>>;
+    xvfb: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodBoolean>>>;
+    chromeExecutablePath: ConfigField<z.ZodOptional<z.ZodString>>;
+    defaultBrowserPath: ConfigField<z.ZodOptional<z.ZodString>>;
+    purgeOnStart: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodBoolean>>>;
+    metamorphAfterSleepMillis: ConfigField<any>;
+    actorEventsWsUrl: ConfigField<z.ZodOptional<z.ZodString>>;
+    token: ConfigField<z.ZodOptional<z.ZodString>>;
+    actorId: ConfigField<z.ZodOptional<z.ZodString>>;
+    actorRunId: ConfigField<z.ZodOptional<z.ZodString>>;
+    actorTaskId: ConfigField<z.ZodOptional<z.ZodString>>;
+    apiBaseUrl: ConfigField<z.ZodDefault<z.ZodString>>;
+    apiPublicBaseUrl: ConfigField<z.ZodDefault<z.ZodString>>;
+    containerPort: ConfigField<any>;
+    containerUrl: ConfigField<z.ZodDefault<z.ZodString>>;
+    proxyHostname: ConfigField<z.ZodDefault<z.ZodString>>;
+    proxyPassword: ConfigField<z.ZodOptional<z.ZodString>>;
+    proxyPort: ConfigField<any>;
+    proxyStatusUrl: ConfigField<z.ZodDefault<z.ZodString>>;
+    /** @deprecated use `containerPort` instead */
+    standbyPort: ConfigField<any>;
+    standbyUrl: ConfigField<z.ZodOptional<z.ZodString>>;
+    isAtHome: ConfigField<any>;
+    userId: ConfigField<z.ZodOptional<z.ZodString>>;
+    userIsPaying: ConfigField<z.ZodOptional<z.ZodString>>;
+    actorPermissionLevel: ConfigField<z.ZodOptional<z.ZodString>>;
+    inputSecretsPrivateKeyPassphrase: ConfigField<z.ZodOptional<z.ZodString>>;
+    inputSecretsPrivateKeyFile: ConfigField<z.ZodOptional<z.ZodString>>;
+    maxTotalChargeUsd: ConfigField<any>;
+    metaOrigin: ConfigField<z.ZodOptional<z.ZodString>>;
+    testPayPerEvent: ConfigField<any>;
+    useChargingLogDataset: ConfigField<any>;
+    actorPricingInfo: ConfigField<z.ZodOptional<z.ZodString>>;
+    chargedEventCounts: ConfigField<z.ZodOptional<z.ZodString>>;
+    actorStoragesJson: ConfigField<z.ZodOptional<z.ZodString>>;
+    storageClientOptions: ConfigField<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;
+    maxUsedCpuRatio: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>>>;
+    systemInfoIntervalMillis: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodNumber>>>;
+    logLevel: ConfigField<z.ZodOptional<z.ZodPipe<z.ZodTransform<{} | null | undefined, unknown>, z.ZodEnum<typeof import("@apify/log").LogLevel>>>>;
+    persistStorage: ConfigField<z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodBoolean>>>;
+    containerized: ConfigField<z.ZodOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodBoolean>>>;
+};
+export type ApifyConfigurationInput = FieldsInput<typeof apifyConfigFields>;
+export type ApifyResolvedConfigValues = FieldsOutput<typeof apifyConfigFields>;
+/** @deprecated Use {@link ApifyConfigurationInput} instead. */
+export type ConfigurationOptions = ApifyConfigurationInput;
+export interface Configuration extends ApifyResolvedConfigValues {
 }
 /**
  * `Configuration` is a value object holding the SDK configuration. We can use it in two ways:
@@ -40,38 +65,34 @@ export interface ConfigurationOptions extends CoreConfigurationOptions {
  *
  *    ```javascript
  *    import { Actor } from 'apify';
- *    import { BasicCrawler } from 'crawlee';
  *
  *    const sdk = new Actor({ token: '123' });
- *    console.log(sdk.config.get('token')); // '123'
- *
- *    const crawler = new BasicCrawler({
- *        // ... crawler options
- *    }, sdk.config);
+ *    console.log(sdk.config.token); // '123'
  *    ```
  *
  * 2. To get the global configuration (singleton instance). It will respect the environment variables.
  *
  *    ```javascript
- *    import { BasicCrawler, Configuration } from 'crawlee';
+ *    import { Configuration } from 'apify';
  *
- *    // Get the global configuration
  *    const config = Configuration.getGlobalConfig();
- *    // Set the 'persistStateIntervalMillis' option
- *    // of global configuration to 30 seconds
- *    config.set('persistStateIntervalMillis', 30_000);
- *
- *    // No need to pass the configuration to the crawler,
- *    // as it's using the global configuration by default
- *    const crawler = new BasicCrawler();
+ *    console.log(config.headless);
+ *    console.log(config.persistStateIntervalMillis);
  *    ```
  *
+ * Configuration is immutable — values are set via the constructor and cannot be changed afterwards.
+ * The priority order for resolving values is (highest to lowest):
+ *
+ * ```text
+ * constructor options > environment variables > crawlee.json > schema defaults
+ * ```
+ *
  * ## Supported Configuration Options
  *
  * Key | Environment Variable | Default Value
  * ---|---|---
  * `memoryMbytes` | `ACTOR_MEMORY_MBYTES` | -
- * `headless` | `APIFY_HEADLESS` | -
+ * `headless` | `APIFY_HEADLESS` | `true`
  * `persistStateIntervalMillis` | `APIFY_PERSIST_STATE_INTERVAL_MILLIS` | `60e3`
  * `token` | `APIFY_TOKEN` | -
  * `isAtHome` | `APIFY_IS_AT_HOME` | -
@@ -85,7 +106,6 @@ export interface ConfigurationOptions extends CoreConfigurationOptions {
  * ---|---|---
  * `actorEventsWsUrl` | `ACTOR_EVENTS_WEBSOCKET_URL` | -
  * `actorId` | `ACTOR_ID` | -
- * `actorPermissionLevel` | `ACTOR_PERMISSION_LEVEL` | -
  * `actorRunId` | `ACTOR_RUN_ID` | -
  * `actorTaskId` | `ACTOR_TASK_ID` | -
  * `apiBaseUrl` | `APIFY_API_BASE_URL` | `'https://api.apify.com'`
@@ -99,7 +119,6 @@ export interface ConfigurationOptions extends CoreConfigurationOptions {
  * `proxyPort` | `APIFY_PROXY_PORT` | `8000`
  * `proxyStatusUrl` | `APIFY_PROXY_STATUS_URL` | `'http://proxy.apify.com'`
  * `userId` | `APIFY_USER_ID` | -
- * `userIsPaying` | `APIFY_USER_IS_PAYING` | -
  * `xvfb` | `APIFY_XVFB` | -
  * `standbyPort` | `ACTOR_STANDBY_PORT` | `4321`
  * `standbyUrl` | `ACTOR_STANDBY_URL` | -
@@ -107,99 +126,18 @@ export interface ConfigurationOptions extends CoreConfigurationOptions {
  * `defaultBrowserPath` | `APIFY_DEFAULT_BROWSER_PATH` | -
  */
 export declare class Configuration extends CoreConfiguration {
-    /** @inheritDoc */
+    /** @internal */
     static globalConfig?: Configuration;
-    protected static ENV_MAP: {
-        APIFY_AVAILABLE_MEMORY_RATIO: string;
-        APIFY_PURGE_ON_START: string;
-        APIFY_MEMORY_MBYTES: string;
-        APIFY_DEFAULT_DATASET_ID: string;
-        APIFY_DEFAULT_KEY_VALUE_STORE_ID: string;
-        APIFY_DEFAULT_REQUEST_QUEUE_ID: string;
-        APIFY_INPUT_KEY: string;
-        APIFY_PERSIST_STATE_INTERVAL_MILLIS: string;
-        APIFY_HEADLESS: string;
-        APIFY_XVFB: string;
-        APIFY_CHROME_EXECUTABLE_PATH: string;
-        APIFY_DEFAULT_BROWSER_PATH: string;
-        APIFY_DISABLE_BROWSER_SANDBOX: string;
-        APIFY_TOKEN: string;
-        APIFY_METAMORPH_AFTER_SLEEP_MILLIS: string;
-        APIFY_TEST_PERSIST_INTERVAL_MILLIS: string;
-        APIFY_ACTOR_EVENTS_WS_URL: string;
-        APIFY_ACTOR_ID: string;
-        APIFY_API_BASE_URL: string;
-        APIFY_API_PUBLIC_BASE_URL: string;
-        APIFY_IS_AT_HOME: string;
-        APIFY_ACTOR_RUN_ID: string;
-        APIFY_ACTOR_TASK_ID: string;
-        APIFY_CONTAINER_PORT: string;
-        APIFY_CONTAINER_URL: string;
-        APIFY_USER_ID: string;
-        APIFY_USER_IS_PAYING: string;
-        APIFY_PROXY_HOSTNAME: string;
-        APIFY_PROXY_PASSWORD: string;
-        APIFY_PROXY_STATUS_URL: string;
-        APIFY_PROXY_PORT: string;
-        APIFY_INPUT_SECRETS_PRIVATE_KEY_FILE: string;
-        APIFY_INPUT_SECRETS_PRIVATE_KEY_PASSPHRASE: string;
-        APIFY_META_ORIGIN: string;
-        ACTOR_DEFAULT_DATASET_ID: string;
-        ACTOR_DEFAULT_KEY_VALUE_STORE_ID: string;
-        ACTOR_DEFAULT_REQUEST_QUEUE_ID: string;
-        ACTOR_EVENTS_WEBSOCKET_URL: string;
-        ACTOR_ID: string;
-        ACTOR_INPUT_KEY: string;
-        ACTOR_MEMORY_MBYTES: string;
-        ACTOR_PERMISSION_LEVEL: string;
-        ACTOR_RUN_ID: string;
-        ACTOR_STANDBY_PORT: string;
-        ACTOR_STANDBY_URL: string;
-        ACTOR_TASK_ID: string;
-        ACTOR_WEB_SERVER_PORT: string;
-        ACTOR_WEB_SERVER_URL: string;
-        ACTOR_MAX_TOTAL_CHARGE_USD: string;
-        ACTOR_TEST_PAY_PER_EVENT: string;
-        ACTOR_USE_CHARGING_LOG_DATASET: string;
-        APIFY_ACTOR_PRICING_INFO: string;
-        APIFY_CHARGED_ACTOR_EVENT_COUNTS: string;
-        ACTOR_STORAGES_JSON: string;
-    };
-    protected static INTEGER_VARS: string[];
-    protected static BOOLEAN_VARS: string[];
-    protected static DEFAULTS: {
-        defaultKeyValueStoreId: string;
-        defaultDatasetId: string;
-        defaultRequestQueueId: string;
-        inputKey: string;
-        apiBaseUrl: string;
-        apiPublicBaseUrl: string;
-        proxyStatusUrl: string;
-        proxyHostname: string;
-        proxyPort: number;
-        containerPort: number;
-        containerUrl: string;
-        standbyPort: number;
-        metamorphAfterSleepMillis: number;
-        persistStateIntervalMillis: number;
-        testPayPerEvent: boolean;
-        useChargingLogDataset: boolean;
-    };
-    /**
-     * @inheritDoc
-     */
-    get<T extends keyof ConfigurationOptions, U extends ConfigurationOptions[T]>(key: T, defaultValue?: U): U;
-    /**
-     * @inheritDoc
-     */
-    set(key: keyof ConfigurationOptions, value?: any): void;
+    protected static fields: Record<string, ConfigField>;
+    constructor(options?: ApifyConfigurationInput);
     /**
      * @inheritDoc
+     *
+     * Returns the SDK's global {@link Configuration} singleton (an
+     * Apify-typed default that parses `APIFY_*` env vars). During an Actor run
+     * the active configuration is held by crawlee's `serviceLocator`, which is
+     * what crawlee internals resolve against; this singleton is only the
+     * fallback for code reaching for a configuration without an explicit one.
      */
     static getGlobalConfig(): Configuration;
-    /**
-     * Resets global configuration instance. The default instance holds configuration based on env vars,
-     * if we want to change them, we need to first reset the global state. Used mainly for testing purposes.
-     */
-    static resetGlobalState(): void;
 }

package/dist/configuration.js

@@ -1,8 +1,91 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Configuration = void 0;
-const core_1 = require("@crawlee/core");
-const consts_1 = require("@apify/consts");
+/* eslint-disable no-use-before-define */
+import { coerceBoolean, coerceNumber, Configuration as CoreConfiguration, crawleeConfigFields, field, } from '@crawlee/core';
+import { z } from 'zod';
+import { ACTOR_ENV_VARS, APIFY_ENV_VARS, LOCAL_ACTOR_ENV_VARS, LOCAL_APIFY_ENV_VARS } from '@apify/consts';
+// Evaluated lazily (per Configuration construction, not at import) so the
+// at-home defaults for `availableMemoryRatio` / `disableBrowserSandbox` below
+// react to `APIFY_IS_AT_HOME` even if it changes after import (tests, embedding).
+// Reads the env var, not the resolved `isAtHome` field, so an explicit
+// `new Configuration({ isAtHome: true })` won't flip these — env is the source.
+const isAtHome = () => !!process.env[APIFY_ENV_VARS.IS_AT_HOME];
+function withApifyEnv(base, apifyEnvVars, schema) {
+    const crawleeVars = base.envVar == null ? [] : [base.envVar].flat();
+    return field((schema ?? base.schema), [...[apifyEnvVars].flat(), ...crawleeVars]);
+}
+// --- Apify config field definitions ---
+export const apifyConfigFields = {
+    // Inherit all crawlee fields as-is.
+    ...crawleeConfigFields,
+    // Crawlee fields the SDK extends with ACTOR_/APIFY_ env-var aliases (which
+    // take precedence; crawlee's own CRAWLEE_* var is reused as the fallback,
+    // never re-typed). A schema is passed only where the SDK needs a different
+    // default than crawlee's.
+    defaultDatasetId: withApifyEnv(crawleeConfigFields.defaultDatasetId, [ACTOR_ENV_VARS.DEFAULT_DATASET_ID, APIFY_ENV_VARS.DEFAULT_DATASET_ID], z.string().default(LOCAL_ACTOR_ENV_VARS[ACTOR_ENV_VARS.DEFAULT_DATASET_ID])),
+    defaultKeyValueStoreId: withApifyEnv(crawleeConfigFields.defaultKeyValueStoreId, [ACTOR_ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID, APIFY_ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID], z.string().default(LOCAL_ACTOR_ENV_VARS[ACTOR_ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID])),
+    defaultRequestQueueId: withApifyEnv(crawleeConfigFields.defaultRequestQueueId, [ACTOR_ENV_VARS.DEFAULT_REQUEST_QUEUE_ID, APIFY_ENV_VARS.DEFAULT_REQUEST_QUEUE_ID], z.string().default(LOCAL_ACTOR_ENV_VARS[ACTOR_ENV_VARS.DEFAULT_REQUEST_QUEUE_ID])),
+    inputKey: withApifyEnv(crawleeConfigFields.inputKey, [ACTOR_ENV_VARS.INPUT_KEY, APIFY_ENV_VARS.INPUT_KEY]),
+    memoryMbytes: withApifyEnv(crawleeConfigFields.memoryMbytes, [
+        ACTOR_ENV_VARS.MEMORY_MBYTES,
+        APIFY_ENV_VARS.MEMORY_MBYTES,
+    ]),
+    availableMemoryRatio: withApifyEnv(crawleeConfigFields.availableMemoryRatio, 'APIFY_AVAILABLE_MEMORY_RATIO', coerceNumber.default(() => (isAtHome() ? 1 : 0.25))),
+    disableBrowserSandbox: withApifyEnv(crawleeConfigFields.disableBrowserSandbox, 'APIFY_DISABLE_BROWSER_SANDBOX', coerceBoolean.optional().default(() => (isAtHome() ? true : undefined))),
+    persistStateIntervalMillis: withApifyEnv(crawleeConfigFields.persistStateIntervalMillis, [
+        APIFY_ENV_VARS.PERSIST_STATE_INTERVAL_MILLIS,
+        'APIFY_TEST_PERSIST_INTERVAL_MILLIS',
+    ]),
+    headless: withApifyEnv(crawleeConfigFields.headless, APIFY_ENV_VARS.HEADLESS),
+    xvfb: withApifyEnv(crawleeConfigFields.xvfb, APIFY_ENV_VARS.XVFB),
+    chromeExecutablePath: withApifyEnv(crawleeConfigFields.chromeExecutablePath, APIFY_ENV_VARS.CHROME_EXECUTABLE_PATH),
+    defaultBrowserPath: withApifyEnv(crawleeConfigFields.defaultBrowserPath, 'APIFY_DEFAULT_BROWSER_PATH'),
+    purgeOnStart: withApifyEnv(crawleeConfigFields.purgeOnStart, APIFY_ENV_VARS.PURGE_ON_START),
+    // Apify-specific fields
+    metamorphAfterSleepMillis: field(coerceNumber.default(300_000), APIFY_ENV_VARS.METAMORPH_AFTER_SLEEP_MILLIS),
+    actorEventsWsUrl: field(z.string().optional(), [
+        ACTOR_ENV_VARS.EVENTS_WEBSOCKET_URL,
+        APIFY_ENV_VARS.ACTOR_EVENTS_WS_URL,
+    ]),
+    token: field(z.string().optional(), APIFY_ENV_VARS.TOKEN),
+    actorId: field(z.string().optional(), [ACTOR_ENV_VARS.ID, APIFY_ENV_VARS.ACTOR_ID]),
+    actorRunId: field(z.string().optional(), [ACTOR_ENV_VARS.RUN_ID, APIFY_ENV_VARS.ACTOR_RUN_ID]),
+    actorTaskId: field(z.string().optional(), [ACTOR_ENV_VARS.TASK_ID, APIFY_ENV_VARS.ACTOR_TASK_ID]),
+    apiBaseUrl: field(z.string().default('https://api.apify.com'), APIFY_ENV_VARS.API_BASE_URL),
+    apiPublicBaseUrl: field(z.string().default('https://api.apify.com'), APIFY_ENV_VARS.API_PUBLIC_BASE_URL),
+    containerPort: field(coerceNumber.default(+LOCAL_ACTOR_ENV_VARS[ACTOR_ENV_VARS.WEB_SERVER_PORT]), [
+        ACTOR_ENV_VARS.WEB_SERVER_PORT,
+        APIFY_ENV_VARS.CONTAINER_PORT,
+    ]),
+    containerUrl: field(z.string().default(LOCAL_ACTOR_ENV_VARS[ACTOR_ENV_VARS.WEB_SERVER_URL]), [
+        ACTOR_ENV_VARS.WEB_SERVER_URL,
+        APIFY_ENV_VARS.CONTAINER_URL,
+    ]),
+    proxyHostname: field(z.string().default(LOCAL_APIFY_ENV_VARS[APIFY_ENV_VARS.PROXY_HOSTNAME]), APIFY_ENV_VARS.PROXY_HOSTNAME),
+    proxyPassword: field(z.string().optional(), APIFY_ENV_VARS.PROXY_PASSWORD),
+    proxyPort: field(coerceNumber.default(+LOCAL_APIFY_ENV_VARS[APIFY_ENV_VARS.PROXY_PORT]), APIFY_ENV_VARS.PROXY_PORT),
+    proxyStatusUrl: field(z.string().default('http://proxy.apify.com'), APIFY_ENV_VARS.PROXY_STATUS_URL),
+    /** @deprecated use `containerPort` instead */
+    standbyPort: field(coerceNumber.default(+LOCAL_ACTOR_ENV_VARS[ACTOR_ENV_VARS.STANDBY_PORT]), ACTOR_ENV_VARS.STANDBY_PORT),
+    standbyUrl: field(z.string().optional(), ACTOR_ENV_VARS.STANDBY_URL),
+    isAtHome: field(coerceBoolean.default(false), APIFY_ENV_VARS.IS_AT_HOME),
+    userId: field(z.string().optional(), APIFY_ENV_VARS.USER_ID),
+    userIsPaying: field(z.string().optional(), APIFY_ENV_VARS.USER_IS_PAYING),
+    actorPermissionLevel: field(z.string().optional(), ACTOR_ENV_VARS.PERMISSION_LEVEL),
+    inputSecretsPrivateKeyPassphrase: field(z.string().optional(), APIFY_ENV_VARS.INPUT_SECRETS_PRIVATE_KEY_PASSPHRASE),
+    inputSecretsPrivateKeyFile: field(z.string().optional(), APIFY_ENV_VARS.INPUT_SECRETS_PRIVATE_KEY_FILE),
+    // `0` is treated as "no limit" (mirrors the Apify platform contract).
+    maxTotalChargeUsd: field(coerceNumber.transform((val) => (val === 0 ? Infinity : val)).default(Infinity), ACTOR_ENV_VARS.MAX_TOTAL_CHARGE_USD),
+    metaOrigin: field(z.string().optional(), APIFY_ENV_VARS.META_ORIGIN),
+    testPayPerEvent: field(coerceBoolean.default(false), 'ACTOR_TEST_PAY_PER_EVENT'),
+    useChargingLogDataset: field(coerceBoolean.default(false), 'ACTOR_USE_CHARGING_LOG_DATASET'),
+    // Pay-per-event charging metadata injected by the platform (JSON strings).
+    actorPricingInfo: field(z.string().optional(), 'APIFY_ACTOR_PRICING_INFO'),
+    chargedEventCounts: field(z.string().optional(), 'APIFY_CHARGED_ACTOR_EVENT_COUNTS'),
+    actorStoragesJson: field(z.string().optional(), 'ACTOR_STORAGES_JSON'),
+    // Grab-bag of ApifyClient constructor options; the `storageDir` key is
+    // pulled out separately for local storage emulation, the rest is spread
+    // into `new ApifyClient({...})` in `Actor.newClient()`. No env var alias.
+    storageClientOptions: field(z.record(z.string(), z.unknown()).optional()),
+};
 /**
  * `Configuration` is a value object holding the SDK configuration. We can use it in two ways:
  *
@@ -10,38 +93,34 @@ const consts_1 = require("@apify/consts");
  *
  *    ```javascript
  *    import { Actor } from 'apify';
- *    import { BasicCrawler } from 'crawlee';
  *
  *    const sdk = new Actor({ token: '123' });
- *    console.log(sdk.config.get('token')); // '123'
- *
- *    const crawler = new BasicCrawler({
- *        // ... crawler options
- *    }, sdk.config);
+ *    console.log(sdk.config.token); // '123'
  *    ```
  *
  * 2. To get the global configuration (singleton instance). It will respect the environment variables.
  *
  *    ```javascript
- *    import { BasicCrawler, Configuration } from 'crawlee';
+ *    import { Configuration } from 'apify';
  *
- *    // Get the global configuration
  *    const config = Configuration.getGlobalConfig();
- *    // Set the 'persistStateIntervalMillis' option
- *    // of global configuration to 30 seconds
- *    config.set('persistStateIntervalMillis', 30_000);
- *
- *    // No need to pass the configuration to the crawler,
- *    // as it's using the global configuration by default
- *    const crawler = new BasicCrawler();
+ *    console.log(config.headless);
+ *    console.log(config.persistStateIntervalMillis);
  *    ```
  *
+ * Configuration is immutable — values are set via the constructor and cannot be changed afterwards.
+ * The priority order for resolving values is (highest to lowest):
+ *
+ * ```text
+ * constructor options > environment variables > crawlee.json > schema defaults
+ * ```
+ *
  * ## Supported Configuration Options
  *
  * Key | Environment Variable | Default Value
  * ---|---|---
  * `memoryMbytes` | `ACTOR_MEMORY_MBYTES` | -
- * `headless` | `APIFY_HEADLESS` | -
+ * `headless` | `APIFY_HEADLESS` | `true`
  * `persistStateIntervalMillis` | `APIFY_PERSIST_STATE_INTERVAL_MILLIS` | `60e3`
  * `token` | `APIFY_TOKEN` | -
  * `isAtHome` | `APIFY_IS_AT_HOME` | -
@@ -55,7 +134,6 @@ const consts_1 = require("@apify/consts");
  * ---|---|---
  * `actorEventsWsUrl` | `ACTOR_EVENTS_WEBSOCKET_URL` | -
  * `actorId` | `ACTOR_ID` | -
- * `actorPermissionLevel` | `ACTOR_PERMISSION_LEVEL` | -
  * `actorRunId` | `ACTOR_RUN_ID` | -
  * `actorTaskId` | `ACTOR_TASK_ID` | -
  * `apiBaseUrl` | `APIFY_API_BASE_URL` | `'https://api.apify.com'`
@@ -69,166 +147,34 @@ const consts_1 = require("@apify/consts");
  * `proxyPort` | `APIFY_PROXY_PORT` | `8000`
  * `proxyStatusUrl` | `APIFY_PROXY_STATUS_URL` | `'http://proxy.apify.com'`
  * `userId` | `APIFY_USER_ID` | -
- * `userIsPaying` | `APIFY_USER_IS_PAYING` | -
  * `xvfb` | `APIFY_XVFB` | -
  * `standbyPort` | `ACTOR_STANDBY_PORT` | `4321`
  * `standbyUrl` | `ACTOR_STANDBY_URL` | -
  * `chromeExecutablePath` | `APIFY_CHROME_EXECUTABLE_PATH` | -
  * `defaultBrowserPath` | `APIFY_DEFAULT_BROWSER_PATH` | -
  */
-class Configuration extends core_1.Configuration {
-    /**
-     * @inheritDoc
-     */
-    get(key, defaultValue) {
-        return super.get(key, defaultValue);
-    }
-    /**
-     * @inheritDoc
-     */
-    set(key, value) {
-        super.set(key, value);
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
+export class Configuration extends CoreConfiguration {
+    /** @internal */
+    static globalConfig;
+    static fields = apifyConfigFields;
+    constructor(options = {}) {
+        // `super` types its options against crawlee's field set; ours is a
+        // superset (apifyConfigFields spreads crawleeConfigFields), so the
+        // shapes are runtime-compatible but not TS-assignable — hence the cast.
+        super(options);
     }
     /**
      * @inheritDoc
+     *
+     * Returns the SDK's global {@link Configuration} singleton (an
+     * Apify-typed default that parses `APIFY_*` env vars). During an Actor run
+     * the active configuration is held by crawlee's `serviceLocator`, which is
+     * what crawlee internals resolve against; this singleton is only the
+     * fallback for code reaching for a configuration without an explicit one.
      */
     static getGlobalConfig() {
-        if (Configuration.storage.getStore()) {
-            return Configuration.storage.getStore();
-        }
-        Configuration.globalConfig ?? (Configuration.globalConfig = new Configuration());
+        Configuration.globalConfig ??= new Configuration();
         return Configuration.globalConfig;
     }
-    /**
-     * Resets global configuration instance. The default instance holds configuration based on env vars,
-     * if we want to change them, we need to first reset the global state. Used mainly for testing purposes.
-     */
-    static resetGlobalState() {
-        delete this.globalConfig;
-    }
 }
-exports.Configuration = Configuration;
-// maps environment variables to config keys (e.g. `APIFY_MEMORY_MBYTES` to `memoryMbytes`)
-Object.defineProperty(Configuration, "ENV_MAP", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: {
-        // regular crawlee env vars are also supported
-        ...core_1.Configuration.ENV_MAP,
-        // support crawlee env vars prefixed with `APIFY_` too
-        APIFY_AVAILABLE_MEMORY_RATIO: 'availableMemoryRatio',
-        APIFY_PURGE_ON_START: 'purgeOnStart',
-        APIFY_MEMORY_MBYTES: 'memoryMbytes',
-        APIFY_DEFAULT_DATASET_ID: 'defaultDatasetId',
-        APIFY_DEFAULT_KEY_VALUE_STORE_ID: 'defaultKeyValueStoreId',
-        APIFY_DEFAULT_REQUEST_QUEUE_ID: 'defaultRequestQueueId',
-        APIFY_INPUT_KEY: 'inputKey',
-        APIFY_PERSIST_STATE_INTERVAL_MILLIS: 'persistStateIntervalMillis',
-        APIFY_HEADLESS: 'headless',
-        APIFY_XVFB: 'xvfb',
-        APIFY_CHROME_EXECUTABLE_PATH: 'chromeExecutablePath',
-        APIFY_DEFAULT_BROWSER_PATH: 'defaultBrowserPath',
-        APIFY_DISABLE_BROWSER_SANDBOX: 'disableBrowserSandbox',
-        // as well as apify specific ones
-        APIFY_TOKEN: 'token',
-        APIFY_METAMORPH_AFTER_SLEEP_MILLIS: 'metamorphAfterSleepMillis',
-        APIFY_TEST_PERSIST_INTERVAL_MILLIS: 'persistStateIntervalMillis', // for BC, seems to be unused
-        APIFY_ACTOR_EVENTS_WS_URL: 'actorEventsWsUrl',
-        APIFY_ACTOR_ID: 'actorId',
-        APIFY_API_BASE_URL: 'apiBaseUrl',
-        APIFY_API_PUBLIC_BASE_URL: 'apiPublicBaseUrl',
-        APIFY_IS_AT_HOME: 'isAtHome',
-        APIFY_ACTOR_RUN_ID: 'actorRunId',
-        APIFY_ACTOR_TASK_ID: 'actorTaskId',
-        APIFY_CONTAINER_PORT: 'containerPort',
-        APIFY_CONTAINER_URL: 'containerUrl',
-        APIFY_USER_ID: 'userId',
-        APIFY_USER_IS_PAYING: 'userIsPaying',
-        APIFY_PROXY_HOSTNAME: 'proxyHostname',
-        APIFY_PROXY_PASSWORD: 'proxyPassword',
-        APIFY_PROXY_STATUS_URL: 'proxyStatusUrl',
-        APIFY_PROXY_PORT: 'proxyPort',
-        APIFY_INPUT_SECRETS_PRIVATE_KEY_FILE: 'inputSecretsPrivateKeyFile',
-        APIFY_INPUT_SECRETS_PRIVATE_KEY_PASSPHRASE: 'inputSecretsPrivateKeyPassphrase',
-        APIFY_META_ORIGIN: 'metaOrigin',
-        // Actor env vars
-        ACTOR_DEFAULT_DATASET_ID: 'defaultDatasetId',
-        ACTOR_DEFAULT_KEY_VALUE_STORE_ID: 'defaultKeyValueStoreId',
-        ACTOR_DEFAULT_REQUEST_QUEUE_ID: 'defaultRequestQueueId',
-        ACTOR_EVENTS_WEBSOCKET_URL: 'actorEventsWsUrl',
-        ACTOR_ID: 'actorId',
-        ACTOR_INPUT_KEY: 'inputKey',
-        ACTOR_MEMORY_MBYTES: 'memoryMbytes',
-        ACTOR_PERMISSION_LEVEL: 'actorPermissionLevel',
-        ACTOR_RUN_ID: 'actorRunId',
-        ACTOR_STANDBY_PORT: 'standbyPort',
-        ACTOR_STANDBY_URL: 'standbyUrl',
-        ACTOR_TASK_ID: 'actorTaskId',
-        ACTOR_WEB_SERVER_PORT: 'containerPort',
-        ACTOR_WEB_SERVER_URL: 'containerUrl',
-        ACTOR_MAX_TOTAL_CHARGE_USD: 'maxTotalChargeUsd',
-        ACTOR_TEST_PAY_PER_EVENT: 'testPayPerEvent',
-        ACTOR_USE_CHARGING_LOG_DATASET: 'useChargingLogDataset',
-        APIFY_ACTOR_PRICING_INFO: 'actorPricingInfo',
-        APIFY_CHARGED_ACTOR_EVENT_COUNTS: 'chargedEventCounts',
-        ACTOR_STORAGES_JSON: 'actorStoragesJson',
-    }
-});
-Object.defineProperty(Configuration, "INTEGER_VARS", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: [
-        ...core_1.Configuration.INTEGER_VARS,
-        'proxyPort',
-        'containerPort',
-        'metamorphAfterSleepMillis',
-        'maxTotalChargeUsd',
-    ]
-});
-Object.defineProperty(Configuration, "BOOLEAN_VARS", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: [
-        ...core_1.Configuration.BOOLEAN_VARS,
-        'isAtHome',
-        'testPayPerEvent',
-        'useChargingLogDataset',
-    ]
-});
-Object.defineProperty(Configuration, "DEFAULTS", {
-    enumerable: true,
-    configurable: true,
-    writable: true,
-    value: {
-        ...core_1.Configuration.DEFAULTS,
-        defaultKeyValueStoreId: consts_1.LOCAL_ACTOR_ENV_VARS[consts_1.ACTOR_ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID],
-        defaultDatasetId: consts_1.LOCAL_ACTOR_ENV_VARS[consts_1.ACTOR_ENV_VARS.DEFAULT_DATASET_ID],
-        defaultRequestQueueId: consts_1.LOCAL_ACTOR_ENV_VARS[consts_1.ACTOR_ENV_VARS.DEFAULT_REQUEST_QUEUE_ID],
-        inputKey: 'INPUT',
-        apiBaseUrl: 'https://api.apify.com',
-        apiPublicBaseUrl: 'https://api.apify.com',
-        proxyStatusUrl: 'http://proxy.apify.com',
-        proxyHostname: consts_1.LOCAL_APIFY_ENV_VARS[consts_1.APIFY_ENV_VARS.PROXY_HOSTNAME],
-        proxyPort: +consts_1.LOCAL_APIFY_ENV_VARS[consts_1.APIFY_ENV_VARS.PROXY_PORT],
-        containerPort: +consts_1.LOCAL_ACTOR_ENV_VARS[consts_1.ACTOR_ENV_VARS.WEB_SERVER_PORT],
-        containerUrl: consts_1.LOCAL_ACTOR_ENV_VARS[consts_1.ACTOR_ENV_VARS.WEB_SERVER_URL],
-        standbyPort: +consts_1.LOCAL_ACTOR_ENV_VARS[consts_1.ACTOR_ENV_VARS.STANDBY_PORT],
-        metamorphAfterSleepMillis: 300e3,
-        persistStateIntervalMillis: 60e3, // This value is mentioned in jsdoc in `events.js`, if you update it here, update it there too.
-        testPayPerEvent: false,
-        useChargingLogDataset: false,
-    }
-});
-// monkey patch the core class so it respects the new options too
-core_1.Configuration.getGlobalConfig = Configuration.getGlobalConfig;
-// @ts-expect-error protected property
-core_1.Configuration.ENV_MAP = Configuration.ENV_MAP;
-// @ts-expect-error protected property
-core_1.Configuration.INTEGER_VARS = Configuration.INTEGER_VARS;
-// @ts-expect-error protected property
-core_1.Configuration.BOOLEAN_VARS = Configuration.BOOLEAN_VARS;
-// @ts-expect-error protected property
-core_1.Configuration.DEFAULTS = Configuration.DEFAULTS;

package/dist/index.js

@@ -1,22 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApifyClient = exports.LoggerText = exports.LoggerJson = exports.Logger = exports.LogLevel = exports.Log = exports.log = exports.RequestQueue = exports.Dataset = exports.ChargingManager = void 0;
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./actor.js"), exports);
-var charging_js_1 = require("./charging.js");
-Object.defineProperty(exports, "ChargingManager", { enumerable: true, get: function () { return charging_js_1.ChargingManager; } });
-tslib_1.__exportStar(require("./configuration.js"), exports);
-tslib_1.__exportStar(require("./proxy_configuration.js"), exports);
-tslib_1.__exportStar(require("./platform_event_manager.js"), exports);
-tslib_1.__exportStar(require("./key_value_store.js"), exports);
-var core_1 = require("@crawlee/core");
-Object.defineProperty(exports, "Dataset", { enumerable: true, get: function () { return core_1.Dataset; } });
-Object.defineProperty(exports, "RequestQueue", { enumerable: true, get: function () { return core_1.RequestQueue; } });
-Object.defineProperty(exports, "log", { enumerable: true, get: function () { return core_1.log; } });
-Object.defineProperty(exports, "Log", { enumerable: true, get: function () { return core_1.Log; } });
-Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return core_1.LogLevel; } });
-Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return core_1.Logger; } });
-Object.defineProperty(exports, "LoggerJson", { enumerable: true, get: function () { return core_1.LoggerJson; } });
-Object.defineProperty(exports, "LoggerText", { enumerable: true, get: function () { return core_1.LoggerText; } });
-var apify_client_1 = require("apify-client");
-Object.defineProperty(exports, "ApifyClient", { enumerable: true, get: function () { return apify_client_1.ApifyClient; } });
+export * from './actor.js';
+export { ChargingManager } from './charging.js';
+export * from './configuration.js';
+export * from './proxy_configuration.js';
+export * from './platform_event_manager.js';
+export * from './key_value_store.js';
+export { Dataset, RequestQueue, log, Log, LogLevel, Logger, LoggerJson, LoggerText, } from '@crawlee/core';
+export { ApifyClient } from 'apify-client';