@remotion/renderer 4.0.102 → 4.0.104

package/LICENSE.md

@@ -7,7 +7,7 @@ Depending on the type of your legal entity, you are granted permission to use Re
 
 ## Free license
 
-Copyright © 2023 [Remotion](https://www.remotion.dev)
+Copyright © 2024 [Remotion](https://www.remotion.dev)
 
 ### Eligibility
 

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

@@ -269,17 +269,24 @@ const attachDownloadListenerToEmitter = (downloadMap, onDownload) => {
     downloadMap.downloadListeners.push(onDownload);
     cleanup.push(() => {
         downloadMap.downloadListeners = downloadMap.downloadListeners.filter((l) => l !== onDownload);
+        return Promise.resolve();
     });
-    const a = downloadMap.emitter.addEventListener('download', ({ detail: { src: initialSrc } }) => {
+    const cleanupDownloadListener = downloadMap.emitter.addEventListener('download', ({ detail: { src: initialSrc } }) => {
         const progress = onDownload(initialSrc);
-        const b = downloadMap.emitter.addEventListener('progress', ({ detail: { downloaded, percent, src: progressSrc, totalSize } }) => {
+        const cleanupProgressListener = downloadMap.emitter.addEventListener('progress', ({ detail: { downloaded, percent, src: progressSrc, totalSize } }) => {
             if (initialSrc === progressSrc) {
                 progress === null || progress === void 0 ? void 0 : progress({ downloaded, percent, totalSize });
             }
         });
-        cleanup.push(b);
+        cleanup.push(() => {
+            cleanupProgressListener();
+            return Promise.resolve();
+        });
+    });
+    cleanup.push(() => {
+        cleanupDownloadListener();
+        return Promise.resolve();
     });
-    cleanup.push(() => a());
     return () => {
         cleanup.forEach((c) => c());
     };

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

@@ -13,7 +13,7 @@ const getAudioChannelsAndDurationWithoutCache = async (src, indent, logLevel) =>
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
-    const task = await (0, call_ffmpeg_1.callFf)('ffprobe', args, indent, logLevel);
+    const task = await (0, call_ffmpeg_1.callFf)({ bin: 'ffprobe', args, indent, logLevel });
     const channels = task.stdout.match(/channels=([0-9]+)/);
     const duration = task.stdout.match(/duration=([0-9.]+)/);
     const result = {

package/dist/call-ffmpeg.d.ts

@@ -1,15 +1,9 @@
 import execa from 'execa';
 import type { LogLevel } from './log-level';
-export declare const dynamicLibraryPathOptions: (indent: boolean, logLevel: LogLevel) => {
-    env: {
-        DYLD_LIBRARY_PATH: string;
-        RUST_BACKTRACE: string;
-    } | {
-        PATH: string;
-        RUST_BACKTRACE: string;
-    } | {
-        LD_LIBRARY_PATH: string;
-        RUST_BACKTRACE: string;
-    };
-};
-export declare const callFf: (bin: 'ffmpeg' | 'ffprobe', args: (string | null)[], indent: boolean, logLevel: LogLevel, options?: execa.Options<string>) => execa.ExecaChildProcess<string>;
+export declare const callFf: ({ args, bin, indent, logLevel, options, }: {
+    bin: 'ffmpeg' | 'ffprobe';
+    args: (string | null)[];
+    indent: boolean;
+    logLevel: LogLevel;
+    options?: execa.Options<string> | undefined;
+}) => execa.ExecaChildProcess<string>;

package/dist/call-ffmpeg.js

@@ -3,38 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callFf = exports.dynamicLibraryPathOptions = void 0;
+exports.callFf = void 0;
 const execa_1 = __importDefault(require("execa"));
 const node_fs_1 = require("node:fs");
+const path_1 = __importDefault(require("path"));
 const get_executable_path_1 = require("./compositor/get-executable-path");
 const truthy_1 = require("./truthy");
-const dynamicLibraryPathOptions = (indent, logLevel) => {
-    const lib = (0, get_executable_path_1.getExecutablePath)('lib', indent, logLevel);
-    return {
-        env: {
-            RUST_BACKTRACE: 'full',
-            ...(process.platform === 'darwin'
-                ? {
-                    DYLD_LIBRARY_PATH: lib,
-                }
-                : process.platform === 'win32'
-                    ? {
-                        PATH: `${lib};${process.env.PATH}`,
-                    }
-                    : {
-                        LD_LIBRARY_PATH: lib,
-                    }),
-        },
-    };
-};
-exports.dynamicLibraryPathOptions = dynamicLibraryPathOptions;
-const callFf = (bin, args, indent, logLevel, options) => {
+const callFf = ({ args, bin, indent, logLevel, options, }) => {
     const executablePath = (0, get_executable_path_1.getExecutablePath)(bin, indent, logLevel);
     if (!process.env.READ_ONLY_FS) {
         (0, node_fs_1.chmodSync)(executablePath, 0o755);
     }
     return (0, execa_1.default)(executablePath, args.filter(truthy_1.truthy), {
-        ...(0, exports.dynamicLibraryPathOptions)(indent, logLevel),
+        cwd: path_1.default.dirname(executablePath),
         ...options,
     });
 };

package/dist/client.d.ts

@@ -316,7 +316,7 @@ export declare const BrowserSafeApis: {
             cliFlag: "gl";
             docLink: string;
             name: string;
-            type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+            type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
             ssrName: string;
             description: () => import("react/jsx-runtime").JSX.Element;
         };

package/dist/combine-videos.js

@@ -48,7 +48,12 @@ const combineVideos = async (options) => {
     ].filter(truthy_1.truthy);
     logger_1.Log.verbose({ indent, logLevel }, 'Combining command: ', command);
     try {
-        const task = (0, call_ffmpeg_1.callFf)('ffmpeg', command, options.indent, options.logLevel);
+        const task = (0, call_ffmpeg_1.callFf)({
+            bin: 'ffmpeg',
+            args: command,
+            indent: options.indent,
+            logLevel: options.logLevel,
+        });
         (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
             if (onProgress) {
                 const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));

package/dist/compositor/compose.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callCompositor = exports.compose = exports.composeWithoutCache = exports.serializeCommand = void 0;
 const node_child_process_1 = require("node:child_process");
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const call_ffmpeg_1 = require("../call-ffmpeg");
+const node_path_1 = __importDefault(require("node:path"));
 const get_executable_path_1 = require("./get-executable-path");
 const make_nonce_1 = require("./make-nonce");
 const getCompositorHash = ({ ...input }) => {
@@ -54,7 +57,9 @@ const callCompositor = (payload, indent, logLevel) => {
         if (!process.env.READ_ONLY_FS) {
             (0, node_fs_1.chmodSync)(execPath, 0o755);
         }
-        const child = (0, node_child_process_1.spawn)(execPath, [payload], (0, call_ffmpeg_1.dynamicLibraryPathOptions)(indent, logLevel));
+        const child = (0, node_child_process_1.spawn)(execPath, [payload], {
+            cwd: node_path_1.default.dirname(execPath),
+        });
         const stderrChunks = [];
         child.stderr.on('data', (d) => stderrChunks.push(d));
         child.on('close', (code) => {

package/dist/compositor/compositor.js

@@ -1,9 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startCompositor = exports.startLongRunningCompositor = void 0;
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
-const call_ffmpeg_1 = require("../call-ffmpeg");
+const node_path_1 = __importDefault(require("node:path"));
 const get_concurrency_1 = require("../get-concurrency");
 const log_level_1 = require("../log-level");
 const logger_1 = require("../logger");
@@ -25,7 +28,9 @@ const startCompositor = (type, payload, logLevel, indent) => {
         (0, node_fs_1.chmodSync)(bin, 0o755);
     }
     const fullCommand = (0, compose_1.serializeCommand)(type, payload);
-    const child = (0, node_child_process_1.spawn)(bin, [JSON.stringify(fullCommand)], (0, call_ffmpeg_1.dynamicLibraryPathOptions)(indent, logLevel));
+    const child = (0, node_child_process_1.spawn)(bin, [JSON.stringify(fullCommand)], {
+        cwd: node_path_1.default.dirname(bin),
+    });
     const stderrChunks = [];
     let outputBuffer = Buffer.from('');
     const separator = Buffer.from('remotion_buffer:');
@@ -176,10 +181,10 @@ const startCompositor = (type, payload, logLevel, indent) => {
         },
         finishCommands: () => {
             if (runningStatus.type === 'quit-with-error') {
-                throw new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}: ${runningStatus.error}`);
+                return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}: ${runningStatus.error}`));
             }
             if (runningStatus.type === 'quit-without-error') {
-                throw new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}`);
+                return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}`));
             }
             return new Promise((res, rej) => {
                 child.stdin.write('EOF\n', (e) => {
@@ -192,13 +197,19 @@ const startCompositor = (type, payload, logLevel, indent) => {
             });
         },
         executeCommand: (command, params) => {
-            if (runningStatus.type === 'quit-without-error') {
-                throw new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}`);
-            }
-            if (runningStatus.type === 'quit-with-error') {
-                throw new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}: ${runningStatus.error}`);
-            }
             return new Promise((_resolve, _reject) => {
+                if (runningStatus.type === 'quit-without-error') {
+                    _reject(new Error(`Compositor quit${runningStatus.signal
+                        ? ` with signal ${runningStatus.signal}`
+                        : ''}`));
+                    return;
+                }
+                if (runningStatus.type === 'quit-with-error') {
+                    _reject(new Error(`Compositor quit${runningStatus.signal
+                        ? ` with signal ${runningStatus.signal}`
+                        : ''}: ${runningStatus.error}`));
+                    return;
+                }
                 const nonce = (0, make_nonce_1.makeNonce)();
                 const composed = {
                     nonce,

package/dist/compositor/get-executable-path.d.ts

@@ -3,5 +3,5 @@ export declare function isMusl({ indent, logLevel, }: {
     indent: boolean;
     logLevel: LogLevel;
 }): boolean;
-export declare const getExecutablePath: (type: 'compositor' | 'ffmpeg' | 'ffprobe' | 'lib', indent: boolean, logLevel: LogLevel) => string;
+export declare const getExecutablePath: (type: 'compositor' | 'ffmpeg' | 'ffprobe', indent: boolean, logLevel: LogLevel) => string;
 export declare const getExecutableDir: (indent: boolean, logLevel: LogLevel) => string;

package/dist/compositor/get-executable-path.js

@@ -27,32 +27,25 @@ const getExecutablePath = (type, indent, logLevel) => {
     switch (type) {
         case 'compositor':
             if (process.platform === 'win32') {
-                return path_1.default.resolve(base, 'compositor.exe');
+                return path_1.default.resolve(base, 'remotion.exe');
             }
-            return path_1.default.resolve(base, 'compositor');
+            return path_1.default.resolve(base, 'remotion');
         case 'ffmpeg':
             if (process.platform === 'win32') {
-                return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffmpeg.exe');
+                return path_1.default.join(base, 'ffmpeg.exe');
             }
-            return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffmpeg');
+            return path_1.default.join(base, 'ffmpeg');
         case 'ffprobe':
             if (process.platform === 'win32') {
-                return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffprobe.exe');
+                return path_1.default.join(base, 'ffprobe.exe');
             }
-            return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffprobe');
-        case 'lib': {
-            const dir = path_1.default.resolve(base, 'ffmpeg', 'remotion', 'lib');
-            return dir;
-        }
+            return path_1.default.join(base, 'ffprobe');
         default:
             throw new Error(`Unknown executable type: ${type}`);
     }
 };
 exports.getExecutablePath = getExecutablePath;
 const getExecutableDir = (indent, logLevel) => {
-    if (process.env.COMPOSITOR_DIR) {
-        return process.env.COMPOSITOR_DIR;
-    }
     switch (process.platform) {
         case 'win32':
             switch (process.arch) {

package/dist/create-silent-audio.js

@@ -4,18 +4,23 @@ exports.createSilentAudio = void 0;
 const call_ffmpeg_1 = require("./call-ffmpeg");
 const sample_rate_1 = require("./sample-rate");
 const createSilentAudio = async ({ numberOfSeconds, outName, indent, logLevel, }) => {
-    await (0, call_ffmpeg_1.callFf)('ffmpeg', [
-        '-f',
-        'lavfi',
-        '-i',
-        `anullsrc=r=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
-        '-c:a',
-        'pcm_s16le',
-        '-t',
-        String(numberOfSeconds),
-        '-ar',
-        String(sample_rate_1.DEFAULT_SAMPLE_RATE),
-        outName,
-    ], indent, logLevel);
+    await (0, call_ffmpeg_1.callFf)({
+        bin: 'ffmpeg',
+        args: [
+            '-f',
+            'lavfi',
+            '-i',
+            `anullsrc=r=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
+            '-c:a',
+            'pcm_s16le',
+            '-t',
+            String(numberOfSeconds),
+            '-ar',
+            String(sample_rate_1.DEFAULT_SAMPLE_RATE),
+            outName,
+        ],
+        indent,
+        logLevel,
+    });
 };
 exports.createSilentAudio = createSilentAudio;

package/dist/error-handling/handle-javascript-exception.d.ts

@@ -18,4 +18,4 @@ export declare const handleJavascriptException: ({ page, onError, frame, }: {
     page: Page;
     frame: number | null;
     onError: (err: Error) => void;
-}) => () => void;
+}) => () => Promise<void>;

package/dist/error-handling/handle-javascript-exception.js

@@ -77,6 +77,7 @@ const handleJavascriptException = ({ page, onError, frame, }) => {
     client.on('Runtime.exceptionThrown', handler);
     return () => {
         client.off('Runtime.exceptionThrown', handler);
+        return Promise.resolve();
     };
 };
 exports.handleJavascriptException = handleJavascriptException;

package/dist/get-browser-instance.d.ts

@@ -11,6 +11,6 @@ export declare const getPageAndCleanupFn: ({ passedInInstance, browserExecutable
     forceDeviceScaleFactor: number | undefined;
     logLevel: LogLevel;
 }) => Promise<{
-    cleanup: () => void;
+    cleanup: () => Promise<void>;
     page: Page;
 }>;

package/dist/get-browser-instance.js

@@ -14,6 +14,7 @@ const getPageAndCleanupFn = async ({ passedInInstance, browserExecutable, chromi
                 page.close().catch((err) => {
                     console.error('Was not able to close puppeteer page', err);
                 });
+                return Promise.resolve();
             },
         };
     }
@@ -34,6 +35,7 @@ const getPageAndCleanupFn = async ({ passedInInstance, browserExecutable, chromi
             browserInstance.close(true, logLevel, indent).catch((err) => {
                 console.error('Was not able to close puppeteer page', err);
             });
+            return Promise.resolve();
         },
     };
 };

package/dist/get-compositions.js

@@ -111,7 +111,9 @@ const internalGetCompositionsRaw = async ({ browserExecutable, chromiumOptions,
         })
             .then(({ server: { serveUrl, offthreadPort, sourceMap }, cleanupServer }) => {
             page.setBrowserSourceMapGetter(sourceMap);
-            cleanup.push(() => cleanupServer(true));
+            cleanup.push(() => {
+                return cleanupServer(true);
+            });
             return innerGetCompositions({
                 envVariables,
                 serializedInputPropsWithCustomSchema,

package/dist/guess-extension-for-media.js

@@ -3,7 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.guessExtensionForVideo = void 0;
 const call_ffmpeg_1 = require("./call-ffmpeg");
 const guessExtensionForVideo = async ({ src, indent, logLevel, }) => {
-    const { stderr } = await (0, call_ffmpeg_1.callFf)('ffprobe', [src], indent, logLevel);
+    const { stderr } = await (0, call_ffmpeg_1.callFf)({
+        bin: 'ffprobe',
+        args: [src],
+        indent,
+        logLevel,
+    });
     if (stderr.includes('Audio: mp3,')) {
         return 'mp3';
     }

package/dist/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import execa from 'execa';
 import { HeadlessBrowser } from './browser/Browser';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
@@ -137,8 +135,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: "chrome";
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
-    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
     validateJpegQuality: (q: number | undefined) => void;
@@ -313,24 +311,18 @@ export declare const RenderInternals: {
     };
     makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif")[]>;
     defaultCodecsForFileExtension: Record<import("./file-extensions").FileExtension, "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">;
-    getExecutablePath: (type: "compositor" | "ffmpeg" | "ffprobe" | "lib", indent: boolean, logLevel: "verbose" | "info" | "warn" | "error") => string;
-    callFf: (bin: "ffmpeg" | "ffprobe", args: (string | null)[], indent: boolean, logLevel: "verbose" | "info" | "warn" | "error", options?: execa.Options<string> | undefined) => execa.ExecaChildProcess<string>;
-    dynamicLibraryPathOptions: (indent: boolean, logLevel: "verbose" | "info" | "warn" | "error") => {
-        env: {
-            DYLD_LIBRARY_PATH: string;
-            RUST_BACKTRACE: string;
-        } | {
-            PATH: string;
-            RUST_BACKTRACE: string;
-        } | {
-            LD_LIBRARY_PATH: string;
-            RUST_BACKTRACE: string;
-        };
-    };
+    getExecutablePath: (type: "compositor" | "ffmpeg" | "ffprobe", indent: boolean, logLevel: "verbose" | "info" | "warn" | "error") => string;
+    callFf: ({ args, bin, indent, logLevel, options, }: {
+        bin: "ffmpeg" | "ffprobe";
+        args: (string | null)[];
+        indent: boolean;
+        logLevel: "verbose" | "info" | "warn" | "error";
+        options?: execa.Options<string> | undefined;
+    }) => execa.ExecaChildProcess<string>;
     validStillImageFormats: readonly ["png", "jpeg", "pdf", "webp"];
     validVideoImageFormats: readonly ["png", "jpeg", "none"];
-    DEFAULT_STILL_IMAGE_FORMAT: "jpeg" | "png" | "webp" | "pdf";
-    DEFAULT_VIDEO_IMAGE_FORMAT: "jpeg" | "png" | "none";
+    DEFAULT_STILL_IMAGE_FORMAT: "png" | "jpeg" | "pdf" | "webp";
+    DEFAULT_VIDEO_IMAGE_FORMAT: "png" | "jpeg" | "none";
     DEFAULT_JPEG_QUALITY: number;
     chalk: {
         enabled: () => boolean;
@@ -429,7 +421,7 @@ export declare const RenderInternals: {
         frame: number;
         serializedInputPropsWithCustomSchema: string;
         serializedResolvedPropsWithCustomSchema: string;
-        imageFormat: "jpeg" | "png" | "webp" | "pdf";
+        imageFormat: "png" | "jpeg" | "pdf" | "webp";
         jpegQuality: number;
         puppeteerInstance: HeadlessBrowser | null;
         envVariables: Record<string, string>;

package/dist/index.js

@@ -171,7 +171,6 @@ exports.RenderInternals = {
     defaultCodecsForFileExtension: get_extension_from_codec_1.defaultCodecsForFileExtension,
     getExecutablePath: get_executable_path_1.getExecutablePath,
     callFf: call_ffmpeg_1.callFf,
-    dynamicLibraryPathOptions: call_ffmpeg_1.dynamicLibraryPathOptions,
     validStillImageFormats: image_format_1.validStillImageFormats,
     validVideoImageFormats: image_format_1.validVideoImageFormats,
     DEFAULT_STILL_IMAGE_FORMAT: image_format_1.DEFAULT_STILL_IMAGE_FORMAT,

package/dist/merge-audio-track.js

@@ -77,7 +77,7 @@ const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downl
     ]
         .filter(truthy_1.truthy)
         .flat(2);
-    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', args, indent, logLevel);
+    const task = (0, call_ffmpeg_1.callFf)({ bin: 'ffmpeg', args, indent, logLevel });
     await task;
     cleanup();
 };

package/dist/options/gl.d.ts

@@ -3,7 +3,7 @@ export declare const glOption: {
     cliFlag: "gl";
     docLink: string;
     name: string;
-    type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+    type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
     ssrName: string;
     description: () => import("react/jsx-runtime").JSX.Element;
 };

package/dist/options/index.d.ts

@@ -115,7 +115,7 @@ export declare const allOptions: {
         cliFlag: "gl";
         docLink: string;
         name: string;
-        type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+        type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
         ssrName: string;
         description: () => import("react/jsx-runtime").JSX.Element;
     };

package/dist/prepare-server.js

@@ -114,10 +114,9 @@ const makeOrReuseServer = async (server, config, { onDownload, onError, }) => {
     return {
         server: newServer,
         cleanupServer: (force) => {
-            newServer.closeServer(force);
             cleanupOnDownloadNew();
             cleanupErrorNew();
-            return Promise.resolve();
+            return Promise.all([newServer.closeServer(force)]);
         },
     };
 };

package/dist/preprocess-audio-track.js

@@ -29,7 +29,7 @@ const preprocessAudioTrackUnlimited = async ({ outName, asset, expectedFrames, f
         ['-ar', String(sample_rate_1.DEFAULT_SAMPLE_RATE)],
         ['-y', outName],
     ].flat(2);
-    await (0, call_ffmpeg_1.callFf)('ffmpeg', args, indent, logLevel);
+    await (0, call_ffmpeg_1.callFf)({ bin: 'ffmpeg', args, indent, logLevel });
     cleanup();
     return { outName, filter };
 };

package/dist/prespawn-ffmpeg.js

@@ -65,7 +65,12 @@ const prespawnFfmpeg = (options) => {
     const finalFfmpegString = options.ffmpegOverride
         ? options.ffmpegOverride({ type: 'pre-stitcher', args: ffmpegString })
         : ffmpegString;
-    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', finalFfmpegString, options.indent, options.logLevel);
+    const task = (0, call_ffmpeg_1.callFf)({
+        bin: 'ffmpeg',
+        args: finalFfmpegString,
+        indent: options.indent,
+        logLevel: options.logLevel,
+    });
     options.signal(() => {
         task.kill();
     });

package/dist/render-frames.js

@@ -141,6 +141,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         stopped = true;
     });
+    const frameDir = outputDir !== null && outputDir !== void 0 ? outputDir : downloadMap.compositingDir;
     const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, compId, }) => {
         const pool = await poolPromise;
         const freePage = await pool.acquire();
@@ -177,7 +178,6 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             throw new Error('Pass either `outputDir` or `onFrameBuffer` to renderFrames(), not both.');
         }
         const id = (0, perf_1.startPerfMeasure)('save');
-        const frameDir = outputDir !== null && outputDir !== void 0 ? outputDir : downloadMap.compositingDir;
         const { buffer, collectedAssets } = await (0, take_frame_and_compose_1.takeFrameAndCompose)({
             frame,
             freePage,
@@ -298,7 +298,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
         const returnValue = {
             assetsInfo: {
                 assets,
-                imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
+                imageSequenceName: node_path_1.default.join(frameDir, `element-%0${filePadLength}d.${imageFormat}`),
                 firstFrameIndex,
                 downloadMap,
             },
@@ -360,8 +360,10 @@ const internalRenderFramesRaw = ({ browserExecutable, cancelSignal, chromiumOpti
             ]).then(([{ server: openedServer, cleanupServer }, pInstance]) => {
                 const { serveUrl, offthreadPort, compositor, sourceMap, downloadMap } = openedServer;
                 const browserReplacer = (0, replace_browser_1.handleBrowserCrash)(pInstance, logLevel, indent);
-                cleanup.push((0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency, logLevel, indent)
-                    .stopCycling);
+                cleanup.push(() => {
+                    (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency, logLevel, indent).stopCycling();
+                    return Promise.resolve();
+                });
                 cleanup.push(() => cleanupServer(false));
                 return innerRenderFrames({
                     onError,

package/dist/render-media.js

@@ -381,7 +381,6 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
                     onDownload,
                     numberOfGifLoops,
                     logLevel,
-                    dir: workingDir,
                     cancelSignal: cancelStitcher.cancelSignal,
                     muted: disableAudio,
                     enforceAudioTrack,
@@ -454,7 +453,11 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
             if (workingDir && node_fs_1.default.existsSync(workingDir)) {
                 (0, delete_directory_1.deleteDirectory)(workingDir);
             }
-            cleanupServerFn === null || cleanupServerFn === void 0 ? void 0 : cleanupServerFn(false);
+            cleanupServerFn === null || cleanupServerFn === void 0 ? void 0 : cleanupServerFn(false).catch((err) => {
+                // Must prevent unhandled exception in cleanup function.
+                // Might crash whole runtime.
+                console.log('Could not cleanup: ', err);
+            });
         });
     });
     return Promise.race([

package/dist/render-still.js

@@ -234,7 +234,9 @@ const internalRenderStillRaw = (options) => {
             .catch((err) => reject(err))
             .finally(() => {
             cleanup.forEach((c) => {
-                c();
+                c().catch((err) => {
+                    console.log('Cleanup error:', err);
+                });
             });
         });
     });

package/dist/select-composition.js

@@ -152,7 +152,11 @@ const internalSelectCompositionRaw = async (options) => {
         })
             .finally(() => {
             cleanup.forEach((c) => {
-                c();
+                // Must prevent unhandled exception in cleanup function.
+                // Promise has already been resolved, so we can't reject it.
+                c().catch((err) => {
+                    console.log('Cleanup error:', err);
+                });
             });
         });
     });

package/dist/set-props-and-env.js

@@ -37,6 +37,25 @@ const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVa
     await page.evaluateOnNewDocument((enabled) => {
         window.remotion_videoEnabled = enabled;
     }, videoEnabled);
+    await page.evaluateOnNewDocument(() => {
+        window.alert = (message) => {
+            if (message) {
+                window.window.remotion_cancelledError = new Error(`alert("${message}") was called. It cannot be called in a headless browser.`).stack;
+            }
+            else {
+                window.window.remotion_cancelledError = new Error('alert() was called. It cannot be called in a headless browser.').stack;
+            }
+        };
+        window.confirm = (message) => {
+            if (message) {
+                window.remotion_cancelledError = new Error(`confirm("${message}") was called. It cannot be called in a headless browser.`).stack;
+            }
+            else {
+                window.remotion_cancelledError = new Error('confirm() was called. It cannot be called in a headless browser.').stack;
+            }
+            return false;
+        };
+    });
     const pageRes = await page.goto({ url: urlToVisit, timeout: actualTimeout });
     if (pageRes === null) {
         throw new Error(`Visited "${urlToVisit}" but got no response.`);

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { RenderAssetInfo } from './assets/download-map';
 import type { AudioCodec } from './audio-codec';
@@ -30,7 +29,6 @@ type InternalStitchFramesToVideoOptions = {
     onDownload: undefined | RenderMediaOnDownload;
     proResProfile: undefined | ProResProfile;
     logLevel: LogLevel;
-    dir: string;
     cancelSignal: CancelSignal | null;
     preEncodedFileLocation: string | null;
     preferLossless: boolean;
@@ -61,7 +59,6 @@ export type StitchFramesToVideoOptions = {
     onDownload?: RenderMediaOnDownload;
     proResProfile?: ProResProfile;
     verbose?: boolean;
-    dir: string;
     cancelSignal?: CancelSignal;
     muted?: boolean;
     enforceAudioTrack?: boolean;
@@ -74,5 +71,5 @@ export declare const internalStitchFramesToVideo: (options: InternalStitchFrames
  * @description Takes a series of images and audio information generated by renderFrames() and encodes it to a video.
  * @see [Documentation](https://www.remotion.dev/docs/renderer/stitch-frames-to-video)
  */
-export declare const stitchFramesToVideo: ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, }: StitchFramesToVideoOptions) => Promise<Buffer | null>;
+export declare const stitchFramesToVideo: ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, }: StitchFramesToVideoOptions) => Promise<Buffer | null>;
 export {};

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

@@ -106,7 +106,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, logLevel
     });
     return outName;
 };
-const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, logLevel, videoBitrate, encodingMaxRate, encodingBufferSize, width, numberOfGifLoops, onProgress, x264Preset, colorSpace, }, remotionRoot) => {
+const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, logLevel, videoBitrate, encodingMaxRate, encodingBufferSize, width, numberOfGifLoops, onProgress, x264Preset, colorSpace, }, remotionRoot) => {
     var _a;
     (0, validate_1.validateDimension)(height, 'height', 'passed to `stitchFramesToVideo()`');
     (0, validate_1.validateDimension)(width, 'width', 'passed to `stitchFramesToVideo()`');
@@ -197,16 +197,21 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
         if (!resolvedAudioCodec) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
-        const ffmpegTask = (0, call_ffmpeg_1.callFf)('ffmpeg', [
-            '-i',
-            audio,
-            '-c:a',
-            (0, audio_codec_1.mapAudioCodecToFfmpegAudioCodecName)(resolvedAudioCodec),
-            '-b:a',
-            audioBitrate ? audioBitrate : '320k',
-            force ? '-y' : null,
-            outputLocation !== null && outputLocation !== void 0 ? outputLocation : tempFile,
-        ].filter(no_react_1.NoReactInternals.truthy), indent, logLevel);
+        const ffmpegTask = (0, call_ffmpeg_1.callFf)({
+            bin: 'ffmpeg',
+            args: [
+                '-i',
+                audio,
+                '-c:a',
+                (0, audio_codec_1.mapAudioCodecToFfmpegAudioCodecName)(resolvedAudioCodec),
+                '-b:a',
+                audioBitrate ? audioBitrate : '320k',
+                force ? '-y' : null,
+                outputLocation !== null && outputLocation !== void 0 ? outputLocation : tempFile,
+            ].filter(no_react_1.NoReactInternals.truthy),
+            indent,
+            logLevel,
+        });
         cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
             ffmpegTask.kill();
         });
@@ -294,8 +299,11 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
         logLevel,
         tag: 'stitchFramesToVideo()',
     }, finalFfmpegString.join(' '));
-    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', finalFfmpegString, indent, logLevel, {
-        cwd: dir,
+    const task = (0, call_ffmpeg_1.callFf)({
+        bin: 'ffmpeg',
+        args: finalFfmpegString,
+        indent,
+        logLevel,
     });
     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         task.kill();
@@ -366,7 +374,7 @@ exports.internalStitchFramesToVideo = internalStitchFramesToVideo;
  * @description Takes a series of images and audio information generated by renderFrames() and encodes it to a video.
  * @see [Documentation](https://www.remotion.dev/docs/renderer/stitch-frames-to-video)
  */
-const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, }) => {
+const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, }) => {
     return (0, exports.internalStitchFramesToVideo)({
         assetsInfo,
         audioBitrate: audioBitrate !== null && audioBitrate !== void 0 ? audioBitrate : null,
@@ -376,7 +384,6 @@ const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitra
         cancelSignal: cancelSignal !== null && cancelSignal !== void 0 ? cancelSignal : null,
         codec: codec !== null && codec !== void 0 ? codec : codec_1.DEFAULT_CODEC,
         crf: crf !== null && crf !== void 0 ? crf : null,
-        dir,
         enforceAudioTrack: enforceAudioTrack !== null && enforceAudioTrack !== void 0 ? enforceAudioTrack : false,
         ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : null,
         force,

package/dist/take-frame-and-compose.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { TRenderAsset } from 'remotion/no-react';
 import type { DownloadMap } from './assets/download-map';
 import type { Page } from './browser/BrowserPage';

package/dist/take-frame-and-compose.js

@@ -66,10 +66,10 @@ const takeFrameAndCompose = async ({ freePage, imageFormat, jpegQuality, frame,
     }
     if (needsComposing) {
         if (imageFormat === 'pdf') {
-            throw new Error("You cannot use compositor APIs (like <Clipper>) if `imageFormat` is 'pdf'.");
+            throw new Error("You cannot use Rust APIs (like <Clipper>) if `imageFormat` is 'pdf'.");
         }
         if (imageFormat === 'webp') {
-            throw new Error("You cannot use compositor APIs (like <Clipper>) if `imageFormat` is 'webp'.");
+            throw new Error("You cannot use Rust APIs (like <Clipper>) if `imageFormat` is 'webp'.");
         }
         await (0, compose_1.compose)({
             height: height * scale,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.102",
+  "version": "4.0.104",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.102"
+    "remotion": "4.0.104"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.102",
-    "@remotion/compositor-darwin-arm64": "4.0.102",
-    "@remotion/compositor-linux-x64-gnu": "4.0.102",
-    "@remotion/compositor-linux-arm64-musl": "4.0.102",
-    "@remotion/compositor-win32-x64-msvc": "4.0.102",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.102",
-    "@remotion/compositor-linux-x64-musl": "4.0.102"
+    "@remotion/compositor-linux-arm64-gnu": "4.0.104",
+    "@remotion/compositor-darwin-x64": "4.0.104",
+    "@remotion/compositor-linux-arm64-musl": "4.0.104",
+    "@remotion/compositor-linux-x64-musl": "4.0.104",
+    "@remotion/compositor-linux-x64-gnu": "4.0.104",
+    "@remotion/compositor-darwin-arm64": "4.0.104",
+    "@remotion/compositor-win32-x64-msvc": "4.0.104"
   },
   "keywords": [
     "remotion",