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

package/dist/browser/Browser.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 _Browser_instances, _Browser_defaultViewport, _Browser_process, _Browser_connection, _Browser_closeCallback, _Browser_defaultContext, _Browser_contexts, _Browser_targets, _Browser_targetCreated, _Browser_targetDestroyed, _Browser_targetInfoChanged, _Browser_getVersion, _BrowserContext_browser, _BrowserContext_id;
+var _Browser_instances, _Browser_defaultViewport, _Browser_closeCallback, _Browser_defaultContext, _Browser_contexts, _Browser_targets, _Browser_targetCreated, _Browser_targetDestroyed, _Browser_targetInfoChanged, _BrowserContext_browser, _BrowserContext_id;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserContext = exports.Browser = void 0;
 const assert_1 = require("./assert");
@@ -34,19 +34,16 @@ const Target_1 = require("./Target");
 const util_1 = require("./util");
 class Browser extends EventEmitter_1.EventEmitter {
     // eslint-disable-next-line max-params
-    constructor(connection, contextIds, defaultViewport, process, closeCallback) {
+    constructor(connection, contextIds, defaultViewport, closeCallback) {
         super();
         _Browser_instances.add(this);
         _Browser_defaultViewport.set(this, void 0);
-        _Browser_process.set(this, void 0);
-        _Browser_connection.set(this, void 0);
         _Browser_closeCallback.set(this, void 0);
         _Browser_defaultContext.set(this, void 0);
         _Browser_contexts.set(this, void 0);
         _Browser_targets.set(this, void 0);
         __classPrivateFieldSet(this, _Browser_defaultViewport, defaultViewport, "f");
-        __classPrivateFieldSet(this, _Browser_process, process, "f");
-        __classPrivateFieldSet(this, _Browser_connection, connection, "f");
+        this.connection = connection;
         __classPrivateFieldSet(this, _Browser_closeCallback, closeCallback ||
             function () {
                 return undefined;
@@ -57,104 +54,26 @@ class Browser extends EventEmitter_1.EventEmitter {
             __classPrivateFieldGet(this, _Browser_contexts, "f").set(contextId, new BrowserContext(this, contextId));
         }
         __classPrivateFieldSet(this, _Browser_targets, new Map(), "f");
-        __classPrivateFieldGet(this, _Browser_connection, "f").on('Target.targetCreated', __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_targetCreated).bind(this));
-        __classPrivateFieldGet(this, _Browser_connection, "f").on('Target.targetDestroyed', __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_targetDestroyed).bind(this));
-        __classPrivateFieldGet(this, _Browser_connection, "f").on('Target.targetInfoChanged', __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_targetInfoChanged).bind(this));
+        this.connection.on('Target.targetCreated', __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_targetCreated).bind(this));
+        this.connection.on('Target.targetDestroyed', __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_targetDestroyed).bind(this));
+        this.connection.on('Target.targetInfoChanged', __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_targetInfoChanged).bind(this));
     }
-    static async _create({ connection, contextIds, defaultViewport, process, closeCallback, }) {
-        const browser = new Browser(connection, contextIds, defaultViewport, process, closeCallback);
+    static async _create({ connection, contextIds, defaultViewport, closeCallback, }) {
+        const browser = new Browser(connection, contextIds, defaultViewport, closeCallback);
         await connection.send('Target.setDiscoverTargets', { discover: true });
         return browser;
     }
     get _targets() {
         return __classPrivateFieldGet(this, _Browser_targets, "f");
     }
-    /**
-     * The spawned browser process. Returns `null` if the browser instance was created with
-     * {@link Puppeteer.connect}.
-     */
-    process() {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _Browser_process, "f")) !== null && _a !== void 0 ? _a : null;
-    }
-    /**
-     * Creates a new incognito browser context. This won't share cookies/cache with other
-     * browser contexts.
-     *
-     * @example
-     * ```js
-     * (async () => {
-     *  const browser = await puppeteer.launch();
-     *   // Create a new incognito browser context.
-     *   const context = await browser.createIncognitoBrowserContext();
-     *   // Create a new page in a pristine context.
-     *   const page = await context.newPage();
-     *   // Do stuff
-     *   await page.goto('https://example.com');
-     * })();
-     * ```
-     */
-    async createIncognitoBrowserContext(options = {}) {
-        const { proxyServer, proxyBypassList } = options;
-        const { browserContextId } = await __classPrivateFieldGet(this, _Browser_connection, "f").send('Target.createBrowserContext', {
-            proxyServer,
-            proxyBypassList: proxyBypassList === null || proxyBypassList === void 0 ? void 0 : proxyBypassList.join(','),
-        });
-        const context = new BrowserContext(this, browserContextId);
-        __classPrivateFieldGet(this, _Browser_contexts, "f").set(browserContextId, context);
-        return context;
-    }
-    /**
-     * Returns an array of all open browser contexts. In a newly created browser, this will
-     * return a single instance of {@link BrowserContext}.
-     */
     browserContexts() {
         return [__classPrivateFieldGet(this, _Browser_defaultContext, "f"), ...Array.from(__classPrivateFieldGet(this, _Browser_contexts, "f").values())];
     }
-    /**
-     * Returns the default browser context. The default browser context cannot be closed.
-     */
-    defaultBrowserContext() {
-        return __classPrivateFieldGet(this, _Browser_defaultContext, "f");
-    }
-    async _disposeContext(contextId) {
-        if (!contextId) {
-            return;
-        }
-        await __classPrivateFieldGet(this, _Browser_connection, "f").send('Target.disposeBrowserContext', {
-            browserContextId: contextId,
-        });
-        __classPrivateFieldGet(this, _Browser_contexts, "f").delete(contextId);
-    }
-    /**
-     * The browser websocket endpoint which can be used as an argument to
-     * {@link Puppeteer.connect}.
-     *
-     * @returns The Browser websocket url.
-     *
-     * @remarks
-     *
-     * The format is `ws://${host}:${port}/devtools/browser/<id>`.
-     *
-     * You can find the `webSocketDebuggerUrl` from `http://${host}:${port}/json/version`.
-     * Learn more about the
-     * {@link https://chromedevtools.github.io/devtools-protocol | devtools protocol} and
-     * the {@link
-     * https://chromedevtools.github.io/devtools-protocol/#how-do-i-access-the-browser-target
-     * | browser endpoint}.
-     */
-    wsEndpoint() {
-        return __classPrivateFieldGet(this, _Browser_connection, "f").url();
-    }
-    /**
-     * Promise which resolves to a new {@link Page} object. The Page is created in
-     * a default browser context.
-     */
     newPage() {
         return __classPrivateFieldGet(this, _Browser_defaultContext, "f").newPage();
     }
     async _createPageInContext(contextId) {
-        const { targetId } = await __classPrivateFieldGet(this, _Browser_connection, "f").send('Target.createTarget', {
+        const { targetId } = await this.connection.send('Target.createTarget', {
             url: 'about:blank',
             browserContextId: contextId || undefined,
         });
@@ -172,41 +91,11 @@ class Browser extends EventEmitter_1.EventEmitter {
         }
         return page;
     }
-    /**
-     * All active targets inside the Browser. In case of multiple browser contexts, returns
-     * an array with all the targets in all browser contexts.
-     */
     targets() {
         return Array.from(__classPrivateFieldGet(this, _Browser_targets, "f").values()).filter((target) => {
             return target._isInitialized;
         });
     }
-    /**
-     * The target associated with the browser.
-     */
-    target() {
-        const browserTarget = this.targets().find((target) => {
-            return target.type() === 'browser';
-        });
-        if (!browserTarget) {
-            throw new Error('Browser target is not found');
-        }
-        return browserTarget;
-    }
-    /**
-     * Searches for a target in all browser contexts.
-     *
-     * @param predicate - A function to be run for every target.
-     * @returns The first target found that matches the `predicate` function.
-     *
-     * @example
-     *
-     * An example of finding a target for a page opened via `window.open`:
-     * ```js
-     * await page.evaluate(() => window.open('https://www.example.com/'));
-     * const newWindowTarget = await browser.waitForTarget(target => target.url() === 'https://www.example.com/');
-     * ```
-     */
     async waitForTarget(predicate, options = {}) {
         const { timeout = 30000 } = options;
         let resolve;
@@ -221,7 +110,7 @@ class Browser extends EventEmitter_1.EventEmitter {
                 return await targetPromise;
             }
             this.targets().forEach(check);
-            return await (0, util_1.waitWithTimeout)(targetPromise, 'target', timeout);
+            return await (0, util_1.waitWithTimeout)(targetPromise, 'target', timeout, this);
         }
         finally {
             this.off("targetcreated" /* BrowserEmittedEvents.TargetCreated */, check);
@@ -234,15 +123,6 @@ class Browser extends EventEmitter_1.EventEmitter {
             }
         }
     }
-    /**
-     * An array of all open pages inside the Browser.
-     *
-     * @remarks
-     *
-     * In case of multiple browser contexts, returns an array with all the pages in all
-     * browser contexts. Non-visible pages, such as `"background_page"`, will not be listed
-     * here. You can find them using {@link Target.page}.
-     */
     async pages() {
         const contextPages = await Promise.all(this.browserContexts().map((context) => {
             return context.pages();
@@ -252,53 +132,21 @@ class Browser extends EventEmitter_1.EventEmitter {
             return acc.concat(x);
         }, []);
     }
-    /**
-     * A string representing the browser name and version.
-     *
-     * @remarks
-     *
-     * For headless Chromium, this is similar to `HeadlessChrome/61.0.3153.0`. For
-     * non-headless, this is similar to `Chrome/61.0.3153.0`.
-     *
-     * The format of browser.version() might change with future releases of Chromium.
-     */
-    async version() {
-        const version = await __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_getVersion).call(this);
-        return version.product;
-    }
-    /**
-     * The browser's original user agent. Pages can override the browser user agent with
-     * {@link Page.setUserAgent}.
-     */
-    async userAgent() {
-        const version = await __classPrivateFieldGet(this, _Browser_instances, "m", _Browser_getVersion).call(this);
-        return version.userAgent;
-    }
-    /**
-     * Closes Chromium and all of its pages (if any were opened). The {@link Browser} object
-     * itself is considered to be disposed and cannot be used anymore.
-     */
-    async close() {
+    async close(silent) {
         await __classPrivateFieldGet(this, _Browser_closeCallback, "f").call(null);
+        (await this.pages()).forEach((page) => {
+            page.emit("disposed" /* PageEmittedEvents.Disposed */);
+            page.closed = true;
+        });
         this.disconnect();
+        this.emit(silent ? "closed-silent" /* BrowserEmittedEvents.ClosedSilent */ : "closed" /* BrowserEmittedEvents.Closed */);
     }
-    /**
-     * Disconnects Puppeteer from the browser, but leaves the Chromium process running.
-     * After calling `disconnect`, the {@link Browser} object is considered disposed and
-     * cannot be used anymore.
-     */
     disconnect() {
-        __classPrivateFieldGet(this, _Browser_connection, "f").dispose();
-    }
-    /**
-     * Indicates that the browser is connected.
-     */
-    isConnected() {
-        return !__classPrivateFieldGet(this, _Browser_connection, "f")._closed;
+        this.connection.dispose();
     }
 }
 exports.Browser = Browser;
-_Browser_defaultViewport = new WeakMap(), _Browser_process = new WeakMap(), _Browser_connection = new WeakMap(), _Browser_closeCallback = new WeakMap(), _Browser_defaultContext = new WeakMap(), _Browser_contexts = new WeakMap(), _Browser_targets = new WeakMap(), _Browser_instances = new WeakSet(), _Browser_targetCreated = async function _Browser_targetCreated(event) {
+_Browser_defaultViewport = new WeakMap(), _Browser_closeCallback = new WeakMap(), _Browser_defaultContext = new WeakMap(), _Browser_contexts = new WeakMap(), _Browser_targets = new WeakMap(), _Browser_instances = new WeakSet(), _Browser_targetCreated = async function _Browser_targetCreated(event) {
     var _a;
     const { targetInfo } = event;
     const { browserContextId } = targetInfo;
@@ -309,7 +157,7 @@ _Browser_defaultViewport = new WeakMap(), _Browser_process = new WeakMap(), _Bro
         throw new Error('Missing browser context');
     }
     const target = new Target_1.Target(targetInfo, context, () => {
-        return __classPrivateFieldGet(this, _Browser_connection, "f").createSession(targetInfo);
+        return this.connection.createSession(targetInfo);
     }, (_a = __classPrivateFieldGet(this, _Browser_defaultViewport, "f")) !== null && _a !== void 0 ? _a : null);
     (0, assert_1.assert)(!__classPrivateFieldGet(this, _Browser_targets, "f").has(event.targetInfo.targetId), 'Target should not exist before targetCreated');
     __classPrivateFieldGet(this, _Browser_targets, "f").set(event.targetInfo.targetId, target);
@@ -335,8 +183,6 @@ _Browser_defaultViewport = new WeakMap(), _Browser_process = new WeakMap(), _Bro
     if (wasInitialized && previousURL !== target.url()) {
         this.emit("targetchanged" /* BrowserEmittedEvents.TargetChanged */, target);
     }
-}, _Browser_getVersion = function _Browser_getVersion() {
-    return __classPrivateFieldGet(this, _Browser_connection, "f").send('Browser.getVersion');
 };
 class BrowserContext extends EventEmitter_1.EventEmitter {
     constructor(browser, contextId) {
@@ -364,39 +210,12 @@ class BrowserContext extends EventEmitter_1.EventEmitter {
             return Boolean(page);
         });
     }
-    /**
-     * Returns whether BrowserContext is incognito.
-     * The default browser context is the only non-incognito browser context.
-     *
-     * @remarks
-     * The default browser context cannot be closed.
-     */
-    isIncognito() {
-        return Boolean(__classPrivateFieldGet(this, _BrowserContext_id, "f"));
-    }
-    /**
-     * Creates a new page in the browser context.
-     */
     newPage() {
         return __classPrivateFieldGet(this, _BrowserContext_browser, "f")._createPageInContext(__classPrivateFieldGet(this, _BrowserContext_id, "f"));
     }
-    /**
-     * The browser this browser context belongs to.
-     */
     browser() {
         return __classPrivateFieldGet(this, _BrowserContext_browser, "f");
     }
-    /**
-     * Closes the browser context. All the targets that belong to the browser context
-     * will be closed.
-     *
-     * @remarks
-     * Only incognito browser contexts can be closed.
-     */
-    async close() {
-        (0, assert_1.assert)(__classPrivateFieldGet(this, _BrowserContext_id, "f"), 'Non-incognito profiles cannot be closed!');
-        await __classPrivateFieldGet(this, _BrowserContext_browser, "f")._disposeContext(__classPrivateFieldGet(this, _BrowserContext_id, "f"));
-    }
 }
 exports.BrowserContext = BrowserContext;
 _BrowserContext_browser = new WeakMap(), _BrowserContext_id = new WeakMap();

package/dist/browser/BrowserConnector.d.ts

@@ -13,14 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Browser } from './Browser';
-import { ConnectionTransport } from './ConnectionTransport';
-import { Viewport } from './PuppeteerViewport';
+import type { Viewport } from './PuppeteerViewport';
 export interface BrowserConnectOptions {
     defaultViewport: Viewport;
 }
-export declare type ConnectToBrowserOptions = BrowserConnectOptions & {
-    browserWSEndpoint: string;
-    transport: ConnectionTransport;
-};
-export declare function _connectToBrowser(options: ConnectToBrowserOptions): Promise<Browser>;

package/dist/browser/BrowserConnector.js

@@ -15,35 +15,3 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._connectToBrowser = void 0;
-const assert_1 = require("./assert");
-const Browser_1 = require("./Browser");
-const Connection_1 = require("./Connection");
-const NodeWebSocketTransport_1 = require("./NodeWebSocketTransport");
-const getWebSocketTransportClass = () => {
-    return NodeWebSocketTransport_1.NodeWebSocketTransport;
-};
-async function _connectToBrowser(options) {
-    const { browserWSEndpoint, defaultViewport, transport } = options;
-    (0, assert_1.assert)(Number(Boolean(browserWSEndpoint)) + Number(Boolean(transport)) === 1, 'Exactly one of browserWSEndpoint, browserURL or transport must be passed to puppeteer.connect');
-    let connection;
-    if (transport) {
-        connection = new Connection_1.Connection('', transport);
-    }
-    else if (browserWSEndpoint) {
-        const WebSocketClass = getWebSocketTransportClass();
-        const connectionTransport = await WebSocketClass.create(browserWSEndpoint);
-        connection = new Connection_1.Connection(browserWSEndpoint, connectionTransport);
-    }
-    const { browserContextIds } = await connection.send('Target.getBrowserContexts');
-    return Browser_1.Browser._create({
-        connection,
-        contextIds: browserContextIds,
-        defaultViewport,
-        process: undefined,
-        closeCallback: () => {
-            return connection.send('Browser.close').catch(() => undefined);
-        },
-    });
-}
-exports._connectToBrowser = _connectToBrowser;

package/dist/browser/BrowserFetcher.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Product } from './Product';
+import type { Product } from './Product';
 declare type Platform = 'linux' | 'mac' | 'mac_arm' | 'win32' | 'win64';
 export interface BrowserFetcherOptions {
     platform: Platform | null;
@@ -86,4 +86,5 @@ export declare class BrowserFetcher {
      */
     revisionInfo(revision: string): BrowserFetcherRevisionInfo;
 }
+export declare function _downloadFile(url: string, destinationPath: string, progressCallback: (x: number, y: number) => void): Promise<number>;
 export {};

package/dist/browser/BrowserFetcher.js

@@ -53,17 +53,17 @@ var __importDefault = (this && this.__importDefault) || function (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.BrowserFetcher = 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 +106,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 +118,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 +138,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) => {
@@ -251,7 +253,9 @@ class BrowserFetcher {
             return this.revisionInfo(revision);
         }
         if (!(await existsAsync(__classPrivateFieldGet(this, _BrowserFetcher_downloadsFolder, "f")))) {
-            await mkdirAsync(__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') {
@@ -323,7 +327,7 @@ class BrowserFetcher {
                 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');
+                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"));
@@ -348,14 +352,6 @@ class BrowserFetcher {
         }
         const url = _downloadURL(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), __classPrivateFieldGet(this, _BrowserFetcher_downloadHost, "f"), revision);
         const local = fs.existsSync(folderPath);
-        console.log({
-            revision,
-            executablePath,
-            folderPath,
-            local,
-            url,
-            product: __classPrivateFieldGet(this, _BrowserFetcher_product, "f"),
-        });
         return {
             revision,
             executablePath,
@@ -391,6 +387,14 @@ 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}`);
@@ -400,8 +404,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);
@@ -414,11 +418,8 @@ function _downloadFile(url, destinationPath, progressCallback) {
         return reject(error);
     });
     return promise;
-    function onData(chunk) {
-        downloadedBytes += chunk.length;
-        progressCallback(downloadedBytes, totalBytes);
-    }
 }
+exports._downloadFile = _downloadFile;
 function install(archivePath, folderPath) {
     if (archivePath.endsWith('.zip')) {
         return (0, extract_zip_1.default)(archivePath, { dir: folderPath });

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

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