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

package/dist/actor.js

@@ -1,31 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Actor = exports.EXIT_CODES = void 0;
-const tslib_1 = require("tslib");
-const node_crypto_1 = require("node:crypto");
-const core_1 = require("@crawlee/core");
-const utils_1 = require("@crawlee/utils");
-const ow_1 = tslib_1.__importDefault(require("ow"));
-const consts_1 = require("@apify/consts");
-const input_secrets_1 = require("@apify/input_secrets");
-const log_1 = tslib_1.__importDefault(require("@apify/log"));
-const timeout_1 = require("@apify/timeout");
-const charging_js_1 = require("./charging.js");
-const configuration_js_1 = require("./configuration.js");
-const input_schemas_js_1 = require("./input-schemas.js");
-const key_value_store_js_1 = require("./key_value_store.js");
-const patched_apify_client_js_1 = require("./patched_apify_client.js");
-const platform_event_manager_js_1 = require("./platform_event_manager.js");
-const proxy_configuration_js_1 = require("./proxy_configuration.js");
-const storage_js_1 = require("./storage.js");
-const utils_js_1 = require("./utils.js");
+import { createPrivateKey } from 'node:crypto';
+import { Dataset, purgeDefaultStorages, RequestQueue, serviceLocator } from '@crawlee/core';
+import { sleep, snakeCaseToCamelCase } from '@crawlee/utils';
+import { ApifyClient } from 'apify-client';
+import ow from 'ow';
+import { ACTOR_ENV_VARS, ACTOR_EVENT_NAMES, APIFY_ENV_VARS, INTEGER_ENV_VARS, } from '@apify/consts';
+import { decryptInputSecrets } from '@apify/input_secrets';
+import log from '@apify/log';
+import { addTimeoutToPromise } from '@apify/timeout';
+import { ApifyStorageClient, pushDataChargingContext, USES_PUSH_DATA_INTERCEPTION, } from './apify_storage_client.js';
+import { ChargingManager, pushDataAndCharge } from './charging.js';
+import { Configuration } from './configuration.js';
+import { getDefaultsFromInputSchema, noActorInputSchemaDefinedMarker, readInputSchema } from './input-schemas.js';
+import { KeyValueStore } from './key_value_store.js';
+import { PlatformEventManager } from './platform_event_manager.js';
+import { ProxyConfiguration } from './proxy_configuration.js';
+import { openStorage } from './storage.js';
+import { checkCrawleeVersion, getSystemInfo, printOutdatedSdkWarning } from './utils.js';
 /**
  * Exit codes for the Actor process.
  * The error codes must be in the range 1-128, to avoid collision with signal exits
  * and to ensure Docker will handle them correctly!
  * @internal should be removed if we decide to remove `Actor.main()`
  */
-exports.EXIT_CODES = {
+export const EXIT_CODES = {
     SUCCESS: 0,
     ERROR_USER_FUNCTION_THREW: 91,
     ERROR_UNKNOWN: 92,
@@ -35,106 +32,77 @@ exports.EXIT_CODES = {
  * that will be used on the instance methods. Environment variables will have precedence over this configuration.
  * See {@link Configuration} for details about what can be configured and what are the default values.
  */
-class Actor {
+export class Actor {
+    /** @internal */
+    static _instance;
+    /**
+     * Configuration of this SDK instance (provided to its constructor). See {@link Configuration} for details.
+     * @internal
+     */
+    config;
+    /**
+     * Default {@link ApifyClient} instance.
+     * @internal
+     */
+    apifyClient;
+    /**
+     * Default {@link EventManager} instance.
+     * @internal
+     */
+    eventManager;
+    /**
+     * Whether the Actor instance was initialized. This is set by calling {@link Actor.init}.
+     */
+    initialized = false;
+    /**
+     * Set if the Actor called a method that requires the instance to be initialized, but did not do so.
+     * A call to `init` after this warning is emitted is considered  an invalid state and will throw an error.
+     */
+    warnedAboutMissingInitCall = false;
+    /**
+     * Set if the Actor is currently rebooting.
+     */
+    isRebooting = false;
+    /**
+     * Set if the Actor is currently exiting. Prevents double-exit from graceful shutdown handlers.
+     */
+    isExiting = false;
+    /**
+     * References to graceful shutdown handlers so they can be removed during cleanup.
+     */
+    gracefulShutdownHandlers = {};
+    chargingManager;
+    /**
+     * Tracks which aliased storages have been purged during this session,
+     * so we only purge them once (on first open) when running locally.
+     * @internal
+     */
+    purgedStorageAliases = new Set();
     constructor(options = {}) {
-        /**
-         * Configuration of this SDK instance (provided to its constructor). See {@link Configuration} for details.
-         * @internal
-         */
-        Object.defineProperty(this, "config", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Default {@link ApifyClient} instance.
-         * @internal
-         */
-        Object.defineProperty(this, "apifyClient", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Default {@link EventManager} instance.
-         * @internal
-         */
-        Object.defineProperty(this, "eventManager", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Whether the Actor instance was initialized. This is set by calling {@link Actor.init}.
-         */
-        Object.defineProperty(this, "initialized", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        /**
-         * Set if the Actor called a method that requires the instance to be initialized, but did not do so.
-         * A call to `init` after this warning is emitted is considered  an invalid state and will throw an error.
-         */
-        Object.defineProperty(this, "warnedAboutMissingInitCall", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        /**
-         * Set if the Actor is currently rebooting.
-         */
-        Object.defineProperty(this, "isRebooting", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        /**
-         * Set if the Actor is currently exiting. Prevents double-exit from graceful shutdown handlers.
-         */
-        Object.defineProperty(this, "isExiting", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        /**
-         * References to graceful shutdown handlers so they can be removed during cleanup.
-         */
-        Object.defineProperty(this, "gracefulShutdownHandlers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: {}
-        });
-        Object.defineProperty(this, "chargingManager", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Tracks which aliased storages have been purged during this session,
-         * so we only purge them once (on first open) when running locally.
-         * @internal
-         */
-        Object.defineProperty(this, "purgedStorageAliases", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Set()
-        });
-        // use default configuration object if nothing overridden (it fallbacks to env vars)
-        this.config = Object.keys(options).length === 0 ? configuration_js_1.Configuration.getGlobalConfig() : new configuration_js_1.Configuration(options);
+        const { configuration, ...configOptions } = options;
+        if (configuration) {
+            // BYO Configuration takes precedence; field-level overrides are
+            // ignored to keep the contract unambiguous. It must be the SDK's
+            // Configuration subclass, not a bare crawlee one — env-var
+            // resolution is driven by the subclass's `static fields`
+            // (`apifyConfigFields`) at construction, so a crawlee instance
+            // would silently expose none of the `APIFY_*`/`ACTOR_*` values.
+            if (!(configuration instanceof Configuration)) {
+                throw new Error('Actor `configuration` must be an Apify SDK Configuration (imported from `apify`), ' +
+                    'not a crawlee Configuration, otherwise APIFY_*/ACTOR_* environment variables are not resolved.');
+            }
+            this.config = configuration;
+        }
+        else if (Object.keys(configOptions).length === 0) {
+            // use default configuration object if nothing overridden (it fallbacks to env vars)
+            this.config = Configuration.getGlobalConfig();
+        }
+        else {
+            this.config = new Configuration(configOptions);
+        }
         this.apifyClient = this.newClient();
-        this.eventManager = new platform_event_manager_js_1.PlatformEventManager(this.config);
-        this.chargingManager = new charging_js_1.ChargingManager(this.config, this.apifyClient);
+        this.eventManager = new PlatformEventManager(this.config);
+        this.chargingManager = new ChargingManager(this.config, this.apifyClient);
     }
     /**
      * Runs the main user function that performs the job of the Actor
@@ -210,9 +178,9 @@ class Actor {
                 await this.exit(options);
             }
             catch (err) {
-                log_1.default.exception(err, err.message);
+                log.exception(err, err.message);
                 await this.exit({
-                    exitCode: exports.EXIT_CODES.ERROR_USER_FUNCTION_THREW,
+                    exitCode: EXIT_CODES.ERROR_USER_FUNCTION_THREW,
                 });
             }
             return ret;
@@ -223,7 +191,7 @@ class Actor {
      */
     async init(options = {}) {
         if (this.initialized) {
-            log_1.default.debug(`Actor SDK was already initialized`);
+            log.debug(`Actor SDK was already initialized`);
             return;
         }
         // If the warning about forgotten init call was emitted, we will not continue the init procedure.
@@ -234,22 +202,23 @@ class Actor {
             ].join('\n'));
         }
         this.initialized = true;
-        (0, utils_js_1.checkCrawleeVersion)();
-        log_1.default.info('System info', (0, utils_js_1.getSystemInfo)());
-        // reset global config instance to respect APIFY_ prefixed env vars
-        core_1.Configuration.globalConfig = configuration_js_1.Configuration.getGlobalConfig();
+        checkCrawleeVersion();
+        log.info('System info', getSystemInfo());
+        printOutdatedSdkWarning();
+        // Register this Actor's config as the global one so crawlee storages and
+        // the event manager resolve the same instance (`availableMemoryRatio` /
+        // `disableBrowserSandbox` at-home defaults now live in `Configuration`).
+        serviceLocator.setConfiguration(this.config);
         if (this.isAtHome()) {
-            this.config.set('availableMemoryRatio', 1);
-            this.config.set('disableBrowserSandbox', true); // for browser launcher, adds `--no-sandbox` to args
-            this.config.useStorageClient(this.apifyClient);
-            this.config.useEventManager(this.eventManager);
+            serviceLocator.setStorageClient(new ApifyStorageClient(this.apifyClient, this.config, () => this.chargingManager));
+            serviceLocator.setEventManager(this.eventManager);
         }
         else if (options.storage) {
-            this.config.useStorageClient(options.storage);
+            serviceLocator.setStorageClient(options.storage);
         }
         // Init the event manager the config uses
-        await this.config.getEventManager().init();
-        log_1.default.debug(`Events initialized`);
+        await serviceLocator.getEventManager().init();
+        log.debug(`Events initialized`);
         // Register handlers for aborting and migrating events for automatic graceful shutdown.
         // - aborting: calls Actor.exit() to terminate the run gracefully
         // - migrating: calls Actor.reboot() to speed up migration (the run continues on a new worker)
@@ -259,28 +228,27 @@ class Actor {
             this.gracefulShutdownHandlers.aborting = () => {
                 setTimeout(() => {
                     this.exit().catch((err) => {
-                        log_1.default.exception(err, 'Failed to exit gracefully');
+                        log.exception(err, 'Failed to exit gracefully');
                     });
                 }, delay);
             };
-            this.on(consts_1.ACTOR_EVENT_NAMES.ABORTING, this.gracefulShutdownHandlers.aborting);
+            this.on(ACTOR_EVENT_NAMES.ABORTING, this.gracefulShutdownHandlers.aborting);
             this.gracefulShutdownHandlers.migrating = () => {
                 setTimeout(() => {
                     this.reboot().catch((err) => {
-                        log_1.default.exception(err, 'Failed to reboot on migration');
+                        log.exception(err, 'Failed to reboot on migration');
                     });
                 }, delay);
             };
-            this.on(consts_1.ACTOR_EVENT_NAMES.MIGRATING, this.gracefulShutdownHandlers.migrating);
+            this.on(ACTOR_EVENT_NAMES.MIGRATING, this.gracefulShutdownHandlers.migrating);
         }
-        await (0, core_1.purgeDefaultStorages)({
+        await purgeDefaultStorages({
             config: this.config,
             onlyPurgeOnce: true,
         });
-        log_1.default.debug(`Default storages purged`);
-        configuration_js_1.Configuration.storage.enterWith(this.config);
+        log.debug(`Default storages purged`);
         await this.chargingManager.init();
-        log_1.default.debug(`ChargingManager initialized`, this.chargingManager.getPricingInfo());
+        log.debug(`ChargingManager initialized`, this.chargingManager.getPricingInfo());
     }
     /**
      * @ignore
@@ -288,7 +256,7 @@ class Actor {
     async exit(messageOrOptions, options = {}) {
         // Prevent double-exit from graceful shutdown handlers
         if (this.isExiting) {
-            log_1.default.debug('Actor.exit() called while already exiting, skipping');
+            log.debug('Actor.exit() called while already exiting, skipping');
             return;
         }
         this.isExiting = true;
@@ -296,26 +264,26 @@ class Actor {
             typeof messageOrOptions === 'string'
                 ? { ...options, statusMessage: messageOrOptions }
                 : { ...messageOrOptions, ...options };
-        options.exit ?? (options.exit = true);
-        options.exitCode ?? (options.exitCode = exports.EXIT_CODES.SUCCESS);
-        options.timeoutSecs ?? (options.timeoutSecs = 30);
+        options.exit ??= true;
+        options.exitCode ??= EXIT_CODES.SUCCESS;
+        options.timeoutSecs ??= 30;
         this._ensureActorInit('exit');
-        const client = this.config.getStorageClient();
-        const events = this.config.getEventManager();
+        const client = serviceLocator.getStorageClient();
+        const events = serviceLocator.getEventManager();
         // Remove graceful shutdown handlers to prevent them from interfering with exit
         if (this.gracefulShutdownHandlers.aborting) {
-            this.off(consts_1.ACTOR_EVENT_NAMES.ABORTING, this.gracefulShutdownHandlers.aborting);
+            this.off(ACTOR_EVENT_NAMES.ABORTING, this.gracefulShutdownHandlers.aborting);
         }
         if (this.gracefulShutdownHandlers.migrating) {
-            this.off(consts_1.ACTOR_EVENT_NAMES.MIGRATING, this.gracefulShutdownHandlers.migrating);
+            this.off(ACTOR_EVENT_NAMES.MIGRATING, this.gracefulShutdownHandlers.migrating);
         }
         // Close the event manager and emit the final PERSIST_STATE event
         await events.close();
-        log_1.default.debug(`Events closed`);
+        log.debug(`Events closed`);
         // Emit the exit event
         events.emit("exit" /* EventType.EXIT */, options);
         // Wait for all event listeners to be processed
-        log_1.default.debug(`Waiting for all event listeners to complete their execution (with ${options.timeoutSecs} seconds timeout)`);
+        log.debug(`Waiting for all event listeners to complete their execution (with ${options.timeoutSecs} seconds timeout)`);
         if (options.exit) {
             // `addTimeoutToPromise` is a cooperative timeout. This ensures that the process exits
             // after the timeout, even if the event listeners don't trigger the timeout.
@@ -323,13 +291,13 @@ class Actor {
                 process.exit(options.exitCode);
             }, options.timeoutSecs * 1000);
         }
-        await (0, timeout_1.addTimeoutToPromise)(async () => {
+        await addTimeoutToPromise(async () => {
             await events.waitForAllListenersToComplete();
             if (client.teardown) {
                 let finished = false;
                 setTimeout(() => {
                     if (!finished) {
-                        log_1.default.info('Waiting for the storage to write its state to file system.');
+                        log.info('Waiting for the storage to write its state to file system.');
                     }
                 }, 1000);
                 await client.teardown();
@@ -341,7 +309,7 @@ class Actor {
                     level: options.exitCode > 0 ? 'ERROR' : 'INFO',
                 });
                 // Waiting 1ms is enough for the network request to be sent. We don't need to wait for the response.
-                await Promise.race([statusMessagePromise, (0, utils_1.sleep)(1)]);
+                await Promise.race([statusMessagePromise, sleep(1)]);
             }
         }, options.timeoutSecs * 1000, `Waiting for all event listeners to complete their execution timed out after ${options.timeoutSecs} seconds`).catch(() => {
             if (options.exit) {
@@ -366,13 +334,13 @@ class Actor {
      * @ignore
      */
     on(event, listener) {
-        this.config.getEventManager().on(event, listener);
+        serviceLocator.getEventManager().on(event, listener);
     }
     /**
      * @ignore
      */
     off(event, listener) {
-        this.config.getEventManager().off(event, listener);
+        serviceLocator.getEventManager().off(event, listener);
     }
     /**
      * Runs an Actor on the Apify platform using the current user account (determined by the `APIFY_TOKEN` environment variable).
@@ -507,14 +475,14 @@ class Actor {
      */
     async metamorph(targetActorId, input, options = {}) {
         if (!this.isAtHome()) {
-            log_1.default.warning('Actor.metamorph() is only supported when running on the Apify platform.');
+            log.warning('Actor.metamorph() is only supported when running on the Apify platform.');
             return;
         }
-        const { customAfterSleepMillis = this.config.get('metamorphAfterSleepMillis'), ...metamorphOpts } = options;
-        const runId = this.config.get('actorRunId');
+        const { customAfterSleepMillis = this.config.metamorphAfterSleepMillis, ...metamorphOpts } = options;
+        const runId = this.config.actorRunId;
         await this.apifyClient.run(runId).metamorph(targetActorId, input, metamorphOpts);
         // Wait some time for container to be stopped.
-        await (0, utils_1.sleep)(customAfterSleepMillis);
+        await sleep(customAfterSleepMillis);
     }
     /**
      * Internally reboots this Actor. The system stops the current container and starts
@@ -526,32 +494,32 @@ class Actor {
     async reboot(options = {}) {
         this._ensureActorInit('reboot');
         if (!this.isAtHome()) {
-            log_1.default.warning('Actor.reboot() is only supported when running on the Apify platform.');
+            log.warning('Actor.reboot() is only supported when running on the Apify platform.');
             return;
         }
         if (this.isRebooting) {
-            log_1.default.debug('Actor is already rebooting, skipping the additional reboot call.');
+            log.debug('Actor is already rebooting, skipping the additional reboot call.');
             return;
         }
         this.isRebooting = true;
         // Waiting for all the listeners to finish, as `.reboot()` kills the container.
         await Promise.all([
             // `persistState` for individual RequestLists, RequestQueue... instances to be persisted
-            ...this.config
+            ...serviceLocator
                 .getEventManager()
                 .listeners("persistState" /* EventType.PERSIST_STATE */)
                 .map(async (x) => x({})),
             // `migrating` to pause Apify crawlers
-            ...this.config
+            ...serviceLocator
                 .getEventManager()
                 .listeners("migrating" /* EventType.MIGRATING */)
                 .map(async (x) => x({})),
         ]);
-        const runId = this.config.get('actorRunId');
+        const runId = this.config.actorRunId;
         await this.apifyClient.run(runId).reboot();
         // Wait some time for container to be stopped.
-        const { customAfterSleepMillis = this.config.get('metamorphAfterSleepMillis') } = options;
-        await (0, utils_1.sleep)(customAfterSleepMillis);
+        const { customAfterSleepMillis = this.config.metamorphAfterSleepMillis } = options;
+        await sleep(customAfterSleepMillis);
     }
     /**
      * Creates an ad-hoc webhook for the current Actor run, which lets you receive a notification when the Actor run finished or failed.
@@ -566,25 +534,25 @@ class Actor {
      * @ignore
      */
     async addWebhook(options) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            eventTypes: ow_1.default.array.ofType(ow_1.default.string),
-            requestUrl: ow_1.default.string,
-            payloadTemplate: ow_1.default.optional.string,
-            idempotencyKey: ow_1.default.optional.string,
-            headersTemplate: ow_1.default.optional.string,
-            description: ow_1.default.optional.string,
-            ignoreSslErrors: ow_1.default.optional.boolean,
-            doNotRetry: ow_1.default.optional.boolean,
-            shouldInterpolateStrings: ow_1.default.optional.boolean,
-            isApifyIntegration: ow_1.default.optional.boolean,
+        ow(options, ow.object.exactShape({
+            eventTypes: ow.array.ofType(ow.string),
+            requestUrl: ow.string,
+            payloadTemplate: ow.optional.string,
+            idempotencyKey: ow.optional.string,
+            headersTemplate: ow.optional.string,
+            description: ow.optional.string,
+            ignoreSslErrors: ow.optional.boolean,
+            doNotRetry: ow.optional.boolean,
+            shouldInterpolateStrings: ow.optional.boolean,
+            isApifyIntegration: ow.optional.boolean,
         }));
         if (!this.isAtHome()) {
-            log_1.default.warning('Actor.addWebhook() is only supported when running on the Apify platform. The webhook will not be invoked.');
+            log.warning('Actor.addWebhook() is only supported when running on the Apify platform. The webhook will not be invoked.');
             return undefined;
         }
-        const runId = this.config.get('actorRunId');
+        const runId = this.config.actorRunId;
         if (!runId) {
-            throw new Error(`Environment variable ${consts_1.ACTOR_ENV_VARS.RUN_ID} is not set!`);
+            throw new Error(`Environment variable ${ACTOR_ENV_VARS.RUN_ID} is not set!`);
         }
         return this.apifyClient.webhooks().create({
             ...options,
@@ -603,34 +571,34 @@ class Actor {
      */
     async setStatusMessage(statusMessage, options) {
         const { isStatusMessageTerminal, level } = options || {};
-        (0, ow_1.default)(statusMessage, ow_1.default.string);
-        (0, ow_1.default)(isStatusMessageTerminal, ow_1.default.optional.boolean);
+        ow(statusMessage, ow.string);
+        ow(isStatusMessageTerminal, ow.optional.boolean);
         this._ensureActorInit('setStatusMessage');
         const loggedStatusMessage = `[Status message]: ${statusMessage}`;
         switch (level) {
             case 'DEBUG':
-                log_1.default.debug(loggedStatusMessage);
+                log.debug(loggedStatusMessage);
                 break;
             case 'WARNING':
-                log_1.default.warning(loggedStatusMessage);
+                log.warning(loggedStatusMessage);
                 break;
             case 'ERROR':
-                log_1.default.error(loggedStatusMessage);
+                log.error(loggedStatusMessage);
                 break;
             default:
-                log_1.default.info(loggedStatusMessage);
+                log.info(loggedStatusMessage);
                 break;
         }
-        const client = this.config.getStorageClient();
+        const client = serviceLocator.getStorageClient();
         // just to be sure, this should be fast
-        await (0, timeout_1.addTimeoutToPromise)(async () => client.setStatusMessage(statusMessage, {
+        await addTimeoutToPromise(async () => client.setStatusMessage(statusMessage, {
             isStatusMessageTerminal,
             level,
-        }), 1000, 'Setting status message timed out after 1s').catch((e) => log_1.default.warning(e.message));
-        const runId = this.config.get('actorRunId');
+        }), 1000, 'Setting status message timed out after 1s').catch((e) => log.warning(e.message));
+        const runId = this.config.actorRunId;
         if (runId) {
             // just to be sure, this should be fast
-            const run = await (0, timeout_1.addTimeoutToPromise)(async () => this.apifyClient.run(runId).get(), 1000, 'Getting the current run timed out after 1s').catch((e) => log_1.default.warning(e.message));
+            const run = await addTimeoutToPromise(async () => this.apifyClient.run(runId).get(), 1000, 'Getting the current run timed out after 1s').catch((e) => log.warning(e.message));
             if (run) {
                 return run;
             }
@@ -697,11 +665,11 @@ class Actor {
      * @ignore
      */
     async openDataset(datasetIdOrName, options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forceCloud: ow_1.default.optional.boolean,
+        ow(options, ow.object.exactShape({
+            forceCloud: ow.optional.boolean,
         }));
         this._ensureActorInit('openDataset');
-        return this._openStorage(core_1.Dataset, datasetIdOrName, options);
+        return this._openStorage(Dataset, datasetIdOrName, options);
     }
     /**
      * Gets a value from the default {@link KeyValueStore} associated with the current Actor run.
@@ -803,20 +771,19 @@ class Actor {
      */
     async getInput() {
         this._ensureActorInit('getInput');
-        const inputSecretsPrivateKeyFile = this.config.get('inputSecretsPrivateKeyFile');
-        const inputSecretsPrivateKeyPassphrase = this.config.get('inputSecretsPrivateKeyPassphrase');
-        const rawInput = await this.getValue(this.config.get('inputKey'));
+        const { inputSecretsPrivateKeyFile, inputSecretsPrivateKeyPassphrase } = this.config;
+        const rawInput = await this.getValue(this.config.inputKey);
         let input = rawInput;
-        if (ow_1.default.isValid(rawInput, ow_1.default.object.nonEmpty) &&
+        if (ow.isValid(rawInput, ow.object.nonEmpty) &&
             inputSecretsPrivateKeyFile &&
             inputSecretsPrivateKeyPassphrase) {
-            const privateKey = (0, node_crypto_1.createPrivateKey)({
+            const privateKey = createPrivateKey({
                 key: Buffer.from(inputSecretsPrivateKeyFile, 'base64'),
                 passphrase: inputSecretsPrivateKeyPassphrase,
             });
-            input = (0, input_secrets_1.decryptInputSecrets)({ input: rawInput, privateKey });
+            input = decryptInputSecrets({ input: rawInput, privateKey });
         }
-        if (ow_1.default.isValid(input, ow_1.default.object.nonEmpty) && !Buffer.isBuffer(input)) {
+        if (ow.isValid(input, ow.object.nonEmpty) && !Buffer.isBuffer(input)) {
             input = await this.inferDefaultsFromInputSchema(input);
         }
         return input;
@@ -849,11 +816,11 @@ class Actor {
      * @ignore
      */
     async openKeyValueStore(storeIdOrName, options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forceCloud: ow_1.default.optional.boolean,
+        ow(options, ow.object.exactShape({
+            forceCloud: ow.optional.boolean,
         }));
         this._ensureActorInit('openKeyValueStore');
-        return this._openStorage(key_value_store_js_1.KeyValueStore, storeIdOrName, options);
+        return this._openStorage(KeyValueStore, storeIdOrName, options);
     }
     /**
      * Opens a request queue and returns a promise resolving to an instance
@@ -874,13 +841,13 @@ class Actor {
      * @ignore
      */
     async openRequestQueue(queueIdOrName, options = {}) {
-        (0, ow_1.default)(options, ow_1.default.object.exactShape({
-            forceCloud: ow_1.default.optional.boolean,
+        ow(options, ow.object.exactShape({
+            forceCloud: ow.optional.boolean,
         }));
         this._ensureActorInit('openRequestQueue');
-        const queue = await this._openStorage(core_1.RequestQueue, queueIdOrName, options);
+        const queue = await this._openStorage(RequestQueue, queueIdOrName, options);
         // eslint-disable-next-line dot-notation
-        queue['initialCount'] = (await queue.client.get())?.totalRequestCount ?? 0;
+        queue['initialCount'] = (await queue.client.getMetadata())?.totalRequestCount ?? 0;
         return queue;
     }
     /**
@@ -932,7 +899,7 @@ class Actor {
         if (dontUseApifyProxy && dontUseCustomProxies) {
             return undefined;
         }
-        const proxyConfiguration = new proxy_configuration_js_1.ProxyConfiguration(options, this.config);
+        const proxyConfiguration = new ProxyConfiguration(options, this.config);
         if (await proxyConfiguration.initialize({ checkAccess })) {
             return proxyConfiguration;
         }
@@ -972,7 +939,7 @@ class Actor {
      */
     getModifiedActorEnvVars() {
         const modifiedActorEnvVars = {};
-        Object.entries(consts_1.ACTOR_ENV_VARS).forEach(([k, v]) => {
+        Object.entries(ACTOR_ENV_VARS).forEach(([k, v]) => {
             // Prepend `ACTOR_` to env vars so ApifyEnv structure is preserved
             if (['ID', 'RUN_ID', 'TASK_ID'].includes(k)) {
                 modifiedActorEnvVars[`ACTOR_${k}`] = v;
@@ -996,17 +963,17 @@ class Actor {
         const env = process.env || {};
         const envVars = {};
         for (const [shortName, fullName] of Object.entries({
-            ...consts_1.APIFY_ENV_VARS,
+            ...APIFY_ENV_VARS,
             ...this.getModifiedActorEnvVars(),
         })) {
-            const camelCaseName = (0, utils_1.snakeCaseToCamelCase)(shortName);
+            const camelCaseName = snakeCaseToCamelCase(shortName);
             let value = env[fullName];
             // Parse dates and integers.
             if (value && fullName.endsWith('_AT')) {
                 const unix = Date.parse(value);
                 value = unix > 0 ? new Date(unix) : undefined;
             }
-            else if (consts_1.INTEGER_ENV_VARS.includes(fullName)) {
+            else if (INTEGER_ENV_VARS.includes(fullName)) {
                 value = parseInt(value, 10);
             }
             Reflect.set(envVars, camelCaseName, value || value === 0 ? value : null);
@@ -1022,23 +989,23 @@ class Actor {
      * @ignore
      */
     newClient(options = {}) {
-        const { storageDir, ...storageClientOptions } = this.config.get('storageClientOptions');
-        const { apifyVersion, crawleeVersion } = (0, utils_js_1.getSystemInfo)();
-        return (0, patched_apify_client_js_1.createPatchedApifyClient)({
-            baseUrl: this.config.get('apiBaseUrl'),
-            publicBaseUrl: this.config.get('apiPublicBaseUrl'),
-            token: this.config.get('token'),
+        const { storageDir, ...storageClientOptions } = (this.config.storageClientOptions ?? {});
+        const { apifyVersion, crawleeVersion } = getSystemInfo();
+        return new ApifyClient({
+            baseUrl: this.config.apiBaseUrl,
+            publicBaseUrl: this.config.apiPublicBaseUrl,
+            token: this.config.token,
             userAgentSuffix: [`SDK/${apifyVersion}`, `Crawlee/${crawleeVersion}`],
             ...storageClientOptions,
             ...options, // allow overriding the instance configuration
-        }, this);
+        });
     }
     /**
      * Returns `true` when code is running on Apify platform and `false` otherwise (for example locally).
      * @ignore
      */
     isAtHome() {
-        return !!process.env[consts_1.APIFY_ENV_VARS.IS_AT_HOME];
+        return !!process.env[APIFY_ENV_VARS.IS_AT_HOME];
     }
     /**
      * Easily create and manage state values. All state values are automatically persisted.
@@ -1051,8 +1018,8 @@ class Actor {
      */
     async useState(name, defaultValue = {}, options) {
         this._ensureActorInit('useState');
-        const kvStore = await key_value_store_js_1.KeyValueStore.open(options?.keyValueStoreName, {
-            config: options?.config || configuration_js_1.Configuration.getGlobalConfig(),
+        const kvStore = await KeyValueStore.open(options?.keyValueStoreName, {
+            config: options?.config || Configuration.getGlobalConfig(),
         });
         return kvStore.getAutoSavedValue(name || 'APIFY_GLOBAL_STATE', defaultValue);
     }
@@ -1622,11 +1589,11 @@ class Actor {
     }
     /** @internal */
     static getDefaultInstance() {
-        this._instance ?? (this._instance = new Actor());
+        this._instance ??= new Actor();
         return this._instance;
     }
     usesPushDataInterception(dataset) {
-        return Boolean(dataset.client[patched_apify_client_js_1.USES_PUSH_DATA_INTERCEPTION]);
+        return Boolean(dataset.client[USES_PUSH_DATA_INTERCEPTION]);
     }
     async pushDataViaInterceptedClient(dataset, item, eventName) {
         // PatchedDatasetClient will handle charging and item limiting.
@@ -1634,7 +1601,7 @@ class Actor {
         const context = {
             eventName,
         };
-        await patched_apify_client_js_1.pushDataChargingContext.run(context, async () => {
+        await pushDataChargingContext.run(context, async () => {
             await dataset.pushData(item);
         });
         return (context.chargeResult ?? {
@@ -1654,8 +1621,8 @@ class Actor {
                 chargeableWithinLimit: {},
             };
         }
-        const isDefaultDataset = dataset.id === this.config.get('defaultDatasetId');
-        return (0, charging_js_1.pushDataAndCharge)({
+        const isDefaultDataset = dataset.id === this.config.defaultDatasetId;
+        return pushDataAndCharge({
             chargingManager: this.chargingManager,
             items,
             eventName: explicitEventName,
@@ -1664,9 +1631,11 @@ class Actor {
         });
     }
     async _openStorage(storageClass, identifier, options = {}) {
-        return (0, storage_js_1.openStorage)(storageClass, identifier, {
+        return openStorage(storageClass, identifier, {
             config: this.config,
-            client: options.forceCloud ? this.apifyClient : undefined,
+            client: options.forceCloud
+                ? new ApifyStorageClient(this.apifyClient, this.config, () => this.chargingManager)
+                : undefined,
             purgedStorageAliases: this.purgedStorageAliases,
         });
     }
@@ -1679,7 +1648,7 @@ class Actor {
             return;
         }
         this.warnedAboutMissingInitCall = true;
-        log_1.default.warning([
+        log.warning([
             `Actor.${methodCalled}() was called but the Actor instance was not initialized.`,
             'Did you forget to call Actor.init()?',
         ].join('\n'));
@@ -1693,7 +1662,7 @@ class Actor {
         if (this.isAtHome() && env.timeoutAt !== null) {
             return env.timeoutAt.getTime() - Date.now();
         }
-        log_1.default.warning('Using `inherit` argument is only possible when the Actor is running on the Apify platform and when the ' +
+        log.warning('Using `inherit` argument is only possible when the Actor is running on the Apify platform and when the ' +
             'timeout for the Actor run is set.');
         return undefined;
     }
@@ -1704,17 +1673,16 @@ class Actor {
             return input;
         }
         // On local, we can get the input schema from the local config
-        const inputSchema = (0, input_schemas_js_1.readInputSchema)();
+        const inputSchema = readInputSchema();
         // Don't emit warning if there is no input schema defined
-        if (inputSchema === input_schemas_js_1.noActorInputSchemaDefinedMarker) {
+        if (inputSchema === noActorInputSchemaDefinedMarker) {
             return input;
         }
         if (!inputSchema) {
-            log_1.default.warning('Failed to find the input schema for the local run of this Actor. Your input will be missing fields that have default values set if they are missing from the input you are using.');
+            log.warning('Failed to find the input schema for the local run of this Actor. Your input will be missing fields that have default values set if they are missing from the input you are using.');
             return input;
         }
-        const defaults = (0, input_schemas_js_1.getDefaultsFromInputSchema)(inputSchema);
+        const defaults = getDefaultsFromInputSchema(inputSchema);
         return { ...defaults, ...input };
     }
 }
-exports.Actor = Actor;