@remotion/lambda 3.3.6 → 3.3.8

package/dist/functions/launch.js

@@ -1,12 +1,33 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchHandler = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = __importStar(require("fs"));
+const path_1 = require("path");
 const remotion_1 = require("remotion");
 const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
@@ -29,7 +50,6 @@ const find_output_file_in_bucket_1 = require("./helpers/find-output-file-in-buck
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
 const get_files_to_delete_1 = require("./helpers/get-files-to-delete");
-const get_lambdas_invoked_stats_1 = require("./helpers/get-lambdas-invoked-stats");
 const get_output_url_from_metadata_1 = require("./helpers/get-output-url-from-metadata");
 const inspect_errors_1 = require("./helpers/inspect-errors");
 const io_1 = require("./helpers/io");
@@ -223,6 +243,8 @@ const innerLaunchHandler = async (params, options) => {
         renderId: params.renderId,
         outName: (_b = params.outName) !== null && _b !== void 0 ? _b : undefined,
         privacy: params.privacy,
+        everyNthFrame: params.everyNthFrame,
+        frameRange: realFrameRange,
     };
     const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName, typeof params.outName === 'string' || typeof params.outName === 'undefined'
         ? null
@@ -264,27 +286,17 @@ const innerLaunchHandler = async (params, options) => {
     }));
     reqSend.end();
     let lastProgressUploaded = 0;
-    let encodingStop = null;
-    const onProgress = (framesEncoded, start) => {
+    const onProgress = (framesEncoded) => {
         const relativeProgress = framesEncoded / frameCount.length;
         const deltaSinceLastProgressUploaded = relativeProgress - lastProgressUploaded;
-        if (relativeProgress === 1) {
-            encodingStop = Date.now();
-        }
         if (deltaSinceLastProgressUploaded < 0.1) {
             return;
         }
         lastProgressUploaded = relativeProgress;
-        const encodingProgress = {
-            framesEncoded,
-            totalFrames: frameCount.length,
-            doneIn: encodingStop ? encodingStop - start : null,
-            timeToInvoke: null,
-        };
         (0, io_1.lambdaWriteFile)({
             bucketName: params.bucketName,
             key: (0, constants_1.encodingProgressKey)(params.renderId),
-            body: JSON.stringify(encodingProgress),
+            body: String(framesEncoded),
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
@@ -338,24 +350,35 @@ const innerLaunchHandler = async (params, options) => {
         throw new Error('Stopping Lambda function because error occurred: ' + errors[0].stack);
     };
     const fps = comp.fps / params.everyNthFrame;
-    const { outfile, cleanupChunksProm, encodingStart } = await (0, concat_videos_1.concatVideosS3)({
+    const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
+    if ((0, fs_1.existsSync)(outdir)) {
+        (fs_1.rmSync !== null && fs_1.rmSync !== void 0 ? fs_1.rmSync : fs_1.rmdirSync)(outdir, {
+            recursive: true,
+        });
+    }
+    (0, fs_1.mkdirSync)(outdir);
+    const files = await (0, concat_videos_1.getAllFilesS3)({
         bucket: params.bucketName,
         expectedFiles: chunkCount,
-        onProgress,
-        numberOfFrames: frameCount.length,
+        outdir,
         renderId: params.renderId,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        codec: params.codec,
         expectedBucketOwner: options.expectedBucketOwner,
+        onErrors,
+    });
+    const encodingStart = Date.now();
+    const { outfile, cleanupChunksProm } = await (0, concat_videos_1.concatVideosS3)({
+        onProgress,
+        numberOfFrames: frameCount.length,
+        codec: params.codec,
         fps,
         numberOfGifLoops: params.numberOfGifLoops,
         ffmpegExecutable: null,
         remotionRoot: process.cwd(),
-        onErrors,
+        files,
+        outdir,
     });
-    if (!encodingStop) {
-        encodingStop = Date.now();
-    }
+    const encodingStop = Date.now();
     const outputSize = fs_1.default.statSync(outfile);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
@@ -373,22 +396,10 @@ const innerLaunchHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
     });
-    const finalEncodingProgress = {
-        framesEncoded: frameCount.length,
-        totalFrames: frameCount.length,
-        doneIn: encodingStop ? encodingStop - encodingStart : null,
-        timeToInvoke: (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)({
-            contents,
-            renderId: params.renderId,
-            estimatedRenderLambdaInvokations: renderMetadata.estimatedRenderLambdaInvokations,
-            checkIfAllLambdasWereInvoked: false,
-            startDate: renderMetadata.startedDate,
-        }).timeToInvokeLambdas,
-    };
     const finalEncodingProgressProm = (0, io_1.lambdaWriteFile)({
         bucketName: params.bucketName,
         key: (0, constants_1.encodingProgressKey)(params.renderId),
-        body: JSON.stringify(finalEncodingProgress),
+        body: String(frameCount.length),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,

package/dist/functions/renderer.js

@@ -9,13 +9,11 @@ const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const aws_clients_1 = require("../shared/aws-clients");
+const chunk_progress_1 = require("../shared/chunk-progress");
 const constants_1 = require("../shared/constants");
 const deserialize_input_props_1 = require("../shared/deserialize-input-props");
-const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
-const get_files_in_folder_1 = require("./helpers/get-files-in-folder");
-const get_folder_size_1 = require("./helpers/get-folder-size");
 const io_1 = require("./helpers/io");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
 const renderHandler = async (params, options, logs) => {
@@ -64,9 +62,17 @@ const renderHandler = async (params, options, logs) => {
             inputProps,
             frameRange: params.frameRange,
             onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
-                if (renderedFrames % 10 === 0 &&
+                if (renderedFrames % 5 === 0 &&
                     renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
                     console.log(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                    (0, chunk_progress_1.writeLambdaInitializedFile)({
+                        attempt: params.attempt,
+                        bucketName: params.bucketName,
+                        chunk: params.chunk,
+                        expectedBucketOwner: options.expectedBucketOwner,
+                        framesRendered: renderedFrames,
+                        renderId: params.renderId,
+                    }).catch((err) => reject(err));
                 }
                 const allFrames = renderer_1.RenderInternals.getFramesToRender(params.frameRange, params.everyNthFrame);
                 if (renderedFrames === allFrames.length) {
@@ -76,26 +82,13 @@ const renderHandler = async (params, options, logs) => {
             },
             concurrency: params.concurrencyPerLambda,
             onStart: () => {
-                (0, io_1.lambdaWriteFile)({
-                    privacy: 'private',
+                (0, chunk_progress_1.writeLambdaInitializedFile)({
+                    attempt: params.attempt,
                     bucketName: params.bucketName,
-                    body: JSON.stringify({
-                        filesCleaned: clean_tmpdir_1.deletedFilesSize,
-                        filesInTmp: fs_1.default.readdirSync('/tmp'),
-                        isWarm: options.isWarm,
-                        deletedFiles: clean_tmpdir_1.deletedFiles,
-                        tmpSize: (0, get_folder_size_1.getFolderSizeRecursively)('/tmp'),
-                        tmpDirFiles: (0, get_files_in_folder_1.getFolderFiles)('/tmp'),
-                    }),
-                    key: (0, constants_1.lambdaChunkInitializedKey)({
-                        renderId: params.renderId,
-                        chunk: params.chunk,
-                        attempt: params.attempt,
-                    }),
-                    region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+                    chunk: params.chunk,
                     expectedBucketOwner: options.expectedBucketOwner,
-                    downloadBehavior: null,
-                    customCredentials: null,
+                    framesRendered: 0,
+                    renderId: params.renderId,
                 }).catch((err) => reject(err));
             },
             puppeteerInstance: browserInstance,

package/dist/functions/still.js

@@ -93,6 +93,8 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         renderId,
         outName: (_b = lambdaParams.outName) !== null && _b !== void 0 ? _b : undefined,
         privacy: lambdaParams.privacy,
+        everyNthFrame: 1,
+        frameRange: [lambdaParams.frame, lambdaParams.frame],
     };
     await (0, io_1.lambdaWriteFile)({
         bucketName,

package/dist/pricing/aws-regions.d.ts

@@ -1,2 +1,2 @@
-export declare const AWS_REGIONS: readonly ["eu-central-1", "eu-west-1", "eu-west-2", "us-east-1", "us-east-2", "us-west-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1"];
+export declare const AWS_REGIONS: readonly ["eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "eu-south-1", "eu-north-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2", "af-south-1", "ap-south-1", "ap-east-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ca-central-1", "me-south-1", "sa-east-1"];
 export declare type AwsRegion = typeof AWS_REGIONS[number];

package/dist/pricing/aws-regions.js

@@ -5,11 +5,22 @@ exports.AWS_REGIONS = [
     'eu-central-1',
     'eu-west-1',
     'eu-west-2',
+    'eu-west-3',
+    'eu-south-1',
+    'eu-north-1',
     'us-east-1',
     'us-east-2',
+    'us-west-1',
     'us-west-2',
+    'af-south-1',
     'ap-south-1',
+    'ap-east-1',
     'ap-southeast-1',
     'ap-southeast-2',
     'ap-northeast-1',
+    'ap-northeast-2',
+    'ap-northeast-3',
+    'ca-central-1',
+    'me-south-1',
+    'sa-east-1',
 ];