@remotion/renderer 4.0.0-lambda.1 → 4.0.0-newpathfunctions.13

package/dist/browser/NetworkEventManager.js

@@ -9,50 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkEventManager = void 0;
 class NetworkEventManager {
     constructor() {
-        /*
-         * There are four possible orders of events:
-         *  A. `_onRequestWillBeSent`
-         *  B. `_onRequestWillBeSent`, `_onRequestPaused`
-         *  C. `_onRequestPaused`, `_onRequestWillBeSent`
-         *  D. `_onRequestPaused`, `_onRequestWillBeSent`, `_onRequestPaused`,
-         *     `_onRequestWillBeSent`, `_onRequestPaused`, `_onRequestPaused`
-         *     (see crbug.com/1196004)
-         *
-         * For `_onRequest` we need the event from `_onRequestWillBeSent` and
-         * optionally the `interceptionId` from `_onRequestPaused`.
-         *
-         * If request interception is disabled, call `_onRequest` once per call to
-         * `_onRequestWillBeSent`.
-         * If request interception is enabled, call `_onRequest` once per call to
-         * `_onRequestPaused` (once per `interceptionId`).
-         *
-         * Events are stored to allow for subsequent events to call `_onRequest`.
-         *
-         * Note that (chains of) redirect requests have the same `requestId` (!) as
-         * the original request. We have to anticipate series of events like these:
-         *  A. `_onRequestWillBeSent`,
-         *     `_onRequestWillBeSent`, ...
-         *  B. `_onRequestWillBeSent`, `_onRequestPaused`,
-         *     `_onRequestWillBeSent`, `_onRequestPaused`, ...
-         *  C. `_onRequestWillBeSent`, `_onRequestPaused`,
-         *     `_onRequestPaused`, `_onRequestWillBeSent`, ...
-         *  D. `_onRequestPaused`, `_onRequestWillBeSent`,
-         *     `_onRequestPaused`, `_onRequestWillBeSent`, `_onRequestPaused`,
-         *     `_onRequestWillBeSent`, `_onRequestPaused`, `_onRequestPaused`, ...
-         *     (see crbug.com/1196004)
-         */
         _NetworkEventManager_requestWillBeSentMap.set(this, new Map());
         _NetworkEventManager_requestPausedMap.set(this, new Map());
         _NetworkEventManager_httpRequestsMap.set(this, new Map());
-        /*
-         * The below maps are used to reconcile Network.responseReceivedExtraInfo
-         * events with their corresponding request. Each response and redirect
-         * response gets an ExtraInfo event, and we don't know which will come first.
-         * This means that we have to store a Response or an ExtraInfo for each
-         * response, and emit the event when we get both of them. In addition, to
-         * handle redirects, we have to make them Arrays to represent the chain of
-         * events.
-         */
         _NetworkEventManager_responseReceivedExtraInfoMap.set(this, new Map());
         _NetworkEventManager_queuedRedirectInfoMap.set(this, new Map());
         _NetworkEventManager_queuedEventGroupMap.set(this, new Map());
@@ -96,12 +55,6 @@ class NetworkEventManager {
     forgetRequestWillBeSent(networkRequestId) {
         __classPrivateFieldGet(this, _NetworkEventManager_requestWillBeSentMap, "f").delete(networkRequestId);
     }
-    getRequestPaused(networkRequestId) {
-        return __classPrivateFieldGet(this, _NetworkEventManager_requestPausedMap, "f").get(networkRequestId);
-    }
-    forgetRequestPaused(networkRequestId) {
-        __classPrivateFieldGet(this, _NetworkEventManager_requestPausedMap, "f").delete(networkRequestId);
-    }
     storeRequestPaused(networkRequestId, event) {
         __classPrivateFieldGet(this, _NetworkEventManager_requestPausedMap, "f").set(networkRequestId, event);
     }

package/dist/browser/NetworkManager.d.ts

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ProtocolMapping } from 'devtools-protocol/types/protocol-mapping';
+import type { Commands } from './devtools-commands';
 import { EventEmitter } from './EventEmitter';
-import { Frame } from './FrameManager';
+import type { Frame } from './FrameManager';
 export declare const NetworkManagerEmittedEvents: {
     readonly Request: symbol;
 };
 interface CDPSession extends EventEmitter {
-    send<T extends keyof ProtocolMapping.Commands>(method: T, ...paramArgs: ProtocolMapping.Commands[T]['paramsType']): Promise<ProtocolMapping.Commands[T]['returnType']>;
+    send<T extends keyof Commands>(method: T, ...paramArgs: Commands[T]['paramsType']): Promise<Commands[T]['returnType']>;
 }
 interface FrameManager {
     frame(frameId: string): Frame | null;
@@ -29,8 +29,6 @@ export declare class NetworkManager extends EventEmitter {
     #private;
     constructor(client: CDPSession, frameManager: FrameManager);
     initialize(): Promise<void>;
-    setExtraHTTPHeaders(extraHTTPHeaders: Record<string, string>): Promise<void>;
-    extraHTTPHeaders(): Record<string, string>;
     numRequestsInProgress(): number;
 }
 export {};

package/dist/browser/NetworkManager.js

@@ -25,15 +25,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _NetworkManager_instances, _NetworkManager_client, _NetworkManager_frameManager, _NetworkManager_networkEventManager, _NetworkManager_extraHTTPHeaders, _NetworkManager_attemptedAuthentications, _NetworkManager_onRequestWillBeSent, _NetworkManager_onAuthRequired, _NetworkManager_onRequestPaused, _NetworkManager_patchRequestEventHeaders, _NetworkManager_onRequest, _NetworkManager_onRequestServedFromCache, _NetworkManager_handleRequestRedirect, _NetworkManager_emitResponseEvent, _NetworkManager_onResponseReceived, _NetworkManager_onResponseReceivedExtraInfo, _NetworkManager_forgetRequest, _NetworkManager_onLoadingFinished, _NetworkManager_emitLoadingFinished, _NetworkManager_onLoadingFailed, _NetworkManager_emitLoadingFailed;
+var _NetworkManager_instances, _NetworkManager_client, _NetworkManager_frameManager, _NetworkManager_networkEventManager, _NetworkManager_onRequestWillBeSent, _NetworkManager_onRequestPaused, _NetworkManager_patchRequestEventHeaders, _NetworkManager_onRequest, _NetworkManager_onRequestServedFromCache, _NetworkManager_handleRequestRedirect, _NetworkManager_emitResponseEvent, _NetworkManager_onResponseReceived, _NetworkManager_onResponseReceivedExtraInfo, _NetworkManager_forgetRequest, _NetworkManager_onLoadingFinished, _NetworkManager_emitLoadingFinished, _NetworkManager_onLoadingFailed, _NetworkManager_emitLoadingFailed;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkManager = exports.NetworkManagerEmittedEvents = void 0;
-const assert_1 = require("./assert");
 const EventEmitter_1 = require("./EventEmitter");
 const HTTPRequest_1 = require("./HTTPRequest");
 const HTTPResponse_1 = require("./HTTPResponse");
 const NetworkEventManager_1 = require("./NetworkEventManager");
-const util_1 = require("./util");
 exports.NetworkManagerEmittedEvents = {
     Request: Symbol('NetworkManager.Request'),
 };
@@ -44,12 +42,9 @@ class NetworkManager extends EventEmitter_1.EventEmitter {
         _NetworkManager_client.set(this, void 0);
         _NetworkManager_frameManager.set(this, void 0);
         _NetworkManager_networkEventManager.set(this, new NetworkEventManager_1.NetworkEventManager());
-        _NetworkManager_extraHTTPHeaders.set(this, {});
-        _NetworkManager_attemptedAuthentications.set(this, new Set());
         __classPrivateFieldSet(this, _NetworkManager_client, client, "f");
         __classPrivateFieldSet(this, _NetworkManager_frameManager, frameManager, "f");
         __classPrivateFieldGet(this, _NetworkManager_client, "f").on('Fetch.requestPaused', __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onRequestPaused).bind(this));
-        __classPrivateFieldGet(this, _NetworkManager_client, "f").on('Fetch.authRequired', __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onAuthRequired).bind(this));
         __classPrivateFieldGet(this, _NetworkManager_client, "f").on('Network.requestWillBeSent', __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onRequestWillBeSent).bind(this));
         __classPrivateFieldGet(this, _NetworkManager_client, "f").on('Network.requestServedFromCache', __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onRequestServedFromCache).bind(this));
         __classPrivateFieldGet(this, _NetworkManager_client, "f").on('Network.responseReceived', __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onResponseReceived).bind(this));
@@ -60,42 +55,13 @@ class NetworkManager extends EventEmitter_1.EventEmitter {
     async initialize() {
         await __classPrivateFieldGet(this, _NetworkManager_client, "f").send('Network.enable');
     }
-    async setExtraHTTPHeaders(extraHTTPHeaders) {
-        __classPrivateFieldSet(this, _NetworkManager_extraHTTPHeaders, {}, "f");
-        for (const key of Object.keys(extraHTTPHeaders)) {
-            const value = extraHTTPHeaders[key];
-            (0, assert_1.assert)((0, util_1.isString)(value), `Expected value of header "${key}" to be String, but "${typeof value}" is found.`);
-            __classPrivateFieldGet(this, _NetworkManager_extraHTTPHeaders, "f")[key.toLowerCase()] = value;
-        }
-        await __classPrivateFieldGet(this, _NetworkManager_client, "f").send('Network.setExtraHTTPHeaders', {
-            headers: __classPrivateFieldGet(this, _NetworkManager_extraHTTPHeaders, "f"),
-        });
-    }
-    extraHTTPHeaders() {
-        return { ...__classPrivateFieldGet(this, _NetworkManager_extraHTTPHeaders, "f") };
-    }
     numRequestsInProgress() {
         return __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").numRequestsInProgress();
     }
 }
 exports.NetworkManager = NetworkManager;
-_NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakMap(), _NetworkManager_networkEventManager = new WeakMap(), _NetworkManager_extraHTTPHeaders = new WeakMap(), _NetworkManager_attemptedAuthentications = new WeakMap(), _NetworkManager_instances = new WeakSet(), _NetworkManager_onRequestWillBeSent = function _NetworkManager_onRequestWillBeSent(event) {
+_NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakMap(), _NetworkManager_networkEventManager = new WeakMap(), _NetworkManager_instances = new WeakSet(), _NetworkManager_onRequestWillBeSent = function _NetworkManager_onRequestWillBeSent(event) {
     __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onRequest).call(this, event, undefined);
-}, _NetworkManager_onAuthRequired = function _NetworkManager_onAuthRequired(event) {
-    let response = 'Default';
-    if (__classPrivateFieldGet(this, _NetworkManager_attemptedAuthentications, "f").has(event.requestId)) {
-        response = 'CancelAuth';
-    }
-    const { username, password } = {
-        username: undefined,
-        password: undefined,
-    };
-    __classPrivateFieldGet(this, _NetworkManager_client, "f")
-        .send('Fetch.continueWithAuth', {
-        requestId: event.requestId,
-        authChallengeResponse: { response, username, password },
-    })
-        .catch(() => undefined);
 }, _NetworkManager_onRequestPaused = function _NetworkManager_onRequestPaused(event) {
     const { networkId: networkRequestId, requestId: fetchRequestId } = event;
     if (!networkRequestId) {
@@ -126,7 +92,6 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
         ...requestPausedEvent.request.headers,
     };
 }, _NetworkManager_onRequest = function _NetworkManager_onRequest(event, fetchRequestId) {
-    let redirectChain = [];
     if (event.redirectResponse) {
         // We want to emit a response and requestfinished for the
         // redirectResponse, but we can't do so unless we have a
@@ -153,13 +118,12 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
         // requestWillBeSent event.
         if (_request) {
             __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_handleRequestRedirect).call(this, _request, event.redirectResponse, redirectResponseExtraInfo);
-            redirectChain = _request._redirectChain;
         }
     }
     const frame = event.frameId
         ? __classPrivateFieldGet(this, _NetworkManager_frameManager, "f").frame(event.frameId)
         : null;
-    const request = new HTTPRequest_1.HTTPRequest(frame, event, redirectChain);
+    const request = new HTTPRequest_1.HTTPRequest(frame, event);
     __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").storeRequest(event.requestId, request);
     this.emit(exports.NetworkManagerEmittedEvents.Request, request);
 }, _NetworkManager_onRequestServedFromCache = function _NetworkManager_onRequestServedFromCache(event) {
@@ -168,10 +132,8 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
         request._fromMemoryCache = true;
     }
 }, _NetworkManager_handleRequestRedirect = function _NetworkManager_handleRequestRedirect(request, responsePayload, extraInfo) {
-    const response = new HTTPResponse_1.HTTPResponse(__classPrivateFieldGet(this, _NetworkManager_client, "f"), request, responsePayload, extraInfo);
+    const response = new HTTPResponse_1.HTTPResponse(responsePayload, extraInfo);
     request._response = response;
-    request._redirectChain.push(request);
-    response._resolveBody(new Error('Response body is unavailable for redirect responses'));
     __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_forgetRequest).call(this, request, false);
 }, _NetworkManager_emitResponseEvent = function _NetworkManager_emitResponseEvent(responseReceived, extraInfo) {
     const request = __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").getRequest(responseReceived.requestId);
@@ -179,12 +141,8 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
     if (!request) {
         return;
     }
-    const extraInfos = __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").responseExtraInfo(responseReceived.requestId);
-    if (extraInfos.length) {
-        console.log(new Error('Unexpected extraInfo events for request ' +
-            responseReceived.requestId));
-    }
-    const response = new HTTPResponse_1.HTTPResponse(__classPrivateFieldGet(this, _NetworkManager_client, "f"), request, responseReceived.response, extraInfo);
+    __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").responseExtraInfo(responseReceived.requestId);
+    const response = new HTTPResponse_1.HTTPResponse(responseReceived.response, extraInfo);
     request._response = response;
 }, _NetworkManager_onResponseReceived = function _NetworkManager_onResponseReceived(event) {
     const request = __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").getRequest(event.requestId);
@@ -245,18 +203,12 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
         __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_emitLoadingFinished).call(this, event);
     }
 }, _NetworkManager_emitLoadingFinished = function _NetworkManager_emitLoadingFinished(event) {
-    var _a;
     const request = __classPrivateFieldGet(this, _NetworkManager_networkEventManager, "f").getRequest(event.requestId);
     // For certain requestIds we never receive requestWillBeSent event.
     // @see https://crbug.com/750469
     if (!request) {
         return;
     }
-    // Under certain conditions we never get the Network.responseReceived
-    // event from protocol. @see https://crbug.com/883475
-    if (request.response()) {
-        (_a = request.response()) === null || _a === void 0 ? void 0 : _a._resolveBody(null);
-    }
     __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_forgetRequest).call(this, request, true);
 }, _NetworkManager_onLoadingFailed = function _NetworkManager_onLoadingFailed(event) {
     // If the response event for this request is still waiting on a
@@ -275,10 +227,5 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
     if (!request) {
         return;
     }
-    request._failureText = event.errorText;
-    const response = request.response();
-    if (response) {
-        response._resolveBody(null);
-    }
     __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_forgetRequest).call(this, request, true);
 };

package/dist/browser/NodeWebSocketTransport.d.ts

@@ -1,11 +1,17 @@
-import NodeWebSocket from 'ws';
-import { ConnectionTransport } from './ConnectionTransport';
+import type { WS } from '../ws/ws-types';
+interface ConnectionTransport {
+    send(message: string): void;
+    close(): void;
+    onmessage?: (message: string) => void;
+    onclose?: () => void;
+}
 export declare class NodeWebSocketTransport implements ConnectionTransport {
     #private;
     static create(urlString: string): Promise<NodeWebSocketTransport>;
-    onmessage?: (message: NodeWebSocket.Data) => void;
+    onmessage?: (message: string) => void;
     onclose?: () => void;
-    constructor(ws: NodeWebSocket);
+    constructor(ws: WS);
     send(message: string): void;
     close(): void;
 }
+export {};

package/dist/browser/NodeWebSocketTransport.js

@@ -10,9 +10,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _NodeWebSocketTransport_ws;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeWebSocketTransport = void 0;
@@ -33,7 +30,7 @@ exports.NodeWebSocketTransport = void 0;
  */
 const dns_1 = require("dns");
 const url_1 = require("url");
-const ws_1 = __importDefault(require("ws"));
+const ws_types_1 = require("../ws/ws-types");
 class NodeWebSocketTransport {
     constructor(ws) {
         _NodeWebSocketTransport_ws.set(this, void 0);
@@ -52,7 +49,7 @@ class NodeWebSocketTransport {
         __classPrivateFieldGet(this, _NodeWebSocketTransport_ws, "f").addEventListener('error', () => undefined);
     }
     static async create(urlString) {
-        // TODO(jrandolf): Starting in Node 17, IPv6 is favoured over IPv4 due to a change
+        // Starting in Node 17, IPv6 is favoured over IPv4 due to a change
         // in a default option:
         // - https://github.com/nodejs/node/issues/40537,
         // Due to this, for Firefox, we must parse and resolve the `localhost` hostname
@@ -65,10 +62,10 @@ class NodeWebSocketTransport {
             url.hostname = address;
         }
         return new Promise((resolve, reject) => {
-            const ws = new ws_1.default(url, [], {
+            const ws = new ws_types_1.ws(url, [], {
                 followRedirects: true,
                 perMessageDeflate: false,
-                maxPayload: 256 * 1024 * 1024,
+                maxPayload: 1024 * 1024 * 1024,
                 headers: {
                     'User-Agent': `Remotion CLI`,
                 },

package/dist/browser/PuppeteerNode.d.ts

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Browser } from './Browser';
-import { BrowserConnectOptions, ConnectToBrowserOptions } from './BrowserConnector';
-import { BrowserFetcher, BrowserFetcherOptions } from './BrowserFetcher';
-import { ProductLauncher } from './Launcher';
-import { BrowserLaunchArgumentOptions, LaunchOptions } from './LaunchOptions';
-import { Product } from './Product';
+import type { Browser } from './Browser';
+import type { BrowserConnectOptions } from './BrowserConnector';
+import type { BrowserFetcherOptions } from './BrowserFetcher';
+import { BrowserFetcher } from './BrowserFetcher';
+import type { ProductLauncher } from './Launcher';
+import type { BrowserLaunchArgumentOptions, LaunchOptions } from './LaunchOptions';
+import type { Product } from './Product';
 interface PuppeteerLaunchOptions extends LaunchOptions, BrowserLaunchArgumentOptions, BrowserConnectOptions {
     product?: Product;
     extraPrefsFirefox?: Record<string, unknown>;
@@ -30,63 +31,10 @@ export declare class PuppeteerNode {
         preferredRevision: string;
         productName?: Product;
     });
-    connect(options: ConnectToBrowserOptions & {
-        product: Product;
-    }): Promise<Browser>;
-    get _productName(): Product | undefined;
-    set _productName(name: Product | undefined);
-    /**
-     * Launches puppeteer and launches a browser instance with given arguments
-     * and options when specified.
-     *
-     * @remarks
-     *
-     * @example
-     * You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
-     * ```js
-     * const browser = await puppeteer.launch({
-     *   ignoreDefaultArgs: ['--mute-audio']
-     * });
-     * ```
-     *
-     * **NOTE** Puppeteer can also be used to control the Chrome browser,
-     * but it works best with the version of Chromium it is bundled with.
-     * There is no guarantee it will work with any other version.
-     * Use `executablePath` option with extreme caution.
-     * If Google Chrome (rather than Chromium) is preferred, a {@link https://www.google.com/chrome/browser/canary.html | Chrome Canary} or {@link https://www.chromium.org/getting-involved/dev-channel | Dev Channel} build is suggested.
-     * In `puppeteer.launch([options])`, any mention of Chromium also applies to Chrome.
-     * See {@link https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/ | this article} for a description of the differences between Chromium and Chrome. {@link https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md | This article} describes some differences for Linux users.
-     *
-     * @param options - Set of configurable options to set on the browser.
-     * @returns Promise which resolves to browser instance.
-     */
     launch(options: PuppeteerLaunchOptions): Promise<Browser>;
-    /**
-     * @remarks
-     *
-     * **NOTE** `puppeteer.executablePath()` is affected by the `PUPPETEER_EXECUTABLE_PATH`
-     * and `PUPPETEER_CHROMIUM_REVISION` environment variables.
-     *
-     * @returns A path where Puppeteer expects to find the bundled browser.
-     * The browser binary might not be there if the download was skipped with
-     * the `PUPPETEER_SKIP_DOWNLOAD` environment variable.
-     */
     executablePath(channel?: string): string;
     get _launcher(): ProductLauncher;
-    /**
-     * The name of the browser that is under automation (`"chrome"` or `"firefox"`)
-     *
-     * @remarks
-     * The product is set by the `PUPPETEER_PRODUCT` environment variable or the `product`
-     * option in `puppeteer.launch([options])` and defaults to `chrome`.
-     * Firefox support is experimental.
-     */
     get product(): string;
-    /**
-     * @param options - Set of configurable options to specify the settings
-     * of the BrowserFetcher.
-     * @returns A new BrowserFetcher instance.
-     */
     createBrowserFetcher(options: BrowserFetcherOptions): BrowserFetcher;
 }
 export {};

package/dist/browser/PuppeteerNode.js

@@ -25,15 +25,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _PuppeteerNode_lazyLauncher, _PuppeteerNode_productName;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PuppeteerNode = void 0;
-const BrowserConnector_1 = require("./BrowserConnector");
 const BrowserFetcher_1 = require("./BrowserFetcher");
-const Launcher_1 = __importDefault(require("./Launcher"));
+const Launcher_1 = require("./Launcher");
 const revisions_1 = require("./revisions");
 class PuppeteerNode {
     constructor(settings) {
@@ -42,99 +38,34 @@ class PuppeteerNode {
         const { preferredRevision, productName } = settings;
         __classPrivateFieldSet(this, _PuppeteerNode_productName, productName, "f");
         this._preferredRevision = preferredRevision;
-        this.connect = this.connect.bind(this);
         this.launch = this.launch.bind(this);
         this.executablePath = this.executablePath.bind(this);
         this.createBrowserFetcher = this.createBrowserFetcher.bind(this);
     }
-    connect(options) {
-        if (options.product) {
-            this._productName = options.product;
-        }
-        return (0, BrowserConnector_1._connectToBrowser)(options);
-    }
-    get _productName() {
-        return __classPrivateFieldGet(this, _PuppeteerNode_productName, "f");
-    }
-    set _productName(name) {
-        __classPrivateFieldSet(this, _PuppeteerNode_productName, name, "f");
-    }
-    /**
-     * Launches puppeteer and launches a browser instance with given arguments
-     * and options when specified.
-     *
-     * @remarks
-     *
-     * @example
-     * You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
-     * ```js
-     * const browser = await puppeteer.launch({
-     *   ignoreDefaultArgs: ['--mute-audio']
-     * });
-     * ```
-     *
-     * **NOTE** Puppeteer can also be used to control the Chrome browser,
-     * but it works best with the version of Chromium it is bundled with.
-     * There is no guarantee it will work with any other version.
-     * Use `executablePath` option with extreme caution.
-     * If Google Chrome (rather than Chromium) is preferred, a {@link https://www.google.com/chrome/browser/canary.html | Chrome Canary} or {@link https://www.chromium.org/getting-involved/dev-channel | Dev Channel} build is suggested.
-     * In `puppeteer.launch([options])`, any mention of Chromium also applies to Chrome.
-     * See {@link https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/ | this article} for a description of the differences between Chromium and Chrome. {@link https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md | This article} describes some differences for Linux users.
-     *
-     * @param options - Set of configurable options to set on the browser.
-     * @returns Promise which resolves to browser instance.
-     */
     launch(options) {
         if (options.product) {
-            this._productName = options.product;
+            __classPrivateFieldSet(this, _PuppeteerNode_productName, options.product, "f");
         }
         return this._launcher.launch(options);
     }
-    /**
-     * @remarks
-     *
-     * **NOTE** `puppeteer.executablePath()` is affected by the `PUPPETEER_EXECUTABLE_PATH`
-     * and `PUPPETEER_CHROMIUM_REVISION` environment variables.
-     *
-     * @returns A path where Puppeteer expects to find the bundled browser.
-     * The browser binary might not be there if the download was skipped with
-     * the `PUPPETEER_SKIP_DOWNLOAD` environment variable.
-     */
     executablePath(channel) {
         return this._launcher.executablePath(channel);
     }
     get _launcher() {
         if (!__classPrivateFieldGet(this, _PuppeteerNode_lazyLauncher, "f") ||
-            __classPrivateFieldGet(this, _PuppeteerNode_lazyLauncher, "f").product !== this._productName) {
-            switch (this._productName) {
-                case 'firefox':
-                    this._preferredRevision = revisions_1.PUPPETEER_REVISIONS.firefox;
-                    break;
+            __classPrivateFieldGet(this, _PuppeteerNode_lazyLauncher, "f").product !== __classPrivateFieldGet(this, _PuppeteerNode_productName, "f")) {
+            switch (__classPrivateFieldGet(this, _PuppeteerNode_productName, "f")) {
                 case 'chrome':
                 default:
                     this._preferredRevision = revisions_1.PUPPETEER_REVISIONS.chromium;
             }
-            // eslint-disable-next-line new-cap
-            __classPrivateFieldSet(this, _PuppeteerNode_lazyLauncher, (0, Launcher_1.default)(this._preferredRevision, this._productName), "f");
+            __classPrivateFieldSet(this, _PuppeteerNode_lazyLauncher, new Launcher_1.ChromeLauncher(this._preferredRevision), "f");
         }
         return __classPrivateFieldGet(this, _PuppeteerNode_lazyLauncher, "f");
     }
-    /**
-     * The name of the browser that is under automation (`"chrome"` or `"firefox"`)
-     *
-     * @remarks
-     * The product is set by the `PUPPETEER_PRODUCT` environment variable or the `product`
-     * option in `puppeteer.launch([options])` and defaults to `chrome`.
-     * Firefox support is experimental.
-     */
     get product() {
         return this._launcher.product;
     }
-    /**
-     * @param options - Set of configurable options to specify the settings
-     * of the BrowserFetcher.
-     * @returns A new BrowserFetcher instance.
-     */
     createBrowserFetcher(options) {
         return new BrowserFetcher_1.BrowserFetcher(options);
     }

package/dist/browser/ScreenshotOptions.d.ts

@@ -1,14 +0,0 @@
-interface ScreenshotClip {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-}
-export interface ScreenshotOptions {
-    type: 'png' | 'jpeg';
-    path?: string;
-    clip?: ScreenshotClip;
-    quality?: number;
-    omitBackground: boolean;
-}
-export {};

package/dist/browser/ScreenshotOptions.js

@@ -1,2 +1 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/browser/Target.d.ts

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Protocol } from 'devtools-protocol';
-import { Browser, BrowserContext } from './Browser';
-import { CDPSession } from './Connection';
-import { Page } from './Page';
-import { Viewport } from './PuppeteerViewport';
+import type { Browser, BrowserContext } from './Browser';
+import { Page } from './BrowserPage';
+import type { CDPSession } from './Connection';
+import type { TargetInfo } from './devtools-types';
+import type { Viewport } from './PuppeteerViewport';
 export declare class Target {
     #private;
     _initializedPromise: Promise<boolean>;
@@ -26,12 +26,12 @@ export declare class Target {
     _closedCallback: () => void;
     _isInitialized: boolean;
     _targetId: string;
-    constructor(targetInfo: Protocol.Target.TargetInfo, browserContext: BrowserContext, sessionFactory: () => Promise<CDPSession>, defaultViewport: Viewport);
+    constructor(targetInfo: TargetInfo, browserContext: BrowserContext, sessionFactory: () => Promise<CDPSession>, defaultViewport: Viewport);
     /**
      * Creates a Chrome Devtools Protocol session attached to the target.
      */
     createCDPSession(): Promise<CDPSession>;
-    _getTargetInfo(): Protocol.Target.TargetInfo;
+    _getTargetInfo(): TargetInfo;
     /**
      * If the target is not of type `"page"` or `"background_page"`, returns `null`.
      */
@@ -57,5 +57,5 @@ export declare class Target {
      * Get the target that opened this target. Top-level targets return `null`.
      */
     opener(): Target | undefined;
-    _targetInfoChanged(targetInfo: Protocol.Target.TargetInfo): void;
+    _targetInfoChanged(targetInfo: TargetInfo): void;
 }

package/dist/browser/Target.js

@@ -28,7 +28,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _Target_browserContext, _Target_targetInfo, _Target_sessionFactory, _Target_defaultViewport, _Target_pagePromise;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Target = void 0;
-const Page_1 = require("./Page");
+const BrowserPage_1 = require("./BrowserPage");
 const isPagetTarget = (target) => {
     return (target.type === 'page' ||
         target.type === 'background_page' ||
@@ -84,7 +84,7 @@ class Target {
         if (isPagetTarget(__classPrivateFieldGet(this, _Target_targetInfo, "f")) && !__classPrivateFieldGet(this, _Target_pagePromise, "f")) {
             __classPrivateFieldSet(this, _Target_pagePromise, __classPrivateFieldGet(this, _Target_sessionFactory, "f").call(this).then((client) => {
                 var _a;
-                return Page_1.Page._create(client, this, (_a = __classPrivateFieldGet(this, _Target_defaultViewport, "f")) !== null && _a !== void 0 ? _a : null);
+                return BrowserPage_1.Page._create(client, this, (_a = __classPrivateFieldGet(this, _Target_defaultViewport, "f")) !== null && _a !== void 0 ? _a : null, this.browser());
             }), "f");
         }
         return (_a = (await __classPrivateFieldGet(this, _Target_pagePromise, "f"))) !== null && _a !== void 0 ? _a : null;

package/dist/browser/TimeoutSettings.d.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export declare const DEFAULT_TIMEOUT = 30000;
 export declare class TimeoutSettings {
     #private;
     constructor();

package/dist/browser/TimeoutSettings.js

@@ -27,8 +27,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TimeoutSettings_defaultTimeout, _TimeoutSettings_defaultNavigationTimeout;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeoutSettings = void 0;
-const DEFAULT_TIMEOUT = 30000;
+exports.TimeoutSettings = exports.DEFAULT_TIMEOUT = void 0;
+exports.DEFAULT_TIMEOUT = 30000;
 class TimeoutSettings {
     constructor() {
         _TimeoutSettings_defaultTimeout.set(this, void 0);
@@ -49,13 +49,13 @@ class TimeoutSettings {
         if (__classPrivateFieldGet(this, _TimeoutSettings_defaultTimeout, "f") !== null) {
             return __classPrivateFieldGet(this, _TimeoutSettings_defaultTimeout, "f");
         }
-        return DEFAULT_TIMEOUT;
+        return exports.DEFAULT_TIMEOUT;
     }
     timeout() {
         if (__classPrivateFieldGet(this, _TimeoutSettings_defaultTimeout, "f") !== null) {
             return __classPrivateFieldGet(this, _TimeoutSettings_defaultTimeout, "f");
         }
-        return DEFAULT_TIMEOUT;
+        return exports.DEFAULT_TIMEOUT;
     }
 }
 exports.TimeoutSettings = TimeoutSettings;