apify-client 3.0.0-beta.87 → 3.0.0-beta.89

package/dist/resource_clients/actor_server.d.ts

@@ -0,0 +1,141 @@
+import type { Readable } from 'node:stream';
+import type { ApiClientSubResourceOptions } from '../base/api_client.js';
+import { ResourceClient } from '../base/resource_client.js';
+import type { ApifyResponse, ApifyResponseType, HttpMethod } from '../http_clients/index.js';
+import type { HttpCompressor } from '../http_compressors/base.js';
+import type { HttpCompressionAlgorithm } from '../http_compressors/resolve.js';
+import type { TimeoutOptions } from '../timeouts.js';
+/**
+ * Client for the server interface of a specific Actor.
+ *
+ * Provides methods to work with the web server of a Server Actor, such as sending it requests or getting its OpenAPI
+ * specification. Get an instance with {@link ActorClient.server}.
+ *
+ * @example
+ * ```javascript
+ * const client = new ApifyClient({ token: 'my-token' });
+ * const actorServerClient = client.actor('username/actor-name').server();
+ *
+ * const response = await actorServerClient.request('/search', { params: { q: 'apify' } });
+ * console.log(response.data);
+ * ```
+ *
+ * @see https://docs.apify.com/platform/actors/running/standby
+ */
+export declare class ActorServerClient extends ResourceClient {
+    #private;
+    /**
+     * @hidden
+     */
+    constructor(options: ApiClientSubResourceOptions);
+    /**
+     * Returns the URL of the Actor's server.
+     *
+     * The URL is the Actor's `standbyUrl`, fetched from the API by the first call of this method or
+     * {@link getOpenApiSpec} and reused by later calls on this client. Use it to call the server with another HTTP
+     * client, for example one generated from the server's OpenAPI specification.
+     *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
+     * @returns The URL of the Actor's server
+     * @throws {ApifyClientError} When the Actor is not a Server Actor.
+     * @throws {NotFoundError} When the Actor does not exist.
+     * @see https://docs.apify.com/platform/actors/running/standby
+     */
+    getUrl(options?: TimeoutOptions): Promise<string>;
+    /**
+     * Returns the OpenAPI specification of the Actor's server.
+     *
+     * The specification is the web server schema from the Actor's definition, taken from the build that serves the
+     * server interface: the build set in `actorStandby.build`, or `latest` if none is set. Use it to generate an HTTP
+     * client for the server, and point that client at the URL returned by {@link getUrl}.
+     *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for each API request. Default is `'short'`.
+     * @returns The OpenAPI specification of the Actor's server, or `undefined` if the Actor's definition doesn't
+     * include one
+     * @throws {ApifyClientError} When the Actor is not a Server Actor, or the build that serves its server interface
+     * doesn't exist.
+     * @throws {NotFoundError} When the Actor does not exist.
+     * @see https://docs.apify.com/platform/actors/development/actor-definition/web-server-schema
+     */
+    getOpenApiSpec(options?: TimeoutOptions): Promise<Record<string, unknown> | undefined>;
+    /**
+     * Sends an HTTP request to the Actor's server.
+     *
+     * The request goes to the URL returned by {@link getUrl} and carries the client's token in the
+     * `X-Apify-Authorization` header, which the platform consumes, so it never reaches the Actor's code. Headers you
+     * pass, `Authorization` included, reach the Actor's server as they are. The first request to an idle Actor waits
+     * for the platform to start a server run, which is why the timeout defaults to `'long'`.
+     *
+     * The method resolves to any response of the server, error statuses included. A rate-limit (429) or Service
+     * Unavailable (503) response is retried with the client's retry settings, and the last one is returned once the
+     * retries run out. The Actor's code can return these statuses too, and then it gets the request again. A redirect
+     * is returned as it is, since following it would send the token to a host the Actor's code picked. A browser
+     * follows redirects itself, though, so there the token goes with a redirect. Request bodies are sent uncompressed
+     * unless `compression` is set, since the Actor's server may not decode a compressed body.
+     *
+     * @template T - Type of the parsed response body.
+     * @param path - The path on the Actor's server, for example `/search`. It is always resolved against the server
+     * URL, so the request, and the token with it, can't be sent to another host. Pass the query in `params`. A
+     * fragment (`#...`) is dropped, since it's never sent to the server.
+     * @param options - Request options
+     * @param options.method - HTTP method of the request. Default is `'GET'`.
+     * @param options.params - Query parameters of the request, converted the same way as for API calls.
+     * @param options.headers - Additional headers of the request.
+     * @param options.data - Request body, serialized the same way as for API calls: a plain object or array is sent
+     * as JSON, and a string or binary value as it is.
+     * @param options.compression - Compression algorithm for the request body, as a name or an {@link HttpCompressor}.
+     * The body is compressed under the same conditions as for API calls. Set it only if the Actor's server decodes
+     * the resulting `Content-Encoding`.
+     * @param options.responseType - How to return the response body: `'parsed'` by its content type, `'buffer'` as
+     * raw bytes, or `'stream'` as a Readable stream with the body unread. A stream holds its connection open until
+     * you consume it to the end or destroy it. Node.js only. Default is `'parsed'`.
+     * @param options.timeoutSecs - Timeout for the HTTP request. Default is `'long'`. With `'stream'`, it bounds the
+     * wait for the server to start responding.
+     * @returns The response of the Actor's server, with the body in the form `responseType` asks for. An error
+     * response whose body doesn't parse as its content type comes with the raw bytes in `data`.
+     * @throws {ApifyClientError} When the Actor is not a Server Actor.
+     * @throws {InvalidResponseBodyError} When a success response's body doesn't parse as its content type, with
+     * `responseType: 'parsed'`.
+     * @throws {NotFoundError} When the Actor does not exist.
+     * @see https://docs.apify.com/platform/actors/running/standby
+     */
+    request<T = any>(path?: string, options?: ActorServerRequestOptions & {
+        responseType?: 'parsed';
+    }): Promise<ApifyResponse<T>>;
+    request(path: string, options: ActorServerRequestOptions & {
+        responseType: 'buffer';
+    }): Promise<ApifyResponse<Buffer>>;
+    request(path: string, options: ActorServerRequestOptions & {
+        responseType: 'stream';
+    }): Promise<ApifyResponse<Readable>>;
+    request(path?: string, options?: ActorServerRequestOptions): Promise<ApifyResponse>;
+}
+/**
+ * Options of {@link ActorServerClient.request}.
+ */
+export interface ActorServerRequestOptions extends TimeoutOptions {
+    /** HTTP method of the request. @default 'GET' */
+    method?: HttpMethod;
+    /** Query parameters of the request, converted the same way as for API calls. */
+    params?: Record<string, unknown>;
+    /** Additional headers of the request. */
+    headers?: Record<string, string>;
+    /**
+     * Request body, serialized the same way as for API calls: a plain object or array is sent as JSON, and a string
+     * or binary value as it is.
+     */
+    data?: unknown;
+    /**
+     * Compression algorithm for the request body, as a name or an {@link HttpCompressor}. The body is sent
+     * uncompressed when it's not set, since the Actor's server may not decode a compressed body.
+     */
+    compression?: HttpCompressionAlgorithm | HttpCompressor;
+    /**
+     * How to return the response body: `'parsed'` by its content type, `'buffer'` as raw bytes, or `'stream'` as a
+     * Readable stream with the body unread. Node.js only.
+     * @default 'parsed'
+     */
+    responseType?: ApifyResponseType;
+}

package/dist/resource_clients/actor_server.js

@@ -0,0 +1,195 @@
+import { z } from 'zod';
+import { ApifyClientError } from '../apify_client_error.js';
+import { ResourceClient } from '../base/resource_client.js';
+import { compressionSchema, resolveCompressor } from '../http_compressors/resolve.js';
+import * as schemas from '../schemas.js';
+import { timeoutOptionsSchema, timeoutOptionsShape } from '../timeouts.js';
+import { runtime } from '#runtime';
+import { parseArgument, parseResponse } from '../utils.js';
+import { BuildClient } from './build.js';
+import { BuildCollectionClient } from './build_collection.js';
+/**
+ * Statuses a server request is retried on. The platform answers with them when it can't pass a request to a server
+ * run, so a retry usually doesn't run the Actor's code again. An Actor that returns one itself gets the request again.
+ */
+const SERVER_RETRY_STATUS_CODES = [429, 503];
+const BUILD_NUMBER_PATTERN = /^(\d+)\.(\d+)\.(\d+)$/;
+/**
+ * Splits a build number like `0.1.23` into its version and sequence number, or returns `undefined` for anything else.
+ */
+function parseBuildNumber(buildNumber) {
+    const match = BUILD_NUMBER_PATTERN.exec(buildNumber ?? '');
+    if (!match)
+        return undefined;
+    return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+/**
+ * Returns whether `buildNumber` belongs to the same version as `target` and comes before it. Builds are listed newest
+ * first and the sequence numbers of a version grow over time, so meeting such a build means the target doesn't exist.
+ */
+function isOlderBuild(buildNumber, target) {
+    const parsed = parseBuildNumber(buildNumber);
+    return parsed !== undefined && parsed[0] === target[0] && parsed[1] === target[1] && parsed[2] < target[2];
+}
+const requestOptionsSchema = z.strictObject({
+    method: z
+        .enum(['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE', 'PATCH'])
+        .optional(),
+    params: z.record(z.string(), z.unknown()).optional(),
+    headers: z.record(z.string(), z.string()).optional(),
+    data: z.unknown().optional(),
+    compression: compressionSchema.optional(),
+    responseType: z.enum(['parsed', 'buffer', 'stream']).optional(),
+    ...timeoutOptionsShape,
+});
+/**
+ * Client for the server interface of a specific Actor.
+ *
+ * Provides methods to work with the web server of a Server Actor, such as sending it requests or getting its OpenAPI
+ * specification. Get an instance with {@link ActorClient.server}.
+ *
+ * @example
+ * ```javascript
+ * const client = new ApifyClient({ token: 'my-token' });
+ * const actorServerClient = client.actor('username/actor-name').server();
+ *
+ * const response = await actorServerClient.request('/search', { params: { q: 'apify' } });
+ * console.log(response.data);
+ * ```
+ *
+ * @see https://docs.apify.com/platform/actors/running/standby
+ */
+export class ActorServerClient extends ResourceClient {
+    /**
+     * The server URL. Getting it takes an API call for the Actor, so it's cached for {@link getUrl} and
+     * {@link request}. It's pending while the first lookup runs, so concurrent first calls share one API request.
+     */
+    #url;
+    /**
+     * @hidden
+     */
+    constructor(options) {
+        super({
+            resourcePath: 'actors',
+            ...options,
+        });
+    }
+    /**
+     * Returns the URL of the Actor's server.
+     *
+     * The URL is the Actor's `standbyUrl`, fetched from the API by the first call of this method or
+     * {@link getOpenApiSpec} and reused by later calls on this client. Use it to call the server with another HTTP
+     * client, for example one generated from the server's OpenAPI specification.
+     *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for the API request. Default is `'short'`.
+     * @returns The URL of the Actor's server
+     * @throws {ApifyClientError} When the Actor is not a Server Actor.
+     * @throws {NotFoundError} When the Actor does not exist.
+     * @see https://docs.apify.com/platform/actors/running/standby
+     */
+    async getUrl(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const url = (this.#url ??= this.#getServerActor(timeoutSecs, signal).then((actor) => actor.standbyUrl));
+        try {
+            return await url;
+        }
+        catch (err) {
+            // A failed lookup is not kept, so the next call tries again.
+            if (this.#url === url)
+                this.#url = undefined;
+            throw err;
+        }
+    }
+    /**
+     * Returns the OpenAPI specification of the Actor's server.
+     *
+     * The specification is the web server schema from the Actor's definition, taken from the build that serves the
+     * server interface: the build set in `actorStandby.build`, or `latest` if none is set. Use it to generate an HTTP
+     * client for the server, and point that client at the URL returned by {@link getUrl}.
+     *
+     * @param options - Request options
+     * @param options.timeoutSecs - Timeout for each API request. Default is `'short'`.
+     * @returns The OpenAPI specification of the Actor's server, or `undefined` if the Actor's definition doesn't
+     * include one
+     * @throws {ApifyClientError} When the Actor is not a Server Actor, or the build that serves its server interface
+     * doesn't exist.
+     * @throws {NotFoundError} When the Actor does not exist.
+     * @see https://docs.apify.com/platform/actors/development/actor-definition/web-server-schema
+     */
+    async getOpenApiSpec(options = {}) {
+        const { timeoutSecs = 'short', signal } = parseArgument(options, timeoutOptionsSchema, 'TimeoutOptions');
+        const actor = await this.#getServerActor(timeoutSecs, signal);
+        const buildRef = actor.actorStandby?.build || 'latest';
+        let buildId = actor.taggedBuilds?.[buildRef]?.buildId ?? undefined;
+        const targetBuildNumber = parseBuildNumber(buildRef);
+        if (buildId === undefined && targetBuildNumber !== undefined) {
+            // Not a tag, so look `buildRef` up as a build number, which the API can't resolve directly.
+            const builds = new BuildCollectionClient(this.subResourceOptions({ resourcePath: 'builds' }));
+            for await (const build of builds.list({ desc: true, timeoutSecs, signal })) {
+                if (build.buildNumber === buildRef) {
+                    buildId = build.id;
+                    break;
+                }
+                if (isOlderBuild(build.buildNumber, targetBuildNumber))
+                    break;
+            }
+        }
+        const build = buildId === undefined
+            ? undefined
+            : await new BuildClient({
+                baseUrl: this.apifyClient.baseUrl,
+                publicBaseUrl: this.apifyClient.publicBaseUrl,
+                httpClient: this.httpClient,
+                apifyClient: this.apifyClient,
+                id: buildId,
+            }).get({ timeoutSecs, signal });
+        if (build === undefined) {
+            throw new ApifyClientError(`Build ${buildRef} of Actor ${this.id} does not exist.`);
+        }
+        return build.actorDefinition?.webServerSchema;
+    }
+    async request(path = '/', options = {}) {
+        parseArgument(path, z.string());
+        const { method = 'GET', params, headers, data, compression, responseType, timeoutSecs = 'long', signal, } = parseArgument(options, requestOptionsSchema, 'ActorServerRequestOptions');
+        if (responseType === 'stream' && !runtime.isNode) {
+            throw new Error("The 'stream' response type can only be used in Node.js environment.");
+        }
+        const serverUrl = await this.getUrl({ signal });
+        const serverPath = path.split('#')[0].replace(/^\/+/, '');
+        return this.httpClient.call({
+            url: `${serverUrl.replace(/\/+$/, '')}/${serverPath}`,
+            method,
+            params,
+            headers,
+            data,
+            compression: compression === undefined ? false : resolveCompressor(compression),
+            authorizationHeader: 'X-Apify-Authorization',
+            throwOnErrorStatus: false,
+            retryStatusCodes: SERVER_RETRY_STATUS_CODES,
+            retryTransportErrors: false,
+            followRedirects: false,
+            responseType,
+            timeoutSecs,
+            signal,
+        });
+    }
+    /**
+     * Fetches the Actor, checks that it is a Server Actor, and caches its server URL.
+     */
+    async #getServerActor(timeoutSecs, signal) {
+        const response = await this.httpClient.call({
+            url: this.buildUrl(),
+            method: 'GET',
+            params: this.buildParams(),
+            timeoutSecs,
+            signal,
+        });
+        const actor = parseResponse(response, schemas.ActorResource());
+        if (!actor.standbyUrl) {
+            throw new ApifyClientError(`Actor ${this.id} is not a Server Actor.`);
+        }
+        this.#url = Promise.resolve(actor.standbyUrl);
+        return actor;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-client",
-  "version": "3.0.0-beta.87",
+  "version": "3.0.0-beta.89",
   "description": "Apify API client for JavaScript",
   "engines": {
     "node": ">=22.13.0"
@@ -66,42 +66,42 @@
     "@apify/consts": "^3.0.1",
     "@apify/log": "^3.0.1",
     "@apify/utilities": "^3.1.0",
-    "@apify/validations": "^1.1.1",
+    "@apify/validations": "^1.1.2",
     "ansi-colors": "^4.1.3",
-    "axios": "^1.20.0",
+    "axios": "^1.21.0",
     "content-type": "^3.1.1",
     "proxy-agent": "^8.0.2",
-    "tslib": "^2.8.1",
+    "tslib": "^2.9.1",
     "type-fest": "^5.10.0",
-    "zod": "^4.6.5"
+    "zod": "^4.6.7"
   },
   "devDependencies": {
     "@apify/oxlint-config": "^0.3.0",
     "@apify/tsconfig": "^0.2.0",
     "@crawlee/puppeteer": "4.0.0-rc.1",
-    "@rsbuild/core": "^2.2.10",
+    "@rsbuild/core": "^2.3.0",
     "@rsbuild/plugin-node-polyfill": "^1.4.6",
-    "@rspack/cli": "^2.2.8",
-    "@rspack/core": "^2.2.8",
+    "@rspack/cli": "^2.3.0",
+    "@rspack/core": "^2.3.0",
     "@types/compression": "^1.8.1",
     "@types/express": "^5.0.6",
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.6.6",
     "ajv": "^8.20.0",
-    "body-parser": "^2.3.0",
+    "body-parser": "^2.4.0",
     "compression": "^1.8.2",
     "esbuild": "0.28.2",
-    "express": "^5.2.1",
+    "express": "^5.3.0",
     "oxfmt": "0.75.0",
     "oxlint": "1.90.0",
     "oxlint-tsgolint": "7.0.2005",
-    "puppeteer": "^25.12.0",
+    "puppeteer": "^25.16.0",
     "rimraf": "^6.1.3",
-    "rolldown": "^1.2.11",
+    "rolldown": "^1.2.16",
     "typescript": "^7.0.2",
     "typescript-v6": "npm:typescript@^6.0.3",
-    "vitest": "^5.0.2",
-    "webpack": "^5.111.1",
-    "webpack-cli": "^7.2.3"
+    "vitest": "^5.1.0",
+    "webpack": "^5.112.2",
+    "webpack-cli": "^7.3.1"
   },
   "devEngines": {
     "packageManager": {