@remotion/renderer 4.0.0-imgloading.2 → 4.0.0-lambda.3

package/dist/provide-screenshot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import puppeteer from 'puppeteer-core';
 import { ImageFormat } from 'remotion';
 export declare const provideScreenshot: ({ page, imageFormat, options, quality, }: {

package/dist/provide-screenshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provide-screenshot.d.ts","sourceRoot":"","sources":["../src/provide-screenshot.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,iBAAiB;UAMvB,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;aAClB;QACR,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KAChB;MACE,QAAQ,MAAM,CAUjB,CAAC"}

package/dist/provide-screenshot.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.provideScreenshot = void 0;
 const screenshot_dom_element_1 = require("./screenshot-dom-element");
-const provideScreenshot = async ({ page, imageFormat, options, quality, }) => {
+const provideScreenshot = ({ page, imageFormat, options, quality, }) => {
     return (0, screenshot_dom_element_1.screenshotDOMElement)({
         page,
         opts: {

package/dist/provide-screenshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provide-screenshot.js","sourceRoot":"","sources":["../src/provide-screenshot.ts"],"names":[],"mappings":";;;AAEA,qEAA8D;AAEvD,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,IAAI,EACJ,WAAW,EACX,OAAO,EACP,OAAO,GASP,EAAmB,EAAE;IACrB,OAAO,IAAA,6CAAoB,EAAC;QAC3B,IAAI;QACJ,IAAI,EAAE;YACL,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,QAAQ,EAAE,kBAAkB;SAC5B;QACD,WAAW;QACX,OAAO;KACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B"}

package/dist/puppeteer-evaluate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"puppeteer-evaluate.d.ts","sourceRoot":"","sources":["../src/puppeteer-evaluate.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,IAAI,EAAW,MAAM,gBAAgB,CAAC;AAmCpE,wBAAsB,0BAA0B,CAAC,UAAU,EAAE,EAC5D,IAAI,EACJ,YAAY,EACZ,KAAK,EACL,IAAI,GACJ,EAAE;IACF,IAAI,EAAE,IAAI,CAAC;IACX,YAAY,EAAE,QAAQ,GAAG,MAAM,CAAC;IAChC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,OAAO,EAAE,CAAC;CAChB,GAAG,OAAO,CAAC,UAAU,CAAC,CAsGtB"}

package/dist/puppeteer-evaluate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"puppeteer-evaluate.js","sourceRoot":"","sources":["../src/puppeteer-evaluate.ts"],"names":[],"mappings":"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"}

package/dist/puppeteer-screenshot.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import { Page, ScreenshotOptions } from 'puppeteer-core';
 export declare const screenshot: (page: Page, options?: ScreenshotOptions) => Promise<Buffer | string | void>;

package/dist/puppeteer-screenshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"puppeteer-screenshot.d.ts","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAIvD,eAAO,MAAM,UAAU,SAChB,IAAI,YACD,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,GAAG,IAAI,CAyFhC,CAAC"}

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/puppeteer-screenshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"puppeteer-screenshot.js","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":"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"}

package/dist/render-frames.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { BrowserExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
+import { BrowserExecutable, FfmpegExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import { BrowserLog } from './browser-log';
 import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import { CancelSignal } from './make-cancel-signal';
 import { ChromiumOptions } from './open-browser';
 import { OnStartData, RenderFramesOutput } from './types';
 declare type ConfigOrComposition = {
@@ -33,6 +34,10 @@ declare type RenderFramesOptions = {
     timeoutInMilliseconds?: number;
     chromiumOptions?: ChromiumOptions;
     scale?: number;
+    ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
+    port?: number | null;
+    cancelSignal?: CancelSignal;
 } & ConfigOrComposition & ServeUrlOrWebpackBundle;
 export declare const renderFrames: (options: RenderFramesOptions) => Promise<RenderFramesOutput>;
 export {};

package/dist/render-frames.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render-frames.d.ts","sourceRoot":"","sources":["../src/render-frames.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAG3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,kBAAkB,EAElB,MAAM,UAAU,CAAC;AAClB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAOzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAC,eAAe,EAAc,MAAM,gBAAgB,CAAC;AAO5D,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAGxD,aAAK,mBAAmB,GACrB;IACA;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC1B,GACD;IACA,WAAW,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEL,aAAK,mBAAmB,GAAG;IAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AA2OzB,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAqF5B,CAAC"}

package/dist/render-frames.js

@@ -33,9 +33,14 @@ const getComposition = (others) => {
     }
     return undefined;
 };
-const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualParallelism, }) => {
+const getPool = async (pages) => {
+    const puppeteerPages = await Promise.all(pages);
+    const pool = new pool_1.Pool(puppeteerPages);
+    return pool;
+};
+const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualParallelism, downloadDir, proxyPort, cancelSignal, }) => {
     if (!puppeteerInstance) {
-        throw new Error('weird');
+        throw new Error('no puppeteer instance passed to innerRenderFrames - internal error');
     }
     if (outputDir) {
         if (!fs_1.default.existsSync(outputDir)) {
@@ -49,7 +54,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     const pages = new Array(actualParallelism).fill(true).map(async () => {
         const page = await puppeteerInstance.newPage();
         pagesArray.push(page);
-        page.setViewport({
+        await page.setViewport({
             width: composition.width,
             height: composition.height,
             deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
@@ -76,6 +81,8 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             serveUrl,
             initialFrame,
             timeoutInMilliseconds,
+            proxyPort,
+            retriesRemaining: 2,
         });
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             pageFunction: (id) => {
@@ -91,24 +98,30 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         page.off('console', logCallback);
         return page;
     });
-    const puppeteerPages = await Promise.all(pages);
-    const pool = new pool_1.Pool(puppeteerPages);
     const [firstFrameIndex, lastFrameIndex] = realFrameRange;
     // Substract one because 100 frames will be 00-99
     // --> 2 digits
     const filePadLength = String(lastFrameIndex).length;
     let framesRendered = 0;
+    const poolPromise = getPool(pages);
     onStart({
         frameCount,
     });
-    const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
     const assets = new Array(frameCount).fill(undefined);
-    await Promise.all(new Array(frameCount)
+    let stopped = false;
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+        stopped = true;
+    });
+    const progress = Promise.all(new Array(frameCount)
         .fill(Boolean)
-        .map((x, i) => i)
+        .map((_x, i) => i)
         .map(async (index) => {
         const frame = realFrameRange[0] + index;
+        const pool = await poolPromise;
         const freePage = await pool.acquire();
+        if (stopped) {
+            throw new Error('Render was stopped');
+        }
         const paddedIndex = String(frame).padStart(filePadLength, '0');
         const errorCallbackOnFrame = (err) => {
             onError(err);
@@ -122,6 +135,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
         if (imageFormat !== 'none') {
             if (onFrameBuffer) {
+                const id = remotion_1.Internals.perf.startPerfMeasure('save');
                 const buffer = await (0, provide_screenshot_1.provideScreenshot)({
                     page: freePage,
                     imageFormat,
@@ -131,6 +145,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
                         output: undefined,
                     },
                 });
+                remotion_1.Internals.perf.stopPerfMeasure(id);
                 onFrameBuffer(buffer, frame);
             }
             else {
@@ -163,7 +178,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
                 asset,
                 downloadDir,
-                onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
+                onDownload,
             }).catch((err) => {
                 onError(new Error(`Error while downloading asset: ${err.stack}`));
             });
@@ -175,19 +190,29 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         freePage.off('error', errorCallbackOnFrame);
         return compressedAssets;
     }));
-    const returnValue = {
-        assetsInfo: {
-            assets,
-            downloadDir,
-            firstFrameIndex,
-            imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
-        },
-        frameCount,
-    };
-    return returnValue;
+    const happyPath = progress.then(() => {
+        const returnValue = {
+            assetsInfo: {
+                assets,
+                downloadDir,
+                firstFrameIndex,
+                imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
+            },
+            frameCount,
+        };
+        return returnValue;
+    });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+                reject(new Error('renderFrames() got cancelled'));
+            });
+        }),
+    ]);
 };
-const renderFrames = async (options) => {
-    var _a, _b, _c;
+const renderFrames = (options) => {
+    var _a, _b, _c, _d;
     const composition = getComposition(options);
     if (!composition) {
         throw new Error('No `composition` option has been specified for renderFrames()');
@@ -202,25 +227,54 @@ const renderFrames = async (options) => {
     const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
     remotion_1.Internals.validateQuality(options.quality);
     (0, validate_scale_1.validateScale)(options.scale);
-    const { closeServer, serveUrl } = await (0, prepare_server_1.prepareServer)(selectedServeUrl);
-    const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
+    const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
         shouldDumpIo: options.dumpBrowserLogs,
         browserExecutable: options.browserExecutable,
         chromiumOptions: options.chromiumOptions,
         forceDeviceScaleFactor: (_b = options.scale) !== null && _b !== void 0 ? _b : 1,
-    }));
-    const actualParallelism = (0, get_concurrency_1.getActualConcurrency)((_c = options.parallelism) !== null && _c !== void 0 ? _c : null);
-    const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance, actualParallelism);
+    });
+    const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
+    const onDownload = (_c = options.onDownload) !== null && _c !== void 0 ? _c : (() => () => undefined);
+    const actualParallelism = (0, get_concurrency_1.getActualConcurrency)((_d = options.parallelism) !== null && _d !== void 0 ? _d : null);
     const openedPages = [];
     return new Promise((resolve, reject) => {
-        innerRenderFrames({
-            ...options,
-            puppeteerInstance: browserInstance,
-            onError: (err) => reject(err),
-            pagesArray: openedPages,
-            serveUrl,
-            composition,
-            actualParallelism,
+        var _a, _b, _c;
+        const cleanup = [];
+        const onError = (err) => reject(err);
+        Promise.all([
+            (0, prepare_server_1.prepareServer)({
+                webpackConfigOrServeUrl: selectedServeUrl,
+                downloadDir,
+                onDownload,
+                onError,
+                ffmpegExecutable: (_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : null,
+                ffprobeExecutable: (_b = options.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
+                port: (_c = options.port) !== null && _c !== void 0 ? _c : null,
+            }),
+            browserInstance,
+        ])
+            .then(([{ serveUrl, closeServer, offthreadPort }, puppeteerInstance]) => {
+            var _a;
+            const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(puppeteerInstance, actualParallelism);
+            cleanup.push(stopCycling);
+            (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+                stopCycling();
+                closeServer();
+            });
+            cleanup.push(closeServer);
+            const renderFramesProm = innerRenderFrames({
+                ...options,
+                puppeteerInstance,
+                onError,
+                pagesArray: openedPages,
+                serveUrl,
+                composition,
+                actualParallelism,
+                onDownload,
+                downloadDir,
+                proxyPort: offthreadPort,
+            });
+            return renderFramesProm;
         })
             .then((res) => resolve(res))
             .catch((err) => reject(err))
@@ -234,12 +288,17 @@ const renderFrames = async (options) => {
                 });
             }
             else {
-                browserInstance.close().catch((err) => {
+                Promise.resolve(browserInstance)
+                    .then((puppeteerInstance) => {
+                    return puppeteerInstance.close();
+                })
+                    .catch((err) => {
                     console.log('Unable to close browser', err);
                 });
             }
-            stopCycling();
-            closeServer();
+            cleanup.forEach((c) => {
+                c();
+            });
         });
     });
 };

package/dist/render-frames.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"render-frames.js","sourceRoot":"","sources":["../src/render-frames.ts"],"names":[],"mappings":"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"}

package/dist/render-media.d.ts

@@ -1,8 +1,9 @@
 import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
+import { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import { BrowserLog } from './browser-log';
 import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import { CancelSignal } from './make-cancel-signal';
 import { ChromiumOptions } from './open-browser';
 import { OnStartData } from './types';
 export declare type StitchingState = 'encoding' | 'muxing';
@@ -22,6 +23,7 @@ export declare type RenderMediaOptions = {
     crf?: number | null;
     imageFormat?: 'png' | 'jpeg' | 'none';
     ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
     pixelFormat?: PixelFormat;
     envVariables?: Record<string, string>;
     quality?: number;
@@ -37,5 +39,13 @@ export declare type RenderMediaOptions = {
     timeoutInMilliseconds?: number;
     chromiumOptions?: ChromiumOptions;
     scale?: number;
+    port?: number | null;
+    cancelSignal?: CancelSignal;
+    browserExecutable?: BrowserExecutable;
 } & ServeUrlOrWebpackBundle;
-export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }: RenderMediaOptions) => Promise<void>;
+/**
+ *
+ * @description Render a video from a composition
+ * @link https://www.remotion.dev/docs/renderer/render-media
+ */
+export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }: RenderMediaOptions) => Promise<void>;

package/dist/render-media.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAOzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAK/C,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAIpC,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,gUAyBrB,kBAAkB,kBAoLpB,CAAC"}

package/dist/render-media.js

@@ -16,6 +16,7 @@ const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_extension_of_filename_1 = require("./get-extension-of-filename");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
+const make_cancel_signal_1 = require("./make-cancel-signal");
 const prespawn_ffmpeg_1 = require("./prespawn-ffmpeg");
 const render_frames_1 = require("./render-frames");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
@@ -23,8 +24,12 @@ const tmp_dir_1 = require("./tmp-dir");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
-const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }) => {
-    var _a;
+/**
+ *
+ * @description Render a video from a composition
+ * @link https://www.remotion.dev/docs/renderer/render-media
+ */
+const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }) => {
     remotion_1.Internals.validateQuality(quality);
     if (typeof crf !== 'undefined' && crf !== null) {
         remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
@@ -39,6 +44,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
     let renderedFrames = 0;
     let renderedDoneIn = null;
     let encodedDoneIn = null;
+    let cancelled = false;
     const renderStart = Date.now();
     const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
     const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
@@ -48,23 +54,31 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
         : null;
     const outputDir = parallelEncoding
         ? null
-        : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
+        : fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
     (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
         codec,
         height: composition.height,
         scale: scale !== null && scale !== void 0 ? scale : 1,
         width: composition.width,
     });
-    try {
-        const callUpdate = () => {
-            onProgress === null || onProgress === void 0 ? void 0 : onProgress({
-                encodedDoneIn,
-                encodedFrames,
-                renderedDoneIn,
-                renderedFrames,
-                stitchStage,
-            });
-        };
+    const callUpdate = () => {
+        onProgress === null || onProgress === void 0 ? void 0 : onProgress({
+            encodedDoneIn,
+            encodedFrames,
+            renderedDoneIn,
+            renderedFrames,
+            stitchStage,
+        });
+    };
+    const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
+    const cancelRenderFrames = (0, make_cancel_signal_1.makeCancelSignal)();
+    const cancelPrestitcher = (0, make_cancel_signal_1.makeCancelSignal)();
+    const cancelStitcher = (0, make_cancel_signal_1.makeCancelSignal)();
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+        cancelRenderFrames.cancel();
+    });
+    const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish } = (0, ensure_frames_in_order_1.ensureFramesInOrder)(realFrameRange);
+    const createPrestitcherIfNecessary = async () => {
         if (preEncodedFileLocation) {
             preStitcher = await (0, prespawn_ffmpeg_1.prespawnFfmpeg)({
                 width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
@@ -82,12 +96,27 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
                 verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
                 ffmpegExecutable,
                 imageFormat: actualImageFormat,
+                signal: cancelPrestitcher.cancelSignal,
             });
             stitcherFfmpeg = preStitcher.task;
         }
-        const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
-        const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)(realFrameRange);
-        const { assetsInfo } = await (0, render_frames_1.renderFrames)({
+    };
+    const waitForPrestitcherIfNecessary = async () => {
+        var _a;
+        if (stitcherFfmpeg) {
+            await waitForFinish();
+            (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
+            try {
+                await stitcherFfmpeg;
+            }
+            catch (err) {
+                throw new Error(preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.getLogs());
+            }
+        }
+    };
+    const happyPath = createPrestitcherIfNecessary()
+        .then(() => {
+        const renderFramesProc = (0, render_frames_1.renderFrames)({
             config: composition,
             onFrameUpdate: (frame) => {
                 renderedFrames = frame;
@@ -110,7 +139,12 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
                 ? async (buffer, frame) => {
                     var _a;
                     await waitForRightTimeOfFrameToBeInserted(frame);
+                    if (cancelled) {
+                        return;
+                    }
+                    const id = remotion_1.Internals.perf.startPerfMeasure('piping');
                     (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
+                    remotion_1.Internals.perf.stopPerfMeasure(id);
                     setFrameToStitch(frame + 1);
                 }
                 : undefined,
@@ -121,55 +155,94 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
             timeoutInMilliseconds,
             chromiumOptions,
             scale,
+            ffmpegExecutable,
+            ffprobeExecutable,
+            browserExecutable,
+            port,
+            cancelSignal: cancelRenderFrames.cancelSignal,
         });
-        if (stitcherFfmpeg) {
-            await waitForFinish();
-            (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
-            try {
-                await stitcherFfmpeg;
-            }
-            catch (err) {
-                throw new Error(preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.getLogs());
-            }
-        }
+        return renderFramesProc;
+    })
+        .then((renderFramesReturn) => {
+        return Promise.all([renderFramesReturn, waitForPrestitcherIfNecessary()]);
+    })
+        .then(([{ assetsInfo }]) => {
         renderedDoneIn = Date.now() - renderStart;
         callUpdate();
         (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
         const stitchStart = Date.now();
-        await (0, stitch_frames_to_video_1.stitchFramesToVideo)({
-            width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
-            height: composition.height * (scale !== null && scale !== void 0 ? scale : 1),
-            fps: composition.fps,
-            outputLocation,
-            internalOptions: {
-                preEncodedFileLocation,
-                imageFormat: actualImageFormat,
-            },
-            force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
-            pixelFormat,
-            codec,
-            proResProfile,
-            crf,
-            assetsInfo,
-            ffmpegExecutable,
-            onProgress: (frame) => {
-                stitchStage = 'muxing';
-                encodedFrames = frame;
-                callUpdate();
-            },
-            onDownload,
-            verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
-            dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
-        });
+        return Promise.all([
+            (0, stitch_frames_to_video_1.stitchFramesToVideo)({
+                width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
+                height: composition.height * (scale !== null && scale !== void 0 ? scale : 1),
+                fps: composition.fps,
+                outputLocation,
+                internalOptions: {
+                    preEncodedFileLocation,
+                    imageFormat: actualImageFormat,
+                },
+                force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
+                pixelFormat,
+                codec,
+                proResProfile,
+                crf,
+                assetsInfo,
+                ffmpegExecutable,
+                ffprobeExecutable,
+                onProgress: (frame) => {
+                    stitchStage = 'muxing';
+                    encodedFrames = frame;
+                    callUpdate();
+                },
+                onDownload,
+                verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+                dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
+                cancelSignal: cancelStitcher.cancelSignal,
+            }),
+            stitchStart,
+        ]);
+    })
+        .then(([, stitchStart]) => {
         encodedFrames = (0, get_duration_from_frame_range_1.getDurationFromFrameRange)(frameRange !== null && frameRange !== void 0 ? frameRange : null, composition.durationInFrames);
         encodedDoneIn = Date.now() - stitchStart;
         callUpdate();
-    }
-    finally {
+    })
+        .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
+         */
+        cancelled = true;
+        cancelRenderFrames.cancel();
+        cancelStitcher.cancel();
+        cancelPrestitcher.cancel();
+        if (stitcherFfmpeg !== undefined && stitcherFfmpeg.exitCode === null) {
+            const promise = new Promise((resolve) => {
+                setTimeout(() => {
+                    resolve();
+                }, 2000);
+                stitcherFfmpeg.on('close', resolve);
+            });
+            stitcherFfmpeg.kill();
+            return promise.then(() => {
+                throw err;
+            });
+        }
+        throw err;
+    })
+        .finally(() => {
         if (preEncodedFileLocation !== null &&
             fs_1.default.existsSync(preEncodedFileLocation)) {
             fs_1.default.unlinkSync(preEncodedFileLocation);
         }
-    }
+    });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+                reject(new Error('renderMedia() got cancelled'));
+            });
+        }),
+    ]);
 };
 exports.renderMedia = renderMedia;