@remotion/lambda 4.0.0-publish.3 → 4.0.0-reorg.27

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

@@ -1,10 +1,10 @@
 import type { OptimizationProfile } from './types';
-export declare const planFrameRanges: ({ chunkCount, framesPerLambda, optimization, shouldUseOptimization, frameRange, }: {
-    chunkCount: number;
+export declare const planFrameRanges: ({ framesPerLambda, optimization, shouldUseOptimization, frameRange, everyNthFrame, }: {
     framesPerLambda: number;
     optimization: OptimizationProfile | null;
     shouldUseOptimization: boolean;
     frameRange: [number, number];
+    everyNthFrame: number;
 }) => {
     chunks: [
         number,

package/dist/functions/chunk-optimization/plan-frame-ranges.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.planFrameRanges = void 0;
 const renderer_1 = require("@remotion/renderer");
 const can_use_optimization_1 = require("./can-use-optimization");
-const planFrameRanges = ({ chunkCount, framesPerLambda, optimization, shouldUseOptimization, frameRange, }) => {
+const planFrameRanges = ({ framesPerLambda, optimization, shouldUseOptimization, frameRange, everyNthFrame, }) => {
+    const framesToRender = renderer_1.RenderInternals.getFramesToRender(frameRange, everyNthFrame);
+    const chunkCount = Math.ceil(framesToRender.length / framesPerLambda);
     if ((0, can_use_optimization_1.canUseOptimization)({
         optimization,
         framesPerLambda,
@@ -15,13 +17,12 @@ const planFrameRanges = ({ chunkCount, framesPerLambda, optimization, shouldUseO
             didUseOptimization: true,
         };
     }
-    const frameCount = renderer_1.RenderInternals.getDurationFromFrameRange(frameRange, 0);
+    const firstFrame = frameRange[0];
     return {
         chunks: new Array(chunkCount).fill(1).map((_, i) => {
-            return [
-                i * framesPerLambda + frameRange[0],
-                Math.min(frameCount, (i + 1) * framesPerLambda) - 1 + frameRange[0],
-            ];
+            const start = i * framesPerLambda * everyNthFrame + firstFrame;
+            const end = Math.min(framesToRender[framesToRender.length - 1], (i + 1) * framesPerLambda * everyNthFrame - 1) + firstFrame;
+            return [start, end];
         }),
         didUseOptimization: false,
     };

package/dist/functions/chunk-optimization/s3-optimization-file.js

@@ -12,6 +12,7 @@ const writeOptimization = async ({ bucketName, optimization, compositionId, site
         region,
         privacy: 'private',
         expectedBucketOwner,
+        downloadBehavior: null,
     });
 };
 exports.writeOptimization = writeOptimization;

package/dist/functions/chunk-optimization/types.d.ts

@@ -19,4 +19,5 @@ export declare type OptimizationProfile = {
     createdFromRenderId: string;
     framesPerLambda: number;
     lambdaVersion: LambdaVersions;
+    everyNthFrame: number;
 };

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

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

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

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

package/dist/functions/helpers/io.d.ts

@@ -3,6 +3,7 @@ import type { ReadStream } from 'fs';
 import type { Readable } from 'stream';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { Privacy } from '../../shared/constants';
+import type { DownloadBehavior } from '../../shared/content-disposition-header';
 export declare type LambdaLSInput = {
     bucketName: string;
     prefix: string;
@@ -12,13 +13,14 @@ export declare type LambdaLSInput = {
 };
 export declare type LambdaLsReturnType = Promise<_Object[]>;
 export declare const lambdaLs: ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }: LambdaLSInput) => LambdaLsReturnType;
-export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, }: {
+export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, }: {
     bucketName: string;
     key: string;
     body: ReadStream | string;
     region: AwsRegion;
     privacy: Privacy;
     expectedBucketOwner: string | null;
+    downloadBehavior: DownloadBehavior | null;
 }) => Promise<void>;
 export declare const lambdaReadFile: ({ bucketName, key, region, expectedBucketOwner, }: {
     bucketName: string;

package/dist/functions/helpers/io.js

@@ -7,6 +7,7 @@ exports.lambdaReadFile = exports.lambdaWriteFile = exports.lambdaLs = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const mime_types_1 = __importDefault(require("mime-types"));
 const aws_clients_1 = require("../../shared/aws-clients");
+const content_disposition_header_1 = require("../../shared/content-disposition-header");
 const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }) => {
     var _a, _b, _c;
     try {
@@ -46,7 +47,7 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
     }
 };
 exports.lambdaLs = lambdaLs;
-const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, }) => {
+const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, }) => {
     await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.PutObjectCommand({
         Bucket: bucketName,
         Key: key,
@@ -54,6 +55,7 @@ const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expecte
         ACL: privacy === 'private' ? 'private' : 'public-read',
         ExpectedBucketOwner: expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
         ContentType: mime_types_1.default.lookup(key) || 'application/octet-stream',
+        ContentDisposition: (0, content_disposition_header_1.getContentDispositionHeader)(downloadBehavior),
     }));
 };
 exports.lambdaWriteFile = lambdaWriteFile;

package/dist/functions/helpers/read-with-progress.d.ts

@@ -1,8 +1,8 @@
 import type { AwsRegion } from '../../pricing/aws-regions';
 export declare type LambdaReadFileProgress = (progress: {
-    totalSize: number | null;
+    totalSize: number;
     downloaded: number;
-    percent: number | null;
+    percent: number;
 }) => unknown;
 export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, }: {
     bucketName: string;

package/dist/functions/helpers/read-with-progress.js

@@ -15,7 +15,14 @@ const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expecte
     const presigned = await (0, s3_request_presigner_1.getSignedUrl)(client, command);
     const { to, sizeInBytes } = await renderer_1.RenderInternals.downloadFile({
         url: presigned,
-        onProgress,
+        onProgress: ({ downloaded, percent, totalSize }) => {
+            // On Lambda, it should always be a number
+            onProgress({
+                downloaded,
+                percent: percent,
+                totalSize: totalSize,
+            });
+        },
         to: () => outputPath,
     });
     return { sizeInBytes, to };

package/dist/functions/helpers/validate-composition.d.ts

@@ -1,5 +1,5 @@
-import type { ChromiumOptions, openBrowser } from '@remotion/renderer';
-import type { FfmpegExecutable, TCompMetadata } from 'remotion';
+import type { ChromiumOptions, FfmpegExecutable, openBrowser } from '@remotion/renderer';
+import type { TCompMetadata } from 'remotion';
 import type { Await } from '../../shared/await';
 declare type ValidateCompositionOptions = {
     serveUrl: string;

package/dist/functions/helpers/write-lambda-error.js

@@ -33,6 +33,7 @@ const writeLambdaError = async ({ bucketName, renderId, errorInfo, expectedBucke
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner,
+        downloadBehavior: null,
     });
 };
 exports.writeLambdaError = writeLambdaError;

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

@@ -11,6 +11,7 @@ const writePostRenderData = async ({ bucketName, renderId, postRenderData, expec
         body: JSON.stringify(postRenderData),
         expectedBucketOwner,
         region,
+        downloadBehavior: null,
     });
 };
 exports.writePostRenderData = writePostRenderData;

package/dist/functions/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = void 0;
-const remotion_1 = require("remotion");
+const renderer_1 = require("@remotion/renderer");
 const constants_1 = require("../shared/constants");
 const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
 const is_warm_1 = require("./helpers/is-warm");
@@ -9,7 +9,7 @@ const print_cloudwatch_helper_1 = require("./helpers/print-cloudwatch-helper");
 const info_1 = require("./info");
 const launch_1 = require("./launch");
 const progress_1 = require("./progress");
-const renderer_1 = require("./renderer");
+const renderer_2 = require("./renderer");
 const start_1 = require("./start");
 const still_1 = require("./still");
 const handler = async (params, context) => {
@@ -56,10 +56,10 @@ const handler = async (params, context) => {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.renderer, {
             renderId: params.renderId,
             chunk: String(params.chunk),
-            dumpLogs: String(remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose')),
+            dumpLogs: String(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')),
             inputProps: JSON.stringify(params.inputProps),
         });
-        return (0, renderer_1.rendererHandler)(params, {
+        return (0, renderer_2.rendererHandler)(params, {
             expectedBucketOwner: currentUserId,
             isWarm,
         });

package/dist/functions/launch.js

@@ -46,7 +46,7 @@ const innerLaunchHandler = async (params, options) => {
     }
     const startedDate = Date.now();
     const [browserInstance, optimization] = await Promise.all([
-        (0, get_browser_instance_1.getBrowserInstance)(remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'), params.chromiumOptions),
+        (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), params.chromiumOptions),
         (0, s3_optimization_file_1.getOptimization)({
             bucketName: params.bucketName,
             siteId: (0, make_s3_url_1.getServeUrlHash)(params.serveUrl),
@@ -67,15 +67,16 @@ const innerLaunchHandler = async (params, options) => {
         chromiumOptions: params.chromiumOptions,
         port: null,
     });
-    remotion_1.Internals.validateDurationInFrames(comp.durationInFrames, 'passed to <Component />');
-    remotion_1.Internals.validateFps(comp.fps, 'passed to <Component />');
-    remotion_1.Internals.validateDimension(comp.height, 'height', 'passed to <Component />');
-    remotion_1.Internals.validateDimension(comp.width, 'width', 'passed to <Component />');
+    remotion_1.Internals.validateDurationInFrames(comp.durationInFrames, 'passed to a Lambda render');
+    remotion_1.Internals.validateFps(comp.fps, 'passed to a Lambda render', false);
+    remotion_1.Internals.validateDimension(comp.height, 'height', 'passed to a Lambda render');
+    remotion_1.Internals.validateDimension(comp.width, 'width', 'passed to a Lambda render');
+    renderer_1.RenderInternals.validateConcurrency(params.concurrencyPerLambda, 'concurrencyPerLambda');
     const realFrameRange = renderer_1.RenderInternals.getRealFrameRange(comp.durationInFrames, params.frameRange);
-    const frameCount = renderer_1.RenderInternals.getDurationFromFrameRange(realFrameRange, 0);
-    const framesPerLambda = (_a = params.framesPerLambda) !== null && _a !== void 0 ? _a : (0, best_frames_per_lambda_param_1.bestFramesPerLambdaParam)(frameCount);
+    const frameCount = renderer_1.RenderInternals.getFramesToRender(realFrameRange, params.everyNthFrame);
+    const framesPerLambda = (_a = params.framesPerLambda) !== null && _a !== void 0 ? _a : (0, best_frames_per_lambda_param_1.bestFramesPerLambdaParam)(frameCount.length);
     (0, validate_frames_per_lambda_1.validateFramesPerLambda)(framesPerLambda);
-    const chunkCount = Math.ceil(frameCount / framesPerLambda);
+    const chunkCount = Math.ceil(frameCount.length / framesPerLambda);
     if (chunkCount > constants_1.MAX_FUNCTIONS_PER_RENDER) {
         throw new Error(`Too many functions: This render would cause ${chunkCount} functions to spawn. We limit this amount to ${constants_1.MAX_FUNCTIONS_PER_RENDER} functions as more would result in diminishing returns. Values set: frameCount = ${frameCount}, framesPerLambda=${framesPerLambda}. See ${docs_url_1.DOCS_URL}/docs/lambda/concurrency for how this parameter is calculated.`);
     }
@@ -83,12 +84,12 @@ const innerLaunchHandler = async (params, options) => {
     (0, validate_privacy_1.validatePrivacy)(params.privacy);
     renderer_1.RenderInternals.validatePuppeteerTimeout(params.timeoutInMilliseconds);
     const { chunks, didUseOptimization } = (0, plan_frame_ranges_1.planFrameRanges)({
-        chunkCount,
         framesPerLambda,
         optimization,
         // TODO: Re-enable chunk optimization later
         shouldUseOptimization: false,
         frameRange: realFrameRange,
+        everyNthFrame: params.everyNthFrame,
     });
     const sortedChunks = chunks.slice().sort((a, b) => a[0] - b[0]);
     const invokers = Math.round(Math.sqrt(chunks.length));
@@ -117,11 +118,13 @@ const innerLaunchHandler = async (params, options) => {
             proResProfile: params.proResProfile,
             quality: params.quality,
             privacy: params.privacy,
-            logLevel: (_a = params.logLevel) !== null && _a !== void 0 ? _a : remotion_1.Internals.Logging.DEFAULT_LOG_LEVEL,
+            logLevel: (_a = params.logLevel) !== null && _a !== void 0 ? _a : 'info',
             attempt: 1,
             timeoutInMilliseconds: params.timeoutInMilliseconds,
             chromiumOptions: params.chromiumOptions,
             scale: params.scale,
+            everyNthFrame: params.everyNthFrame,
+            concurrencyPerLambda: params.concurrencyPerLambda,
         };
         return payload;
     });
@@ -158,6 +161,7 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
     });
     await Promise.all(lambdaPayloads.map(async (payload, index) => {
         const callingLambdaTimer = (0, timer_1.timer)('Calling chunk ' + index);
@@ -173,7 +177,7 @@ const innerLaunchHandler = async (params, options) => {
     let lastProgressUploaded = 0;
     let encodingStop = null;
     const onProgress = (framesEncoded, start) => {
-        const relativeProgress = framesEncoded / frameCount;
+        const relativeProgress = framesEncoded / frameCount.length;
         const deltaSinceLastProgressUploaded = relativeProgress - lastProgressUploaded;
         if (relativeProgress === 1) {
             encodingStop = Date.now();
@@ -184,7 +188,7 @@ const innerLaunchHandler = async (params, options) => {
         lastProgressUploaded = relativeProgress;
         const encodingProgress = {
             framesEncoded,
-            totalFrames: frameCount,
+            totalFrames: frameCount.length,
             doneIn: encodingStop ? encodingStop - start : null,
             timeToInvoke: null,
         };
@@ -195,6 +199,7 @@ const innerLaunchHandler = async (params, options) => {
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
+            downloadBehavior: null,
         }).catch((err) => {
             (0, write_lambda_error_1.writeLambdaError)({
                 bucketName: params.bucketName,
@@ -216,16 +221,18 @@ const innerLaunchHandler = async (params, options) => {
             });
         });
     };
+    const fps = comp.fps / params.everyNthFrame;
     const { outfile, cleanupChunksProm, encodingStart } = await (0, concat_videos_1.concatVideosS3)({
         bucket: params.bucketName,
         expectedFiles: chunkCount,
         onProgress,
-        numberOfFrames: frameCount,
+        numberOfFrames: frameCount.length,
         renderId: params.renderId,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         codec: params.codec,
         expectedBucketOwner: options.expectedBucketOwner,
-        fps: comp.fps,
+        fps,
+        numberOfGifLoops: params.numberOfGifLoops,
     });
     if (!encodingStop) {
         encodingStop = Date.now();
@@ -239,6 +246,7 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: params.downloadBehavior,
     });
     let chunkProm = Promise.resolve();
     // TODO: Enable in a later release
@@ -263,6 +271,7 @@ const innerLaunchHandler = async (params, options) => {
                     framesPerLambda,
                     lambdaVersion: constants_1.CURRENT_VERSION,
                     frameRange: realFrameRange,
+                    everyNthFrame: params.everyNthFrame,
                 },
                 expectedBucketOwner: options.expectedBucketOwner,
                 compositionId: params.composition,
@@ -281,8 +290,8 @@ const innerLaunchHandler = async (params, options) => {
         }),
     ]);
     const finalEncodingProgress = {
-        framesEncoded: frameCount,
-        totalFrames: frameCount,
+        framesEncoded: frameCount.length,
+        totalFrames: frameCount.length,
         doneIn: encodingStop ? encodingStop - encodingStart : null,
         timeToInvoke: (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)(contents, params.renderId, renderMetadata.estimatedRenderLambdaInvokations, renderMetadata.startedDate).timeToInvokeLambdas,
     };
@@ -293,6 +302,7 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
     });
     const errorExplanationsProm = (0, inspect_errors_1.inspectErrors)({
         contents,