@remotion/renderer 4.0.0-bitrate.18 → 4.0.0-copy.4

package/LICENSE.md

@@ -1,34 +1,34 @@
 # Remotion License
 
-Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion create videos for free (even commercial), while a company license is required for for-profit organisations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
+Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion to create videos for free (even commercial), while a company license is required for for-profit organizations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
 
 - [Free license](#free-license)
 - [Company license](#company-license)
 
 ## Free license
 
-Copyright © 2022 [Jonny Burger](https://jonny.io)
+Copyright © 2022 [Remotion](https://www.remotion.dev/)
 
 ### Eligibility
 
 You are eligible to use Remotion for free if you are:
 
 - an individual
-- a for-profit organisation with up to 3 employees
-- a non-profit or not-for-profit organisation
+- a for-profit organization with up to 3 employees
+- a non-profit or not-for-profit organization
 - evaluating whether Remotion is a good fit, and are not yet using it in a commercial way
 
 ### Allowed use cases
 
-Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify and the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
+Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
 
 ### Disallowed use cases
 
-It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, sublicensing your own derivate of Remotion.
+It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, or sublicensing your own derivate of Remotion.
 
 ### Warranty notice
 
-The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
+The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
 
 ### Support
 
@@ -36,6 +36,6 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord.
 
 ## Company license
 
-You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support.
+You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)).
 
 Visit [companies.remotion.dev](https://companies.remotion.dev) for pricing and to buy a license.

package/dist/assets/download-and-map-assets-to-file.js

@@ -141,13 +141,6 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
     downloadMap.isDownloadingMap[src][downloadDir] = true;
     const onProgress = onDownload(src);
     if (src.startsWith('data:')) {
-        const output = (0, exports.getSanitizedFilenameForAssetUrl)({
-            contentDisposition: null,
-            downloadDir,
-            src,
-            contentType: null,
-        });
-        (0, ensure_output_directory_1.ensureOutputDirectory)(output);
         const [assetDetails, assetData] = src.substring('data:'.length).split(',');
         if (!assetDetails.includes(';')) {
             const errMessage = [
@@ -161,6 +154,13 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         const [mimeType, encoding] = assetDetails.split(';');
         validateMimeType(mimeType, src);
         validateBufferEncoding(encoding, src);
+        const output = (0, exports.getSanitizedFilenameForAssetUrl)({
+            contentDisposition: null,
+            downloadDir,
+            src,
+            contentType: mimeType,
+        });
+        (0, ensure_output_directory_1.ensureOutputDirectory)(output);
         const buff = Buffer.from(assetData, encoding);
         await fs_1.default.promises.writeFile(output, buff);
         notifyAssetIsDownloaded({ src, downloadMap, downloadDir, to: output });

package/dist/assets/download-file.d.ts

@@ -1,3 +1,7 @@
+declare type Response = {
+    sizeInBytes: number;
+    to: string;
+};
 export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
     url: string;
     to: (contentDisposition: string | null, contentType: string | null) => string;
@@ -6,7 +10,5 @@ export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
         downloaded: number;
         totalSize: number | null;
     }) => void) | undefined;
-}) => Promise<{
-    sizeInBytes: number;
-    to: string;
-}>;
+}) => Promise<Response>;
+export {};

package/dist/assets/download-file.js

@@ -6,6 +6,35 @@ const ensure_output_directory_1 = require("../ensure-output-directory");
 const read_file_1 = require("./read-file");
 const downloadFile = ({ onProgress, url, to: toFn, }) => {
     return new Promise((resolve, reject) => {
+        let rejected = false;
+        let resolved = false;
+        let timeout;
+        const resolveAndFlag = (val) => {
+            resolved = true;
+            resolve(val);
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+        };
+        const rejectAndFlag = (err) => {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            reject(err);
+            rejected = true;
+        };
+        const refreshTimeout = () => {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            timeout = setTimeout(() => {
+                if (resolved) {
+                    return;
+                }
+                rejectAndFlag(new Error(`Tried to download file ${url}, but the server sent no data for 20 seconds`));
+            }, 20000);
+        };
+        refreshTimeout();
         (0, read_file_1.readFile)(url)
             .then((res) => {
             var _a, _b;
@@ -21,16 +50,20 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
             // concise method to avoid this problem
             // https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
             writeStream.on('close', () => {
+                if (rejected) {
+                    return;
+                }
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     downloaded,
                     percent: 1,
                     totalSize: downloaded,
                 });
-                return resolve({ sizeInBytes: downloaded, to });
+                refreshTimeout();
+                return resolveAndFlag({ sizeInBytes: downloaded, to });
             });
-            writeStream.on('error', (err) => reject(err));
-            res.on('error', (err) => reject(err));
-            res.pipe(writeStream).on('error', (err) => reject(err));
+            writeStream.on('error', (err) => rejectAndFlag(err));
+            res.on('error', (err) => rejectAndFlag(err));
+            res.pipe(writeStream).on('error', (err) => rejectAndFlag(err));
             res.on('data', (d) => {
                 downloaded += d.length;
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
@@ -39,9 +72,15 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
                     totalSize,
                 });
             });
+            res.on('close', () => {
+                if (totalSize !== null && downloaded !== totalSize) {
+                    rejectAndFlag(new Error(`Download finished with ${downloaded} bytes, but expected ${totalSize} bytes from 'Content-Length'.`));
+                }
+                writeStream.close();
+            });
         })
             .catch((err) => {
-            reject(err);
+            rejectAndFlag(err);
         });
     });
 };

package/dist/assets/download-map.d.ts

@@ -7,9 +7,10 @@ declare type EncodingStatus = {
     src: string;
 } | undefined;
 export declare type SpecialVCodecForTransparency = 'vp9' | 'vp8' | 'none';
+export declare type NeedsResize = [number, number] | null;
 export declare type Vp9Result = {
-    specialVcodec: SpecialVCodecForTransparency;
-    needsResize: [number, number] | null;
+    specialVcodecForTransparency: SpecialVCodecForTransparency;
+    needsResize: NeedsResize;
 };
 export declare type VideoDurationResult = {
     duration: number | null;

package/dist/assets/get-audio-channels.d.ts

@@ -1,3 +1,3 @@
 import type { FfmpegExecutable } from '../ffmpeg-executable';
 import type { AudioChannelsAndDurationResultCache, DownloadMap } from './download-map';
-export declare const getAudioChannelsAndDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<AudioChannelsAndDurationResultCache>;
+export declare const getAudioChannelsAndDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<AudioChannelsAndDurationResultCache>;

package/dist/assets/get-audio-channels.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAudioChannelsAndDuration = void 0;
 const execa_1 = __importDefault(require("execa"));
+const ffmpeg_flags_1 = require("../ffmpeg-flags");
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable) {
+async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
     if (downloadMap.durationOfAssetCache[src]) {
         return downloadMap.durationOfAssetCache[src];
     }
@@ -19,7 +20,7 @@ async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExe
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
+    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), args);
     const channels = task.stdout.match(/channels=([0-9]+)/);
     const duration = task.stdout.match(/duration=([0-9.]+)/);
     const result = {
@@ -29,7 +30,7 @@ async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExe
     downloadMap.durationOfAssetCache[src] = result;
     return result;
 }
-const getAudioChannelsAndDuration = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable));
+const getAudioChannelsAndDuration = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
+    return limit(() => getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
 };
 exports.getAudioChannelsAndDuration = getAudioChannelsAndDuration;

package/dist/assets/get-video-stream-duration.d.ts

@@ -1,4 +1,9 @@
 import type { FfmpegExecutable } from '../ffmpeg-executable';
 import type { DownloadMap, VideoDurationResult } from './download-map';
 export declare const parseVideoStreamDuration: (stdout: string) => VideoDurationResult;
-export declare const getVideoStreamDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<VideoDurationResult>;
+export declare function getVideoStreamDurationwithoutCache({ src, ffprobeExecutable, remotionRoot, }: {
+    src: string;
+    ffprobeExecutable: FfmpegExecutable;
+    remotionRoot: string;
+}): Promise<VideoDurationResult>;
+export declare const getVideoStreamDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<VideoDurationResult>;

package/dist/assets/get-video-stream-duration.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVideoStreamDuration = exports.parseVideoStreamDuration = void 0;
+exports.getVideoStreamDuration = exports.getVideoStreamDurationwithoutCache = exports.parseVideoStreamDuration = void 0;
 const execa_1 = __importDefault(require("execa"));
+const ffmpeg_flags_1 = require("../ffmpeg-flags");
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
 const parseAlternativeDuration = (stdout) => {
@@ -38,10 +39,7 @@ const parseVideoStreamDuration = (stdout) => {
     return result;
 };
 exports.parseVideoStreamDuration = parseVideoStreamDuration;
-async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable) {
-    if (downloadMap.videoDurationResultCache[src]) {
-        return downloadMap.videoDurationResultCache[src];
-    }
+async function getVideoStreamDurationwithoutCache({ src, ffprobeExecutable, remotionRoot, }) {
     const args = [
         ['-v', 'error'],
         ['-select_streams', 'v:0'],
@@ -50,10 +48,24 @@ async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutab
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
-    return (0, exports.parseVideoStreamDuration)(task.stdout);
+    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), args);
+    const result = (0, exports.parseVideoStreamDuration)(task.stdout);
+    return result;
+}
+exports.getVideoStreamDurationwithoutCache = getVideoStreamDurationwithoutCache;
+async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
+    if (downloadMap.videoDurationResultCache[src]) {
+        return downloadMap.videoDurationResultCache[src];
+    }
+    const result = await getVideoStreamDurationwithoutCache({
+        src,
+        ffprobeExecutable,
+        remotionRoot,
+    });
+    downloadMap.videoDurationResultCache[src] = result;
+    return result;
 }
-const getVideoStreamDuration = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable));
+const getVideoStreamDuration = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
+    return limit(() => getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
 };
 exports.getVideoStreamDuration = getVideoStreamDuration;

package/dist/assets/read-file.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFile = void 0;
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
+const redirect_status_codes_1 = require("../redirect-status-codes");
 const getClient = (url) => {
     if (url.startsWith('https://')) {
         return https_1.default.get;
@@ -29,10 +30,7 @@ const readFile = async (url, redirectsSoFar = 0) => {
         throw new Error(`Too many redirects while downloading ${url}`);
     }
     const file = await readFileWithoutRedirect(url);
-    if (file.statusCode === 302 ||
-        file.statusCode === 301 ||
-        file.statusCode === 307 ||
-        file.statusCode === 308) {
+    if (redirect_status_codes_1.redirectStatusCodes.includes(file.statusCode)) {
         if (!file.headers.location) {
             throw new Error(`Received a status code ${file.statusCode} but no "Location" header while calling ${file.headers.location}`);
         }

package/dist/browser/Browser.d.ts

@@ -25,7 +25,8 @@ interface WaitForTargetOptions {
 export declare const enum BrowserEmittedEvents {
     TargetChanged = "targetchanged",
     TargetCreated = "targetcreated",
-    Closed = "closed"
+    Closed = "closed",
+    ClosedSilent = "closed-silent"
 }
 export declare class Browser extends EventEmitter {
     #private;
@@ -35,6 +36,7 @@ export declare class Browser extends EventEmitter {
         defaultViewport: Viewport;
         closeCallback?: BrowserCloseCallback;
     }): Promise<Browser>;
+    connection: Connection;
     get _targets(): Map<string, Target>;
     constructor(connection: Connection, contextIds: string[], defaultViewport: Viewport, closeCallback?: BrowserCloseCallback);
     browserContexts(): BrowserContext[];
@@ -43,7 +45,7 @@ export declare class Browser extends EventEmitter {
     targets(): Target[];
     waitForTarget(predicate: (x: Target) => boolean | Promise<boolean>, options?: WaitForTargetOptions): Promise<Target>;
     pages(): Promise<Page[]>;
-    close(): Promise<void>;
+    close(silent: boolean): Promise<void>;
     disconnect(): void;
 }
 export declare class BrowserContext extends EventEmitter {

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_connection, _Browser_closeCallback, _Browser_defaultContext, _Browser_contexts, _Browser_targets, _Browser_targetCreated, _Browser_targetDestroyed, _Browser_targetInfoChanged, _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");
@@ -38,13 +38,12 @@ class Browser extends EventEmitter_1.EventEmitter {
         super();
         _Browser_instances.add(this);
         _Browser_defaultViewport.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_connection, connection, "f");
+        this.connection = connection;
         __classPrivateFieldSet(this, _Browser_closeCallback, closeCallback ||
             function () {
                 return undefined;
@@ -55,9 +54,9 @@ 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, closeCallback, }) {
         const browser = new Browser(connection, contextIds, defaultViewport, closeCallback);
@@ -74,7 +73,7 @@ class Browser extends EventEmitter_1.EventEmitter {
         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,
         });
@@ -133,17 +132,21 @@ class Browser extends EventEmitter_1.EventEmitter {
             return acc.concat(x);
         }, []);
     }
-    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("closed" /* BrowserEmittedEvents.Closed */);
+        this.emit(silent ? "closed-silent" /* BrowserEmittedEvents.ClosedSilent */ : "closed" /* BrowserEmittedEvents.Closed */);
     }
     disconnect() {
-        __classPrivateFieldGet(this, _Browser_connection, "f").dispose();
+        this.connection.dispose();
     }
 }
 exports.Browser = Browser;
-_Browser_defaultViewport = 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;
@@ -154,7 +157,7 @@ _Browser_defaultViewport = new WeakMap(), _Browser_connection = new WeakMap(), _
         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);

package/dist/browser/BrowserFetcher.d.ts

@@ -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,7 +53,7 @@ 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"));
@@ -388,6 +388,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}`);
@@ -397,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);
@@ -411,14 +418,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', {