@remotion/lambda 4.0.114 → 4.0.116

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesRmallSubcommand = exports.SITES_RMALL_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const client_1 = require("@remotion/renderer/client");
 const delete_site_1 = require("../../../api/delete-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const get_sites_1 = require("../../../api/get-sites");
@@ -11,15 +10,15 @@ const get_aws_region_1 = require("../../get-aws-region");
 const confirm_1 = require("../../helpers/confirm");
 const log_1 = require("../../log");
 exports.SITES_RMALL_COMMAND = 'rmall';
-const sitesRmallSubcommand = async () => {
-    var _a, _b;
+const sitesRmallSubcommand = async (logLevel) => {
+    var _a;
     const region = (0, get_aws_region_1.getAwsRegion)();
     const deployedSites = await (0, get_sites_1.getSites)({
         region,
     });
     const bucketName = (_a = args_1.parsedLambdaCli['force-bucket-name']) !== null && _a !== void 0 ? _a : (await (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
         region,
-        enableFolderExpiry: (_b = args_1.parsedLambdaCli[client_1.BrowserSafeApis.options.folderExpiryOption.cliFlag]) !== null && _b !== void 0 ? _b : null,
+        enableFolderExpiry: false,
         customCredentials: null,
     })).bucketName;
     for (const site of deployedSites.sites) {
@@ -34,10 +33,10 @@ const sitesRmallSubcommand = async () => {
             siteName: site.id,
             region,
             onAfterItemDeleted: ({ itemName }) => {
-                log_1.Log.info(cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
+                log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
             },
         });
-        log_1.Log.info(`Deleted site ${site.id} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
+        log_1.Log.info({ indent: false, logLevel }, `Deleted site ${site.id} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
     }
 };
 exports.sitesRmallSubcommand = sitesRmallSubcommand;

package/dist/cli/commands/still.js

@@ -17,27 +17,48 @@ 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");
+const { offthreadVideoCacheSizeInBytesOption, scaleOption, deleteAfterOption, jpegQualityOption, enableMultiprocessOnLinuxOption, glOption, headlessOption, delayRenderTimeoutInMillisecondsOption, } = client_1.BrowserSafeApis.options;
+const { parsedCli, determineFinalStillImageFormat, chalk, getCliOptions, formatBytes, getCompositionWithDimensionOverride, } = cli_1.CliInternals;
 exports.STILL_COMMAND = 'still';
 const stillCommand = async (args, remotionRoot, logLevel) => {
     var _a, _b, _c, _d, _e;
     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.STILL_COMMAND} <serve-url> <composition-id>  [output-location]`);
+        log_1.Log.error({ indent: false, logLevel }, 'No serve URL passed.');
+        log_1.Log.info({ indent: false, logLevel }, 'Pass an additional argument specifying a URL where your Remotion project is hosted.');
+        log_1.Log.info({ indent: false, logLevel });
+        log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.STILL_COMMAND} <serve-url> <composition-id>  [output-location]`);
         (0, quit_1.quit)(1);
     }
-    const { chromiumOptions, envVariables, inputProps, puppeteerTimeout, jpegQuality, stillFrame, scale, height, width, browserExecutable, offthreadVideoCacheSizeInBytes, } = cli_1.CliInternals.getCliOptions({
-        type: 'still',
-        isLambda: true,
-        remotionRoot,
+    const { envVariables, inputProps, stillFrame, height, width, browserExecutable, userAgent, disableWebSecurity, ignoreCertificateErrors, } = getCliOptions({
+        isStill: true,
         logLevel,
     });
     const region = (0, get_aws_region_1.getAwsRegion)();
     let composition = args[1];
+    const enableMultiProcessOnLinux = enableMultiprocessOnLinuxOption.getValue({
+        commandLine: parsedCli,
+    }).value;
+    const gl = glOption.getValue({ commandLine: parsedCli }).value;
+    const headless = headlessOption.getValue({
+        commandLine: parsedCli,
+    }).value;
+    const chromiumOptions = {
+        disableWebSecurity,
+        enableMultiProcessOnLinux,
+        gl,
+        headless,
+        ignoreCertificateErrors,
+        userAgent,
+    };
+    const timeoutInMilliseconds = delayRenderTimeoutInMillisecondsOption.getValue({
+        commandLine: parsedCli,
+    }).value;
+    const offthreadVideoCacheSizeInBytes = offthreadVideoCacheSizeInBytesOption.getValue({
+        commandLine: parsedCli,
+    }).value;
     if (!composition) {
-        log_1.Log.info('No compositions passed. Fetching compositions...');
+        log_1.Log.info({ indent: false, logLevel }, 'No compositions passed. Fetching compositions...');
         (0, validate_serveurl_1.validateServeUrl)(serveUrl);
         if (!serveUrl.startsWith('https://') && !serveUrl.startsWith('http://')) {
             throw Error('Passing the shorthand serve URL without composition name is currently not supported.\n Make sure to pass a composition name after the shorthand serve URL or pass the complete serveURL without composition name to get to choose between all compositions.');
@@ -51,7 +72,7 @@ const stillCommand = async (args, remotionRoot, logLevel) => {
             webpackConfigOrServeUrl: serveUrl,
             offthreadVideoCacheSizeInBytes,
         });
-        const { compositionId } = await cli_1.CliInternals.getCompositionWithDimensionOverride({
+        const { compositionId } = await getCompositionWithDimensionOverride({
             args: args.slice(1),
             compositionIdFromUi: null,
             indent: false,
@@ -67,7 +88,7 @@ const stillCommand = async (args, remotionRoot, logLevel) => {
             }).serializedString,
             port: config_1.ConfigInternals.getRendererPortFromConfigFileAndCliFlag(),
             puppeteerInstance: undefined,
-            timeoutInMilliseconds: puppeteerTimeout,
+            timeoutInMilliseconds,
             height,
             width,
             server,
@@ -82,16 +103,22 @@ const stillCommand = async (args, remotionRoot, logLevel) => {
     (0, validate_retries_1.validateMaxRetries)(maxRetries);
     const privacy = (_c = args_1.parsedLambdaCli.privacy) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_OUTPUT_PRIVACY;
     (0, validate_privacy_1.validatePrivacy)(privacy, true);
-    const { format: imageFormat, source: imageFormatReason } = cli_1.CliInternals.determineFinalStillImageFormat({
+    const { format: imageFormat, source: imageFormatReason } = determineFinalStillImageFormat({
         downloadName,
         outName: outName !== null && outName !== void 0 ? outName : null,
-        cliFlag: (_d = cli_1.CliInternals.parsedCli['image-format']) !== null && _d !== void 0 ? _d : null,
+        cliFlag: (_d = parsedCli['image-format']) !== null && _d !== void 0 ? _d : null,
         isLambda: true,
         fromUi: null,
         configImageFormat: (_e = config_1.ConfigInternals.getUserPreferredStillImageFormat()) !== null && _e !== void 0 ? _e : null,
     });
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`functionName = ${functionName}, imageFormat = ${imageFormat} (${imageFormatReason})`));
-    const deleteAfter = args_1.parsedLambdaCli[client_1.BrowserSafeApis.options.deleteAfterOption.cliFlag];
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`functionName = ${functionName}, imageFormat = ${imageFormat} (${imageFormatReason})`));
+    const deleteAfter = args_1.parsedLambdaCli[deleteAfterOption.cliFlag];
+    const scale = scaleOption.getValue({
+        commandLine: parsedCli,
+    }).value;
+    const jpegQuality = jpegQualityOption.getValue({
+        commandLine: parsedCli,
+    }).value;
     const res = await (0, render_still_on_lambda_1.renderStillOnLambda)({
         functionName,
         serveUrl,
@@ -107,19 +134,19 @@ const stillCommand = async (args, remotionRoot, logLevel) => {
         logLevel,
         outName,
         chromiumOptions,
-        timeoutInMilliseconds: puppeteerTimeout,
+        timeoutInMilliseconds,
         scale,
         forceHeight: height,
         forceWidth: width,
         onInit: ({ cloudWatchLogs, renderId, lambdaInsightsUrl }) => {
-            log_1.Log.info(cli_1.CliInternals.chalk.gray(`Render invoked with ID = ${renderId}`));
+            log_1.Log.info({ indent: false, logLevel }, chalk.gray(`Render invoked with ID = ${renderId}`));
             log_1.Log.verbose({ indent: false, logLevel }, `CloudWatch logs (if enabled): ${cloudWatchLogs}`);
             log_1.Log.verbose({ indent: false, logLevel }, `Lambda Insights (if enabled): ${lambdaInsightsUrl}`);
         },
         deleteAfter,
     });
     if (downloadName) {
-        log_1.Log.info('Finished rendering. Downloading...');
+        log_1.Log.info({ indent: false, logLevel }, 'Finished rendering. Downloading...');
         const { outputPath, sizeInBytes } = await (0, download_media_1.downloadMedia)({
             bucketName: res.bucketName,
             outPath: downloadName,
@@ -127,12 +154,12 @@ const stillCommand = async (args, remotionRoot, logLevel) => {
             renderId: res.renderId,
             logLevel,
         });
-        log_1.Log.info('Done!', outputPath, cli_1.CliInternals.formatBytes(sizeInBytes));
+        log_1.Log.info({ indent: false, logLevel }, 'Done!', outputPath, formatBytes(sizeInBytes));
     }
     else {
-        log_1.Log.info(`Finished still!`);
-        log_1.Log.info();
-        log_1.Log.info(res.url);
+        log_1.Log.info({ indent: false, logLevel }, `Finished still!`);
+        log_1.Log.info({ indent: false, logLevel });
+        log_1.Log.info({ indent: false, logLevel }, res.url);
     }
 };
 exports.stillCommand = stillCommand;

package/dist/cli/help.d.ts

@@ -1 +1,2 @@
-export declare const printHelp: () => void;
+import type { LogLevel } from '@remotion/renderer';
+export declare const printHelp: (logLevel: LogLevel) => void;

package/dist/cli/help.js

@@ -13,32 +13,32 @@ const sites_1 = require("./commands/sites");
 const still_1 = require("./commands/still");
 const log_1 = require("./log");
 const packagejson = require('../../package.json');
-const printHelp = () => {
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${packagejson.version} © ${new Date().getFullYear()} The Remotion developers`);
-    log_1.Log.info();
-    log_1.Log.info('Available commands:');
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${render_1.RENDER_COMMAND} <s3-url> <composition-id>`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Render a video in the cloud.'));
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${still_1.STILL_COMMAND} <s3-url> <composition-id>`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Render a still image in the cloud.'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Deploy and manage AWS Lambda functions.'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${sites_1.SITES_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Deploy and manage Remotion projects.'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${compositions_1.COMPOSITIONS_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Print list of composition IDs from a serve URL.'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${policies_1.POLICIES_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('View and validate AWS policy files.'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${regions_1.REGIONS_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Show the list of AWS regions supported.'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${quotas_1.QUOTAS_COMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Shows AWS quotas and allows to increase them.'));
+const printHelp = (logLevel) => {
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${packagejson.version} © ${new Date().getFullYear()} The Remotion developers`);
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, 'Available commands:');
+    log_1.Log.info({ indent: false, logLevel }, '');
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${render_1.RENDER_COMMAND} <s3-url> <composition-id>`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Render a video in the cloud.'));
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${still_1.STILL_COMMAND} <s3-url> <composition-id>`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Render a still image in the cloud.'));
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND}`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Deploy and manage AWS Lambda functions.'));
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${sites_1.SITES_COMMAND}`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Deploy and manage Remotion projects.'));
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${compositions_1.COMPOSITIONS_COMMAND}`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Print list of composition IDs from a serve URL.'));
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${policies_1.POLICIES_COMMAND}`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('View and validate AWS policy files.'));
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${regions_1.REGIONS_COMMAND}`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Show the list of AWS regions supported.'));
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${quotas_1.QUOTAS_COMMAND}`);
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Shows AWS quotas and allows to increase them.'));
 };
 exports.printHelp = printHelp;

package/dist/cli/helpers/find-function-name.js

@@ -23,13 +23,13 @@ const findFunctionName = async (logLevel) => {
         logLevel,
     };
     if (lambdasWithMatchingVersion.length === 0) {
-        log_1.Log.error(`No Lambda functions with version ${version_1.VERSION} found in your account.`);
+        log_1.Log.error({ indent: false, logLevel }, `No Lambda functions with version ${version_1.VERSION} found in your account.`);
         if (remotionLambdas.length > 0) {
-            log_1.Log.error('Other functions were found, but are not compatible with this version of the CLI.');
+            log_1.Log.error({ indent: false, logLevel }, 'Other functions were found, but are not compatible with this version of the CLI.');
         }
-        log_1.Log.infoAdvanced(logOptions, 'Run');
-        log_1.Log.infoAdvanced(logOptions, `  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
-        log_1.Log.infoAdvanced(logOptions, `to deploy a new Lambda function.`);
+        log_1.Log.info(logOptions, 'Run');
+        log_1.Log.info(logOptions, `  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
+        log_1.Log.info(logOptions, `to deploy a new Lambda function.`);
         (0, quit_1.quit)(1);
     }
     if (lambdasWithMatchingVersion.length > 1) {
@@ -37,32 +37,32 @@ const findFunctionName = async (logLevel) => {
             const prevFunctions = [...lambdasWithMatchingVersion];
             lambdasWithMatchingVersion = lambdasWithMatchingVersion.filter((l) => l.functionName === args_1.parsedLambdaCli['function-name']);
             if (lambdasWithMatchingVersion.length === 0) {
-                log_1.Log.error(`No Lambda function with name "${args_1.parsedLambdaCli['function-name']}" and version ${version_1.VERSION} found in your account.`);
-                log_1.Log.infoAdvanced(logOptions);
+                log_1.Log.error({ indent: false, logLevel }, `No Lambda function with name "${args_1.parsedLambdaCli['function-name']}" and version ${version_1.VERSION} found in your account.`);
+                log_1.Log.info(logOptions);
                 if (prevFunctions.length === 0) {
-                    log_1.Log.infoAdvanced(logOptions, `No functions for version ${version_1.VERSION} were found, deploy one using:`);
-                    log_1.Log.infoAdvanced(logOptions, `  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
+                    log_1.Log.info(logOptions, `No functions for version ${version_1.VERSION} were found, deploy one using:`);
+                    log_1.Log.info(logOptions, `  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
                     (0, quit_1.quit)(1);
                 }
-                log_1.Log.infoAdvanced(logOptions, 'The following functions were found:');
+                log_1.Log.info(logOptions, 'The following functions were found:');
                 for (const l of prevFunctions) {
-                    log_1.Log.infoAdvanced(logOptions, `- ${l.functionName} (v${l.version})`);
+                    log_1.Log.info(logOptions, `- ${l.functionName} (v${l.version})`);
                 }
-                log_1.Log.infoAdvanced(logOptions, 'Remove the `--function-name` parameter use one of them.');
+                log_1.Log.info(logOptions, 'Remove the `--function-name` parameter use one of them.');
                 (0, quit_1.quit)(1);
             }
         }
         else {
-            log_1.Log.error('More than 1 lambda function found in your account. Unsure which one to use.');
-            log_1.Log.infoAdvanced(logOptions);
-            log_1.Log.infoAdvanced(logOptions, 'Possible solutions:');
-            log_1.Log.infoAdvanced(logOptions, '- Define using `--function-name` which function you want to use.');
-            log_1.Log.infoAdvanced(logOptions, `- Delete extraneous lambda functions in your AWS console or using:`);
-            log_1.Log.infoAdvanced(logOptions, `    npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${rm_1.FUNCTIONS_RM_SUBCOMMAND} $(npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${ls_1.FUNCTIONS_LS_SUBCOMMAND} -q) -y`);
-            log_1.Log.infoAdvanced(logOptions);
-            log_1.Log.infoAdvanced(logOptions, `The following functions were found (only showing v${version_1.VERSION}):`);
+            log_1.Log.error({ indent: false, logLevel }, 'More than 1 lambda function found in your account. Unsure which one to use.');
+            log_1.Log.info(logOptions);
+            log_1.Log.info(logOptions, 'Possible solutions:');
+            log_1.Log.info(logOptions, '- Define using `--function-name` which function you want to use.');
+            log_1.Log.info(logOptions, `- Delete extraneous lambda functions in your AWS console or using:`);
+            log_1.Log.info(logOptions, `    npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${rm_1.FUNCTIONS_RM_SUBCOMMAND} $(npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${ls_1.FUNCTIONS_LS_SUBCOMMAND} -q) -y`);
+            log_1.Log.info(logOptions);
+            log_1.Log.info(logOptions, `The following functions were found (only showing v${version_1.VERSION}):`);
             for (const l of lambdasWithMatchingVersion) {
-                log_1.Log.infoAdvanced(logOptions, `- ${l.functionName}`);
+                log_1.Log.info(logOptions, `- ${l.functionName}`);
             }
             (0, quit_1.quit)(1);
         }

package/dist/cli/helpers/get-webhook-custom-data.js

@@ -25,9 +25,9 @@ const getWebhookCustomData = (logLevel) => {
         return JSON.parse(webhookFlag);
     }
     catch (err) {
-        log_1.Log.error(`You passed --${flagName} but it was neither valid JSON nor a file path to a valid JSON file. Provided value: ${webhookFlag}`);
-        log_1.Log.info('Got the following value:', webhookFlag);
-        log_1.Log.error('Check that your input is parseable using `JSON.parse` and try again.');
+        log_1.Log.error({ indent: false, logLevel }, `You passed --${flagName} but it was neither valid JSON nor a file path to a valid JSON file. Provided value: ${webhookFlag}`);
+        log_1.Log.info({ indent: false, logLevel }, 'Got the following value:', webhookFlag);
+        log_1.Log.error({ indent: false, logLevel }, 'Check that your input is parseable using `JSON.parse` and try again.');
         if (node_os_1.default.platform() === 'win32') {
             const logOptions = {
                 indent: false,

package/dist/cli/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cli = exports.executeCommand = void 0;
 const cli_1 = require("@remotion/cli");
-const config_1 = require("@remotion/cli/config");
 const renderer_1 = require("@remotion/renderer");
 const suggested_policy_1 = require("../api/iam-validation/suggested-policy");
 const defaults_1 = require("../defaults");
@@ -39,7 +38,7 @@ const requiresCredentials = (args) => {
 };
 const matchCommand = (args, remotionRoot, logLevel) => {
     if (args_1.parsedLambdaCli.help || args.length === 0) {
-        (0, help_1.printHelp)();
+        (0, help_1.printHelp)(logLevel);
         (0, quit_1.quit)(0);
     }
     if (requiresCredentials(args)) {
@@ -52,49 +51,49 @@ const matchCommand = (args, remotionRoot, logLevel) => {
         return (0, still_1.stillCommand)(args.slice(1), remotionRoot, logLevel);
     }
     if (args[0] === compositions_1.COMPOSITIONS_COMMAND) {
-        return (0, compositions_1.compositionsCommand)(args.slice(1), remotionRoot, logLevel);
+        return (0, compositions_1.compositionsCommand)(args.slice(1), logLevel);
     }
     if (args[0] === functions_1.FUNCTIONS_COMMAND) {
-        return (0, functions_1.functionsCommand)(args.slice(1));
+        return (0, functions_1.functionsCommand)(args.slice(1), logLevel);
     }
     if (args[0] === quotas_1.QUOTAS_COMMAND) {
         return (0, quotas_1.quotasCommand)(args.slice(1), logLevel);
     }
     if (args[0] === policies_1.POLICIES_COMMAND) {
-        return (0, policies_1.policiesCommand)(args.slice(1));
+        return (0, policies_1.policiesCommand)(args.slice(1), logLevel);
     }
     if (args[0] === regions_1.REGIONS_COMMAND) {
-        return (0, regions_1.regionsCommand)();
+        return (0, regions_1.regionsCommand)(logLevel);
     }
     if (args[0] === sites_1.SITES_COMMAND) {
         return (0, sites_1.sitesCommand)(args.slice(1), remotionRoot, logLevel);
     }
     if (args[0] === 'upload') {
-        log_1.Log.info('The command has been renamed.');
-        log_1.Log.info('Before: remotion-lambda upload <entry-point>');
-        log_1.Log.info('After: remotion lambda sites create <entry-point>');
+        log_1.Log.info({ indent: false, logLevel }, 'The command has been renamed.');
+        log_1.Log.info({ indent: false, logLevel }, 'Before: remotion-lambda upload <entry-point>');
+        log_1.Log.info({ indent: false, logLevel }, 'After: remotion lambda sites create <entry-point>');
         (0, quit_1.quit)(1);
     }
     if (args[0] === 'deploy') {
-        log_1.Log.info('The command has been renamed.');
-        log_1.Log.info('Before: remotion-lambda deploy');
-        log_1.Log.info('After: remotion lambda functions deploy');
+        log_1.Log.info({ indent: false, logLevel }, 'The command has been renamed.');
+        log_1.Log.info({ indent: false, logLevel }, 'Before: remotion-lambda deploy');
+        log_1.Log.info({ indent: false, logLevel }, 'After: remotion lambda functions deploy');
         (0, quit_1.quit)(1);
     }
     if (args[0] === 'ls') {
-        log_1.Log.info(`The "ls" command does not exist.`);
-        log_1.Log.info(`Did you mean "functions ls" or "sites ls"?`);
+        log_1.Log.info({ indent: false, logLevel }, `The "ls" command does not exist.`);
+        log_1.Log.info({ indent: false, logLevel }, `Did you mean "functions ls" or "sites ls"?`);
     }
     if (args[0] === 'rm') {
-        log_1.Log.info(`The "rm" command does not exist.`);
-        log_1.Log.info(`Did you mean "functions rm" or "sites rm"?`);
+        log_1.Log.info({ indent: false, logLevel }, `The "rm" command does not exist.`);
+        log_1.Log.info({ indent: false, logLevel }, `Did you mean "functions rm" or "sites rm"?`);
     }
     if (args[0] === 'deploy') {
-        log_1.Log.info(`The "deploy" command does not exist.`);
-        log_1.Log.info(`Did you mean "functions deploy"?`);
+        log_1.Log.info({ indent: false, logLevel }, `The "deploy" command does not exist.`);
+        log_1.Log.info({ indent: false, logLevel }, `Did you mean "functions deploy"?`);
     }
-    log_1.Log.error(`Command ${args[0]} not found.`);
-    (0, help_1.printHelp)();
+    log_1.Log.error({ indent: false, logLevel }, `Command ${args[0]} not found.`);
+    (0, help_1.printHelp)(logLevel);
     (0, quit_1.quit)(1);
 };
 const executeCommand = async (args, remotionRoot, logLevel) => {
@@ -107,7 +106,7 @@ const executeCommand = async (args, remotionRoot, logLevel) => {
         const error = err;
         if (error.message.includes('The role defined for the function cannot be assumed by Lambda')) {
             if (args_1.parsedLambdaCli['custom-role-arn']) {
-                log_1.Log.error(`
+                log_1.Log.error({ indent: false, logLevel }, `
 	The role "${args_1.parsedLambdaCli['custom-role-arn']}" does not exist or has the wrong policy assigned to it. Do either:
 	- Remove the "--custom-role-arn" parameter and set up Remotion Lambda according to the setup guide
 	- Make sure the role has the same policy assigned as the one returned by "npx ${defaults_1.BINARY_NAME} ${policies_1.POLICIES_COMMAND} ${role_1.ROLE_SUBCOMMAND}"
@@ -115,7 +114,7 @@ const executeCommand = async (args, remotionRoot, logLevel) => {
 	Revisit ${docs_url_1.DOCS_URL}/docs/lambda/setup and make sure you set up the role and role policy correctly. Also see the troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
 	`.trim());
             }
-            log_1.Log.error(`
+            log_1.Log.error({ indent: false, logLevel }, `
 The role "${suggested_policy_1.ROLE_NAME}" does not exist in your AWS account or has the wrong policy assigned to it. Common reasons:
 - The name of the role is not "${suggested_policy_1.ROLE_NAME}"
 - The policy is not exactly as specified in the setup guide
@@ -124,12 +123,12 @@ Revisit ${docs_url_1.DOCS_URL}/docs/lambda/setup and make sure you set up the ro
 `.trim());
         }
         if ((_a = error.stack) === null || _a === void 0 ? void 0 : _a.includes('AccessDenied')) {
-            log_1.Log.error(`
+            log_1.Log.error({ indent: false, logLevel }, `
 AWS returned an "AccessDenied" error message meaning a permission is missing. Read the permissions troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
 `.trim());
         }
         if ((_b = error.stack) === null || _b === void 0 ? void 0 : _b.includes('TooManyRequestsException')) {
-            log_1.Log.error(`
+            log_1.Log.error({ indent: false, logLevel }, `
 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());
         }
@@ -139,18 +138,18 @@ AWS returned an "TooManyRequestsException" error message which could mean you re
             const pureKeyButDoesntStartWithAki = process.env.AWS_ACCESS_KEY_ID &&
                 !process.env.AWS_ACCESS_KEY_ID.startsWith('AKI');
             if (keyButDoesntStartWithAki || pureKeyButDoesntStartWithAki) {
-                log_1.Log.error(`
+                log_1.Log.error({ indent: false, logLevel }, `
 	AWS returned an error message "The security token included in the request is invalid". A possible reason is that your AWS Access key ID is set but doesn't start with "AKI", which it usually should. The original message is: 
 	`);
             }
             else {
-                log_1.Log.error(`
+                log_1.Log.error({ indent: false, logLevel }, `
 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: 
 `);
             }
         }
         if (error instanceof renderer_1.RenderInternals.SymbolicateableError) {
-            await cli_1.CliInternals.printError(error, config_1.ConfigInternals.Logging.getLogLevel());
+            await cli_1.CliInternals.printError(error, logLevel);
         }
         else {
             const frames = renderer_1.RenderInternals.parseStack((_e = (_d = error.stack) === null || _d === void 0 ? void 0 : _d.split('\n')) !== null && _e !== void 0 ? _e : []);
@@ -161,7 +160,7 @@ AWS returned an error message "The security token included in the request is inv
                 stack: error.stack,
                 stackFrame: frames,
             });
-            await cli_1.CliInternals.printError(errorWithStackFrame, config_1.ConfigInternals.Logging.getLogLevel());
+            await cli_1.CliInternals.printError(errorWithStackFrame, logLevel);
         }
         (0, quit_1.quit)(1);
     }

package/dist/cli/log.d.ts

@@ -2,11 +2,9 @@ export declare const Log: {
     verbose: (options: import("@remotion/renderer").LogOptions & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;
-    info: (message?: any, ...optionalParams: any[]) => void;
-    infoAdvanced: (options: import("@remotion/renderer").LogOptions, message?: any, ...optionalParams: any[]) => void;
+    info: (options: import("@remotion/renderer").LogOptions, message?: any, ...optionalParams: any[]) => void;
     warn: (options: import("@remotion/renderer").LogOptions, message?: any, ...optionalParams: any[]) => void;
-    error: (message?: any, ...optionalParams: any[]) => void;
-    errorAdvanced: (options: import("@remotion/renderer").LogOptions & {
+    error: (options: import("@remotion/renderer").LogOptions & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;
 };

package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts

@@ -3,8 +3,5 @@ export declare const planFrameRanges: ({ framesPerLambda, frameRange, everyNthFr
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [
-        number,
-        number
-    ][];
+    chunks: [number, number][];
 };

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

@@ -2,7 +2,7 @@ import type { AudioCodec, LogLevel } 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 getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }: {
+export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, logLevel, }: {
     bucket: string;
     expectedFiles: number;
     outdir: string;
@@ -10,6 +10,7 @@ export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId,
     region: AwsRegion;
     expectedBucketOwner: string;
     onErrors: (errors: EnhancedErrorInfo[]) => void;
+    logLevel: LogLevel;
 }) => Promise<string[]>;
 export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, }: {
     onProgress: (frames: number) => void;

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

@@ -51,7 +51,7 @@ const downloadS3File = async ({ bucket, key, outdir, region, expectedBucketOwner
             .on('close', () => resolve());
     });
 };
-const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }) => {
+const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, logLevel, }) => {
     const alreadyDownloading = {};
     const downloaded = {};
     const getFiles = async () => {
@@ -113,7 +113,7 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                         region,
                         expectedBucketOwner,
                     });
-                    renderer_1.RenderInternals.Log.info('Successfully downloaded', key);
+                    renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Successfully downloaded', key);
                     downloadTimer.end();
                     downloaded[key] = true;
                     checkFinish();

package/dist/functions/helpers/get-browser-instance.js

@@ -33,7 +33,7 @@ const waitForLaunched = () => {
     });
 };
 const forgetBrowserEventLoop = (logLevel) => {
-    renderer_1.RenderInternals.Log.infoAdvanced({ indent: false, logLevel }, 'Keeping browser open for next invocation');
+    renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Keeping browser open for next invocation');
     _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.instance.forgetEventLoop();
 };
 exports.forgetBrowserEventLoop = forgetBrowserEventLoop;
@@ -45,16 +45,16 @@ const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
         gl: (_a = chromiumOptions.gl) !== null && _a !== void 0 ? _a : 'swangle',
     };
     const configurationString = makeConfigurationString(actualChromiumOptions, logLevel);
-    renderer_1.RenderInternals.Log.info(`Rendering with Remotion v${version_1.VERSION}.`);
+    renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `Rendering with Remotion v${version_1.VERSION}.`);
     if (launching) {
-        renderer_1.RenderInternals.Log.info('Already waiting for browser launch...');
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Already waiting for browser launch...');
         await waitForLaunched();
         if (!_browserInstance) {
             throw new Error('expected to launch');
         }
     }
     if (!_browserInstance) {
-        renderer_1.RenderInternals.Log.info('Cold Lambda function, launching new browser instance');
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Cold Lambda function, launching new browser instance');
         launching = true;
         const execPath = (0, get_chromium_executable_path_1.executablePath)();
         const instance = await renderer_1.RenderInternals.internalOpenBrowser({
@@ -68,10 +68,10 @@ const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
         });
         instance.on('disconnected', () => {
             var _a;
-            renderer_1.RenderInternals.Log.info('Browser disconnected or crashed.');
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Browser disconnected or crashed.');
             (0, exports.forgetBrowserEventLoop)(logLevel);
             (_a = _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.instance) === null || _a === void 0 ? void 0 : _a.close(true, logLevel, indent).catch((err) => {
-                renderer_1.RenderInternals.Log.info('Could not close browser instance', err);
+                renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Could not close browser instance', err);
             });
             _browserInstance = null;
         });
@@ -83,13 +83,13 @@ const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
         return _browserInstance;
     }
     if (_browserInstance.configurationString !== configurationString) {
-        renderer_1.RenderInternals.Log.info('Warm Lambda function, but Browser configuration changed. Killing old browser instance.');
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Warm Lambda function, but Browser configuration changed. Killing old browser instance.');
         _browserInstance.instance.rememberEventLoop();
         await _browserInstance.instance.close(true, logLevel, indent);
         _browserInstance = null;
         return (0, exports.getBrowserInstance)(logLevel, indent, chromiumOptions);
     }
-    renderer_1.RenderInternals.Log.info('Warm Lambda function, reusing browser instance');
+    renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Warm Lambda function, reusing browser instance');
     _browserInstance.instance.rememberEventLoop();
     return _browserInstance;
 };

package/dist/functions/helpers/lifecycle.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDeleteAfter = exports.generateRandomHashWithLifeCycleRule = exports.getLifeCycleRules = exports.getEnabledLifeCycleRule = void 0;
 const random_hash_1 = require("../../shared/random-hash");
 const truthy_1 = require("../../shared/truthy");
-// Needs to be in sync with cli/src/config/render-folder-expiry.ts#L7
+// Needs to be in sync with renderer/src/options/delete-after.ts#L7
 const expiryDays = {
     '1-day': 1,
     '3-days': 3,

package/dist/functions/helpers/merge-chunks.js

@@ -59,7 +59,7 @@ const mergeChunksAndFinishRender = async (options) => {
         });
     };
     const onErrors = (errors) => {
-        renderer_1.RenderInternals.Log.error('Found Errors', errors);
+        renderer_1.RenderInternals.Log.error({ indent: false, logLevel: options.logLevel }, 'Found Errors', errors);
         const firstError = errors[0];
         if (firstError.chunk !== null) {
             throw new Error(`Stopping Lambda function because error occurred while rendering chunk ${firstError.chunk}:\n${errors[0].stack
@@ -84,6 +84,7 @@ const mergeChunksAndFinishRender = async (options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         expectedBucketOwner: options.expectedBucketOwner,
         onErrors,
+        logLevel: options.logLevel,
     });
     options.onAllChunks({
         inputProps: options.inputProps,