@remotion/renderer 4.0.106 → 4.0.108

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

@@ -37,9 +37,6 @@ const download_file_1 = require("./download-file");
 const sanitize_filepath_1 = require("./sanitize-filepath");
 const waitForAssetToBeDownloaded = ({ src, downloadDir, downloadMap, }) => {
     var _a, _b;
-    if (process.env.NODE_ENV === 'test') {
-        console.log('waiting for asset to be downloaded', src);
-    }
     if ((_a = downloadMap.hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
         return Promise.resolve((_b = downloadMap.hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]);
     }
@@ -142,9 +139,6 @@ const downloadAsset = async ({ src, downloadMap, indent, logLevel, }) => {
         downloadMap.isDownloadingMap[src] = {};
     }
     downloadMap.isDownloadingMap[src][downloadDir] = true;
-    if (process.env.NODE_ENV === 'test') {
-        console.log('Actually downloading asset', src);
-    }
     downloadMap.emitter.dispatchDownload(src);
     if (src.startsWith('data:')) {
         const [assetDetails, assetData] = src.substring('data:'.length).split(',');
@@ -238,7 +232,7 @@ const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition,
     const fileExtension = split.length > 1 && split[split.length - 1]
         ? `.${split[split.length - 1]}`
         : '';
-    const hashedFileName = String((0, no_react_1.random)(`${pathname}${search}`)).replace('0.', '');
+    const hashedFileName = String((0, no_react_1.random)(`${src}${pathname}${search}`)).replace('0.', '');
     const filename = hashedFileName + fileExtension;
     return node_path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
 };

package/dist/assets/download-map.d.ts

@@ -36,6 +36,9 @@ export type DownloadMap = {
     compositorCache: {
         [key: string]: string;
     };
+    preventCleanup: () => void;
+    allowCleanup: () => void;
+    isPreventedFromCleanup: () => boolean;
 };
 export type RenderAssetInfo = {
     assets: TRenderAsset[][];

package/dist/assets/download-map.js

@@ -45,6 +45,7 @@ const makeDownloadMap = () => {
     const dir = (0, tmp_dir_1.tmpDir)(packageJson
         ? `remotion-v${packageJson.version.replace(/\./g, '-')}-assets`
         : 'remotion-assets');
+    let prevented = false;
     return {
         isDownloadingMap: {},
         hasBeenDownloadedMap: {},
@@ -62,10 +63,22 @@ const makeDownloadMap = () => {
         compositingDir: makeAndReturn(dir, 'remotion-compositing-temp-dir'),
         compositorCache: {},
         emitter: new offthread_video_server_1.OffthreadVideoServerEmitter(),
+        preventCleanup: () => {
+            prevented = true;
+        },
+        allowCleanup: () => {
+            prevented = false;
+        },
+        isPreventedFromCleanup: () => {
+            return prevented;
+        },
     };
 };
 exports.makeDownloadMap = makeDownloadMap;
 const cleanDownloadMap = (downloadMap) => {
+    if (downloadMap.isPreventedFromCleanup()) {
+        return;
+    }
     (0, delete_directory_1.deleteDirectory)(downloadMap.downloadDir);
     (0, delete_directory_1.deleteDirectory)(downloadMap.complexFilter);
     (0, delete_directory_1.deleteDirectory)(downloadMap.compositingDir);

package/dist/browser/Connection.js

@@ -29,7 +29,6 @@ exports.CDPSession = exports.CDPSessionEmittedEvents = exports.Connection = void
  * limitations under the License.
  */
 const logger_1 = require("../logger");
-const assert_1 = require("./assert");
 const Errors_1 = require("./Errors");
 const EventEmitter_1 = require("./EventEmitter");
 const ConnectionEmittedEvents = {
@@ -228,7 +227,6 @@ class CDPSession extends EventEmitter_1.EventEmitter {
             }
         }
         else {
-            (0, assert_1.assert)(!object.id);
             this.emit(object.method, object.params);
         }
     }

package/dist/call-ffmpeg.d.ts

@@ -1,4 +1,6 @@
+/// <reference types="node" />
 import execa from 'execa';
+import type { SpawnOptionsWithoutStdio } from 'node:child_process';
 import type { LogLevel } from './log-level';
 export declare const callFf: ({ args, bin, indent, logLevel, options, }: {
     bin: 'ffmpeg' | 'ffprobe';
@@ -7,3 +9,10 @@ export declare const callFf: ({ args, bin, indent, logLevel, options, }: {
     logLevel: LogLevel;
     options?: execa.Options<string> | undefined;
 }) => execa.ExecaChildProcess<string>;
+export declare const callFfNative: ({ args, bin, indent, logLevel, options, }: {
+    bin: 'ffmpeg' | 'ffprobe';
+    args: (string | null)[];
+    indent: boolean;
+    logLevel: LogLevel;
+    options?: SpawnOptionsWithoutStdio | undefined;
+}) => import("child_process").ChildProcessWithoutNullStreams;

package/dist/call-ffmpeg.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callFf = void 0;
+exports.callFfNative = exports.callFf = void 0;
 const execa_1 = __importDefault(require("execa"));
+const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const path_1 = __importDefault(require("path"));
 const get_executable_path_1 = require("./compositor/get-executable-path");
@@ -20,3 +21,14 @@ const callFf = ({ args, bin, indent, logLevel, options, }) => {
     });
 };
 exports.callFf = callFf;
+const callFfNative = ({ 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, node_child_process_1.spawn)(executablePath, args.filter(truthy_1.truthy), {
+        cwd: path_1.default.dirname(executablePath),
+        ...options,
+    });
+};
+exports.callFfNative = callFfNative;

package/dist/check-apple-silicon.d.ts

@@ -0,0 +1,3 @@
+import type { LogLevel } from './log-level';
+export declare const gLibCErrorMessage: (libCString: string) => string | null;
+export declare const checkNodeVersionAndWarnAboutRosetta: (logLevel: LogLevel, indent: boolean) => void;

package/dist/check-apple-silicon.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkNodeVersionAndWarnAboutRosetta = exports.gLibCErrorMessage = void 0;
+const logger_1 = require("./logger");
+const gLibCErrorMessage = (libCString) => {
+    const split = libCString.split('.');
+    if (split.length !== 2) {
+        return null;
+    }
+    if (split[0] === '2' && Number(split[1]) >= 35) {
+        return null;
+    }
+    if (Number(split[0]) > 2) {
+        return null;
+    }
+    return `Rendering videos requires glibc 2.35 or higher. Your system has glibc ${libCString}.`;
+};
+exports.gLibCErrorMessage = gLibCErrorMessage;
+const checkLibCRequirement = (logLevel, indent) => {
+    const { report } = process;
+    if (report) {
+        // @ts-expect-error no types
+        const { glibcVersionRuntime } = report.getReport().header;
+        if (!glibcVersionRuntime) {
+            return;
+        }
+        const error = (0, exports.gLibCErrorMessage)(glibcVersionRuntime);
+        if (error) {
+            logger_1.Log.warn({ logLevel, indent }, error);
+        }
+    }
+};
+const checkNodeVersionAndWarnAboutRosetta = (logLevel, indent) => {
+    const version = process.version.replace('v', '').split('.');
+    const majorVersion = Number(version[0]);
+    const requiredNodeVersion = 16;
+    if (majorVersion < 16) {
+        throw new Error(`Remotion requires at least Node ${requiredNodeVersion}. You currently have ${process.version}. Update your node version to ${requiredNodeVersion} to use Remotion.`);
+    }
+    checkLibCRequirement(logLevel, indent);
+};
+exports.checkNodeVersionAndWarnAboutRosetta = checkNodeVersionAndWarnAboutRosetta;

package/dist/compositor/compose.js

@@ -88,7 +88,10 @@ const callCompositor = (payload, indent, logLevel) => {
         try {
             child.stdin.write(payload, (e) => {
                 if (e) {
-                    reject(e);
+                    if (e instanceof Error && e.message.includes('EPIPE')) {
+                        reject(new Error('Compositor stdin closed unexpectedly,' +
+                            Buffer.concat(stderrChunks).toString('utf-8')));
+                    }
                     return;
                 }
                 child.stdin.end();

package/dist/get-extension-from-codec.d.ts

@@ -1,6 +1,6 @@
 import type { AudioCodec } from './audio-codec';
 import type { Codec } from './codec';
 import type { FileExtension } from './file-extensions';
-export declare const getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">(codec: T, audioCodec: AudioCodec | null) => FileExtension;
-export declare const makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif")[]>;
+export declare const getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">(codec: T, audioCodec: AudioCodec | null) => FileExtension;
+export declare const makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif")[]>;
 export declare const defaultCodecsForFileExtension: Record<FileExtension, Codec>;

package/dist/options/color-space.d.ts

@@ -6,6 +6,6 @@ export declare const colorSpaceOption: {
     description: () => import("react/jsx-runtime").JSX.Element;
     docLink: string;
     ssrName: string;
-    type: "bt709" | "bt2020-ncl" | "default";
+    type: "default" | "bt709" | "bt2020-ncl";
 };
 export declare const validateColorSpace: (option: unknown) => void;

package/dist/pixel-format.d.ts

@@ -2,5 +2,5 @@ import type { Codec } from './codec';
 export declare const validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
 export type PixelFormat = (typeof validPixelFormats)[number];
 export declare const DEFAULT_PIXEL_FORMAT: PixelFormat;
-export declare const validPixelFormatsForCodec: (codec: Codec) => readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"] | ("yuv420p" | "yuv422p" | "yuv444p" | "yuva420p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le")[];
+export declare const validPixelFormatsForCodec: (codec: Codec) => readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"] | ("yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le")[];
 export declare const validateSelectedPixelFormatAndCodecCombination: (pixelFormat: PixelFormat | undefined, codec: Codec) => undefined;

package/dist/prepare-server.js

@@ -83,6 +83,8 @@ const prepareServer = async ({ webpackConfigOrServeUrl, port, remotionRoot, conc
             }
             return close();
         },
+        // This should be kept localhost, even if the server is bound to ::1,
+        // to prevent "Failed to load resource: net::ERR_FAILED  Access to image at 'http://localhost:3000/proxy?src=http%3A%2F%2F%5B%3A%3A%5D%3A3000%2Fpublic%2Fframer.webm&time=0&transparent=false' from origin 'http://[::]:3000' has been blocked by CORS policy: The request client is not a secure context and the resource is in more-private address space `local`".
         serveUrl: `http://localhost:${serverPort}`,
         offthreadPort: serverPort,
         compositor,

package/dist/pure.d.ts

@@ -1,10 +1,10 @@
 export declare const NoReactAPIs: {
     wrapWithErrorHandling: <A extends unknown[], R>(fn: (...args: A) => Promise<R>) => (...args: A) => Promise<R>;
     getExtensionOfFilename: (filename: string | null) => string | null;
-    getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">(codec: T, audioCodec: "opus" | "aac" | "mp3" | "pcm-16" | null) => import("./file-extensions").FileExtension;
-    validateOutputFilename: <T_1 extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
+    getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">(codec: T, audioCodec: "mp3" | "aac" | "pcm-16" | "opus" | null) => import("./file-extensions").FileExtension;
+    validateOutputFilename: <T_1 extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
         codec: T_1;
-        audioCodec: "opus" | "aac" | "mp3" | "pcm-16" | null;
+        audioCodec: "mp3" | "aac" | "pcm-16" | "opus" | null;
         extension: string;
         preferLossless: boolean;
     }) => void;

package/dist/screenshot-task.js

@@ -56,12 +56,13 @@ const screenshotTask = async ({ format, height, omitBackground, page, width, pat
                         width,
                     },
                 captureBeyondViewport: true,
-                optimizeForSpeed: false,
+                optimizeForSpeed: true,
                 // We find that there is a 0.1% framedrop when rendering under memory pressure
                 // which can be circumvented by disabling this option on Lambda.
-                // To be determined: Is this a problem with Lambda, Linux, or the Chrome version
+                // To be determined: Is this a problem with Lambda, or the Chrome version
                 // we are using on Lambda?
-                fromSurface: process.platform !== 'linux',
+                // We already found out that the problem is not a general Linux problem.
+                fromSurface: !process.env.DISABLE_FROM_SURFACE,
             });
             result = value;
         }

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

@@ -11,6 +11,7 @@ const version_1 = require("remotion/version");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
 const convert_assets_to_file_urls_1 = require("./assets/convert-assets-to-file-urls");
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
+const download_map_1 = require("./assets/download-map");
 const audio_codec_1 = require("./audio-codec");
 const call_ffmpeg_1 = require("./call-ffmpeg");
 const codec_1 = require("./codec");
@@ -101,6 +102,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
     // encodingBufferSize is not a bitrate but need to be validated using the same format
     (0, validate_videobitrate_1.validateBitrate)(encodingBufferSize, 'encodingBufferSize');
     (0, validate_1.validateFps)(fps, 'in `stitchFramesToVideo()`', false);
+    assetsInfo.downloadMap.preventCleanup();
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, proResProfile);
     const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
     const shouldRenderAudio = mediaSupport.audio &&
@@ -208,10 +210,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
             }
         });
         (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames);
-        return {
-            getLogs: () => '',
-            task: Promise.resolve(file),
-        };
+        return Promise.resolve(file);
     }
     const ffmpegArgs = [
         ...(preEncodedFileLocation
@@ -269,7 +268,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
         logLevel,
         tag: 'stitchFramesToVideo()',
     }, finalFfmpegString.join(' '));
-    const task = (0, call_ffmpeg_1.callFf)({
+    const task = (0, call_ffmpeg_1.callFfNative)({
         bin: 'ffmpeg',
         args: finalFfmpegString,
         indent,
@@ -278,12 +277,12 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         task.kill();
     });
-    let ffmpegOutput = '';
+    let ffmpegStderr = '';
     let isFinished = false;
     (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
         var _a;
         const str = data.toString();
-        ffmpegOutput += str;
+        ffmpegStderr += str;
         if (onProgress) {
             const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
             // FFMPEG bug: In some cases, FFMPEG does hang after it is finished with it's job
@@ -302,35 +301,37 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
             }
         }
     });
-    return {
-        task: task.then(() => {
-            (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.audioPreprocessing);
-            if (tempFile === null) {
-                (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames);
-                return null;
+    return new Promise((resolve, reject) => {
+        task.once('close', (code, signal) => {
+            if (code === 0) {
+                assetsInfo.downloadMap.allowCleanup();
+                if (tempFile === null) {
+                    (0, download_map_1.cleanDownloadMap)(assetsInfo.downloadMap);
+                    return resolve(null);
+                }
+                node_fs_1.promises
+                    .readFile(tempFile)
+                    .then((f) => {
+                    resolve(f);
+                })
+                    .catch((e) => {
+                    reject(e);
+                })
+                    .finally(() => {
+                    (0, download_map_1.cleanDownloadMap)(assetsInfo.downloadMap);
+                });
             }
-            return node_fs_1.promises
-                .readFile(tempFile)
-                .then((file) => {
-                return Promise.all([
-                    file,
-                    (0, delete_directory_1.deleteDirectory)(node_path_1.default.dirname(tempFile)),
-                    (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames),
-                ]);
-            })
-                .then(([file]) => file);
-        }),
-        getLogs: () => ffmpegOutput,
-    };
+            else {
+                reject(new Error(`FFmpeg quit with code ${code} ${signal ? `(${signal})` : ''} The FFmpeg output was ${ffmpegStderr}`));
+            }
+        });
+    });
 };
 const internalStitchFramesToVideo = async (options) => {
     const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
-    const { task, getLogs } = await innerStitchFramesToVideo(options, remotionRoot);
-    const happyPath = task.catch(() => {
-        throw new Error(getLogs());
-    });
+    const task = await innerStitchFramesToVideo(options, remotionRoot);
     return Promise.race([
-        happyPath,
+        task,
         new Promise((_resolve, reject) => {
             var _a;
             (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {

package/dist/validate-output-filename.d.ts

@@ -1,5 +1,5 @@
 import type { AudioCodec } from './audio-codec';
-export declare const validateOutputFilename: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
+export declare const validateOutputFilename: <T extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
     codec: T;
     audioCodec: AudioCodec | null;
     extension: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.106",
+  "version": "4.0.108",
   "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.106"
+    "remotion": "4.0.108"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.106",
-    "@remotion/compositor-darwin-arm64": "4.0.106",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.106",
-    "@remotion/compositor-linux-arm64-musl": "4.0.106",
-    "@remotion/compositor-linux-x64-gnu": "4.0.106",
-    "@remotion/compositor-win32-x64-msvc": "4.0.106",
-    "@remotion/compositor-linux-x64-musl": "4.0.106"
+    "@remotion/compositor-darwin-arm64": "4.0.108",
+    "@remotion/compositor-darwin-x64": "4.0.108",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.108",
+    "@remotion/compositor-linux-x64-musl": "4.0.108",
+    "@remotion/compositor-win32-x64-msvc": "4.0.108",
+    "@remotion/compositor-linux-x64-gnu": "4.0.108",
+    "@remotion/compositor-linux-arm64-musl": "4.0.108"
   },
   "keywords": [
     "remotion",