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

package/dist/browser/BrowserFetcher.js

@@ -37,33 +37,21 @@ 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"));
 const https = __importStar(require("https"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
-const util = __importStar(require("util"));
+const util_1 = __importDefault(require("util"));
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const URL = __importStar(require("url"));
-const util_1 = require("util");
+const util_2 = require("util");
 const assert_1 = require("./assert");
 const delete_directory_1 = require("../delete-directory");
 const get_download_destination_1 = require("./get-download-destination");
@@ -106,7 +94,7 @@ function archiveName(product, platform, revision) {
                 case 'win64':
                     // Windows archive name changed at r591479.
                     return parseInt(revision, 10) > 591479
-                        ? 'chrome-win'
+                        ? 'Thorium_107.0.5271.0\\BIN'
                         : 'chrome-win32';
                 default:
                     throw new Error('unknown browser');
@@ -118,8 +106,10 @@ function archiveName(product, platform, revision) {
     }
 }
 function _downloadURL(product, platform, host, revision) {
-    const url = util.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
-    return url;
+    if (platform === 'win64' || platform === 'win32') {
+        return 'https://remotionchromium-binaries.s3.eu-central-1.amazonaws.com/thorium-107.zip';
+    }
+    return util_1.default.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
 }
 function handleArm64() {
     let exists = fs.existsSync('/usr/bin/chromium-browser');
@@ -136,10 +126,10 @@ function handleArm64() {
         '\n\n sudo apt install chromium-browser\n');
     throw new Error();
 }
-const readdirAsync = (0, util_1.promisify)(fs.readdir.bind(fs));
-const mkdirAsync = (0, util_1.promisify)(fs.mkdir.bind(fs));
-const unlinkAsync = (0, util_1.promisify)(fs.unlink.bind(fs));
-const chmodAsync = (0, util_1.promisify)(fs.chmod.bind(fs));
+const readdirAsync = (0, util_2.promisify)(fs.readdir.bind(fs));
+const mkdirAsync = (0, util_2.promisify)(fs.mkdir.bind(fs));
+const unlinkAsync = (0, util_2.promisify)(fs.unlink.bind(fs));
+const chmodAsync = (0, util_2.promisify)(fs.chmod.bind(fs));
 function existsAsync(filePath) {
     return new Promise((resolve) => {
         fs.access(filePath, (err) => {
@@ -147,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,
-            });
-        }
-        // 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);
         }
-        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;
-        });
+        throw new Error('Unsupported platform: ' + platform);
     }
-    /**
-     * @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`);
-        await (0, delete_directory_1.deleteDirectory)(folderPath);
-    }
-    /**
-     * @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), 'chrome.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('-');
@@ -386,6 +300,13 @@ function _downloadFile(url, destinationPath, progressCallback) {
     let downloadedBytes = 0;
     let totalBytes = 0;
     let lastProgress = Date.now();
+    function onData(chunk) {
+        downloadedBytes += chunk.length;
+        if (Date.now() - lastProgress > 1000) {
+            progressCallback(downloadedBytes, totalBytes);
+            lastProgress = Date.now();
+        }
+    }
     const request = httpRequest(url, 'GET', (response) => {
         if (response.statusCode !== 200) {
             const error = new Error(`Download failed: server returned code ${response.statusCode}. URL: ${url}`);
@@ -395,8 +316,8 @@ function _downloadFile(url, destinationPath, progressCallback) {
             return;
         }
         const file = fs.createWriteStream(destinationPath);
-        file.on('finish', () => {
-            return fulfill();
+        file.on('close', () => {
+            return fulfill(totalBytes);
         });
         file.on('error', (error) => {
             return reject(error);
@@ -409,14 +330,8 @@ function _downloadFile(url, destinationPath, progressCallback) {
         return reject(error);
     });
     return promise;
-    function onData(chunk) {
-        downloadedBytes += chunk.length;
-        if (Date.now() - lastProgress > 1000) {
-            progressCallback(downloadedBytes, totalBytes);
-            lastProgress = Date.now();
-        }
-    }
 }
+exports._downloadFile = _downloadFile;
 function install(archivePath, folderPath) {
     if (archivePath.endsWith('.zip')) {
         return (0, extract_zip_1.default)(archivePath, { dir: folderPath });

package/dist/browser/BrowserPage.d.ts

@@ -27,13 +27,21 @@ import { TaskQueue } from './TaskQueue';
 interface WaitForOptions {
     timeout?: number;
 }
+export declare const enum PageEmittedEvents {
+    Console = "console",
+    Error = "error",
+    Disposed = "disposed"
+}
 interface PageEventObject {
     console: ConsoleMessage;
     error: Error;
+    disposed: undefined;
 }
 export declare class Page extends EventEmitter {
     #private;
+    id: string;
     static _create(client: CDPSession, target: Target, defaultViewport: Viewport, browser: Browser): Promise<Page>;
+    closed: boolean;
     browser: Browser;
     screenshotTaskQueue: TaskQueue;
     constructor(client: CDPSession, target: Target, browser: Browser);
@@ -68,7 +76,5 @@ export declare class Page extends EventEmitter {
     close(options?: {
         runBeforeUnload?: boolean;
     }): Promise<void>;
-    isClosed(): boolean;
-    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
 }
 export {};

package/dist/browser/BrowserPage.js

@@ -25,7 +25,7 @@ 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_pageBindings, _Page_initialize, _Page_onTargetCrashed, _Page_onLogEntryAdded, _Page_onConsoleAPI, _Page_onBindingCalled, _Page_addConsoleMessage;
+var _Page_instances, _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 assert_1 = require("./assert");
@@ -40,7 +40,7 @@ class Page extends EventEmitter_1.EventEmitter {
     constructor(client, target, browser) {
         super();
         _Page_instances.add(this);
-        _Page_closed.set(this, false);
+        this.closed = false;
         _Page_client.set(this, void 0);
         _Page_target.set(this, void 0);
         _Page_timeoutSettings.set(this, new TimeoutSettings_1.TimeoutSettings());
@@ -51,6 +51,7 @@ class Page extends EventEmitter_1.EventEmitter {
         __classPrivateFieldSet(this, _Page_frameManager, new FrameManager_1.FrameManager(client, this, __classPrivateFieldGet(this, _Page_timeoutSettings, "f")), "f");
         this.screenshotTaskQueue = new TaskQueue_1.TaskQueue();
         this.browser = browser;
+        this.id = String(Math.random());
         client.on('Target.attachedToTarget', (event) => {
             switch (event.targetInfo.type) {
                 case 'iframe':
@@ -166,7 +167,9 @@ class Page extends EventEmitter_1.EventEmitter {
     }
     async close(options = { runBeforeUnload: undefined }) {
         const connection = __classPrivateFieldGet(this, _Page_client, "f").connection();
-        (0, assert_1.assert)(connection, 'Protocol error: Connection closed. Most likely the page has been closed.');
+        if (!connection) {
+            return;
+        }
         const runBeforeUnload = Boolean(options.runBeforeUnload);
         if (runBeforeUnload) {
             await __classPrivateFieldGet(this, _Page_client, "f").send('Page.close');
@@ -178,15 +181,9 @@ class Page extends EventEmitter_1.EventEmitter {
             await __classPrivateFieldGet(this, _Page_target, "f")._isClosedPromise;
         }
     }
-    isClosed() {
-        return __classPrivateFieldGet(this, _Page_closed, "f");
-    }
-    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_pageBindings = new WeakMap(), _Page_instances = new WeakSet(), _Page_initialize = async function _Page_initialize() {
+_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', {
@@ -247,7 +244,7 @@ _Page_closed = new WeakMap(), _Page_client = new WeakMap(), _Page_target = new W
             expression = (0, util_1.pageBindingDeliverErrorValueString)(name, seq, _error);
         }
     }
-    __classPrivateFieldGet(this, _Page_client, "f").send('Runtime.evaluate', {
+    await __classPrivateFieldGet(this, _Page_client, "f").send('Runtime.evaluate', {
         expression,
         contextId: event.executionContextId,
     });

package/dist/browser/BrowserRunner.d.ts

@@ -17,17 +17,14 @@
 import * as childProcess from 'child_process';
 import { Connection } from './Connection';
 import type { LaunchOptions } from './LaunchOptions';
-import type { Product } from './Product';
 export declare class BrowserRunner {
     #private;
     proc?: childProcess.ChildProcess;
     connection?: Connection;
-    constructor({ product, executablePath, processArguments, userDataDir, isTempUserDataDir, }: {
-        product: Product;
+    constructor({ executablePath, processArguments, userDataDir, }: {
         executablePath: string;
         processArguments: string[];
         userDataDir: string;
-        isTempUserDataDir?: boolean;
     });
     start(options: LaunchOptions): void;
     close(): Promise<void>;