apify-client 3.0.0-beta.28 → 3.0.0-beta.29

package/dist/apify_client.d.ts

@@ -401,7 +401,10 @@ export declare class ApifyClient {
  * Configuration options for ApifyClient.
  */
 export interface ApifyClientOptions {
-    /** @default https://api.apify.com */
+    /**
+     * URL of the Apify API, with or without the `/v2` version path, which is appended when missing.
+     * @default https://api.apify.com
+     */
     baseUrl?: string;
     /**
      * Compression of request bodies: the name of a built-in algorithm, or an {@link HttpCompressor} for a custom
@@ -416,6 +419,8 @@ export interface ApifyClientOptions {
      */
     headers?: Record<string, string>;
     /**
+     * Publicly accessible URL of the Apify API, used in the URLs the client generates. Like `baseUrl`, with or
+     * without the `/v2` version path.
      * @default https://api.apify.com
      * @since Added in 2.17.0
      */
@@ -456,9 +461,16 @@ export interface ApifyClientOptions {
  * on the HTTP client itself.
  */
 export interface ApifyClientCustomHttpClientOptions {
-    /** @default https://api.apify.com */
+    /**
+     * URL of the Apify API, with or without the `/v2` version path, which is appended when missing.
+     * @default https://api.apify.com
+     */
     baseUrl?: string;
-    /** @default https://api.apify.com */
+    /**
+     * Publicly accessible URL of the Apify API, used in the URLs the client generates. Like `baseUrl`, with or
+     * without the `/v2` version path.
+     * @default https://api.apify.com
+     */
     publicBaseUrl?: string;
     /** Set as the HTTP client's `Authorization` header, unless it already has one. */
     token?: string;

package/dist/apify_client.js

@@ -31,6 +31,13 @@ import { Statistics } from './statistics.js';
 import { DEFAULT_TIMEOUT_LONG_SECS, DEFAULT_TIMEOUT_MAX_SECS, DEFAULT_TIMEOUT_MEDIUM_SECS, DEFAULT_TIMEOUT_SHORT_SECS, } from './timeouts.js';
 import { getEnv, parseArgument } from './utils.js';
 const DEFAULT_API_URL = 'https://api.apify.com';
+const API_VERSION_PATH = '/v2';
+function toApiBaseUrl(url) {
+    const parsed = new URL(url);
+    const path = parsed.pathname.replace(/\/+$/, '');
+    parsed.pathname = path.endsWith(API_VERSION_PATH) ? path : `${path}${API_VERSION_PATH}`;
+    return parsed.href;
+}
 const clientOptionsSchema = z.strictObject({
     baseUrl: z.string().default(DEFAULT_API_URL),
     compression: compressionSchema.default('brotli'),
@@ -105,12 +112,8 @@ export class ApifyClient {
     constructor(options = {}) {
         const parsed = parseArgument(options, clientOptionsSchema, 'ApifyClientOptions');
         const { baseUrl, compression, headers, publicBaseUrl, maxRetries, minDelayBetweenRetriesMillis, timeoutShortSecs, timeoutMediumSecs, timeoutLongSecs, timeoutMaxSecs, token, } = parsed;
-        const tempBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, baseUrl.length - 1) : baseUrl;
-        this.baseUrl = `${tempBaseUrl}/v2`;
-        const tempPublicBaseUrl = publicBaseUrl.endsWith('/')
-            ? publicBaseUrl.slice(0, publicBaseUrl.length - 1)
-            : publicBaseUrl;
-        this.publicBaseUrl = `${tempPublicBaseUrl}/v2`;
+        this.baseUrl = toApiBaseUrl(baseUrl);
+        this.publicBaseUrl = toApiBaseUrl(publicBaseUrl);
         this.token = token;
         this.stats = new Statistics();
         this.logger = logger.child({ prefix: 'ApifyClient' });