@remotion/lambda 4.0.0-alpha.4 → 4.0.0-alpha5

package/dist/cli/commands/compositions/index.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compositionsCommand = exports.COMPOSITIONS_COMMAND = void 0;
+const cli_1 = require("@remotion/cli");
+const __1 = require("../../..");
+const constants_1 = require("../../../shared/constants");
+const validate_serveurl_1 = require("../../../shared/validate-serveurl");
+const args_1 = require("../../args");
+const get_aws_region_1 = require("../../get-aws-region");
+const find_function_name_1 = require("../../helpers/find-function-name");
+const quit_1 = require("../../helpers/quit");
+const log_1 = require("../../log");
+exports.COMPOSITIONS_COMMAND = 'compositions';
+const compositionsCommand = async (args, remotionRoot) => {
+    const serveUrl = args[0];
+    if (!serveUrl) {
+        log_1.Log.error('No serve URL passed.');
+        log_1.Log.info('Pass an additional argument specifying a URL where your Remotion project is hosted.');
+        log_1.Log.info();
+        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.COMPOSITIONS_COMMAND} <serve-url>`);
+        (0, quit_1.quit)(1);
+    }
+    const { chromiumOptions, envVariables, inputProps, logLevel, puppeteerTimeout, } = await cli_1.CliInternals.getCliOptions({
+        type: 'get-compositions',
+        isLambda: true,
+        remotionRoot,
+    });
+    const region = (0, get_aws_region_1.getAwsRegion)();
+    (0, validate_serveurl_1.validateServeUrl)(serveUrl);
+    const functionName = await (0, find_function_name_1.findFunctionName)();
+    const comps = await (0, __1.getCompositionsOnLambda)({
+        functionName,
+        serveUrl,
+        inputProps,
+        region,
+        chromiumOptions,
+        envVariables,
+        logLevel,
+        timeoutInMilliseconds: puppeteerTimeout,
+        forceBucketName: args_1.parsedLambdaCli['force-bucket-name'],
+    });
+    cli_1.CliInternals.printCompositions(comps);
+};
+exports.compositionsCommand = compositionsCommand;

package/dist/cli/commands/functions/deploy.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsDeploySubcommand = exports.FUNCTIONS_DEPLOY_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const log_1 = require("@remotion/cli/dist/log");
+const version_1 = require("remotion/version");
 const deploy_function_1 = require("../../../api/deploy-function");
 const constants_1 = require("../../../shared/constants");
-const validate_architecture_1 = require("../../../shared/validate-architecture");
 const validate_custom_role_arn_1 = require("../../../shared/validate-custom-role-arn");
 const validate_disk_size_in_mb_1 = require("../../../shared/validate-disk-size-in-mb");
 const validate_memory_size_1 = require("../../../shared/validate-memory-size");
@@ -14,33 +13,33 @@ const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 exports.FUNCTIONS_DEPLOY_SUBCOMMAND = 'deploy';
 const functionsDeploySubcommand = async () => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const region = (0, get_aws_region_1.getAwsRegion)();
     const timeoutInSeconds = (_a = args_1.parsedLambdaCli.timeout) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_TIMEOUT;
     const memorySizeInMb = (_b = args_1.parsedLambdaCli.memory) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_MEMORY_SIZE;
     const diskSizeInMb = (_c = args_1.parsedLambdaCli.disk) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_EPHEMERAL_STORAGE_IN_MB;
-    const architecture = (_d = args_1.parsedLambdaCli.architecture) !== null && _d !== void 0 ? _d : constants_1.DEFAULT_ARCHITECTURE;
-    const customRoleArn = (_e = args_1.parsedLambdaCli['custom-role-arn']) !== null && _e !== void 0 ? _e : undefined;
+    const customRoleArn = (_d = args_1.parsedLambdaCli['custom-role-arn']) !== null && _d !== void 0 ? _d : undefined;
     const createCloudWatchLogGroup = !args_1.parsedLambdaCli['disable-cloudwatch'];
-    const cloudWatchLogRetentionPeriodInDays = (_f = args_1.parsedLambdaCli['retention-period']) !== null && _f !== void 0 ? _f : constants_1.DEFAULT_CLOUDWATCH_RETENTION_PERIOD;
+    const cloudWatchLogRetentionPeriodInDays = (_e = args_1.parsedLambdaCli['retention-period']) !== null && _e !== void 0 ? _e : constants_1.DEFAULT_CLOUDWATCH_RETENTION_PERIOD;
     (0, validate_memory_size_1.validateMemorySize)(memorySizeInMb);
     (0, validate_timeout_1.validateTimeout)(timeoutInSeconds);
-    (0, validate_architecture_1.validateArchitecture)(architecture);
     (0, validate_disk_size_in_mb_1.validateDiskSizeInMb)(diskSizeInMb);
     (0, validate_custom_role_arn_1.validateCustomRoleArn)(customRoleArn);
     if (!cli_1.CliInternals.quietFlagProvided()) {
-        log_1.Log.info(cli_1.CliInternals.chalk.gray(`
+        cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray(`
 Region = ${region}
 Memory = ${memorySizeInMb}MB
 Disk size = ${diskSizeInMb}MB
 Timeout = ${timeoutInSeconds}sec
-Version = ${constants_1.CURRENT_VERSION}
-Architecture = ${architecture}
+Version = ${version_1.VERSION}
 CloudWatch Logging Enabled = ${createCloudWatchLogGroup}
 CloudWatch Retention Period = ${cloudWatchLogRetentionPeriodInDays} days
 				`.trim()));
     }
-    const output = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+    const output = cli_1.CliInternals.createOverwriteableCliOutput({
+        quiet: cli_1.CliInternals.quietFlagProvided(),
+        cancelSignal: null,
+    });
     output.update('Deploying Lambda...');
     const { functionName, alreadyExisted } = await (0, deploy_function_1.deployFunction)({
         createCloudWatchLogGroup,
@@ -48,12 +47,11 @@ CloudWatch Retention Period = ${cloudWatchLogRetentionPeriodInDays} days
         timeoutInSeconds,
         memorySizeInMb,
         cloudWatchLogRetentionPeriodInDays,
-        architecture,
         diskSizeInMb,
         customRoleArn,
     });
     if (cli_1.CliInternals.quietFlagProvided()) {
-        log_1.Log.info(functionName);
+        cli_1.CliInternals.Log.info(functionName);
     }
     if (alreadyExisted) {
         output.update(`Already exists as ${functionName}\n`);

package/dist/cli/commands/functions/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsCommand = exports.FUNCTIONS_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const log_1 = require("@remotion/cli/dist/log");
 const constants_1 = require("../../../shared/constants");
 const quit_1 = require("../../helpers/quit");
 const deploy_1 = require("./deploy");
@@ -11,21 +10,21 @@ const rm_1 = require("./rm");
 const rmall_1 = require("./rmall");
 exports.FUNCTIONS_COMMAND = 'functions';
 const printFunctionsHelp = () => {
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} <subcommand>`);
-    log_1.Log.info();
-    log_1.Log.info('Available subcommands:');
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${ls_1.FUNCTIONS_LS_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Lists the functions currently deployed'));
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Deploy a new Lambda function'));
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${rm_1.FUNCTIONS_RM_SUBCOMMAND} <function-name>`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Delete a Lambda function'));
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${rmall_1.FUNCTIONS_RMALL_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Delete all functions in selected region'));
+    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} <subcommand>`);
+    cli_1.CliInternals.Log.info();
+    cli_1.CliInternals.Log.info('Available subcommands:');
+    cli_1.CliInternals.Log.info('');
+    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${ls_1.FUNCTIONS_LS_SUBCOMMAND}`);
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Lists the functions currently deployed'));
+    cli_1.CliInternals.Log.info('');
+    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Deploy a new Lambda function'));
+    cli_1.CliInternals.Log.info('');
+    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${rm_1.FUNCTIONS_RM_SUBCOMMAND} <function-name>`);
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Delete a Lambda function'));
+    cli_1.CliInternals.Log.info('');
+    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.FUNCTIONS_COMMAND} ${rmall_1.FUNCTIONS_RMALL_SUBCOMMAND}`);
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Delete all functions in selected region'));
 };
 const functionsCommand = (args) => {
     if (args[0] === ls_1.FUNCTIONS_LS_SUBCOMMAND) {
@@ -41,7 +40,7 @@ const functionsCommand = (args) => {
         return (0, deploy_1.functionsDeploySubcommand)();
     }
     if (args[0]) {
-        log_1.Log.error(`Subcommand ${args[0]} not found.`);
+        cli_1.CliInternals.Log.error(`Subcommand ${args[0]} not found.`);
         printFunctionsHelp();
         (0, quit_1.quit)(1);
     }

package/dist/cli/commands/functions/ls.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsLsCommand = exports.FUNCTIONS_LS_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const log_1 = require("@remotion/cli/dist/log");
 const get_functions_1 = require("../../../api/get-functions");
 const get_aws_region_1 = require("../../get-aws-region");
 const NAME_COLS = 70;
@@ -13,7 +12,10 @@ const VERSION_COLS = 15;
 exports.FUNCTIONS_LS_SUBCOMMAND = 'ls';
 const functionsLsCommand = async () => {
     const region = (0, get_aws_region_1.getAwsRegion)();
-    const fetchingOutput = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+    const fetchingOutput = cli_1.CliInternals.createOverwriteableCliOutput({
+        quiet: cli_1.CliInternals.quietFlagProvided(),
+        cancelSignal: null,
+    });
     fetchingOutput.update('Getting functions...');
     const functions = await (0, get_functions_1.getFunctions)({
         region,
@@ -21,17 +23,17 @@ const functionsLsCommand = async () => {
     });
     if (cli_1.CliInternals.quietFlagProvided()) {
         if (functions.length === 0) {
-            log_1.Log.info('()');
+            cli_1.CliInternals.Log.info('()');
             return;
         }
-        log_1.Log.info(functions.map((f) => f.functionName).join(' '));
+        cli_1.CliInternals.Log.info(functions.map((f) => f.functionName).join(' '));
         return;
     }
     fetchingOutput.update('Getting function info...');
     const pluralized = functions.length === 1 ? 'function' : 'functions';
     fetchingOutput.update(`${functions.length} ${pluralized} in the ${region} region`);
-    log_1.Log.info();
-    log_1.Log.info(cli_1.CliInternals.chalk.gray([
+    cli_1.CliInternals.Log.info();
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray([
         'Name'.padEnd(NAME_COLS, ' '),
         'Version'.padEnd(VERSION_COLS, ' '),
         'Disk (MB)'.padEnd(MEMORY_COLS, ' '),
@@ -39,7 +41,7 @@ const functionsLsCommand = async () => {
         'Timeout (sec)'.padEnd(TIMEOUT_COLS, ' '),
     ].join('')));
     for (const datapoint of functions) {
-        log_1.Log.info([
+        cli_1.CliInternals.Log.info([
             datapoint.functionName.padEnd(NAME_COLS, ' '),
             datapoint.version
                 ? datapoint.version.padEnd(VERSION_COLS, ' ')

package/dist/cli/commands/functions/rm.js

@@ -26,7 +26,10 @@ const functionsRmCommand = async (args) => {
     }
     const region = (0, get_aws_region_1.getAwsRegion)();
     for (const functionName of args) {
-        const infoOutput = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+        const infoOutput = cli_1.CliInternals.createOverwriteableCliOutput({
+            quiet: cli_1.CliInternals.quietFlagProvided(),
+            cancelSignal: null,
+        });
         infoOutput.update('Getting function info...');
         const info = await (0, get_function_info_1.getFunctionInfo)({
             region,
@@ -40,7 +43,10 @@ const functionsRmCommand = async (args) => {
         ].join('\n'));
         log_1.Log.info();
         await (0, confirm_1.confirmCli)({ delMessage: 'Delete? (Y/n)', allowForceFlag: true });
-        const output = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+        const output = cli_1.CliInternals.createOverwriteableCliOutput({
+            quiet: cli_1.CliInternals.quietFlagProvided(),
+            cancelSignal: null,
+        });
         output.update('Deleting...');
         await (0, delete_function_1.deleteFunction)({ region, functionName });
         output.update('Deleted!\n');

package/dist/cli/commands/functions/rmall.js

@@ -17,7 +17,10 @@ const functionsRmallCommand = async () => {
         compatibleOnly: false,
     });
     for (const fun of functions) {
-        const infoOutput = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+        const infoOutput = cli_1.CliInternals.createOverwriteableCliOutput({
+            quiet: cli_1.CliInternals.quietFlagProvided(),
+            cancelSignal: null,
+        });
         infoOutput.update('Getting function info...');
         const info = await (0, get_function_info_1.getFunctionInfo)({
             region,
@@ -31,7 +34,10 @@ const functionsRmallCommand = async () => {
         ].join('\n'));
         log_1.Log.info();
         await (0, confirm_1.confirmCli)({ delMessage: 'Delete? (Y/n)', allowForceFlag: true });
-        const output = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+        const output = cli_1.CliInternals.createOverwriteableCliOutput({
+            quiet: cli_1.CliInternals.quietFlagProvided(),
+            cancelSignal: null,
+        });
         output.update('Deleting...');
         await (0, delete_function_1.deleteFunction)({ region, functionName: fun.functionName });
         output.update('Deleted!\n');

package/dist/cli/commands/quotas/increase.js

@@ -2,15 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quotasIncreaseCommand = exports.INCREASE_SUBCOMMAND = void 0;
 const client_service_quotas_1 = require("@aws-sdk/client-service-quotas");
-const log_1 = require("@remotion/cli/dist/log");
 const process_1 = require("process");
 const _1 = require(".");
 const defaults_1 = require("../../../defaults");
 const aws_clients_1 = require("../../../shared/aws-clients");
+const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 const confirm_1 = require("../../helpers/confirm");
 const quit_1 = require("../../helpers/quit");
+const log_1 = require("../../log");
 exports.INCREASE_SUBCOMMAND = 'increase';
+const makeQuotaUrl = ({ region, quotaId, }) => {
+    return `https://${region}.console.aws.amazon.com/servicequotas/home/services/lambda/quotas/${quotaId}`;
+};
 const quotasIncreaseCommand = async () => {
     var _a, _b, _c;
     const region = (0, get_aws_region_1.getAwsRegion)();
@@ -37,8 +41,11 @@ const quotasIncreaseCommand = async () => {
     const concurrencyCurrent = (_b = concurrencyLimit.Quota) === null || _b === void 0 ? void 0 : _b.Value;
     const defaultConcurrency = (_c = defaultConcurrencyLimit.Quota) === null || _c === void 0 ? void 0 : _c.Value;
     const increaseRecommended = concurrencyCurrent <= defaultConcurrency;
-    if (!increaseRecommended) {
-        log_1.Log.info(`Current limit of ${concurrencyCurrent} is already increased over the default (${defaultConcurrency}). Increase it further via the AWS console.`);
+    if (!increaseRecommended && !args_1.forceFlagProvided) {
+        log_1.Log.error(`Current limit of ${concurrencyCurrent} is already increased over the default (${defaultConcurrency}).`);
+        log_1.Log.info('You can force the increase with the --force flag.');
+        log_1.Log.info('You are more likely to get an increase if you attach a reason. Go so by going to the AWS console:');
+        log_1.Log.info(makeQuotaUrl({ quotaId: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA, region }));
         (0, quit_1.quit)(1);
     }
     const newLimit = Math.floor(concurrencyCurrent / 5000) * 5000 + 5000;
@@ -47,11 +54,24 @@ const quotasIncreaseCommand = async () => {
         allowForceFlag: true,
         delMessage: 'Send? (Y/n)',
     });
-    await (0, aws_clients_1.getServiceQuotasClient)(region).send(new client_service_quotas_1.RequestServiceQuotaIncreaseCommand({
-        QuotaCode: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA,
-        DesiredValue: newLimit,
-        ServiceCode: 'lambda',
-    }));
+    try {
+        await (0, aws_clients_1.getServiceQuotasClient)(region).send(new client_service_quotas_1.RequestServiceQuotaIncreaseCommand({
+            QuotaCode: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA,
+            DesiredValue: newLimit,
+            ServiceCode: 'lambda',
+        }));
+    }
+    catch (err) {
+        if (err.name === 'DependencyAccessDeniedException') {
+            log_1.Log.error('Could not request increase because this is a sub-account of another AWS account.');
+            log_1.Log.error(`Please go to ${makeQuotaUrl({
+                quotaId: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA,
+                region,
+            })} to request the increase via the AWS console.`);
+            return;
+        }
+        throw err;
+    }
     log_1.Log.info(`Requested increase successfully. Run "${defaults_1.BINARY_NAME} ${_1.QUOTAS_COMMAND}" to check whether your request was approved.`);
 };
 exports.quotasIncreaseCommand = quotasIncreaseCommand;

package/dist/cli/commands/quotas/index.js

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quotasCommand = exports.QUOTAS_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const log_1 = require("@remotion/cli/dist/log");
 const defaults_1 = require("../../../defaults");
 const increase_1 = require("./increase");
 const list_1 = require("./list");
 exports.QUOTAS_COMMAND = 'quotas';
 const printHelp = () => {
-    log_1.Log.info('Available commands:');
-    log_1.Log.info();
-    log_1.Log.info(`npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('List relevant AWS Lambda quotas.'));
-    log_1.Log.info();
-    log_1.Log.info(`npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND} ${increase_1.INCREASE_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Increase Lambda quotas.'));
+    cli_1.CliInternals.Log.info('Available commands:');
+    cli_1.CliInternals.Log.info();
+    cli_1.CliInternals.Log.info(`npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND}`);
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('List relevant AWS Lambda quotas.'));
+    cli_1.CliInternals.Log.info();
+    cli_1.CliInternals.Log.info(`npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND} ${increase_1.INCREASE_SUBCOMMAND}`);
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Increase Lambda quotas.'));
 };
 const quotasCommand = (args) => {
     if (args.filter(Boolean).length === 0) {
@@ -23,7 +22,7 @@ const quotasCommand = (args) => {
     if (args[0] === increase_1.INCREASE_SUBCOMMAND) {
         return (0, increase_1.quotasIncreaseCommand)();
     }
-    log_1.Log.error('Subcommand ' + args[0] + ' not found.');
+    cli_1.CliInternals.Log.error('Subcommand ' + args[0] + ' not found.');
     printHelp();
 };
 exports.quotasCommand = quotasCommand;

package/dist/cli/commands/regions.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.regionsCommand = exports.REGIONS_COMMAND = void 0;
-const log_1 = require("@remotion/cli/dist/log");
+const cli_1 = require("@remotion/cli");
 const get_regions_1 = require("../../api/get-regions");
+const args_1 = require("../args");
 exports.REGIONS_COMMAND = 'regions';
 const regionsCommand = () => {
-    log_1.Log.info((0, get_regions_1.getRegions)().join(' '));
+    var _a;
+    cli_1.CliInternals.Log.info((0, get_regions_1.getRegions)({
+        enabledByDefaultOnly: (_a = args_1.parsedLambdaCli['default-only']) !== null && _a !== void 0 ? _a : false,
+    }).join(' '));
 };
 exports.regionsCommand = regionsCommand;

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,10 +23,13 @@ declare type DownloadedInfo = {
     downloaded: number;
     doneIn: number | null;
 };
-export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, }: {
+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,51 @@
 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;
@@ -48,24 +54,28 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
         return '';
     }
     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) => {
+const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     if (!cleanupInfo) {
         return '';
     }
+    if (skipped) {
+        return [
+            `(5/${totalSteps})`,
+            cli_1.CliInternals.chalk.blueBright(`Not cleaning up because --log=verbose was set`),
+        ].join(' ');
+    }
     const { doneIn, filesDeleted, minFilesToDelete } = cleanupInfo;
     const progress = filesDeleted / minFilesToDelete;
     return [
-        '🪣 ',
-        `(4/${totalSteps})`,
+        `(5/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Cleaning up' : 'Cleaned up'} artifacts`,
         doneIn === null
@@ -75,8 +85,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps) => {
 };
 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),
@@ -94,42 +103,43 @@ 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, }) => {
+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),
+        makeCleanupProgress(progress.cleanupInfo, steps, verbose),
         downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,
     ]
         .filter(remotion_1.Internals.truthy)