apify 4.0.0-beta.28 → 4.0.0-beta.30

package/dist/actor.d.ts

@@ -318,6 +318,7 @@ export declare const EXIT_CODES: {
  * See {@link Configuration} for details about what can be configured and what are the default values.
  */
 export declare class Actor<Data extends Dictionary = Dictionary> {
+    #private;
     /** @internal */
     static _instance: Actor;
     /**

package/dist/actor.js

@@ -7,6 +7,7 @@ import { ACTOR_ENV_VARS, ACTOR_EVENT_NAMES, APIFY_ENV_VARS, INTEGER_ENV_VARS, }
 import { decryptInputSecrets } from '@apify/input_secrets';
 import log from '@apify/log';
 import { addTimeoutToPromise } from '@apify/timeout';
+import { parseArgument } from '@apify/validations';
 import { ApifyStorageBackend, pushDataChargingContext, USES_PUSH_DATA_INTERCEPTION, } from './apify_storage_backend.js';
 import { ChargingManager, pushDataAndCharge } from './charging.js';
 import { Configuration } from './configuration.js';
@@ -14,7 +15,7 @@ import { getDefaultsFromInputSchema, noActorInputSchemaDefinedMarker, readInputS
 import { PlatformEventManager } from './platform_event_manager.js';
 import { ProxyConfiguration } from './proxy_configuration.js';
 import { openStorage } from './storage.js';
-import { checkCrawleeVersion, getSystemInfo, isNonEmptyObject, printOutdatedSdkWarning, snakeCaseToCamelCase, validate, } from './utils.js';
+import { checkCrawleeVersion, getSystemInfo, isNonEmptyObject, printOutdatedSdkWarning, snakeCaseToCamelCase, } 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
@@ -70,6 +71,10 @@ export class Actor {
      * References to graceful shutdown handlers so they can be removed during cleanup.
      */
     gracefulShutdownHandlers = {};
+    /**
+     * Reference to the crawlee status message forwarder, so it can be removed during cleanup.
+     */
+    #statusMessageForwarder;
     chargingManager;
     /**
      * Tracks which aliased storages have been purged during this session,
@@ -242,6 +247,9 @@ export class Actor {
             };
             this.on(ACTOR_EVENT_NAMES.MIGRATING, this.gracefulShutdownHandlers.migrating);
         }
+        // Crawlee crawlers, for instance, broadcast their status messages as `statusMessage` events.
+        this.#statusMessageForwarder = async ({ message, isStatusMessageTerminal }) => this.#updateRunStatusMessage(message, isStatusMessageTerminal);
+        this.on(EventType.STATUS_MESSAGE, this.#statusMessageForwarder);
         await purgeDefaultStorages({
             configuration: this.configuration,
             onlyPurgeOnce: true,
@@ -293,6 +301,11 @@ export class Actor {
         }
         await addTimeoutToPromise(async () => {
             await events.waitForAllListenersToComplete();
+            // The final status messages have been forwarded by now; stop listening so
+            // that a periodic one can't overwrite the terminal message set below.
+            if (this.#statusMessageForwarder) {
+                this.off(EventType.STATUS_MESSAGE, this.#statusMessageForwarder);
+            }
             if (client.teardown) {
                 let finished = false;
                 setTimeout(() => {
@@ -534,7 +547,7 @@ export class Actor {
      * @ignore
      */
     async addWebhook(options) {
-        validate(z
+        parseArgument(options, z
             .object({
             eventTypes: z.array(z.string()),
             requestUrl: z.string(),
@@ -547,7 +560,7 @@ export class Actor {
             shouldInterpolateStrings: z.boolean().optional(),
             isApifyIntegration: z.boolean().optional(),
         })
-            .strict(), options);
+            .strict());
         if (!this.isAtHome()) {
             log.warning('Actor.addWebhook() is only supported when running on the Apify platform. The webhook will not be invoked.');
             return undefined;
@@ -573,8 +586,8 @@ export class Actor {
      */
     async setStatusMessage(statusMessage, options) {
         const { isStatusMessageTerminal, level } = options || {};
-        validate(z.string(), statusMessage);
-        validate(z.boolean().optional(), isStatusMessageTerminal);
+        parseArgument(statusMessage, z.string());
+        parseArgument(isStatusMessageTerminal, z.boolean().optional());
         this._ensureActorInit('setStatusMessage');
         const loggedStatusMessage = `[Status message]: ${statusMessage}`;
         switch (level) {
@@ -591,6 +604,12 @@ export class Actor {
                 log.info(loggedStatusMessage);
                 break;
         }
+        return this.#updateRunStatusMessage(statusMessage, isStatusMessageTerminal);
+    }
+    /**
+     * Propagates a status message to the current run, without logging it locally.
+     */
+    async #updateRunStatusMessage(statusMessage, isStatusMessageTerminal) {
         const runId = this.configuration.actorRunId;
         if (runId) {
             // just to be sure, this should be fast
@@ -661,7 +680,7 @@ export class Actor {
      * @ignore
      */
     async openDataset(datasetIdOrName, options = {}) {
-        validate(z.object({ forceCloud: z.boolean().optional() }).strict(), options);
+        parseArgument(options, z.object({ forceCloud: z.boolean().optional() }).strict());
         this._ensureActorInit('openDataset');
         return this._openStorage(Dataset, datasetIdOrName, options);
     }
@@ -808,7 +827,7 @@ export class Actor {
      * @ignore
      */
     async openKeyValueStore(storeIdOrName, options = {}) {
-        validate(z.object({ forceCloud: z.boolean().optional() }).strict(), options);
+        parseArgument(options, z.object({ forceCloud: z.boolean().optional() }).strict());
         this._ensureActorInit('openKeyValueStore');
         return this._openStorage(KeyValueStore, storeIdOrName, options);
     }
@@ -831,7 +850,7 @@ export class Actor {
      * @ignore
      */
     async openRequestQueue(queueIdOrName, options = {}) {
-        validate(z.object({ forceCloud: z.boolean().optional() }).strict(), options);
+        parseArgument(options, z.object({ forceCloud: z.boolean().optional() }).strict());
         this._ensureActorInit('openRequestQueue');
         const queue = await this._openStorage(RequestQueue, queueIdOrName, options);
         return queue;

package/dist/configuration.d.ts

@@ -5,7 +5,7 @@ export declare const apifyConfigFields: {
     maxUsedCpuRatio: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber>>>;
     internalTimeoutMillis: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodNumber>>>;
     systemInfoIntervalMillis: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodNumber>>>;
-    logLevel: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodEnum<typeof import("@apify/log").LogLevel>>>>;
+    logLevel: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodEnum<typeof import("@crawlee/core").LogLevel>>>>;
     persistStorage: ConfigField<z.ZodDefault<z.ZodPreprocess<z.ZodBoolean>>>;
     storageDir: ConfigField<z.ZodDefault<z.ZodString>>;
     containerized: ConfigField<z.ZodOptional<z.ZodPreprocess<z.ZodBoolean>>>;

package/dist/proxy_configuration.js

@@ -6,9 +6,9 @@ import { z } from 'zod';
 import { APIFY_ENV_VARS, APIFY_PROXY_VALUE_REGEX } from '@apify/consts';
 import defaultLog from '@apify/log';
 import { cryptoRandomObjectId } from '@apify/utilities';
+import { parseArgument } from '@apify/validations';
 import { Actor } from './actor.js';
 import { Configuration } from './configuration.js';
-import { validate } from './utils.js';
 const CHECK_ACCESS_REQUEST_TIMEOUT_MILLIS = 4_000;
 const CHECK_ACCESS_MAX_ATTEMPTS = 2;
 const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/;
@@ -72,7 +72,7 @@ export class ProxyConfiguration extends CoreProxyConfiguration {
             ['validateRequired']: false,
         });
         this.configuration = configuration;
-        validate(z
+        parseArgument(rest, z
             .object({
             groups: z.array(z.string().regex(APIFY_PROXY_VALUE_REGEX)).optional(),
             apifyProxyGroups: z.array(z.string().regex(APIFY_PROXY_VALUE_REGEX)).optional(),
@@ -82,7 +82,7 @@ export class ProxyConfiguration extends CoreProxyConfiguration {
             apifyProxySubdivision: z.string().regex(SUBDIVISION_CODE_REGEX).optional(),
             password: z.string().optional(),
         })
-            .strict(), rest);
+            .strict());
         const { groups = [], apifyProxyGroups = [], countryCode, apifyProxyCountry, subdivisionCode, apifyProxySubdivision, password = configuration.proxyPassword, } = options;
         const groupsToUse = groups.length ? groups : apifyProxyGroups;
         const countryCodeToUse = countryCode || apifyProxyCountry;

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import type { z } from 'zod';
+export { ArgumentValidationError } from '@apify/validations';
 /**
  * Returns `true` for a plain, non-empty object (not `null`, not an array).
  * Mirrors the `ow.object.nonEmpty` predicate the SDK used previously.
@@ -10,26 +10,6 @@ export declare function isNonEmptyObject(value: unknown): value is Record<string
  * @internal
  */
 export declare function snakeCaseToCamelCase(snakeCaseStr: string): string;
-/**
- * Error thrown when an argument fails validation (e.g. by `Actor.addWebhook()`
- * or the `ProxyConfiguration` constructor).
- *
- * Its `message` is a human-readable sentence naming the offending field and the
- * value it received (see {@link formatZodError}) — not a raw JSON dump. The
- * structured zod {@link https://zod.dev | zod} issues are available on `issues`
- * (and the original `ZodError` on `cause`) for programmatic inspection.
- */
-export declare class ArgumentValidationError extends Error {
-    /** Structured issues from the underlying schema check. */
-    readonly issues: z.ZodError['issues'];
-    constructor(error: z.ZodError, value: unknown);
-}
-/**
- * Validates `value` against a zod `schema`, returning the parsed value, or
- * throwing an {@link ArgumentValidationError} if it doesn't match.
- * @internal
- */
-export declare function validate<Schema extends z.ZodType>(schema: Schema, value: unknown): z.infer<Schema>;
 /**
  * Gets info about system, node version and apify package version.
  * @internal

package/dist/utils.js

@@ -11,6 +11,7 @@ import { APIFY_ENV_VARS } from '@apify/consts';
 import log from '@apify/log';
 // @ts-ignore if we enable resolveJsonModule, we end up with `src` folder in `dist`
 import apifyPkgJson from '../package.json' with { type: 'json' };
+export { ArgumentValidationError } from '@apify/validations';
 const require = createRequire(import.meta.url);
 /**
  * Returns `true` for a plain, non-empty object (not `null`, not an array).
@@ -31,86 +32,6 @@ export function snakeCaseToCamelCase(snakeCaseStr) {
         .map((part, index) => (index > 0 ? part.charAt(0).toUpperCase() + part.slice(1) : part))
         .join('');
 }
-/** Formats a zod issue path like `groups[0]` or `countryCode`. */
-function formatIssuePath(path) {
-    let out = '';
-    for (const key of path) {
-        if (typeof key === 'number')
-            out += `[${key}]`;
-        else
-            out += out ? `.${String(key)}` : String(key);
-    }
-    return out;
-}
-/** Reads the value at `path` from the validated input, to include in the error. */
-function valueAtPath(root, path) {
-    let current = root;
-    for (const key of path) {
-        if (current === null || typeof current !== 'object')
-            return undefined;
-        current = current[key];
-    }
-    return current;
-}
-/** Renders a primitive received value for an error; skips objects/Dates (noisy). */
-function describeReceived(value) {
-    switch (typeof value) {
-        case 'string':
-            return value;
-        case 'number':
-        case 'boolean':
-        case 'bigint':
-            return String(value);
-        default:
-            return undefined;
-    }
-}
-/**
- * Formats a `ZodError` as a plain, human-readable message that names the
- * offending field *and* the value it received (e.g. ``must match pattern
- * /^[A-Z]{2}$/ at `countryCode`, got `CZE` ``) — closer to the old `ow` errors
- * than zod's default, which omits the received value.
- */
-function formatZodError(error, root) {
-    return error.issues
-        .map((issue) => {
-        const location = issue.path.length ? ` at \`${formatIssuePath(issue.path)}\`` : '';
-        const received = describeReceived(valueAtPath(root, issue.path));
-        const got = received === undefined ? '' : `, got \`${received}\``;
-        return `${issue.message}${location}${got}`;
-    })
-        .join('\n');
-}
-/**
- * Error thrown when an argument fails validation (e.g. by `Actor.addWebhook()`
- * or the `ProxyConfiguration` constructor).
- *
- * Its `message` is a human-readable sentence naming the offending field and the
- * value it received (see {@link formatZodError}) — not a raw JSON dump. The
- * structured zod {@link https://zod.dev | zod} issues are available on `issues`
- * (and the original `ZodError` on `cause`) for programmatic inspection.
- */
-export class ArgumentValidationError extends Error {
-    /** Structured issues from the underlying schema check. */
-    issues;
-    constructor(error, value) {
-        super(formatZodError(error, value), { cause: error });
-        this.name = 'ArgumentValidationError';
-        this.issues = error.issues;
-    }
-}
-/**
- * Validates `value` against a zod `schema`, returning the parsed value, or
- * throwing an {@link ArgumentValidationError} if it doesn't match.
- * @internal
- */
-export function validate(schema, value) {
-    const result = schema.safeParse(value);
-    if (!result.success) {
-        throw new ArgumentValidationError(result.error, value);
-    }
-    return result.data;
-}
 /**
  * Gets info about system, node version and apify package version.
  * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify",
-  "version": "4.0.0-beta.28",
+  "version": "4.0.0-beta.30",
   "description": "The scalable web crawling and scraping library for JavaScript/Node.js. Enables development of data extraction and web automation jobs (not only) with headless Chrome and Puppeteer.",
   "engines": {
     "node": ">=22.0.0"
@@ -53,13 +53,14 @@
     ]
   },
   "dependencies": {
-    "@apify/consts": "^2.57.2",
-    "@apify/datastructures": "^2.0.6",
-    "@apify/input_secrets": "^1.2.56",
-    "@apify/log": "^2.5.50",
-    "@apify/pseudo_url": "^2.0.91",
-    "@apify/timeout": "^0.4.10",
-    "@apify/utilities": "^2.35.7",
+    "@apify/consts": "^3.0.1",
+    "@apify/datastructures": "^3.0.1",
+    "@apify/input_secrets": "^2.0.1",
+    "@apify/log": "^3.0.1",
+    "@apify/pseudo_url": "^3.0.1",
+    "@apify/timeout": "^1.0.1",
+    "@apify/utilities": "^3.0.1",
+    "@apify/validations": "^1.0.1",
     "@crawlee/core": "^4.0.0-rc.0",
     "@crawlee/types": "^4.0.0-rc.0",
     "@crawlee/utils": "^4.0.0-rc.0",