@crawlee/impit-client 4.0.0-beta.18 → 4.0.0-beta.181

package/README.md

@@ -1,23 +1,23 @@
 <h1 align="center">
     <a href="https://crawlee.dev">
         <picture>
-          <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/apify/crawlee/master/website/static/img/crawlee-dark.svg?sanitize=true">
-          <img alt="Crawlee" src="https://raw.githubusercontent.com/apify/crawlee/master/website/static/img/crawlee-light.svg?sanitize=true" width="500">
+          <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/apify/crawlee/master/website/static/img/crawlee-dark.svg?sanitize=true" />
+          <img alt="Crawlee" src="https://raw.githubusercontent.com/apify/crawlee/master/website/static/img/crawlee-light.svg?sanitize=true" width="500" />
         </picture>
     </a>
-    <br>
+    <br />
     <small>A web scraping and browser automation library</small>
 </h1>
 
-<p align=center>
-    <a href="https://trendshift.io/repositories/5179" target="_blank"><img src="https://trendshift.io/api/badge/repositories/5179" alt="apify%2Fcrawlee | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<p align="center">
+    <a href="https://trendshift.io/repositories/5179" target="_blank"><img src="https://trendshift.io/api/badge/repositories/5179" alt="apify%2Fcrawlee | Trendshift" width="250" height="55"/></a>
 </p>
 
-<p align=center>
-    <a href="https://www.npmjs.com/package/@crawlee/core" rel="nofollow"><img src="https://img.shields.io/npm/v/@crawlee/core.svg" alt="NPM latest version" data-canonical-src="https://img.shields.io/npm/v/@crawlee/core/next.svg" style="max-width: 100%;"></a>
-    <a href="https://www.npmjs.com/package/@crawlee/core" rel="nofollow"><img src="https://img.shields.io/npm/dm/@crawlee/core.svg" alt="Downloads" data-canonical-src="https://img.shields.io/npm/dm/@crawlee/core.svg" style="max-width: 100%;"></a>
-    <a href="https://discord.gg/jyEM2PRvMU" rel="nofollow"><img src="https://img.shields.io/discord/801163717915574323?label=discord" alt="Chat on discord" data-canonical-src="https://img.shields.io/discord/801163717915574323?label=discord" style="max-width: 100%;"></a>
-    <a href="https://github.com/apify/crawlee/actions/workflows/test-ci.yml"><img src="https://github.com/apify/crawlee/actions/workflows/test-ci.yml/badge.svg?branch=master" alt="Build Status" style="max-width: 100%;"></a>
+<p align="center">
+    <a href="https://www.npmjs.com/package/@crawlee/core" rel="nofollow"><img src="https://img.shields.io/npm/v/@crawlee/core.svg" alt="NPM latest version" data-canonical-src="https://img.shields.io/npm/v/@crawlee/core/next.svg" /></a>
+    <a href="https://www.npmjs.com/package/@crawlee/core" rel="nofollow"><img src="https://img.shields.io/npm/dm/@crawlee/core.svg" alt="Downloads" data-canonical-src="https://img.shields.io/npm/dm/@crawlee/core.svg" /></a>
+    <a href="https://discord.gg/jyEM2PRvMU" rel="nofollow"><img src="https://img.shields.io/discord/801163717915574323?label=discord" alt="Chat on discord" data-canonical-src="https://img.shields.io/discord/801163717915574323?label=discord" /></a>
+    <a href="https://github.com/apify/crawlee/actions/workflows/test-ci.yml"><img src="https://github.com/apify/crawlee/actions/workflows/test-ci.yml/badge.svg?branch=master" alt="Build Status" /></a>
 </p>
 
 Crawlee covers your crawling and scraping end-to-end and **helps you build reliable scrapers. Fast.**
@@ -89,7 +89,7 @@ By default, Crawlee stores data to `./storage` in the current working directory.
 We provide automated beta builds for every merged code change in Crawlee. You can find them in the npm [list of releases](https://www.npmjs.com/package/crawlee?activeTab=versions). If you want to test new features or bug fixes before we release them, feel free to install a beta build like this:
 
 ```bash
-npm install crawlee@3.12.3-beta.13
+npm install crawlee@next
 ```
 
 If you also use the [Apify SDK](https://github.com/apify/apify-sdk-js), you need to specify dependency overrides in your `package.json` file so that you don't end up with multiple versions of Crawlee installed:
@@ -98,9 +98,9 @@ If you also use the [Apify SDK](https://github.com/apify/apify-sdk-js), you need
 {
     "overrides": {
        "apify": {
-           "@crawlee/core": "3.12.3-beta.13",
-           "@crawlee/types": "3.12.3-beta.13",
-           "@crawlee/utils": "3.12.3-beta.13"
+           "@crawlee/core": "$crawlee",
+           "@crawlee/types": "$crawlee",
+           "@crawlee/utils": "$crawlee"
        }
     }
 }

package/index.d.ts

@@ -1,41 +1,27 @@
-import type { BaseHttpClient, SendRequestOptions, StreamOptions } from '@crawlee/core';
-import type { ImpitOptions } from 'impit';
+import type { CustomFetchOptions } from '@crawlee/http-client';
+import { BaseHttpClient } from '@crawlee/http-client';
+import type { CrawleeLogger } from '@crawlee/types';
+import { type ImpitOptions } from 'impit';
 export declare const Browser: {
-    readonly Chrome: "chrome";
-    readonly Firefox: "firefox";
+    readonly Chrome: 'chrome';
+    readonly Firefox: 'firefox';
 };
 /**
- * A HTTP client implementation based on the `impit library.
+ * A HTTP client implementation based on the `impit` library.
  */
-export declare class ImpitHttpClient implements BaseHttpClient {
-    private impitOptions;
-    private maxRedirects;
-    private followRedirects;
-    /**
-     * Enables reuse of `impit` clients for the same set of options.
-     * This is useful for performance reasons, as creating
-     * a new client for each request breaks TCP connection
-     * (and other resources) reuse.
-     */
-    private clientCache;
+export declare class ImpitHttpClient extends BaseHttpClient {
+    #private;
     private getClient;
-    constructor(options?: Omit<ImpitOptions, 'proxyUrl'> & {
-        maxRedirects?: number;
-    });
     /**
-     * Common implementation for `sendRequest` and `stream` methods.
-     * @param request `HttpRequest` object
-     * @returns `HttpResponse` object
+     * @param options.cacheClients Whether to cache `impit` clients between requests. Defaults to `true`.
      */
-    private getResponse;
-    /**
-     * @inheritDoc
-     */
-    sendRequest(request: Request, options?: SendRequestOptions): Promise<Response>;
-    private getStreamWithProgress;
+    constructor(options?: Omit<ImpitOptions, 'proxyUrl' | 'timeout'> & {
+        cacheClients?: boolean;
+        logger?: CrawleeLogger;
+    });
     /**
      * @inheritDoc
      */
-    stream(request: Request, options?: StreamOptions): Promise<Response>;
+    fetch(request: Request, options?: RequestInit & CustomFetchOptions): Promise<Response>;
+    private resolveImpitBrowser;
 }
-//# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1,108 +1,103 @@
-import { Readable } from 'node:stream';
-import { ResponseWithUrl } from '@crawlee/core';
+import { BaseHttpClient, ResponseWithUrl } from '@crawlee/http-client';
 import { Impit } from 'impit';
 import { LruCache } from '@apify/datastructures';
+// Concrete impit impersonation profiles per browser family. The plain `chrome` /
+// `firefox` aliases fall back to the oldest available version, which is a
+// fingerprint giveaway — we pick one of these explicitly instead. Keep in sync
+// with impit's `Browser` type when bumping the dependency.
+const IMPIT_VERSIONS_BY_BROWSER = {
+    chrome: [
+        'chrome100',
+        'chrome101',
+        'chrome104',
+        'chrome107',
+        'chrome110',
+        'chrome116',
+        'chrome124',
+        'chrome125',
+        'chrome131',
+        'chrome136',
+        'chrome142',
+    ],
+    firefox: ['firefox128', 'firefox133', 'firefox135', 'firefox144'],
+};
 export const Browser = {
     'Chrome': 'chrome',
     'Firefox': 'firefox',
 };
 /**
- * A HTTP client implementation based on the `impit library.
+ * A HTTP client implementation based on the `impit` library.
  */
-export class ImpitHttpClient {
-    impitOptions;
-    maxRedirects;
-    followRedirects;
+export class ImpitHttpClient extends BaseHttpClient {
+    #impitOptions;
+    #cacheClients;
     /**
      * Enables reuse of `impit` clients for the same set of options.
      * This is useful for performance reasons, as creating
      * a new client for each request breaks TCP connection
      * (and other resources) reuse.
      */
-    clientCache = new LruCache({ maxLength: 10 });
+    #clientCache = new LruCache({ maxLength: 10 });
+    /**
+     * Stable impit impersonation version per fingerprint object, so the same
+     * session keeps impersonating the same browser version across requests
+     * instead of rerolling on every call.
+     */
+    #impitBrowserByFingerprint = new WeakMap();
     getClient(options) {
+        if (!this.#cacheClients) {
+            return new Impit(options);
+        }
         const { cookieJar, ...rest } = options;
         const cacheKey = JSON.stringify(rest);
-        const existingClient = this.clientCache.get(cacheKey);
+        const existingClient = this.#clientCache.get(cacheKey);
         if (existingClient && (!cookieJar || existingClient.cookieJar === cookieJar)) {
             return existingClient.client;
         }
         const client = new Impit(options);
-        this.clientCache.add(cacheKey, { client, cookieJar: cookieJar });
+        this.#clientCache.add(cacheKey, { client, cookieJar: cookieJar });
         return client;
     }
-    constructor(options) {
-        this.impitOptions = options ?? {};
-        this.maxRedirects = options?.maxRedirects ?? 10;
-        this.followRedirects = options?.followRedirects ?? true;
-    }
     /**
-     * Common implementation for `sendRequest` and `stream` methods.
-     * @param request `HttpRequest` object
-     * @returns `HttpResponse` object
+     * @param options.cacheClients Whether to cache `impit` clients between requests. Defaults to `true`.
      */
-    async getResponse(request, redirects, options) {
-        if ((redirects?.redirectCount ?? 0) > this.maxRedirects) {
-            throw new Error(`Too many redirects, maximum is ${this.maxRedirects}.`);
-        }
-        const impit = this.getClient({
-            ...this.impitOptions,
-            ...(options?.cookieJar ? { cookieJar: options?.cookieJar } : {}),
-            proxyUrl: options?.session?.proxyInfo?.url,
-            followRedirects: false,
-        });
-        const response = await impit.fetch(request, { timeout: options?.timeout });
-        if (this.followRedirects && response.status >= 300 && response.status < 400) {
-            const location = response.headers.get('location');
-            const redirectUrl = new URL(location ?? '', request.url);
-            if (!location) {
-                throw new Error('Redirect response missing location header.');
-            }
-            return this.getResponse({
-                ...request,
-                url: redirectUrl.href,
-            }, {
-                redirectCount: (redirects?.redirectCount ?? 0) + 1,
-                redirectUrls: [...(redirects?.redirectUrls ?? []), redirectUrl],
-            });
-        }
-        return {
-            response,
-            redirectUrls: redirects?.redirectUrls ?? [],
-        };
+    constructor(options) {
+        super({ logger: options?.logger });
+        const { cacheClients = true, logger: _logger, ...impitOptions } = options ?? {};
+        this.#impitOptions = impitOptions;
+        this.#cacheClients = cacheClients;
     }
     /**
      * @inheritDoc
      */
-    async sendRequest(request, options) {
-        const { response } = await this.getResponse(request, {}, options);
-        // todo - cast shouldn't be needed here, impit returns `Uint8Array`
-        return new ResponseWithUrl((await response.bytes()), response);
-    }
-    getStreamWithProgress(response) {
-        const responseStream = Readable.fromWeb(response.body);
-        let transferred = 0;
-        const total = Number(response.headers.get('content-length') ?? 0);
-        responseStream.on('data', (chunk) => {
-            transferred += chunk.length;
+    async fetch(request, options) {
+        const { proxyUrl, redirect, signal, fingerprint, ignoreTlsErrors } = options ?? {};
+        const impitBrowser = this.resolveImpitBrowser(fingerprint);
+        const impit = this.getClient({
+            ...this.#impitOptions,
+            ...(impitBrowser ? { browser: impitBrowser } : {}),
+            // The per-request flag (from the crawler option or a MITM proxy session)
+            // can only enable ignoring, never override a constructor-level `true`.
+            ...(ignoreTlsErrors ? { ignoreTlsErrors: true } : {}),
+            proxyUrl,
+            followRedirects: redirect === 'follow',
         });
-        const getDownloadProgress = () => {
-            return {
-                percent: Math.round((transferred / total) * 100),
-                transferred,
-                total,
-            };
-        };
-        return [responseStream, getDownloadProgress];
+        const response = await impit.fetch(request, { signal: signal ?? undefined });
+        // todo - cast shouldn't be needed here, impit returns `Uint8Array`
+        return new ResponseWithUrl(response.body, response);
     }
-    /**
-     * @inheritDoc
-     */
-    async stream(request, options) {
-        const { response } = await this.getResponse(request, {}, options);
-        const [stream] = this.getStreamWithProgress(response);
-        // Cast shouldn't be needed here, undici might have a slightly different `ReadableStream` type
-        return new ResponseWithUrl(Readable.toWeb(stream), response);
+    resolveImpitBrowser(fingerprint) {
+        if (!fingerprint?.browser)
+            return undefined;
+        const cached = this.#impitBrowserByFingerprint.get(fingerprint);
+        if (cached)
+            return cached;
+        // impit can only impersonate Chrome and Firefox. Map other (Chromium-based or
+        // unsupported) families like `edge`/`safari` onto Chrome so the request still
+        // carries realistic browser headers instead of impit's bare `*/*` defaults.
+        const versions = IMPIT_VERSIONS_BY_BROWSER[fingerprint.browser] ?? IMPIT_VERSIONS_BY_BROWSER.chrome;
+        const picked = versions[Math.floor(Math.random() * versions.length)];
+        this.#impitBrowserByFingerprint.set(fingerprint, picked);
+        return picked;
     }
 }
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@crawlee/impit-client",
-    "version": "4.0.0-beta.18",
+    "version": "4.0.0-beta.181",
     "description": "impit-based HTTP client implementation for Crawlee. Impersonates browser requests to avoid bot detection.",
     "engines": {
         "node": ">=22.0.0"
@@ -38,7 +38,7 @@
     },
     "homepage": "https://crawlee.dev",
     "scripts": {
-        "build": "yarn clean && yarn compile && yarn copy",
+        "build": "pnpm clean && pnpm compile && pnpm copy",
         "clean": "rimraf ./dist",
         "compile": "tsc -p tsconfig.build.json",
         "copy": "tsx ../../scripts/copy.ts"
@@ -46,15 +46,11 @@
     "publishConfig": {
         "access": "public"
     },
-    "peerDependencies": {
-        "@crawlee/core": "4.0.0"
-    },
-    "devDependencies": {
-        "@crawlee/core": "4.0.0"
-    },
     "dependencies": {
-        "@apify/datastructures": "^2.0.3",
-        "impit": "^0.7.0",
+        "@apify/datastructures": "^3.0.1",
+        "@crawlee/http-client": "4.0.0-beta.181",
+        "@crawlee/types": "4.0.0-beta.181",
+        "impit": "^0.14.2",
         "tough-cookie": "^6.0.0"
     },
     "lerna": {
@@ -64,5 +60,5 @@
             }
         }
     },
-    "gitHead": "cfaba5f4e082914d98d96d6539ab7b324d1c14c7"
+    "gitHead": "9ed15c042e37591cc2ee96f7e86d5472fece32eb"
 }

package/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEvF,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,OAAO,CAAC;AAMzD,eAAO,MAAM,OAAO;;;CAGV,CAAC;AAOX;;GAEG;AACH,qBAAa,eAAgB,YAAW,cAAc;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,eAAe,CAAU;IAEjC;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAA2F;IAE9G,OAAO,CAAC,SAAS;gBAgBL,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE;IAOhF;;;;OAIG;YACW,WAAW;IA+CzB;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAOpF,OAAO,CAAC,qBAAqB;IAqB7B;;OAEG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC;CAO7E"}

package/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}