apify-client 2.23.5-beta.3 → 2.23.5-beta.30

package/dist/resource_clients/request_queue.js

@@ -43,6 +43,8 @@ const SAFETY_BUFFER_PERCENT = 0.01 / 100; // 0.01%
  * @see https://docs.apify.com/platform/storage/request-queue
  */
 class RequestQueueClient extends resource_client_1.ResourceClient {
+    clientKey;
+    timeoutMillis;
     /**
      * @hidden
      */
@@ -51,18 +53,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
             resourcePath: 'request-queues',
             ...options,
         });
-        Object.defineProperty(this, "clientKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "timeoutMillis", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.clientKey = userOptions.clientKey;
         this.timeoutMillis = userOptions.timeoutSecs ? userOptions.timeoutSecs * 1e3 : undefined;
     }
@@ -105,14 +95,13 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-head-get
      */
     async listHead(options = {}) {
-        var _a;
         (0, ow_1.default)(options, ow_1.default.object.exactShape({
             limit: ow_1.default.optional.number.not.negative,
         }));
         const response = await this.httpClient.call({
             url: this._url('head'),
             method: 'GET',
-            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 limit: options.limit,
                 clientKey: this.clientKey,
@@ -153,7 +142,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * ```
      */
     async listAndLockHead(options) {
-        var _a;
         (0, ow_1.default)(options, ow_1.default.object.exactShape({
             lockSecs: ow_1.default.number,
             limit: ow_1.default.optional.number.not.negative,
@@ -161,7 +149,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('head/lock'),
             method: 'POST',
-            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 limit: options.limit,
                 lockSecs: options.lockSecs,
@@ -209,7 +197,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * ```
      */
     async addRequest(request, options = {}) {
-        var _a;
         (0, ow_1.default)(request, ow_1.default.object.partialShape({
             id: ow_1.default.undefined,
         }));
@@ -219,7 +206,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         const response = await this.httpClient.call({
             url: this._url('requests'),
             method: 'POST',
-            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: request,
             params: this._params({
                 forefront: options.forefront,
@@ -234,7 +221,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @private
      */
     async _batchAddRequests(requests, options = {}) {
-        var _a;
         (0, ow_1.default)(requests, ow_1.default.array
             .ofType(ow_1.default.object.partialShape({
             id: ow_1.default.undefined,
@@ -247,7 +233,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         const { data } = await this.httpClient.call({
             url: this._url('requests/batch'),
             method: 'POST',
-            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: requests,
             params: this._params({
                 forefront: options.forefront,
@@ -395,7 +381,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-requests-batch-delete
      */
     async batchDeleteRequests(requests) {
-        var _a;
         (0, ow_1.default)(requests, ow_1.default.array
             .ofType(ow_1.default.any(ow_1.default.object.partialShape({ id: ow_1.default.string }), ow_1.default.object.partialShape({ uniqueKey: ow_1.default.string })))
             .minLength(1)
@@ -403,7 +388,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         const { data } = await this.httpClient.call({
             url: this._url('requests/batch'),
             method: 'DELETE',
-            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: requests,
             params: this._params({
                 clientKey: this.clientKey,
@@ -419,12 +404,11 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-request-get
      */
     async getRequest(id) {
-        var _a;
         (0, ow_1.default)(id, ow_1.default.string);
         const requestOpts = {
             url: this._url(`requests/${id}`),
             method: 'GET',
-            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params(),
         };
         try {
@@ -445,7 +429,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-request-put
      */
     async updateRequest(request, options = {}) {
-        var _a;
         (0, ow_1.default)(request, ow_1.default.object.partialShape({
             id: ow_1.default.string,
         }));
@@ -455,7 +438,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         const response = await this.httpClient.call({
             url: this._url(`requests/${request.id}`),
             method: 'PUT',
-            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             data: request,
             params: this._params({
                 forefront: options.forefront,
@@ -470,12 +453,11 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @param id - Request ID
      */
     async deleteRequest(id) {
-        var _a;
         (0, ow_1.default)(id, ow_1.default.string);
         await this.httpClient.call({
             url: this._url(`requests/${id}`),
             method: 'DELETE',
-            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 clientKey: this.clientKey,
             }),
@@ -506,7 +488,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * ```
      */
     async prolongRequestLock(id, options) {
-        var _a;
         (0, ow_1.default)(id, ow_1.default.string);
         (0, ow_1.default)(options, ow_1.default.object.exactShape({
             lockSecs: ow_1.default.number,
@@ -515,7 +496,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         const response = await this.httpClient.call({
             url: this._url(`requests/${id}/lock`),
             method: 'PUT',
-            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 forefront: options.forefront,
                 lockSecs: options.lockSecs,
@@ -535,7 +516,6 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-request-lock-delete
      */
     async deleteRequestLock(id, options = {}) {
-        var _a;
         (0, ow_1.default)(id, ow_1.default.string);
         (0, ow_1.default)(options, ow_1.default.object.exactShape({
             forefront: ow_1.default.optional.boolean,
@@ -543,7 +523,7 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         await this.httpClient.call({
             url: this._url(`requests/${id}/lock`),
             method: 'DELETE',
-            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.SMALL_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 forefront: options.forefront,
                 clientKey: this.clientKey,
@@ -570,11 +550,10 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
         })
             .validate((0, utils_1.mutuallyExclusive)('exclusiveStartId', 'cursor')));
         const getPaginatedList = async (rqListOptions = {}) => {
-            var _a;
             const response = await this.httpClient.call({
                 url: this._url('requests'),
                 method: 'GET',
-                timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+                timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
                 params: this._params({
                     ...rqListOptions,
                     filter: rqListOptions.filter ? rqListOptions.filter.join(',') : undefined,
@@ -622,11 +601,10 @@ class RequestQueueClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/request-queue-requests-unlock-post
      */
     async unlockRequests() {
-        var _a;
         const response = await this.httpClient.call({
             url: this._url('requests/unlock'),
             method: 'POST',
-            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, (_a = this.timeoutMillis) !== null && _a !== void 0 ? _a : Infinity),
+            timeout: Math.min(resource_client_1.MEDIUM_TIMEOUT_MILLIS, this.timeoutMillis ?? Infinity),
             params: this._params({
                 clientKey: this.clientKey,
             }),

package/dist/resource_clients/run.js

@@ -254,16 +254,15 @@ class RunClient extends resource_client_1.ResourceClient {
      * @see https://docs.apify.com/api/v2/post-charge-run
      */
     async charge(options) {
-        var _a, _b;
         (0, ow_1.default)(options, ow_1.default.object.exactShape({
             eventName: ow_1.default.string,
             count: ow_1.default.optional.number,
             idempotencyKey: ow_1.default.optional.string,
         }));
-        const count = (_a = options.count) !== null && _a !== void 0 ? _a : 1;
+        const count = options.count ?? 1;
         /** To avoid duplicates during the same milisecond, doesn't need to by crypto-secure. */
         const randomSuffix = (Math.random() + 1).toString(36).slice(3, 8);
-        const idempotencyKey = (_b = options.idempotencyKey) !== null && _b !== void 0 ? _b : `${this.id}-${options.eventName}-${Date.now()}-${randomSuffix}`;
+        const idempotencyKey = options.idempotencyKey ?? `${this.id}-${options.eventName}-${Date.now()}-${randomSuffix}`;
         const request = {
             url: this._url('charge'),
             method: 'POST',
@@ -385,7 +384,6 @@ class RunClient extends resource_client_1.ResourceClient {
      * Get StreamedLog for convenient streaming of the run log and their redirection.
      */
     async getStreamedLog(options = {}) {
-        var _a, _b, _c;
         const { fromStart = true } = options;
         let { toLog } = options;
         if (toLog === null || !(0, utils_1.isNode)()) {
@@ -396,10 +394,10 @@ class RunClient extends resource_client_1.ResourceClient {
             // Create default StreamedLog
             // Get actor name and run id
             const runData = await this.get();
-            const runId = (_a = runData === null || runData === void 0 ? void 0 : runData.id) !== null && _a !== void 0 ? _a : '';
-            const actorId = (_b = runData === null || runData === void 0 ? void 0 : runData.actId) !== null && _b !== void 0 ? _b : '';
+            const runId = runData?.id ?? '';
+            const actorId = runData?.actId ?? '';
             const actorData = (await this.apifyClient.actor(actorId).get()) || { name: '' };
-            const actorName = (_c = actorData === null || actorData === void 0 ? void 0 : actorData.name) !== null && _c !== void 0 ? _c : '';
+            const actorName = actorData?.name ?? '';
             const name = [actorName, `runId:${runId}`].filter(Boolean).join(' ');
             toLog = new log_1.Log({ level: log_1.LEVELS.DEBUG, prefix: `${name} -> `, logger: new log_2.LoggerActorRedirect() });
         }

package/dist/resource_clients/task.d.ts

@@ -1,8 +1,7 @@
-import { ACT_JOB_STATUSES } from '@apify/consts';
 import type { ApiClientSubResourceOptions } from '../base/api_client';
 import { ResourceClient } from '../base/resource_client';
 import type { Dictionary } from '../utils';
-import type { ActorRun, ActorStandby, ActorStartOptions } from './actor';
+import type { ActorLastRunOptions, ActorRun, ActorStandby, ActorStartOptions } from './actor';
 import { RunClient } from './run';
 import { RunCollectionClient } from './run_collection';
 import { WebhookCollectionClient } from './webhook_collection';
@@ -170,8 +169,7 @@ export type TaskUpdateData = Partial<Pick<Task, 'name' | 'title' | 'description'
 /**
  * Options for filtering the last run of a Task.
  */
-export interface TaskLastRunOptions {
-    status?: keyof typeof ACT_JOB_STATUSES;
+export interface TaskLastRunOptions extends ActorLastRunOptions {
 }
 /**
  * Options for starting a Task.

package/dist/statistics.js

@@ -4,36 +4,19 @@ exports.Statistics = void 0;
 const tslib_1 = require("tslib");
 const ow_1 = tslib_1.__importDefault(require("ow"));
 class Statistics {
-    constructor() {
-        /**
-         * Number of Apify client function calls
-         */
-        Object.defineProperty(this, "calls", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
-        /**
-         * Number of Apify API requests
-         */
-        Object.defineProperty(this, "requests", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
-        /**
-         * Number of times the API returned 429 error. Errors on first attempt are
-         * counted at index 0. First retry error counts are on index 1 and so on.
-         */
-        Object.defineProperty(this, "rateLimitErrors", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
-    }
+    /**
+     * Number of Apify client function calls
+     */
+    calls = 0;
+    /**
+     * Number of Apify API requests
+     */
+    requests = 0;
+    /**
+     * Number of times the API returned 429 error. Errors on first attempt are
+     * counted at index 0. First retry error counts are on index 1 and so on.
+     */
+    rateLimitErrors = [];
     addRateLimitError(attempt) {
         (0, ow_1.default)(attempt, ow_1.default.number.greaterThan(0));
         // attempt is never 0,

package/dist/utils.d.ts

@@ -41,10 +41,15 @@ export declare function parseDateFields(input: JsonValue, shouldParseField?: ((k
  * Helper function that converts array of webhooks to base64 string
  */
 export declare function stringifyWebhooksToBase64(webhooks: WebhookUpdateData[]): string | undefined;
+export interface CompressedValue {
+    data: Buffer;
+    encoding: 'br' | 'gzip';
+}
 /**
- * Gzip provided value, otherwise returns undefined.
+ * Compress the passed value using brotli if available or using gzip as a fallback. Returns undefined
+ * if the data is too small / wrong type.
  */
-export declare function maybeGzipValue(value: unknown): Promise<Buffer | undefined>;
+export declare function maybeCompressValue(value: unknown): Promise<CompressedValue | undefined>;
 /**
  * Helper function slice the items from array to fit the max byte length.
  */

package/dist/utils.js

@@ -5,7 +5,7 @@ exports.pluckData = pluckData;
 exports.catchNotFoundOrThrow = catchNotFoundOrThrow;
 exports.parseDateFields = parseDateFields;
 exports.stringifyWebhooksToBase64 = stringifyWebhooksToBase64;
-exports.maybeGzipValue = maybeGzipValue;
+exports.maybeCompressValue = maybeCompressValue;
 exports.sliceArrayByByteLength = sliceArrayByByteLength;
 exports.isNode = isNode;
 exports.isBuffer = isBuffer;
@@ -19,7 +19,7 @@ const ow_1 = tslib_1.__importDefault(require("ow"));
 const NOT_FOUND_STATUS_CODE = 404;
 const RECORD_NOT_FOUND_TYPE = 'record-not-found';
 const RECORD_OR_TOKEN_NOT_FOUND_TYPE = 'record-or-token-not-found';
-const MIN_GZIP_BYTES = 1024;
+const MIN_COMPRESS_BYTES = 1024;
 /**
  * Returns object's 'data' property or throws if parameter is not an object,
  * or an object without a 'data' property.
@@ -99,26 +99,59 @@ function stringifyWebhooksToBase64(webhooks) {
 }
 let gzipPromisified;
 /**
- * Gzip provided value, otherwise returns undefined.
+ * Gzip-compress the provided value.
  */
-async function maybeGzipValue(value) {
-    if (!isNode())
-        return;
-    if (typeof value !== 'string' && !Buffer.isBuffer(value))
-        return;
-    // Request compression is not that important so let's
-    // skip it instead of throwing for unsupported types.
-    const areDataLargeEnough = Buffer.byteLength(value) >= MIN_GZIP_BYTES;
-    if (areDataLargeEnough) {
-        if (!gzipPromisified) {
-            const { promisify } = await import('node:util');
-            const { gzip } = await import('node:zlib');
-            gzipPromisified = promisify(gzip);
+async function gzipValue(value) {
+    if (!gzipPromisified) {
+        const { promisify } = await import('node:util');
+        const { gzip } = await import('node:zlib');
+        gzipPromisified = promisify(gzip);
+    }
+    return gzipPromisified(value);
+}
+// null = confirmed unavailable; undefined = not yet checked
+let brotliCompressPromisified;
+/**
+ * Brotli-compress the provided value, or return undefined if brotli is unavailable
+ * (Node.js < v10.16.0), this is a strict defensive guard.
+ */
+async function maybeBrotliValue(value) {
+    if (brotliCompressPromisified === undefined) {
+        const { promisify } = await import('node:util');
+        const { brotliCompress, constants } = await import('node:zlib');
+        if (typeof brotliCompress === 'function') {
+            const compress = promisify(brotliCompress);
+            brotliCompressPromisified = async (value) => compress(value, { params: { [constants.BROTLI_PARAM_QUALITY]: 6 } });
         }
-        return gzipPromisified(value);
+        else {
+            brotliCompressPromisified = null;
+        }
+    }
+    if (brotliCompressPromisified !== null) {
+        return brotliCompressPromisified(value);
     }
     return undefined;
 }
+/**
+ * Compress the passed value using brotli if available or using gzip as a fallback. Returns undefined
+ * if the data is too small / wrong type.
+ */
+async function maybeCompressValue(value) {
+    if (!isNode())
+        return undefined;
+    // Request compression is not that important so let's
+    // skip it instead of throwing for unsupported types.
+    if (typeof value !== 'string' && !Buffer.isBuffer(value))
+        return undefined;
+    const areDataLargeEnough = Buffer.byteLength(value) >= MIN_COMPRESS_BYTES;
+    if (!areDataLargeEnough)
+        return undefined;
+    const brotli = await maybeBrotliValue(value);
+    if (brotli)
+        return { data: brotli, encoding: 'br' };
+    const gzipped = await gzipValue(value);
+    return { data: gzipped, encoding: 'gzip' };
+}
 /**
  * Helper function slice the items from array to fit the max byte length.
  */
@@ -165,37 +198,12 @@ function getVersionData() {
  * Helper class to create async iterators from paginated list endpoints with exclusive start key.
  */
 class RequestQueuePaginationIterator {
+    maxPageLimit;
+    getPage;
+    limit;
+    exclusiveStartId;
+    cursor;
     constructor(options) {
-        Object.defineProperty(this, "maxPageLimit", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "getPage", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "limit", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "exclusiveStartId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cursor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.maxPageLimit = options.maxPageLimit;
         this.limit = options.limit;
         this.exclusiveStartId = options.exclusiveStartId;
@@ -243,7 +251,7 @@ function asArray(value) {
  * Adds query parameters to a given URL based on the provided options object.
  */
 function applyQueryParamsToUrl(url, options) {
-    for (const [key, value] of Object.entries(options !== null && options !== void 0 ? options : {})) {
+    for (const [key, value] of Object.entries(options ?? {})) {
         // skip undefined values
         if (value === undefined)
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-client",
-  "version": "2.23.5-beta.3",
+  "version": "2.23.5-beta.30",
   "description": "Apify API client for JavaScript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -63,8 +63,8 @@
     "type-fest": "^4.0.0"
   },
   "devDependencies": {
-    "@apify/oxlint-config": "^0.2.5",
-    "@apify/tsconfig": "^0.1.2",
+    "@apify/oxlint-config": "^0.3.0",
+    "@apify/tsconfig": "^0.2.0",
     "@crawlee/puppeteer": "^3.2.2",
     "@rsbuild/core": "^2.0.0",
     "@rsbuild/plugin-node-polyfill": "^1.3.0",
@@ -81,9 +81,9 @@
     "esbuild": "0.28.1",
     "express": "^5.0.0",
     "gen-esm-wrapper": "^1.1.2",
-    "oxfmt": "0.53.0",
-    "oxlint": "1.69.0",
-    "oxlint-tsgolint": "0.23.0",
+    "oxfmt": "0.59.0",
+    "oxlint": "1.74.0",
+    "oxlint-tsgolint": "0.24.0",
     "puppeteer": "^25.0.0",
     "rimraf": "^6.0.0",
     "rolldown": "^1.0.0-rc.4",