@remotion/renderer 3.3.31 → 3.3.33

package/dist/compositor/compositor.d.ts

@@ -1,9 +1,12 @@
-import type { CliInput } from './payloads';
+import type { CompositorCommand, CompositorInitiatePayload } from './payloads';
 export declare type Compositor = {
     finishCommands: () => void;
-    executeCommand: (payload: Omit<CliInput, 'nonce'>) => Promise<void>;
+    executeCommand: (payload: Omit<CompositorCommand, 'nonce'>) => Promise<void>;
     waitForDone: () => Promise<void>;
 };
-export declare const spawnCompositorOrReuse: (renderId: string) => Compositor;
+export declare const spawnCompositorOrReuse: ({ initiatePayload, renderId, }: {
+    initiatePayload: CompositorInitiatePayload;
+    renderId: string;
+}) => Compositor;
 export declare const releaseCompositorWithId: (renderId: string) => void;
 export declare const waitForCompositorWithIdToQuit: (renderId: string) => Promise<void>;

package/dist/compositor/compositor.js

@@ -5,9 +5,9 @@ const child_process_1 = require("child_process");
 const truthy_1 = require("../truthy");
 const get_executable_path_1 = require("./get-executable-path");
 const compositorMap = {};
-const spawnCompositorOrReuse = (renderId) => {
+const spawnCompositorOrReuse = ({ initiatePayload, renderId, }) => {
     if (!compositorMap[renderId]) {
-        compositorMap[renderId] = startCompositor();
+        compositorMap[renderId] = startCompositor(initiatePayload);
     }
     return compositorMap[renderId];
 };
@@ -25,28 +25,31 @@ const waitForCompositorWithIdToQuit = (renderId) => {
     return compositorMap[renderId].waitForDone();
 };
 exports.waitForCompositorWithIdToQuit = waitForCompositorWithIdToQuit;
-const startCompositor = () => {
+const startCompositor = (compositorInitiatePayload) => {
     const bin = (0, get_executable_path_1.getExecutablePath)();
-    const child = (0, child_process_1.spawn)(bin);
-    const _stderrChunks = [];
-    const stdoutChunks = [];
+    const child = (0, child_process_1.spawn)(`${bin}`, [JSON.stringify(compositorInitiatePayload)]);
+    const stderrChunks = [];
+    let stdoutListeners = [];
+    let stderrListeners = [];
     child.stderr.on('data', (d) => {
-        _stderrChunks.push(d);
+        stderrChunks.push(d);
+        const str = d.toString('utf-8');
+        stderrListeners.forEach((s) => s(str));
     });
     child.stdout.on('data', (d) => {
-        stdoutChunks.push(d);
+        const str = d.toString('utf-8');
+        stdoutListeners.forEach((s) => s(str));
     });
     let nonce = 0;
     return {
         waitForDone: () => {
             return new Promise((resolve, reject) => {
                 child.on('exit', (code) => {
-                    console.log({ code });
                     if (code === 0) {
                         resolve();
                     }
                     else {
-                        reject(Buffer.concat(_stderrChunks).toString('utf-8'));
+                        reject(Buffer.concat(stderrChunks).toString('utf-8'));
                     }
                 });
             });
@@ -62,10 +65,7 @@ const startCompositor = () => {
             nonce++;
             return new Promise((resolve, reject) => {
                 child.stdin.write(JSON.stringify(actualPayload) + '\n');
-                const stderrChunks = [];
-                const onStderr = (d) => {
-                    stderrChunks.push(d);
-                    const message = Buffer.concat(stderrChunks).toString('utf-8');
+                const onStderr = (message) => {
                     let parsed = null;
                     try {
                         const content = JSON.parse(message);
@@ -81,12 +81,11 @@ const startCompositor = () => {
                         const err = new Error(parsed.error);
                         err.stack = parsed.error + '\n' + parsed.backtrace;
                         reject(err);
-                        child.stderr.off('data', onStderr);
-                        child.stdout.off('data', onStdout);
+                        stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
+                        stderrListeners = stderrListeners.filter((s) => s !== onStderr);
                     }
                 };
-                const onStdout = (d) => {
-                    const str = d.toString('utf-8');
+                const onStdout = (str) => {
                     const lineSplit = str.split('\n');
                     for (const line of lineSplit.filter(truthy_1.truthy)) {
                         let parsed = null;
@@ -99,13 +98,13 @@ const startCompositor = () => {
                         catch (e) { }
                         if (parsed && parsed.nonce === actualPayload.nonce) {
                             resolve();
-                            child.stderr.off('data', onStderr);
-                            child.stdout.off('data', onStdout);
+                            stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
+                            stderrListeners = stderrListeners.filter((s) => s !== onStderr);
                         }
                     }
                 };
-                child.stderr.on('data', onStderr);
-                child.stdout.on('data', onStdout);
+                stdoutListeners.push(onStdout);
+                stderrListeners.push(onStderr);
             });
         },
     };

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

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

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

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

package/dist/get-port.d.ts

@@ -1 +1,4 @@
-export declare const getDesiredPort: (desiredPort: number | undefined, from: number, to: number) => Promise<number>;
+export declare const getDesiredPort: (desiredPort: number | undefined, from: number, to: number) => Promise<{
+    port: number;
+    didUsePort: () => void;
+}>;

package/dist/get-port.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDesiredPort = void 0;
 const net_1 = __importDefault(require("net"));
-const p_limit_1 = require("./p-limit");
+const locks_1 = require("./locks");
 const getAvailablePort = (portToTry) => new Promise((resolve) => {
     let status = 'unavailable';
     const host = '127.0.0.1';
@@ -35,21 +35,21 @@ const getPort = async (from, to) => {
     }
     throw new Error('No available ports found');
 };
-const getDesiredPortUnlimited = async (desiredPort, from, to) => {
+const portLocks = (0, locks_1.createLock)({ timeout: 10000 });
+const getDesiredPort = async (desiredPort, from, to) => {
+    await portLocks.waitForAllToBeDone();
+    const lockPortSelection = portLocks.lock();
+    const didUsePort = () => portLocks.unlock(lockPortSelection);
     if (typeof desiredPort !== 'undefined' &&
         (await getAvailablePort(desiredPort)) === 'available') {
-        return desiredPort;
+        return { port: desiredPort, didUsePort };
     }
     const actualPort = await getPort(from, to);
     // If did specify a port but did not get that one, fail hard.
     if (desiredPort && desiredPort !== actualPort) {
         throw new Error(`You specified port ${desiredPort} to be used for the HTTP server, but it is not available. Choose a different port or remove the setting to let Remotion automatically select a free port.`);
     }
-    return actualPort;
-};
-const limit = (0, p_limit_1.pLimit)(1);
-const getDesiredPort = (desiredPort, from, to) => {
-    return limit(() => getDesiredPortUnlimited(desiredPort, from, to));
+    return { port: actualPort, didUsePort };
 };
 exports.getDesiredPort = getDesiredPort;
 const makeRange = (from, to) => {

package/dist/get-video-signals.d.ts

@@ -0,0 +1,2 @@
+import type { CompositorLayer } from './compositor/payloads';
+export declare const getNativeVideoSignals: (layers: CompositorLayer[]) => Record<string, Record<number, number>>;

package/dist/get-video-signals.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNativeVideoSignals = void 0;
+const getNativeVideoSignals = (layers) => {
+    const videoSignals = layers
+        .filter((l) => {
+        return l.type === 'VideoFrame';
+    })
+        .map((l) => {
+        if (l.type !== 'VideoFrame') {
+            throw new Error('Expected VideoFrame');
+        }
+        return { frame: l.params.frame, src: l.params.src };
+    });
+    const map = {};
+    // Return a map for each video source and the number of times each frame is expected to be used
+    for (const { src, frame } of videoSignals) {
+        if (!map[src]) {
+            map[src] = {};
+        }
+        if (!map[src][frame]) {
+            map[src][frame] = 0;
+        }
+        map[src][frame]++;
+    }
+    return map;
+};
+exports.getNativeVideoSignals = getNativeVideoSignals;

package/dist/index.d.ts

@@ -9,7 +9,6 @@ export { Browser } from './browser';
 export { BrowserExecutable } from './browser-executable';
 export { BrowserLog } from './browser-log';
 export { Codec, CodecOrUndefined } from './codec';
-export { combineVideos } from './combine-videos';
 export { Crf } from './crf';
 export { ensureFfmpeg, EnsureFfmpegOptions, ensureFfprobe, } from './ensure-ffmpeg';
 export { ErrorWithStackFrame } from './error-handling/handle-javascript-exception';
@@ -86,7 +85,10 @@ export declare const RenderInternals: {
     SymbolicateableError: typeof SymbolicateableError;
     getFramesToRender: (frameRange: [number, number], everyNthFrame: number) => number[];
     getExtensionOfFilename: (filename: string | null) => string | null;
-    getDesiredPort: (desiredPort: number | undefined, from: number, to: number) => Promise<number>;
+    getDesiredPort: (desiredPort: number | undefined, from: number, to: number) => Promise<{
+        port: number;
+        didUsePort: () => void;
+    }>;
     isPathInside: (thePath: string, potentialParent: string) => boolean;
     execa: {
         (file: string, arguments?: readonly string[] | undefined, options?: execa.Options<string> | undefined): execa.ExecaChildProcess<string>;
@@ -142,4 +144,16 @@ export declare const RenderInternals: {
         ffmpegExecutable: string | null;
         remotionRoot: string;
     }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
+    combineVideos: (options: {
+        files: string[];
+        filelistDir: string;
+        output: string;
+        onProgress: (p: number) => void;
+        numberOfFrames: number;
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
+        fps: number;
+        numberOfGifLoops: number | null;
+        remotionRoot: string;
+        ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable;
+    }) => Promise<void>;
 };

package/dist/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.getCanExtractFramesFast = exports.ErrorWithStackFrame = exports.ensureFfprobe = exports.ensureFfmpeg = exports.combineVideos = void 0;
+exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.getCanExtractFramesFast = exports.ErrorWithStackFrame = exports.ensureFfprobe = exports.ensureFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
 const download_file_1 = require("./assets/download-file");
 const download_map_1 = require("./assets/download-map");
@@ -35,6 +35,7 @@ const TimeoutSettings_1 = require("./browser/TimeoutSettings");
 const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
 const check_apple_silicon_1 = require("./check-apple-silicon");
 const codec_1 = require("./codec");
+const combine_videos_1 = require("./combine-videos");
 const convert_to_positive_frame_index_1 = require("./convert-to-positive-frame-index");
 const delete_directory_1 = require("./delete-directory");
 const ensure_output_directory_1 = require("./ensure-output-directory");
@@ -71,8 +72,6 @@ const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_videobitrate_1 = require("./validate-videobitrate");
 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 ensure_ffmpeg_1 = require("./ensure-ffmpeg");
 Object.defineProperty(exports, "ensureFfmpeg", { enumerable: true, get: function () { return ensure_ffmpeg_1.ensureFfmpeg; } });
 Object.defineProperty(exports, "ensureFfprobe", { enumerable: true, get: function () { return ensure_ffmpeg_1.ensureFfprobe; } });
@@ -153,6 +152,7 @@ exports.RenderInternals = {
     getExecutableBinary: ffmpeg_flags_1.getExecutableBinary,
     validateBitrate: validate_videobitrate_1.validateBitrate,
     getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
+    combineVideos: combine_videos_1.combineVideos,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
 (0, check_apple_silicon_1.checkNodeVersionAndWarnAboutRosetta)();

package/dist/lock-port-selection.d.ts

@@ -0,0 +1,2 @@
+export declare const lockPortSelection: () => void;
+export declare const unlockPortSelection: () => void;

package/dist/lock-port-selection.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unlockPortSelection = exports.lockPortSelection = void 0;
+const locks = [];
+const waitForPortSelection = () => { };
+const lockPortSelection = () => {
+    locks.push();
+};
+exports.lockPortSelection = lockPortSelection;
+const unlockPortSelection = () => { };
+exports.unlockPortSelection = unlockPortSelection;

package/dist/locks.d.ts

@@ -0,0 +1,7 @@
+export declare const createLock: ({ timeout }: {
+    timeout: number | null;
+}) => {
+    lock: () => number;
+    unlock: (id: number) => void;
+    waitForAllToBeDone: () => Promise<unknown>;
+};

package/dist/locks.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLock = void 0;
+const createLock = ({ timeout }) => {
+    let locks = [];
+    const waiters = [];
+    const lock = () => {
+        const id = Math.random();
+        locks.push(id);
+        return id;
+    };
+    const unlock = (id) => {
+        locks = locks.filter((l) => l !== id);
+        resolveWaiters();
+    };
+    const resolveWaiters = () => {
+        if (locks.length === 0) {
+            waiters.forEach((w) => w());
+        }
+    };
+    const waitForAllToBeDone = () => {
+        const success = new Promise((resolve) => {
+            waiters.push(() => {
+                resolve();
+            });
+        });
+        resolveWaiters();
+        if (timeout === null) {
+            return success;
+        }
+        const timeoutFn = new Promise((resolve) => {
+            setTimeout(() => {
+                return resolve();
+            }, timeout);
+        });
+        return Promise.race([success, timeoutFn]);
+    };
+    return {
+        lock,
+        unlock,
+        waitForAllToBeDone,
+    };
+};
+exports.createLock = createLock;

package/dist/make-timeline-context-value.d.ts

@@ -0,0 +1,2 @@
+import type { SmallTCompMetadata, TimelineContextValue } from 'remotion';
+export declare const makeTimelineContextValue: (composition: SmallTCompMetadata, frame: number) => TimelineContextValue;

package/dist/make-timeline-context-value.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeTimelineContextValue = void 0;
+const makeTimelineContextValue = (composition, frame) => {
+    const value = {
+        audioAndVideoTags: { current: [] },
+        rootId: composition.id,
+        playing: false,
+        playbackRate: 1,
+        imperativePlaying: {
+            current: false,
+        },
+        frame,
+        setPlaybackRate: () => {
+            throw new Error('Not implemented');
+        },
+    };
+    return value;
+};
+exports.makeTimelineContextValue = makeTimelineContextValue;

package/dist/render-on-server.js

@@ -68,6 +68,14 @@ const renderOnServer = async (Comp, composition) => {
             ],
             output: out,
             renderId,
+            compositorInitiatePayload: {
+                create_h264_queue: true,
+                duration_in_frames: 300,
+                fps: 30,
+                video_signals: {},
+                height: composition.height,
+                width: composition.width,
+            },
         });
         pool.release(frame);
     }));

package/dist/render-svg.js

@@ -5,24 +5,9 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const server_1 = require("react-dom/server");
 const remotion_1 = require("remotion");
 const make_comp_manager_context_1 = require("./make-comp-manager-context");
-const makeTimelineContextValue = (composition, frame) => {
-    const value = {
-        audioAndVideoTags: { current: [] },
-        rootId: composition.id,
-        playing: false,
-        playbackRate: 1,
-        imperativePlaying: {
-            current: false,
-        },
-        frame,
-        setPlaybackRate: () => {
-            throw new Error('Not implemented');
-        },
-    };
-    return value;
-};
+const make_timeline_context_value_1 = require("./make-timeline-context-value");
 const renderSvg = ({ composition, Comp, frame, layer, }) => {
-    const svg = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.SelectCompositionMode, { layer: layer, id: composition.id, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: makeTimelineContextValue(composition, frame), children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: (0, make_comp_manager_context_1.makeCompManagerContext)(composition), children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }) }));
+    const svg = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.SelectCompositionMode, { layer: layer, id: composition.id, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: (0, make_timeline_context_value_1.makeTimelineContextValue)(composition, frame), children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: (0, make_comp_manager_context_1.makeCompManagerContext)(composition), children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }) }));
     return svg;
 };
 exports.renderSvg = renderSvg;

package/dist/render-video-layer.d.ts

@@ -0,0 +1,9 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
+import type { NativeVideoLayerInfo } from 'remotion/src/video/NativeVideoForRendering';
+export declare const renderVideoLayer: ({ composition, Comp, frame, layer, }: {
+    composition: TCompMetadata;
+    Comp: ComponentType;
+    frame: number;
+    layer: number;
+}) => NativeVideoLayerInfo | null;

package/dist/render-video-layer.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderVideoLayer = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const server_1 = require("react-dom/server");
+const remotion_1 = require("remotion");
+const make_comp_manager_context_1 = require("./make-comp-manager-context");
+const make_timeline_context_value_1 = require("./make-timeline-context-value");
+const renderVideoLayer = ({ composition, Comp, frame, layer, }) => {
+    process.env.REMOTION_SERVER_RENDERING = 'true';
+    const markup = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.SelectCompositionMode, { layer: layer, id: composition.id, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: (0, make_timeline_context_value_1.makeTimelineContextValue)(composition, frame), children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: (0, make_comp_manager_context_1.makeCompManagerContext)(composition), children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }) }));
+    const matches = markup.matchAll(/<div>(.*?)<\/div>/g);
+    let parsed = null;
+    for (const match of matches) {
+        if (parsed) {
+            throw new Error('cannot have more than one video layer');
+        }
+        const json = JSON.parse(match[1]);
+        parsed = json;
+    }
+    return parsed;
+};
+exports.renderVideoLayer = renderVideoLayer;

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

@@ -1,5 +1,5 @@
+/// <reference types="node" />
 import type { SmallTCompMetadata, TAsset } from 'remotion';
-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';
@@ -10,7 +10,7 @@ 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, }: {
+export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, outputDir, stopState, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, }: {
     frame: number;
     index: number;
     retriesLeft: number;
@@ -22,12 +22,10 @@ export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retries
     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;
@@ -48,11 +46,10 @@ export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retries
     realFrameRange: [number, number];
     serveUrl: ServeUrl;
     timeoutInMilliseconds: number;
-    onDownload: RenderMediaOnDownload;
-    onError: (err: Error) => void;
 }) => Promise<{
     layer: CompositorLayer | null;
     buffer: Buffer | null;
+    assets: TAsset[];
 }>;
 export declare const makePage: ({ browserReplacer, pagesArray, composition, scale, onBrowserLog, inputProps, envVariables, serveUrl, realFrameRange, timeoutInMilliseconds, proxyPort, imageFormat, muted, }: {
     browserReplacer: BrowserReplacer;

package/dist/render-web-frame.js

@@ -5,9 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (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 make_cancel_signal_1 = require("./make-cancel-signal");
 const open_browser_1 = require("./open-browser");
@@ -16,15 +14,13 @@ 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, imageFormat, downloadMap, onFrameUpdate, scale, assets, quality, framesRendered, onDownload, onError, }) => {
+const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, poolPromise, stopState, imageFormat, downloadMap, scale, quality, }) => {
     const pool = await poolPromise;
     const freePage = await pool.acquire();
     if (stopState.isStopped) {
         reject(new Error('Render was stopped'));
         throw new Error('stopped');
     }
-    const startTime = performance.now();
     const errorCallbackOnFrame = (err) => {
         reject(err);
     };
@@ -68,25 +64,12 @@ const renderFrameWithOptionToReject = async ({ frame, index, reject, width, heig
         };
     // TODO: Always return buffer
     (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);
-    return { layer: compositionLayer, buffer };
+    return { layer: compositionLayer, buffer, assets: collectedAssets };
 };
-const renderWebFrame = ({ frame, index, downloadMap, imageFormat, onFrameUpdate, poolPromise, stopState, composition, assets, scale, quality, framesRendered, onDownload, onError, }) => {
+const renderWebFrame = ({ frame, index, downloadMap, imageFormat, poolPromise, stopState, composition, scale, quality, }) => {
     return new Promise((resolve, reject) => {
         renderFrameWithOptionToReject({
             frame,
@@ -96,15 +79,10 @@ const renderWebFrame = ({ frame, index, downloadMap, imageFormat, onFrameUpdate,
             height: composition.height,
             downloadMap,
             imageFormat,
-            onFrameUpdate,
             poolPromise,
             stopState,
-            assets,
             scale,
             quality,
-            framesRendered,
-            onDownload,
-            onError,
         })
             .then((res) => {
             resolve(res);
@@ -114,7 +92,7 @@ const renderWebFrame = ({ frame, index, downloadMap, imageFormat, onFrameUpdate,
         });
     });
 };
-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, }) => {
+const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, outputDir, stopState, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, }) => {
     var _a, _b;
     try {
         const returnval = await renderWebFrame({
@@ -124,14 +102,9 @@ const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, at
             composition,
             downloadMap,
             imageFormat,
-            onFrameUpdate,
             stopState,
-            assets,
             scale,
             quality,
-            framesRendered,
-            onDownload,
-            onError,
         });
         return returnval;
     }
@@ -189,11 +162,9 @@ const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, at
             downloadMap,
             imageFormat,
             onFrameBuffer,
-            onFrameUpdate,
             outputDir,
             poolPromise,
             stopState,
-            assets,
             countType,
             scale,
             quality,
@@ -212,8 +183,6 @@ const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, at
             realFrameRange,
             serveUrl,
             timeoutInMilliseconds,
-            onDownload,
-            onError,
         });
         return fram;
     }

package/dist/serve-static.js

@@ -10,7 +10,7 @@ const offthread_video_server_1 = require("./offthread-video-server");
 const serve_handler_1 = require("./serve-handler");
 const serveStatic = async (path, options) => {
     var _a;
-    const port = await (0, get_port_1.getDesiredPort)((_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : undefined, 3000, 3100);
+    const { port, didUsePort } = await (0, get_port_1.getDesiredPort)((_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : undefined, 3000, 3100);
     const offthreadRequest = (0, offthread_video_server_1.startOffthreadVideoServer)({
         ffmpegExecutable: options.ffmpegExecutable,
         ffprobeExecutable: options.ffprobeExecutable,
@@ -47,6 +47,9 @@ const serveStatic = async (path, options) => {
                 delete connections[key];
             });
         });
+        server.on('listening', () => {
+            didUsePort();
+        });
         const destroyConnections = function () {
             for (const key in connections)
                 connections[key].destroy();

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

@@ -1,34 +1,8 @@
 "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;
+const locks_1 = require("./locks");
+const { lock, unlock, waitForAllToBeDone } = (0, locks_1.createLock)({ timeout: 50000 });
+exports.registerErrorSymbolicationLock = lock;
+exports.unlockErrorSymbolicationLock = unlock;
+exports.waitForSymbolicationToBeDone = waitForAllToBeDone;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.31",
+	"version": "3.3.33",
 	"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.31",
+		"remotion": "3.3.33",
 		"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.31",
-		"@remotion/compositor-darwin-x64": "3.3.31",
-		"@remotion/compositor-linux-arm64-gnu": "3.3.31",
-		"@remotion/compositor-linux-arm64-musl": "3.3.31",
-		"@remotion/compositor-linux-x64-gnu": "3.3.31",
-		"@remotion/compositor-linux-x64-musl": "3.3.31",
-		"@remotion/compositor-win32-x64-msvc": "3.3.31"
+		"@remotion/compositor-darwin-arm64": "3.3.33",
+		"@remotion/compositor-darwin-x64": "3.3.33",
+		"@remotion/compositor-linux-arm64-gnu": "3.3.33",
+		"@remotion/compositor-linux-arm64-musl": "3.3.33",
+		"@remotion/compositor-linux-x64-gnu": "3.3.33",
+		"@remotion/compositor-linux-x64-musl": "3.3.33",
+		"@remotion/compositor-win32-x64-msvc": "3.3.33"
 	},
 	"keywords": [
 		"remotion",
@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "4b89462c98236d59641272bd0649d880514e685f"
+	"gitHead": "0356b9108673ac98c41990f192b101f7a6574ed0"
 }