@remotion/lambda 4.0.10 → 4.0.12

package/dist/cli/log.d.ts

@@ -2,24 +2,24 @@ export declare const Log: {
     verbose: (message?: any, ...optionalParams: any[]) => void;
     verboseAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     } & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;
     infoAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     }, message?: any, ...optionalParams: any[]) => void;
     warn: (message?: any, ...optionalParams: any[]) => void;
     warnAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     }, message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
     errorAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     } & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;

package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts

@@ -3,8 +3,5 @@ export declare const planFrameRanges: ({ framesPerLambda, frameRange, everyNthFr
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [
-        number,
-        number
-    ][];
+    chunks: [number, number][];
 };

package/dist/functions/helpers/concat-videos.js

@@ -79,7 +79,12 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                 console.log('Checking for finish... ', Object.keys(downloaded), expectedFiles + ' files expected');
                 if (areAllFilesDownloaded) {
                     console.log('All files are downloaded!');
-                    resolve(filesInBucket.map((file) => getChunkDownloadOutputLocation({ outdir, file })));
+                    resolve(
+                    // Need to use downloaded variable, not filesInBucket
+                    // as it may be out of date
+                    Object.keys(downloaded)
+                        .sort()
+                        .map((file) => getChunkDownloadOutputLocation({ outdir, file })));
                 }
             };
             console.log('Found ', filesInBucket);
@@ -108,7 +113,7 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                         region,
                         expectedBucketOwner,
                     });
-                    console.log('Successfully downloaded', key);
+                    renderer_1.RenderInternals.Log.info('Successfully downloaded', key);
                     downloadTimer.end();
                     downloaded[key] = true;
                     checkFinish();

package/dist/functions/helpers/get-current-region.d.ts

@@ -1 +1 @@
-export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-south-1" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "af-south-1" | "ap-south-1" | "ap-east-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "me-south-1" | "sa-east-1";
+export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "ap-south-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "sa-east-1" | "eu-south-1" | "af-south-1" | "ap-east-1" | "me-south-1";

package/dist/functions/launch.js

@@ -373,7 +373,14 @@ const innerLaunchHandler = async (params, options) => {
         else {
             console.log('No webhook specified');
         }
-        throw new Error('Stopping Lambda function because error occurred: ' + errors[0].stack);
+        const firstError = errors[0];
+        if (firstError.chunk !== null) {
+            throw new Error(`Stopping Lambda function because error occurred while rendering chunk ${firstError.chunk}:\n${errors[0].stack
+                .split('\n')
+                .map((s) => `   ${s}`)
+                .join('\n')}`);
+        }
+        throw new Error(`Stopping Lambda function because error occurred: ${errors[0].stack}`);
     };
     const fps = comp.fps / params.everyNthFrame;
     const outdir = (0, node_path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');

package/dist/functions/renderer.js

@@ -47,6 +47,7 @@ const renderHandler = async (params, options, logs) => {
     if (!params.frameRange) {
         throw new Error('must pass framerange');
     }
+    renderer_1.RenderInternals.Log.verbose(`Rendering frames ${params.frameRange[0]}-${params.frameRange[1]} in this Lambda function`);
     const start = Date.now();
     const chunkTimingData = {
         timings: {},
@@ -79,9 +80,8 @@ const renderHandler = async (params, options, logs) => {
             serializedInputPropsWithCustomSchema,
             frameRange: params.frameRange,
             onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
-                if (renderedFrames % 5 === 0 &&
-                    renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
-                    console.log(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                if (renderedFrames % 5 === 0) {
+                    renderer_1.RenderInternals.Log.info(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
                     (0, chunk_progress_1.writeLambdaInitializedFile)({
                         attempt: params.attempt,
                         bucketName: params.bucketName,
@@ -90,10 +90,13 @@ const renderHandler = async (params, options, logs) => {
                         framesRendered: renderedFrames,
                         renderId: params.renderId,
                     }).catch((err) => {
-                        console.log(err);
+                        console.log('Could not write progress', err);
                         return reject(err);
                     });
                 }
+                else {
+                    renderer_1.RenderInternals.Log.verbose(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                }
                 const allFrames = renderer_1.RenderInternals.getFramesToRender(params.frameRange, params.everyNthFrame);
                 if (renderedFrames === allFrames.length) {
                     console.log('Rendered all frames!');
@@ -240,13 +243,19 @@ const rendererHandler = async (params, options) => {
             console.log({ err });
             throw err;
         }
+        const { message } = err;
         // If this error is encountered, we can just retry as it
         // is a very rare error to occur
-        const isBrowserError = err.message.includes('FATAL:zygote_communication_linux.cc') ||
-            err.message.includes('error while loading shared libraries: libnss3.so');
+        const isRetryableError = message.includes('FATAL:zygote_communication_linux.cc') ||
+            message.includes('error while loading shared libraries: libnss3.so') ||
+            message.includes('but the server sent no data') ||
+            message.includes('Compositor panicked') ||
+            (message.includes('Compositor exited') && !message.includes('SIGSEGV')) ||
+            message.includes('Timed out while setting up the headless browser');
         const shouldNotRetry = err.name === 'CancelledError';
-        const willRetry = (isBrowserError || params.retriesLeft > 0) && !shouldNotRetry;
-        console.log('Error occurred');
+        const isFatal = !isRetryableError;
+        const willRetry = isRetryableError && params.retriesLeft > 0 && !shouldNotRetry;
+        console.log(`Error occurred (will retry = ${String(willRetry)})`);
         console.log(err);
         await (0, write_lambda_error_1.writeLambdaError)({
             bucketName: params.bucketName,
@@ -257,7 +266,7 @@ const rendererHandler = async (params, options) => {
                 chunk: params.chunk,
                 frame: null,
                 type: 'renderer',
-                isFatal: !isBrowserError,
+                isFatal,
                 tmpDir: (0, write_lambda_error_1.getTmpDirStateIfENoSp)(err.stack),
                 attempt: params.attempt,
                 totalAttempts: params.retriesLeft + params.attempt,

package/dist/shared/invoke-webhook.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import https from 'https';
 import http from 'node:http';
 import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -26,10 +26,10 @@
     "aws-policies": "^1.0.1",
     "mime-types": "2.1.34",
     "zod": "3.21.4",
-    "@remotion/bundler": "4.0.10",
-    "@remotion/cli": "4.0.10",
-    "remotion": "4.0.10",
-    "@remotion/renderer": "4.0.10"
+    "@remotion/bundler": "4.0.12",
+    "@remotion/cli": "4.0.12",
+    "@remotion/renderer": "4.0.12",
+    "remotion": "4.0.12"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
@@ -44,11 +44,11 @@
     "typescript": "4.9.5",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.10",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.10"
+    "@remotion/bundler": "4.0.12",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.12"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.10"
+    "@remotion/bundler": "4.0.12"
   },
   "publishConfig": {
     "access": "public"