@remotion/lambda 4.0.0-oops.3 → 4.0.0-playerimpr.8

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,12 +9,12 @@ 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) => {
-    process.env.REMOTION_LAMBDA = 'true';
-    const timeoutInMiliseconds = context.getRemainingTimeInMillis();
+    process.env.__RESERVED_IS_INSIDE_REMOTION_LAMBDA = 'true';
+    const timeoutInMilliseconds = context.getRemainingTimeInMillis();
     if (!context || !context.invokedFunctionArn) {
         throw new Error('Lambda function unexpectedly does not have context.invokedFunctionArn');
     }
@@ -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,39 +34,45 @@ 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);
+        return (0, start_1.startHandler)(params, { expectedBucketOwner: currentUserId });
     }
     if (params.type === constants_1.LambdaRoutines.launch) {
         (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,
-            timeoutInMiliseconds,
+            timeoutInMilliseconds,
         });
     }
     if (params.type === constants_1.LambdaRoutines.renderer) {
         (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 } from '../shared/constants';
 export declare const infoHandler: (lambdaParams: LambdaPayload) => Promise<{
-    version: LambdaVersions;
+    version: string;
 }>;

package/dist/functions/info.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.infoHandler = void 0;
+const version_1 = require("remotion/version");
 const constants_1 = require("../shared/constants");
 const infoHandler = (lambdaParams) => {
     if (lambdaParams.type !== constants_1.LambdaRoutines.info) {
         throw new TypeError('Expected info type');
     }
     const returnValue = {
-        version: constants_1.CURRENT_VERSION,
+        version: version_1.VERSION,
     };
     return Promise.resolve(returnValue);
 };

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

@@ -8,6 +8,7 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const remotion_1 = require("remotion");
+const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
 const constants_1 = require("../shared/constants");
 const docs_url_1 = require("../shared/docs-url");
@@ -39,14 +40,35 @@ 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;
+    var _a, _b, _c, _d;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
     }
     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 +77,33 @@ 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);
-    (0, validate_frames_per_lambda_1.validateFramesPerLambda)(framesPerLambda);
-    const chunkCount = Math.ceil(frameCount / framesPerLambda);
+    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,
+        durationInFrames: frameCount.length,
+    });
+    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 +111,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 +138,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;
     });
@@ -139,12 +175,13 @@ const innerLaunchHandler = async (params, options) => {
         type: 'video',
         imageFormat: params.imageFormat,
         inputProps: params.inputProps,
-        lambdaVersion: constants_1.CURRENT_VERSION,
+        lambdaVersion: version_1.VERSION,
         framesPerLambda,
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,
         outName: (_b = params.outName) !== null && _b !== void 0 ? _b : undefined,
+        privacy: params.privacy,
     };
     await (0, io_1.lambdaWriteFile)({
         bucketName: params.bucketName,
@@ -153,22 +190,19 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
+        customCredentials: 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 +213,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 +224,8 @@ const innerLaunchHandler = async (params, options) => {
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
+            downloadBehavior: null,
+            customCredentials: null,
         }).catch((err) => {
             (0, write_lambda_error_1.writeLambdaError)({
                 bucketName: params.bucketName,
@@ -211,20 +247,25 @@ 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();
     }
-    const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName);
+    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName, typeof params.outName === 'string' || typeof params.outName === 'undefined'
+        ? null
+        : (_d = (_c = params.outName) === null || _c === void 0 ? void 0 : _c.s3OutputProvider) !== null && _d !== void 0 ? _d : null);
     const outputSize = fs_1.default.statSync(outfile);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
@@ -233,6 +274,8 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: params.downloadBehavior,
+        customCredentials,
     });
     let chunkProm = Promise.resolve();
     // TODO: Enable in a later release
@@ -255,8 +298,9 @@ const innerLaunchHandler = async (params, options) => {
                     newTiming: (0, get_profile_duration_1.getProfileDuration)(optimizedProfile),
                     createdFromRenderId: params.renderId,
                     framesPerLambda,
-                    lambdaVersion: constants_1.CURRENT_VERSION,
+                    lambdaVersion: version_1.VERSION,
                     frameRange: realFrameRange,
+                    everyNthFrame: params.everyNthFrame,
                 },
                 expectedBucketOwner: options.expectedBucketOwner,
                 compositionId: params.composition,
@@ -275,10 +319,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 +337,8 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
+        customCredentials: null,
     });
     const errorExplanationsProm = (0, inspect_errors_1.inspectErrors)({
         contents,
@@ -305,7 +357,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,
@@ -318,7 +370,7 @@ const innerLaunchHandler = async (params, options) => {
         outputFile: {
             lastModified: Date.now(),
             size: outputSize.size,
-            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, params.bucketName),
+            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, params.bucketName, customCredentials),
         },
     });
     await finalEncodingProgressProm;
@@ -329,6 +381,12 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,
     });
+    await (0, io_1.lambdaDeleteFile)({
+        bucketName: params.bucketName,
+        key: (0, constants_1.initalizedMetadataKey)(params.renderId),
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        customCredentials: null,
+    });
     await Promise.all([cleanupChunksProm, fs_1.default.promises.rm(outfile)]);
 };
 const launchHandler = async (params, options) => {

package/dist/functions/progress.d.ts

@@ -1,7 +1,7 @@
-import { LambdaPayload, RenderProgress } from '../shared/constants';
+import type { LambdaPayload, RenderProgress } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
-    timeoutInMiliseconds: number;
+    timeoutInMilliseconds: number;
 };
 export declare const progressHandler: (lambdaParams: LambdaPayload, options: Options) => Promise<RenderProgress>;
 export {};

package/dist/functions/progress.js

@@ -1,20 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.progressHandler = void 0;
+const version_1 = require("remotion/version");
 const constants_1 = require("../shared/constants");
 const get_current_region_1 = require("./helpers/get-current-region");
 const get_progress_1 = require("./helpers/get-progress");
 const progressHandler = (lambdaParams, options) => {
+    var _a;
     if (lambdaParams.type !== constants_1.LambdaRoutines.status) {
         throw new TypeError('Expected status type');
     }
+    if (lambdaParams.version !== version_1.VERSION) {
+        if (!lambdaParams.version) {
+            throw new Error(`Version mismatch: When calling getRenderProgress(), the deployed Lambda function had version ${version_1.VERSION} but the @remotion/lambda package is an older version. Align the versions.`);
+        }
+        throw new Error(`Version mismatch: When calling getRenderProgress(), get deployed Lambda function had version ${version_1.VERSION} and the @remotion/lambda package has version ${lambdaParams.version}. Align the versions.`);
+    }
     return (0, get_progress_1.getProgress)({
         bucketName: lambdaParams.bucketName,
         renderId: lambdaParams.renderId,
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
-        timeoutInMiliseconds: options.timeoutInMiliseconds,
+        timeoutInMilliseconds: options.timeoutInMilliseconds,
+        customCredentials: (_a = lambdaParams.s3OutputProvider) !== null && _a !== void 0 ? _a : null,
     });
 };
 exports.progressHandler = progressHandler;

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;