@remotion/renderer 4.0.0-preload.17 → 4.0.0-spawn.10

package/dist/assets/download-and-map-assets-to-file.d.ts

@@ -2,7 +2,7 @@ import { TAsset } from 'remotion';
 export declare type RenderMediaOnDownload = (src: string) => ((progress: {
     percent: number;
 }) => void) | undefined | void;
-export declare const waitForAssetToBeDownloaded: (src: string) => Promise<string>;
+export declare const waitForAssetToBeDownloaded: (src: string, to: string) => Promise<void>;
 export declare const markAllAssetsAsDownloaded: () => void;
 export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, }: {
     src: string;

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

@@ -13,25 +13,38 @@ const sanitize_filepath_1 = require("./sanitize-filepath");
 const isDownloadingMap = {};
 const hasBeenDownloadedMap = {};
 const listeners = {};
-const waitForAssetToBeDownloaded = (src) => {
-    if (hasBeenDownloadedMap[src]) {
-        return Promise.resolve(hasBeenDownloadedMap[src]);
+const waitForAssetToBeDownloaded = (src, to) => {
+    var _a;
+    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[to]) {
+        return Promise.resolve();
     }
     if (!listeners[src]) {
-        listeners[src] = [];
+        listeners[src] = {};
+    }
+    if (!listeners[src][to]) {
+        listeners[src][to] = [];
     }
     return new Promise((resolve) => {
-        listeners[src].push((to) => resolve(to));
+        listeners[src][to].push(() => resolve());
     });
 };
 exports.waitForAssetToBeDownloaded = waitForAssetToBeDownloaded;
 const notifyAssetIsDownloaded = (src, to) => {
     if (!listeners[src]) {
-        listeners[src] = [];
+        listeners[src] = {};
+    }
+    if (!listeners[src][to]) {
+        listeners[src][to] = [];
+    }
+    listeners[src][to].forEach((fn) => fn());
+    if (!isDownloadingMap[src]) {
+        isDownloadingMap[src] = {};
     }
-    listeners[src].forEach((fn) => fn(to));
-    isDownloadingMap[src] = false;
-    hasBeenDownloadedMap[src] = to;
+    isDownloadingMap[src][to] = false;
+    if (!hasBeenDownloadedMap[src]) {
+        hasBeenDownloadedMap[src] = {};
+    }
+    hasBeenDownloadedMap[src][to] = true;
 };
 const validateMimeType = (mimeType, src) => {
     if (!mimeType.includes('/')) {
@@ -73,13 +86,17 @@ function validateBufferEncoding(potentialEncoding, dataUrl) {
     }
 }
 const downloadAsset = async (src, to, onDownload) => {
-    if (hasBeenDownloadedMap[src]) {
+    var _a, _b;
+    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[to]) {
         return;
     }
-    if (isDownloadingMap[src]) {
-        return (0, exports.waitForAssetToBeDownloaded)(src);
+    if ((_b = isDownloadingMap[src]) === null || _b === void 0 ? void 0 : _b[to]) {
+        return (0, exports.waitForAssetToBeDownloaded)(src, to);
+    }
+    if (!isDownloadingMap[src]) {
+        isDownloadingMap[src] = {};
     }
-    isDownloadingMap[src] = true;
+    isDownloadingMap[src][to] = true;
     const onProgress = onDownload(src);
     (0, ensure_output_directory_1.ensureOutputDirectory)(to);
     if (src.startsWith('data:')) {

package/dist/extract-frame-from-video.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { FfmpegExecutable } from 'remotion';
 import { Readable } from 'stream';
 export declare function streamToString(stream: Readable): Promise<string>;

package/dist/get-compositions.d.ts

@@ -13,5 +13,5 @@ declare type GetCompositionsConfig = {
     ffmpegExecutable?: FfmpegExecutable;
     port?: number | null;
 };
-export declare const getCompositions: (serveUrlOrWebpackUrl: string, config?: GetCompositionsConfig | undefined) => Promise<TCompMetadata[]>;
+export declare const getCompositions: (serveUrlOrWebpackUrl: string, config?: GetCompositionsConfig) => Promise<TCompMetadata[]>;
 export {};

package/dist/get-compositions.js

@@ -28,6 +28,7 @@ const innerGetCompositions = async (serveUrl, page, config, proxyPort) => {
         initialFrame: 0,
         timeoutInMilliseconds: config === null || config === void 0 ? void 0 : config.timeoutInMilliseconds,
         proxyPort,
+        retriesRemaining: 2,
     });
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         page,

package/dist/index.d.ts

@@ -51,7 +51,6 @@ export declare const RenderInternals: {
         getLogs: () => string;
     }>;
     getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "mp4" | "mkv" | "mov" | "webm";
-    makeAssetsDownloadTmpDir: () => string;
     tmpDir: (str: string) => string;
     deleteDirectory: (directory: string) => Promise<void>;
     isServeUrl: (potentialUrl: string) => boolean;

package/dist/index.js

@@ -14,7 +14,6 @@ const get_extension_of_filename_1 = require("./get-extension-of-filename");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const get_local_browser_executable_1 = require("./get-local-browser-executable");
 const is_serve_url_1 = require("./is-serve-url");
-const make_assets_download_dir_1 = require("./make-assets-download-dir");
 const normalize_serve_url_1 = require("./normalize-serve-url");
 const open_browser_1 = require("./open-browser");
 const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
@@ -54,7 +53,6 @@ exports.RenderInternals = {
     normalizeServeUrl: normalize_serve_url_1.normalizeServeUrl,
     spawnFfmpeg: stitch_frames_to_video_1.spawnFfmpeg,
     getFileExtensionFromCodec: get_extension_from_codec_1.getFileExtensionFromCodec,
-    makeAssetsDownloadTmpDir: make_assets_download_dir_1.makeAssetsDownloadTmpDir,
     tmpDir: tmp_dir_1.tmpDir,
     deleteDirectory: delete_directory_1.deleteDirectory,
     isServeUrl: is_serve_url_1.isServeUrl,

package/dist/merge-audio-track.js

@@ -30,8 +30,8 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
         });
         return;
     }
-    // FFMPEG has a limit of 64 tracks that can be merged at once
-    if (files.length > 64) {
+    // In FFMPEG, the total number of left and right tracks that can be merged at one time is limited to 64
+    if (files.length >= 32) {
         const chunked = (0, chunk_1.chunk)(files, 10);
         const tempPath = (0, tmp_dir_1.tmpDir)('remotion-large-audio-mixing');
         const chunkNames = await Promise.all(chunked.map(async (chunkFiles, i) => {

package/dist/offthread-video-server.js

@@ -35,14 +35,15 @@ const startOffthreadVideoServer = ({ ffmpegExecutable, downloadDir, onDownload,
         res.setHeader('access-control-allow-origin', '*');
         res.setHeader('content-type', 'image/jpg');
         const { src, time } = (0, exports.extractUrlAndSourceFromUrl)(req.url);
+        const to = (0, download_and_map_assets_to_file_1.getSanitizedFilenameForAssetUrl)({ downloadDir, src });
         (0, download_and_map_assets_to_file_1.startDownloadForSrc)({ src, downloadDir, onDownload }).catch((err) => {
             onError(new Error(`Error while downloading asset: ${err.stack}`));
         });
-        (0, download_and_map_assets_to_file_1.waitForAssetToBeDownloaded)(src)
-            .then((newSrc) => {
+        (0, download_and_map_assets_to_file_1.waitForAssetToBeDownloaded)(src, to)
+            .then(() => {
             return (0, extract_frame_from_video_1.extractFrameFromVideo)({
                 time,
-                src: newSrc,
+                src: to,
                 ffmpegExecutable,
             });
         })

package/dist/open-browser.d.ts

@@ -10,9 +10,9 @@ export declare type ChromiumOptions = {
 };
 export declare const killAllBrowsers: () => Promise<void>;
 export declare const openBrowser: (browser: Browser, options?: {
-    shouldDumpIo?: boolean | undefined;
-    browserExecutable?: string | null | undefined;
-    chromiumOptions?: ChromiumOptions | undefined;
-    forceDeviceScaleFactor?: number | undefined;
-} | undefined) => Promise<puppeteer.Browser>;
+    shouldDumpIo?: boolean;
+    browserExecutable?: string | null;
+    chromiumOptions?: ChromiumOptions;
+    forceDeviceScaleFactor?: number;
+}) => Promise<puppeteer.Browser>;
 export {};

package/dist/prespawn-ffmpeg.d.ts

@@ -17,5 +17,6 @@ declare type PreSticherOptions = {
 export declare const prespawnFfmpeg: (options: PreSticherOptions) => Promise<{
     task: execa.ExecaChildProcess<string>;
     getLogs: () => string;
+    waitForSpawn: Promise<void>;
 }>;
 export {};

package/dist/prespawn-ffmpeg.js

@@ -73,6 +73,9 @@ const prespawnFfmpeg = async (options) => {
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
     const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', ffmpegString);
+    const waitForSpawn = new Promise((resolve) => {
+        task.on('spawn', () => resolve());
+    });
     let ffmpegOutput = '';
     (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
         const str = data.toString();
@@ -84,6 +87,6 @@ const prespawnFfmpeg = async (options) => {
             }
         }
     });
-    return { task, getLogs: () => ffmpegOutput };
+    return { task, getLogs: () => ffmpegOutput, waitForSpawn };
 };
 exports.prespawnFfmpeg = prespawnFfmpeg;

package/dist/puppeteer-screenshot.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/render-frames.js

@@ -77,6 +77,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             initialFrame,
             timeoutInMilliseconds,
             proxyPort,
+            retriesRemaining: 2,
         });
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             pageFunction: (id) => {
@@ -105,7 +106,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     const assets = new Array(frameCount).fill(undefined);
     await Promise.all(new Array(frameCount)
         .fill(Boolean)
-        .map((x, i) => i)
+        .map((_x, i) => i)
         .map(async (index) => {
         const frame = realFrameRange[0] + index;
         const freePage = await pool.acquire();

package/dist/render-media.js

@@ -168,6 +168,25 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
         encodedDoneIn = Date.now() - stitchStart;
         callUpdate();
     }
+    catch (err) {
+        /**
+         * When an error is thrown in renderFrames(...) (e.g., when delayRender() is used incorrectly), fs.unlinkSync(...) throws an error that the file is locked because ffmpeg is still running, and renderMedia returns it.
+         * Therefore we first kill the FFMPEG process before deleting the file
+         */
+        if (stitcherFfmpeg !== undefined && stitcherFfmpeg.exitCode === null) {
+            const promise = new Promise((resolve) => {
+                setTimeout(() => {
+                    resolve();
+                }, 2000);
+                stitcherFfmpeg.on('close', resolve);
+            });
+            // Can only kill the process once it has spawned, otherwise getting EPIPE error in Node.JS
+            await (preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.waitForSpawn);
+            stitcherFfmpeg.kill();
+            await promise;
+        }
+        throw err;
+    }
     finally {
         if (preEncodedFileLocation !== null &&
             fs_1.default.existsSync(preEncodedFileLocation)) {

package/dist/render-still.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -105,6 +109,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
         initialFrame: frame,
         timeoutInMilliseconds,
         proxyPort,
+        retriesRemaining: 2,
     });
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: (id) => {

package/dist/set-props-and-env.d.ts

@@ -1,5 +1,5 @@
 import { Page } from 'puppeteer-core';
-export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, }: {
+export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, }: {
     inputProps: unknown;
     envVariables: Record<string, string> | undefined;
     page: Page;
@@ -7,4 +7,5 @@ export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl
     initialFrame: number;
     timeoutInMilliseconds: number | undefined;
     proxyPort: number;
+    retriesRemaining: number;
 }) => Promise<void>;

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

@@ -5,7 +5,7 @@ const remotion_1 = require("remotion");
 const normalize_serve_url_1 = require("./normalize-serve-url");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
-const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, }) => {
+const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, }) => {
     (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
     const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : remotion_1.Internals.DEFAULT_PUPPETEER_TIMEOUT;
     page.setDefaultTimeout(actualTimeout);
@@ -32,6 +32,25 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
     }, [proxyPort]);
     const pageRes = await page.goto(urlToVisit);
     const status = pageRes.status();
+    // S3 in rare occasions returns a 500 or 503 error code for GET operations.
+    // Usually it is fixed by retrying.
+    if (status >= 500 && status <= 504 && retriesRemaining > 0) {
+        await new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, 2000);
+        });
+        return (0, exports.setPropsAndEnv)({
+            envVariables,
+            initialFrame,
+            inputProps,
+            page,
+            proxyPort,
+            retriesRemaining: retriesRemaining - 1,
+            serveUrl,
+            timeoutInMilliseconds,
+        });
+    }
     if (status !== 200 &&
         status !== 301 &&
         status !== 302 &&

package/dist/tmp-dir.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "4.0.0-preload.17+14cd6033f",
+	"version": "4.0.0-spawn.10+911177607",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"puppeteer-core": "13.5.1",
-		"remotion": "4.0.0-preload.17+14cd6033f",
+		"remotion": "4.0.0-spawn.10+911177607",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -46,7 +46,7 @@
 		"react": "18.0.0",
 		"react-dom": "18.0.0",
 		"ts-jest": "^27.0.5",
-		"typescript": "^4.5.5"
+		"typescript": "^4.7.0"
 	},
 	"keywords": [
 		"remotion",
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "14cd6033f4ad0fa75af142d54a4cd1a23aff3f21"
+	"gitHead": "911177607ac127d9f4d1c014ad8ae32fd14947dd"
 }