@remotion/lambda 4.0.0-fastlambda.8 → 4.0.0-forcepublish.7

package/dist/functions/helpers/read-with-progress.d.ts

@@ -1,8 +1,8 @@
-import { AwsRegion } from '../../pricing/aws-regions';
+import type { AwsRegion } from '../../pricing/aws-regions';
 export declare type LambdaReadFileProgress = (progress: {
     totalSize: number;
     downloaded: number;
-    progress: number;
+    percent: number;
 }) => unknown;
 export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, }: {
     bucketName: string;
@@ -13,4 +13,5 @@ export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region,
     onProgress: LambdaReadFileProgress;
 }) => Promise<{
     sizeInBytes: number;
+    to: string;
 }>;

package/dist/functions/helpers/read-with-progress.js

@@ -13,6 +13,18 @@ const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expecte
         Key: key,
     });
     const presigned = await (0, s3_request_presigner_1.getSignedUrl)(client, command);
-    return renderer_1.RenderInternals.downloadFile(presigned, outputPath, onProgress);
+    const { to, sizeInBytes } = await renderer_1.RenderInternals.downloadFile({
+        url: presigned,
+        onProgress: ({ downloaded, percent, totalSize }) => {
+            // On Lambda, it should always be a number
+            onProgress({
+                downloaded,
+                percent: percent,
+                totalSize: totalSize,
+            });
+        },
+        to: () => outputPath,
+    });
+    return { sizeInBytes, to };
 };
 exports.lambdaDownloadFileWithProgress = lambdaDownloadFileWithProgress;

package/dist/functions/helpers/validate-composition.d.ts

@@ -1,12 +1,18 @@
-import { openBrowser } from '@remotion/renderer';
-import { TCompMetadata } from 'remotion';
-import { Await } from '../../shared/await';
+import type { ChromiumOptions, DownloadMap, FfmpegExecutable, openBrowser } from '@remotion/renderer';
+import type { TCompMetadata } from 'remotion';
+import type { Await } from '../../shared/await';
 declare type ValidateCompositionOptions = {
     serveUrl: string;
     composition: string;
     browserInstance: Await<ReturnType<typeof openBrowser>>;
     inputProps: unknown;
     envVariables: Record<string, string> | undefined;
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
+    timeoutInMilliseconds: number;
+    chromiumOptions: ChromiumOptions;
+    port: number | null;
+    downloadMap: DownloadMap;
 };
-export declare const validateComposition: ({ serveUrl, composition, browserInstance, inputProps, envVariables, }: ValidateCompositionOptions) => Promise<TCompMetadata>;
+export declare const validateComposition: ({ serveUrl, composition, browserInstance, inputProps, envVariables, timeoutInMilliseconds, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, downloadMap, }: ValidateCompositionOptions) => Promise<TCompMetadata>;
 export {};

package/dist/functions/helpers/validate-composition.js

@@ -2,11 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateComposition = void 0;
 const renderer_1 = require("@remotion/renderer");
-const validateComposition = async ({ serveUrl, composition, browserInstance, inputProps, envVariables, }) => {
+const validateComposition = async ({ serveUrl, composition, browserInstance, inputProps, envVariables, timeoutInMilliseconds, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, downloadMap, }) => {
     const compositions = await (0, renderer_1.getCompositions)(serveUrl, {
         puppeteerInstance: browserInstance,
         inputProps: inputProps,
         envVariables,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        timeoutInMilliseconds,
+        chromiumOptions,
+        port,
+        downloadMap,
     });
     const found = compositions.find((c) => c.id === composition);
     if (!found) {

package/dist/functions/helpers/write-lambda-error.d.ts

@@ -1,4 +1,4 @@
-import { FileNameAndSize } from './get-files-in-folder';
+import type { FileNameAndSize } from './get-files-in-folder';
 export declare type LambdaErrorInfo = {
     type: 'renderer' | 'browser' | 'stitcher';
     message: string;

package/dist/functions/helpers/write-lambda-error.js

@@ -33,6 +33,7 @@ const writeLambdaError = async ({ bucketName, renderId, errorInfo, expectedBucke
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner,
+        downloadBehavior: null,
     });
 };
 exports.writeLambdaError = writeLambdaError;

package/dist/functions/helpers/write-post-render-data.d.ts

@@ -1,5 +1,5 @@
-import { AwsRegion } from '../../pricing/aws-regions';
-import { PostRenderData } from '../../shared/constants';
+import type { AwsRegion } from '../../pricing/aws-regions';
+import type { PostRenderData } from '../../shared/constants';
 export declare const writePostRenderData: ({ bucketName, renderId, postRenderData, expectedBucketOwner, region, }: {
     bucketName: string;
     renderId: string;

package/dist/functions/helpers/write-post-render-data.js

@@ -11,6 +11,7 @@ const writePostRenderData = async ({ bucketName, renderId, postRenderData, expec
         body: JSON.stringify(postRenderData),
         expectedBucketOwner,
         region,
+        downloadBehavior: null,
     });
 };
 exports.writePostRenderData = writePostRenderData;

package/dist/functions/index.d.ts

@@ -1,5 +1,6 @@
-import { LambdaPayload, LambdaRoutines } from '../shared/constants';
-import { LambdaReturnValues } from '../shared/return-values';
+import type { LambdaPayload } from '../shared/constants';
+import { LambdaRoutines } from '../shared/constants';
+import type { LambdaReturnValues } from '../shared/return-values';
 export declare const handler: <T extends LambdaRoutines>(params: LambdaPayload, context: {
     invokedFunctionArn: string;
     getRemainingTimeInMillis: () => number;

package/dist/functions/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = void 0;
-const remotion_1 = require("remotion");
+const renderer_1 = require("@remotion/renderer");
 const constants_1 = require("../shared/constants");
 const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
 const is_warm_1 = require("./helpers/is-warm");
@@ -9,7 +9,7 @@ const print_cloudwatch_helper_1 = require("./helpers/print-cloudwatch-helper");
 const info_1 = require("./info");
 const launch_1 = require("./launch");
 const progress_1 = require("./progress");
-const renderer_1 = require("./renderer");
+const renderer_2 = require("./renderer");
 const start_1 = require("./start");
 const still_1 = require("./still");
 const handler = async (params, context) => {
@@ -25,6 +25,7 @@ const handler = async (params, context) => {
     if (params.type === constants_1.LambdaRoutines.still) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.still, {
             inputProps: JSON.stringify(params.inputProps),
+            isWarm,
         });
         return (0, still_1.stillHandler)(params, {
             expectedBucketOwner: currentUserId,
@@ -33,6 +34,7 @@ const handler = async (params, context) => {
     if (params.type === constants_1.LambdaRoutines.start) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.start, {
             inputProps: JSON.stringify(params.inputProps),
+            isWarm,
         });
         return (0, start_1.startHandler)(params);
     }
@@ -40,12 +42,14 @@ const handler = async (params, context) => {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.launch, {
             renderId: params.renderId,
             inputProps: JSON.stringify(params.inputProps),
+            isWarm,
         });
         return (0, launch_1.launchHandler)(params, { expectedBucketOwner: currentUserId });
     }
     if (params.type === constants_1.LambdaRoutines.status) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.status, {
             renderId: params.renderId,
+            isWarm,
         });
         return (0, progress_1.progressHandler)(params, {
             expectedBucketOwner: currentUserId,
@@ -56,16 +60,19 @@ const handler = async (params, context) => {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.renderer, {
             renderId: params.renderId,
             chunk: String(params.chunk),
-            dumpLogs: String(remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose')),
+            dumpLogs: String(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')),
             inputProps: JSON.stringify(params.inputProps),
+            isWarm,
         });
-        return (0, renderer_1.rendererHandler)(params, {
+        return (0, renderer_2.rendererHandler)(params, {
             expectedBucketOwner: currentUserId,
             isWarm,
         });
     }
     if (params.type === constants_1.LambdaRoutines.info) {
-        (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.info, {});
+        (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.info, {
+            isWarm,
+        });
         return (0, info_1.infoHandler)(params);
     }
     throw new Error(constants_1.COMMAND_NOT_FOUND);

package/dist/functions/info.d.ts

@@ -1,4 +1,4 @@
-import { LambdaPayload, LambdaVersions } from '../shared/constants';
+import type { LambdaPayload, LambdaVersions } from '../shared/constants';
 export declare const infoHandler: (lambdaParams: LambdaPayload) => Promise<{
     version: LambdaVersions;
 }>;

package/dist/functions/launch.d.ts

@@ -1,4 +1,4 @@
-import { LambdaPayload } from '../shared/constants';
+import type { LambdaPayload } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
 };

package/dist/functions/launch.js

@@ -39,6 +39,27 @@ const timer_1 = require("./helpers/timer");
 const validate_composition_1 = require("./helpers/validate-composition");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
 const write_post_render_data_1 = require("./helpers/write-post-render-data");
+const callFunctionWithRetry = async (payload, retries = 0) => {
+    try {
+        await (0, aws_clients_1.getLambdaClient)((0, get_current_region_1.getCurrentRegionInFunction)()).send(new client_lambda_1.InvokeCommand({
+            FunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+            // @ts-expect-error
+            Payload: JSON.stringify(payload),
+            InvocationType: 'Event',
+        }), {});
+    }
+    catch (err) {
+        if (err.name === 'ResourceConflictException') {
+            if (retries > 10) {
+                throw err;
+            }
+            await new Promise((resolve) => {
+                setTimeout(resolve, 1000);
+            });
+            return callFunctionWithRetry(payload, retries + 1);
+        }
+    }
+};
 const innerLaunchHandler = async (params, options) => {
     var _a, _b;
     if (params.type !== constants_1.LambdaRoutines.launch) {
@@ -46,7 +67,7 @@ const innerLaunchHandler = async (params, options) => {
     }
     const startedDate = Date.now();
     const [browserInstance, optimization] = await Promise.all([
-        (0, get_browser_instance_1.getBrowserInstance)(remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'), params.chromiumOptions),
+        (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), params.chromiumOptions),
         (0, s3_optimization_file_1.getOptimization)({
             bucketName: params.bucketName,
             siteId: (0, make_s3_url_1.getServeUrlHash)(params.serveUrl),
@@ -55,22 +76,30 @@ const innerLaunchHandler = async (params, options) => {
             expectedBucketOwner: options.expectedBucketOwner,
         }),
     ]);
+    const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     const comp = await (0, validate_composition_1.validateComposition)({
         serveUrl: params.serveUrl,
         composition: params.composition,
         browserInstance,
         inputProps: params.inputProps,
         envVariables: params.envVariables,
+        ffmpegExecutable: null,
+        ffprobeExecutable: null,
+        timeoutInMilliseconds: params.timeoutInMilliseconds,
+        chromiumOptions: params.chromiumOptions,
+        port: null,
+        downloadMap,
     });
-    remotion_1.Internals.validateDurationInFrames(comp.durationInFrames, 'passed to <Component />');
-    remotion_1.Internals.validateFps(comp.fps, 'passed to <Component />');
-    remotion_1.Internals.validateDimension(comp.height, 'height', 'passed to <Component />');
-    remotion_1.Internals.validateDimension(comp.width, 'width', 'passed to <Component />');
+    remotion_1.Internals.validateDurationInFrames(comp.durationInFrames, 'passed to a Lambda render');
+    remotion_1.Internals.validateFps(comp.fps, 'passed to a Lambda render', false);
+    remotion_1.Internals.validateDimension(comp.height, 'height', 'passed to a Lambda render');
+    remotion_1.Internals.validateDimension(comp.width, 'width', 'passed to a Lambda render');
+    renderer_1.RenderInternals.validateConcurrency(params.concurrencyPerLambda, 'concurrencyPerLambda');
     const realFrameRange = renderer_1.RenderInternals.getRealFrameRange(comp.durationInFrames, params.frameRange);
-    const frameCount = renderer_1.RenderInternals.getDurationFromFrameRange(realFrameRange, 0);
-    const framesPerLambda = (_a = params.framesPerLambda) !== null && _a !== void 0 ? _a : (0, best_frames_per_lambda_param_1.bestFramesPerLambdaParam)(frameCount);
+    const frameCount = renderer_1.RenderInternals.getFramesToRender(realFrameRange, params.everyNthFrame);
+    const framesPerLambda = (_a = params.framesPerLambda) !== null && _a !== void 0 ? _a : (0, best_frames_per_lambda_param_1.bestFramesPerLambdaParam)(frameCount.length);
     (0, validate_frames_per_lambda_1.validateFramesPerLambda)(framesPerLambda);
-    const chunkCount = Math.ceil(frameCount / framesPerLambda);
+    const chunkCount = Math.ceil(frameCount.length / framesPerLambda);
     if (chunkCount > constants_1.MAX_FUNCTIONS_PER_RENDER) {
         throw new Error(`Too many functions: This render would cause ${chunkCount} functions to spawn. We limit this amount to ${constants_1.MAX_FUNCTIONS_PER_RENDER} functions as more would result in diminishing returns. Values set: frameCount = ${frameCount}, framesPerLambda=${framesPerLambda}. See ${docs_url_1.DOCS_URL}/docs/lambda/concurrency for how this parameter is calculated.`);
     }
@@ -78,12 +107,12 @@ const innerLaunchHandler = async (params, options) => {
     (0, validate_privacy_1.validatePrivacy)(params.privacy);
     renderer_1.RenderInternals.validatePuppeteerTimeout(params.timeoutInMilliseconds);
     const { chunks, didUseOptimization } = (0, plan_frame_ranges_1.planFrameRanges)({
-        chunkCount,
         framesPerLambda,
         optimization,
         // TODO: Re-enable chunk optimization later
         shouldUseOptimization: false,
         frameRange: realFrameRange,
+        everyNthFrame: params.everyNthFrame,
     });
     const sortedChunks = chunks.slice().sort((a, b) => a[0] - b[0]);
     const invokers = Math.round(Math.sqrt(chunks.length));
@@ -105,18 +134,21 @@ const innerLaunchHandler = async (params, options) => {
             inputProps: params.inputProps,
             renderId: params.renderId,
             imageFormat: params.imageFormat,
-            codec: params.codec,
+            codec: params.codec === 'h264' ? 'h264-mkv' : params.codec,
             crf: params.crf,
             envVariables: params.envVariables,
             pixelFormat: params.pixelFormat,
             proResProfile: params.proResProfile,
             quality: params.quality,
             privacy: params.privacy,
-            logLevel: (_a = params.logLevel) !== null && _a !== void 0 ? _a : remotion_1.Internals.Logging.DEFAULT_LOG_LEVEL,
+            logLevel: (_a = params.logLevel) !== null && _a !== void 0 ? _a : 'info',
             attempt: 1,
             timeoutInMilliseconds: params.timeoutInMilliseconds,
             chromiumOptions: params.chromiumOptions,
             scale: params.scale,
+            everyNthFrame: params.everyNthFrame,
+            concurrencyPerLambda: params.concurrencyPerLambda,
+            muted: params.muted,
         };
         return payload;
     });
@@ -153,22 +185,18 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
     });
     await Promise.all(lambdaPayloads.map(async (payload, index) => {
         const callingLambdaTimer = (0, timer_1.timer)('Calling chunk ' + index);
-        await (0, aws_clients_1.getLambdaClient)((0, get_current_region_1.getCurrentRegionInFunction)()).send(new client_lambda_1.InvokeCommand({
-            FunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
-            // @ts-expect-error
-            Payload: JSON.stringify(payload),
-            InvocationType: 'Event',
-        }), {});
+        await callFunctionWithRetry(payload);
         callingLambdaTimer.end();
     }));
     reqSend.end();
     let lastProgressUploaded = 0;
     let encodingStop = null;
     const onProgress = (framesEncoded, start) => {
-        const relativeProgress = framesEncoded / frameCount;
+        const relativeProgress = framesEncoded / frameCount.length;
         const deltaSinceLastProgressUploaded = relativeProgress - lastProgressUploaded;
         if (relativeProgress === 1) {
             encodingStop = Date.now();
@@ -179,7 +207,7 @@ const innerLaunchHandler = async (params, options) => {
         lastProgressUploaded = relativeProgress;
         const encodingProgress = {
             framesEncoded,
-            totalFrames: frameCount,
+            totalFrames: frameCount.length,
             doneIn: encodingStop ? encodingStop - start : null,
             timeToInvoke: null,
         };
@@ -190,6 +218,7 @@ const innerLaunchHandler = async (params, options) => {
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
+            downloadBehavior: null,
         }).catch((err) => {
             (0, write_lambda_error_1.writeLambdaError)({
                 bucketName: params.bucketName,
@@ -211,15 +240,18 @@ const innerLaunchHandler = async (params, options) => {
             });
         });
     };
+    const fps = comp.fps / params.everyNthFrame;
     const { outfile, cleanupChunksProm, encodingStart } = await (0, concat_videos_1.concatVideosS3)({
         bucket: params.bucketName,
         expectedFiles: chunkCount,
         onProgress,
-        numberOfFrames: frameCount,
+        numberOfFrames: frameCount.length,
         renderId: params.renderId,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         codec: params.codec,
         expectedBucketOwner: options.expectedBucketOwner,
+        fps,
+        numberOfGifLoops: params.numberOfGifLoops,
     });
     if (!encodingStop) {
         encodingStop = Date.now();
@@ -233,6 +265,7 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: params.downloadBehavior,
     });
     let chunkProm = Promise.resolve();
     // TODO: Enable in a later release
@@ -257,6 +290,7 @@ const innerLaunchHandler = async (params, options) => {
                     framesPerLambda,
                     lambdaVersion: constants_1.CURRENT_VERSION,
                     frameRange: realFrameRange,
+                    everyNthFrame: params.everyNthFrame,
                 },
                 expectedBucketOwner: options.expectedBucketOwner,
                 compositionId: params.composition,
@@ -275,10 +309,16 @@ const innerLaunchHandler = async (params, options) => {
         }),
     ]);
     const finalEncodingProgress = {
-        framesEncoded: frameCount,
-        totalFrames: frameCount,
+        framesEncoded: frameCount.length,
+        totalFrames: frameCount.length,
         doneIn: encodingStop ? encodingStop - encodingStart : null,
-        timeToInvoke: (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)(contents, params.renderId, renderMetadata.estimatedRenderLambdaInvokations, renderMetadata.startedDate).timeToInvokeLambdas,
+        timeToInvoke: (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)({
+            contents,
+            renderId: params.renderId,
+            estimatedRenderLambdaInvokations: renderMetadata.estimatedRenderLambdaInvokations,
+            checkIfAllLambdasWereInvoked: false,
+            startDate: renderMetadata.startedDate,
+        }).timeToInvokeLambdas,
     };
     const finalEncodingProgressProm = (0, io_1.lambdaWriteFile)({
         bucketName: params.bucketName,
@@ -287,6 +327,7 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
     });
     const errorExplanationsProm = (0, inspect_errors_1.inspectErrors)({
         contents,
@@ -305,7 +346,7 @@ const innerLaunchHandler = async (params, options) => {
         contents,
         jobs,
     });
-    const postRenderData = await (0, create_post_render_data_1.createPostRenderData)({
+    const postRenderData = (0, create_post_render_data_1.createPostRenderData)({
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,

package/dist/functions/progress.d.ts

@@ -1,4 +1,4 @@
-import { LambdaPayload, RenderProgress } from '../shared/constants';
+import type { LambdaPayload, RenderProgress } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
     timeoutInMiliseconds: number;

package/dist/functions/renderer.d.ts

@@ -1,4 +1,4 @@
-import { LambdaPayload } from '../shared/constants';
+import type { LambdaPayload } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
     isWarm: boolean;