@remotion/lambda 4.0.0-offthread.9 → 4.0.0-playerimpr.8

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,6 +77,7 @@ 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,
@@ -62,19 +85,25 @@ const innerLaunchHandler = async (params, options) => {
         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.`);
     }
@@ -82,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));
@@ -109,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;
     });
@@ -143,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,
@@ -157,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();
@@ -183,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,
         };
@@ -194,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,
@@ -215,21 +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: comp.fps,
+        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,
@@ -238,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
@@ -260,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,
@@ -280,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,
@@ -292,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,
@@ -310,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,
@@ -323,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;
@@ -334,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;

package/dist/functions/renderer.js

@@ -8,7 +8,6 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
 const aws_clients_1 = require("../shared/aws-clients");
 const constants_1 = require("../shared/constants");
 const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
@@ -19,12 +18,11 @@ const get_folder_size_1 = require("./helpers/get-folder-size");
 const io_1 = require("./helpers/io");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
 const renderHandler = async (params, options, logs) => {
-    var _a, _b;
+    var _a;
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
-    remotion_1.Internals.Logging.setLogLevel(params.logLevel);
-    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), (_a = params.chromiumOptions) !== null && _a !== void 0 ? _a : {});
+    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), (_a = params.chromiumOptions) !== null && _a !== void 0 ? _a : {});
     const outputPath = renderer_1.RenderInternals.tmpDir('remotion-render-');
     if (typeof params.chunk !== 'number') {
         throw new Error('must pass chunk');
@@ -41,76 +39,108 @@ const renderHandler = async (params, options, logs) => {
     };
     const outdir = renderer_1.RenderInternals.tmpDir(constants_1.RENDERER_PATH_TOKEN);
     const outputLocation = path_1.default.join(outdir, `localchunk-${String(params.chunk).padStart(8, '0')}.${renderer_1.RenderInternals.getFileExtensionFromCodec(params.codec, 'chunk')}`);
-    await (0, renderer_1.renderMedia)({
-        composition: {
-            id: params.composition,
-            durationInFrames: params.durationInFrames,
-            fps: params.fps,
-            height: params.height,
-            width: params.width,
-        },
-        imageFormat: params.imageFormat,
-        inputProps: params.inputProps,
-        frameRange: params.frameRange,
-        onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
-            if (renderedFrames % 10 === 0 &&
-                remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
-                console.log(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
-            }
-            const duration = renderer_1.RenderInternals.getDurationFromFrameRange(params.frameRange, params.durationInFrames);
-            if (renderedFrames === duration) {
-                console.log('Rendered all frames!');
-            }
-            chunkTimingData.timings[renderedFrames] = Date.now() - start;
-        },
-        parallelism: 1,
-        onStart: () => {
-            (0, io_1.lambdaWriteFile)({
-                privacy: 'private',
-                bucketName: params.bucketName,
-                body: JSON.stringify({
-                    filesCleaned: clean_tmpdir_1.deletedFilesSize,
-                    filesInTmp: fs_1.default.readdirSync('/tmp'),
-                    isWarm: options.isWarm,
-                    deletedFiles: clean_tmpdir_1.deletedFiles,
-                    tmpSize: (0, get_folder_size_1.getFolderSizeRecursively)('/tmp'),
-                    tmpDirFiles: (0, get_files_in_folder_1.getFolderFiles)('/tmp'),
-                }),
-                key: (0, constants_1.lambdaInitializedKey)({
-                    renderId: params.renderId,
-                    chunk: params.chunk,
-                    attempt: params.attempt,
-                }),
-                region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-                expectedBucketOwner: options.expectedBucketOwner,
-            });
-        },
-        puppeteerInstance: browserInstance,
-        serveUrl: params.serveUrl,
-        quality: params.quality,
-        envVariables: params.envVariables,
-        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose'),
-        onBrowserLog: (log) => {
-            logs.push(log);
-        },
-        outputLocation,
-        codec: params.codec,
-        crf: (_b = params.crf) !== null && _b !== void 0 ? _b : undefined,
-        ffmpegExecutable: process.env.NODE_ENV === 'test' ? null : '/opt/bin/ffmpeg',
-        pixelFormat: params.pixelFormat,
-        proResProfile: params.proResProfile,
-        onDownload: (src) => {
-            console.log('Downloading', src);
-            return () => undefined;
-        },
-        overwrite: false,
-        chromiumOptions: params.chromiumOptions,
-        scale: params.scale,
-        timeoutInMilliseconds: params.timeoutInMilliseconds,
-        port: null,
+    const chunkCodec = params.codec === 'gif' ? 'h264-mkv' : params.codec;
+    const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    const downloads = {};
+    await new Promise((resolve, reject) => {
+        var _a;
+        (0, renderer_1.renderMedia)({
+            composition: {
+                id: params.composition,
+                durationInFrames: params.durationInFrames,
+                fps: params.fps,
+                height: params.height,
+                width: params.width,
+            },
+            imageFormat: params.imageFormat,
+            inputProps: params.inputProps,
+            frameRange: params.frameRange,
+            onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
+                if (renderedFrames % 10 === 0 &&
+                    renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
+                    console.log(`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!');
+                }
+                chunkTimingData.timings[renderedFrames] = Date.now() - start;
+            },
+            concurrency: params.concurrencyPerLambda,
+            onStart: () => {
+                (0, io_1.lambdaWriteFile)({
+                    privacy: 'private',
+                    bucketName: params.bucketName,
+                    body: JSON.stringify({
+                        filesCleaned: clean_tmpdir_1.deletedFilesSize,
+                        filesInTmp: fs_1.default.readdirSync('/tmp'),
+                        isWarm: options.isWarm,
+                        deletedFiles: clean_tmpdir_1.deletedFiles,
+                        tmpSize: (0, get_folder_size_1.getFolderSizeRecursively)('/tmp'),
+                        tmpDirFiles: (0, get_files_in_folder_1.getFolderFiles)('/tmp'),
+                    }),
+                    key: (0, constants_1.lambdaChunkInitializedKey)({
+                        renderId: params.renderId,
+                        chunk: params.chunk,
+                        attempt: params.attempt,
+                    }),
+                    region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+                    expectedBucketOwner: options.expectedBucketOwner,
+                    downloadBehavior: null,
+                    customCredentials: null,
+                }).catch((err) => reject(err));
+            },
+            puppeteerInstance: browserInstance,
+            serveUrl: params.serveUrl,
+            quality: params.quality,
+            envVariables: params.envVariables,
+            dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'),
+            verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'),
+            onBrowserLog: (log) => {
+                logs.push(log);
+            },
+            outputLocation,
+            codec: chunkCodec,
+            crf: (_a = params.crf) !== null && _a !== void 0 ? _a : undefined,
+            ffmpegExecutable: process.env.NODE_ENV === 'test' ? null : '/opt/bin/ffmpeg',
+            pixelFormat: params.pixelFormat,
+            proResProfile: params.proResProfile,
+            onDownload: (src) => {
+                console.log('Downloading', src);
+                downloads[src] = 0;
+                return ({ percent, downloaded }) => {
+                    if (percent === null) {
+                        console.log(`Download progress (${src}): ${downloaded} bytes. Don't know final size of download, no Content-Length header.`);
+                        return;
+                    }
+                    if (
+                    // Only report every 10% change
+                    downloads[src] > percent - 0.1 &&
+                        percent !== 1) {
+                        return;
+                    }
+                    downloads[src] = percent;
+                    console.log(`Download progress (${src}): ${downloaded} bytes, ${(percent * 100).toFixed(1)}%`);
+                    if (percent === 1) {
+                        console.log(`Download complete: ${src}`);
+                    }
+                };
+            },
+            overwrite: false,
+            chromiumOptions: params.chromiumOptions,
+            scale: params.scale,
+            timeoutInMilliseconds: params.timeoutInMilliseconds,
+            port: null,
+            everyNthFrame: params.everyNthFrame,
+            numberOfGifLoops: null,
+            downloadMap,
+            muted: params.muted,
+            enforceAudioTrack: true,
+        })
+            .then(() => resolve())
+            .catch((err) => reject(err));
     });
     const endRendered = Date.now();
-    console.log('Adding silent audio, chunk', params.chunk);
     const condensedTimingData = {
         ...chunkTimingData,
         timings: Object.values(chunkTimingData.timings),
@@ -125,6 +155,8 @@ const renderHandler = async (params, options, logs) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
+        customCredentials: null,
     });
     await Promise.all([
         fs_1.default.promises.rm(outputLocation, { recursive: true }),
@@ -132,15 +164,17 @@ const renderHandler = async (params, options, logs) => {
         (0, io_1.lambdaWriteFile)({
             bucketName: params.bucketName,
             body: JSON.stringify(condensedTimingData, null, 2),
-            key: `${(0, constants_1.lambdaTimingsKey)({
+            key: (0, constants_1.lambdaTimingsKey)({
                 renderId: params.renderId,
                 chunk: params.chunk,
                 rendered: endRendered,
                 start,
-            })}`,
+            }),
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
+            downloadBehavior: null,
+            customCredentials: null,
         }),
     ]);
 };

package/dist/functions/start.d.ts

@@ -1,5 +1,9 @@
-import { LambdaPayload } from '../shared/constants';
-export declare const startHandler: (params: LambdaPayload) => Promise<{
+import type { LambdaPayload } from '../shared/constants';
+declare type Options = {
+    expectedBucketOwner: string;
+};
+export declare const startHandler: (params: LambdaPayload, options: Options) => Promise<{
     bucketName: string;
     renderId: string;
 }>;
+export {};

package/dist/functions/start.js

@@ -2,21 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startHandler = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
-const remotion_1 = require("remotion");
+const version_1 = require("remotion/version");
 const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const aws_clients_1 = require("../shared/aws-clients");
 const constants_1 = require("../shared/constants");
 const random_hash_1 = require("../shared/random-hash");
 const get_current_region_1 = require("./helpers/get-current-region");
-const startHandler = async (params) => {
+const io_1 = require("./helpers/io");
+const startHandler = async (params, options) => {
     var _a;
     if (params.type !== constants_1.LambdaRoutines.start) {
         throw new TypeError('Expected type start');
     }
+    if (params.version !== version_1.VERSION) {
+        if (!params.version) {
+            throw new Error(`Version mismatch: When calling renderMediaOnLambda(), 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 renderMediaOnLambda(), get deployed Lambda function had version ${version_1.VERSION} and the @remotion/lambda package has version ${params.version}. Align the versions.`);
+    }
     const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
     });
     const renderId = (0, random_hash_1.randomHash)({ randomInTests: true });
+    const initialFile = (0, io_1.lambdaWriteFile)({
+        bucketName,
+        downloadBehavior: null,
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        body: 'Render was initialized',
+        expectedBucketOwner: options.expectedBucketOwner,
+        key: (0, constants_1.initalizedMetadataKey)(renderId),
+        privacy: 'private',
+        customCredentials: null,
+    });
     const payload = {
         type: constants_1.LambdaRoutines.launch,
         framesPerLambda: params.framesPerLambda,
@@ -34,12 +51,17 @@ const startHandler = async (params) => {
         quality: params.quality,
         maxRetries: params.maxRetries,
         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',
         frameRange: params.frameRange,
         outName: params.outName,
         timeoutInMilliseconds: params.timeoutInMilliseconds,
         chromiumOptions: params.chromiumOptions,
         scale: params.scale,
+        numberOfGifLoops: params.numberOfGifLoops,
+        everyNthFrame: params.everyNthFrame,
+        concurrencyPerLambda: params.concurrencyPerLambda,
+        downloadBehavior: params.downloadBehavior,
+        muted: params.muted,
     };
     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,
@@ -47,6 +69,7 @@ const startHandler = async (params) => {
         Payload: JSON.stringify(payload),
         InvocationType: 'Event',
     }));
+    await initialFile;
     return {
         bucketName,
         renderId,