@remotion/renderer 3.0.24 → 3.0.27

package/dist/assets/download-and-map-assets-to-file.d.ts

@@ -1,20 +1,33 @@
 import type { TAsset } from 'remotion';
 export declare type RenderMediaOnDownload = (src: string) => ((progress: {
-    percent: number;
+    percent: number | null;
+    downloaded: number;
+    totalSize: number | null;
 }) => void) | undefined | void;
-export declare const waitForAssetToBeDownloaded: (src: string, to: string) => Promise<void>;
+export declare const waitForAssetToBeDownloaded: ({ src, downloadDir, }: {
+    src: string;
+    downloadDir: string;
+}) => Promise<string>;
+export declare const downloadAsset: ({ src, onDownload, downloadDir, }: {
+    src: string;
+    onDownload: RenderMediaOnDownload;
+    downloadDir: string;
+}) => Promise<string>;
 export declare const markAllAssetsAsDownloaded: () => void;
-export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, }: {
+export declare const getFilename: ({ contentDisposition, src, }: {
+    src: string;
+    contentDisposition: string | null;
+}) => {
+    pathname: string;
+    search: string;
+};
+export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, contentDisposition, }: {
     src: string;
     downloadDir: string;
+    contentDisposition: string | null;
 }) => string;
 export declare const downloadAndMapAssetsToFileUrl: ({ asset, downloadDir, onDownload, }: {
     asset: TAsset;
     downloadDir: string;
     onDownload: RenderMediaOnDownload;
 }) => Promise<TAsset>;
-export declare const startDownloadForSrc: ({ src, downloadDir, onDownload, }: {
-    src: string;
-    downloadDir: string;
-    onDownload: RenderMediaOnDownload;
-}) => Promise<string>;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startDownloadForSrc = exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = exports.waitForAssetToBeDownloaded = void 0;
+exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.getFilename = exports.markAllAssetsAsDownloaded = exports.downloadAsset = exports.waitForAssetToBeDownloaded = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
@@ -13,38 +13,41 @@ const sanitize_filepath_1 = require("./sanitize-filepath");
 const isDownloadingMap = {};
 const hasBeenDownloadedMap = {};
 const listeners = {};
-const waitForAssetToBeDownloaded = (src, to) => {
-    var _a;
-    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[to]) {
-        return Promise.resolve();
+const waitForAssetToBeDownloaded = ({ src, downloadDir, }) => {
+    var _a, _b;
+    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
+        return Promise.resolve((_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]);
     }
     if (!listeners[src]) {
         listeners[src] = {};
     }
-    if (!listeners[src][to]) {
-        listeners[src][to] = [];
+    if (!listeners[src][downloadDir]) {
+        listeners[src][downloadDir] = [];
     }
     return new Promise((resolve) => {
-        listeners[src][to].push(() => resolve());
+        listeners[src][downloadDir].push(() => {
+            var _a;
+            resolve((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]);
+        });
     });
 };
 exports.waitForAssetToBeDownloaded = waitForAssetToBeDownloaded;
-const notifyAssetIsDownloaded = (src, to) => {
+const notifyAssetIsDownloaded = ({ src, downloadDir, to, }) => {
     if (!listeners[src]) {
         listeners[src] = {};
     }
-    if (!listeners[src][to]) {
-        listeners[src][to] = [];
+    if (!listeners[src][downloadDir]) {
+        listeners[src][downloadDir] = [];
     }
-    listeners[src][to].forEach((fn) => fn());
+    listeners[src][downloadDir].forEach((fn) => fn());
     if (!isDownloadingMap[src]) {
         isDownloadingMap[src] = {};
     }
-    isDownloadingMap[src][to] = false;
+    isDownloadingMap[src][downloadDir] = true;
     if (!hasBeenDownloadedMap[src]) {
         hasBeenDownloadedMap[src] = {};
     }
-    hasBeenDownloadedMap[src][to] = true;
+    hasBeenDownloadedMap[src][downloadDir] = to;
 };
 const validateMimeType = (mimeType, src) => {
     if (!mimeType.includes('/')) {
@@ -85,21 +88,29 @@ function validateBufferEncoding(potentialEncoding, dataUrl) {
         throw new TypeError(errMessage);
     }
 }
-const downloadAsset = async (src, to, onDownload) => {
-    var _a, _b;
-    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[to]) {
-        return;
+const downloadAsset = async ({ src, onDownload, downloadDir, }) => {
+    var _a, _b, _c;
+    if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
+        return src;
+    }
+    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
+        return (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
     }
-    if ((_b = isDownloadingMap[src]) === null || _b === void 0 ? void 0 : _b[to]) {
-        return (0, exports.waitForAssetToBeDownloaded)(src, to);
+    if ((_c = isDownloadingMap[src]) === null || _c === void 0 ? void 0 : _c[downloadDir]) {
+        return (0, exports.waitForAssetToBeDownloaded)({ src, downloadDir });
     }
     if (!isDownloadingMap[src]) {
         isDownloadingMap[src] = {};
     }
-    isDownloadingMap[src][to] = true;
+    isDownloadingMap[src][downloadDir] = true;
     const onProgress = onDownload(src);
-    (0, ensure_output_directory_1.ensureOutputDirectory)(to);
     if (src.startsWith('data:')) {
+        const output = (0, exports.getSanitizedFilenameForAssetUrl)({
+            contentDisposition: null,
+            downloadDir,
+            src,
+        });
+        (0, ensure_output_directory_1.ensureOutputDirectory)(output);
         const [assetDetails, assetData] = src.substring('data:'.length).split(',');
         if (!assetDetails.includes(';')) {
             const errMessage = [
@@ -114,17 +125,21 @@ const downloadAsset = async (src, to, onDownload) => {
         validateMimeType(mimeType, src);
         validateBufferEncoding(encoding, src);
         const buff = Buffer.from(assetData, encoding);
-        await fs_1.default.promises.writeFile(to, buff);
-        notifyAssetIsDownloaded(src, to);
-        return;
+        await fs_1.default.promises.writeFile(output, buff);
+        notifyAssetIsDownloaded({ src, downloadDir, to: output });
+        return output;
     }
-    await (0, download_file_1.downloadFile)(src, to, ({ progress }) => {
-        onProgress === null || onProgress === void 0 ? void 0 : onProgress({
-            percent: progress,
-        });
+    const { to } = await (0, download_file_1.downloadFile)({
+        url: src,
+        onProgress: (progress) => {
+            onProgress === null || onProgress === void 0 ? void 0 : onProgress(progress);
+        },
+        to: (contentDisposition) => (0, exports.getSanitizedFilenameForAssetUrl)({ contentDisposition, downloadDir, src }),
     });
-    notifyAssetIsDownloaded(src, to);
+    notifyAssetIsDownloaded({ src, downloadDir, to });
+    return to;
 };
+exports.downloadAsset = downloadAsset;
 const markAllAssetsAsDownloaded = () => {
     Object.keys(hasBeenDownloadedMap).forEach((key) => {
         delete hasBeenDownloadedMap[key];
@@ -134,21 +149,40 @@ const markAllAssetsAsDownloaded = () => {
     });
 };
 exports.markAllAssetsAsDownloaded = markAllAssetsAsDownloaded;
-const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, }) => {
+const getFilename = ({ contentDisposition, src, }) => {
+    const filenameProbe = 'filename=';
+    if (contentDisposition === null || contentDisposition === void 0 ? void 0 : contentDisposition.includes(filenameProbe)) {
+        const start = contentDisposition.indexOf(filenameProbe);
+        const onlyFromFileName = contentDisposition.substring(start + filenameProbe.length);
+        const hasSemi = onlyFromFileName.indexOf(';');
+        if (hasSemi === -1) {
+            return { pathname: onlyFromFileName.trim(), search: '' };
+        }
+        return {
+            search: '',
+            pathname: onlyFromFileName.substring(0, hasSemi).trim(),
+        };
+    }
+    const { pathname, search } = new URL(src);
+    return { pathname, search };
+};
+exports.getFilename = getFilename;
+const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition, }) => {
     if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
         return src;
     }
-    const { pathname, search } = new URL(src);
+    const { pathname, search } = (0, exports.getFilename)({ contentDisposition, src });
     const split = pathname.split('.');
     const fileExtension = split.length > 1 && split[split.length - 1]
         ? `.${split[split.length - 1]}`
         : '';
     const hashedFileName = String((0, remotion_1.random)(`${pathname}${search}`)).replace('0.', '');
-    return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(hashedFileName + fileExtension));
+    const filename = hashedFileName + fileExtension;
+    return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
 };
 exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
 const downloadAndMapAssetsToFileUrl = async ({ asset, downloadDir, onDownload, }) => {
-    const newSrc = await (0, exports.startDownloadForSrc)({
+    const newSrc = await (0, exports.downloadAsset)({
         src: asset.src,
         downloadDir,
         onDownload,
@@ -159,11 +193,3 @@ const downloadAndMapAssetsToFileUrl = async ({ asset, downloadDir, onDownload, }
     };
 };
 exports.downloadAndMapAssetsToFileUrl = downloadAndMapAssetsToFileUrl;
-const startDownloadForSrc = async ({ src, downloadDir, onDownload, }) => {
-    const newSrc = (0, exports.getSanitizedFilenameForAssetUrl)({ downloadDir, src });
-    if (!remotion_1.Internals.AssetCompression.isAssetCompressed(newSrc)) {
-        await downloadAsset(src, newSrc, onDownload);
-    }
-    return newSrc;
-};
-exports.startDownloadForSrc = startDownloadForSrc;

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

@@ -1,7 +1,12 @@
-export declare const downloadFile: (url: string, to: string, onProgress: ((progress: {
-    progress: number;
-    downloaded: number;
-    totalSize: number;
-}) => void) | undefined) => Promise<{
+export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
+    url: string;
+    to: (contentDisposition: string | null) => string;
+    onProgress: ((progress: {
+        percent: number | null;
+        downloaded: number;
+        totalSize: number | null;
+    }) => void) | undefined;
+}) => Promise<{
     sizeInBytes: number;
+    to: string;
 }>;

package/dist/assets/download-file.js

@@ -2,25 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFile = void 0;
 const fs_1 = require("fs");
+const ensure_output_directory_1 = require("../ensure-output-directory");
 const read_file_1 = require("./read-file");
-const downloadFile = (url, to, onProgress) => {
+const downloadFile = ({ onProgress, url, to: toFn, }) => {
     return new Promise((resolve, reject) => {
         (0, read_file_1.readFile)(url)
             .then((res) => {
-            const totalSize = Number(res.headers['content-length']);
+            var _a;
+            const contentDisposition = (_a = res.headers['content-disposition']) !== null && _a !== void 0 ? _a : null;
+            const to = toFn(contentDisposition);
+            (0, ensure_output_directory_1.ensureOutputDirectory)(to);
+            const sizeHeader = res.headers['content-length'];
+            const totalSize = typeof sizeHeader === 'undefined' ? null : Number(sizeHeader);
             const writeStream = (0, fs_1.createWriteStream)(to);
+            let downloaded = 0;
             // Listen to 'close' event instead of more
             // concise method to avoid this problem
             // https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
-            writeStream.on('close', () => resolve({ sizeInBytes: totalSize }));
+            writeStream.on('close', () => {
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress({
+                    downloaded,
+                    percent: 1,
+                    totalSize: downloaded,
+                });
+                return resolve({ sizeInBytes: downloaded, to });
+            });
             writeStream.on('error', (err) => reject(err));
-            let downloaded = 0;
             res.pipe(writeStream).on('error', (err) => reject(err));
             res.on('data', (d) => {
                 downloaded += d.length;
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     downloaded,
-                    progress: downloaded / totalSize,
+                    percent: totalSize === null ? null : downloaded / totalSize,
                     totalSize,
                 });
             });

package/dist/assets/ffmpeg-volume-expression.d.ts

@@ -4,9 +4,8 @@ declare type FfmpegVolumeExpression = {
     eval: FfmpegEval;
     value: string;
 };
-export declare const ffmpegVolumeExpression: ({ volume, startInVideo, fps, trimLeft, }: {
+export declare const ffmpegVolumeExpression: ({ volume, fps, trimLeft, }: {
     volume: AssetVolume;
-    startInVideo: number;
     trimLeft: number;
     fps: number;
 }) => FfmpegVolumeExpression;

package/dist/assets/ffmpeg-volume-expression.js

@@ -43,7 +43,7 @@ const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
     const [volume, frames] = first;
     return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression(rest, delay, fps));
 };
-const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
+const ffmpegVolumeExpression = ({ volume, fps, trimLeft, }) => {
     // If it's a static volume, we return it and tell
     // FFMPEG it only has to evaluate it once
     if (typeof volume === 'number') {
@@ -55,7 +55,6 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
     if ([...new Set(volume)].length === 1) {
         return (0, exports.ffmpegVolumeExpression)({
             volume: volume[0],
-            startInVideo,
             fps,
             trimLeft,
         });
@@ -76,7 +75,7 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
         if (!volumeMap[actualVolume]) {
             volumeMap[actualVolume] = [];
         }
-        volumeMap[actualVolume].push(frame + startInVideo);
+        volumeMap[actualVolume].push(frame);
     });
     // Sort the map so that the most common volume is last
     // this is going to be the else statement so the expression is short

package/dist/assets/read-file.js

@@ -29,7 +29,10 @@ 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) {
+    if (file.statusCode === 302 ||
+        file.statusCode === 301 ||
+        file.statusCode === 307 ||
+        file.statusCode === 308) {
         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

@@ -22,6 +22,11 @@ declare type BrowserCloseCallback = () => Promise<void> | void;
 interface WaitForTargetOptions {
     timeout?: number;
 }
+export declare const enum BrowserEmittedEvents {
+    TargetChanged = "targetchanged",
+    TargetCreated = "targetcreated",
+    Closed = "closed"
+}
 export declare class Browser extends EventEmitter {
     #private;
     static _create({ connection, contextIds, defaultViewport, closeCallback, }: {

package/dist/browser/Browser.js

@@ -111,7 +111,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);
@@ -136,6 +136,7 @@ class Browser extends EventEmitter_1.EventEmitter {
     async close() {
         await __classPrivateFieldGet(this, _Browser_closeCallback, "f").call(null);
         this.disconnect();
+        this.emit("closed" /* BrowserEmittedEvents.Closed */);
     }
     disconnect() {
         __classPrivateFieldGet(this, _Browser_connection, "f").dispose();

package/dist/browser/DOMWorld.d.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { Browser } from './Browser';
 import type { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
 import type { ExecutionContext } from './ExecutionContext';
 import type { Frame } from './FrameManager';
@@ -29,7 +30,7 @@ export declare class DOMWorld {
     executionContext(): Promise<ExecutionContext>;
     evaluateHandle<HandlerType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandlerType>;
     evaluate<T extends EvaluateFn>(pageFunction: T, ...args: SerializableOrJSHandle[]): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>>;
-    waitForFunction(pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
+    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
     title(): Promise<string>;
 }
 interface WaitTaskOptions {
@@ -37,12 +38,14 @@ interface WaitTaskOptions {
     predicateBody: Function | string;
     title: string;
     timeout: number;
+    browser: Browser;
     args: SerializableOrJSHandle[];
 }
 declare class WaitTask {
     #private;
     promise: Promise<JSHandle>;
     constructor(options: WaitTaskOptions);
+    onBrowserClose: () => void;
     terminate(error: Error): void;
     rerun(): Promise<void>;
 }

package/dist/browser/DOMWorld.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 _DOMWorld_frame, _DOMWorld_timeoutSettings, _DOMWorld_contextPromise, _DOMWorld_contextResolveCallback, _DOMWorld_detached, _DOMWorld_waitTasks, _WaitTask_instances, _WaitTask_domWorld, _WaitTask_timeout, _WaitTask_predicateBody, _WaitTask_args, _WaitTask_runCount, _WaitTask_resolve, _WaitTask_reject, _WaitTask_timeoutTimer, _WaitTask_terminated, _WaitTask_cleanup;
+var _DOMWorld_frame, _DOMWorld_timeoutSettings, _DOMWorld_contextPromise, _DOMWorld_contextResolveCallback, _DOMWorld_detached, _DOMWorld_waitTasks, _WaitTask_instances, _WaitTask_domWorld, _WaitTask_timeout, _WaitTask_predicateBody, _WaitTask_args, _WaitTask_runCount, _WaitTask_resolve, _WaitTask_reject, _WaitTask_timeoutTimer, _WaitTask_terminated, _WaitTask_browser, _WaitTask_cleanup;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DOMWorld = void 0;
 const assert_1 = require("./assert");
@@ -93,7 +93,7 @@ class DOMWorld {
         const context = await this.executionContext();
         return context.evaluate(pageFunction, ...args);
     }
-    waitForFunction(pageFunction, ...args) {
+    waitForFunction(browser, pageFunction, ...args) {
         const timeout = __classPrivateFieldGet(this, _DOMWorld_timeoutSettings, "f").timeout();
         const waitTaskOptions = {
             domWorld: this,
@@ -101,6 +101,7 @@ class DOMWorld {
             title: 'function',
             timeout,
             args,
+            browser,
         };
         const waitTask = new WaitTask(waitTaskOptions);
         return waitTask.promise;
@@ -126,6 +127,10 @@ class WaitTask {
         _WaitTask_reject.set(this, noop);
         _WaitTask_timeoutTimer.set(this, void 0);
         _WaitTask_terminated.set(this, false);
+        _WaitTask_browser.set(this, void 0);
+        this.onBrowserClose = () => {
+            return this.terminate(new Error('Browser was closed'));
+        };
         function getPredicateBody(predicateBody) {
             if ((0, util_1.isString)(predicateBody)) {
                 return `return (${predicateBody});`;
@@ -150,6 +155,8 @@ class WaitTask {
                 return this.terminate(timeoutError);
             }, options.timeout), "f");
         }
+        __classPrivateFieldSet(this, _WaitTask_browser, options.browser, "f");
+        __classPrivateFieldGet(this, _WaitTask_browser, "f").on("closed" /* BrowserEmittedEvents.Closed */, this.onBrowserClose);
         this.rerun();
     }
     terminate(error) {
@@ -230,10 +237,11 @@ class WaitTask {
         __classPrivateFieldGet(this, _WaitTask_instances, "m", _WaitTask_cleanup).call(this);
     }
 }
-_WaitTask_domWorld = new WeakMap(), _WaitTask_timeout = new WeakMap(), _WaitTask_predicateBody = new WeakMap(), _WaitTask_args = new WeakMap(), _WaitTask_runCount = new WeakMap(), _WaitTask_resolve = new WeakMap(), _WaitTask_reject = new WeakMap(), _WaitTask_timeoutTimer = new WeakMap(), _WaitTask_terminated = new WeakMap(), _WaitTask_instances = new WeakSet(), _WaitTask_cleanup = function _WaitTask_cleanup() {
+_WaitTask_domWorld = new WeakMap(), _WaitTask_timeout = new WeakMap(), _WaitTask_predicateBody = new WeakMap(), _WaitTask_args = new WeakMap(), _WaitTask_runCount = new WeakMap(), _WaitTask_resolve = new WeakMap(), _WaitTask_reject = new WeakMap(), _WaitTask_timeoutTimer = new WeakMap(), _WaitTask_terminated = new WeakMap(), _WaitTask_browser = new WeakMap(), _WaitTask_instances = new WeakSet(), _WaitTask_cleanup = function _WaitTask_cleanup() {
     if (__classPrivateFieldGet(this, _WaitTask_timeoutTimer, "f") !== undefined) {
         clearTimeout(__classPrivateFieldGet(this, _WaitTask_timeoutTimer, "f"));
     }
+    __classPrivateFieldGet(this, _WaitTask_browser, "f").off("closed" /* BrowserEmittedEvents.Closed */, this.onBrowserClose);
     __classPrivateFieldGet(this, _WaitTask_domWorld, "f")._waitTasks.delete(this);
 };
 function waitForPredicatePageFunction(predicateBody, timeout, ...args) {

package/dist/browser/FrameManager.d.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import type { Protocol } from 'devtools-protocol';
+import type { Browser } from './Browser';
 import type { CDPSession } from './Connection';
 import { DOMWorld } from './DOMWorld';
 import type { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
@@ -82,7 +83,7 @@ export declare class Frame {
     evaluate<T extends EvaluateFn>(pageFunction: T, ...args: SerializableOrJSHandle[]): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>>;
     url(): string;
     childFrames(): Frame[];
-    waitForFunction(pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
+    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
     _navigated(framePayload: Protocol.Page.Frame): void;
     _navigatedWithinDocument(url: string): void;
     _onLifecycleEvent(loaderId: string, name: string): void;

package/dist/browser/FrameManager.js

@@ -460,8 +460,8 @@ class Frame {
     childFrames() {
         return Array.from(this._childFrames);
     }
-    waitForFunction(pageFunction, ...args) {
-        return this._mainWorld.waitForFunction(pageFunction, ...args);
+    waitForFunction(browser, pageFunction, ...args) {
+        return this._mainWorld.waitForFunction(browser, pageFunction, ...args);
     }
     _navigated(framePayload) {
         this._name = framePayload.name;

package/dist/browser/Page.d.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { Browser } from './Browser';
 import type { CDPSession } from './Connection';
 import { ConsoleMessage } from './ConsoleMessage';
 import type { EvaluateFn, EvaluateFnReturnType, EvaluateHandleFn, SerializableOrJSHandle, UnwrapPromiseLike } from './EvalTypes';
@@ -32,9 +33,10 @@ interface PageEventObject {
 }
 export declare class Page extends EventEmitter {
     #private;
-    static _create(client: CDPSession, target: Target, defaultViewport: Viewport): Promise<Page>;
+    static _create(client: CDPSession, target: Target, defaultViewport: Viewport, browser: Browser): Promise<Page>;
+    browser: Browser;
     screenshotTaskQueue: TaskQueue;
-    constructor(client: CDPSession, target: Target);
+    constructor(client: CDPSession, target: Target, browser: Browser);
     /**
      * Listen to page events.
      */
@@ -67,6 +69,6 @@ export declare class Page extends EventEmitter {
         runBeforeUnload?: boolean;
     }): Promise<void>;
     isClosed(): boolean;
-    waitForFunction(pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
+    waitForFunction(browser: Browser, pageFunction: Function | string, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
 }
 export {};

package/dist/browser/Page.js

@@ -37,7 +37,7 @@ const TaskQueue_1 = require("./TaskQueue");
 const TimeoutSettings_1 = require("./TimeoutSettings");
 const util_1 = require("./util");
 class Page extends EventEmitter_1.EventEmitter {
-    constructor(client, target) {
+    constructor(client, target, browser) {
         super();
         _Page_instances.add(this);
         _Page_closed.set(this, false);
@@ -50,6 +50,7 @@ class Page extends EventEmitter_1.EventEmitter {
         __classPrivateFieldSet(this, _Page_target, target, "f");
         __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;
         client.on('Target.attachedToTarget', (event) => {
             switch (event.targetInfo.type) {
                 case 'iframe':
@@ -83,8 +84,8 @@ class Page extends EventEmitter_1.EventEmitter {
             return __classPrivateFieldGet(this, _Page_instances, "m", _Page_onLogEntryAdded).call(this, event);
         });
     }
-    static async _create(client, target, defaultViewport) {
-        const page = new Page(client, target);
+    static async _create(client, target, defaultViewport, browser) {
+        const page = new Page(client, target, browser);
         await __classPrivateFieldGet(page, _Page_instances, "m", _Page_initialize).call(page);
         await page.setViewport(defaultViewport);
         return page;
@@ -180,8 +181,8 @@ class Page extends EventEmitter_1.EventEmitter {
     isClosed() {
         return __classPrivateFieldGet(this, _Page_closed, "f");
     }
-    waitForFunction(pageFunction, ...args) {
-        return this.mainFrame().waitForFunction(pageFunction, ...args);
+    waitForFunction(browser, pageFunction, ...args) {
+        return this.mainFrame().waitForFunction(browser, pageFunction, ...args);
     }
 }
 exports.Page = Page;

package/dist/browser/Target.js

@@ -84,7 +84,7 @@ class Target {
         if (isPagetTarget(__classPrivateFieldGet(this, _Target_targetInfo, "f")) && !__classPrivateFieldGet(this, _Target_pagePromise, "f")) {
             __classPrivateFieldSet(this, _Target_pagePromise, __classPrivateFieldGet(this, _Target_sessionFactory, "f").call(this).then((client) => {
                 var _a;
-                return Page_1.Page._create(client, this, (_a = __classPrivateFieldGet(this, _Target_defaultViewport, "f")) !== null && _a !== void 0 ? _a : null);
+                return Page_1.Page._create(client, this, (_a = __classPrivateFieldGet(this, _Target_defaultViewport, "f")) !== null && _a !== void 0 ? _a : null, this.browser());
             }), "f");
         }
         return (_a = (await __classPrivateFieldGet(this, _Target_pagePromise, "f"))) !== null && _a !== void 0 ? _a : null;

package/dist/browser/util.d.ts

@@ -15,6 +15,7 @@
  */
 /// <reference types="node" />
 import type { Protocol } from 'devtools-protocol';
+import type { Browser } from './Browser';
 import type { CDPSession } from './Connection';
 import type { CommonEventEmitter } from './EventEmitter';
 export declare function getExceptionMessage(exceptionDetails: Protocol.Runtime.ExceptionDetails): string;
@@ -36,7 +37,7 @@ export declare function evaluationString(fun: Function | string, ...args: unknow
 export declare function pageBindingDeliverResultString(name: string, seq: number, result: unknown): string;
 export declare function pageBindingDeliverErrorString(name: string, seq: number, message: string, stack?: string): string;
 export declare function pageBindingDeliverErrorValueString(name: string, seq: number, value: unknown): string;
-export declare function waitWithTimeout<T>(promise: Promise<T>, taskName: string, timeout: number): Promise<T>;
+export declare function waitWithTimeout<T>(promise: Promise<T>, taskName: string, timeout: number, browser: Browser): Promise<T>;
 interface ErrorLike extends Error {
     name: string;
     message: string;

package/dist/browser/util.js

@@ -128,7 +128,7 @@ function pageBindingDeliverErrorValueString(name, seq, value) {
     return evaluationString(deliverErrorValue, name, seq, value);
 }
 exports.pageBindingDeliverErrorValueString = pageBindingDeliverErrorValueString;
-async function waitWithTimeout(promise, taskName, timeout) {
+async function waitWithTimeout(promise, taskName, timeout, browser) {
     let reject;
     const timeoutError = new Errors_1.TimeoutError(`waiting for ${taskName} failed: timeout ${timeout}ms exceeded`);
     const timeoutPromise = new Promise((_res, rej) => {
@@ -141,7 +141,15 @@ async function waitWithTimeout(promise, taskName, timeout) {
         }, timeout);
     }
     try {
-        return await Promise.race([promise, timeoutPromise]);
+        return await Promise.race([
+            new Promise((_, rej) => {
+                browser.once("closed" /* BrowserEmittedEvents.Closed */, () => {
+                    return rej();
+                });
+            }),
+            promise,
+            timeoutPromise,
+        ]);
     }
     finally {
         if (timeoutTimer) {

package/dist/calculate-sar-dar-pixels.d.ts

@@ -0,0 +1,9 @@
+export declare const calculateDisplayVideoSize: ({ darX, darY, x, y, }: {
+    x: number;
+    y: number;
+    darX: number;
+    darY: number;
+}) => {
+    width: number;
+    height: number;
+};

package/dist/calculate-sar-dar-pixels.js

@@ -0,0 +1,19 @@
+"use strict";
+// https://superuser.com/questions/907933/correct-aspect-ratio-without-re-encoding-video-file
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateDisplayVideoSize = void 0;
+const calculateDisplayVideoSize = ({ darX, darY, x, y, }) => {
+    // We know two equations:
+    //   newWidth / newHeight = darX / darY
+    // and:
+    //   x * y = (newWidth * newHeight)
+    // I solved it then on pen and paper and simplified the formula:
+    const dimensions = x * y;
+    const newWidth = Math.sqrt(dimensions * (darX / darY));
+    const newHeight = dimensions / newWidth;
+    return {
+        height: Math.round(newHeight),
+        width: Math.round(newWidth),
+    };
+};
+exports.calculateDisplayVideoSize = calculateDisplayVideoSize;