@remotion/lambda 3.2.21 → 3.2.23-ensure-ffmpeg.123

package/dist/functions/launch.js

@@ -10,25 +10,22 @@ const fs_1 = __importDefault(require("fs"));
 const remotion_1 = require("remotion");
 const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
+const cleanup_serialized_input_props_1 = require("../shared/cleanup-serialized-input-props");
 const constants_1 = require("../shared/constants");
+const deserialize_input_props_1 = require("../shared/deserialize-input-props");
 const docs_url_1 = require("../shared/docs-url");
+const invoke_webhook_1 = require("../shared/invoke-webhook");
 const make_s3_url_1 = require("../shared/make-s3-url");
 const validate_frames_per_lambda_1 = require("../shared/validate-frames-per-lambda");
 const validate_outname_1 = require("../shared/validate-outname");
 const validate_privacy_1 = require("../shared/validate-privacy");
-const collect_data_1 = require("./chunk-optimization/collect-data");
-const get_frame_ranges_from_profile_1 = require("./chunk-optimization/get-frame-ranges-from-profile");
-const get_profile_duration_1 = require("./chunk-optimization/get-profile-duration");
-const is_valid_profile_1 = require("./chunk-optimization/is-valid-profile");
-const optimize_invocation_order_1 = require("./chunk-optimization/optimize-invocation-order");
-const optimize_profile_1 = require("./chunk-optimization/optimize-profile");
 const plan_frame_ranges_1 = require("./chunk-optimization/plan-frame-ranges");
-const s3_optimization_file_1 = require("./chunk-optimization/s3-optimization-file");
 const best_frames_per_lambda_param_1 = require("./helpers/best-frames-per-lambda-param");
 const concat_videos_1 = require("./helpers/concat-videos");
 const create_post_render_data_1 = require("./helpers/create-post-render-data");
 const delete_chunks_1 = require("./helpers/delete-chunks");
 const expected_out_name_1 = require("./helpers/expected-out-name");
+const find_output_file_in_bucket_1 = require("./helpers/find-output-file-in-bucket");
 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");
@@ -62,27 +59,69 @@ const callFunctionWithRetry = async (payload, retries = 0) => {
     }
 };
 const innerLaunchHandler = async (params, options) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
     }
     const startedDate = Date.now();
-    const [browserInstance, optimization] = await Promise.all([
-        (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),
-            compositionId: params.composition,
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-            expectedBucketOwner: options.expectedBucketOwner,
-        }),
-    ]);
+    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 {
+                await (0, invoke_webhook_1.invokeWebhook)({
+                    url: params.webhook.url,
+                    secret: params.webhook.secret,
+                    payload: {
+                        type: 'timeout',
+                        renderId: params.renderId,
+                        expectedBucketOwner: options.expectedBucketOwner,
+                        bucketName: params.bucketName,
+                    },
+                });
+                webhookInvoked = true;
+            }
+            catch (err) {
+                if (process.env.NODE_ENV === 'test') {
+                    throw err;
+                }
+                await (0, write_lambda_error_1.writeLambdaError)({
+                    bucketName: params.bucketName,
+                    errorInfo: {
+                        type: 'webhook',
+                        message: err.message,
+                        name: err.name,
+                        stack: err.stack,
+                        tmpDir: null,
+                        frame: 0,
+                        chunk: 0,
+                        isFatal: false,
+                        attempt: 1,
+                        willRetry: false,
+                        totalAttempts: 1,
+                    },
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                });
+                console.log('Failed to invoke webhook:');
+                console.log(err);
+            }
+        }
+    }, Math.max(options.getRemainingTimeInMillis() - 1000, 1000));
+    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,
+        expectedBucketOwner: options.expectedBucketOwner,
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        serialized: params.inputProps,
+    });
     const comp = await (0, validate_composition_1.validateComposition)({
         serveUrl: params.serveUrl,
         composition: params.composition,
         browserInstance,
-        inputProps: params.inputProps,
+        inputProps: await inputPropsPromise,
         envVariables: params.envVariables,
         ffmpegExecutable: null,
         ffprobeExecutable: null,
@@ -90,11 +129,15 @@ const innerLaunchHandler = async (params, options) => {
         chromiumOptions: params.chromiumOptions,
         port: null,
         downloadMap,
+        forceHeight: params.forceHeight,
+        forceWidth: params.forceWidth,
     });
     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.validateBitrate(params.audioBitrate, 'audioBitrate');
+    renderer_1.RenderInternals.validateBitrate(params.videoBitrate, 'videoBitrate');
     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);
@@ -107,14 +150,11 @@ const innerLaunchHandler = async (params, options) => {
     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.`);
     }
-    (0, validate_outname_1.validateOutname)(params.outName);
+    (0, validate_outname_1.validateOutname)(params.outName, params.codec);
     (0, validate_privacy_1.validatePrivacy)(params.privacy);
     renderer_1.RenderInternals.validatePuppeteerTimeout(params.timeoutInMilliseconds);
-    const { chunks, didUseOptimization } = (0, plan_frame_ranges_1.planFrameRanges)({
+    const { chunks } = (0, plan_frame_ranges_1.planFrameRanges)({
         framesPerLambda,
-        optimization,
-        // TODO: Re-enable chunk optimization later
-        shouldUseOptimization: false,
         frameRange: realFrameRange,
         everyNthFrame: params.everyNthFrame,
     });
@@ -153,6 +193,8 @@ const innerLaunchHandler = async (params, options) => {
             everyNthFrame: params.everyNthFrame,
             concurrencyPerLambda: params.concurrencyPerLambda,
             muted: params.muted,
+            audioBitrate: params.audioBitrate,
+            videoBitrate: params.videoBitrate,
         };
         return payload;
     });
@@ -171,7 +213,6 @@ const innerLaunchHandler = async (params, options) => {
         compositionId: comp.id,
         siteId: (0, make_s3_url_1.getServeUrlHash)(params.serveUrl),
         codec: params.codec,
-        usesOptimizationProfile: didUseOptimization,
         type: 'video',
         imageFormat: params.imageFormat,
         inputProps: params.inputProps,
@@ -181,7 +222,31 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,
         outName: (_b = params.outName) !== null && _b !== void 0 ? _b : undefined,
+        privacy: params.privacy,
     };
+    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);
+    const output = await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
+        bucketName: params.bucketName,
+        customCredentials,
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        renderMetadata,
+    });
+    if (output) {
+        if (params.overwrite) {
+            console.info('Deleting', { bucketName: renderBucketName, key }, 'because it already existed and will be overwritten');
+            await (0, io_1.lambdaDeleteFile)({
+                bucketName: renderBucketName,
+                customCredentials,
+                key,
+                region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+            });
+        }
+        else {
+            throw new TypeError(`Output file "${key}" in bucket "${renderBucketName}" in region "${(0, get_current_region_1.getCurrentRegionInFunction)()}" already exists. Delete it before re-rendering, or use the overwrite option to delete it before render."`);
+        }
+    }
     await (0, io_1.lambdaWriteFile)({
         bucketName: params.bucketName,
         key: (0, constants_1.renderMetadataKey)(params.renderId),
@@ -190,6 +255,7 @@ const innerLaunchHandler = async (params, options) => {
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     await Promise.all(lambdaPayloads.map(async (payload, index) => {
         const callingLambdaTimer = (0, timer_1.timer)('Calling chunk ' + index);
@@ -223,6 +289,7 @@ const innerLaunchHandler = async (params, options) => {
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
             downloadBehavior: null,
+            customCredentials: null,
         }).catch((err) => {
             (0, write_lambda_error_1.writeLambdaError)({
                 bucketName: params.bucketName,
@@ -244,6 +311,32 @@ const innerLaunchHandler = async (params, options) => {
             });
         });
     };
+    const onErrors = async (errors) => {
+        var _a;
+        console.log('Found Errors', errors);
+        if (params.webhook) {
+            console.log('Sending webhook with errors');
+            await (0, invoke_webhook_1.invokeWebhook)({
+                url: params.webhook.url,
+                secret: (_a = params.webhook.secret) !== null && _a !== void 0 ? _a : null,
+                payload: {
+                    type: 'error',
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                    bucketName: params.bucketName,
+                    errors: errors.slice(0, 5).map((e) => ({
+                        message: e.message,
+                        name: e.name,
+                        stack: e.stack,
+                    })),
+                },
+            });
+        }
+        else {
+            console.log('No webhook specified');
+        }
+        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)({
         bucket: params.bucketName,
@@ -256,11 +349,13 @@ const innerLaunchHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         fps,
         numberOfGifLoops: params.numberOfGifLoops,
+        ffmpegExecutable: null,
+        remotionRoot: process.cwd(),
+        onErrors,
     });
     if (!encodingStop) {
         encodingStop = Date.now();
     }
-    const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName);
     const outputSize = fs_1.default.statSync(outfile);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
@@ -270,48 +365,14 @@ const innerLaunchHandler = async (params, options) => {
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: params.downloadBehavior,
+        customCredentials,
+    });
+    const contents = await (0, io_1.lambdaLs)({
+        bucketName: params.bucketName,
+        prefix: (0, constants_1.rendersPrefix)(params.renderId),
+        expectedBucketOwner: options.expectedBucketOwner,
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
     });
-    let chunkProm = Promise.resolve();
-    // TODO: Enable in a later release
-    const enableChunkOptimization = false;
-    if (enableChunkOptimization) {
-        const chunkData = await (0, collect_data_1.collectChunkInformation)({
-            bucketName: params.bucketName,
-            renderId: params.renderId,
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-            expectedBucketOwner: options.expectedBucketOwner,
-        });
-        const optimizedProfile = (0, optimize_invocation_order_1.optimizeInvocationOrder)((0, optimize_profile_1.optimizeProfileRecursively)(chunkData, 400));
-        const optimizedFrameRange = (0, get_frame_ranges_from_profile_1.getFrameRangesFromProfile)(optimizedProfile);
-        chunkProm = (0, is_valid_profile_1.isValidOptimizationProfile)(optimizedProfile)
-            ? (0, s3_optimization_file_1.writeOptimization)({
-                bucketName: params.bucketName,
-                optimization: {
-                    ranges: optimizedFrameRange,
-                    oldTiming: (0, get_profile_duration_1.getProfileDuration)(chunkData),
-                    newTiming: (0, get_profile_duration_1.getProfileDuration)(optimizedProfile),
-                    createdFromRenderId: params.renderId,
-                    framesPerLambda,
-                    lambdaVersion: version_1.VERSION,
-                    frameRange: realFrameRange,
-                    everyNthFrame: params.everyNthFrame,
-                },
-                expectedBucketOwner: options.expectedBucketOwner,
-                compositionId: params.composition,
-                siteId: (0, make_s3_url_1.getServeUrlHash)(params.serveUrl),
-                region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-            })
-            : Promise.resolve();
-    }
-    const [, contents] = await Promise.all([
-        chunkProm,
-        (0, io_1.lambdaLs)({
-            bucketName: params.bucketName,
-            prefix: (0, constants_1.rendersPrefix)(params.renderId),
-            expectedBucketOwner: options.expectedBucketOwner,
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        }),
-    ]);
     const finalEncodingProgress = {
         framesEncoded: frameCount.length,
         totalFrames: frameCount.length,
@@ -332,6 +393,7 @@ const innerLaunchHandler = async (params, options) => {
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     const errorExplanationsProm = (0, inspect_errors_1.inspectErrors)({
         contents,
@@ -344,12 +406,20 @@ const innerLaunchHandler = async (params, options) => {
         chunkCount,
         renderId: params.renderId,
     });
-    const deletProm = (0, delete_chunks_1.cleanupFiles)({
+    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)(),
-        bucket: params.bucketName,
-        contents,
-        jobs,
+        serialized: params.inputProps,
     });
+    const outputUrl = (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, params.bucketName, customCredentials);
     const postRenderData = (0, create_post_render_data_1.createPostRenderData)({
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
@@ -359,11 +429,11 @@ const innerLaunchHandler = async (params, options) => {
         contents,
         errorExplanations: await errorExplanationsProm,
         timeToEncode: encodingStop - encodingStart,
-        timeToDelete: await deletProm,
+        timeToDelete: (await Promise.all([deletProm, cleanupSerializedInputPropsProm])).reduce((a, b) => a + b, 0),
         outputFile: {
             lastModified: Date.now(),
             size: outputSize.size,
-            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, params.bucketName),
+            url: outputUrl,
         },
     });
     await finalEncodingProgressProm;
@@ -378,10 +448,57 @@ const innerLaunchHandler = async (params, options) => {
         bucketName: params.bucketName,
         key: (0, constants_1.initalizedMetadataKey)(params.renderId),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        customCredentials: null,
     });
     await Promise.all([cleanupChunksProm, fs_1.default.promises.rm(outfile)]);
+    clearTimeout(webhookDueToTimeout);
+    if (params.webhook && !webhookInvoked) {
+        try {
+            await (0, invoke_webhook_1.invokeWebhook)({
+                url: params.webhook.url,
+                secret: params.webhook.secret,
+                payload: {
+                    type: 'success',
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                    bucketName: params.bucketName,
+                    outputUrl,
+                    lambdaErrors: postRenderData.errors,
+                    outputFile: postRenderData.outputFile,
+                    timeToFinish: postRenderData.timeToFinish,
+                },
+            });
+            webhookInvoked = true;
+        }
+        catch (err) {
+            if (process.env.NODE_ENV === 'test') {
+                throw err;
+            }
+            await (0, write_lambda_error_1.writeLambdaError)({
+                bucketName: params.bucketName,
+                errorInfo: {
+                    type: 'webhook',
+                    message: err.message,
+                    name: err.name,
+                    stack: err.stack,
+                    tmpDir: null,
+                    frame: 0,
+                    chunk: 0,
+                    isFatal: false,
+                    attempt: 1,
+                    willRetry: false,
+                    totalAttempts: 1,
+                },
+                renderId: params.renderId,
+                expectedBucketOwner: options.expectedBucketOwner,
+            });
+            console.log('Failed to invoke webhook:');
+            console.log(err);
+        }
+    }
 };
 const launchHandler = async (params, options) => {
+    var _a, _b;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
     }
@@ -389,6 +506,9 @@ const launchHandler = async (params, options) => {
         await innerLaunchHandler(params, options);
     }
     catch (err) {
+        if (process.env.NODE_ENV === 'test') {
+            throw err;
+        }
         console.log('Error occurred', err);
         await (0, write_lambda_error_1.writeLambdaError)({
             bucketName: params.bucketName,
@@ -408,6 +528,50 @@ const launchHandler = async (params, options) => {
             expectedBucketOwner: options.expectedBucketOwner,
             renderId: params.renderId,
         });
+        if ((_a = params.webhook) === null || _a === void 0 ? void 0 : _a.url) {
+            try {
+                await (0, invoke_webhook_1.invokeWebhook)({
+                    url: params.webhook.url,
+                    secret: (_b = params.webhook.secret) !== null && _b !== void 0 ? _b : null,
+                    payload: {
+                        type: 'error',
+                        renderId: params.renderId,
+                        expectedBucketOwner: options.expectedBucketOwner,
+                        bucketName: params.bucketName,
+                        errors: [err].map((e) => ({
+                            message: e.message,
+                            name: e.name,
+                            stack: e.stack,
+                        })),
+                    },
+                });
+            }
+            catch (error) {
+                if (process.env.NODE_ENV === 'test') {
+                    throw error;
+                }
+                await (0, write_lambda_error_1.writeLambdaError)({
+                    bucketName: params.bucketName,
+                    errorInfo: {
+                        type: 'webhook',
+                        message: err.message,
+                        name: err.name,
+                        stack: err.stack,
+                        tmpDir: null,
+                        frame: 0,
+                        chunk: 0,
+                        isFatal: false,
+                        attempt: 1,
+                        willRetry: false,
+                        totalAttempts: 1,
+                    },
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                });
+                console.log('Failed to invoke webhook:');
+                console.log(error);
+            }
+        }
     }
 };
 exports.launchHandler = launchHandler;

package/dist/functions/progress.d.ts

@@ -1,7 +1,7 @@
 import type { LambdaPayload, RenderProgress } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
-    timeoutInMiliseconds: number;
+    timeoutInMilliseconds: number;
 };
 export declare const progressHandler: (lambdaParams: LambdaPayload, options: Options) => Promise<RenderProgress>;
 export {};

package/dist/functions/progress.js

@@ -6,14 +6,15 @@ const constants_1 = require("../shared/constants");
 const get_current_region_1 = require("./helpers/get-current-region");
 const get_progress_1 = require("./helpers/get-progress");
 const progressHandler = (lambdaParams, options) => {
+    var _a;
     if (lambdaParams.type !== constants_1.LambdaRoutines.status) {
         throw new TypeError('Expected status type');
     }
     if (lambdaParams.version !== version_1.VERSION) {
         if (!lambdaParams.version) {
-            throw new Error(`Version mismatch: When calling getRenderProgress(), the deployed Lambda function had version ${version_1.VERSION} but the @remotion/lambda package is an older version. Align the versions.`);
+            throw new Error(`Version mismatch: When calling renderStillOnLambda(), you called the function ${process.env.AWS_LAMBDA_FUNCTION_NAME} which has the version ${version_1.VERSION} but the @remotion/lambda package is an older version. Deploy a new function and use it to call renderStillOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
         }
-        throw new Error(`Version mismatch: When calling getRenderProgress(), get deployed Lambda function had version ${version_1.VERSION} and the @remotion/lambda package has version ${lambdaParams.version}. Align the versions.`);
+        throw new Error(`Version mismatch: When calling renderStillOnLambda(), you passed ${process.env.AWS_LAMBDA_FUNCTION_NAME} as the function, which has the version ${version_1.VERSION}, but the @remotion/lambda package you used to invoke the function has version ${lambdaParams.version}. Deploy a new function and use it to call renderStillOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
     }
     return (0, get_progress_1.getProgress)({
         bucketName: lambdaParams.bucketName,
@@ -21,7 +22,8 @@ const progressHandler = (lambdaParams, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
-        timeoutInMiliseconds: options.timeoutInMiliseconds,
+        timeoutInMilliseconds: options.timeoutInMilliseconds,
+        customCredentials: (_a = lambdaParams.s3OutputProvider) !== null && _a !== void 0 ? _a : null,
     });
 };
 exports.progressHandler = progressHandler;

package/dist/functions/renderer.js

@@ -10,6 +10,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const aws_clients_1 = require("../shared/aws-clients");
 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");
@@ -22,6 +23,12 @@ const renderHandler = async (params, options, logs) => {
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
+    const inputPropsPromise = (0, deserialize_input_props_1.deserializeInputProps)({
+        bucketName: params.bucketName,
+        expectedBucketOwner: options.expectedBucketOwner,
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        serialized: params.inputProps,
+    });
     const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), (_a = params.chromiumOptions) !== null && _a !== void 0 ? _a : {});
     const outputPath = renderer_1.RenderInternals.tmpDir('remotion-render-');
     if (typeof params.chunk !== 'number') {
@@ -42,6 +49,7 @@ const renderHandler = async (params, options, logs) => {
     const chunkCodec = params.codec === 'gif' ? 'h264-mkv' : params.codec;
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     const downloads = {};
+    const inputProps = await inputPropsPromise;
     await new Promise((resolve, reject) => {
         var _a;
         (0, renderer_1.renderMedia)({
@@ -53,7 +61,7 @@ const renderHandler = async (params, options, logs) => {
                 width: params.width,
             },
             imageFormat: params.imageFormat,
-            inputProps: params.inputProps,
+            inputProps,
             frameRange: params.frameRange,
             onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
                 if (renderedFrames % 10 === 0 &&
@@ -87,6 +95,7 @@ const renderHandler = async (params, options, logs) => {
                     region: (0, get_current_region_1.getCurrentRegionInFunction)(),
                     expectedBucketOwner: options.expectedBucketOwner,
                     downloadBehavior: null,
+                    customCredentials: null,
                 }).catch((err) => reject(err));
             },
             puppeteerInstance: browserInstance,
@@ -101,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) => {
@@ -135,6 +143,15 @@ const renderHandler = async (params, options, logs) => {
             downloadMap,
             muted: params.muted,
             enforceAudioTrack: true,
+            audioBitrate: params.audioBitrate,
+            videoBitrate: params.videoBitrate,
+            onSlowestFrames: (slowestFrames) => {
+                console.log();
+                console.log(`Slowest frames:`);
+                slowestFrames.forEach(({ frame, time }) => {
+                    console.log(`Frame ${frame} (${time.toFixed(3)}ms)`);
+                });
+            },
         })
             .then(() => resolve())
             .catch((err) => reject(err));
@@ -155,6 +172,7 @@ const renderHandler = async (params, options, logs) => {
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     await Promise.all([
         fs_1.default.promises.rm(outputLocation, { recursive: true }),
@@ -172,6 +190,7 @@ const renderHandler = async (params, options, logs) => {
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
             downloadBehavior: null,
+            customCredentials: null,
         }),
     ]);
 };
@@ -184,6 +203,10 @@ const rendererHandler = async (params, options) => {
         await renderHandler(params, options, logs);
     }
     catch (err) {
+        if (process.env.NODE_ENV === 'test') {
+            console.log({ err });
+            throw err;
+        }
         // If this error is encountered, we can just retry as it
         // is a very rare error to occur
         const isBrowserError = err.message.includes('FATAL:zygote_communication_linux.cc') ||

package/dist/functions/start.js

@@ -16,9 +16,9 @@ const startHandler = async (params, options) => {
     }
     if (params.version !== version_1.VERSION) {
         if (!params.version) {
-            throw new Error(`Version mismatch: When calling renderMediaOnLambda(), the deployed Lambda function had version ${version_1.VERSION} but the @remotion/lambda package is an older version. Align the versions.`);
+            throw new Error(`Version mismatch: When calling renderMediaOnLambda(), you called the function ${process.env.AWS_LAMBDA_FUNCTION_NAME} which has the version ${version_1.VERSION} but the @remotion/lambda package is an older version. Deploy a new function and use it to call renderMediaOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
         }
-        throw new Error(`Version mismatch: When calling renderMediaOnLambda(), get deployed Lambda function had version ${version_1.VERSION} and the @remotion/lambda package has version ${params.version}. Align the versions.`);
+        throw new Error(`Version mismatch: When calling renderMediaOnLambda(), you passed ${process.env.AWS_LAMBDA_FUNCTION_NAME} as the function, which has the version ${version_1.VERSION}, but the @remotion/lambda package you used to invoke the function has version ${params.version}. Deploy a new function and use it to call renderMediaOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
     }
     const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
@@ -32,6 +32,7 @@ const startHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         key: (0, constants_1.initalizedMetadataKey)(renderId),
         privacy: 'private',
+        customCredentials: null,
     });
     const payload = {
         type: constants_1.LambdaRoutines.launch,
@@ -61,6 +62,12 @@ const startHandler = async (params, options) => {
         concurrencyPerLambda: params.concurrencyPerLambda,
         downloadBehavior: params.downloadBehavior,
         muted: params.muted,
+        overwrite: params.overwrite,
+        webhook: params.webhook,
+        audioBitrate: params.audioBitrate,
+        videoBitrate: params.videoBitrate,
+        forceHeight: params.forceHeight,
+        forceWidth: params.forceWidth,
     };
     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,