@remotion/lambda 3.3.7 → 3.3.9

package/dist/functions/helpers/get-encoding-metadata.js

@@ -1,26 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEncodingMetadata = void 0;
-const defaults_1 = require("../../defaults");
-const stream_to_string_1 = require("../../shared/stream-to-string");
-const io_1 = require("./io");
-const getEncodingMetadata = async ({ exists, bucketName, renderId, region, expectedBucketOwner, }) => {
+const chunk_progress_1 = require("../../shared/chunk-progress");
+const getEncodingMetadata = ({ exists, }) => {
     if (!exists) {
         return null;
     }
-    try {
-        const Body = await (0, io_1.lambdaReadFile)({
-            bucketName,
-            key: (0, defaults_1.encodingProgressKey)(renderId),
-            region,
-            expectedBucketOwner,
-        });
-        const encodingProgress = JSON.parse(await (0, stream_to_string_1.streamToString)(Body));
-        return encodingProgress;
-    }
-    catch (err) {
-        // The file may not yet have been fully written or already have been cleaned up again
-        return null;
-    }
+    const framesEncoded = (0, chunk_progress_1.getProgressOfChunk)(exists.ETag);
+    return { framesEncoded };
 };
 exports.getEncodingMetadata = getEncodingMetadata;

package/dist/functions/helpers/get-final-encoding-status.d.ts

@@ -1,8 +1,6 @@
 import type { EncodingProgress, RenderMetadata } from '../../shared/constants';
-import type { LambdaInvokeStats } from './get-lambdas-invoked-stats';
-export declare const getFinalEncodingStatus: ({ encodingStatus: encodingProgress, renderMetadata, outputFileExists, lambdaInvokeStatus, }: {
-    encodingStatus: EncodingProgress | null;
+export declare const getFinalEncodingStatus: ({ encodingProgress, renderMetadata, outputFileExists, }: {
+    encodingProgress: EncodingProgress | null;
     renderMetadata: RenderMetadata | null;
     outputFileExists: boolean;
-    lambdaInvokeStatus: LambdaInvokeStats;
 }) => EncodingProgress | null;

package/dist/functions/helpers/get-final-encoding-status.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFinalEncodingStatus = void 0;
-const getFinalEncodingStatus = ({ encodingStatus: encodingProgress, renderMetadata, outputFileExists, lambdaInvokeStatus, }) => {
+const getFinalEncodingStatus = ({ encodingProgress, renderMetadata, outputFileExists, }) => {
     if (!renderMetadata) {
         return null;
     }
@@ -11,9 +11,6 @@ const getFinalEncodingStatus = ({ encodingStatus: encodingProgress, renderMetada
     if (outputFileExists) {
         return {
             framesEncoded: renderMetadata.videoConfig.durationInFrames,
-            totalFrames: renderMetadata.videoConfig.durationInFrames,
-            doneIn: null,
-            timeToInvoke: lambdaInvokeStatus.timeToInvokeLambdas,
         };
     }
     return null;

package/dist/functions/helpers/get-lambdas-invoked-stats.d.ts

@@ -1,12 +1,8 @@
 import type { _Object } from '@aws-sdk/client-s3';
 export declare type LambdaInvokeStats = {
-    timeToInvokeLambdas: number | null;
     lambdasInvoked: number;
 };
-export declare const getLambdasInvokedStats: ({ contents, renderId, estimatedRenderLambdaInvokations, startDate, checkIfAllLambdasWereInvoked, }: {
+export declare const getLambdasInvokedStats: ({ contents, renderId, }: {
     contents: _Object[];
     renderId: string;
-    estimatedRenderLambdaInvokations: number | null;
-    startDate: number | null;
-    checkIfAllLambdasWereInvoked: boolean;
 }) => LambdaInvokeStats;

package/dist/functions/helpers/get-lambdas-invoked-stats.js

@@ -3,19 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLambdasInvokedStats = void 0;
 const constants_1 = require("../../shared/constants");
 const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
-const min_max_1 = require("./min-max");
-const getLambdasInvokedStats = ({ contents, renderId, estimatedRenderLambdaInvokations, startDate, checkIfAllLambdasWereInvoked, }) => {
-    var _a;
+const getLambdasInvokedStats = ({ contents, renderId, }) => {
     const lambdasInvoked = contents
         .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
         .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt === 1);
-    const allLambdasInvoked = !checkIfAllLambdasWereInvoked ||
-        lambdasInvoked.length === estimatedRenderLambdaInvokations;
-    const timeToInvokeLambdas = !allLambdasInvoked || startDate === null
-        ? null
-        : ((_a = (0, min_max_1.max)(lambdasInvoked.map((l) => { var _a; return (_a = l.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(); }))) !== null && _a !== void 0 ? _a : 0) - startDate;
     return {
-        timeToInvokeLambdas,
         lambdasInvoked: lambdasInvoked.length,
     };
 };

package/dist/functions/helpers/get-overall-progress.d.ts

@@ -1,6 +1,7 @@
-export declare const getOverallProgress: ({ cleanup, encoding, rendering, invoking, }: {
+export declare const getOverallProgress: ({ cleanup, encoding, rendering, invoking, frames, }: {
     cleanup: number;
     encoding: number;
     rendering: number;
     invoking: number;
+    frames: number;
 }) => number;

package/dist/functions/helpers/get-overall-progress.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOverallProgress = void 0;
 const weights = {
     cleanup: 0.1,
-    encoding: 0.3,
-    rendering: 0.3,
-    invoking: 0.3,
+    encoding: 0.225,
+    rendering: 0.225,
+    frames: 0.225,
+    invoking: 0.225,
 };
-const getOverallProgress = ({ cleanup, encoding, rendering, invoking, }) => {
+const getOverallProgress = ({ cleanup, encoding, rendering, invoking, frames, }) => {
     return (cleanup * weights.cleanup +
         encoding * weights.encoding +
         rendering * weights.rendering +
-        invoking * weights.invoking);
+        invoking * weights.invoking +
+        frames * weights.frames);
 };
 exports.getOverallProgress = getOverallProgress;

package/dist/functions/helpers/get-progress.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgress = void 0;
+const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
+const chunk_progress_1 = require("../../shared/chunk-progress");
 const constants_1 = require("../../shared/constants");
 const docs_url_1 = require("../../shared/docs-url");
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
@@ -19,12 +21,13 @@ const get_lambdas_invoked_stats_1 = require("./get-lambdas-invoked-stats");
 const get_overall_progress_1 = require("./get-overall-progress");
 const get_post_render_data_1 = require("./get-post-render-data");
 const get_render_metadata_1 = require("./get-render-metadata");
+const get_rendered_frames_progress_1 = require("./get-rendered-frames-progress");
 const get_retry_stats_1 = require("./get-retry-stats");
 const get_time_to_finish_1 = require("./get-time-to-finish");
 const inspect_errors_1 = require("./inspect-errors");
 const io_1 = require("./io");
 const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const postRenderData = await (0, get_post_render_data_1.getPostRenderData)({
         bucketName,
         region,
@@ -33,7 +36,9 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
     });
     if (postRenderData) {
         const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName, customCredentials);
+        const totalFrameCount = renderer_1.RenderInternals.getFramesToRender(postRenderData.renderMetadata.frameRange, postRenderData.renderMetadata.everyNthFrame).length;
         return {
+            framesRendered: totalFrameCount,
             bucket: bucketName,
             renderSize: postRenderData.renderSize,
             chunks: postRenderData.renderMetadata.totalChunks,
@@ -51,10 +56,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             currentTime: Date.now(),
             done: true,
             encodingStatus: {
-                framesEncoded: postRenderData.renderMetadata.videoConfig.durationInFrames,
-                totalFrames: postRenderData.renderMetadata.videoConfig.durationInFrames,
-                doneIn: postRenderData.timeToEncode,
-                timeToInvoke: postRenderData.timeToInvokeLambdas,
+                framesEncoded: totalFrameCount,
             },
             errors: postRenderData.errors,
             fatalErrorEncountered: false,
@@ -64,12 +66,13 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             renderMetadata: postRenderData.renderMetadata,
             timeToFinish: postRenderData.timeToFinish,
             timeToFinishChunks: postRenderData.timeToRenderChunks,
-            timeToInvokeLambdas: postRenderData.timeToInvokeLambdas,
             overallProgress: 1,
             retriesInfo: postRenderData.retriesInfo,
             outKey: outData.key,
             outBucket: outData.renderBucketName,
             mostExpensiveFrameRanges: (_a = postRenderData.mostExpensiveFrameRanges) !== null && _a !== void 0 ? _a : null,
+            timeToEncode: postRenderData.timeToEncode,
+            outputSizeInBytes: postRenderData.outputSize,
         };
     }
     const contents = await (0, io_1.lambdaLs)({
@@ -78,16 +81,11 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         expectedBucketOwner,
     });
-    (0, check_if_render_exists_1.checkIfRenderExists)(contents, renderId, bucketName, (0, get_current_region_1.getCurrentRegionInFunction)());
     const renderMetadataExists = Boolean(contents.find((c) => c.Key === (0, constants_1.renderMetadataKey)(renderId)));
-    const [encodingStatus, renderMetadata, errorExplanations] = await Promise.all([
-        (0, get_encoding_metadata_1.getEncodingMetadata)({
-            exists: Boolean(contents.find((c) => c.Key === (0, constants_1.encodingProgressKey)(renderId))),
-            bucketName,
-            renderId,
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-            expectedBucketOwner,
-        }),
+    const encodingStatus = (0, get_encoding_metadata_1.getEncodingMetadata)({
+        exists: contents.find((c) => c.Key === (0, constants_1.encodingProgressKey)(renderId)),
+    });
+    const [renderMetadata, errorExplanations] = await Promise.all([
         renderMetadataExists
             ? (0, get_render_metadata_1.getRenderMetadata)({
                 bucketName,
@@ -107,6 +105,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
     if ((renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.type) === 'still') {
         throw new Error("You don't need to call getRenderProgress() on a still render. Once you have obtained the `renderId`, the render is already done! 😉");
     }
+    (0, check_if_render_exists_1.checkIfRenderExists)(contents, renderId, bucketName, (0, get_current_region_1.getCurrentRegionInFunction)());
     const outputFile = renderMetadata
         ? await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
             bucketName,
@@ -137,6 +136,20 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         renderMetadata,
     });
     const chunks = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); });
+    const framesRendered = renderMetadata
+        ? (0, get_rendered_frames_progress_1.getRenderedFramesProgress)({
+            contents,
+            everyNthFrame: renderMetadata.everyNthFrame,
+            frameRange: renderMetadata.frameRange,
+            framesPerLambda: renderMetadata.framesPerLambda,
+            renderId,
+        })
+        : 0;
+    console.log('etags', contents
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
+        .map((c) => {
+        return (0, chunk_progress_1.getProgressOfChunk)(c.ETag);
+    }));
     const allChunks = chunks.length === ((_f = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _f !== void 0 ? _f : Infinity);
     const renderSize = contents
         .map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
@@ -144,22 +157,18 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
     const lambdasInvokedStats = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)({
         contents,
         renderId,
-        estimatedRenderLambdaInvokations: (_g = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.estimatedRenderLambdaInvokations) !== null && _g !== void 0 ? _g : null,
-        startDate: (_h = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _h !== void 0 ? _h : null,
-        checkIfAllLambdasWereInvoked: true,
     });
     const retriesInfo = (0, get_retry_stats_1.getRetryStats)({
         contents,
         renderId,
     });
     const finalEncodingStatus = (0, get_final_encoding_status_1.getFinalEncodingStatus)({
-        encodingStatus,
+        encodingProgress: encodingStatus,
         outputFileExists: Boolean(outputFile),
         renderMetadata,
-        lambdaInvokeStatus: lambdasInvokedStats,
     });
     const chunkCount = outputFile
-        ? (_j = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _j !== void 0 ? _j : 0
+        ? (_g = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _g !== void 0 ? _g : 0
         : chunks.length;
     // We add a 20 second buffer for it, since AWS timeshifts can be quite a lot. Once it's 20sec over the limit, we consider it timed out
     const isBeyondTimeout = renderMetadata &&
@@ -182,7 +191,11 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             : null,
         ...errorExplanations,
     ].filter(remotion_1.Internals.truthy);
+    const frameCount = renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(renderMetadata.frameRange, renderMetadata.everyNthFrame).length
+        : null;
     return {
+        framesRendered,
         chunks: chunkCount,
         done: false,
         encodingStatus,
@@ -190,7 +203,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         renderId,
         renderMetadata,
         bucket: bucketName,
-        outputFile: (_k = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _k !== void 0 ? _k : null,
+        outputFile: (_h = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _h !== void 0 ? _h : null,
         timeToFinish,
         errors: allErrors,
         fatalErrorEncountered: allErrors.some((f) => f.isFatal && !f.willRetry),
@@ -205,18 +218,17 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 type: 'absolute-time',
             })
             : null,
-        timeToInvokeLambdas: (_l = encodingStatus === null || encodingStatus === void 0 ? void 0 : encodingStatus.timeToInvoke) !== null && _l !== void 0 ? _l : lambdasInvokedStats.timeToInvokeLambdas,
         overallProgress: (0, get_overall_progress_1.getOverallProgress)({
             cleanup: cleanup ? cleanup.filesDeleted / cleanup.minFilesToDelete : 0,
-            encoding: finalEncodingStatus && renderMetadata
-                ? finalEncodingStatus.framesEncoded /
-                    renderMetadata.videoConfig.durationInFrames
+            encoding: finalEncodingStatus && renderMetadata && frameCount
+                ? finalEncodingStatus.framesEncoded / frameCount
                 : 0,
             invoking: renderMetadata
                 ? lambdasInvokedStats.lambdasInvoked /
                     renderMetadata.estimatedRenderLambdaInvokations
                 : 0,
             rendering: renderMetadata ? chunkCount / renderMetadata.totalChunks : 0,
+            frames: frameCount === null ? 0 : framesRendered / frameCount,
         }),
         retriesInfo,
         outKey: outputFile && renderMetadata
@@ -227,6 +239,8 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 .renderBucketName
             : null,
         mostExpensiveFrameRanges: null,
+        timeToEncode: null,
+        outputSizeInBytes: null,
     };
 };
 exports.getProgress = getProgress;

package/dist/functions/helpers/get-rendered-frames-progress.d.ts

@@ -0,0 +1,8 @@
+import type { _Object } from '@aws-sdk/client-s3';
+export declare const getRenderedFramesProgress: ({ contents, renderId, framesPerLambda, everyNthFrame, frameRange, }: {
+    contents: _Object[];
+    renderId: string;
+    framesPerLambda: number;
+    frameRange: [number, number];
+    everyNthFrame: number;
+}) => number;

package/dist/functions/helpers/get-rendered-frames-progress.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRenderedFramesProgress = void 0;
+const chunk_progress_1 = require("../../shared/chunk-progress");
+const constants_1 = require("../../shared/constants");
+const parse_chunk_key_1 = require("../../shared/parse-chunk-key");
+const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
+const plan_frame_ranges_1 = require("../chunk-optimization/plan-frame-ranges");
+const getRenderedFramesProgress = ({ contents, renderId, framesPerLambda, everyNthFrame, frameRange, }) => {
+    const chunkProgress = {};
+    const { chunks } = (0, plan_frame_ranges_1.planFrameRanges)({
+        everyNthFrame,
+        frameRange,
+        framesPerLambda,
+    });
+    // Sort, so only the latest attempt is used
+    const sortedChunks = contents
+        .filter((c) => {
+        return c.Key.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId));
+    })
+        .sort((a, b) => {
+        return a.Key.localeCompare(b.Key);
+    });
+    for (const chunk of sortedChunks) {
+        const key = (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(chunk.Key);
+        chunkProgress[key.chunk] = (0, chunk_progress_1.getProgressOfChunk)(chunk.ETag);
+    }
+    for (const chunk of contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); })) {
+        const parsed = (0, parse_chunk_key_1.parseLambdaChunkKey)(chunk.Key);
+        const frameRangeInChunk = chunks[parsed.chunk];
+        chunkProgress[parsed.chunk] =
+            frameRangeInChunk[1] - frameRangeInChunk[0] + 1;
+    }
+    const framesRendered = Object.values(chunkProgress).reduce((a, b) => a + b, 0);
+    return framesRendered;
+};
+exports.getRenderedFramesProgress = getRenderedFramesProgress;

package/dist/functions/launch.js

@@ -1,12 +1,33 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchHandler = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = __importStar(require("fs"));
+const path_1 = require("path");
 const remotion_1 = require("remotion");
 const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
@@ -29,7 +50,6 @@ const find_output_file_in_bucket_1 = require("./helpers/find-output-file-in-buck
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
 const get_files_to_delete_1 = require("./helpers/get-files-to-delete");
-const get_lambdas_invoked_stats_1 = require("./helpers/get-lambdas-invoked-stats");
 const get_output_url_from_metadata_1 = require("./helpers/get-output-url-from-metadata");
 const inspect_errors_1 = require("./helpers/inspect-errors");
 const io_1 = require("./helpers/io");
@@ -223,6 +243,8 @@ const innerLaunchHandler = async (params, options) => {
         renderId: params.renderId,
         outName: (_b = params.outName) !== null && _b !== void 0 ? _b : undefined,
         privacy: params.privacy,
+        everyNthFrame: params.everyNthFrame,
+        frameRange: realFrameRange,
     };
     const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName, typeof params.outName === 'string' || typeof params.outName === 'undefined'
         ? null
@@ -264,27 +286,17 @@ const innerLaunchHandler = async (params, options) => {
     }));
     reqSend.end();
     let lastProgressUploaded = 0;
-    let encodingStop = null;
-    const onProgress = (framesEncoded, start) => {
+    const onProgress = (framesEncoded) => {
         const relativeProgress = framesEncoded / frameCount.length;
         const deltaSinceLastProgressUploaded = relativeProgress - lastProgressUploaded;
-        if (relativeProgress === 1) {
-            encodingStop = Date.now();
-        }
         if (deltaSinceLastProgressUploaded < 0.1) {
             return;
         }
         lastProgressUploaded = relativeProgress;
-        const encodingProgress = {
-            framesEncoded,
-            totalFrames: frameCount.length,
-            doneIn: encodingStop ? encodingStop - start : null,
-            timeToInvoke: null,
-        };
         (0, io_1.lambdaWriteFile)({
             bucketName: params.bucketName,
             key: (0, constants_1.encodingProgressKey)(params.renderId),
-            body: JSON.stringify(encodingProgress),
+            body: String(framesEncoded),
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
@@ -338,24 +350,35 @@ const innerLaunchHandler = async (params, options) => {
         throw new Error('Stopping Lambda function because error occurred: ' + errors[0].stack);
     };
     const fps = comp.fps / params.everyNthFrame;
-    const { outfile, cleanupChunksProm, encodingStart } = await (0, concat_videos_1.concatVideosS3)({
+    const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
+    if ((0, fs_1.existsSync)(outdir)) {
+        (fs_1.rmSync !== null && fs_1.rmSync !== void 0 ? fs_1.rmSync : fs_1.rmdirSync)(outdir, {
+            recursive: true,
+        });
+    }
+    (0, fs_1.mkdirSync)(outdir);
+    const files = await (0, concat_videos_1.getAllFilesS3)({
         bucket: params.bucketName,
         expectedFiles: chunkCount,
-        onProgress,
-        numberOfFrames: frameCount.length,
+        outdir,
         renderId: params.renderId,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        codec: params.codec,
         expectedBucketOwner: options.expectedBucketOwner,
+        onErrors,
+    });
+    const encodingStart = Date.now();
+    const { outfile, cleanupChunksProm } = await (0, concat_videos_1.concatVideosS3)({
+        onProgress,
+        numberOfFrames: frameCount.length,
+        codec: params.codec,
         fps,
         numberOfGifLoops: params.numberOfGifLoops,
         ffmpegExecutable: null,
         remotionRoot: process.cwd(),
-        onErrors,
+        files,
+        outdir,
     });
-    if (!encodingStop) {
-        encodingStop = Date.now();
-    }
+    const encodingStop = Date.now();
     const outputSize = fs_1.default.statSync(outfile);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
@@ -373,22 +396,10 @@ const innerLaunchHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
     });
-    const finalEncodingProgress = {
-        framesEncoded: frameCount.length,
-        totalFrames: frameCount.length,
-        doneIn: encodingStop ? encodingStop - encodingStart : null,
-        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,
         key: (0, constants_1.encodingProgressKey)(params.renderId),
-        body: JSON.stringify(finalEncodingProgress),
+        body: String(frameCount.length),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,

package/dist/functions/renderer.js

@@ -9,13 +9,11 @@ const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const aws_clients_1 = require("../shared/aws-clients");
+const chunk_progress_1 = require("../shared/chunk-progress");
 const constants_1 = require("../shared/constants");
 const deserialize_input_props_1 = require("../shared/deserialize-input-props");
-const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
-const get_files_in_folder_1 = require("./helpers/get-files-in-folder");
-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) => {
@@ -64,9 +62,17 @@ const renderHandler = async (params, options, logs) => {
             inputProps,
             frameRange: params.frameRange,
             onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
-                if (renderedFrames % 10 === 0 &&
+                if (renderedFrames % 5 === 0 &&
                     renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
                     console.log(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                    (0, chunk_progress_1.writeLambdaInitializedFile)({
+                        attempt: params.attempt,
+                        bucketName: params.bucketName,
+                        chunk: params.chunk,
+                        expectedBucketOwner: options.expectedBucketOwner,
+                        framesRendered: renderedFrames,
+                        renderId: params.renderId,
+                    }).catch((err) => reject(err));
                 }
                 const allFrames = renderer_1.RenderInternals.getFramesToRender(params.frameRange, params.everyNthFrame);
                 if (renderedFrames === allFrames.length) {
@@ -76,26 +82,13 @@ const renderHandler = async (params, options, logs) => {
             },
             concurrency: params.concurrencyPerLambda,
             onStart: () => {
-                (0, io_1.lambdaWriteFile)({
-                    privacy: 'private',
+                (0, chunk_progress_1.writeLambdaInitializedFile)({
+                    attempt: params.attempt,
                     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)(),
+                    chunk: params.chunk,
                     expectedBucketOwner: options.expectedBucketOwner,
-                    downloadBehavior: null,
-                    customCredentials: null,
+                    framesRendered: 0,
+                    renderId: params.renderId,
                 }).catch((err) => reject(err));
             },
             puppeteerInstance: browserInstance,

package/dist/functions/still.js

@@ -93,6 +93,8 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         renderId,
         outName: (_b = lambdaParams.outName) !== null && _b !== void 0 ? _b : undefined,
         privacy: lambdaParams.privacy,
+        everyNthFrame: 1,
+        frameRange: [lambdaParams.frame, lambdaParams.frame],
     };
     await (0, io_1.lambdaWriteFile)({
         bucketName,

package/dist/shared/aws-clients.d.ts

@@ -3,6 +3,7 @@ import { IAMClient } from '@aws-sdk/client-iam';
 import { LambdaClient } from '@aws-sdk/client-lambda';
 import { S3Client } from '@aws-sdk/client-s3';
 import { ServiceQuotasClient } from '@aws-sdk/client-service-quotas';
+import { STSClient } from '@aws-sdk/client-sts';
 import type { AwsRegion } from '../pricing/aws-regions';
 export declare type ServiceMapping = {
     s3: S3Client;
@@ -10,6 +11,7 @@ export declare type ServiceMapping = {
     iam: IAMClient;
     lambda: LambdaClient;
     servicequotas: ServiceQuotasClient;
+    sts: STSClient;
 };
 export declare type CustomCredentialsWithoutSensitiveData = {
     endpoint: string;
@@ -28,3 +30,4 @@ export declare const getS3Client: (region: AwsRegion, customCredentials: CustomC
 export declare const getLambdaClient: (region: AwsRegion) => LambdaClient;
 export declare const getIamClient: (region: AwsRegion) => IAMClient;
 export declare const getServiceQuotasClient: (region: AwsRegion) => ServiceQuotasClient;
+export declare const getStsClient: (region: AwsRegion) => STSClient;