@remotion/renderer 4.0.0-lambda.3 → 4.0.0-newpaths.13

package/dist/browser/Launcher.js

@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChromeLauncher = void 0;
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  *
@@ -45,9 +46,7 @@ const assert_1 = require("./assert");
 const Browser_1 = require("./Browser");
 const BrowserFetcher_1 = require("./BrowserFetcher");
 const BrowserRunner_1 = require("./BrowserRunner");
-const copyFileAsync = fs.promises.copyFile;
 const mkdtempAsync = fs.promises.mkdtemp;
-const writeFileAsync = fs.promises.writeFile;
 const tmpDir = () => {
     return process.env.PUPPETEER_TMP_DIR || os.tmpdir();
 };
@@ -56,7 +55,7 @@ class ChromeLauncher {
         this._preferredRevision = preferredRevision;
     }
     async launch(options) {
-        const { args = [], dumpio = false, channel, executablePath, pipe = false, env = process.env, handleSIGINT = true, handleSIGTERM = true, handleSIGHUP = true, defaultViewport, timeout = 30000, waitForInitialPage = true, debuggingPort, } = options;
+        const { args = [], dumpio = false, executablePath, pipe = false, env = process.env, defaultViewport, timeout = 60000, debuggingPort, } = options;
         const chromeArguments = args;
         if (!chromeArguments.some((argument) => {
             return argument.startsWith('--remote-debugging-');
@@ -69,26 +68,12 @@ class ChromeLauncher {
                 chromeArguments.push(`--remote-debugging-port=${debuggingPort || 0}`);
             }
         }
-        let isTempUserDataDir = true;
         // Check for the user data dir argument, which will always be set even
         // with a custom directory specified via the userDataDir option.
-        let userDataDirIndex = chromeArguments.findIndex((arg) => {
-            return arg.startsWith('--user-data-dir');
-        });
-        if (userDataDirIndex < 0) {
-            chromeArguments.push(`--user-data-dir=${await mkdtempAsync(path.join(tmpDir(), 'puppeteer_dev_chrome_profile-'))}`);
-            userDataDirIndex = chromeArguments.length - 1;
-        }
-        const userDataDir = chromeArguments[userDataDirIndex].split('=', 2)[1];
-        (0, assert_1.assert)(typeof userDataDir === 'string', '`--user-data-dir` is malformed');
-        isTempUserDataDir = false;
+        const userDataDir = await mkdtempAsync(path.join(tmpDir(), 'puppeteer_dev_chrome_profile-'));
+        chromeArguments.push(`--user-data-dir=${userDataDir}`);
         let chromeExecutable = executablePath;
-        if (channel) {
-            // executablePath is detected by channel, so it should not be specified by user.
-            (0, assert_1.assert)(!chromeExecutable, '`executablePath` must not be specified when `channel` is given.');
-            chromeExecutable = executablePathForChannel(channel);
-        }
-        else if (!chromeExecutable) {
+        if (!chromeExecutable) {
             const { missingText, executablePath: exPath } = resolveExecutablePath(this);
             if (missingText) {
                 throw new Error(missingText);
@@ -96,16 +81,11 @@ class ChromeLauncher {
             chromeExecutable = exPath;
         }
         const runner = new BrowserRunner_1.BrowserRunner({
-            product: this.product,
             executablePath: chromeExecutable,
             processArguments: chromeArguments,
             userDataDir,
-            isTempUserDataDir,
         });
         runner.start({
-            handleSIGHUP,
-            handleSIGTERM,
-            handleSIGINT,
             dumpio,
             env,
             pipe: false,
@@ -120,7 +100,6 @@ class ChromeLauncher {
                 connection,
                 contextIds: [],
                 defaultViewport,
-                process: runner.proc,
                 closeCallback: runner.close.bind(runner),
             });
         }
@@ -128,446 +107,26 @@ class ChromeLauncher {
             runner.kill();
             throw error;
         }
-        if (waitForInitialPage) {
-            try {
-                await browser.waitForTarget((t) => {
-                    return t.type() === 'page';
-                }, { timeout });
-            }
-            catch (error) {
-                await browser.close();
-                throw error;
-            }
-        }
-        return browser;
-    }
-    executablePath(channel) {
-        if (channel) {
-            return executablePathForChannel(channel);
-        }
-        const results = resolveExecutablePath(this);
-        return results.executablePath;
-    }
-    get product() {
-        return 'chrome';
-    }
-}
-class FirefoxLauncher {
-    constructor(preferredRevision) {
-        this._preferredRevision = preferredRevision;
-    }
-    async launch(options) {
-        const { ignoreDefaultArgs = false, args = [], dumpio = false, executablePath = null, env = process.env, handleSIGINT = true, handleSIGTERM = true, handleSIGHUP = true, defaultViewport, timeout = 30000, extraPrefsFirefox = {}, waitForInitialPage = true, debuggingPort = null, } = options;
-        const firefoxArguments = [];
-        if (!ignoreDefaultArgs) {
-            firefoxArguments.push(...this.defaultArgs(options));
-        }
-        else if (Array.isArray(ignoreDefaultArgs)) {
-            firefoxArguments.push(...this.defaultArgs(options).filter((arg) => {
-                return !ignoreDefaultArgs.includes(arg);
-            }));
-        }
-        else {
-            firefoxArguments.push(...args);
-        }
-        if (!firefoxArguments.some((argument) => {
-            return argument.startsWith('--remote-debugging-');
-        })) {
-            firefoxArguments.push(`--remote-debugging-port=${debuggingPort || 0}`);
-        }
-        let userDataDir;
-        let isTempUserDataDir = true;
-        // Check for the profile argument, which will always be set even
-        // with a custom directory specified via the userDataDir option.
-        const profileArgIndex = firefoxArguments.findIndex((arg) => {
-            return ['-profile', '--profile'].includes(arg);
-        });
-        if (profileArgIndex === -1) {
-            userDataDir = await this._createProfile(extraPrefsFirefox);
-            firefoxArguments.push('--profile');
-            firefoxArguments.push(userDataDir);
-        }
-        else {
-            userDataDir = firefoxArguments[profileArgIndex + 1];
-            if (!userDataDir || !fs.existsSync(userDataDir)) {
-                throw new Error(`Firefox profile not found at '${userDataDir}'`);
-            }
-            // When using a custom Firefox profile it needs to be populated
-            // with required preferences.
-            isTempUserDataDir = false;
-            const prefs = this.defaultPreferences(extraPrefsFirefox);
-            this.writePreferences(prefs, userDataDir);
-        }
-        await this._updateRevision();
-        let firefoxExecutable = executablePath;
-        if (!executablePath) {
-            const { missingText, executablePath: exPath } = resolveExecutablePath(this);
-            if (missingText) {
-                throw new Error(missingText);
-            }
-            firefoxExecutable = exPath;
-        }
-        if (!firefoxExecutable) {
-            throw new Error('firefoxExecutable is not found.');
-        }
-        const runner = new BrowserRunner_1.BrowserRunner({
-            product: this.product,
-            executablePath: firefoxExecutable,
-            processArguments: firefoxArguments,
-            userDataDir,
-            isTempUserDataDir,
-        });
-        runner.start({
-            handleSIGHUP,
-            handleSIGTERM,
-            handleSIGINT,
-            dumpio,
-            env,
-        });
-        let browser;
         try {
-            const connection = await runner.setupConnection({
-                timeout,
-                preferredRevision: this._preferredRevision,
-            });
-            browser = await Browser_1.Browser._create({
-                connection,
-                contextIds: [],
-                defaultViewport,
-                process: runner.proc,
-                closeCallback: runner.close.bind(runner),
-            });
+            await browser.waitForTarget((t) => {
+                return t.type() === 'page';
+            }, { timeout });
         }
         catch (error) {
-            runner.kill();
+            await browser.close(false);
             throw error;
         }
-        if (waitForInitialPage) {
-            try {
-                await browser.waitForTarget((t) => {
-                    return t.type() === 'page';
-                }, { timeout });
-            }
-            catch (error) {
-                await browser.close();
-                throw error;
-            }
-        }
         return browser;
     }
     executablePath() {
-        return resolveExecutablePath(this).executablePath;
-    }
-    async _updateRevision() {
-        // replace 'latest' placeholder with actual downloaded revision
-        if (this._preferredRevision === 'latest') {
-            const browserFetcher = new BrowserFetcher_1.BrowserFetcher({
-                product: this.product,
-                path: null,
-                platform: null,
-            });
-            const localRevisions = await browserFetcher.localRevisions();
-            if (localRevisions[0]) {
-                this._preferredRevision = localRevisions[0];
-            }
-        }
+        const results = resolveExecutablePath(this);
+        return results.executablePath;
     }
     get product() {
-        return 'firefox';
-    }
-    defaultArgs(options) {
-        const { devtools = false, headless = !devtools, args = [], userDataDir = null, } = options;
-        const firefoxArguments = ['--no-remote'];
-        if (os.platform() === 'darwin') {
-            firefoxArguments.push('--foreground');
-        }
-        else if (os.platform().startsWith('win')) {
-            firefoxArguments.push('--wait-for-browser');
-        }
-        if (userDataDir) {
-            firefoxArguments.push('--profile');
-            firefoxArguments.push(userDataDir);
-        }
-        if (headless) {
-            firefoxArguments.push('--headless');
-        }
-        if (devtools) {
-            firefoxArguments.push('--devtools');
-        }
-        if (args.every((arg) => {
-            return arg.startsWith('-');
-        })) {
-            firefoxArguments.push('about:blank');
-        }
-        firefoxArguments.push(...args);
-        return firefoxArguments;
-    }
-    defaultPreferences(extraPrefs) {
-        const server = 'dummy.test';
-        const defaultPrefs = {
-            // Make sure Shield doesn't hit the network.
-            'app.normandy.api_url': '',
-            // Disable Firefox old build background check
-            'app.update.checkInstallTime': false,
-            // Disable automatically upgrading Firefox
-            'app.update.disabledForTesting': true,
-            // Increase the APZ content response timeout to 1 minute
-            'apz.content_response_timeout': 60000,
-            // Prevent various error message on the console
-            // jest-puppeteer asserts that no error message is emitted by the console
-            'browser.contentblocking.features.standard': '-tp,tpPrivate,cookieBehavior0,-cm,-fp',
-            // Enable the dump function: which sends messages to the system
-            // console
-            // https://bugzilla.mozilla.org/show_bug.cgi?id=1543115
-            'browser.dom.window.dump.enabled': true,
-            // Disable topstories
-            'browser.newtabpage.activity-stream.feeds.system.topstories': false,
-            // Always display a blank page
-            'browser.newtabpage.enabled': false,
-            // Background thumbnails in particular cause grief: and disabling
-            // thumbnails in general cannot hurt
-            'browser.pagethumbnails.capturing_disabled': true,
-            // Disable safebrowsing components.
-            'browser.safebrowsing.blockedURIs.enabled': false,
-            'browser.safebrowsing.downloads.enabled': false,
-            'browser.safebrowsing.malware.enabled': false,
-            'browser.safebrowsing.passwords.enabled': false,
-            'browser.safebrowsing.phishing.enabled': false,
-            // Disable updates to search engines.
-            'browser.search.update': false,
-            // Do not restore the last open set of tabs if the browser has crashed
-            'browser.sessionstore.resume_from_crash': false,
-            // Skip check for default browser on startup
-            'browser.shell.checkDefaultBrowser': false,
-            // Disable newtabpage
-            'browser.startup.homepage': 'about:blank',
-            // Do not redirect user when a milstone upgrade of Firefox is detected
-            'browser.startup.homepage_override.mstone': 'ignore',
-            // Start with a blank page about:blank
-            'browser.startup.page': 0,
-            // Do not allow background tabs to be zombified on Android: otherwise for
-            // tests that open additional tabs: the test harness tab itself might get
-            // unloaded
-            'browser.tabs.disableBackgroundZombification': false,
-            // Do not warn when closing all other open tabs
-            'browser.tabs.warnOnCloseOtherTabs': false,
-            // Do not warn when multiple tabs will be opened
-            'browser.tabs.warnOnOpen': false,
-            // Disable the UI tour.
-            'browser.uitour.enabled': false,
-            // Turn off search suggestions in the location bar so as not to trigger
-            // network connections.
-            'browser.urlbar.suggest.searches': false,
-            // Disable first run splash page on Windows 10
-            'browser.usedOnWindows10.introURL': '',
-            // Do not warn on quitting Firefox
-            'browser.warnOnQuit': false,
-            // Defensively disable data reporting systems
-            'datareporting.healthreport.documentServerURI': `http://${server}/dummy/healthreport/`,
-            'datareporting.healthreport.logging.consoleEnabled': false,
-            'datareporting.healthreport.service.enabled': false,
-            'datareporting.healthreport.service.firstRun': false,
-            'datareporting.healthreport.uploadEnabled': false,
-            // Do not show datareporting policy notifications which can interfere with tests
-            'datareporting.policy.dataSubmissionEnabled': false,
-            'datareporting.policy.dataSubmissionPolicyBypassNotification': true,
-            // DevTools JSONViewer sometimes fails to load dependencies with its require.js.
-            // This doesn't affect Puppeteer but spams console (Bug 1424372)
-            'devtools.jsonview.enabled': false,
-            // Disable popup-blocker
-            'dom.disable_open_during_load': false,
-            // Enable the support for File object creation in the content process
-            // Required for |Page.setFileInputFiles| protocol method.
-            'dom.file.createInChild': true,
-            // Disable the ProcessHangMonitor
-            'dom.ipc.reportProcessHangs': false,
-            // Disable slow script dialogues
-            'dom.max_chrome_script_run_time': 0,
-            'dom.max_script_run_time': 0,
-            // Only load extensions from the application and user profile
-            // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
-            'extensions.autoDisableScopes': 0,
-            'extensions.enabledScopes': 5,
-            // Disable metadata caching for installed add-ons by default
-            'extensions.getAddons.cache.enabled': false,
-            // Disable installing any distribution extensions or add-ons.
-            'extensions.installDistroAddons': false,
-            // Disabled screenshots extension
-            'extensions.screenshots.disabled': true,
-            // Turn off extension updates so they do not bother tests
-            'extensions.update.enabled': false,
-            // Turn off extension updates so they do not bother tests
-            'extensions.update.notifyUser': false,
-            // Make sure opening about:addons will not hit the network
-            'extensions.webservice.discoverURL': `http://${server}/dummy/discoveryURL`,
-            // Temporarily force disable BFCache in parent (https://bit.ly/bug-1732263)
-            'fission.bfcacheInParent': false,
-            // Force all web content to use a single content process
-            'fission.webContentIsolationStrategy': 0,
-            // Allow the application to have focus even it runs in the background
-            'focusmanager.testmode': true,
-            // Disable useragent updates
-            'general.useragent.updates.enabled': false,
-            // Always use network provider for geolocation tests so we bypass the
-            // macOS dialog raised by the corelocation provider
-            'geo.provider.testing': true,
-            // Do not scan Wifi
-            'geo.wifi.scan': false,
-            // No hang monitor
-            'hangmonitor.timeout': 0,
-            // Show chrome errors and warnings in the error console
-            'javascript.options.showInConsole': true,
-            // Disable download and usage of OpenH264: and Widevine plugins
-            'media.gmp-manager.updateEnabled': false,
-            // Prevent various error message on the console
-            // jest-puppeteer asserts that no error message is emitted by the console
-            'network.cookie.cookieBehavior': 0,
-            // Disable experimental feature that is only available in Nightly
-            'network.cookie.sameSite.laxByDefault': false,
-            // Do not prompt for temporary redirects
-            'network.http.prompt-temp-redirect': false,
-            // Disable speculative connections so they are not reported as leaking
-            // when they are hanging around
-            'network.http.speculative-parallel-limit': 0,
-            // Do not automatically switch between offline and online
-            'network.manage-offline-status': false,
-            // Make sure SNTP requests do not hit the network
-            'network.sntp.pools': server,
-            // Disable Flash.
-            'plugin.state.flash': 0,
-            'privacy.trackingprotection.enabled': false,
-            // Can be removed once Firefox 89 is no longer supported
-            // https://bugzilla.mozilla.org/show_bug.cgi?id=1710839
-            'remote.enabled': true,
-            // Don't do network connections for mitm priming
-            'security.certerrors.mitm.priming.enabled': false,
-            // Local documents have access to all other local documents,
-            // including directory listings
-            'security.fileuri.strict_origin_policy': false,
-            // Do not wait for the notification button security delay
-            'security.notification_enable_delay': 0,
-            // Ensure blocklist updates do not hit the network
-            'services.settings.server': `http://${server}/dummy/blocklist/`,
-            // Do not automatically fill sign-in forms with known usernames and
-            // passwords
-            'signon.autofillForms': false,
-            // Disable password capture, so that tests that include forms are not
-            // influenced by the presence of the persistent doorhanger notification
-            'signon.rememberSignons': false,
-            // Disable first-run welcome page
-            'startup.homepage_welcome_url': 'about:blank',
-            // Disable first-run welcome page
-            'startup.homepage_welcome_url.additional': '',
-            // Disable browser animations (tabs, fullscreen, sliding alerts)
-            'toolkit.cosmeticAnimations.enabled': false,
-            // Prevent starting into safe mode after application crashes
-            'toolkit.startup.max_resumed_crashes': -1,
-        };
-        return Object.assign(defaultPrefs, extraPrefs);
-    }
-    /**
-     * Populates the user.js file with custom preferences as needed to allow
-     * Firefox's CDP support to properly function. These preferences will be
-     * automatically copied over to prefs.js during startup of Firefox. To be
-     * able to restore the original values of preferences a backup of prefs.js
-     * will be created.
-     *
-     * @param prefs - List of preferences to add.
-     * @param profilePath - Firefox profile to write the preferences to.
-     */
-    async writePreferences(prefs, profilePath) {
-        const lines = Object.entries(prefs).map(([key, value]) => {
-            return `user_pref(${JSON.stringify(key)}, ${JSON.stringify(value)});`;
-        });
-        await writeFileAsync(path.join(profilePath, 'user.js'), lines.join('\n'));
-        // Create a backup of the preferences file if it already exitsts.
-        const prefsPath = path.join(profilePath, 'prefs.js');
-        if (fs.existsSync(prefsPath)) {
-            const prefsBackupPath = path.join(profilePath, 'prefs.js.puppeteer');
-            await copyFileAsync(prefsPath, prefsBackupPath);
-        }
-    }
-    async _createProfile(extraPrefs) {
-        const temporaryProfilePath = await mkdtempAsync(path.join(tmpDir(), 'puppeteer_dev_firefox_profile-'));
-        const prefs = this.defaultPreferences(extraPrefs);
-        await this.writePreferences(prefs, temporaryProfilePath);
-        return temporaryProfilePath;
-    }
-}
-function executablePathForChannel(channel) {
-    const platform = os.platform();
-    let chromePath;
-    switch (platform) {
-        case 'win32':
-            switch (channel) {
-                case 'chrome':
-                    chromePath = `${process.env.PROGRAMFILES}\\Google\\Chrome\\Application\\chrome.exe`;
-                    break;
-                case 'chrome-beta':
-                    chromePath = `${process.env.PROGRAMFILES}\\Google\\Chrome Beta\\Application\\chrome.exe`;
-                    break;
-                case 'chrome-canary':
-                    chromePath = `${process.env.PROGRAMFILES}\\Google\\Chrome SxS\\Application\\chrome.exe`;
-                    break;
-                case 'chrome-dev':
-                    chromePath = `${process.env.PROGRAMFILES}\\Google\\Chrome Dev\\Application\\chrome.exe`;
-                    break;
-                default:
-                    throw new Error('unknown chrome release channel');
-            }
-            break;
-        case 'darwin':
-            switch (channel) {
-                case 'chrome':
-                    chromePath =
-                        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
-                    break;
-                case 'chrome-beta':
-                    chromePath =
-                        '/Applications/Google Chrome Beta.app/Contents/MacOS/Google Chrome Beta';
-                    break;
-                case 'chrome-canary':
-                    chromePath =
-                        '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary';
-                    break;
-                case 'chrome-dev':
-                    chromePath =
-                        '/Applications/Google Chrome Dev.app/Contents/MacOS/Google Chrome Dev';
-                    break;
-                default:
-                    throw new Error('unknown chrome release channel');
-            }
-            break;
-        case 'linux':
-            switch (channel) {
-                case 'chrome':
-                    chromePath = '/opt/google/chrome/chrome';
-                    break;
-                case 'chrome-beta':
-                    chromePath = '/opt/google/chrome-beta/chrome';
-                    break;
-                case 'chrome-dev':
-                    chromePath = '/opt/google/chrome-unstable/chrome';
-                    break;
-                default:
-                    throw new Error('unknown chrome release channel');
-            }
-            break;
-        default:
-            throw new Error('unknown OS');
-    }
-    if (!chromePath) {
-        throw new Error(`Unable to detect browser executable path for '${channel}' on ${platform}.`);
-    }
-    // Check if Chrome exists and is accessible.
-    try {
-        fs.accessSync(chromePath);
-    }
-    catch (error) {
-        throw new Error(`Could not find Google Chrome executable for channel '${channel}' at '${chromePath}'.`);
+        return 'chrome';
     }
-    return chromePath;
 }
+exports.ChromeLauncher = ChromeLauncher;
 function resolveExecutablePath(launcher) {
     const { product, _preferredRevision } = launcher;
     const browserFetcher = new BrowserFetcher_1.BrowserFetcher({
@@ -583,20 +142,3 @@ function resolveExecutablePath(launcher) {
         : `Could not find expected browser (${product}) locally. ${product === 'chrome' ? chromeHelp : firefoxHelp}`;
     return { executablePath: revisionInfo.executablePath, missingText };
 }
-function Launcher(preferredRevision, product) {
-    switch (product) {
-        case 'firefox':
-            return new FirefoxLauncher(preferredRevision);
-        case 'chrome':
-        default:
-            if (typeof product !== 'undefined' && product !== 'chrome') {
-                /* The user gave us an incorrect product name
-                 * we'll default to launching Chrome, but log to the console
-                 * to let the user know (they've probably typoed).
-                 */
-                console.warn(`Warning: unknown product name ${product}. Falling back to chrome.`);
-            }
-            return new ChromeLauncher(preferredRevision);
-    }
-}
-exports.default = Launcher;

package/dist/browser/LifecycleWatcher.d.ts

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 import { TimeoutError } from './Errors';
-import { Frame, FrameManager } from './FrameManager';
-import { HTTPResponse } from './HTTPResponse';
-export declare type PuppeteerLifeCycleEvent = 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2';
+import type { Frame, FrameManager } from './FrameManager';
+import type { HTTPResponse } from './HTTPResponse';
+export declare type PuppeteerLifeCycleEvent = 'load';
 export declare class LifecycleWatcher {
     #private;
-    constructor(frameManager: FrameManager, frame: Frame, waitUntil: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[], timeout: number);
+    constructor(frameManager: FrameManager, frame: Frame, waitUntil: PuppeteerLifeCycleEvent, timeout: number);
     navigationResponse(): HTTPResponse | null;
     sameDocumentNavigationPromise(): Promise<Error | undefined>;
     newDocumentNavigationPromise(): Promise<Error | undefined>;

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,30 +1,28 @@
-import { Protocol } from 'devtools-protocol';
-import { HTTPRequest } from './HTTPRequest';
+import type { LoadingFailedEvent, LoadingFinishedEvent, RequestPausedEvent, RequestWillBeSentEvent, ResponseReceivedEvent, ResponseReceivedExtraInfoEvent } from './devtools-types';
+import type { HTTPRequest } from './HTTPRequest';
 declare type QueuedEventGroup = {
-    responseReceivedEvent: Protocol.Network.ResponseReceivedEvent;
-    loadingFinishedEvent?: Protocol.Network.LoadingFinishedEvent;
-    loadingFailedEvent?: Protocol.Network.LoadingFailedEvent;
+    responseReceivedEvent: ResponseReceivedEvent;
+    loadingFinishedEvent?: LoadingFinishedEvent;
+    loadingFailedEvent?: LoadingFailedEvent;
 };
 export declare type FetchRequestId = string;
 declare type NetworkRequestId = string;
 declare type RedirectInfo = {
-    event: Protocol.Network.RequestWillBeSentEvent;
+    event: RequestWillBeSentEvent;
     fetchRequestId?: FetchRequestId;
 };
 export declare class NetworkEventManager {
     #private;
     forget(networkRequestId: NetworkRequestId): void;
-    responseExtraInfo(networkRequestId: NetworkRequestId): Protocol.Network.ResponseReceivedExtraInfoEvent[];
+    responseExtraInfo(networkRequestId: NetworkRequestId): ResponseReceivedExtraInfoEvent[];
     private queuedRedirectInfo;
     queueRedirectInfo(fetchRequestId: FetchRequestId, redirectInfo: RedirectInfo): void;
     takeQueuedRedirectInfo(fetchRequestId: FetchRequestId): RedirectInfo | undefined;
     numRequestsInProgress(): number;
-    storeRequestWillBeSent(networkRequestId: NetworkRequestId, event: Protocol.Network.RequestWillBeSentEvent): void;
-    getRequestWillBeSent(networkRequestId: NetworkRequestId): Protocol.Network.RequestWillBeSentEvent | undefined;
+    storeRequestWillBeSent(networkRequestId: NetworkRequestId, event: RequestWillBeSentEvent): void;
+    getRequestWillBeSent(networkRequestId: NetworkRequestId): 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;
+    storeRequestPaused(networkRequestId: NetworkRequestId, event: RequestPausedEvent): void;
     getRequest(networkRequestId: NetworkRequestId): HTTPRequest | undefined;
     storeRequest(networkRequestId: NetworkRequestId, request: HTTPRequest): void;
     forgetRequest(networkRequestId: NetworkRequestId): void;