@remotion/renderer 3.2.44 → 3.3.0

package/dist/screenshot-task.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._screenshotTask = void 0;
+exports.screenshotTask = void 0;
 const fs_1 = __importDefault(require("fs"));
 const perf_1 = require("./perf");
-const _screenshotTask = async (page, format, options) => {
+const screenshotTask = async (page, format, options) => {
     var _a;
     const client = page._client();
     const target = page.target();
@@ -51,4 +51,4 @@ const _screenshotTask = async (page, format, options) => {
         throw err;
     }
 };
-exports._screenshotTask = _screenshotTask;
+exports.screenshotTask = screenshotTask;

package/dist/seek-to-frame.d.ts

@@ -1,4 +1,5 @@
 import type { Page } from './browser/BrowserPage';
+export declare const waitForReady: (page: Page) => Promise<unknown>;
 export declare const seekToFrame: ({ frame, page, }: {
     frame: number;
     page: Page;

package/dist/seek-to-frame.js

@@ -1,9 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.seekToFrame = void 0;
+exports.seekToFrame = exports.waitForReady = void 0;
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
+const waitForReady = (page) => {
+    return Promise.race([
+        new Promise((_, reject) => {
+            page.on("disposed" /* PageEmittedEvents.Disposed */, () => {
+                reject(new Error('Target closed (page disposed)'));
+            });
+        }),
+        new Promise((_, reject) => {
+            page.browser.on("closed-silent" /* BrowserEmittedEvents.ClosedSilent */, () => {
+                reject(new Error('Target closed'));
+            });
+        }),
+        page
+            .mainFrame()
+            ._mainWorld.waitForFunction(page.browser, 'window.ready === true')
+            .catch((err) => {
+            throw err;
+        }),
+    ]);
+};
+exports.waitForReady = waitForReady;
 const seekToFrame = async ({ frame, page, }) => {
-    await page.waitForFunction(page.browser, 'window.ready === true');
+    await (0, exports.waitForReady)(page);
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: (f) => {
             window.remotion_setFrame(f);
@@ -12,7 +33,7 @@ const seekToFrame = async ({ frame, page, }) => {
         frame,
         page,
     });
-    await page.waitForFunction(page.browser, 'window.ready === true');
+    await (0, exports.waitForReady)(page);
     await page.evaluateHandle('document.fonts.ready');
 };
 exports.seekToFrame = seekToFrame;

package/dist/serve-static.d.ts

@@ -8,6 +8,7 @@ export declare const serveStatic: (path: string | null, options: {
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 }) => Promise<{
     port: number;
     close: () => Promise<void>;

package/dist/serve-static.js

@@ -17,6 +17,7 @@ const serveStatic = async (path, options) => {
         onDownload: options.onDownload,
         onError: options.onError,
         downloadMap: options.downloadMap,
+        remotionRoot: options.remotionRoot,
     });
     try {
         const connections = {};

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { RenderAssetInfo } from './assets/download-map';
 import type { Codec } from './codec';
@@ -36,4 +37,10 @@ export declare type StitcherOptions = {
     enforceAudioTrack?: boolean;
     ffmpegOverride?: FfmpegOverrideFn;
 };
+declare type ReturnType = {
+    task: Promise<Buffer | null>;
+    getLogs: () => string;
+};
+export declare const spawnFfmpeg: (options: StitcherOptions, remotionRoot: string) => Promise<ReturnType>;
 export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<Buffer | null>;
+export {};

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stitchFramesToVideo = void 0;
+exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = __importDefault(require("fs"));
 const promises_1 = require("fs/promises");
@@ -17,6 +17,8 @@ const codec_supports_media_1 = require("./codec-supports-media");
 const convert_number_of_gif_loops_to_ffmpeg_1 = require("./convert-number-of-gif-loops-to-ffmpeg");
 const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 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");
@@ -34,7 +36,7 @@ const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
 const packageJson = fs_1.default.existsSync(packageJsonPath)
     ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
-const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, remotionRoot, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
@@ -59,6 +61,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
             expectedFrames,
             fps,
             downloadMap,
+            remotionRoot,
         });
         preprocessProgress[index] = 1;
         updateProgress();
@@ -71,6 +74,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
         outName,
         numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
         downloadMap,
+        remotionRoot,
     });
     (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     onProgress(1);
@@ -79,8 +83,8 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     });
     return outName;
 };
-const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+const spawnFfmpeg = async (options, remotionRoot) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : codec_1.DEFAULT_CODEC;
@@ -98,7 +102,7 @@ const spawnFfmpeg = async (options) => {
     (0, validate_videobitrate_1.validateBitrate)(options.videoBitrate, 'videoBitrate');
     remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', false);
     const pixelFormat = (_b = options.pixelFormat) !== null && _b !== void 0 ? _b : pixel_format_1.DEFAULT_PIXEL_FORMAT;
-    await (0, validate_ffmpeg_1.validateFfmpeg)((_c = options.ffmpegExecutable) !== null && _c !== void 0 ? _c : null);
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_c = options.ffmpegExecutable) !== null && _c !== void 0 ? _c : null, remotionRoot, 'ffmpeg');
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
     const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
@@ -150,28 +154,29 @@ const spawnFfmpeg = async (options) => {
             ffprobeExecutable: (_g = options.ffprobeExecutable) !== null && _g !== void 0 ? _g : null,
             onProgress: (prog) => updateProgress(prog, 0),
             downloadMap: options.assetsInfo.downloadMap,
+            remotionRoot,
         })
         : null;
     if (mediaSupport.audio && !mediaSupport.video) {
         if (!audioCodecName) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
-        const ffmpegTask = (0, execa_1.default)('ffmpeg', [
+        const ffmpegTask = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_h = options.ffmpegExecutable) !== null && _h !== void 0 ? _h : null, remotionRoot, 'ffmpeg'), [
             '-i',
             audio,
             '-c:a',
             audioCodecName,
             // Set bitrate up to 320k, for aac it might effectively be lower
             '-b:a',
-            (_h = options.audioBitrate) !== null && _h !== void 0 ? _h : '320k',
+            (_j = options.audioBitrate) !== null && _j !== void 0 ? _j : '320k',
             options.force ? '-y' : null,
-            (_j = options.outputLocation) !== null && _j !== void 0 ? _j : tempFile,
+            (_k = options.outputLocation) !== null && _k !== void 0 ? _k : tempFile,
         ].filter(remotion_1.Internals.truthy));
-        (_k = options.cancelSignal) === null || _k === void 0 ? void 0 : _k.call(options, () => {
+        (_l = options.cancelSignal) === null || _l === void 0 ? void 0 : _l.call(options, () => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, expectedFrames);
+        (_m = options.onProgress) === null || _m === void 0 ? void 0 : _m.call(options, expectedFrames);
         if (audio) {
             await (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(audio));
         }
@@ -195,8 +200,8 @@ const spawnFfmpeg = async (options) => {
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
-            ? [['-i', (_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation]]
+        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
+            ? [['-i', (_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
@@ -204,16 +209,16 @@ const spawnFfmpeg = async (options) => {
                 ['-i', options.assetsInfo.imageSequenceName],
             ]),
         audio ? ['-i', audio] : null,
-        ((_p = options.numberOfGifLoops) !== null && _p !== void 0 ? _p : null) === null
+        ((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null) === null
             ? null
             : [
                 '-loop',
-                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null),
+                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_r = options.numberOfGifLoops) !== null && _r !== void 0 ? _r : null),
             ],
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_r = options.internalOptions) === null || _r === void 0 ? void 0 : _r.preEncodedFileLocation)
+        ...(((_s = options.internalOptions) === null || _s === void 0 ? void 0 : _s.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -239,7 +244,7 @@ const spawnFfmpeg = async (options) => {
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
         options.force ? '-y' : null,
-        (_s = options.outputLocation) !== null && _s !== void 0 ? _s : tempFile,
+        (_t = options.outputLocation) !== null && _t !== void 0 ? _t : tempFile,
     ];
     if (options.verbose) {
         console.log('Generated FFMPEG command:');
@@ -253,15 +258,15 @@ const spawnFfmpeg = async (options) => {
         console.log('Generated final FFMPEG command:');
         console.log(finalFfmpegString);
     }
-    const task = (0, execa_1.default)((_t = options.ffmpegExecutable) !== null && _t !== void 0 ? _t : 'ffmpeg', finalFfmpegString, {
+    const task = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_u = options.ffmpegExecutable) !== null && _u !== void 0 ? _u : null, remotionRoot, 'ffmpeg'), finalFfmpegString, {
         cwd: options.dir,
     });
-    (_u = options.cancelSignal) === null || _u === void 0 ? void 0 : _u.call(options, () => {
+    (_v = options.cancelSignal) === null || _v === void 0 ? void 0 : _v.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_v = task.stderr) === null || _v === void 0 ? void 0 : _v.on('data', (data) => {
+    (_w = task.stderr) === null || _w === void 0 ? void 0 : _w.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -303,8 +308,10 @@ const spawnFfmpeg = async (options) => {
         getLogs: () => ffmpegOutput,
     };
 };
+exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
-    const { task, getLogs } = await spawnFfmpeg(options);
+    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options, remotionRoot);
     const happyPath = task.catch(() => {
         throw new Error(getLogs());
     });

package/dist/validate-ffmpeg.d.ts

@@ -1,5 +1,7 @@
-export declare const binaryExists: (name: 'ffmpeg' | 'brew', localFFmpeg: string | null) => boolean;
+export declare const customExecutableExists: (localExecutable: string) => boolean;
+export declare const binaryExists: (name: 'ffmpeg' | 'ffprobe') => boolean;
 export declare const checkAndValidateFfmpegVersion: (options: {
     ffmpegExecutable: string | null;
+    remotionRoot: string;
 }) => Promise<void>;
-export declare const validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
+export declare const validateFfmpeg: (customFfmpegBinary: string | null, remotionRoot: string, binary: 'ffmpeg' | 'ffprobe') => Promise<void>;

package/dist/validate-ffmpeg.js

@@ -3,25 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFfmpeg = exports.checkAndValidateFfmpegVersion = exports.binaryExists = void 0;
+exports.validateFfmpeg = exports.checkAndValidateFfmpegVersion = exports.binaryExists = exports.customExecutableExists = void 0;
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const warn_about_ffmpeg_version_1 = require("./warn-about-ffmpeg-version");
 const existsMap = {};
-const binaryExists = (name, localFFmpeg) => {
-    if (typeof existsMap[name] !== 'undefined') {
-        return existsMap[name];
+const customExecutableExists = (localExecutable) => {
+    try {
+        (0, fs_1.statSync)(localExecutable);
+        existsMap[localExecutable] = true;
     }
-    if (name === 'ffmpeg' && localFFmpeg) {
-        try {
-            (0, fs_1.statSync)(localFFmpeg);
-            existsMap[name] = true;
-        }
-        catch (err) {
-            existsMap[name] = false;
-        }
+    catch (err) {
+        existsMap[localExecutable] = false;
+    }
+    return existsMap[localExecutable];
+};
+exports.customExecutableExists = customExecutableExists;
+const binaryExists = (name) => {
+    if (typeof existsMap[name] !== 'undefined') {
         return existsMap[name];
     }
     const isWin = os_1.default.platform() === 'win32';
@@ -37,52 +38,40 @@ const binaryExists = (name, localFFmpeg) => {
     }
 };
 exports.binaryExists = binaryExists;
-const isHomebrewInstalled = () => {
-    return (0, exports.binaryExists)('brew', null);
-};
 const checkAndValidateFfmpegVersion = async (options) => {
     const ffmpegVersion = await (0, ffmpeg_flags_1.getFfmpegVersion)({
         ffmpegExecutable: options.ffmpegExecutable,
+        remotionRoot: options.remotionRoot,
     });
     const buildConf = await (0, ffmpeg_flags_1.getFfmpegBuildInfo)({
         ffmpegExecutable: options.ffmpegExecutable,
+        remotionRoot: options.remotionRoot,
     });
     (0, warn_about_ffmpeg_version_1.warnAboutFfmpegVersion)({ ffmpegVersion, buildConf });
 };
 exports.checkAndValidateFfmpegVersion = checkAndValidateFfmpegVersion;
-const validateFfmpeg = async (customFfmpegBinary) => {
-    if (process.platform === 'linux' && (0, fs_1.existsSync)('/opt/bin/ffmpeg')) {
-        return Promise.resolve();
+const validateFfmpeg = async (customFfmpegBinary, remotionRoot, binary) => {
+    const ffmpegExists = (0, exports.binaryExists)(binary);
+    if (ffmpegExists) {
+        return;
     }
-    const ffmpegExists = (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
-    if (!ffmpegExists) {
-        if (customFfmpegBinary) {
-            console.error('FFmpeg executable not found:');
-            console.error(customFfmpegBinary);
-            throw new Error('FFmpeg not found');
-        }
-        console.error('It looks like FFMPEG is not installed');
-        if (os_1.default.platform() === 'darwin' && isHomebrewInstalled()) {
-            console.error('Run `brew install ffmpeg` to install ffmpeg');
-        }
-        else if (os_1.default.platform() === 'win32') {
-            console.error('1. Install FFMPEG for Windows here:');
-            console.error('https://github.com/adaptlearning/adapt_authoring/wiki/Installing-FFmpeg#installing-ffmpeg-in-windows');
-            console.error('2. Add FFMPEG to your PATH');
-            console.error('  a. Go to the settings app.');
-            console.error('  b. Click System.');
-            console.error('  c. Click About.');
-            console.error('  d. Click Advanced system settings.');
-            console.error('  e. Click Environment variables.');
-            console.error('  f. Search for PATH environemnt variable, click edit and the folder where you installed FFMPEG.');
-            console.error('  g. Important: Restart your terminal completely to apply the new PATH.');
-            console.error('3. Re-run this command.');
+    if (customFfmpegBinary) {
+        if (!(0, exports.customExecutableExists)(customFfmpegBinary)) {
+            throw new Error('Custom FFmpeg executable not found: ' + customFfmpegBinary);
         }
-        else {
-            console.error('See https://github.com/adaptlearning/adapt_authoring/wiki/Installing-FFmpeg on how to install FFMPEG.');
-        }
-        throw new Error('FFmpeg not found');
+        return;
+    }
+    if (process.platform === 'linux' && (0, fs_1.existsSync)(ffmpeg_flags_1.lambdaFfmpegPaths[binary])) {
+        return;
+    }
+    if ((0, ffmpeg_flags_1.ffmpegInNodeModules)(remotionRoot, binary)) {
+        return;
+    }
+    const binaryUrl = (0, ffmpeg_flags_1.getBinaryDownloadUrl)(binary);
+    if (binaryUrl) {
+        await (0, ffmpeg_flags_1.downloadBinary)(remotionRoot, binaryUrl.url, 'ffmpeg');
+        return (0, exports.validateFfmpeg)(customFfmpegBinary, remotionRoot, binary);
     }
-    await (0, exports.checkAndValidateFfmpegVersion)({ ffmpegExecutable: customFfmpegBinary });
+    throw new Error(`${binary} could not be installed automatically. Your architecture and OS combination (os = ${os_1.default.platform()}, arch = ${process.arch}) is not supported. Please install ${binary} manually and add "${binary}" to your PATH.`);
 };
 exports.validateFfmpeg = validateFfmpeg;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.44",
+	"version": "3.3.0",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.2.44",
+		"remotion": "3.3.0",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "443b4b387b78905e747ebe69b3b91ee85966796d"
+	"gitHead": "29322c95729df0229eecc5f674d019145a783b46"
 }