@remotion/renderer 3.0.25 → 3.0.26

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/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/get-compositions.js

@@ -40,7 +40,7 @@ const innerGetCompositions = async (serveUrl, page, config, proxyPort) => {
         frame: null,
         args: [],
     });
-    await page.waitForFunction('window.ready === true');
+    await page.waitForFunction(page.browser, 'window.ready === true');
     const result = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: () => {
             return window.getStaticCompositions();

package/dist/get-port.js

@@ -14,7 +14,7 @@ const getAvailablePort = (portToTry) => new Promise((resolve) => {
         status = 'unavailable';
         socket.destroy();
     });
-    socket.setTimeout(1000);
+    socket.setTimeout(3000);
     socket.on('timeout', () => {
         status = 'unavailable';
         socket.destroy();
@@ -26,15 +26,9 @@ const getAvailablePort = (portToTry) => new Promise((resolve) => {
     socket.on('close', () => resolve(status));
     socket.connect(portToTry, host);
 });
-const portCheckSequence = function* (ports) {
-    if (ports) {
-        yield* ports;
-    }
-    yield 0; // Fall back to 0 if anything else failed
-};
 const getPort = async (from, to) => {
     const ports = makeRange(from, to);
-    for (const port of portCheckSequence(ports)) {
+    for (const port of ports) {
         if ((await getAvailablePort(port)) === 'available') {
             return port;
         }
@@ -71,10 +65,7 @@ const makeRange = (from, to) => {
     if (to < from) {
         throw new RangeError('`to` must be greater than or equal to `from`');
     }
-    const generator = function* (f, t) {
-        for (let port = f; port <= t; port++) {
-            yield port;
-        }
-    };
-    return generator(from, to);
+    return new Array(to - from + 1).fill(true).map((_, i) => {
+        return i + from;
+    });
 };

package/dist/index.d.ts

@@ -52,7 +52,7 @@ export declare const RenderInternals: {
     }) => void;
     normalizeServeUrl: (unnormalized: string) => string;
     spawnFfmpeg: (options: import("./stitch-frames-to-video").StitcherOptions) => Promise<{
-        task: Promise<void>;
+        task: Promise<Buffer | null>;
         getLogs: () => string;
     }>;
     getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "mp4" | "mkv" | "mov" | "webm";
@@ -62,12 +62,17 @@ export declare const RenderInternals: {
     ensureOutputDirectory: (outputLocation: string) => void;
     getRealFrameRange: (durationInFrames: number, frameRange: import("remotion").FrameRange | null) => [number, number];
     validatePuppeteerTimeout: (timeoutInMilliseconds: unknown) => void;
-    downloadFile: (url: string, to: string, onProgress: ((progress: {
-        progress: number;
-        downloaded: number;
-        totalSize: number;
-    }) => void) | undefined) => Promise<{
+    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;
     }>;
     validateScale: (scale: unknown) => void;
     killAllBrowsers: () => Promise<void>;
@@ -97,4 +102,6 @@ export declare const RenderInternals: {
         node(scriptPath: string, options?: execa.Options<string> | undefined): execa.ExecaChildProcess<string>;
         node(scriptPath: string, options?: execa.Options<null> | undefined): execa.ExecaChildProcess<Buffer>;
     };
+    registerErrorSymbolicationLock: () => number;
+    unlockErrorSymbolicationLock: (id: number) => void;
 };

package/dist/index.js

@@ -31,6 +31,7 @@ const validate_even_dimensions_with_codec_1 = require("./validate-even-dimension
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_scale_1 = require("./validate-scale");
+const wait_for_symbolication_error_to_be_done_1 = require("./wait-for-symbolication-error-to-be-done");
 var combine_videos_1 = require("./combine-videos");
 Object.defineProperty(exports, "combineVideos", { enumerable: true, get: function () { return combine_videos_1.combineVideos; } });
 var handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
@@ -80,4 +81,6 @@ exports.RenderInternals = {
     mime: mime_types_1.default,
     isPathInside: is_path_inside_1.isPathInside,
     execa: execa_1.default,
+    registerErrorSymbolicationLock: wait_for_symbolication_error_to_be_done_1.registerErrorSymbolicationLock,
+    unlockErrorSymbolicationLock: wait_for_symbolication_error_to_be_done_1.unlockErrorSymbolicationLock,
 };

package/dist/offthread-video-server.js

@@ -45,12 +45,8 @@ const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, downlo
         const { src, time, imageFormat } = (0, exports.extractUrlAndSourceFromUrl)(req.url);
         res.setHeader('access-control-allow-origin', '*');
         res.setHeader('content-type', `image/${imageFormat === 'jpeg' ? 'jpg' : 'png'}`);
-        const to = (0, download_and_map_assets_to_file_1.getSanitizedFilenameForAssetUrl)({ downloadDir, src });
-        (0, download_and_map_assets_to_file_1.startDownloadForSrc)({ src, downloadDir, onDownload }).catch((err) => {
-            onError(new Error(`Error while downloading asset: ${err.stack}`));
-        });
-        (0, download_and_map_assets_to_file_1.waitForAssetToBeDownloaded)(src, to)
-            .then(() => {
+        (0, download_and_map_assets_to_file_1.downloadAsset)({ src, downloadDir, onDownload })
+            .then((to) => {
             return (0, extract_frame_from_video_1.extractFrameFromVideo)({
                 time,
                 src: to,

package/dist/prepare-server.js

@@ -8,6 +8,7 @@ const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const is_serve_url_1 = require("./is-serve-url");
 const serve_static_1 = require("./serve-static");
+const wait_for_symbolication_error_to_be_done_1 = require("./wait-for-symbolication-error-to-be-done");
 const prepareServer = async ({ downloadDir, ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, }) => {
     if ((0, is_serve_url_1.isServeUrl)(webpackConfigOrServeUrl)) {
         const { port: offthreadPort, close: closeProxy } = await (0, serve_static_1.serveStatic)(null, {
@@ -20,7 +21,9 @@ const prepareServer = async ({ downloadDir, ffmpegExecutable, ffprobeExecutable,
         });
         return Promise.resolve({
             serveUrl: webpackConfigOrServeUrl,
-            closeServer: () => closeProxy(),
+            closeServer: () => {
+                return closeProxy();
+            },
             offthreadPort,
         });
     }
@@ -40,7 +43,7 @@ const prepareServer = async ({ downloadDir, ffmpegExecutable, ffprobeExecutable,
     });
     return Promise.resolve({
         closeServer: () => {
-            return close();
+            return (0, wait_for_symbolication_error_to_be_done_1.waitForSymbolicationToBeDone)().then(() => close());
         },
         serveUrl: `http://localhost:${serverPort}`,
         offthreadPort: serverPort,

package/dist/render-frames.js

@@ -203,18 +203,11 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         };
         return returnValue;
     });
-    return Promise.race([
-        happyPath
-            .then(() => {
-            return Promise.all(downloadPromises);
-        })
-            .then(() => happyPath),
-        new Promise((_resolve, reject) => {
-            cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
-                reject(new Error('renderFrames() got cancelled'));
-            });
-        }),
-    ]);
+    return happyPath
+        .then(() => {
+        return Promise.all(downloadPromises);
+    })
+        .then(() => happyPath);
 };
 const renderFrames = (options) => {
     var _a, _b, _c, _d;
@@ -248,40 +241,42 @@ const renderFrames = (options) => {
         const onError = (err) => {
             reject(err);
         };
-        Promise.all([
-            (0, prepare_server_1.prepareServer)({
-                webpackConfigOrServeUrl: selectedServeUrl,
-                downloadDir,
-                onDownload,
-                onError,
-                ffmpegExecutable: (_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : null,
-                ffprobeExecutable: (_b = options.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
-                port: (_c = options.port) !== null && _c !== void 0 ? _c : null,
+        Promise.race([
+            new Promise((_, rej) => {
+                var _a;
+                (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+                    rej(new Error('renderFrames() got cancelled'));
+                });
+            }),
+            Promise.all([
+                (0, prepare_server_1.prepareServer)({
+                    webpackConfigOrServeUrl: selectedServeUrl,
+                    downloadDir,
+                    onDownload,
+                    onError,
+                    ffmpegExecutable: (_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : null,
+                    ffprobeExecutable: (_b = options.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
+                    port: (_c = options.port) !== null && _c !== void 0 ? _c : null,
+                }),
+                browserInstance,
+            ]).then(([{ serveUrl, closeServer, offthreadPort }, puppeteerInstance]) => {
+                const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(puppeteerInstance, actualParallelism);
+                cleanup.push(stopCycling);
+                cleanup.push(closeServer);
+                return innerRenderFrames({
+                    ...options,
+                    puppeteerInstance,
+                    onError,
+                    pagesArray: openedPages,
+                    serveUrl,
+                    composition,
+                    actualParallelism,
+                    onDownload,
+                    downloadDir,
+                    proxyPort: offthreadPort,
+                });
             }),
-            browserInstance,
         ])
-            .then(([{ serveUrl, closeServer, offthreadPort }, puppeteerInstance]) => {
-            var _a;
-            const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(puppeteerInstance, actualParallelism);
-            cleanup.push(stopCycling);
-            (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
-                stopCycling();
-                closeServer();
-            });
-            cleanup.push(closeServer);
-            return innerRenderFrames({
-                ...options,
-                puppeteerInstance,
-                onError,
-                pagesArray: openedPages,
-                serveUrl,
-                composition,
-                actualParallelism,
-                onDownload,
-                downloadDir,
-                proxyPort: offthreadPort,
-            });
-        })
             .then((res) => {
             return resolve(res);
         })

package/dist/render-media.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { BrowserLog } from './browser-log';
@@ -15,7 +16,7 @@ export declare type RenderMediaOnProgress = (progress: {
     stitchStage: StitchingState;
 }) => void;
 export declare type RenderMediaOptions = {
-    outputLocation: string;
+    outputLocation?: string | null;
     codec: Codec;
     composition: SmallTCompMetadata;
     inputProps?: unknown;
@@ -48,4 +49,4 @@ export declare type RenderMediaOptions = {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }: RenderMediaOptions) => Promise<void>;
+export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }: RenderMediaOptions) => Promise<Buffer | null>;

package/dist/render-media.js

@@ -34,7 +34,9 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
     if (typeof crf !== 'undefined' && crf !== null) {
         remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
     }
-    (0, validate_output_filename_1.validateOutputFilename)(codec, (0, get_extension_of_filename_1.getExtensionOfFilename)(outputLocation));
+    if (outputLocation) {
+        (0, validate_output_filename_1.validateOutputFilename)(codec, (0, get_extension_of_filename_1.getExtensionOfFilename)(outputLocation));
+    }
     (0, validate_scale_1.validateScale)(scale);
     const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
     let stitchStage = 'encoding';
@@ -169,7 +171,9 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
         .then(([{ assetsInfo }]) => {
         renderedDoneIn = Date.now() - renderStart;
         callUpdate();
-        (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
+        if (outputLocation) {
+            (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
+        }
         const stitchStart = Date.now();
         return Promise.all([
             (0, stitch_frames_to_video_1.stitchFramesToVideo)({
@@ -202,10 +206,11 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
             stitchStart,
         ]);
     })
-        .then(([, stitchStart]) => {
+        .then(([buffer, stitchStart]) => {
         encodedFrames = (0, get_duration_from_frame_range_1.getDurationFromFrameRange)(frameRange !== null && frameRange !== void 0 ? frameRange : null, composition.durationInFrames);
         encodedDoneIn = Date.now() - stitchStart;
         callUpdate();
+        return buffer;
     })
         .catch((err) => {
         /**

package/dist/seek-to-frame.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.seekToFrame = void 0;
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const seekToFrame = async ({ frame, page, }) => {
-    await page.waitForFunction('window.ready === true');
+    await page.waitForFunction(page.browser, 'window.ready === true');
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: (f) => {
             window.remotion_setFrame(f);
@@ -12,7 +12,7 @@ const seekToFrame = async ({ frame, page, }) => {
         frame,
         page,
     });
-    await page.waitForFunction('window.ready === true');
+    await page.waitForFunction(page.browser, 'window.ready === true');
     await page.evaluateHandle('document.fonts.ready');
 };
 exports.seekToFrame = seekToFrame;

package/dist/stitch-frames-to-video.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { CancelSignal } from './make-cancel-signal';
@@ -5,7 +6,7 @@ export declare type StitcherOptions = {
     fps: number;
     width: number;
     height: number;
-    outputLocation: string;
+    outputLocation?: string | null;
     force: boolean;
     assetsInfo: RenderAssetInfo;
     pixelFormat?: PixelFormat;
@@ -25,9 +26,9 @@ export declare type StitcherOptions = {
     };
 };
 declare type ReturnType = {
-    task: Promise<void>;
+    task: Promise<Buffer | null>;
     getLogs: () => string;
 };
 export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<ReturnType>;
-export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<void>;
+export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<Buffer | null>;
 export {};

package/dist/stitch-frames-to-video.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = __importDefault(require("fs"));
+const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
@@ -14,6 +15,7 @@ const download_and_map_assets_to_file_1 = require("./assets/download-and-map-ass
 const delete_directory_1 = require("./delete-directory");
 const get_audio_codec_name_1 = require("./get-audio-codec-name");
 const get_codec_name_1 = require("./get-codec-name");
+const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_prores_profile_name_1 = require("./get-prores-profile-name");
 const merge_audio_track_1 = require("./merge-audio-track");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
@@ -69,7 +71,7 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
     return outName;
 };
 const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
@@ -88,6 +90,9 @@ const spawnFfmpeg = async (options) => {
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
     const isAudioOnly = encoderName === null;
     const supportsCrf = encoderName && codec !== 'prores';
+    const tempFile = options.outputLocation
+        ? null
+        : path_1.default.join((0, tmp_dir_1.tmpDir)('remotion-stitch-temp-dir'), `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final')}`);
     if (options.verbose) {
         console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
         console.log('[verbose] encoder', encoderName);
@@ -132,22 +137,23 @@ const spawnFfmpeg = async (options) => {
             '-b:a',
             '320k',
             options.force ? '-y' : null,
-            options.outputLocation,
+            (_j = options.outputLocation) !== null && _j !== void 0 ? _j : tempFile,
         ].filter(remotion_1.Internals.truthy));
-        (_j = options.cancelSignal) === null || _j === void 0 ? void 0 : _j.call(options, () => {
+        (_k = options.cancelSignal) === null || _k === void 0 ? void 0 : _k.call(options, () => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_k = options.onProgress) === null || _k === void 0 ? void 0 : _k.call(options, expectedFrames);
+        (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, expectedFrames);
+        const file = tempFile ? await (0, promises_1.readFile)(tempFile) : null;
         return {
             getLogs: () => '',
-            task: Promise.resolve(),
+            task: Promise.resolve(file),
         };
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
-            ? [['-i', (_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation]]
+        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
+            ? [['-i', (_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
@@ -158,7 +164,7 @@ const spawnFfmpeg = async (options) => {
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
+        ...(((_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -181,22 +187,22 @@ const spawnFfmpeg = async (options) => {
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
         options.force ? '-y' : null,
-        options.outputLocation,
+        (_q = options.outputLocation) !== null && _q !== void 0 ? _q : tempFile,
     ];
     if (options.verbose) {
         console.log('Generated FFMPEG command:');
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_p = options.ffmpegExecutable) !== null && _p !== void 0 ? _p : 'ffmpeg', ffmpegString, {
+    const task = (0, execa_1.default)((_r = options.ffmpegExecutable) !== null && _r !== void 0 ? _r : 'ffmpeg', ffmpegString, {
         cwd: options.dir,
     });
-    (_q = options.cancelSignal) === null || _q === void 0 ? void 0 : _q.call(options, () => {
+    (_s = options.cancelSignal) === null || _s === void 0 ? void 0 : _s.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_r = task.stderr) === null || _r === void 0 ? void 0 : _r.on('data', (data) => {
+    (_t = task.stderr) === null || _t === void 0 ? void 0 : _t.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -218,7 +224,19 @@ const spawnFfmpeg = async (options) => {
             }
         }
     });
-    return { task: task.then(() => undefined), getLogs: () => ffmpegOutput };
+    return {
+        task: task.then(() => {
+            if (options.outputLocation) {
+                return null;
+            }
+            return (0, promises_1.readFile)(tempFile)
+                .then((file) => {
+                return Promise.all([file, (0, promises_1.unlink)(tempFile)]);
+            })
+                .then(([file]) => file);
+        }),
+        getLogs: () => ffmpegOutput,
+    };
 };
 exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {

package/dist/stringify-ffmpeg-filter.js

@@ -12,7 +12,6 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
     }
     const volumeFilter = (0, ffmpeg_volume_expression_1.ffmpegVolumeExpression)({
         volume,
-        startInVideo,
         fps,
         trimLeft,
     });
@@ -29,6 +28,12 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
             `atrim=${trimLeft.toFixed(6)}:${actualTrimRight.toFixed(6)}`,
             // then set the tempo
             (0, calculate_atempo_1.calculateATempo)(playbackRate),
+            // set the volume if needed
+            // The timings for volume must include whatever is in atrim, unless the volume
+            // filter gets applied before atrim
+            volumeFilter.value === '1'
+                ? null
+                : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
             // For n channels, we delay n + 1 channels.
             // This is because `ffprobe` for some audio files reports the wrong amount
             // of channels.
@@ -40,12 +45,6 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
                 : `adelay=${new Array(channels + 1)
                     .fill((startInVideoSeconds * 1000).toFixed(0))
                     .join('|')}`,
-            // set the volume if needed
-            // The timings for volume must include whatever is in atrim, unless the volume
-            // filter gets applied before atrim
-            volumeFilter.value === '1'
-                ? null
-                : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
             // Only in the end, we pad to the full length.
             padAtEnd > 0.0000001
                 ? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)

package/dist/wait-for-symbolication-error-to-be-done.d.ts

@@ -0,0 +1,3 @@
+export declare const registerErrorSymbolicationLock: () => number;
+export declare const unlockErrorSymbolicationLock: (id: number) => void;
+export declare const waitForSymbolicationToBeDone: () => Promise<unknown>;

package/dist/wait-for-symbolication-error-to-be-done.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForSymbolicationToBeDone = exports.unlockErrorSymbolicationLock = exports.registerErrorSymbolicationLock = void 0;
+let locks = [];
+const waiters = [];
+const registerErrorSymbolicationLock = () => {
+    const id = Math.random();
+    locks.push(id);
+    return id;
+};
+exports.registerErrorSymbolicationLock = registerErrorSymbolicationLock;
+const unlockErrorSymbolicationLock = (id) => {
+    locks = locks.filter((l) => l !== id);
+    resolveWaiters();
+};
+exports.unlockErrorSymbolicationLock = unlockErrorSymbolicationLock;
+const resolveWaiters = () => {
+    if (locks.length === 0) {
+        waiters.forEach((w) => w());
+    }
+};
+const waitForSymbolicationToBeDone = () => {
+    const success = new Promise((resolve) => {
+        waiters.push(() => {
+            resolve();
+        });
+    });
+    const timeout = new Promise((resolve) => {
+        setTimeout(() => resolve(), 5000);
+    });
+    resolveWaiters();
+    return Promise.all([success, timeout]);
+};
+exports.waitForSymbolicationToBeDone = waitForSymbolicationToBeDone;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.0.25",
+	"version": "3.0.26",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
 		"mime-types": "2.1.35",
-		"remotion": "3.0.25",
+		"remotion": "3.0.26",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -63,5 +63,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "27ec369ebe9cf3d063095383c1e30dc83c60f010"
+	"gitHead": "790e9bb2d66f2fe97efc209237cc57d7cad2e793"
 }