@remotion/lambda 3.2.12 → 3.2.13

package/dist/api/deploy-function.js

@@ -6,6 +6,7 @@ const get_functions_1 = require("../api/get-functions");
 const constants_1 = require("../shared/constants");
 const function_zip_path_1 = require("../shared/function-zip-path");
 const get_account_id_1 = require("../shared/get-account-id");
+const lambda_version_string_1 = require("../shared/lambda-version-string");
 const validate_architecture_1 = require("../shared/validate-architecture");
 const validate_aws_region_1 = require("../shared/validate-aws-region");
 const validate_custom_role_arn_1 = require("../shared/validate-custom-role-arn");
@@ -37,7 +38,7 @@ const deployFunction = async (options) => {
     (0, validate_disk_size_in_mb_1.validateDiskSizeInMb)(diskSizeInMb);
     (0, validate_custom_role_arn_1.validateCustomRoleArn)(options.customRoleArn);
     const fnNameRender = [
-        `${constants_1.RENDER_FN_PREFIX}${version_1.VERSION.replace(/\./g, '-')}`,
+        `${constants_1.RENDER_FN_PREFIX}${lambda_version_string_1.LAMBDA_VERSION_STRING}`,
         `mem${options.memorySizeInMb}mb`,
         `disk${diskSizeInMb}mb`,
         `${options.timeoutInSeconds}sec`,

package/dist/cli/get-aws-region.js

@@ -6,6 +6,7 @@ const is_in_lambda_1 = require("../shared/is-in-lambda");
 const validate_aws_region_1 = require("../shared/validate-aws-region");
 const args_1 = require("./args");
 const getAwsRegion = () => {
+    var _a;
     if ((0, is_in_lambda_1.isInsideLambda)()) {
         throw new Error('Should not call getAwsRegion() if in lambda');
     }
@@ -13,7 +14,7 @@ const getAwsRegion = () => {
         (0, validate_aws_region_1.validateAwsRegion)(args_1.parsedLambdaCli.region);
         return args_1.parsedLambdaCli.region;
     }
-    const envVariable = process.env.AWS_REGION;
+    const envVariable = (_a = process.env.REMOTION_AWS_REGION) !== null && _a !== void 0 ? _a : process.env.AWS_REGION;
     if (envVariable) {
         (0, validate_aws_region_1.validateAwsRegion)(envVariable);
         return envVariable;

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

@@ -6,9 +6,6 @@ export declare const planFrameRanges: ({ framesPerLambda, optimization, shouldUs
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [
-        number,
-        number
-    ][];
+    chunks: [number, number][];
     didUseOptimization: boolean;
 };

package/dist/functions/helpers/check-if-render-exists.d.ts

@@ -0,0 +1,3 @@
+import type { _Object } from '@aws-sdk/client-s3';
+import type { AwsRegion } from '../../client';
+export declare const checkIfRenderExists: (contents: _Object[], renderId: string, bucketName: string, region: AwsRegion) => void;

package/dist/functions/helpers/check-if-render-exists.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkIfRenderExists = void 0;
+const constants_1 = require("../../shared/constants");
+const checkIfRenderExists = (contents, renderId, bucketName, region) => {
+    const initializedExists = Boolean(contents.find((c) => {
+        var _a;
+        return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.initalizedMetadataKey)(renderId));
+    }));
+    if (!initializedExists) {
+        throw new TypeError(`No render with ID "${renderId}" found in bucket ${bucketName} and region ${region}`);
+    }
+};
+exports.checkIfRenderExists = checkIfRenderExists;

package/dist/functions/helpers/get-files-to-delete.js

@@ -12,7 +12,7 @@ const getFilesToDelete = ({ chunkCount, renderId, }) => {
         .map((_x, i) => (0, constants_1.lambdaTimingsPrefixForChunk)(renderId, i));
     return [
         {
-            name: (0, constants_1.lambdaInitializedPrefix)(renderId),
+            name: (0, constants_1.lambdaChunkInitializedPrefix)(renderId),
             type: 'prefix',
         },
         ...chunks.map((i) => {

package/dist/functions/helpers/get-lambdas-invoked-stats.js

@@ -7,7 +7,7 @@ const min_max_1 = require("./min-max");
 const getLambdasInvokedStats = ({ contents, renderId, estimatedRenderLambdaInvokations, startDate, checkIfAllLambdasWereInvoked, }) => {
     var _a;
     const lambdasInvoked = contents
-        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaInitializedPrefix)(renderId)); })
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
         .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt === 1);
     const allLambdasInvoked = !checkIfAllLambdasWereInvoked ||
         lambdasInvoked.length === estimatedRenderLambdaInvokations;

package/dist/functions/helpers/get-progress.js

@@ -6,6 +6,7 @@ const constants_1 = require("../../shared/constants");
 const docs_url_1 = require("../../shared/docs-url");
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
 const calculate_price_from_bucket_1 = require("./calculate-price-from-bucket");
+const check_if_render_exists_1 = require("./check-if-render-exists");
 const expected_out_name_1 = require("./expected-out-name");
 const find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
 const format_costs_info_1 = require("./format-costs-info");
@@ -77,6 +78,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         expectedBucketOwner,
     });
+    (0, check_if_render_exists_1.checkIfRenderExists)(contents, renderId, bucketName, (0, get_current_region_1.getCurrentRegionInFunction)());
     const renderMetadataExists = Boolean(contents.find((c) => c.Key === (0, constants_1.renderMetadataKey)(renderId)));
     const [encodingStatus, renderMetadata, errorExplanations] = await Promise.all([
         (0, get_encoding_metadata_1.getEncodingMetadata)({

package/dist/functions/helpers/get-retry-stats.js

@@ -5,7 +5,7 @@ const constants_1 = require("../../shared/constants");
 const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
 const getRetryStats = ({ contents, renderId, }) => {
     const retries = contents
-        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaInitializedPrefix)(renderId)); })
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
         .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt !== 1);
     return retries.map((retry) => {
         var _a;

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

@@ -13,6 +13,11 @@ export declare type LambdaLSInput = {
 };
 export declare type LambdaLsReturnType = Promise<_Object[]>;
 export declare const lambdaLs: ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }: LambdaLSInput) => LambdaLsReturnType;
+export declare const lambdaDeleteFile: ({ bucketName, key, region, }: {
+    region: AwsRegion;
+    bucketName: string;
+    key: string;
+}) => Promise<void>;
 export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, }: {
     bucketName: string;
     key: string;

package/dist/functions/helpers/io.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lambdaReadFile = exports.lambdaWriteFile = exports.lambdaLs = void 0;
+exports.lambdaReadFile = exports.lambdaWriteFile = exports.lambdaDeleteFile = 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");
@@ -47,6 +47,13 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
     }
 };
 exports.lambdaLs = lambdaLs;
+const lambdaDeleteFile = async ({ bucketName, key, region, }) => {
+    await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.DeleteObjectCommand({
+        Bucket: bucketName,
+        Key: key,
+    }));
+};
+exports.lambdaDeleteFile = lambdaDeleteFile;
 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,

package/dist/functions/index.js

@@ -36,7 +36,7 @@ const handler = async (params, context) => {
             inputProps: JSON.stringify(params.inputProps),
             isWarm,
         });
-        return (0, start_1.startHandler)(params);
+        return (0, start_1.startHandler)(params, { expectedBucketOwner: currentUserId });
     }
     if (params.type === constants_1.LambdaRoutines.launch) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.launch, {

package/dist/functions/launch.js

@@ -371,6 +371,11 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,
     });
+    await (0, io_1.lambdaDeleteFile)({
+        bucketName: params.bucketName,
+        key: (0, constants_1.initalizedMetadataKey)(params.renderId),
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+    });
     await Promise.all([cleanupChunksProm, fs_1.default.promises.rm(outfile)]);
 };
 const launchHandler = async (params, options) => {

package/dist/functions/renderer.js

@@ -41,6 +41,7 @@ const renderHandler = async (params, options, logs) => {
     const outputLocation = path_1.default.join(outdir, `localchunk-${String(params.chunk).padStart(8, '0')}.${renderer_1.RenderInternals.getFileExtensionFromCodec(params.codec, 'chunk')}`);
     const chunkCodec = params.codec === 'gif' ? 'h264-mkv' : params.codec;
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    const downloads = {};
     await new Promise((resolve, reject) => {
         var _a;
         (0, renderer_1.renderMedia)({
@@ -78,7 +79,7 @@ const renderHandler = async (params, options, logs) => {
                         tmpSize: (0, get_folder_size_1.getFolderSizeRecursively)('/tmp'),
                         tmpDirFiles: (0, get_files_in_folder_1.getFolderFiles)('/tmp'),
                     }),
-                    key: (0, constants_1.lambdaInitializedKey)({
+                    key: (0, constants_1.lambdaChunkInitializedKey)({
                         renderId: params.renderId,
                         chunk: params.chunk,
                         attempt: params.attempt,
@@ -105,7 +106,24 @@ const renderHandler = async (params, options, logs) => {
             proResProfile: params.proResProfile,
             onDownload: (src) => {
                 console.log('Downloading', src);
-                return () => undefined;
+                downloads[src] = 0;
+                return ({ percent, downloaded }) => {
+                    if (percent === null) {
+                        console.log(`Download progress (${src}): ${downloaded} bytes. Don't know final size of download, no Content-Length header.`);
+                        return;
+                    }
+                    if (
+                    // Only report every 10% change
+                    downloads[src] > percent - 0.1 &&
+                        percent !== 1) {
+                        return;
+                    }
+                    downloads[src] = percent;
+                    console.log(`Download progress (${src}): ${downloaded} bytes, ${(percent * 100).toFixed(1)}%`);
+                    if (percent === 1) {
+                        console.log(`Download complete: ${src}`);
+                    }
+                };
             },
             overwrite: false,
             chromiumOptions: params.chromiumOptions,

package/dist/functions/start.d.ts

@@ -1,5 +1,9 @@
 import type { LambdaPayload } from '../shared/constants';
-export declare const startHandler: (params: LambdaPayload) => Promise<{
+declare type Options = {
+    expectedBucketOwner: string;
+};
+export declare const startHandler: (params: LambdaPayload, options: Options) => Promise<{
     bucketName: string;
     renderId: string;
 }>;
+export {};

package/dist/functions/start.js

@@ -8,7 +8,8 @@ const aws_clients_1 = require("../shared/aws-clients");
 const constants_1 = require("../shared/constants");
 const random_hash_1 = require("../shared/random-hash");
 const get_current_region_1 = require("./helpers/get-current-region");
-const startHandler = async (params) => {
+const io_1 = require("./helpers/io");
+const startHandler = async (params, options) => {
     var _a;
     if (params.type !== constants_1.LambdaRoutines.start) {
         throw new TypeError('Expected type start');
@@ -23,6 +24,15 @@ const startHandler = async (params) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
     });
     const renderId = (0, random_hash_1.randomHash)({ randomInTests: true });
+    const initialFile = (0, io_1.lambdaWriteFile)({
+        bucketName,
+        downloadBehavior: null,
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        body: 'Render was initialized',
+        expectedBucketOwner: options.expectedBucketOwner,
+        key: (0, constants_1.initalizedMetadataKey)(renderId),
+        privacy: 'private',
+    });
     const payload = {
         type: constants_1.LambdaRoutines.launch,
         framesPerLambda: params.framesPerLambda,
@@ -58,6 +68,7 @@ const startHandler = async (params) => {
         Payload: JSON.stringify(payload),
         InvocationType: 'Event',
     }));
+    await initialFile;
     return {
         bucketName,
         renderId,

package/dist/shared/constants.d.ts

@@ -32,8 +32,9 @@ export declare const LOG_GROUP_PREFIX = "/aws/lambda/";
 export declare const rendersPrefix: (renderId: string) => string;
 export declare const encodingProgressKey: (renderId: string) => string;
 export declare const renderMetadataKey: (renderId: string) => string;
-export declare const lambdaInitializedPrefix: (renderId: string) => string;
-export declare const lambdaInitializedKey: ({ renderId, chunk, attempt, }: {
+export declare const initalizedMetadataKey: (renderId: string) => string;
+export declare const lambdaChunkInitializedPrefix: (renderId: string) => string;
+export declare const lambdaChunkInitializedKey: ({ renderId, chunk, attempt, }: {
     attempt: number;
     renderId: string;
     chunk: number;

package/dist/shared/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMBDA_BURST_LIMIT_QUOTA = exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.postRenderDataKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.optimizationProfile = exports.getErrorFileName = exports.getErrorKeyPrefix = exports.chunkKeyForIndex = exports.chunkKey = exports.lambdaTimingsKey = exports.lambdaLogsPrefix = exports.lambdaTimingsPrefixForChunk = exports.lambdaTimingsPrefix = exports.lambdaInitializedKey = exports.lambdaInitializedPrefix = exports.renderMetadataKey = exports.encodingProgressKey = exports.rendersPrefix = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_ARCHITECTURE = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
+exports.LAMBDA_BURST_LIMIT_QUOTA = exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.postRenderDataKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.optimizationProfile = exports.getErrorFileName = exports.getErrorKeyPrefix = exports.chunkKeyForIndex = exports.chunkKey = exports.lambdaTimingsKey = exports.lambdaLogsPrefix = exports.lambdaTimingsPrefixForChunk = exports.lambdaTimingsPrefix = exports.lambdaChunkInitializedKey = exports.lambdaChunkInitializedPrefix = exports.initalizedMetadataKey = exports.renderMetadataKey = exports.encodingProgressKey = exports.rendersPrefix = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_ARCHITECTURE = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
 exports.MIN_MEMORY = 512;
 exports.MAX_MEMORY = 10240;
 exports.DEFAULT_MEMORY_SIZE = 2048;
@@ -29,10 +29,12 @@ const encodingProgressKey = (renderId) => `${(0, exports.rendersPrefix)(renderId
 exports.encodingProgressKey = encodingProgressKey;
 const renderMetadataKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/pre-render-metadata.json`;
 exports.renderMetadataKey = renderMetadataKey;
-const lambdaInitializedPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/lambda-initialized`;
-exports.lambdaInitializedPrefix = lambdaInitializedPrefix;
-const lambdaInitializedKey = ({ renderId, chunk, attempt, }) => `${(0, exports.lambdaInitializedPrefix)(renderId)}-chunk:${chunk}-attempt:${attempt}.txt`;
-exports.lambdaInitializedKey = lambdaInitializedKey;
+const initalizedMetadataKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/initialized.txt`;
+exports.initalizedMetadataKey = initalizedMetadataKey;
+const lambdaChunkInitializedPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/lambda-initialized`;
+exports.lambdaChunkInitializedPrefix = lambdaChunkInitializedPrefix;
+const lambdaChunkInitializedKey = ({ renderId, chunk, attempt, }) => `${(0, exports.lambdaChunkInitializedPrefix)(renderId)}-chunk:${chunk}-attempt:${attempt}.txt`;
+exports.lambdaChunkInitializedKey = lambdaChunkInitializedKey;
 const lambdaTimingsPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/lambda-timings/chunk:`;
 exports.lambdaTimingsPrefix = lambdaTimingsPrefix;
 const lambdaTimingsPrefixForChunk = (renderId, chunk) => (0, exports.lambdaTimingsPrefix)(renderId) + String(chunk).padStart(8, '0');

package/dist/shared/lambda-version-string.d.ts

@@ -0,0 +1 @@
+export declare const LAMBDA_VERSION_STRING: string;

package/dist/shared/lambda-version-string.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LAMBDA_VERSION_STRING = void 0;
+const version_1 = require("remotion/version");
+exports.LAMBDA_VERSION_STRING = version_1.VERSION.replace(/\./g, '-')
+    .replace(/\+/g, '-')
+    .substring(0, 10);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/lambda",
-	"version": "3.2.12",
+	"version": "3.2.13",
 	"description": "Distributed renderer for Remotion based on AWS Lambda",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -32,12 +32,12 @@
 		"@aws-sdk/client-service-quotas": "3.58.0",
 		"@aws-sdk/lib-storage": "3.58.0",
 		"@aws-sdk/s3-request-presigner": "3.58.0",
-		"@remotion/bundler": "3.2.12",
-		"@remotion/cli": "3.2.12",
-		"@remotion/renderer": "3.2.12",
+		"@remotion/bundler": "3.2.13",
+		"@remotion/cli": "3.2.13",
+		"@remotion/renderer": "3.2.13",
 		"aws-policies": "^1.0.1",
 		"mime-types": "2.1.34",
-		"remotion": "3.2.12"
+		"remotion": "3.2.13"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -62,5 +62,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "72c9a148cafdd4468fff41bbc7ca70a1776fb15e"
+	"gitHead": "989d20fc0ace36685c71396847e1b7b7a06d00d7"
 }