apify 3.2.7-beta.49 → 3.3.0

package/internals/charging.js

@@ -0,0 +1,297 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChargingManager = void 0;
+const tslib_1 = require("tslib");
+const log_1 = tslib_1.__importDefault(require("@apify/log"));
+const core_1 = require("@crawlee/core");
+/**
+ * Handles pay-per-event charging.
+ *
+ * @internal
+ */
+class ChargingManager {
+    constructor(configuration, apifyClient) {
+        Object.defineProperty(this, "LOCAL_CHARGING_LOG_DATASET_NAME", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'charging_log'
+        });
+        Object.defineProperty(this, "PLATFORM_CHARGING_LOG_DATASET_ID_KEY", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'CHARGING_LOG_DATASET_ID'
+        });
+        Object.defineProperty(this, "maxTotalChargeUsd", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "isAtHome", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "actorRunId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "pricingModel", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "purgeChargingLogDataset", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "useChargingLogDataset", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "notPpeWarningPrinted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "pricingInfo", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, "chargingState", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "chargingLogDataset", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apifyClient", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.maxTotalChargeUsd = configuration.get('maxTotalChargeUsd') ?? Infinity;
+        this.isAtHome = configuration.get('isAtHome');
+        this.actorRunId = configuration.get('actorRunId');
+        this.purgeChargingLogDataset = configuration.get('purgeOnStart');
+        this.useChargingLogDataset = configuration.get('useChargingLogDataset');
+        if (this.useChargingLogDataset && this.isAtHome) {
+            throw new Error('Using the ACTOR_USE_CHARGING_LOG_DATASET environment variable is only supported in a local development environment');
+        }
+        if (configuration.get('testPayPerEvent')) {
+            if (this.isAtHome) {
+                throw new Error('Using the ACTOR_TEST_PAY_PER_EVENT environment variable is only supported in a local development environment');
+            }
+            this.pricingModel = 'PAY_PER_EVENT';
+        }
+        this.apifyClient = apifyClient;
+    }
+    get isPayPerEvent() {
+        return this.pricingModel === 'PAY_PER_EVENT';
+    }
+    /**
+     * Initialize the ChargingManager by loading pricing information and charging state via Apify API.
+     */
+    async init() {
+        this.chargingState = {};
+        // Retrieve pricing information
+        if (this.isAtHome) {
+            if (this.actorRunId === undefined) {
+                throw new Error('Actor run ID not found even though the Actor is running on Apify');
+            }
+            const run = await this.apifyClient.run(this.actorRunId).get();
+            if (run === undefined) {
+                throw new Error('Actor run not found');
+            }
+            this.pricingModel = run.pricingInfo?.pricingModel;
+            // Load per-event pricing information
+            if (run.pricingInfo?.pricingModel === 'PAY_PER_EVENT') {
+                for (const [eventName, eventPricing] of Object.entries(run.pricingInfo.pricingPerEvent.actorChargeEvents)) {
+                    this.pricingInfo[eventName] = {
+                        price: eventPricing.eventPriceUsd,
+                        title: eventPricing.eventTitle,
+                    };
+                }
+                this.maxTotalChargeUsd = run.options.maxTotalChargeUsd ?? this.maxTotalChargeUsd;
+            }
+            // Load charged event counts
+            for (const [eventName, chargeCount] of Object.entries(run.chargedEventCounts ?? {})) {
+                this.chargingState[eventName] = {
+                    chargeCount,
+                    totalChargedAmount: chargeCount * (this.pricingInfo[eventName]?.price ?? 0),
+                };
+            }
+        }
+        if (!this.isPayPerEvent || !this.useChargingLogDataset) {
+            return;
+        }
+        // Set up charging log dataset
+        if (this.isAtHome) {
+            const datasetId = await this.ensureChargingLogDatasetOnPlatform();
+            this.chargingLogDataset = await core_1.Dataset.open(datasetId);
+        }
+        else {
+            if (this.purgeChargingLogDataset) {
+                const dataset = await core_1.Dataset.open(this.LOCAL_CHARGING_LOG_DATASET_NAME);
+                await dataset.drop();
+            }
+            this.chargingLogDataset = await core_1.Dataset.open(this.LOCAL_CHARGING_LOG_DATASET_NAME);
+        }
+    }
+    async ensureChargingLogDatasetOnPlatform() {
+        const defaultStore = await core_1.KeyValueStore.open();
+        const storedDatasetId = await defaultStore.getValue(this.PLATFORM_CHARGING_LOG_DATASET_ID_KEY);
+        if (storedDatasetId !== null) {
+            return storedDatasetId;
+        }
+        const dataset = await this.apifyClient.datasets().getOrCreate();
+        await defaultStore.setValue(this.PLATFORM_CHARGING_LOG_DATASET_ID_KEY, dataset.id);
+        return dataset.id;
+    }
+    /**
+     * Get information about the pricing for this Actor.
+     */
+    getPricingInfo() {
+        if (this.chargingState === undefined) {
+            throw new Error('ChargingManager is not initialized');
+        }
+        return {
+            pricingModel: this.pricingModel,
+            isPayPerEvent: this.isPayPerEvent,
+            maxTotalChargeUsd: this.maxTotalChargeUsd,
+            perEventPrices: Object.fromEntries(Object.entries(this.pricingInfo).map(([eventName, { price }]) => [eventName, price])),
+        };
+    }
+    /**
+     * Charge for a specified number of events - sub-operations of the Actor.
+     *
+     * @param options The name of the event to charge for and the number of events to be charged.
+     */
+    async charge({ eventName, count = 1 }) {
+        var _a;
+        const calculateChargeableWithinLimit = () => Object.fromEntries(Object.keys(this.pricingInfo).map((name) => [name, this.calculateMaxEventChargeCountWithinLimit(name)]));
+        if (!this.isPayPerEvent) {
+            if (!this.notPpeWarningPrinted) {
+                log_1.default.warning('Ignored attempt to charge for an event - the Actor does not use the pay-per-event pricing');
+                this.notPpeWarningPrinted = true;
+            }
+            return {
+                eventChargeLimitReached: false,
+                chargedCount: 0,
+                chargeableWithinLimit: calculateChargeableWithinLimit(),
+            };
+        }
+        if (this.chargingState === undefined) {
+            throw new Error('ChargingManager is not initialized');
+        }
+        /* START OF CRITICAL SECTION - no awaits here */
+        const chargedCount = Math.min(count, this.calculateMaxEventChargeCountWithinLimit(eventName));
+        if (chargedCount === 0) {
+            return {
+                eventChargeLimitReached: true,
+                chargedCount: 0,
+                chargeableWithinLimit: calculateChargeableWithinLimit(),
+            };
+        }
+        const pricingInfo = this.pricingInfo[eventName] ?? {
+            price: this.isAtHome ? 0 : 1, // Use a nonzero price for local development so that the maximum budget can be reached
+            title: `Unknown event '${eventName}'`,
+        };
+        (_a = this.chargingState)[eventName] ?? (_a[eventName] = { chargeCount: 0, totalChargedAmount: 0 });
+        this.chargingState[eventName].chargeCount += chargedCount;
+        this.chargingState[eventName].totalChargedAmount += chargedCount * pricingInfo.price;
+        /* END OF CRITICAL SECTION */
+        if (this.isAtHome) {
+            if (this.pricingInfo[eventName] !== undefined) {
+                await this.apifyClient.run(this.actorRunId).charge({ eventName, count: chargedCount });
+            }
+            else {
+                log_1.default.warning(`Attempting to charge for an unknown event '${eventName}'`);
+            }
+        }
+        const timestamp = new Date().toISOString();
+        if (this.chargingLogDataset !== undefined) {
+            await this.chargingLogDataset.pushData({
+                eventName,
+                eventTitle: pricingInfo.title,
+                eventPriceUsd: pricingInfo.price,
+                chargedCount,
+                timestamp,
+            });
+        }
+        if (chargedCount < count) {
+            const subject = count === 1 ? 'instance' : 'instances';
+            log_1.default.info(`Charging ${count} ${subject} of '${eventName}' event would exceed maxTotalChargeUsd - only ${chargedCount} events were charged`);
+        }
+        return {
+            eventChargeLimitReached: this.calculateMaxEventChargeCountWithinLimit(eventName) <= 0,
+            chargedCount,
+            chargeableWithinLimit: calculateChargeableWithinLimit(),
+        };
+    }
+    /**
+     * Get the number of events with given name that the Actor has charged for so far.
+     */
+    getChargedEventCount(eventName) {
+        if (this.chargingState === undefined) {
+            throw new Error('ChargingManager is not initialized');
+        }
+        return this.chargingState[eventName]?.chargeCount ?? 0;
+    }
+    /**
+     * Get the maximum amount of money that the Actor is allowed to charge.
+     */
+    getMaxTotalChargeUsd() {
+        if (this.chargingState === undefined) {
+            throw new Error('ChargingManager is not initialized');
+        }
+        return this.maxTotalChargeUsd;
+    }
+    calculateTotalChargedAmount() {
+        if (this.chargingState === undefined) {
+            throw new Error('ChargingManager is not initialized');
+        }
+        const result = Object.values(this.chargingState).map(({ totalChargedAmount }) => totalChargedAmount).reduce((sum, inc) => sum + inc, 0);
+        // Keeping float precision issues at bay
+        return Number(result.toFixed(6));
+    }
+    /**
+     * How many events of a given type can still be charged for before reaching the limit;
+     * If the event is not registered, returns Infinity (free of charge)
+     */
+    calculateMaxEventChargeCountWithinLimit(eventName) {
+        if (this.chargingState === undefined) {
+            throw new Error('ChargingManager is not initialized');
+        }
+        const price = this.isAtHome
+            ? this.pricingInfo[eventName].price
+            : 1; // Use a nonzero price for local development so that the maximum budget can be reached
+        if (!price) {
+            return Infinity;
+        }
+        // First round as Math.floor(4.9999999999999999) will incorrectly return 5
+        return Math.floor(Number(((this.maxTotalChargeUsd - this.calculateTotalChargedAmount())
+            / price).toFixed(4)));
+    }
+}
+exports.ChargingManager = ChargingManager;
+//# sourceMappingURL=charging.js.map

package/internals/charging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"charging.js","sourceRoot":"","sources":["../../src/internals/charging.ts"],"names":[],"mappings":";;;;AAAA,6DAA6B;AAC7B,wCAAuD;AAKvD;;;;GAIG;AACH,MAAa,eAAe;IAkBxB,YAAY,aAA4B,EAAE,WAAwB;QAjBjD;;;;mBAAkC,cAAc;WAAC;QACjD;;;;mBAAuC,yBAAyB;WAAC;QAE1E;;;;;WAA0B;QAC1B;;;;;WAAkB;QAClB;;;;;WAAoB;QACpB;;;;;WAAmD;QACnD;;;;;WAAiC;QACjC;;;;;WAA+B;QAC/B;;;;mBAAuB,KAAK;WAAC;QAE7B;;;;mBAAgE,EAAE;WAAC;QACnE;;;;;WAAkD;QAClD;;;;;WAA6B;QAE7B;;;;;WAAyB;QAG7B,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,QAAQ,CAAC;QAC5E,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,CAAC,uBAAuB,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACjE,IAAI,CAAC,qBAAqB,GAAG,aAAa,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,oHAAoH,CAAC,CAAC;QAC1I,CAAC;QAED,IAAI,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,8GAA8G,CAAC,CAAC;YACpI,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED,IAAY,aAAa;QACrB,OAAO,IAAI,CAAC,YAAY,KAAK,eAAe,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,+BAA+B;QAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;YACxF,CAAC;YAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC;YAC9D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC3C,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC;YAElD,qCAAqC;YACrC,IAAI,GAAG,CAAC,WAAW,EAAE,YAAY,KAAK,eAAe,EAAE,CAAC;gBACpD,KAAK,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBACxG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG;wBAC1B,KAAK,EAAE,YAAY,CAAC,aAAa;wBACjC,KAAK,EAAE,YAAY,CAAC,UAAU;qBACjC,CAAC;gBACN,CAAC;gBAED,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC,iBAAiB,CAAC;YACrF,CAAC;YAED,4BAA4B;YAC5B,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,EAAE,CAAC;gBAClF,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG;oBAC5B,WAAW;oBACX,kBAAkB,EAAE,WAAW,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;iBAC9E,CAAC;YACN,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACrD,OAAO;QACX,CAAC;QAED,8BAA8B;QAC9B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kCAAkC,EAAE,CAAC;YAElE,IAAI,CAAC,kBAAkB,GAAG,MAAM,cAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,MAAM,cAAO,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;gBACzE,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACzB,CAAC;YAED,IAAI,CAAC,kBAAkB,GAAG,MAAM,cAAO,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACvF,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,kCAAkC;QAC5C,MAAM,YAAY,GAAG,MAAM,oBAAa,CAAC,IAAI,EAAE,CAAC;QAEhD,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAS,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACvG,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;YAC3B,OAAO,eAAe,CAAC;QAC3B,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;QAChE,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACnF,OAAO,OAAO,CAAC,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,cAAc;QACV,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,cAAc,EAAE,MAAM,CAAC,WAAW,CAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CACvF;SACJ,CAAC;IACN,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,CAAC,EAAiB;;QAChD,MAAM,8BAA8B,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAC3D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAC7B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,uCAAuC,CAAC,IAAI,CAAC,CAAC,CACvE,CACJ,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC7B,aAAG,CAAC,OAAO,CAAC,2FAA2F,CAAC,CAAC;gBACzG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;YACrC,CAAC;YAED,OAAO;gBACH,uBAAuB,EAAE,KAAK;gBAC9B,YAAY,EAAE,CAAC;gBACf,qBAAqB,EAAE,8BAA8B,EAAE;aAC1D,CAAC;QACN,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QAED,gDAAgD;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,uCAAuC,CAAC,SAAS,CAAC,CAAC,CAAC;QAE9F,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO;gBACH,uBAAuB,EAAE,IAAI;gBAC7B,YAAY,EAAE,CAAC;gBACf,qBAAqB,EAAE,8BAA8B,EAAE;aAC1D,CAAC;QACN,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI;YAC/C,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,sFAAsF;YACpH,KAAK,EAAE,kBAAkB,SAAS,GAAG;SACxC,CAAC;QAEF,MAAA,IAAI,CAAC,aAAa,EAAC,SAAS,SAAT,SAAS,IAAM,EAAE,WAAW,EAAE,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAC;QAC5E,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,WAAW,IAAI,YAAY,CAAC;QAC1D,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,kBAAkB,IAAI,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC;QAErF,6BAA6B;QAE7B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YAC5F,CAAC;iBAAM,CAAC;gBACJ,aAAG,CAAC,OAAO,CAAC,8CAA8C,SAAS,GAAG,CAAC,CAAC;YAC5E,CAAC;QACL,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE3C,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;gBACnC,SAAS;gBACT,UAAU,EAAE,WAAW,CAAC,KAAK;gBAC7B,aAAa,EAAE,WAAW,CAAC,KAAK;gBAChC,YAAY;gBACZ,SAAS;aACZ,CAAC,CAAC;QACP,CAAC;QAED,IAAI,YAAY,GAAG,KAAK,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;YACvD,aAAG,CAAC,IAAI,CAAC,YAAY,KAAK,IAAI,OAAO,QAAQ,SAAS,iDAAiD,YAAY,sBAAsB,CAAC,CAAC;QAC/I,CAAC;QAED,OAAO;YACH,uBAAuB,EAAE,IAAI,CAAC,uCAAuC,CAAC,SAAS,CAAC,IAAI,CAAC;YACrF,YAAY;YACZ,qBAAqB,EAAE,8BAA8B,EAAE;SAC1D,CAAC;IACN,CAAC;IAED;;OAEG;IACH,oBAAoB,CAAC,SAAiB;QAClC,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,oBAAoB;QAChB,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAEO,2BAA2B;QAC/B,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;QAExI,wCAAwC;QACxC,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,uCAAuC,CAAC,SAAiB;QACrD,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ;YACvB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,KAAK;YACnC,CAAC,CAAC,CAAC,CAAC,CAAC,sFAAsF;QAE/F,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,0EAA0E;QAC1E,OAAO,IAAI,CAAC,KAAK,CACb,MAAM,CACF,CAAC,CAAC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;cAC3D,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACvB,CACJ,CAAC;IACN,CAAC;CACJ;AAnRD,0CAmRC"}

package/package.json

@@ -1,18 +1,18 @@
 {
     "name": "apify",
-    "version": "3.2.7-beta.49+271bc999c1",
+    "version": "3.3.0",
     "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": ">=16.0.0"
     },
-    "main": "./dist/index.js",
-    "module": "./dist/index.mjs",
-    "types": "./dist/index.d.ts",
+    "main": "./index.js",
+    "module": "./index.mjs",
+    "types": "./index.d.ts",
     "exports": {
         ".": {
-            "import": "./dist/index.mjs",
-            "require": "./dist/index.js",
-            "types": "./dist/index.d.ts"
+            "import": "./index.mjs",
+            "require": "./index.js",
+            "types": "./index.d.ts"
         },
         "./package.json": "./package.json"
     },
@@ -46,7 +46,7 @@
     "scripts": {
         "build": "npm run clean && npm run compile && npm run copy && npm run fixApifyExport",
         "clean": "rimraf ./dist",
-        "compile": "tsc -p tsconfig.build.json && gen-esm-wrapper ./dist/index.js ./dist/index.mjs",
+        "compile": "tsc -p tsconfig.build.json && gen-esm-wrapper ./index.js ./index.mjs",
         "copy": "tsx ../../scripts/copy.ts --readme=local",
         "fixApifyExport": "tsx ../../scripts/temp_fix_apify_exports.ts"
     },
@@ -62,7 +62,7 @@
         "@crawlee/core": "^3.9.0",
         "@crawlee/types": "^3.9.0",
         "@crawlee/utils": "^3.9.0",
-        "apify-client": "^2.10.0",
+        "apify-client": "^2.11.1",
         "fs-extra": "^11.2.0",
         "ow": "^0.28.2",
         "semver": "^7.5.4",
@@ -76,5 +76,5 @@
             }
         }
     },
-    "gitHead": "271bc999c1a6c75f8e8359214237b51f8ade03c7"
+    "gitHead": "cdcb69b5c1e5aa583b082e015381a047b5198ea5"
 }