@remotion/lambda 3.3.6 → 3.3.8

package/dist/admin/generate-etag-list.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/admin/generate-etag-list.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const crypto_1 = __importDefault(require("crypto"));
+const fs_1 = require("fs");
+const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
+const chunks = [];
+for (let i = 0; i < 2000; i++) {
+    const etag = `"${md5(String(i))}"`;
+    chunks.push(etag);
+}
+(0, fs_1.writeFileSync)('etags.json', JSON.stringify(chunks));

package/dist/admin/make-layer-public.js

@@ -20,6 +20,17 @@ const layerInfo = {
         'us-east-1': [],
         'us-east-2': [],
         'us-west-2': [],
+        'af-south-1': [],
+        'ap-east-1': [],
+        'ap-northeast-2': [],
+        'ap-northeast-3': [],
+        'ca-central-1': [],
+        'eu-north-1': [],
+        'eu-south-1': [],
+        'eu-west-3': [],
+        'me-south-1': [],
+        'sa-east-1': [],
+        'us-west-1': [],
     },
     x86_64: {
         'ap-northeast-1': [],
@@ -32,6 +43,17 @@ const layerInfo = {
         'us-east-1': [],
         'us-east-2': [],
         'us-west-2': [],
+        'af-south-1': [],
+        'ap-east-1': [],
+        'ap-northeast-2': [],
+        'ap-northeast-3': [],
+        'ca-central-1': [],
+        'eu-north-1': [],
+        'eu-south-1': [],
+        'eu-west-3': [],
+        'me-south-1': [],
+        'sa-east-1': [],
+        'us-west-1': [],
     },
 };
 const makeLayerPublic = async () => {
@@ -43,7 +65,7 @@ const makeLayerPublic = async () => {
                 const { Version, LayerArn } = await (0, aws_clients_1.getLambdaClient)(region).send(new client_lambda_1.PublishLayerVersionCommand({
                     Content: {
                         S3Bucket: 'remotionlambda-binaries-' + region,
-                        S3Key: `remotion-layer-${layer}-v8-${architecture}.zip`,
+                        S3Key: `remotion-layer-${layer}-v9-${architecture}.zip`,
                     },
                     LayerName: layerName,
                     LicenseInfo: layer === 'chromium'

package/dist/api/deploy-site.d.ts

@@ -18,6 +18,11 @@ export declare type DeploySiteInput = {
 export declare type DeploySiteOutput = Promise<{
     serveUrl: string;
     siteName: string;
+    stats: {
+        uploadedFiles: number;
+        deletedFiles: number;
+        untouchedFiles: number;
+    };
 }>;
 /**
  * @description Deploys a Remotion project to an S3 bucket to prepare it for rendering on AWS Lambda.

package/dist/api/deploy-site.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploySite = void 0;
-const delete_site_1 = require("../api/delete-site");
+const io_1 = require("../functions/helpers/io");
 const bundle_site_1 = require("../shared/bundle-site");
 const constants_1 = require("../shared/constants");
 const get_account_id_1 = require("../shared/get-account-id");
+const get_s3_operations_1 = require("../shared/get-s3-operations");
 const make_s3_url_1 = require("../shared/make-s3-url");
 const random_hash_1 = require("../shared/random-hash");
 const validate_aws_region_1 = require("../shared/validate-aws-region");
@@ -28,37 +29,54 @@ const deploySite = async ({ bucketName, entryPoint, siteName, options, region, }
     (0, validate_bucketname_1.validateBucketName)(bucketName, { mustStartWithRemotion: true });
     const siteId = siteName !== null && siteName !== void 0 ? siteName : (0, random_hash_1.randomHash)();
     (0, validate_site_name_1.validateSiteName)(siteId);
+    const accountId = await (0, get_account_id_1.getAccountId)({ region });
     const bucketExists = await (0, bucket_exists_1.bucketExistsInRegion)({
         bucketName,
         region,
-        expectedBucketOwner: await (0, get_account_id_1.getAccountId)({ region }),
+        expectedBucketOwner: accountId,
     });
     if (!bucketExists) {
         throw new Error(`No bucket with the name ${bucketName} exists`);
     }
     const subFolder = (0, constants_1.getSitesKey)(siteId);
-    await (0, delete_site_1.deleteSite)({
-        bucketName,
-        onAfterItemDeleted: () => undefined,
-        region,
-        siteName: siteId,
-    });
-    const bundled = await (0, bundle_site_1.bundleSite)(entryPoint, (_a = options === null || options === void 0 ? void 0 : options.onBundleProgress) !== null && _a !== void 0 ? _a : (() => undefined), {
-        publicPath: `/${subFolder}/`,
-        webpackOverride: (_b = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
-        enableCaching: (_c = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _c !== void 0 ? _c : true,
-        publicDir: options === null || options === void 0 ? void 0 : options.publicDir,
-        rootDir: options === null || options === void 0 ? void 0 : options.rootDir,
+    const [files, bundled] = await Promise.all([
+        (0, io_1.lambdaLs)({
+            bucketName,
+            expectedBucketOwner: accountId,
+            region,
+            prefix: subFolder,
+        }),
+        (0, bundle_site_1.bundleSite)(entryPoint, (_a = options === null || options === void 0 ? void 0 : options.onBundleProgress) !== null && _a !== void 0 ? _a : (() => undefined), {
+            publicPath: `/${subFolder}/`,
+            webpackOverride: (_b = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
+            enableCaching: (_c = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _c !== void 0 ? _c : true,
+            publicDir: options === null || options === void 0 ? void 0 : options.publicDir,
+            rootDir: options === null || options === void 0 ? void 0 : options.rootDir,
+        }),
+    ]);
+    const { toDelete, toUpload, existingCount } = await (0, get_s3_operations_1.getS3DiffOperations)({
+        objects: files,
+        bundle: bundled,
+        prefix: subFolder,
     });
     await Promise.all([
         (0, upload_dir_1.uploadDir)({
             bucket: bucketName,
             region,
-            dir: bundled,
+            localDir: bundled,
             onProgress: (_d = options === null || options === void 0 ? void 0 : options.onUploadProgress) !== null && _d !== void 0 ? _d : (() => undefined),
-            folder: subFolder,
+            keyPrefix: subFolder,
             privacy: 'public',
+            toUpload,
         }),
+        Promise.all(toDelete.map((d) => {
+            return (0, io_1.lambdaDeleteFile)({
+                bucketName,
+                customCredentials: null,
+                key: d.Key,
+                region,
+            });
+        })),
         (0, enable_s3_website_1.enableS3Website)({
             region,
             bucketName,
@@ -67,6 +85,11 @@ const deploySite = async ({ bucketName, entryPoint, siteName, options, region, }
     return {
         serveUrl: (0, make_s3_url_1.makeS3ServeUrl)({ bucketName, subFolder, region }),
         siteName: siteId,
+        stats: {
+            uploadedFiles: toUpload.length,
+            deletedFiles: toDelete.length,
+            untouchedFiles: existingCount,
+        },
     };
 };
 exports.deploySite = deploySite;

package/dist/api/get-aws-client.d.ts

@@ -3,6 +3,7 @@ import * as IamSdk from '@aws-sdk/client-iam';
 import * as LambdaSDK from '@aws-sdk/client-lambda';
 import * as S3SDK from '@aws-sdk/client-s3';
 import * as ServiceQuotasSDK from '@aws-sdk/client-service-quotas';
+import * as StsSdk from '@aws-sdk/client-sts';
 import type { AwsRegion } from '../client';
 import type { CustomCredentials, ServiceMapping } from '../shared/aws-clients';
 export declare type GetAwsClientInput<T extends keyof ServiceMapping> = {
@@ -16,6 +17,7 @@ declare type SdkMapping = {
     iam: typeof IamSdk;
     lambda: typeof LambdaSDK;
     servicequotas: typeof ServiceQuotasSDK;
+    sts: typeof StsSdk;
 };
 export declare type GetAwsClientOutput<T extends keyof ServiceMapping> = {
     client: ServiceMapping[T];

package/dist/api/get-aws-client.js

@@ -29,6 +29,7 @@ const IamSdk = __importStar(require("@aws-sdk/client-iam"));
 const LambdaSDK = __importStar(require("@aws-sdk/client-lambda"));
 const S3SDK = __importStar(require("@aws-sdk/client-s3"));
 const ServiceQuotasSDK = __importStar(require("@aws-sdk/client-service-quotas"));
+const StsSdk = __importStar(require("@aws-sdk/client-sts"));
 const aws_clients_1 = require("../shared/aws-clients");
 /**
  * @description Gets the full AWS SDK and an instantiated client for an AWS service
@@ -51,6 +52,7 @@ const getAwsClient = ({ region, service, customCredentials, }) => {
             iam: IamSdk,
             s3: S3SDK,
             servicequotas: ServiceQuotasSDK,
+            sts: StsSdk,
         }[service],
     };
 };

package/dist/api/iam-validation/simulate-rule.js

@@ -2,32 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulateRule = void 0;
 const client_iam_1 = require("@aws-sdk/client-iam");
-const aws_policies_1 = require("aws-policies");
 const aws_clients_1 = require("../../shared/aws-clients");
 const simulateRule = async (options) => {
     var _a;
     try {
-        if (options.actionNames.includes(aws_policies_1.iam.GetUser)) {
-            try {
-                await (0, aws_clients_1.getIamClient)(options.region).send(new client_iam_1.GetUserCommand({}));
-                const result = [
-                    {
-                        decision: 'allowed',
-                        name: aws_policies_1.iam.GetUser,
-                    },
-                ];
-                return result;
-            }
-            catch (err) {
-                const result = [
-                    {
-                        decision: 'explicitDeny',
-                        name: aws_policies_1.iam.GetUser,
-                    },
-                ];
-                return result;
-            }
-        }
         const res = await (0, aws_clients_1.getIamClient)(options.region).send(new client_iam_1.SimulatePrincipalPolicyCommand({
             ActionNames: options.actionNames,
             PolicySourceArn: options.arn,

package/dist/api/iam-validation/simulate.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulatePermissions = exports.logPermissionOutput = void 0;
-const client_iam_1 = require("@aws-sdk/client-iam");
+const client_sts_1 = require("@aws-sdk/client-sts");
 const aws_clients_1 = require("../../shared/aws-clients");
 const simulate_rule_1 = require("./simulate-rule");
 const user_permissions_1 = require("./user-permissions");
@@ -26,15 +26,27 @@ exports.logPermissionOutput = logPermissionOutput;
  */
 const simulatePermissions = async (options) => {
     var _a;
-    const user = await (0, aws_clients_1.getIamClient)(options.region).send(new client_iam_1.GetUserCommand({}));
-    if (!user || !user.User) {
-        throw new Error('No valid AWS user detected');
+    const callerIdentity = await (0, aws_clients_1.getStsClient)(options.region).send(new client_sts_1.GetCallerIdentityCommand({}));
+    if (!callerIdentity || !callerIdentity.Arn) {
+        throw new Error('No valid AWS Caller Identity detected');
+    }
+    const callerIdentityArnComponents = callerIdentity.Arn.match(/arn:aws:([^:]+)::(\d+):([^/]+)(.*)/);
+    if (!callerIdentityArnComponents) {
+        throw new Error('Unknown AWS Caller Identity ARN detected');
+    }
+    const callerIdentityArnType = callerIdentityArnComponents[1];
+    let callerArn;
+    if (callerIdentityArnType === 'iam' && callerIdentityArnComponents[3] === 'user') {
+        callerArn = callerIdentity.Arn;
+    }
+    else {
+        throw new Error('Unsupported AWS Caller Identity ARN detected');
     }
     const results = [];
     for (const per of user_permissions_1.requiredPermissions) {
         const result = await (0, simulate_rule_1.simulateRule)({
             actionNames: per.actions,
-            arn: user.User.Arn,
+            arn: callerArn,
             region: options.region,
             resource: per.resource,
             retries: 2,

package/dist/api/iam-validation/user-permissions.js

@@ -15,12 +15,6 @@ exports.requiredPermissions = [
         ],
         resource: ['*'],
     },
-    {
-        id: 'Identity',
-        actions: [aws_policies_1.iam.GetUser],
-        // eslint-disable-next-line no-template-curly-in-string
-        resource: ['arn:aws:iam::*:user/${aws:username}'],
-    },
     {
         id: 'PermissionValidation',
         actions: [aws_policies_1.iam.SimulatePrincipalPolicy],

package/dist/api/upload-dir.d.ts

@@ -11,11 +11,12 @@ export declare type MockFile = {
     content: string;
 };
 export declare const getDirFiles: (entry: string) => MockFile[];
-export declare const uploadDir: ({ bucket, region, dir, onProgress, folder, privacy, }: {
+export declare const uploadDir: ({ bucket, region, localDir, onProgress, keyPrefix, privacy, toUpload, }: {
     bucket: string;
     region: AwsRegion;
-    dir: string;
-    folder: string;
+    localDir: string;
+    keyPrefix: string;
     onProgress: (progress: UploadDirProgress) => void;
     privacy: Privacy;
+    toUpload: string[];
 }) => Promise<void>;

package/dist/api/upload-dir.js

@@ -15,31 +15,45 @@ const getDirFiles = (entry) => {
     throw new TypeError('should only be executed in test ' + JSON.stringify(entry));
 };
 exports.getDirFiles = getDirFiles;
-const uploadDir = async ({ bucket, region, dir, onProgress, folder, privacy, }) => {
-    async function getFiles(directory) {
-        const dirents = await fs_1.promises.readdir(directory, { withFileTypes: true });
-        const _files = await Promise.all(dirents.map(async (dirent) => {
-            const res = path_1.default.resolve(directory, dirent.name);
-            const { size } = await fs_1.promises.stat(res);
-            return dirent.isDirectory()
-                ? getFiles(res)
-                : [
-                    {
-                        name: res,
-                        size,
-                    },
-                ];
-        }));
-        return _files.flat(1);
-    }
-    const files = await getFiles(dir);
+async function getFiles(directory, originalDirectory, toUpload) {
+    const dirents = await fs_1.promises.readdir(directory, { withFileTypes: true });
+    const _files = await Promise.all(dirents
+        .map((dirent) => {
+        const res = path_1.default.resolve(directory, dirent.name);
+        return [dirent, res];
+    })
+        .filter(([dirent, res]) => {
+        const relative = path_1.default.relative(originalDirectory, res);
+        if (dirent.isDirectory()) {
+            return true;
+        }
+        if (!toUpload.includes(relative)) {
+            return false;
+        }
+        return true;
+    })
+        .map(async ([dirent, res]) => {
+        const { size } = await fs_1.promises.stat(res);
+        return dirent.isDirectory()
+            ? getFiles(res, originalDirectory, toUpload)
+            : [
+                {
+                    name: res,
+                    size,
+                },
+            ];
+    }));
+    return _files.flat(1);
+}
+const uploadDir = async ({ bucket, region, localDir, onProgress, keyPrefix, privacy, toUpload, }) => {
+    const files = await getFiles(localDir, localDir, toUpload);
     const progresses = {};
     for (const file of files) {
         progresses[file.name] = 0;
     }
     const client = (0, aws_clients_1.getS3Client)(region, null);
     const uploads = files.map(async (filePath) => {
-        const Key = (0, make_s3_key_1.makeS3Key)(folder, dir, filePath.name);
+        const Key = (0, make_s3_key_1.makeS3Key)(keyPrefix, localDir, filePath.name);
         const Body = (0, fs_1.createReadStream)(filePath.name);
         const ContentType = mime_types_1.default.lookup(Key) || 'application/octet-stream';
         const ACL = privacy === 'no-acl'

package/dist/cli/commands/render/progress.d.ts

@@ -3,12 +3,13 @@ import type { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
 declare type LambdaInvokeProgress = {
     totalLambdas: number | null;
     lambdasInvoked: number;
-    doneIn: number | null;
 };
 declare type ChunkProgress = {
+    doneIn: number | null;
+    framesRendered: number;
+    totalFrames: number | null;
     totalChunks: number | null;
     chunksInvoked: number;
-    doneIn: number | null;
 };
 declare type MultiRenderProgress = {
     lambdaInvokeProgress: LambdaInvokeProgress;
@@ -22,11 +23,13 @@ declare type DownloadedInfo = {
     downloaded: number;
     doneIn: number | null;
 };
-export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, }: {
+export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }: {
     progress: MultiRenderProgress;
     steps: number;
     downloadInfo: DownloadedInfo | null;
     retriesInfo: ChunkRetry[];
     verbose: boolean;
+    timeToEncode: number | null;
+    totalFrames: number | null;
 }) => string;
 export {};

package/dist/cli/commands/render/progress.js

@@ -2,45 +2,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
 const cli_1 = require("@remotion/cli");
+const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
+const truthy_1 = require("../../../shared/truthy");
 const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
-    const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
-    const progress = doneIn
-        ? 1
-        : totalLambdas === null
-            ? 0
-            : lambdasInvoked / totalLambdas;
+    const { lambdasInvoked, totalLambdas } = invokeProgress;
+    const progress = totalLambdas === null ? 0 : lambdasInvoked / totalLambdas;
     return [
         '⚡️',
         `(1/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Invoking' : 'Invoked'} lambdas`,
-        doneIn === null
-            ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        `${progress === 0 ? 'Invoked' : 'Invoking'} lambdas`,
+        progress === 1
+            ? cli_1.CliInternals.chalk.gray('100%')
+            : `${Math.round(progress * 100)}%`,
         retriesInfo.length > 0 ? `(+${retriesInfo.length} retries)` : [],
     ].join(' ');
 };
-const makeChunkProgress = ({ chunkProgress, invokeProgress, totalSteps, }) => {
-    const lambdaIsDone = invokeProgress.doneIn !== null;
+const makeRenderProgress = ({ chunkProgress, totalSteps, }) => {
     const { chunksInvoked, totalChunks, doneIn } = chunkProgress;
-    const progress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
-    const shouldShow = lambdaIsDone || progress > 0;
-    if (!shouldShow) {
-        return '';
-    }
-    return [
+    const renderProgress = chunkProgress.totalFrames === null
+        ? 0
+        : chunkProgress.framesRendered / chunkProgress.totalFrames;
+    const encodingProgress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
+    const frames = chunkProgress.totalFrames === null
+        ? null
+        : `(${chunkProgress.framesRendered}/${chunkProgress.totalFrames})`;
+    const first = [
         '🧩',
         `(2/${totalSteps})`,
-        cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Rendering' : 'Rendered'} chunks`,
+        cli_1.CliInternals.makeProgressBar(renderProgress),
+        doneIn === null ? 'Rendering frames' : 'Rendered frames',
+        doneIn === null ? frames : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+    const second = [
+        '🏗️ ',
+        `(3/${totalSteps})`,
+        cli_1.CliInternals.makeProgressBar(encodingProgress),
+        `${doneIn === null ? 'Encoding' : 'Encoded'} chunks`,
         doneIn === null
-            ? `${Math.round(progress * 100)}%`
+            ? `${Math.round(encodingProgress * 100)}%`
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
+    return [first, second];
 };
-const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, }) => {
-    const { framesEncoded, totalFrames, doneIn } = encodingProgress;
+const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, totalFrames, timeToEncode, }) => {
+    const { framesEncoded } = encodingProgress;
     const progress = totalFrames === null ? 0 : framesEncoded / totalFrames;
     const chunksDone = chunkProgress.doneIn !== null;
     const shouldShow = progress > 0 || chunksDone;
@@ -49,12 +58,12 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
     }
     return [
         '📽 ',
-        `(3/${totalSteps})`,
+        `(4/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Combining' : 'Combined'} videos`,
-        doneIn === null
+        `${timeToEncode === null ? 'Combining' : 'Combined'} videos`,
+        timeToEncode === null
             ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+            : cli_1.CliInternals.chalk.gray(`${timeToEncode}ms`),
     ].join(' ');
 };
 const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
@@ -64,7 +73,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     if (skipped) {
         return [
             '🪣 ',
-            `(4/${totalSteps})`,
+            `(5/${totalSteps})`,
             cli_1.CliInternals.chalk.blueBright(`Not cleaning up because --log=verbose was set`),
         ].join(' ');
     }
@@ -72,7 +81,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     const progress = filesDeleted / minFilesToDelete;
     return [
         '🪣 ',
-        `(4/${totalSteps})`,
+        `(5/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Cleaning up' : 'Cleaned up'} artifacts`,
         doneIn === null
@@ -83,7 +92,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
 const makeDownloadProgress = (downloadInfo, totalSteps) => {
     return [
         '💾',
-        `(5/${totalSteps})`,
+        `(6/${totalSteps})`,
         downloadInfo.totalSize === null
             ? cli_1.CliInternals.getFileSizeDownloadBar(downloadInfo.downloaded)
             : cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
@@ -101,40 +110,41 @@ const makeDownloadProgress = (downloadInfo, totalSteps) => {
     ].join(' ');
 };
 const makeMultiProgressFromStatus = (status) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f;
     return {
         chunkProgress: {
             chunksInvoked: status.chunks,
             totalChunks: (_b = (_a = status.renderMetadata) === null || _a === void 0 ? void 0 : _a.totalChunks) !== null && _b !== void 0 ? _b : null,
             doneIn: status.timeToFinishChunks,
+            framesRendered: status.framesRendered,
+            totalFrames: status.renderMetadata
+                ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+                : null,
         },
         encodingProgress: {
             framesEncoded: (_d = (_c = status.encodingStatus) === null || _c === void 0 ? void 0 : _c.framesEncoded) !== null && _d !== void 0 ? _d : 0,
-            totalFrames: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.videoConfig.durationInFrames) !== null && _f !== void 0 ? _f : 1,
-            doneIn: (_h = (_g = status.encodingStatus) === null || _g === void 0 ? void 0 : _g.doneIn) !== null && _h !== void 0 ? _h : null,
-            timeToInvoke: (_k = (_j = status.encodingStatus) === null || _j === void 0 ? void 0 : _j.timeToInvoke) !== null && _k !== void 0 ? _k : null,
         },
         lambdaInvokeProgress: {
-            doneIn: status.timeToInvokeLambdas,
             lambdasInvoked: status.lambdasInvoked,
-            totalLambdas: (_m = (_l = status.renderMetadata) === null || _l === void 0 ? void 0 : _l.estimatedRenderLambdaInvokations) !== null && _m !== void 0 ? _m : null,
+            totalLambdas: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.estimatedRenderLambdaInvokations) !== null && _f !== void 0 ? _f : null,
         },
         cleanupInfo: status.cleanup,
     };
 };
 exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, }) => {
+const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }) => {
     return [
         makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
-        makeChunkProgress({
+        ...makeRenderProgress({
             chunkProgress: progress.chunkProgress,
-            invokeProgress: progress.lambdaInvokeProgress,
             totalSteps: steps,
         }),
         makeEncodingProgress({
             encodingProgress: progress.encodingProgress,
             chunkProgress: progress.chunkProgress,
             totalSteps: steps,
+            timeToEncode,
+            totalFrames,
         }),
         makeCleanupProgress(progress.cleanupInfo, steps, verbose),
         downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,

package/dist/cli/commands/render/render.js

@@ -97,7 +97,7 @@ const renderCommand = async (args, remotionRoot) => {
             }
             : undefined,
     });
-    const totalSteps = downloadName ? 5 : 4;
+    const totalSteps = downloadName ? 6 : 5;
     const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
     log_1.Log.info(cli_1.CliInternals.chalk.gray(`bucket = ${res.bucketName}, function = ${functionName}`));
     log_1.Log.info(cli_1.CliInternals.chalk.gray(`renderId = ${res.renderId}, codec = ${codec} (${reason})`));
@@ -117,6 +117,8 @@ const renderCommand = async (args, remotionRoot) => {
         downloadInfo: null,
         retriesInfo: status.retriesInfo,
         verbose,
+        totalFrames: getTotalFrames(status),
+        timeToEncode: status.timeToEncode,
     }));
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -134,6 +136,8 @@ const renderCommand = async (args, remotionRoot) => {
             retriesInfo: newStatus.retriesInfo,
             downloadInfo: null,
             verbose,
+            timeToEncode: newStatus.timeToEncode,
+            totalFrames: getTotalFrames(newStatus),
         }));
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
@@ -142,6 +146,8 @@ const renderCommand = async (args, remotionRoot) => {
                 downloadInfo: null,
                 retriesInfo: newStatus.retriesInfo,
                 verbose,
+                timeToEncode: newStatus.timeToEncode,
+                totalFrames: getTotalFrames(newStatus),
             }));
             if (downloadName) {
                 const downloadStart = Date.now();
@@ -161,6 +167,8 @@ const renderCommand = async (args, remotionRoot) => {
                                 totalSize,
                             },
                             verbose,
+                            timeToEncode: newStatus.timeToEncode,
+                            totalFrames: getTotalFrames(newStatus),
                         }));
                     },
                 });
@@ -174,6 +182,8 @@ const renderCommand = async (args, remotionRoot) => {
                         totalSize: sizeInBytes,
                     },
                     verbose,
+                    timeToEncode: newStatus.timeToEncode,
+                    totalFrames: getTotalFrames(newStatus),
                 }));
                 log_1.Log.info();
                 log_1.Log.info();
@@ -226,3 +236,8 @@ const renderCommand = async (args, remotionRoot) => {
     }
 };
 exports.renderCommand = renderCommand;
+function getTotalFrames(status) {
+    return status.renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+        : null;
+}