@remotion/lambda 4.0.0-audio.37 → 4.0.0-audio.9

package/dist/functions/progress.js

@@ -1,21 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.progressHandler = void 0;
+const version_1 = require("remotion/version");
 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(), 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 getRenderProgress(). See: https://www.remotion.dev/docs/lambda/upgrading`);
+        }
+        throw new Error(`Version mismatch: When calling getRenderProgress(), 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 getRenderProgress(). See: https://www.remotion.dev/docs/lambda/upgrading`);
+    }
     return (0, get_progress_1.getProgress)({
         bucketName: lambdaParams.bucketName,
         renderId: lambdaParams.renderId,
         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;
-//# sourceMappingURL=progress.js.map

package/dist/functions/renderer.d.ts

@@ -1,8 +1,7 @@
-import { LambdaPayload } from '../shared/constants';
+import type { LambdaPayload } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
     isWarm: boolean;
 };
 export declare const rendererHandler: (params: LambdaPayload, options: Options) => Promise<void>;
 export {};
-//# sourceMappingURL=renderer.d.ts.map

package/dist/functions/renderer.js

@@ -8,23 +8,31 @@ 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 remotion_1 = require("remotion");
+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");
-const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
+const deserialize_input_props_1 = require("../shared/deserialize-input-props");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
+const get_chromium_executable_path_1 = require("./helpers/get-chromium-executable-path");
 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) => {
-    var _a, _b;
+    var _a;
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
-    remotion_1.Internals.Logging.setLogLevel(params.logLevel);
-    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose'), (_a = params.chromiumOptions) !== null && _a !== void 0 ? _a : {});
+    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,
+        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') {
         throw new Error('must pass chunk');
@@ -40,79 +48,126 @@ const renderHandler = async (params, options, logs) => {
         startDate: start,
     };
     const outdir = renderer_1.RenderInternals.tmpDir(constants_1.RENDERER_PATH_TOKEN);
-    const outputLocation = path_1.default.join(outdir, `localchunk-${String(params.chunk).padStart(8, '0')}.${renderer_1.RenderInternals.getFileExtensionFromCodec(params.codec, 'chunk')}`);
-    await (0, renderer_1.renderMedia)({
-        composition: {
-            id: params.composition,
-            durationInFrames: params.durationInFrames,
-            fps: params.fps,
-            height: params.height,
-            width: params.width,
-        },
-        imageFormat: params.imageFormat,
-        inputProps: params.inputProps,
-        frameRange: params.frameRange,
-        onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
-            if (renderedFrames % 10 === 0 &&
-                remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
-                console.log(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
-            }
-            const duration = renderer_1.RenderInternals.getDurationFromFrameRange(params.frameRange, params.durationInFrames);
-            if (renderedFrames === duration) {
-                console.log('Rendered all frames!');
-            }
-            chunkTimingData.timings[renderedFrames] = Date.now() - start;
-        },
-        parallelism: 1,
-        onStart: () => {
-            (0, io_1.lambdaWriteFile)({
-                privacy: 'private',
-                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.lambdaInitializedKey)({
-                    renderId: params.renderId,
-                    chunk: params.chunk,
-                    attempt: params.attempt,
-                }),
-                region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-                expectedBucketOwner: options.expectedBucketOwner,
-            });
-        },
-        puppeteerInstance: browserInstance,
-        serveUrl: params.serveUrl,
-        quality: params.quality,
-        envVariables: params.envVariables,
-        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose'),
-        onBrowserLog: (log) => {
-            logs.push(log);
-        },
-        outputLocation,
+    const chunkCodec = params.codec === 'gif' || params.codec === 'h264'
+        ? 'h264-mkv'
+        : params.codec;
+    const outputLocation = path_1.default.join(outdir, `localchunk-${String(params.chunk).padStart(8, '0')}.${renderer_1.RenderInternals.getFileExtensionFromCodec(chunkCodec, renderer_1.RenderInternals.getDefaultAudioCodec({
         codec: params.codec,
-        crf: (_b = params.crf) !== null && _b !== void 0 ? _b : undefined,
-        ffmpegExecutable: process.env.NODE_ENV === 'test' ? null : '/opt/bin/ffmpeg',
-        pixelFormat: params.pixelFormat,
-        proResProfile: params.proResProfile,
-        onDownload: (src) => {
-            console.log('Downloading', src);
-            return ({ percent }) => {
-                if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
-                    console.log(`Download progress of ${src}: ${percent}`);
+        preferLossless: true,
+    }))}`);
+    const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    const downloads = {};
+    const inputProps = await inputPropsPromise;
+    await new Promise((resolve, reject) => {
+        var _a, _b;
+        (0, renderer_1.renderMedia)({
+            composition: {
+                id: params.composition,
+                durationInFrames: params.durationInFrames,
+                fps: params.fps,
+                height: params.height,
+                width: params.width,
+            },
+            imageFormat: params.imageFormat,
+            inputProps,
+            frameRange: params.frameRange,
+            onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
+                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));
                 }
-            };
-        },
-        overwrite: false,
-        chromiumOptions: params.chromiumOptions,
-        scale: params.scale,
+                const allFrames = renderer_1.RenderInternals.getFramesToRender(params.frameRange, params.everyNthFrame);
+                if (renderedFrames === allFrames.length) {
+                    console.log('Rendered all frames!');
+                }
+                chunkTimingData.timings[renderedFrames] = Date.now() - start;
+            },
+            concurrency: params.concurrencyPerLambda,
+            onStart: () => {
+                (0, chunk_progress_1.writeLambdaInitializedFile)({
+                    attempt: params.attempt,
+                    bucketName: params.bucketName,
+                    chunk: params.chunk,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                    framesRendered: 0,
+                    renderId: params.renderId,
+                }).catch((err) => reject(err));
+            },
+            puppeteerInstance: browserInstance,
+            serveUrl: params.serveUrl,
+            quality: params.quality,
+            envVariables: params.envVariables,
+            dumpBrowserLogs: (_a = params.dumpBrowserLogs) !== null && _a !== void 0 ? _a : renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'),
+            verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose'),
+            onBrowserLog: (log) => {
+                logs.push(log);
+            },
+            outputLocation,
+            codec: chunkCodec,
+            crf: (_b = params.crf) !== null && _b !== void 0 ? _b : undefined,
+            pixelFormat: params.pixelFormat,
+            proResProfile: params.proResProfile,
+            onDownload: (src) => {
+                console.log('Downloading', src);
+                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,
+            scale: params.scale,
+            timeoutInMilliseconds: params.timeoutInMilliseconds,
+            port: null,
+            everyNthFrame: params.everyNthFrame,
+            numberOfGifLoops: null,
+            internal: {
+                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)`);
+                });
+            },
+            // Lossless flag takes priority over audio codec
+            // https://github.com/remotion-dev/remotion/issues/1647
+            // Special flag only in Lambda renderer which improves the audio quality
+            audioCodec: null,
+            preferLossless: true,
+            browserExecutable: (0, get_chromium_executable_path_1.executablePath)(),
+        })
+            .then(() => resolve())
+            .catch((err) => reject(err));
     });
     const endRendered = Date.now();
-    console.log('Adding silent audio, chunk', params.chunk);
     const condensedTimingData = {
         ...chunkTimingData,
         timings: Object.values(chunkTimingData.timings),
@@ -127,6 +182,8 @@ const renderHandler = async (params, options, logs) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
+        downloadBehavior: null,
+        customCredentials: null,
     });
     await Promise.all([
         fs_1.default.promises.rm(outputLocation, { recursive: true }),
@@ -134,16 +191,19 @@ const renderHandler = async (params, options, logs) => {
         (0, io_1.lambdaWriteFile)({
             bucketName: params.bucketName,
             body: JSON.stringify(condensedTimingData, null, 2),
-            key: `${(0, constants_1.lambdaTimingsKey)({
+            key: (0, constants_1.lambdaTimingsKey)({
                 renderId: params.renderId,
                 chunk: params.chunk,
                 rendered: endRendered,
                 start,
-            })}`,
+            }),
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
+            downloadBehavior: null,
+            customCredentials: null,
         }),
+        renderer_1.RenderInternals.cleanDownloadMap(downloadMap),
     ]);
 };
 const rendererHandler = async (params, options) => {
@@ -155,11 +215,16 @@ 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') ||
             err.message.includes('error while loading shared libraries: libnss3.so');
-        const willRetry = isBrowserError || params.retriesLeft > 0;
+        const shouldNotRetry = err.name === 'CancelledError';
+        const willRetry = (isBrowserError || params.retriesLeft > 0) && !shouldNotRetry;
         console.log('Error occurred');
         console.log(err);
         await (0, write_lambda_error_1.writeLambdaError)({
@@ -196,4 +261,3 @@ const rendererHandler = async (params, options) => {
     }
 };
 exports.rendererHandler = rendererHandler;
-//# sourceMappingURL=renderer.js.map

package/dist/functions/start.d.ts

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

package/dist/functions/start.js

@@ -2,26 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startHandler = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
-const remotion_1 = require("remotion");
+const version_1 = require("remotion/version");
 const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const aws_clients_1 = require("../shared/aws-clients");
 const constants_1 = require("../shared/constants");
+const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const random_hash_1 = require("../shared/random-hash");
 const get_current_region_1 = require("./helpers/get-current-region");
-const startHandler = async (params) => {
-    var _a;
+const io_1 = require("./helpers/io");
+const startHandler = async (params, options) => {
+    var _a, _b;
     if (params.type !== constants_1.LambdaRoutines.start) {
         throw new TypeError('Expected type start');
     }
-    const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
+    if (params.version !== version_1.VERSION) {
+        if (!params.version) {
+            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(), 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 region = (0, get_current_region_1.getCurrentRegionInFunction)();
+    const bucketName = (_a = params.bucketName) !== null && _a !== void 0 ? _a : (await (0, get_or_create_bucket_1.getOrCreateBucket)({
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+    })).bucketName;
+    const realServeUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
+        urlOrId: params.serveUrl,
+        region,
+        bucketName,
     });
     const renderId = (0, random_hash_1.randomHash)({ randomInTests: true });
+    const initialFile = (0, io_1.lambdaWriteFile)({
+        bucketName,
+        downloadBehavior: null,
+        region,
+        body: 'Render was initialized',
+        expectedBucketOwner: options.expectedBucketOwner,
+        key: (0, constants_1.initalizedMetadataKey)(renderId),
+        privacy: 'private',
+        customCredentials: null,
+    });
     const payload = {
         type: constants_1.LambdaRoutines.launch,
         framesPerLambda: params.framesPerLambda,
         composition: params.composition,
-        serveUrl: params.serveUrl,
+        serveUrl: realServeUrl,
         inputProps: params.inputProps,
         bucketName,
         renderId,
@@ -34,12 +58,26 @@ const startHandler = async (params) => {
         quality: params.quality,
         maxRetries: params.maxRetries,
         privacy: params.privacy,
-        logLevel: (_a = params.logLevel) !== null && _a !== void 0 ? _a : remotion_1.Internals.Logging.DEFAULT_LOG_LEVEL,
+        logLevel: (_b = params.logLevel) !== null && _b !== void 0 ? _b : 'info',
         frameRange: params.frameRange,
         outName: params.outName,
         timeoutInMilliseconds: params.timeoutInMilliseconds,
         chromiumOptions: params.chromiumOptions,
         scale: params.scale,
+        numberOfGifLoops: params.numberOfGifLoops,
+        everyNthFrame: params.everyNthFrame,
+        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,
+        rendererFunctionName: params.rendererFunctionName,
+        audioCodec: params.audioCodec,
+        dumpBrowserLogs: params.dumpBrowserLogs,
     };
     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,
@@ -47,10 +85,10 @@ const startHandler = async (params) => {
         Payload: JSON.stringify(payload),
         InvocationType: 'Event',
     }));
+    await initialFile;
     return {
         bucketName,
         renderId,
     };
 };
 exports.startHandler = startHandler;
-//# sourceMappingURL=start.js.map

package/dist/functions/still.d.ts

@@ -1,4 +1,4 @@
-import { LambdaPayload } from '../shared/constants';
+import type { LambdaPayload } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
 };
@@ -11,4 +11,3 @@ declare const innerStillHandler: (lambdaParams: LambdaPayload, renderId: string,
 }>;
 export declare const stillHandler: (params: LambdaPayload, options: Options) => Promise<ReturnType<typeof innerStillHandler>>;
 export {};
-//# sourceMappingURL=still.d.ts.map