@remotion/lambda 3.2.43-retry.19 → 3.3.0

package/dist/api/render-media-on-lambda.d.ts

@@ -44,6 +44,7 @@ export declare type RenderMediaOnLambdaOutput = {
     renderId: string;
     bucketName: string;
     cloudWatchLogs: string;
+    folderInS3Console: string;
 };
 /**
  * @description Triggers a render on a lambda given a composition and a lambda function.

package/dist/api/render-media-on-lambda.js

@@ -5,7 +5,7 @@ const version_1 = require("remotion/version");
 const call_lambda_1 = require("../shared/call-lambda");
 const constants_1 = require("../shared/constants");
 const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
-const get_cloudwatch_stream_url_1 = require("../shared/get-cloudwatch-stream-url");
+const get_aws_urls_1 = require("../shared/get-aws-urls");
 const serialize_input_props_1 = require("../shared/serialize-input-props");
 const validate_download_behavior_1 = require("../shared/validate-download-behavior");
 const validate_frames_per_lambda_1 = require("../shared/validate-frames-per-lambda");
@@ -89,12 +89,17 @@ const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec,
         return {
             renderId: res.renderId,
             bucketName: res.bucketName,
-            cloudWatchLogs: (0, get_cloudwatch_stream_url_1.getCloudwatchStreamUrl)({
+            cloudWatchLogs: (0, get_aws_urls_1.getCloudwatchStreamUrl)({
                 functionName,
                 method: constants_1.LambdaRoutines.renderer,
                 region,
                 renderId: res.renderId,
             }),
+            folderInS3Console: (0, get_aws_urls_1.getS3RenderUrl)({
+                bucketName: res.bucketName,
+                renderId: res.renderId,
+                region,
+            }),
         };
     }
     catch (err) {

package/dist/api/render-still-on-lambda.js

@@ -5,7 +5,7 @@ const version_1 = require("remotion/version");
 const call_lambda_1 = require("../shared/call-lambda");
 const constants_1 = require("../shared/constants");
 const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
-const get_cloudwatch_stream_url_1 = require("../shared/get-cloudwatch-stream-url");
+const get_aws_urls_1 = require("../shared/get-aws-urls");
 const serialize_input_props_1 = require("../shared/serialize-input-props");
 /**
  * @description Renders a still frame on Lambda
@@ -64,7 +64,7 @@ const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFo
             sizeInBytes: res.size,
             bucketName: res.bucketName,
             renderId: res.renderId,
-            cloudWatchLogs: (0, get_cloudwatch_stream_url_1.getCloudwatchStreamUrl)({
+            cloudWatchLogs: (0, get_aws_urls_1.getCloudwatchStreamUrl)({
                 functionName,
                 method: constants_1.LambdaRoutines.still,
                 region,

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

@@ -22,10 +22,11 @@ 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, }: {
     progress: MultiRenderProgress;
     steps: number;
     downloadInfo: DownloadedInfo | null;
     retriesInfo: ChunkRetry[];
+    verbose: boolean;
 }) => string;
 export {};

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

@@ -57,10 +57,17 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
 };
-const makeCleanupProgress = (cleanupInfo, totalSteps) => {
+const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     if (!cleanupInfo) {
         return '';
     }
+    if (skipped) {
+        return [
+            '🪣 ',
+            `(4/${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 [
@@ -116,7 +123,7 @@ const makeMultiProgressFromStatus = (status) => {
     };
 };
 exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, }) => {
+const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, }) => {
     return [
         makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
         makeChunkProgress({
@@ -129,7 +136,7 @@ const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, }) =>
             chunkProgress: progress.chunkProgress,
             totalSteps: steps,
         }),
-        makeCleanupProgress(progress.cleanupInfo, steps),
+        makeCleanupProgress(progress.cleanupInfo, steps, verbose),
         downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,
     ]
         .filter(remotion_1.Internals.truthy)

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

@@ -1,2 +1,2 @@
 export declare const RENDER_COMMAND = "render";
-export declare const renderCommand: (args: string[]) => Promise<never>;
+export declare const renderCommand: (args: string[], remotionRoot: string) => Promise<never>;

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

@@ -20,7 +20,7 @@ const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 const progress_1 = require("./progress");
 exports.RENDER_COMMAND = 'render';
-const renderCommand = async (args) => {
+const renderCommand = async (args, remotionRoot) => {
     var _a, _b, _c, _d, _e;
     const serveUrl = args[0];
     if (!serveUrl) {
@@ -49,6 +49,7 @@ const renderCommand = async (args) => {
     const { chromiumOptions, crf, envVariables, frameRange, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, quality, scale, everyNthFrame, numberOfGifLoops, muted, overwrite, audioBitrate, videoBitrate, height, width, } = await cli_1.CliInternals.getCliOptions({
         type: 'series',
         isLambda: true,
+        remotionRoot,
     });
     const imageFormat = cli_1.CliInternals.getImageFormat(codec);
     const functionName = await (0, find_function_name_1.findFunctionName)();
@@ -100,7 +101,9 @@ const renderCommand = async (args) => {
     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})`));
+    const verbose = renderer_1.RenderInternals.isEqualOrBelowLogLevel(cli_1.ConfigInternals.Logging.getLogLevel(), 'verbose');
     log_1.Log.verbose(`CloudWatch logs (if enabled): ${res.cloudWatchLogs}`);
+    log_1.Log.verbose(`Render folder: ${res.folderInS3Console}`);
     const status = await (0, get_render_progress_1.getRenderProgress)({
         functionName,
         bucketName: res.bucketName,
@@ -113,6 +116,7 @@ const renderCommand = async (args) => {
         steps: totalSteps,
         downloadInfo: null,
         retriesInfo: status.retriesInfo,
+        verbose,
     }));
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -129,6 +133,7 @@ const renderCommand = async (args) => {
             steps: totalSteps,
             retriesInfo: newStatus.retriesInfo,
             downloadInfo: null,
+            verbose,
         }));
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
@@ -136,6 +141,7 @@ const renderCommand = async (args) => {
                 steps: totalSteps,
                 downloadInfo: null,
                 retriesInfo: newStatus.retriesInfo,
+                verbose,
             }));
             if (downloadName) {
                 const downloadStart = Date.now();
@@ -154,6 +160,7 @@ const renderCommand = async (args) => {
                                 downloaded,
                                 totalSize,
                             },
+                            verbose,
                         }));
                     },
                 });
@@ -166,6 +173,7 @@ const renderCommand = async (args) => {
                         downloaded: sizeInBytes,
                         totalSize: sizeInBytes,
                     },
+                    verbose,
                 }));
                 log_1.Log.info();
                 log_1.Log.info();

package/dist/cli/commands/still.d.ts

@@ -1,2 +1,2 @@
 export declare const STILL_COMMAND = "still";
-export declare const stillCommand: (args: string[]) => Promise<void>;
+export declare const stillCommand: (args: string[], remotionRoot: string) => Promise<void>;

package/dist/cli/commands/still.js

@@ -16,7 +16,7 @@ const find_function_name_1 = require("../helpers/find-function-name");
 const quit_1 = require("../helpers/quit");
 const log_1 = require("../log");
 exports.STILL_COMMAND = 'still';
-const stillCommand = async (args) => {
+const stillCommand = async (args, remotionRoot) => {
     var _a, _b, _c, _d, _e, _f;
     const serveUrl = args[0];
     if (!serveUrl) {
@@ -43,6 +43,7 @@ const stillCommand = async (args) => {
     const { chromiumOptions, envVariables, inputProps, logLevel, puppeteerTimeout, quality, stillFrame, scale, height, width, } = await cli_1.CliInternals.getCliOptions({
         type: 'still',
         isLambda: true,
+        remotionRoot,
     });
     const functionName = await (0, find_function_name_1.findFunctionName)();
     const maxRetries = (_b = args_1.parsedLambdaCli['max-retries']) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_MAX_RETRIES;

package/dist/cli/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cli = exports.executeCommand = void 0;
 const cli_1 = require("@remotion/cli");
+const renderer_1 = require("@remotion/renderer");
 const suggested_policy_1 = require("../api/iam-validation/suggested-policy");
 const defaults_1 = require("../defaults");
 const check_credentials_1 = require("../shared/check-credentials");
@@ -43,10 +44,10 @@ const matchCommand = (args, remotionRoot) => {
         (0, check_credentials_1.checkCredentials)();
     }
     if (args[0] === render_1.RENDER_COMMAND) {
-        return (0, render_1.renderCommand)(args.slice(1));
+        return (0, render_1.renderCommand)(args.slice(1), remotionRoot);
     }
     if (args[0] === still_1.STILL_COMMAND) {
-        return (0, still_1.stillCommand)(args.slice(1));
+        return (0, still_1.stillCommand)(args.slice(1), remotionRoot);
     }
     if (args[0] === functions_1.FUNCTIONS_COMMAND) {
         return (0, functions_1.functionsCommand)(args.slice(1));
@@ -133,7 +134,7 @@ AWS returned an "TooManyRequestsException" error message which could mean you re
 };
 exports.executeCommand = executeCommand;
 const cli = async () => {
-    const remotionRoot = cli_1.CliInternals.findRemotionRoot();
+    const remotionRoot = renderer_1.RenderInternals.findRemotionRoot();
     await cli_1.CliInternals.initializeCli(remotionRoot);
     await (0, exports.executeCommand)(args_1.parsedLambdaCli._, remotionRoot);
 };

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

@@ -3,5 +3,8 @@ 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

@@ -1,7 +1,8 @@
+import type { FfmpegExecutable } from '@remotion/renderer';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { LambdaCodec } from '../../shared/validate-lambda-codec';
 import type { EnhancedErrorInfo } from './write-lambda-error';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, onErrors, }: {
+export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }: {
     bucket: string;
     expectedFiles: number;
     onProgress: (frames: number, encodingStart: number) => void;
@@ -13,6 +14,8 @@ export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numbe
     expectedBucketOwner: string;
     fps: number;
     numberOfGifLoops: number | null;
+    ffmpegExecutable: FfmpegExecutable;
+    remotionRoot: string;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;

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

@@ -127,7 +127,7 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
         loop().catch((err) => reject(err));
     });
 };
-const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, onErrors, }) => {
+const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }) => {
     var _a;
     const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
     if ((0, fs_1.existsSync)(outdir)) {
@@ -159,6 +159,8 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
         codec: codecForCombining,
         fps,
         numberOfGifLoops,
+        ffmpegExecutable,
+        remotionRoot,
     });
     combine.end();
     const cleanupChunksProm = ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outdir, {

package/dist/functions/launch.js

@@ -66,6 +66,7 @@ const innerLaunchHandler = async (params, options) => {
     const startedDate = Date.now();
     let webhookInvoked = false;
     console.log(`Function has ${Math.max(options.getRemainingTimeInMillis() - 1000, 1000)} before it times out`);
+    const verbose = renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose');
     const webhookDueToTimeout = setTimeout(async () => {
         if (params.webhook && !webhookInvoked) {
             try {
@@ -108,7 +109,7 @@ const innerLaunchHandler = async (params, options) => {
             }
         }
     }, Math.max(options.getRemainingTimeInMillis() - 1000, 1000));
-    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), params.chromiumOptions);
+    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(verbose, params.chromiumOptions);
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     const inputPropsPromise = (0, deserialize_input_props_1.deserializeInputProps)({
         bucketName: params.bucketName,
@@ -348,6 +349,8 @@ const innerLaunchHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         fps,
         numberOfGifLoops: params.numberOfGifLoops,
+        ffmpegExecutable: null,
+        remotionRoot: process.cwd(),
         onErrors,
     });
     if (!encodingStop) {
@@ -403,12 +406,14 @@ const innerLaunchHandler = async (params, options) => {
         chunkCount,
         renderId: params.renderId,
     });
-    const deletProm = (0, delete_chunks_1.cleanupFiles)({
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        bucket: params.bucketName,
-        contents,
-        jobs,
-    });
+    const deletProm = verbose
+        ? Promise.resolve(0)
+        : (0, delete_chunks_1.cleanupFiles)({
+            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+            bucket: params.bucketName,
+            contents,
+            jobs,
+        });
     const cleanupSerializedInputPropsProm = (0, cleanup_serialized_input_props_1.cleanupSerializedInputProps)({
         bucketName: params.bucketName,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),

package/dist/functions/renderer.js

@@ -110,7 +110,6 @@ const renderHandler = async (params, options, logs) => {
             outputLocation,
             codec: chunkCodec,
             crf: (_a = params.crf) !== null && _a !== void 0 ? _a : undefined,
-            ffmpegExecutable: process.env.NODE_ENV === 'test' ? null : '/opt/bin/ffmpeg',
             pixelFormat: params.pixelFormat,
             proResProfile: params.proResProfile,
             onDownload: (src) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/lambda",
-	"version": "3.2.43-retry.19+5671d7797",
+	"version": "3.3.0",
 	"description": "Distributed renderer for Remotion based on AWS Lambda",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -31,12 +31,12 @@
 		"@aws-sdk/client-service-quotas": "3.190.0",
 		"@aws-sdk/lib-storage": "3.190.0",
 		"@aws-sdk/s3-request-presigner": "3.190.0",
-		"@remotion/bundler": "3.2.43-retry.19+5671d7797",
-		"@remotion/cli": "3.2.43-retry.19+5671d7797",
-		"@remotion/renderer": "3.2.43-retry.19+5671d7797",
+		"@remotion/bundler": "3.3.0",
+		"@remotion/cli": "3.3.0",
+		"@remotion/renderer": "3.3.0",
 		"aws-policies": "^1.0.1",
 		"mime-types": "2.1.34",
-		"remotion": "3.2.43-retry.19+5671d7797"
+		"remotion": "3.3.0"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5671d779758f7837f2f50f75e2cccdd7c6b58f43"
+	"gitHead": "29322c95729df0229eecc5f674d019145a783b46"
 }