@remotion/renderer 4.0.0-alpha.217 → 4.0.0-alpha4

package/dist/browser/BrowserFetcher.js

@@ -37,23 +37,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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 _BrowserFetcher_instances, _BrowserFetcher_product, _BrowserFetcher_downloadsFolder, _BrowserFetcher_downloadHost, _BrowserFetcher_platform, _BrowserFetcher_getFolderPath;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserFetcher = void 0;
+exports._downloadFile = exports.getRevisionInfo = exports.getFolderPath = exports.removeBrowser = exports.localRevisions = exports.download = exports.getDownloadHost = exports.getDownloadsFolder = exports.getPlatform = void 0;
 const childProcess = __importStar(require("child_process"));
 const fs = __importStar(require("fs"));
 const http = __importStar(require("http"));
@@ -149,223 +137,147 @@ function existsAsync(filePath) {
         });
     });
 }
-class BrowserFetcher {
-    constructor(options) {
-        _BrowserFetcher_instances.add(this);
-        _BrowserFetcher_product.set(this, void 0);
-        _BrowserFetcher_downloadsFolder.set(this, void 0);
-        _BrowserFetcher_downloadHost.set(this, void 0);
-        _BrowserFetcher_platform.set(this, void 0);
-        __classPrivateFieldSet(this, _BrowserFetcher_product, options.product.toLowerCase(), "f");
-        (0, assert_1.assert)(__classPrivateFieldGet(this, _BrowserFetcher_product, "f") === 'chrome' || __classPrivateFieldGet(this, _BrowserFetcher_product, "f") === 'firefox', `Unknown product: "${options.product}"`);
-        __classPrivateFieldSet(this, _BrowserFetcher_downloadsFolder, options.path ||
-            path.join((0, get_download_destination_1.getDownloadsCacheDir)(), browserConfig[__classPrivateFieldGet(this, _BrowserFetcher_product, "f")].destination), "f");
-        __classPrivateFieldSet(this, _BrowserFetcher_downloadHost, browserConfig[__classPrivateFieldGet(this, _BrowserFetcher_product, "f")].host, "f");
-        if (options.platform) {
-            __classPrivateFieldSet(this, _BrowserFetcher_platform, options.platform, "f");
-        }
-        else {
-            const platform = os.platform();
-            switch (platform) {
-                case 'darwin':
-                    switch (__classPrivateFieldGet(this, _BrowserFetcher_product, "f")) {
-                        case 'chrome':
-                            __classPrivateFieldSet(this, _BrowserFetcher_platform, os.arch() === 'arm64' && PUPPETEER_EXPERIMENTAL_CHROMIUM_MAC_ARM
-                                ? 'mac_arm'
-                                : 'mac', "f");
-                            break;
-                        case 'firefox':
-                            __classPrivateFieldSet(this, _BrowserFetcher_platform, 'mac', "f");
-                            break;
-                        default:
-                            throw new Error('unknown browser');
-                    }
-                    break;
-                case 'linux':
-                    __classPrivateFieldSet(this, _BrowserFetcher_platform, 'linux', "f");
-                    break;
-                case 'win32':
-                    __classPrivateFieldSet(this, _BrowserFetcher_platform, os.arch() === 'x64' ? 'win64' : 'win32', "f");
-                    return;
+const getPlatform = (product) => {
+    const platform = os.platform();
+    switch (platform) {
+        case 'darwin':
+            switch (product) {
+                case 'chrome':
+                    return os.arch() === 'arm64' &&
+                        PUPPETEER_EXPERIMENTAL_CHROMIUM_MAC_ARM
+                        ? 'mac_arm'
+                        : 'mac';
+                case 'firefox':
+                    return 'mac';
                 default:
-                    (0, assert_1.assert)(false, 'Unsupported platform: ' + platform);
+                    throw new Error('unknown browser');
             }
-        }
-        (0, assert_1.assert)(downloadURLs[__classPrivateFieldGet(this, _BrowserFetcher_product, "f")][__classPrivateFieldGet(this, _BrowserFetcher_platform, "f")], 'Unsupported platform: ' + __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));
+        case 'linux':
+            return 'linux';
+        case 'win32':
+            return os.arch() === 'x64' ? 'win64' : 'win32';
+        default:
+            (0, assert_1.assert)(false, 'Unsupported platform: ' + platform);
     }
-    /**
-     * @returns Returns the current `Platform`, which is one of `mac`, `linux`,
-     * `win32` or `win64`.
-     */
-    platform() {
-        return __classPrivateFieldGet(this, _BrowserFetcher_platform, "f");
+};
+exports.getPlatform = getPlatform;
+const getDownloadsFolder = (product) => {
+    return path.join((0, get_download_destination_1.getDownloadsCacheDir)(), browserConfig[product].destination);
+};
+exports.getDownloadsFolder = getDownloadsFolder;
+const getDownloadHost = (product) => {
+    return browserConfig[product].host;
+};
+exports.getDownloadHost = getDownloadHost;
+const download = async ({ revision, progressCallback, product, platform, downloadHost, downloadsFolder, }) => {
+    const url = _downloadURL(product, platform, downloadHost, revision);
+    const fileName = url.split('/').pop();
+    (0, assert_1.assert)(fileName, `A malformed download URL was found: ${url}.`);
+    const archivePath = path.join(downloadsFolder, fileName);
+    const outputPath = (0, exports.getFolderPath)(revision, downloadsFolder, platform);
+    if (await existsAsync(outputPath)) {
+        return (0, exports.getRevisionInfo)(revision, product);
     }
-    /**
-     * @returns Returns the current `Product`, which is one of `chrome` or
-     * `firefox`.
-     */
-    product() {
-        return __classPrivateFieldGet(this, _BrowserFetcher_product, "f");
+    if (!(await existsAsync(downloadsFolder))) {
+        await mkdirAsync(downloadsFolder, {
+            recursive: true,
+        });
     }
-    /**
-     * @returns The download host being used.
-     */
-    host() {
-        return __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f");
+    // Use system Chromium builds on Linux ARM devices
+    if (os.platform() !== 'darwin' && os.arch() === 'arm64') {
+        handleArm64();
+        return;
     }
-    /**
-     * Initiates a HEAD request to check if the revision is available.
-     * @remarks
-     * This method is affected by the current `product`.
-     * @param revision - The revision to check availability for.
-     * @returns A promise that resolves to `true` if the revision could be downloaded
-     * from the host.
-     */
-    canDownload(revision) {
-        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
-        return new Promise((resolve) => {
-            const request = httpRequest(url, 'HEAD', (response) => {
-                resolve(response.statusCode === 200);
-            }, false);
-            request.on('error', (error) => {
-                console.error(error);
-                resolve(false);
-            });
-        });
+    try {
+        await _downloadFile(url, archivePath, progressCallback);
+        await install(archivePath, outputPath);
     }
-    /**
-     * Initiates a GET request to download the revision from the host.
-     * @remarks
-     * This method is affected by the current `product`.
-     * @param revision - The revision to download.
-     * @param progressCallback - A function that will be called with two arguments:
-     * How many bytes have been downloaded and the total number of bytes of the download.
-     * @returns A promise with revision information when the revision is downloaded
-     * and extracted.
-     */
-    async download(revision, progressCallback = () => undefined) {
-        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
-        const fileName = url.split('/').pop();
-        (0, assert_1.assert)(fileName, `A malformed download URL was found: ${url}.`);
-        const archivePath = path.join(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"), fileName);
-        const outputPath = __classPrivateFieldGet(this, _BrowserFetcher_instances, "m", _BrowserFetcher_getFolderPath).call(this, revision);
-        if (await existsAsync(outputPath)) {
-            return this.revisionInfo(revision);
-        }
-        if (!(await existsAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f")))) {
-            await mkdirAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"), {
-                recursive: true,
-            });
+    finally {
+        if (await existsAsync(archivePath)) {
+            await unlinkAsync(archivePath);
         }
-        // Use system Chromium builds on Linux ARM devices
-        if (os.platform() !== 'darwin' && os.arch() === 'arm64') {
-            handleArm64();
-            return;
-        }
-        try {
-            await _downloadFile(url, archivePath, progressCallback);
-            await install(archivePath, outputPath);
-        }
-        finally {
-            if (await existsAsync(archivePath)) {
-                await unlinkAsync(archivePath);
-            }
+    }
+    const revisionInfo = (0, exports.getRevisionInfo)(revision, product);
+    if (revisionInfo) {
+        await chmodAsync(revisionInfo.executablePath, 0o755);
+    }
+    return revisionInfo;
+};
+exports.download = download;
+const localRevisions = async (downloadsFolder, product, platform) => {
+    if (!(await existsAsync(downloadsFolder))) {
+        return [];
+    }
+    const fileNames = await readdirAsync(downloadsFolder);
+    return fileNames
+        .map((fileName) => {
+        return parseFolderPath(product, fileName);
+    })
+        .filter((entry) => {
+        var _a;
+        return (_a = (entry && entry.platform === platform)) !== null && _a !== void 0 ? _a : false;
+    })
+        .map((entry) => {
+        return entry.revision;
+    });
+};
+exports.localRevisions = localRevisions;
+const removeBrowser = async (revision, folderPath) => {
+    (0, assert_1.assert)(await existsAsync(folderPath), `Failed to remove: revision ${revision} is not downloaded`);
+    (0, delete_directory_1.deleteDirectory)(folderPath);
+};
+exports.removeBrowser = removeBrowser;
+const getFolderPath = (revision, downloadsFolder, platform) => {
+    return path.resolve(downloadsFolder, `${platform}-${revision}`);
+};
+exports.getFolderPath = getFolderPath;
+const getExecutablePath = (product, revision) => {
+    const downloadsFolder = (0, exports.getDownloadsFolder)(product);
+    const platform = (0, exports.getPlatform)(product);
+    const folderPath = (0, exports.getFolderPath)(revision, downloadsFolder, platform);
+    if (product === 'chrome') {
+        if (platform === 'mac' || platform === 'mac_arm') {
+            return path.join(folderPath, archiveName(product, platform, revision), 'Chromium.app', 'Contents', 'MacOS', 'Chromium');
         }
-        const revisionInfo = this.revisionInfo(revision);
-        if (revisionInfo) {
-            await chmodAsync(revisionInfo.executablePath, 0o755);
+        if (platform === 'linux') {
+            return path.join(folderPath, archiveName(product, platform, revision), 'chrome');
         }
-        return revisionInfo;
-    }
-    /**
-     * @remarks
-     * This method is affected by the current `product`.
-     * @returns A promise with a list of all revision strings (for the current `product`)
-     * available locally on disk.
-     */
-    async localRevisions() {
-        if (!(await existsAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f")))) {
-            return [];
+        if (platform === 'win32' || platform === 'win64') {
+            return path.join(folderPath, archiveName(product, platform, revision), 'thorium.exe');
         }
-        const fileNames = await readdirAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"));
-        return fileNames
-            .map((fileName) => {
-            return parseFolderPath(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), fileName);
-        })
-            .filter((entry) => {
-            var _a;
-            return (_a = (entry && entry.platform === __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"))) !== null && _a !== void 0 ? _a : false;
-        })
-            .map((entry) => {
-            return entry.revision;
-        });
-    }
-    /**
-     * @remarks
-     * This method is affected by the current `product`.
-     * @param revision - A revision to remove for the current `product`.
-     * @returns A promise that resolves when the revision has been removes or
-     * throws if the revision has not been downloaded.
-     */
-    async remove(revision) {
-        const folderPath = __classPrivateFieldGet(this, _BrowserFetcher_instances, "m", _BrowserFetcher_getFolderPath).call(this, revision);
-        (0, assert_1.assert)(await existsAsync(folderPath), `Failed to remove: revision ${revision} is not downloaded`);
-        (0, delete_directory_1.deleteDirectory)(folderPath);
+        throw new Error('Unsupported platform: ' + platform);
     }
-    /**
-     * @param revision - The revision to get info for.
-     * @returns The revision info for the given revision.
-     */
-    revisionInfo(revision) {
-        const folderPath = __classPrivateFieldGet(this, _BrowserFetcher_instances, "m", _BrowserFetcher_getFolderPath).call(this, revision);
-        let executablePath = '';
-        if (__classPrivateFieldGet(this, _BrowserFetcher_product, "f") === 'chrome') {
-            if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac_arm') {
-                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'Chromium.app', 'Contents', 'MacOS', 'Chromium');
-            }
-            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux') {
-                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'chrome');
-            }
-            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win32' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win64') {
-                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'thorium.exe');
-            }
-            else {
-                throw new Error('Unsupported platform: ' + __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));
-            }
+    if (product === 'firefox') {
+        if (platform === 'mac' || platform === 'mac_arm') {
+            return path.join(folderPath, 'Firefox Nightly.app', 'Contents', 'MacOS', 'firefox');
         }
-        else if (__classPrivateFieldGet(this, _BrowserFetcher_product, "f") === 'firefox') {
-            if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'mac_arm') {
-                executablePath = path.join(folderPath, 'Firefox Nightly.app', 'Contents', 'MacOS', 'firefox');
-            }
-            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'linux') {
-                executablePath = path.join(folderPath, 'firefox', 'firefox');
-            }
-            else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win32' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win64') {
-                executablePath = path.join(folderPath, 'firefox', 'firefox.exe');
-            }
-            else {
-                throw new Error('Unsupported platform: ' + __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));
-            }
+        if (platform === 'linux') {
+            return path.join(folderPath, 'firefox', 'firefox');
         }
-        else {
-            throw new Error('Unsupported product: ' + __classPrivateFieldGet(this, _BrowserFetcher_product, "f"));
+        if (platform === 'win32' || platform === 'win64') {
+            return path.join(folderPath, 'firefox', 'firefox.exe');
         }
-        const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
-        const local = fs.existsSync(folderPath);
-        return {
-            revision,
-            executablePath,
-            folderPath,
-            local,
-            url,
-            product: __classPrivateFieldGet(this, _BrowserFetcher_product, "f"),
-        };
+        throw new Error('Unsupported platform: ' + platform);
     }
-}
-exports.BrowserFetcher = BrowserFetcher;
-_BrowserFetcher_product = new WeakMap(), _BrowserFetcher_downloadsFolder = new WeakMap(), _BrowserFetcher_downloadHost = new WeakMap(), _BrowserFetcher_platform = new WeakMap(), _BrowserFetcher_instances = new WeakSet(), _BrowserFetcher_getFolderPath = function _BrowserFetcher_getFolderPath(revision) {
-    return path.resolve(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f"), `${__classPrivateFieldGet(this, _BrowserFetcher_platform, "f")}-${revision}`);
+    throw new Error('Unsupported product: ' + product);
+};
+const getRevisionInfo = (revision, product) => {
+    const executablePath = getExecutablePath(product, revision);
+    const downloadsFolder = (0, exports.getDownloadsFolder)(product);
+    const platform = (0, exports.getPlatform)(product);
+    const folderPath = (0, exports.getFolderPath)(revision, downloadsFolder, platform);
+    const url = _downloadURL(product, platform, (0, exports.getDownloadHost)(product), revision);
+    const local = fs.existsSync(folderPath);
+    return {
+        revision,
+        executablePath,
+        folderPath,
+        local,
+        url,
+        product,
+    };
 };
+exports.getRevisionInfo = getRevisionInfo;
 function parseFolderPath(product, folderPath) {
     const name = path.basename(folderPath);
     const splits = name.split('-');
@@ -419,6 +331,7 @@ function _downloadFile(url, destinationPath, progressCallback) {
     });
     return promise;
 }
+exports._downloadFile = _downloadFile;
 function install(archivePath, folderPath) {
     if (archivePath.endsWith('.zip')) {
         return (0, extract_zip_1.default)(archivePath, { dir: folderPath });

package/dist/browser/BrowserRunner.js

@@ -105,14 +105,8 @@ class BrowserRunner {
             stdio,
         });
         if (dumpio) {
-            (_a = this.proc.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (d) => {
-                process.stdout.write(options.indentationString);
-                process.stdout.write(d.toString().trimStart());
-            });
-            (_b = this.proc.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (d) => {
-                process.stderr.write(options.indentationString);
-                process.stderr.write(d.toString().trimStart());
-            });
+            (_a = this.proc.stderr) === null || _a === void 0 ? void 0 : _a.pipe(process.stderr);
+            (_b = this.proc.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
         }
         __classPrivateFieldSet(this, _BrowserRunner_closed, false, "f");
         __classPrivateFieldSet(this, _BrowserRunner_processClosing, new Promise((fulfill, reject) => {

package/dist/browser/FrameManager.js

@@ -33,7 +33,6 @@ const Connection_1 = require("./Connection");
 const DOMWorld_1 = require("./DOMWorld");
 const EventEmitter_1 = require("./EventEmitter");
 const ExecutionContext_1 = require("./ExecutionContext");
-const is_target_closed_err_1 = require("./is-target-closed-err");
 const LifecycleWatcher_1 = require("./LifecycleWatcher");
 const NetworkManager_1 = require("./NetworkManager");
 const util_1 = require("./util");
@@ -136,7 +135,9 @@ class FrameManager extends EventEmitter_1.EventEmitter {
         }
         catch (error) {
             // The target might have been closed before the initialization finished.
-            if ((0, util_1.isErrorLike)(error) && (0, is_target_closed_err_1.isTargetClosedErr)(error)) {
+            if ((0, util_1.isErrorLike)(error) &&
+                (error.message.includes('Target closed') ||
+                    error.message.includes('Session closed'))) {
                 return;
             }
             throw error;

package/dist/browser/LaunchOptions.d.ts

@@ -29,6 +29,5 @@ export interface LaunchOptions {
     env?: Record<string, string | undefined>;
     pipe?: boolean;
     product?: Product;
-    indentationString: string;
 }
 export declare type PuppeteerNodeLaunchOptions = BrowserLaunchArgumentOptions & LaunchOptions & BrowserConnectOptions;

package/dist/browser/Launcher.js

@@ -47,8 +47,8 @@ const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const assert_1 = require("./assert");
 const Browser_1 = require("./Browser");
-const BrowserFetcher_1 = require("./BrowserFetcher");
 const BrowserRunner_1 = require("./BrowserRunner");
+const BrowserFetcher_1 = require("./BrowserFetcher");
 const tmpDir = () => {
     return process.env.PUPPETEER_TMP_DIR || os.tmpdir();
 };
@@ -57,7 +57,7 @@ class ChromeLauncher {
         this._preferredRevision = preferredRevision;
     }
     async launch(options) {
-        const { args = [], dumpio = false, executablePath, pipe = false, env = process.env, defaultViewport, timeout = 60000, debuggingPort, indentationString, } = 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-');
@@ -91,7 +91,6 @@ class ChromeLauncher {
             dumpio,
             env,
             pipe: false,
-            indentationString,
         });
         let browser;
         try {
@@ -132,12 +131,7 @@ class ChromeLauncher {
 exports.ChromeLauncher = ChromeLauncher;
 function resolveExecutablePath(launcher) {
     const { product, _preferredRevision } = launcher;
-    const browserFetcher = new BrowserFetcher_1.BrowserFetcher({
-        product,
-        path: null,
-        platform: null,
-    });
-    const revisionInfo = browserFetcher.revisionInfo(_preferredRevision);
+    const revisionInfo = (0, BrowserFetcher_1.getRevisionInfo)(_preferredRevision, 'chrome');
     const firefoxHelp = `Run \`PUPPETEER_PRODUCT=firefox npm install\` to download a supported Firefox browser binary.`;
     const chromeHelp = `Run \`npm install\` to download the correct Chromium revision (${launcher._preferredRevision}).`;
     const missingText = revisionInfo.local

package/dist/browser/PuppeteerNode.d.ts

@@ -15,8 +15,6 @@
  */
 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';
@@ -35,6 +33,5 @@ export declare class PuppeteerNode {
     executablePath(channel?: string): string;
     get _launcher(): ProductLauncher;
     get product(): string;
-    createBrowserFetcher(options: BrowserFetcherOptions): BrowserFetcher;
 }
 export {};

package/dist/browser/PuppeteerNode.js

@@ -28,7 +28,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PuppeteerNode_lazyLauncher, _PuppeteerNode_productName;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PuppeteerNode = void 0;
-const BrowserFetcher_1 = require("./BrowserFetcher");
 const Launcher_1 = require("./Launcher");
 const revisions_1 = require("./revisions");
 class PuppeteerNode {
@@ -40,7 +39,6 @@ class PuppeteerNode {
         this._preferredRevision = preferredRevision;
         this.launch = this.launch.bind(this);
         this.executablePath = this.executablePath.bind(this);
-        this.createBrowserFetcher = this.createBrowserFetcher.bind(this);
     }
     launch(options) {
         if (options.product) {
@@ -66,9 +64,6 @@ class PuppeteerNode {
     get product() {
         return this._launcher.product;
     }
-    createBrowserFetcher(options) {
-        return new BrowserFetcher_1.BrowserFetcher(options);
-    }
 }
 exports.PuppeteerNode = PuppeteerNode;
 _PuppeteerNode_lazyLauncher = new WeakMap(), _PuppeteerNode_productName = new WeakMap();

package/dist/browser/create-browser-fetcher.js

@@ -16,62 +16,48 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadBrowser = void 0;
-const node_1 = require("./node");
+const BrowserFetcher_1 = require("./BrowserFetcher");
 const revisions_1 = require("./revisions");
 const supportedProducts = {
     chrome: 'Chromium',
     firefox: 'Firefox Nightly',
 };
-async function downloadBrowser(product) {
-    const browserFetcher = node_1.puppeteer.createBrowserFetcher({
-        product,
-        path: null,
-        platform: null,
-    });
-    const revision = await getRevision();
-    await fetchBinary(revision);
-    function getRevision() {
-        if (product === 'chrome') {
-            return revisions_1.PUPPETEER_REVISIONS.chromium;
-        }
-        throw new Error(`Unsupported product ${product}`);
+function getRevision(product) {
+    if (product === 'chrome') {
+        return revisions_1.PUPPETEER_REVISIONS.chromium;
     }
-    function fetchBinary(_revision) {
-        const revisionInfo = browserFetcher.revisionInfo(_revision);
-        // Do nothing if the revision is already downloaded.
-        if (revisionInfo.local) {
-            console.log(`${supportedProducts[product]} is already in ${revisionInfo.folderPath}; skipping download.`);
-            return;
-        }
-        function onSuccess(localRevisions) {
-            console.log(`${supportedProducts[product]} (${revisionInfo.revision}) downloaded to ${revisionInfo.folderPath}`);
-            localRevisions = localRevisions.filter((__revision) => {
-                return __revision !== revisionInfo.revision;
-            });
-            const cleanupOldVersions = localRevisions.map((__revision) => {
-                return browserFetcher.remove(__revision);
-            });
-            Promise.all([...cleanupOldVersions]);
-        }
-        function onError(error) {
-            console.error(`ERROR: Failed to set up ${supportedProducts[product]} r${_revision}! Set "PUPPETEER_SKIP_DOWNLOAD" env variable to skip download.`);
-            console.error(error);
-            process.exit(1);
-        }
-        function onProgress(downloadedBytes, totalBytes) {
-            console.log('Downloading', supportedProducts[product], toMegabytes(downloadedBytes) + '/' + toMegabytes(totalBytes));
-        }
-        return browserFetcher
-            .download(revisionInfo.revision, onProgress)
-            .then(() => {
-            return browserFetcher.localRevisions();
+    throw new Error(`Unsupported product ${product}`);
+}
+async function downloadBrowser(product) {
+    const revision = getRevision(product);
+    const revisionInfo = (0, BrowserFetcher_1.getRevisionInfo)(revision, product);
+    try {
+        await (0, BrowserFetcher_1.download)({
+            revision: revisionInfo.revision,
+            progressCallback: (downloadedBytes, totalBytes) => {
+                console.log('Downloading', supportedProducts[product], toMegabytes(downloadedBytes) + '/' + toMegabytes(totalBytes));
+            },
+            product,
+            platform: (0, BrowserFetcher_1.getPlatform)(product),
+            downloadHost: (0, BrowserFetcher_1.getDownloadHost)(product),
+            downloadsFolder: (0, BrowserFetcher_1.getDownloadsFolder)(product),
+        });
+        const _localRevisions = await (0, BrowserFetcher_1.localRevisions)((0, BrowserFetcher_1.getDownloadsFolder)(product), product, (0, BrowserFetcher_1.getPlatform)(product));
+        console.log(`${supportedProducts[product]} (${revisionInfo.revision}) downloaded to ${revisionInfo.folderPath}`);
+        await Promise.all(_localRevisions
+            .filter((__revision) => {
+            return __revision !== revisionInfo.revision;
         })
-            .then(onSuccess)
-            .catch(onError);
+            .map((__revision) => {
+            return (0, BrowserFetcher_1.removeBrowser)(__revision, (0, BrowserFetcher_1.getFolderPath)(revision, (0, BrowserFetcher_1.getDownloadsFolder)(product), (0, BrowserFetcher_1.getPlatform)(product)));
+        }));
     }
-    function toMegabytes(bytes) {
-        const mb = bytes / 1024 / 1024;
-        return `${Math.round(mb * 10) / 10} Mb`;
+    catch (err) {
+        throw new Error(`Failed to set up ${supportedProducts[product]} r${revision}! Set "PUPPETEER_SKIP_DOWNLOAD" env variable to skip download.`);
     }
 }
 exports.downloadBrowser = downloadBrowser;
+function toMegabytes(bytes) {
+    const mb = bytes / 1024 / 1024;
+    return `${Math.round(mb * 10) / 10} Mb`;
+}

package/dist/browser/devtools-commands.d.ts

@@ -1,4 +1,4 @@
-import type { ActivateTargetRequest, AddScriptToEvaluateOnNewDocumentRequest, AddScriptToEvaluateOnNewDocumentResponse, CallFunctionOnRequest, CallFunctionOnResponse, CaptureScreenshotRequest, CaptureScreenshotResponse, CloseTargetRequest, CloseTargetResponse, CreateIsolatedWorldRequest, CreateIsolatedWorldResponse, DetachFromTargetRequest, DevtoolsRemoteObject, EnableRequest, ExceptionDetails, GetFrameTreeResponse, NavigateRequest, NavigateResponse, PrintPDFRequest, PrintPDFResponse, ReleaseObjectRequest, SetAutoAttachRequest, SetDefaultBackgroundColorOverrideRequest, SetDeviceMetricsOverrideRequest, SetLifecycleEventsEnabledRequest } from './devtools-types';
+import type { ActivateTargetRequest, AddScriptToEvaluateOnNewDocumentRequest, AddScriptToEvaluateOnNewDocumentResponse, CallFunctionOnRequest, CallFunctionOnResponse, CaptureScreenshotRequest, CaptureScreenshotResponse, CloseTargetRequest, CloseTargetResponse, CreateIsolatedWorldRequest, CreateIsolatedWorldResponse, DetachFromTargetRequest, DevtoolsRemoteObject, EnableRequest, ExceptionDetails, GetFrameTreeResponse, NavigateRequest, NavigateResponse, ReleaseObjectRequest, SetAutoAttachRequest, SetDefaultBackgroundColorOverrideRequest, SetDeviceMetricsOverrideRequest, SetLifecycleEventsEnabledRequest } from './devtools-types';
 export interface Commands {
     /**
      * Does nothing.
@@ -216,10 +216,6 @@ export interface Commands {
         paramsType: [CaptureScreenshotRequest?];
         returnType: CaptureScreenshotResponse;
     };
-    'Page.printToPDF': {
-        paramsType: [PrintPDFRequest];
-        returnType: PrintPDFResponse;
-    };
     'Target.activateTarget': {
         paramsType: [ActivateTargetRequest];
         returnType: void;