@remotion/renderer 3.3.26 → 3.3.28

package/dist/browser/BrowserPage.js

@@ -244,7 +244,7 @@ _Page_client = new WeakMap(), _Page_target = new WeakMap(), _Page_timeoutSetting
             expression = (0, util_1.pageBindingDeliverErrorValueString)(name, seq, _error);
         }
     }
-    __classPrivateFieldGet(this, _Page_client, "f").send('Runtime.evaluate', {
+    await __classPrivateFieldGet(this, _Page_client, "f").send('Runtime.evaluate', {
         expression,
         contextId: event.executionContextId,
     });

package/dist/compositor/compositor.js

@@ -31,11 +31,9 @@ const startCompositor = () => {
     const _stderrChunks = [];
     const stdoutChunks = [];
     child.stderr.on('data', (d) => {
-        console.log(d.toString('utf-8'));
         _stderrChunks.push(d);
     });
     child.stdout.on('data', (d) => {
-        console.log(d.toString('utf-8'));
         stdoutChunks.push(d);
     });
     let nonce = 0;

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -1,5 +1,8 @@
 import type { DownloadMap } from './assets/download-map';
 export declare const createFfmpegComplexFilter: (filters: number, downloadMap: DownloadMap) => Promise<{
-    complexFilterFlag: [string, string] | null;
+    complexFilterFlag: [
+        string,
+        string
+    ] | null;
     cleanup: () => void;
 }>;

package/dist/determine-resize-params.d.ts

@@ -1 +1,4 @@
-export declare const determineResizeParams: (needsResize: [number, number] | null) => string[];
+export declare const determineResizeParams: (needsResize: [
+    number,
+    number
+] | null) => string[];

package/dist/determine-vcodec-ffmpeg-flags.d.ts

@@ -0,0 +1,2 @@
+import type { SpecialVCodecForTransparency } from './assets/download-map';
+export declare const determineVcodecFfmpegFlags: (vcodecFlag: SpecialVCodecForTransparency) => string[];

package/dist/determine-vcodec-ffmpeg-flags.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.determineVcodecFfmpegFlags = void 0;
+const truthy_1 = require("./truthy");
+const determineVcodecFfmpegFlags = (vcodecFlag) => {
+    return [
+        vcodecFlag === 'vp9' ? '-vcodec' : null,
+        vcodecFlag === 'vp9' ? 'libvpx-vp9' : null,
+        vcodecFlag === 'vp8' ? '-vcodec' : null,
+        vcodecFlag === 'vp8' ? 'libvpx' : null,
+    ].filter(truthy_1.truthy);
+};
+exports.determineVcodecFfmpegFlags = determineVcodecFfmpegFlags;

package/dist/extract-frame-from-video.js

@@ -7,7 +7,7 @@ exports.extractFrameFromVideo = exports.getLastFrameOfVideo = void 0;
 const execa_1 = __importDefault(require("execa"));
 const get_video_stream_duration_1 = require("./assets/get-video-stream-duration");
 const determine_resize_params_1 = require("./determine-resize-params");
-const determine_vcodec_ffmepg_flags_1 = require("./determine-vcodec-ffmepg-flags");
+const determine_vcodec_ffmpeg_flags_1 = require("./determine-vcodec-ffmpeg-flags");
 const ensure_presentation_timestamp_1 = require("./ensure-presentation-timestamp");
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const frame_to_ffmpeg_timestamp_1 = require("./frame-to-ffmpeg-timestamp");
@@ -124,7 +124,7 @@ const extractFrameFromVideoFn = async ({ time, ffmpegExecutable, ffprobeExecutab
     const { stdout, stderr } = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), [
         '-ss',
         ffmpegTimestamp,
-        ...(0, determine_vcodec_ffmepg_flags_1.determineVcodecFfmepgFlags)(specialVcodec),
+        ...(0, determine_vcodec_ffmpeg_flags_1.determineVcodecFfmpegFlags)(specialVcodec),
         '-i',
         src,
         '-frames:v',

package/dist/get-compositions-from-bundle.d.ts

@@ -0,0 +1,2 @@
+import type { GetCompositionsConfig } from './get-compositions';
+export declare const getCompositionsFromBundle: (bundle: string, options: GetCompositionsConfig) => import("remotion/src").TCompMetadata[];

package/dist/get-compositions-from-bundle.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompositionsFromBundle = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const remotion_1 = require("remotion");
+const vm_1 = __importDefault(require("vm"));
+const is_serve_url_1 = require("./is-serve-url");
+const getCompositionsFromBundle = (bundle, options) => {
+    const bundleFile = path_1.default.join(bundle, 'bundle.js');
+    if ((0, is_serve_url_1.isServeUrl)(bundle)) {
+        throw new Error('Can only use getCompositionFromBundle from a local file');
+    }
+    const content = fs_1.default.readFileSync(bundleFile, 'utf-8');
+    // @ts-éxpect-error
+    process.env.REMOTION_SERVER_RENDERING = 'true';
+    const context = {
+        window: {
+            remotion_envVariables: options.envVariables,
+        },
+        clearTimeout: () => {
+            console.trace('clearTimeout() called inside a server-side bundle. This is not supported.');
+        },
+        setTimeout: () => {
+            console.trace('setTimeout() called inside a server-side bundle. This is not supported.');
+        },
+        process: {
+            env: {
+                REMOTION_SERVER_RENDERING: true,
+            },
+        },
+        require,
+        Buffer,
+        console,
+    };
+    const vmContext = vm_1.default.createContext(context);
+    // TODO: Set props and env
+    const code = content;
+    vm_1.default.runInContext(code, vmContext, {
+        filename: bundleFile,
+        breakOnSigint: true,
+    });
+    const theRoot = remotion_1.Internals.getRoot();
+    if (!theRoot) {
+        throw new Error('Did not call getRoot() in the bundle. Delaying the calling of getRoot() is not supported in server-side-rendering.');
+    }
+    const Comp = theRoot;
+    console.log({ Comp1: Comp });
+    const comps = (0, remotion_1.getCompositionsFromMarkup)(Comp);
+    return comps;
+};
+exports.getCompositionsFromBundle = getCompositionsFromBundle;

package/dist/get-compositions-on-server.d.ts

@@ -1,3 +1,3 @@
 import type { ComponentType } from 'react';
-import type { TCompMetadata } from 'remotion/src';
-export declare const getCompositionsOnServer: (Comp: ComponentType) => TCompMetadata[];
+import type { TCompMetadata } from 'remotion';
+export declare const getCompositionsFromMarkup: (Comp: ComponentType) => TCompMetadata[];

package/dist/get-compositions-on-server.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCompositionsOnServer = void 0;
+exports.getCompositionsFromMarkup = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const server_1 = require("react-dom/server");
-const getCompositionsOnServer = (Comp) => {
+const getCompositionsFromMarkup = (Comp) => {
     process.env.REMOTION_SERVER_RENDERING = 'true';
     const str = (0, server_1.renderToString)((0, jsx_runtime_1.jsx)(Comp, {}));
+    console.log({ str }, (0, jsx_runtime_1.jsx)(Comp, {}));
     const matches = str.matchAll(/<div>(.*?)<\/div>/g);
     const metadata = [];
     for (const match of matches) {
@@ -14,4 +15,4 @@ const getCompositionsOnServer = (Comp) => {
     }
     return metadata;
 };
-exports.getCompositionsOnServer = getCompositionsOnServer;
+exports.getCompositionsFromMarkup = getCompositionsFromMarkup;

package/dist/get-extension-of-filename.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtensionOfFilename = void 0;
+const path_1 = __importDefault(require("path"));
 const getExtensionOfFilename = (filename) => {
     if (filename === null) {
         return null;
     }
-    const filenameArr = filename.split('.');
+    const filenameArr = path_1.default.normalize(filename).split('.');
     const hasExtension = filenameArr.length >= 2;
     const filenameArrLength = filenameArr.length;
     const extension = hasExtension ? filenameArr[filenameArrLength - 1] : null;

package/dist/get-frame-of-video-slow.js

@@ -8,7 +8,7 @@ exports.getFrameOfVideoSlow = void 0;
 // if the video is corrupted
 const execa_1 = __importDefault(require("execa"));
 const determine_resize_params_1 = require("./determine-resize-params");
-const determine_vcodec_ffmepg_flags_1 = require("./determine-vcodec-ffmepg-flags");
+const determine_vcodec_ffmpeg_flags_1 = require("./determine-vcodec-ffmpeg-flags");
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const truthy_1 = require("./truthy");
 const getFrameOfVideoSlow = async ({ src, duration, ffmpegExecutable, imageFormat, specialVCodecForTransparency, needsResize, offset, fps, remotionRoot, }) => {
@@ -17,7 +17,7 @@ const getFrameOfVideoSlow = async ({ src, duration, ffmpegExecutable, imageForma
     const command = [
         '-itsoffset',
         actualOffset,
-        ...(0, determine_vcodec_ffmepg_flags_1.determineVcodecFfmepgFlags)(specialVCodecForTransparency),
+        ...(0, determine_vcodec_ffmpeg_flags_1.determineVcodecFfmpegFlags)(specialVCodecForTransparency),
         '-i',
         src,
         '-frames:v',

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -115,8 +114,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: import("./browser").Browser;
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
+    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
     validImageFormats: readonly ["png", "jpeg", "none"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
@@ -126,7 +125,7 @@ export declare const RenderInternals: {
     DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
     logLevels: readonly ["verbose", "info", "warn", "error"];
-    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "error" | "info" | "warn", level: "verbose" | "error" | "info" | "warn") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "error" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
     isValidLogLevel: (level: string) => boolean;
     perf: typeof perf;
     makeDownloadMap: () => import("./assets/download-map").DownloadMap;

package/dist/make-cancel-signal.d.ts

@@ -4,4 +4,11 @@ export declare const makeCancelSignal: () => {
     cancelSignal: CancelSignal;
     cancel: () => void;
 };
+export declare const cancelErrorMessages: {
+    renderMedia: string;
+    renderFrames: string;
+    renderStill: string;
+    stitchFramesToVideo: string;
+};
+export declare const isUserCancelledRender: (err: unknown) => boolean;
 export {};

package/dist/make-cancel-signal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCancelSignal = void 0;
+exports.isUserCancelledRender = exports.cancelErrorMessages = exports.makeCancelSignal = void 0;
 const makeCancelSignal = () => {
     const callbacks = [];
     let cancelled = false;
@@ -23,3 +23,22 @@ const makeCancelSignal = () => {
     };
 };
 exports.makeCancelSignal = makeCancelSignal;
+exports.cancelErrorMessages = {
+    renderMedia: 'renderMedia() got cancelled',
+    renderFrames: 'renderFrames() got cancelled',
+    renderStill: 'renderStill() got cancelled',
+    stitchFramesToVideo: 'stitchFramesToVideo() got cancelled',
+};
+const isUserCancelledRender = (err) => {
+    if (typeof err === 'object' &&
+        err !== null &&
+        'message' in err &&
+        typeof err.message === 'string') {
+        return (err.message.includes(exports.cancelErrorMessages.renderMedia) ||
+            err.message.includes(exports.cancelErrorMessages.renderFrames) ||
+            err.message.includes(exports.cancelErrorMessages.renderStill) ||
+            err.message.includes(exports.cancelErrorMessages.stitchFramesToVideo));
+    }
+    return false;
+};
+exports.isUserCancelledRender = isUserCancelledRender;

package/dist/puppeteer-screenshot.d.ts

@@ -9,4 +9,4 @@ export declare const screenshot: (options: {
     width: number;
     height: number;
     clipRegion: ClipRegion | null;
-}) => Promise<Buffer | string | void>;
+}) => Promise<Buffer | string>;

package/dist/render-frames.js

@@ -21,6 +21,7 @@ const get_frame_padded_index_1 = require("./get-frame-padded-index");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const image_format_1 = require("./image-format");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
+const make_cancel_signal_1 = require("./make-cancel-signal");
 const open_browser_1 = require("./open-browser");
 const perf_1 = require("./perf");
 const pool_1 = require("./pool");
@@ -241,6 +242,9 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
                 !((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes('Session closed'))) {
                 throw err;
             }
+            if ((0, make_cancel_signal_1.isUserCancelledRender)(err)) {
+                throw err;
+            }
             if (retriesLeft === 0) {
                 console.warn(err, `The browser crashed ${attempt} times while rendering frame ${frame}. Not retrying anymore. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
                 throw err;
@@ -320,7 +324,7 @@ const renderFrames = (options) => {
             new Promise((_, rej) => {
                 var _a;
                 (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
-                    rej(new Error('renderFrames() got cancelled'));
+                    rej(new Error(make_cancel_signal_1.cancelErrorMessages.renderFrames));
                 });
             }),
             Promise.all([

package/dist/render-media.js

@@ -362,7 +362,7 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
         happyPath,
         new Promise((_resolve, reject) => {
             cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
-                reject(new Error('renderMedia() got cancelled'));
+                reject(new Error(make_cancel_signal_1.cancelErrorMessages.renderMedia));
             });
         }),
     ]);

package/dist/render-still.js

@@ -38,6 +38,7 @@ const handle_javascript_exception_1 = require("./error-handling/handle-javascrip
 const find_closest_package_json_1 = require("./find-closest-package-json");
 const image_format_1 = require("./image-format");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
+const make_cancel_signal_1 = require("./make-cancel-signal");
 const open_browser_1 = require("./open-browser");
 const prepare_server_1 = require("./prepare-server");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
@@ -215,7 +216,7 @@ const renderStill = (options) => {
         new Promise((_resolve, reject) => {
             var _a;
             (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
-                reject(new Error('renderStill() got cancelled'));
+                reject(new Error(make_cancel_signal_1.cancelErrorMessages.renderStill));
             });
         }),
     ]);

package/dist/render-web-frame.d.ts

@@ -0,0 +1,73 @@
+import type { SmallTCompMetadata, TAsset } from 'remotion/src';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { DownloadMap } from './assets/download-map';
+import type { BrowserExecutable } from './browser-executable';
+import type { BrowserLog } from './browser-log';
+import type { Page } from './browser/BrowserPage';
+import type { CountType } from './get-frame-padded-index';
+import type { ServeUrl } from './legacy-webpack-config';
+import type { ChromiumOptions } from './open-browser';
+import type { Pool } from './pool';
+import type { BrowserReplacer } from './replace-browser';
+export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, onFrameUpdate, outputDir, stopState, assets, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, onDownload, onError, }: {
+    frame: number;
+    index: number;
+    retriesLeft: number;
+    attempt: number;
+    actualConcurrency: number;
+    browserReplacer: BrowserReplacer | null;
+    poolPromise: Promise<Pool<Page>>;
+    composition: SmallTCompMetadata;
+    downloadMap: DownloadMap;
+    imageFormat: 'png' | 'jpeg' | 'none';
+    onFrameBuffer: ((buffer: Buffer, frame: number) => void) | undefined;
+    onFrameUpdate: (framesRendered: number, frameIndex: number, timeToRenderInMilliseconds: number) => void;
+    outputDir: string | null;
+    stopState: {
+        isStopped: boolean;
+    };
+    assets: TAsset[][];
+    countType: CountType;
+    scale: number;
+    quality: number | undefined;
+    framesToRender: number[];
+    lastFrame: number;
+    framesRendered: {
+        frames: number;
+    };
+    browserExecutable?: BrowserExecutable | undefined;
+    chromiumOptions?: ChromiumOptions | undefined;
+    dumpBrowserLogs?: boolean | undefined;
+    pagesArray: Page[];
+    onBrowserLog?: ((log: BrowserLog) => void) | undefined;
+    inputProps: unknown;
+    envVariables?: Record<string, string> | undefined;
+    muted: boolean;
+    proxyPort: number;
+    realFrameRange: [number, number];
+    serveUrl: ServeUrl;
+    timeoutInMilliseconds: number;
+    onDownload: RenderMediaOnDownload;
+    onError: (err: Error) => void;
+}) => Promise<void>;
+export declare const makePage: ({ browserReplacer, pagesArray, composition, scale, onBrowserLog, inputProps, envVariables, serveUrl, realFrameRange, timeoutInMilliseconds, proxyPort, imageFormat, muted, }: {
+    browserReplacer: BrowserReplacer;
+    pagesArray: Page[];
+    composition: SmallTCompMetadata;
+    scale?: number | undefined;
+    onBrowserLog?: ((log: BrowserLog) => void) | undefined;
+    inputProps: unknown;
+    envVariables?: Record<string, string> | undefined;
+    serveUrl: ServeUrl;
+    realFrameRange: [number, number];
+    timeoutInMilliseconds: number | undefined;
+    proxyPort: number;
+    imageFormat: 'png' | 'jpeg' | 'none';
+    muted: boolean;
+}) => Promise<Page>;
+export declare const makeBrowser: ({ dumpBrowserLogs, browserExecutable, chromiumOptions, scale, }: {
+    dumpBrowserLogs?: boolean | undefined;
+    browserExecutable?: BrowserExecutable | undefined;
+    chromiumOptions?: ChromiumOptions | undefined;
+    scale?: number | undefined;
+}) => Promise<import("./browser/Browser").Browser>;

package/dist/render-web-frame.js

@@ -0,0 +1,298 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeBrowser = exports.makePage = exports.renderWebFrameAndRetryTargetClose = void 0;
+const path_1 = __importDefault(require("path"));
+const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
+const browser_1 = require("./browser");
+const compress_assets_1 = require("./compress-assets");
+const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
+const get_frame_padded_index_1 = require("./get-frame-padded-index");
+const make_cancel_signal_1 = require("./make-cancel-signal");
+const open_browser_1 = require("./open-browser");
+const perf_1 = require("./perf");
+const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
+const seek_to_frame_1 = require("./seek-to-frame");
+const set_props_and_env_1 = require("./set-props-and-env");
+const take_frame_and_compose_1 = require("./take-frame-and-compose");
+const truthy_1 = require("./truthy");
+const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, poolPromise, stopState, outputDir, onFrameBuffer, imageFormat, downloadMap, onFrameUpdate, scale, assets, countType, quality, framesToRender, lastFrame, framesRendered, onDownload, onError, }) => {
+    const pool = await poolPromise;
+    const freePage = await pool.acquire();
+    if (stopState.isStopped) {
+        return reject(new Error('Render was stopped'));
+    }
+    const startTime = performance.now();
+    const errorCallbackOnFrame = (err) => {
+        reject(err);
+    };
+    const cleanupPageError = (0, handle_javascript_exception_1.handleJavascriptException)({
+        page: freePage,
+        onError: errorCallbackOnFrame,
+        frame,
+    });
+    freePage.on('error', errorCallbackOnFrame);
+    await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
+    if (!outputDir && !onFrameBuffer && imageFormat !== 'none') {
+        throw new Error('Called renderFrames() without specifying either `outputDir` or `onFrameBuffer`');
+    }
+    if (outputDir && onFrameBuffer && imageFormat !== 'none') {
+        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,
+        height,
+        imageFormat,
+        output: path_1.default.join(frameDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
+            frame,
+            imageFormat,
+            index,
+            countType,
+            lastFrame,
+            totalFrames: framesToRender.length,
+        })),
+        quality,
+        width,
+        scale,
+        downloadMap,
+        wantsBuffer: Boolean(onFrameBuffer),
+    });
+    if (onFrameBuffer) {
+        if (!buffer) {
+            throw new Error('unexpected null buffer');
+        }
+        onFrameBuffer(buffer, frame);
+    }
+    (0, perf_1.stopPerfMeasure)(id);
+    const compressedAssets = collectedAssets.map((asset) => (0, compress_assets_1.compressAsset)(assets.filter(truthy_1.truthy).flat(1), asset));
+    assets[index] = compressedAssets;
+    compressedAssets.forEach((asset) => {
+        (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
+            asset,
+            onDownload,
+            downloadMap,
+        }).catch((err) => {
+            onError(new Error(`Error while downloading asset: ${err.stack}`));
+        });
+    });
+    framesRendered.frames++;
+    onFrameUpdate(framesRendered.frames, frame, performance.now() - startTime);
+    cleanupPageError();
+    freePage.off('error', errorCallbackOnFrame);
+    pool.release(freePage);
+};
+const renderWebFrame = ({ frame, index, downloadMap, imageFormat, onFrameBuffer, onFrameUpdate, outputDir, poolPromise, stopState, composition, assets, countType, scale, quality, lastFrame, framesToRender, framesRendered, onDownload, onError, }) => {
+    return new Promise((resolve, reject) => {
+        renderFrameWithOptionToReject({
+            frame,
+            index,
+            reject,
+            width: composition.width,
+            height: composition.height,
+            downloadMap,
+            imageFormat,
+            onFrameBuffer,
+            onFrameUpdate,
+            outputDir,
+            poolPromise,
+            stopState,
+            assets,
+            countType,
+            scale,
+            quality,
+            framesToRender,
+            lastFrame,
+            framesRendered,
+            onDownload,
+            onError,
+        })
+            .then(() => {
+            resolve();
+        })
+            .catch((err) => {
+            reject(err);
+        });
+    });
+};
+const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, onFrameUpdate, outputDir, stopState, assets, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, onDownload, onError, }) => {
+    var _a, _b;
+    try {
+        await renderWebFrame({
+            frame,
+            index,
+            poolPromise,
+            composition,
+            downloadMap,
+            imageFormat,
+            onFrameBuffer,
+            onFrameUpdate,
+            outputDir,
+            stopState,
+            assets,
+            countType,
+            scale,
+            quality,
+            framesToRender,
+            lastFrame,
+            framesRendered,
+            onDownload,
+            onError,
+        });
+    }
+    catch (err) {
+        if (!((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Target closed')) &&
+            !((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes('Session closed'))) {
+            throw err;
+        }
+        if ((0, make_cancel_signal_1.isUserCancelledRender)(err)) {
+            throw err;
+        }
+        if (retriesLeft === 0) {
+            console.warn(err, `The browser crashed ${attempt} times while rendering frame ${frame}. Not retrying anymore. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
+            throw err;
+        }
+        console.warn(`The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
+        if (!browserReplacer) {
+            throw new Error('Did not have browser replacer for web frame');
+        }
+        await browserReplacer.replaceBrowser(() => (0, exports.makeBrowser)({
+            browserExecutable,
+            chromiumOptions,
+            dumpBrowserLogs,
+            scale,
+        }), async () => {
+            const pages = new Array(actualConcurrency).fill(true).map(() => (0, exports.makePage)({
+                browserReplacer,
+                composition,
+                pagesArray,
+                onBrowserLog,
+                scale,
+                inputProps,
+                envVariables,
+                imageFormat,
+                muted,
+                proxyPort,
+                realFrameRange,
+                serveUrl,
+                timeoutInMilliseconds,
+            }));
+            const puppeteerPages = await Promise.all(pages);
+            const pool = await poolPromise;
+            for (const newPage of puppeteerPages) {
+                pool.release(newPage);
+            }
+        });
+        await (0, exports.renderWebFrameAndRetryTargetClose)({
+            frame,
+            index,
+            retriesLeft: retriesLeft - 1,
+            attempt: attempt + 1,
+            actualConcurrency,
+            browserReplacer,
+            composition,
+            downloadMap,
+            imageFormat,
+            onFrameBuffer,
+            onFrameUpdate,
+            outputDir,
+            poolPromise,
+            stopState,
+            assets,
+            countType,
+            scale,
+            quality,
+            framesToRender,
+            lastFrame,
+            framesRendered,
+            inputProps,
+            pagesArray,
+            browserExecutable,
+            chromiumOptions,
+            dumpBrowserLogs,
+            envVariables,
+            muted,
+            onBrowserLog,
+            proxyPort,
+            realFrameRange,
+            serveUrl,
+            timeoutInMilliseconds,
+            onDownload,
+            onError,
+        });
+    }
+};
+exports.renderWebFrameAndRetryTargetClose = renderWebFrameAndRetryTargetClose;
+const makePage = async ({ browserReplacer, pagesArray, composition, scale, onBrowserLog, inputProps, envVariables, serveUrl, realFrameRange, timeoutInMilliseconds, proxyPort, imageFormat, muted, }) => {
+    if (!browserReplacer) {
+        throw new Error('canonot make page without browser replacer');
+    }
+    const page = await browserReplacer.getBrowser().newPage();
+    pagesArray.push(page);
+    await page.setViewport({
+        width: composition.width,
+        height: composition.height,
+        deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
+    });
+    const logCallback = (log) => {
+        onBrowserLog === null || onBrowserLog === void 0 ? void 0 : onBrowserLog({
+            stackTrace: log.stackTrace(),
+            text: log.text,
+            type: log.type,
+        });
+    };
+    if (onBrowserLog) {
+        page.on('console', logCallback);
+    }
+    const initialFrame = realFrameRange[0];
+    await (0, set_props_and_env_1.setPropsAndEnv)({
+        inputProps,
+        envVariables,
+        page,
+        serveUrl,
+        initialFrame,
+        timeoutInMilliseconds,
+        proxyPort,
+        retriesRemaining: 2,
+        audioEnabled: !muted,
+        videoEnabled: imageFormat !== 'none',
+    });
+    await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+        // eslint-disable-next-line max-params
+        pageFunction: (id, defaultProps, durationInFrames, fps, height, width) => {
+            window.setBundleMode({
+                type: 'composition',
+                compositionName: id,
+                compositionDefaultProps: defaultProps,
+                compositionDurationInFrames: durationInFrames,
+                compositionFps: fps,
+                compositionHeight: height,
+                compositionWidth: width,
+            });
+        },
+        args: [
+            composition.id,
+            composition.defaultProps,
+            composition.durationInFrames,
+            composition.fps,
+            composition.height,
+            composition.width,
+        ],
+        frame: null,
+        page,
+    });
+    page.off('console', logCallback);
+    return page;
+};
+exports.makePage = makePage;
+const makeBrowser = ({ dumpBrowserLogs, browserExecutable, chromiumOptions, scale, }) => (0, open_browser_1.openBrowser)(browser_1.DEFAULT_BROWSER, {
+    shouldDumpIo: dumpBrowserLogs,
+    browserExecutable,
+    chromiumOptions,
+    forceDeviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
+});
+exports.makeBrowser = makeBrowser;

package/dist/screenshot-dom-element.js

@@ -28,7 +28,7 @@ const screenshotDOMElement = async ({ page, imageFormat, quality, opts, height,
     if (imageFormat === 'none') {
         throw new TypeError('Tried to make a screenshot with format "none"');
     }
-    return (0, puppeteer_screenshot_1.screenshot)({
+    const buf = await (0, puppeteer_screenshot_1.screenshot)({
         page,
         omitBackground: imageFormat === 'png',
         path: path !== null && path !== void 0 ? path : undefined,
@@ -38,5 +38,9 @@ const screenshotDOMElement = async ({ page, imageFormat, quality, opts, height,
         height,
         clipRegion,
     });
+    if (typeof buf === 'string') {
+        throw new TypeError('Expected a buffer');
+    }
+    return buf;
 };
 exports.screenshotDOMElement = screenshotDOMElement;

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

@@ -45,6 +45,7 @@ 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 make_cancel_signal_1 = require("./make-cancel-signal");
 const merge_audio_track_1 = require("./merge-audio-track");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const pixel_format_1 = require("./pixel-format");
@@ -98,11 +99,13 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
         downloadMap,
         remotionRoot,
     });
-    (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     onProgress(1);
-    preprocessed.forEach((p) => {
-        (0, delete_directory_1.deleteDirectory)(p);
-    });
+    await Promise.all([
+        (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing),
+        ...preprocessed.map((p) => {
+            return (0, delete_directory_1.deleteDirectory)(p);
+        }),
+    ]);
     return outName;
 };
 const spawnFfmpeg = async (options, remotionRoot) => {
@@ -344,7 +347,7 @@ const stitchFramesToVideo = async (options) => {
         new Promise((_resolve, reject) => {
             var _a;
             (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
-                reject(new Error('stitchFramesToVideo() got cancelled'));
+                reject(new Error(make_cancel_signal_1.cancelErrorMessages.stitchFramesToVideo));
             });
         }),
     ]);

package/dist/try-to-extract-frame-of-video-fast.js

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryToExtractFrameOfVideoFast = void 0;
 const execa_1 = __importDefault(require("execa"));
 const determine_resize_params_1 = require("./determine-resize-params");
-const determine_vcodec_ffmepg_flags_1 = require("./determine-vcodec-ffmepg-flags");
+const determine_vcodec_ffmpeg_flags_1 = require("./determine-vcodec-ffmpeg-flags");
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const truthy_1 = require("./truthy");
 const tryToExtractFrameOfVideoFast = async ({ ffmpegExecutable, remotionRoot, specialVCodecForTransparency, imageFormat, needsResize, src, actualOffset, }) => {
     const { stdout, stderr } = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), [
         '-ss',
         actualOffset,
-        ...(0, determine_vcodec_ffmepg_flags_1.determineVcodecFfmepgFlags)(specialVCodecForTransparency),
+        ...(0, determine_vcodec_ffmpeg_flags_1.determineVcodecFfmpegFlags)(specialVCodecForTransparency),
         '-i',
         src,
         '-frames:v',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.26",
+	"version": "3.3.28",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.3.26",
+		"remotion": "3.3.28",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -49,13 +49,13 @@
 		"vitest": "0.24.3"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "3.3.26",
-		"@remotion/compositor-darwin-x64": "3.3.26",
-		"@remotion/compositor-linux-arm64-gnu": "3.3.26",
-		"@remotion/compositor-linux-arm64-musl": "3.3.26",
-		"@remotion/compositor-linux-x64-gnu": "3.3.26",
-		"@remotion/compositor-linux-x64-musl": "3.3.26",
-		"@remotion/compositor-win32-x64-msvc": "3.3.26"
+		"@remotion/compositor-darwin-arm64": "3.3.28",
+		"@remotion/compositor-darwin-x64": "3.3.28",
+		"@remotion/compositor-linux-arm64-gnu": "3.3.28",
+		"@remotion/compositor-linux-arm64-musl": "3.3.28",
+		"@remotion/compositor-linux-x64-gnu": "3.3.28",
+		"@remotion/compositor-linux-x64-musl": "3.3.28",
+		"@remotion/compositor-win32-x64-msvc": "3.3.28"
 	},
 	"keywords": [
 		"remotion",
@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "8efe8771f7c2b1d22bd50e8c81cc37ae054dfae9"
+	"gitHead": "0caa0bec583b5e4c2b12b7375c365e02c2378eeb"
 }