@remotion/renderer 4.0.157 → 4.0.159

package/dist/compositor/compositor.js

@@ -37,10 +37,18 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
     });
     (0, make_file_executable_1.makeFileExecutableIfItIsNot)(bin);
     const fullCommand = (0, compose_1.serializeCommand)(type, payload);
+    const cwd = node_path_1.default.dirname(bin);
     const child = (0, node_child_process_1.spawn)(bin, [JSON.stringify(fullCommand)], {
-        cwd: node_path_1.default.dirname(bin),
+        cwd,
+        env: process.platform === 'darwin'
+            ? {
+                // Should work out of the box, but sometimes it doesn't
+                // https://github.com/remotion-dev/remotion/issues/3862
+                DYLD_LIBRARY_PATH: cwd,
+            }
+            : undefined,
     });
-    const stderrChunks = [];
+    let stderrChunks = [];
     let outputBuffer = Buffer.from('');
     const separator = Buffer.from('remotion_buffer:');
     const waiters = new Map();
@@ -168,6 +176,9 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
             waiters.clear();
             reject === null || reject === void 0 ? void 0 : reject(error);
         }
+        // Need to manually free up memory
+        outputBuffer = Buffer.from('');
+        stderrChunks = [];
     });
     return {
         waitForDone: () => {

package/dist/render-media.js

@@ -39,6 +39,7 @@ const prores_profile_1 = require("./prores-profile");
 const render_frames_1 = require("./render-frames");
 const repro_1 = require("./repro");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
+const succeed_or_cancel_1 = require("./succeed-or-cancel");
 const validate_1 = require("./validate");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_every_nth_frame_1 = require("./validate-every-nth-frame");
@@ -368,57 +369,55 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
                 (0, ensure_output_directory_1.ensureOutputDirectory)(absoluteOutputLocation);
             }
             const stitchStart = Date.now();
-            return Promise.all([
-                (0, stitch_frames_to_video_1.internalStitchFramesToVideo)({
-                    width: composition.width * scale,
-                    height: composition.height * scale,
-                    fps,
-                    outputLocation: absoluteOutputLocation,
-                    preEncodedFileLocation,
-                    preferLossless,
-                    indent,
-                    force: overwrite,
-                    pixelFormat,
-                    codec,
-                    proResProfile,
-                    crf,
-                    assetsInfo,
-                    onProgress: (frame) => {
-                        stitchStage = 'muxing';
-                        if (preEncodedFileLocation) {
-                            muxedFrames = frame;
-                        }
-                        else {
-                            muxedFrames = frame;
-                            encodedFrames = frame;
-                        }
-                        if (encodedFrames === totalFramesToRender) {
-                            encodedDoneIn = Date.now() - stitchStart;
-                        }
-                        if (frame > 0) {
-                            callUpdate();
-                        }
-                    },
-                    onDownload,
-                    numberOfGifLoops,
-                    logLevel,
-                    cancelSignal: cancelStitcher.cancelSignal,
-                    muted: disableAudio,
-                    enforceAudioTrack,
-                    ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : null,
-                    audioBitrate,
-                    videoBitrate,
-                    encodingBufferSize,
-                    encodingMaxRate,
-                    audioCodec,
-                    x264Preset: x264Preset !== null && x264Preset !== void 0 ? x264Preset : null,
-                    colorSpace,
-                    binariesDirectory,
-                    separateAudioTo,
-                }),
-            ]);
+            return (0, stitch_frames_to_video_1.internalStitchFramesToVideo)({
+                width: composition.width * scale,
+                height: composition.height * scale,
+                fps,
+                outputLocation: absoluteOutputLocation,
+                preEncodedFileLocation,
+                preferLossless,
+                indent,
+                force: overwrite,
+                pixelFormat,
+                codec,
+                proResProfile,
+                crf,
+                assetsInfo,
+                onProgress: (frame) => {
+                    stitchStage = 'muxing';
+                    if (preEncodedFileLocation) {
+                        muxedFrames = frame;
+                    }
+                    else {
+                        muxedFrames = frame;
+                        encodedFrames = frame;
+                    }
+                    if (encodedFrames === totalFramesToRender) {
+                        encodedDoneIn = Date.now() - stitchStart;
+                    }
+                    if (frame > 0) {
+                        callUpdate();
+                    }
+                },
+                onDownload,
+                numberOfGifLoops,
+                logLevel,
+                cancelSignal: cancelStitcher.cancelSignal,
+                muted: disableAudio,
+                enforceAudioTrack,
+                ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : null,
+                audioBitrate,
+                videoBitrate,
+                encodingBufferSize,
+                encodingMaxRate,
+                audioCodec,
+                x264Preset: x264Preset !== null && x264Preset !== void 0 ? x264Preset : null,
+                colorSpace,
+                binariesDirectory,
+                separateAudioTo,
+            });
         })
-            .then(([buffer]) => {
+            .then((buffer) => {
             logger_1.Log.verbose({ indent, logLevel }, 'Stitching done in', encodedDoneIn + 'ms');
             slowestFrames.sort((a, b) => b.time - a.time);
             const result = {
@@ -478,14 +477,11 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
             });
         });
     });
-    return Promise.race([
+    return (0, succeed_or_cancel_1.succeedOrCancel)({
         happyPath,
-        new Promise((_resolve, reject) => {
-            cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
-                reject(new Error(make_cancel_signal_1.cancelErrorMessages.renderMedia));
-            });
-        }),
-    ]);
+        cancelSignal,
+        cancelMessage: make_cancel_signal_1.cancelErrorMessages.renderMedia,
+    });
 };
 exports.internalRenderMedia = (0, wrap_with_error_handling_1.wrapWithErrorHandling)(internalRenderMediaRaw);
 /**

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

@@ -16,6 +16,15 @@ const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVa
     const urlToVisit = (0, normalize_serve_url_1.normalizeServeUrl)(serveUrl);
     await page.evaluateOnNewDocument((timeout) => {
         window.remotion_puppeteerTimeout = timeout;
+        // To make getRemotionEnvironment() work
+        if (window.process === undefined) {
+            // @ts-expect-error
+            window.process = {};
+        }
+        if (window.process.env === undefined) {
+            window.process.env = {};
+        }
+        window.process.env.NODE_ENV = 'production';
     }, actualTimeout);
     await page.evaluateOnNewDocument((input) => {
         window.remotion_inputProps = input;

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

@@ -285,9 +285,9 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
         });
     });
 };
-const internalStitchFramesToVideo = async (options) => {
+const internalStitchFramesToVideo = (options) => {
     const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
-    const task = await innerStitchFramesToVideo(options, remotionRoot);
+    const task = innerStitchFramesToVideo(options, remotionRoot);
     return Promise.race([
         task,
         new Promise((_resolve, reject) => {

package/dist/succeed-or-cancel.d.ts

@@ -0,0 +1,6 @@
+import { type CancelSignal } from './make-cancel-signal';
+export declare const succeedOrCancel: <T>({ happyPath, cancelSignal, cancelMessage, }: {
+    happyPath: Promise<T>;
+    cancelSignal: CancelSignal | undefined;
+    cancelMessage: string;
+}) => Promise<T>;

package/dist/succeed-or-cancel.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.succeedOrCancel = void 0;
+const succeedOrCancel = ({ happyPath, cancelSignal, cancelMessage, }) => {
+    if (!cancelSignal) {
+        return happyPath;
+    }
+    let resolveCancel = () => undefined;
+    const cancelProm = new Promise((_resolve, reject) => {
+        cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+            resolveCancel = _resolve;
+            reject(new Error(cancelMessage));
+        });
+    });
+    return Promise.race([
+        happyPath.then((result) => {
+            process.nextTick(() => resolveCancel === null || resolveCancel === void 0 ? void 0 : resolveCancel(undefined));
+            return result;
+        }),
+        cancelProm,
+    ]);
+};
+exports.succeedOrCancel = succeedOrCancel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.157",
+  "version": "4.0.159",
   "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.157"
+    "remotion": "4.0.159"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -43,13 +43,13 @@
     "@types/ws": "8.5.10"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.157",
-    "@remotion/compositor-darwin-x64": "4.0.157",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.157",
-    "@remotion/compositor-linux-x64-gnu": "4.0.157",
-    "@remotion/compositor-linux-arm64-musl": "4.0.157",
-    "@remotion/compositor-linux-x64-musl": "4.0.157",
-    "@remotion/compositor-win32-x64-msvc": "4.0.157"
+    "@remotion/compositor-darwin-arm64": "4.0.159",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.159",
+    "@remotion/compositor-darwin-x64": "4.0.159",
+    "@remotion/compositor-linux-x64-gnu": "4.0.159",
+    "@remotion/compositor-linux-arm64-musl": "4.0.159",
+    "@remotion/compositor-linux-x64-musl": "4.0.159",
+    "@remotion/compositor-win32-x64-msvc": "4.0.159"
   },
   "keywords": [
     "remotion",