@remotion/renderer 3.2.40 → 3.2.41

package/LICENSE.md

@@ -36,6 +36,6 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord.
 
 ## Company license
 
-You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support.
+You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)).
 
 Visit [companies.remotion.dev](https://companies.remotion.dev) for pricing and to buy a license.

package/dist/find-closest-package-json.d.ts

@@ -0,0 +1,2 @@
+export declare const findClosestPackageJson: () => string | null;
+export declare const findRemotionRoot: () => string;

package/dist/find-closest-package-json.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findRemotionRoot = exports.findClosestPackageJson = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const recursionLimit = 5;
+const findClosestPackageJson = () => {
+    let currentDir = process.cwd();
+    let possiblePackageJson = '';
+    for (let i = 0; i < recursionLimit; i++) {
+        possiblePackageJson = path_1.default.join(currentDir, 'package.json');
+        const exists = fs_1.default.existsSync(possiblePackageJson);
+        if (exists) {
+            return possiblePackageJson;
+        }
+        currentDir = path_1.default.dirname(currentDir);
+    }
+    return null;
+};
+exports.findClosestPackageJson = findClosestPackageJson;
+const findRemotionRoot = () => {
+    const closestPackageJson = (0, exports.findClosestPackageJson)();
+    if (closestPackageJson === null) {
+        return process.cwd();
+    }
+    return path_1.default.dirname(closestPackageJson);
+};
+exports.findRemotionRoot = findRemotionRoot;

package/dist/render-frames.js

@@ -31,6 +31,7 @@ const seek_to_frame_1 = require("./seek-to-frame");
 const set_props_and_env_1 = require("./set-props-and-env");
 const truthy_1 = require("./truthy");
 const validate_scale_1 = require("./validate-scale");
+const MAX_RETRIES_PER_FRAME = 1;
 const getComposition = (others) => {
     if ('composition' in others) {
         return others.composition;
@@ -69,7 +70,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
     const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
     const framesToRender = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame);
     const lastFrame = framesToRender[framesToRender.length - 1];
-    const pages = new Array(actualConcurrency).fill(true).map(async () => {
+    const makePage = async () => {
         const page = await puppeteerInstance.newPage();
         pagesArray.push(page);
         await page.setViewport({
@@ -126,7 +127,8 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         });
         page.off('console', logCallback);
         return page;
-    });
+    };
+    const pages = new Array(actualConcurrency).fill(true).map(makePage);
     // If rendering a GIF and skipping frames, we must ensure it starts from 0
     // and then is consecutive so FFMPEG recognizes the sequence
     const countType = everyNthFrame === 1 ? 'actual-frames' : 'from-zero';
@@ -145,15 +147,15 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         stopped = true;
     });
-    const progress = Promise.all(framesToRender.map(async (frame, index) => {
+    const renderFrameWithOptionToReject = async (frame, index, reject) => {
         const pool = await poolPromise;
         const freePage = await pool.acquire();
         if (stopped) {
-            throw new Error('Render was stopped');
+            return reject(new Error('Render was stopped'));
         }
         const startTime = perf_hooks_1.performance.now();
         const errorCallbackOnFrame = (err) => {
-            onError(err);
+            reject(err);
         };
         const cleanupPageError = (0, handle_javascript_exception_1.handleJavascriptException)({
             page: freePage,
@@ -219,13 +221,44 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
                 onError(new Error(`Error while downloading asset: ${err.stack}`));
             });
         });
-        pool.release(freePage);
         framesRendered++;
         onFrameUpdate(framesRendered, frame, perf_hooks_1.performance.now() - startTime);
         cleanupPageError();
         freePage.off('error', errorCallbackOnFrame);
-        return compressedAssets;
-    }));
+        pool.release(freePage);
+    };
+    const renderFrame = (frame, index) => {
+        return new Promise((resolve, reject) => {
+            renderFrameWithOptionToReject(frame, index, reject)
+                .then(() => {
+                resolve();
+            })
+                .catch((err) => {
+                reject(err);
+            });
+        });
+    };
+    const renderFrameAndRetryTargetClose = async (frame, index, retriesLeft, attempt) => {
+        var _a;
+        try {
+            await renderFrame(frame, index);
+        }
+        catch (err) {
+            if (!((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Target closed'))) {
+                throw err;
+            }
+            if (retriesLeft === 0) {
+                console.warn(err, `The browser crashed ${attempt} times while rendering frame ${frame}. Not retrying anymore. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
+                throw err;
+            }
+            console.warn(`The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
+            const pool = await poolPromise;
+            const page = await makePage();
+            pool.release(page);
+            await renderFrameAndRetryTargetClose(frame, index, retriesLeft - 1, attempt + 1);
+        }
+    };
+    const progress = Promise.all(framesToRender.map((frame, index) => renderFrameAndRetryTargetClose(frame, index, MAX_RETRIES_PER_FRAME, 1)));
     const happyPath = progress.then(() => {
         const firstFrameIndex = countType === 'from-zero' ? 0 : framesToRender[0];
         const returnValue = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.40",
+	"version": "3.2.41",
 	"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.40",
+		"remotion": "3.2.41",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "dd204bb0a42d4c6c2988957d399c898e5eba4eba"
+	"gitHead": "017d1f002dfe81d451e4707ca0a58f30e3a080b9"
 }