@remotion/lambda 3.3.6 → 3.3.8

package/dist/cli/commands/sites/create.js

@@ -7,6 +7,7 @@ exports.sitesCreateSubcommand = exports.SITES_CREATE_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
+const remotion_1 = require("remotion");
 const deploy_site_1 = require("../../../api/deploy-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const constants_1 = require("../../../shared/constants");
@@ -57,6 +58,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
             doneIn: null,
             totalSize: null,
             sizeUploaded: 0,
+            stats: null,
         },
     };
     const updateProgress = () => {
@@ -79,7 +81,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
     updateProgress();
     const bundleStart = Date.now();
     const uploadStart = Date.now();
-    const { serveUrl, siteName } = await (0, deploy_site_1.deploySite)({
+    const { serveUrl, siteName, stats } = await (0, deploy_site_1.deploySite)({
         entryPoint: absoluteFile,
         siteName: desiredSiteName,
         bucketName,
@@ -95,6 +97,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
                     sizeUploaded: p.sizeUploaded,
                     totalSize: p.totalSize,
                     doneIn: null,
+                    stats: null,
                 };
                 updateProgress();
             },
@@ -108,6 +111,11 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
         sizeUploaded: 1,
         totalSize: 1,
         doneIn: uploadDuration,
+        stats: {
+            addedFiles: stats.uploadedFiles,
+            removedFiles: stats.deletedFiles,
+            untouchedFiles: stats.untouchedFiles,
+        },
     };
     updateProgress();
     log_1.Log.info();
@@ -117,6 +125,8 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
     log_1.Log.info(`Site Name: ${siteName}`);
     log_1.Log.info();
     log_1.Log.info(cli_1.CliInternals.chalk.blueBright('ℹ️ If you make changes to your code, you need to redeploy the site. You can overwrite the existing site by running:'));
-    log_1.Log.info(cli_1.CliInternals.chalk.blueBright(`npx remotion lambda sites create ${args[0]} --site-name=${siteName}`));
+    log_1.Log.info(cli_1.CliInternals.chalk.blueBright(['npx remotion lambda sites create', args[0], `--site-name=${siteName}`]
+        .filter(remotion_1.Internals.truthy)
+        .join(' ')));
 };
 exports.sitesCreateSubcommand = sitesCreateSubcommand;

package/dist/cli/helpers/progress-bar.d.ts

@@ -9,9 +9,16 @@ export declare type BucketCreationProgress = {
     doneIn: number | null;
 };
 export declare const makeBucketProgress: ({ bucketCreated, websiteEnabled, doneIn, }: BucketCreationProgress) => string;
+declare type UploadStats = {
+    addedFiles: number;
+    removedFiles: number;
+    untouchedFiles: number;
+};
 export declare type DeployToS3Progress = {
     sizeUploaded: number;
     totalSize: number | null;
     doneIn: number | null;
+    stats: UploadStats | null;
 };
-export declare const makeDeployProgressBar: ({ sizeUploaded, totalSize, doneIn, }: DeployToS3Progress) => string;
+export declare const makeDeployProgressBar: ({ sizeUploaded, totalSize, doneIn, stats, }: DeployToS3Progress) => string;
+export {};

package/dist/cli/helpers/progress-bar.js

@@ -30,7 +30,22 @@ const makeBucketProgress = ({ bucketCreated, websiteEnabled, doneIn, }) => {
     ].join(' ');
 };
 exports.makeBucketProgress = makeBucketProgress;
-const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, }) => {
+const makeUploadDiff = ({ stats }) => {
+    if (!stats) {
+        return null;
+    }
+    if (stats.addedFiles === 0 && stats.removedFiles === 0) {
+        return cli_1.CliInternals.chalk.gray(`(Unchanged)`);
+    }
+    const total = stats.addedFiles + stats.removedFiles;
+    return cli_1.CliInternals.chalk.gray(`(${[
+        stats.addedFiles ? `+${stats.addedFiles}` : null,
+        stats.removedFiles ? `-${stats.removedFiles}` : null,
+    ]
+        .filter(remotion_1.Internals.truthy)
+        .join(',')} ${total === 1 ? 'file' : 'files'})`);
+};
+const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, stats, }) => {
     const progress = totalSize === null ? 0 : sizeUploaded / totalSize;
     return [
         '☁️ ',
@@ -42,6 +57,7 @@ const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, }) => {
                 ? `${cli_1.CliInternals.formatBytes(sizeUploaded)}/${cli_1.CliInternals.formatBytes(totalSize)}`
                 : ''
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        makeUploadDiff({ stats }),
     ]
         .filter(remotion_1.Internals.truthy)
         .join(' ');

package/dist/cli/index.js

@@ -97,7 +97,7 @@ const matchCommand = (args, remotionRoot) => {
     (0, quit_1.quit)(1);
 };
 const executeCommand = async (args, remotionRoot) => {
-    var _a, _b;
+    var _a, _b, _c;
     try {
         (0, is_cli_1.setIsCli)(true);
         await matchCommand(args, remotionRoot);
@@ -131,6 +131,11 @@ AWS returned an "AccessDenied" error message meaning a permission is missing. Re
             log_1.Log.error(`
 AWS returned an "TooManyRequestsException" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/rate-limit. The original error message is:
 `.trim());
+        }
+        if ((_c = error.stack) === null || _c === void 0 ? void 0 : _c.includes('The security token included in the request is invalid')) {
+            log_1.Log.error(`
+AWS returned an error message "The security token included in the request is invalid". A possible reason for this is that you did not enable the region in your AWS account under "Account". The original message is: 
+`);
         }
         log_1.Log.error(error.stack);
         (0, quit_1.quit)(1);

package/dist/functions/helpers/concat-videos.d.ts

@@ -2,22 +2,26 @@ import type { FfmpegExecutable } from '@remotion/renderer';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { LambdaCodec } from '../../shared/validate-lambda-codec';
 import type { EnhancedErrorInfo } from './write-lambda-error';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }: {
+export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }: {
     bucket: string;
     expectedFiles: number;
-    onProgress: (frames: number, encodingStart: number) => void;
-    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
-    numberOfFrames: number;
+    outdir: string;
     renderId: string;
     region: AwsRegion;
-    codec: LambdaCodec;
     expectedBucketOwner: string;
+    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
+}) => Promise<string[]>;
+export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, files, outdir, }: {
+    onProgress: (frames: number) => void;
+    numberOfFrames: number;
+    codec: LambdaCodec;
     fps: number;
     numberOfGifLoops: number | null;
     ffmpegExecutable: FfmpegExecutable;
     remotionRoot: string;
+    files: string[];
+    outdir: string;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;
-    encodingStart: number;
 }>;

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

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.concatVideosS3 = void 0;
+exports.concatVideosS3 = exports.getAllFilesS3 = void 0;
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importStar(require("fs"));
 const path_1 = __importStar(require("path"));
@@ -127,34 +127,18 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
         loop().catch((err) => reject(err));
     });
 };
-const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }) => {
+exports.getAllFilesS3 = getAllFilesS3;
+const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, files, outdir, }) => {
     var _a;
-    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 getAllFilesS3({
-        bucket,
-        expectedFiles,
-        outdir,
-        renderId,
-        region,
-        expectedBucketOwner,
-        onErrors,
-    });
     const outfile = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'));
     const combine = (0, timer_1.timer)('Combine videos');
     const filelistDir = renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_FILELIST_TOKEN);
-    const encodingStart = Date.now();
     const codecForCombining = codec === 'h264-mkv' ? 'h264' : codec;
     await (0, renderer_1.combineVideos)({
         files,
         filelistDir,
         output: outfile,
-        onProgress: (p) => onProgress(p, encodingStart),
+        onProgress: (p) => onProgress(p),
         numberOfFrames,
         codec: codecForCombining,
         fps,
@@ -166,6 +150,6 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
     const cleanupChunksProm = ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outdir, {
         recursive: true,
     });
-    return { outfile, cleanupChunksProm, encodingStart };
+    return { outfile, cleanupChunksProm };
 };
 exports.concatVideosS3 = concatVideosS3;

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

@@ -8,7 +8,6 @@ const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-ke
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
 const get_current_architecture_1 = require("./get-current-architecture");
 const get_files_to_delete_1 = require("./get-files-to-delete");
-const get_lambdas_invoked_stats_1 = require("./get-lambdas-invoked-stats");
 const get_retry_stats_1 = require("./get-retry-stats");
 const get_time_to_finish_1 = require("./get-time-to-finish");
 const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }) => {
@@ -41,17 +40,7 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
     const renderSize = contents
         .map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
         .reduce((a, b) => a + b, 0);
-    const { timeToInvokeLambdas } = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)({
-        contents,
-        renderId,
-        estimatedRenderLambdaInvokations: renderMetadata.estimatedRenderLambdaInvokations,
-        startDate: renderMetadata.startedDate,
-        checkIfAllLambdasWereInvoked: false,
-    });
     const retriesInfo = (0, get_retry_stats_1.getRetryStats)({ contents, renderId });
-    if (timeToInvokeLambdas === null) {
-        throw new Error('should have timing for all lambdas');
-    }
     return {
         cost: {
             currency: 'USD',
@@ -81,7 +70,6 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
             renderId,
             type: 'absolute-time',
         }),
-        timeToInvokeLambdas,
         retriesInfo,
         mostExpensiveFrameRanges: (0, get_most_expensive_chunks_1.getMostExpensiveChunks)(parsedTimings, renderMetadata.framesPerLambda),
     };

package/dist/functions/helpers/get-chromium-executable-path.js

@@ -2,9 +2,10 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executablePath = void 0;
-if (/^AWS_Lambda_nodejs(?:10|12|14)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV) !== null && _a !== void 0 ? _a : '') === true) {
+if (/^AWS_Lambda_nodejs(?:10|12|14|16|18)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV) !== null && _a !== void 0 ? _a : '') === true) {
     if (process.env.FONTCONFIG_PATH === undefined) {
         process.env.FONTCONFIG_PATH = '/opt';
+        process.env.FONTCONFIG_FILE = '/opt/fonts.conf';
     }
     process.env.LD_LIBRARY_PATH = '/opt/lib:/opt/bin';
 }

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

@@ -0,0 +1 @@
+"use strict";

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

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

package/dist/functions/helpers/get-encoding-metadata.d.ts

@@ -1,9 +1,5 @@
+import type { _Object } from '@aws-sdk/client-s3';
 import type { EncodingProgress } from '../../defaults';
-import type { AwsRegion } from '../../pricing/aws-regions';
-export declare const getEncodingMetadata: ({ exists, bucketName, renderId, region, expectedBucketOwner, }: {
-    exists: boolean;
-    bucketName: string;
-    renderId: string;
-    region: AwsRegion;
-    expectedBucketOwner: string;
-}) => Promise<EncodingProgress | null>;
+export declare const getEncodingMetadata: ({ exists, }: {
+    exists: _Object | undefined;
+}) => EncodingProgress | null;

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,12 @@ 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,
         };
     }
     const contents = await (0, io_1.lambdaLs)({
@@ -80,14 +82,10 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
     });
     (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,
@@ -137,6 +135,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 +156,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 +190,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 +202,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 +217,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 +238,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 .renderBucketName
             : null,
         mostExpensiveFrameRanges: null,
+        timeToEncode: 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;