@remotion/renderer 3.0.23 → 3.0.26

package/dist/browser/LifecycleWatcher.js

@@ -34,12 +34,7 @@ const Errors_1 = require("./Errors");
 const FrameManager_1 = require("./FrameManager");
 const NetworkManager_1 = require("./NetworkManager");
 const util_1 = require("./util");
-const puppeteerToProtocolLifecycle = new Map([
-    ['load', 'load'],
-    ['domcontentloaded', 'DOMContentLoaded'],
-    ['networkidle0', 'networkIdle'],
-    ['networkidle2', 'networkAlmostIdle'],
-]);
+const puppeteerToProtocolLifecycle = new Map([['load', 'load']]);
 const noop = () => undefined;
 class LifecycleWatcher {
     constructor(frameManager, frame, waitUntil, timeout) {
@@ -71,17 +66,9 @@ class LifecycleWatcher {
         _LifecycleWatcher_hasSameDocumentNavigation.set(this, void 0);
         _LifecycleWatcher_newDocumentNavigation.set(this, void 0);
         _LifecycleWatcher_swapped.set(this, void 0);
-        if (Array.isArray(waitUntil)) {
-            waitUntil = waitUntil.slice();
-        }
-        else if (typeof waitUntil === 'string') {
-            waitUntil = [waitUntil];
-        }
-        __classPrivateFieldSet(this, _LifecycleWatcher_expectedLifecycle, waitUntil.map((value) => {
-            const protocolEvent = puppeteerToProtocolLifecycle.get(value);
-            (0, assert_1.assert)(protocolEvent, 'Unknown value for options.waitUntil: ' + value);
-            return protocolEvent;
-        }), "f");
+        const protocolEvent = puppeteerToProtocolLifecycle.get(waitUntil);
+        (0, assert_1.assert)(protocolEvent, 'Unknown value for options.waitUntil: ' + waitUntil);
+        __classPrivateFieldSet(this, _LifecycleWatcher_expectedLifecycle, [waitUntil], "f");
         __classPrivateFieldSet(this, _LifecycleWatcher_frameManager, frameManager, "f");
         __classPrivateFieldSet(this, _LifecycleWatcher_frame, frame, "f");
         __classPrivateFieldSet(this, _LifecycleWatcher_timeout, timeout, "f");

package/dist/browser/NetworkEventManager.d.ts

@@ -1,5 +1,5 @@
-import { Protocol } from 'devtools-protocol';
-import { HTTPRequest } from './HTTPRequest';
+import type { Protocol } from 'devtools-protocol';
+import type { HTTPRequest } from './HTTPRequest';
 declare type QueuedEventGroup = {
     responseReceivedEvent: Protocol.Network.ResponseReceivedEvent;
     loadingFinishedEvent?: Protocol.Network.LoadingFinishedEvent;
@@ -22,8 +22,6 @@ export declare class NetworkEventManager {
     storeRequestWillBeSent(networkRequestId: NetworkRequestId, event: Protocol.Network.RequestWillBeSentEvent): void;
     getRequestWillBeSent(networkRequestId: NetworkRequestId): Protocol.Network.RequestWillBeSentEvent | undefined;
     forgetRequestWillBeSent(networkRequestId: NetworkRequestId): void;
-    getRequestPaused(networkRequestId: NetworkRequestId): Protocol.Fetch.RequestPausedEvent | undefined;
-    forgetRequestPaused(networkRequestId: NetworkRequestId): void;
     storeRequestPaused(networkRequestId: NetworkRequestId, event: Protocol.Fetch.RequestPausedEvent): void;
     getRequest(networkRequestId: NetworkRequestId): HTTPRequest | undefined;
     storeRequest(networkRequestId: NetworkRequestId, request: HTTPRequest): void;

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

@@ -15,7 +15,7 @@
  */
 import type { ProtocolMapping } from 'devtools-protocol/types/protocol-mapping';
 import { EventEmitter } from './EventEmitter';
-import { Frame } from './FrameManager';
+import type { Frame } from './FrameManager';
 export declare const NetworkManagerEmittedEvents: {
     readonly Request: symbol;
 };
@@ -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_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;
 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,8 +42,6 @@ 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));
@@ -60,32 +56,15 @@ 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 response = 'Default';
     const { username, password } = {
         username: undefined,
         password: undefined,
@@ -126,7 +105,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 +131,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 +145,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);
@@ -184,7 +159,7 @@ _NetworkManager_client = new WeakMap(), _NetworkManager_frameManager = new WeakM
         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);
+    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 +220,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 +244,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';
+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);
     send(message: string): void;
     close(): void;
 }
+export {};

package/dist/browser/NodeWebSocketTransport.js

@@ -52,7 +52,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

package/dist/browser/{page.d.ts → Page.d.ts}

@@ -13,24 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CDPSession } from './Connection';
+import type { Browser } from './Browser';
+import type { CDPSession } from './Connection';
 import { ConsoleMessage } from './ConsoleMessage';
-import { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
+import type { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
 import { EventEmitter } from './EventEmitter';
-import { Frame } from './FrameManager';
-import { HTTPResponse } from './HTTPResponse';
-import { JSHandle } from './JSHandle';
-import { PuppeteerLifeCycleEvent } from './LifecycleWatcher';
-import { Viewport } from './PuppeteerViewport';
-import { Target } from './Target';
+import type { Frame } from './FrameManager';
+import type { HTTPResponse } from './HTTPResponse';
+import type { JSHandle } from './JSHandle';
+import type { Viewport } from './PuppeteerViewport';
+import type { Target } from './Target';
 import { TaskQueue } from './TaskQueue';
 interface WaitForOptions {
     timeout?: number;
-    waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-}
-export declare const enum PageEmittedEvents {
-    Console = "console",
-    Error = "error"
 }
 interface PageEventObject {
     console: ConsoleMessage;
@@ -38,9 +33,10 @@ interface PageEventObject {
 }
 export declare class Page extends EventEmitter {
     #private;
-    static _create(client: CDPSession, target: Target, defaultViewport: Viewport): Promise<Page>;
+    static _create(client: CDPSession, target: Target, defaultViewport: Viewport, browser: Browser): Promise<Page>;
+    browser: Browser;
     screenshotTaskQueue: TaskQueue;
-    constructor(client: CDPSession, target: Target);
+    constructor(client: CDPSession, target: Target, browser: Browser);
     /**
      * Listen to page events.
      */
@@ -73,6 +69,6 @@ export declare class Page extends EventEmitter {
         runBeforeUnload?: boolean;
     }): Promise<void>;
     isClosed(): boolean;
-    waitForFunction(pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
+    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
 }
 export {};

package/dist/browser/{page.js → Page.js}

@@ -25,13 +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 _Page_instances, _Page_closed, _Page_client, _Page_target, _Page_timeoutSettings, _Page_frameManager, _Page_emulationManager, _Page_pageBindings, _Page_initialize, _Page_onTargetCrashed, _Page_onLogEntryAdded, _Page_onConsoleAPI, _Page_onBindingCalled, _Page_addConsoleMessage;
+var _Page_instances, _Page_closed, _Page_client, _Page_target, _Page_timeoutSettings, _Page_frameManager, _Page_pageBindings, _Page_initialize, _Page_onTargetCrashed, _Page_onLogEntryAdded, _Page_onConsoleAPI, _Page_onBindingCalled, _Page_addConsoleMessage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
-const console_1 = require("console");
 const assert_1 = require("./assert");
 const ConsoleMessage_1 = require("./ConsoleMessage");
-const EmulationManager_1 = require("./EmulationManager");
 const EventEmitter_1 = require("./EventEmitter");
 const FrameManager_1 = require("./FrameManager");
 const JSHandle_1 = require("./JSHandle");
@@ -39,7 +37,7 @@ const TaskQueue_1 = require("./TaskQueue");
 const TimeoutSettings_1 = require("./TimeoutSettings");
 const util_1 = require("./util");
 class Page extends EventEmitter_1.EventEmitter {
-    constructor(client, target) {
+    constructor(client, target, browser) {
         super();
         _Page_instances.add(this);
         _Page_closed.set(this, false);
@@ -47,13 +45,12 @@ class Page extends EventEmitter_1.EventEmitter {
         _Page_target.set(this, void 0);
         _Page_timeoutSettings.set(this, new TimeoutSettings_1.TimeoutSettings());
         _Page_frameManager.set(this, void 0);
-        _Page_emulationManager.set(this, void 0);
         _Page_pageBindings.set(this, new Map());
         __classPrivateFieldSet(this, _Page_client, client, "f");
         __classPrivateFieldSet(this, _Page_target, target, "f");
         __classPrivateFieldSet(this, _Page_frameManager, new FrameManager_1.FrameManager(client, this, __classPrivateFieldGet(this, _Page_timeoutSettings, "f")), "f");
-        __classPrivateFieldSet(this, _Page_emulationManager, new EmulationManager_1.EmulationManager(client), "f");
         this.screenshotTaskQueue = new TaskQueue_1.TaskQueue();
+        this.browser = browser;
         client.on('Target.attachedToTarget', (event) => {
             switch (event.targetInfo.type) {
                 case 'iframe':
@@ -71,7 +68,7 @@ class Page extends EventEmitter_1.EventEmitter {
                         .send('Target.detachFromTarget', {
                         sessionId: event.sessionId,
                     })
-                        .catch(() => console.log(console_1.error));
+                        .catch((err) => console.log(err));
             }
         });
         client.on('Runtime.consoleAPICalled', (event) => {
@@ -87,8 +84,8 @@ class Page extends EventEmitter_1.EventEmitter {
             return __classPrivateFieldGet(this, _Page_instances, "m", _Page_onLogEntryAdded).call(this, event);
         });
     }
-    static async _create(client, target, defaultViewport) {
-        const page = new Page(client, target);
+    static async _create(client, target, defaultViewport, browser) {
+        const page = new Page(client, target, browser);
         await __classPrivateFieldGet(page, _Page_instances, "m", _Page_initialize).call(page);
         await page.setViewport(defaultViewport);
         return page;
@@ -127,8 +124,17 @@ class Page extends EventEmitter_1.EventEmitter {
     mainFrame() {
         return __classPrivateFieldGet(this, _Page_frameManager, "f").mainFrame();
     }
-    async setViewport(viewport) {
-        await __classPrivateFieldGet(this, _Page_emulationManager, "f").emulateViewport(viewport);
+    setViewport(viewport) {
+        return __classPrivateFieldGet(this, _Page_client, "f").send('Emulation.setDeviceMetricsOverride', {
+            mobile: false,
+            width: viewport.width,
+            height: viewport.height,
+            deviceScaleFactor: viewport.deviceScaleFactor,
+            screenOrientation: {
+                angle: 0,
+                type: 'portraitPrimary',
+            },
+        });
     }
     setDefaultNavigationTimeout(timeout) {
         __classPrivateFieldGet(this, _Page_timeoutSettings, "f").setDefaultNavigationTimeout(timeout);
@@ -175,12 +181,12 @@ class Page extends EventEmitter_1.EventEmitter {
     isClosed() {
         return __classPrivateFieldGet(this, _Page_closed, "f");
     }
-    waitForFunction(pageFunction, ...args) {
-        return this.mainFrame().waitForFunction(pageFunction, ...args);
+    waitForFunction(browser, pageFunction, ...args) {
+        return this.mainFrame().waitForFunction(browser, pageFunction, ...args);
     }
 }
 exports.Page = Page;
-_Page_closed = new WeakMap(), _Page_client = new WeakMap(), _Page_target = new WeakMap(), _Page_timeoutSettings = new WeakMap(), _Page_frameManager = new WeakMap(), _Page_emulationManager = new WeakMap(), _Page_pageBindings = new WeakMap(), _Page_instances = new WeakSet(), _Page_initialize = async function _Page_initialize() {
+_Page_closed = new WeakMap(), _Page_client = new WeakMap(), _Page_target = new WeakMap(), _Page_timeoutSettings = new WeakMap(), _Page_frameManager = new WeakMap(), _Page_pageBindings = new WeakMap(), _Page_instances = new WeakSet(), _Page_initialize = async function _Page_initialize() {
     await Promise.all([
         __classPrivateFieldGet(this, _Page_frameManager, "f").initialize(),
         __classPrivateFieldGet(this, _Page_client, "f").send('Target.setAutoAttach', {

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

@@ -31,7 +31,6 @@ var __importDefault = (this && this.__importDefault) || function (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 revisions_1 = require("./revisions");
@@ -42,71 +41,23 @@ 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) {
+            __classPrivateFieldGet(this, _PuppeteerNode_lazyLauncher, "f").product !== __classPrivateFieldGet(this, _PuppeteerNode_productName, "f")) {
+            switch (__classPrivateFieldGet(this, _PuppeteerNode_productName, "f")) {
                 case 'firefox':
                     this._preferredRevision = revisions_1.PUPPETEER_REVISIONS.firefox;
                     break;
@@ -115,26 +66,13 @@ class PuppeteerNode {
                     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, (0, Launcher_1.default)(this._preferredRevision, __classPrivateFieldGet(this, _PuppeteerNode_productName, "f")), "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);
     }