@remotion/lambda 3.3.36 → 3.3.38

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

@@ -40,6 +40,7 @@ export declare type RenderMediaOnLambdaInput = {
     };
     forceWidth?: number | null;
     forceHeight?: number | null;
+    rendererFunctionName?: string | null;
 };
 export declare type RenderMediaOnLambdaOutput = {
     renderId: string;
@@ -66,8 +67,8 @@ export declare type RenderMediaOnLambdaOutput = {
  * @param params.webhook Configuration for webhook called upon completion or timeout of the render.
  * @returns {Promise<RenderMediaOnLambdaOutput>} See documentation for detailed structure
  */
-export declare const renderMediaOnLambda: ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, }: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;
+export declare const renderMediaOnLambda: ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, rendererFunctionName, }: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;
 /**
  * @deprecated Renamed to renderMediaOnLambda()
  */
-export declare const renderVideoOnLambda: ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, }: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;
+export declare const renderVideoOnLambda: ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, rendererFunctionName, }: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;

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

@@ -29,7 +29,7 @@ const validate_serveurl_1 = require("../shared/validate-serveurl");
  * @param params.webhook Configuration for webhook called upon completion or timeout of the render.
  * @returns {Promise<RenderMediaOnLambdaOutput>} See documentation for detailed structure
  */
-const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, }) => {
+const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, rendererFunctionName, }) => {
     var _a;
     const actualCodec = (0, validate_lambda_codec_1.validateLambdaCodec)(codec);
     (0, validate_serveurl_1.validateServeUrl)(serveUrl);
@@ -48,6 +48,7 @@ const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec,
             functionName,
             type: constants_1.LambdaRoutines.start,
             payload: {
+                rendererFunctionName: rendererFunctionName !== null && rendererFunctionName !== void 0 ? rendererFunctionName : null,
                 framesPerLambda: framesPerLambda !== null && framesPerLambda !== void 0 ? framesPerLambda : null,
                 composition,
                 serveUrl,
@@ -90,6 +91,7 @@ const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec,
                 method: constants_1.LambdaRoutines.renderer,
                 region,
                 renderId: res.renderId,
+                rendererFunctionName: rendererFunctionName !== null && rendererFunctionName !== void 0 ? rendererFunctionName : null,
             }),
             folderInS3Console: (0, get_aws_urls_1.getS3RenderUrl)({
                 bucketName: res.bucketName,

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

@@ -67,6 +67,7 @@ const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFo
                 method: constants_1.LambdaRoutines.still,
                 region,
                 renderId: res.renderId,
+                rendererFunctionName: null,
             }),
         };
     }

package/dist/cli/args.d.ts

@@ -27,6 +27,8 @@ declare type LambdaCommandLineOptions = {
     privacy: Privacy;
     webhook: string | undefined;
     ['webhook-secret']: string | undefined;
+    ['renderer-function-name']: string | undefined;
+    ['function-name']: string | undefined;
 };
 export declare const parsedLambdaCli: LambdaCommandLineOptions & import("minimist").ParsedArgs;
 export declare const forceFlagProvided: boolean;

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

@@ -20,7 +20,7 @@ const log_1 = require("../../log");
 const progress_1 = require("./progress");
 exports.RENDER_COMMAND = 'render';
 const renderCommand = async (args, remotionRoot) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const serveUrl = args[0];
     if (!serveUrl) {
         log_1.Log.error('No serve URL passed.');
@@ -94,6 +94,7 @@ const renderCommand = async (args, remotionRoot) => {
                 secret: (_e = args_1.parsedLambdaCli['webhook-secret']) !== null && _e !== void 0 ? _e : null,
             }
             : undefined,
+        rendererFunctionName: (_f = args_1.parsedLambdaCli['renderer-function-name']) !== null && _f !== void 0 ? _f : null,
     });
     const totalSteps = downloadName ? 6 : 5;
     const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());

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

@@ -4,6 +4,7 @@ exports.findFunctionName = void 0;
 const version_1 = require("remotion/version");
 const get_functions_1 = require("../../api/get-functions");
 const constants_1 = require("../../shared/constants");
+const args_1 = require("../args");
 const functions_1 = require("../commands/functions");
 const deploy_1 = require("../commands/functions/deploy");
 const ls_1 = require("../commands/functions/ls");
@@ -16,7 +17,7 @@ const findFunctionName = async () => {
         region: (0, get_aws_region_1.getAwsRegion)(),
         compatibleOnly: false,
     });
-    const lambdasWithMatchingVersion = remotionLambdas.filter((l) => l.version === version_1.VERSION);
+    let lambdasWithMatchingVersion = remotionLambdas.filter((l) => l.version === version_1.VERSION);
     if (lambdasWithMatchingVersion.length === 0) {
         log_1.Log.error(`No lambda functions with version ${version_1.VERSION} found in your account.`);
         if (remotionLambdas.length > 0) {
@@ -28,11 +29,39 @@ const findFunctionName = async () => {
         (0, quit_1.quit)(1);
     }
     if (lambdasWithMatchingVersion.length > 1) {
-        log_1.Log.error('More than 1 lambda function found in your account. This is an error.');
-        log_1.Log.info(`Delete extraneous lambda functions in your AWS console or run`);
-        log_1.Log.info(`  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('to delete all lambda functions.');
-        (0, quit_1.quit)(1);
+        if (args_1.parsedLambdaCli['function-name']) {
+            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.info();
+                if (prevFunctions.length === 0) {
+                    log_1.Log.info(`No functions for version ${version_1.VERSION} were found, deploy one using:`);
+                    log_1.Log.info(`  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
+                    (0, quit_1.quit)(1);
+                }
+                log_1.Log.info('The following functions were found:');
+                for (const l of prevFunctions) {
+                    log_1.Log.info(`- ${l.functionName} (v${l.version})`);
+                }
+                log_1.Log.info('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.info();
+            log_1.Log.info('Possible solutions:');
+            log_1.Log.info('- Define using `--function-name` which function you want to use.');
+            log_1.Log.info(`- Delete extraneous lambda functions in your AWS console or using:`);
+            log_1.Log.info(`    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();
+            log_1.Log.info(`The following functions were found (only showing v${version_1.VERSION}):`);
+            for (const l of lambdasWithMatchingVersion) {
+                log_1.Log.info(`- ${l.functionName}`);
+            }
+            (0, quit_1.quit)(1);
+        }
     }
     const { functionName } = lambdasWithMatchingVersion[0];
     return functionName;

package/dist/functions/launch.js

@@ -57,10 +57,10 @@ const timer_1 = require("./helpers/timer");
 const validate_composition_1 = require("./helpers/validate-composition");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
 const write_post_render_data_1 = require("./helpers/write-post-render-data");
-const callFunctionWithRetry = async (payload, retries = 0) => {
+const callFunctionWithRetry = async ({ payload, retries, functionName, }) => {
     try {
         await (0, aws_clients_1.getLambdaClient)((0, get_current_region_1.getCurrentRegionInFunction)()).send(new client_lambda_1.InvokeCommand({
-            FunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+            FunctionName: functionName,
             // @ts-expect-error
             Payload: JSON.stringify(payload),
             InvocationType: 'Event',
@@ -74,15 +74,20 @@ const callFunctionWithRetry = async (payload, retries = 0) => {
             await new Promise((resolve) => {
                 setTimeout(resolve, 1000);
             });
-            return callFunctionWithRetry(payload, retries + 1);
+            return callFunctionWithRetry({
+                payload,
+                retries: retries + 1,
+                functionName,
+            });
         }
     }
 };
 const innerLaunchHandler = async (params, options) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
     }
+    const functionName = (_a = params.rendererFunctionName) !== null && _a !== void 0 ? _a : process.env.AWS_LAMBDA_FUNCTION_NAME;
     const startedDate = Date.now();
     let webhookInvoked = false;
     console.log(`Function has ${Math.max(options.getRemainingTimeInMillis() - 1000, 1000)} before it times out`);
@@ -161,7 +166,7 @@ const innerLaunchHandler = async (params, options) => {
     renderer_1.RenderInternals.validateConcurrency(params.concurrencyPerLambda, 'concurrencyPerLambda');
     const realFrameRange = renderer_1.RenderInternals.getRealFrameRange(comp.durationInFrames, params.frameRange);
     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);
+    const framesPerLambda = (_b = params.framesPerLambda) !== null && _b !== void 0 ? _b : (0, best_frames_per_lambda_param_1.bestFramesPerLambdaParam)(frameCount.length);
     (0, validate_frames_per_lambda_1.validateFramesPerLambda)({
         framesPerLambda,
         durationInFrames: frameCount.length,
@@ -215,6 +220,9 @@ const innerLaunchHandler = async (params, options) => {
             muted: params.muted,
             audioBitrate: params.audioBitrate,
             videoBitrate: params.videoBitrate,
+            launchFunctionConfig: {
+                version: version_1.VERSION,
+            },
         };
         return payload;
     });
@@ -241,14 +249,14 @@ const innerLaunchHandler = async (params, options) => {
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,
-        outName: (_b = params.outName) !== null && _b !== void 0 ? _b : undefined,
+        outName: (_c = params.outName) !== null && _c !== void 0 ? _c : 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
-        : (_d = (_c = params.outName) === null || _c === void 0 ? void 0 : _c.s3OutputProvider) !== null && _d !== void 0 ? _d : null);
+        : (_e = (_d = params.outName) === null || _d === void 0 ? void 0 : _d.s3OutputProvider) !== null && _e !== void 0 ? _e : null);
     const output = await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
         bucketName: params.bucketName,
         customCredentials,
@@ -281,7 +289,7 @@ const innerLaunchHandler = async (params, options) => {
     });
     await Promise.all(lambdaPayloads.map(async (payload, index) => {
         const callingLambdaTimer = (0, timer_1.timer)('Calling chunk ' + index);
-        await callFunctionWithRetry(payload);
+        await callFunctionWithRetry({ payload, retries: 0, functionName });
         callingLambdaTimer.end();
     }));
     reqSend.end();

package/dist/functions/renderer.js

@@ -8,6 +8,7 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
 const chunk_progress_1 = require("../shared/chunk-progress");
 const constants_1 = require("../shared/constants");
@@ -21,6 +22,9 @@ const renderHandler = async (params, options, logs) => {
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
+    if (params.launchFunctionConfig.version !== version_1.VERSION) {
+        throw new Error(`The version of the function that was specified as "rendererFunctionName" is ${version_1.VERSION} but the version of the function that invoked the render is ${params.launchFunctionConfig.version}. Please make sure that the version of the function that is specified as "rendererFunctionName" is the same as the version of the function that is invoked.`);
+    }
     const inputPropsPromise = (0, deserialize_input_props_1.deserializeInputProps)({
         bucketName: params.bucketName,
         expectedBucketOwner: options.expectedBucketOwner,

package/dist/functions/start.js

@@ -75,6 +75,7 @@ const startHandler = async (params, options) => {
         videoBitrate: params.videoBitrate,
         forceHeight: params.forceHeight,
         forceWidth: params.forceWidth,
+        rendererFunctionName: params.rendererFunctionName,
     };
     await (0, aws_clients_1.getLambdaClient)((0, get_current_region_1.getCurrentRegionInFunction)()).send(new client_lambda_1.InvokeCommand({
         FunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,

package/dist/index.d.ts

@@ -46,7 +46,7 @@ import type { LambdaArchitecture } from './shared/validate-architecture';
 /**
  * @deprecated Import this from `@remotion/lambda/client` instead
  */
-declare const renderMediaOnLambda: ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, }: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;
+declare const renderMediaOnLambda: ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, overwrite, audioBitrate, videoBitrate, webhook, forceHeight, forceWidth, rendererFunctionName, }: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;
 /**
  * @deprecated Import this from `@remotion/lambda/client` instead
  */

package/dist/shared/constants.d.ts

@@ -110,6 +110,7 @@ export declare type LambdaPayloads = {
         type: LambdaRoutines.info;
     };
     start: {
+        rendererFunctionName: string | null;
         type: LambdaRoutines.start;
         serveUrl: string;
         composition: string;
@@ -144,6 +145,7 @@ export declare type LambdaPayloads = {
         forceWidth: number | null;
     };
     launch: {
+        rendererFunctionName: string | null;
         type: LambdaRoutines.launch;
         serveUrl: string;
         composition: string;
@@ -217,6 +219,9 @@ export declare type LambdaPayloads = {
         muted: boolean;
         audioBitrate: string | null;
         videoBitrate: string | null;
+        launchFunctionConfig: {
+            version: string;
+        };
     };
     still: {
         type: LambdaRoutines.still;

package/dist/shared/get-aws-urls.d.ts

@@ -1,8 +1,9 @@
 import type { AwsRegion } from '../client';
 import type { LambdaRoutines } from './constants';
-export declare const getCloudwatchStreamUrl: ({ region, functionName, method, renderId, }: {
+export declare const getCloudwatchStreamUrl: ({ region, functionName, method, renderId, rendererFunctionName, }: {
     region: AwsRegion;
     functionName: string;
+    rendererFunctionName: string | null;
     method: LambdaRoutines;
     renderId: string;
 }) => string;

package/dist/shared/get-aws-urls.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getS3RenderUrl = exports.getCloudwatchStreamUrl = void 0;
-const getCloudwatchStreamUrl = ({ region, functionName, method, renderId, }) => {
-    return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionName}/log-events$3FfilterPattern$3D$2522method$253D${method}$252CrenderId$253D${renderId}$2522`;
+const getCloudwatchStreamUrl = ({ region, functionName, method, renderId, rendererFunctionName, }) => {
+    const functionNameToUse = rendererFunctionName !== null && rendererFunctionName !== void 0 ? rendererFunctionName : functionName;
+    return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionNameToUse}/log-events$3FfilterPattern$3D$2522method$253D${method}$252CrenderId$253D${renderId}$2522`;
 };
 exports.getCloudwatchStreamUrl = getCloudwatchStreamUrl;
 const getS3RenderUrl = ({ renderId, region, bucketName, }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/lambda",
-	"version": "3.3.36",
+	"version": "3.3.38",
 	"description": "Distributed renderer for Remotion based on AWS Lambda",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -33,21 +33,17 @@
 		"@aws-sdk/credential-providers": "3.215.0",
 		"@aws-sdk/lib-storage": "3.215.0",
 		"@aws-sdk/s3-request-presigner": "3.215.0",
-		"@remotion/bundler": "3.3.36",
-		"@remotion/cli": "3.3.36",
-		"@remotion/renderer": "3.3.36",
+		"@remotion/bundler": "3.3.38",
+		"@remotion/cli": "3.3.38",
+		"@remotion/renderer": "3.3.38",
 		"aws-policies": "^1.0.1",
 		"mime-types": "2.1.34",
-		"remotion": "3.3.36"
-	},
-	"peerDependencies": {
-		"react": ">=16.8.0",
-		"react-dom": ">=16.8.0"
+		"remotion": "3.3.38"
 	},
 	"devDependencies": {
 		"@jonny/eslint-config": "3.0.266",
-		"@remotion/compositor-linux-arm64-musl": "3.3.36",
-		"@remotion/compositor-linux-x64-musl": "3.3.36",
+		"@remotion/compositor-linux-arm64-musl": "3.3.38",
+		"@remotion/compositor-linux-x64-musl": "3.3.38",
 		"@types/mime-types": "2.1.1",
 		"@types/minimist": "1.2.2",
 		"@types/node": "^14.14.14",
@@ -63,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "623bf1e883e7b26b9d02458037c930ccbe8857e4"
+	"gitHead": "ac58695e452e58deb5c010f09bcc94d036930e6c"
 }