@remotion/lambda 4.0.0-bitrate.16 → 4.0.0-copy.4

package/dist/functions/helpers/clean-tmpdir.js

@@ -35,7 +35,7 @@ const deleteAllFilesInAFolderRecursively = (path) => {
 const deleteTmpDir = () => {
     exports.deletedFiles = [];
     exports.deletedFilesSize = 0;
-    if (typeof jest === 'undefined') {
+    if (!process.env.VITEST) {
         deleteAllFilesInAFolderRecursively('/tmp');
     }
 };

package/dist/functions/helpers/concat-videos.d.ts

@@ -1,9 +1,12 @@
+import type { FfmpegExecutable } from '@remotion/renderer';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { LambdaCodec } from '../../shared/validate-lambda-codec';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, }: {
+import type { EnhancedErrorInfo } from './write-lambda-error';
+export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }: {
     bucket: string;
     expectedFiles: number;
     onProgress: (frames: number, encodingStart: number) => void;
+    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
     numberOfFrames: number;
     renderId: string;
     region: AwsRegion;
@@ -11,6 +14,8 @@ export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numbe
     expectedBucketOwner: string;
     fps: number;
     numberOfGifLoops: number | null;
+    ffmpegExecutable: FfmpegExecutable;
+    remotionRoot: string;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;

package/dist/functions/helpers/concat-videos.js

@@ -28,6 +28,7 @@ const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importStar(require("fs"));
 const path_1 = __importStar(require("path"));
 const constants_1 = require("../../shared/constants");
+const inspect_errors_1 = require("./inspect-errors");
 const io_1 = require("./io");
 const timer_1 = require("./timer");
 const getChunkDownloadOutputLocation = ({ outdir, file, }) => {
@@ -50,11 +51,11 @@ const downloadS3File = async ({ bucket, key, outdir, region, expectedBucketOwner
             .on('close', () => resolve());
     });
 };
-const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, }) => {
+const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }) => {
     const alreadyDownloading = {};
     const downloaded = {};
     const getFiles = async () => {
-        const prefix = (0, constants_1.chunkKey)(renderId);
+        const prefix = (0, constants_1.rendersPrefix)(renderId);
         const lsTimer = (0, timer_1.timer)('Listing files');
         const contents = await (0, io_1.lambdaLs)({
             bucketName: bucket,
@@ -63,13 +64,16 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
             expectedBucketOwner,
         });
         lsTimer.end();
-        return contents
-            .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); })
-            .map((_) => _.Key);
+        return {
+            filesInBucket: contents
+                .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); })
+                .map((_) => _.Key),
+            errorContents: contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.getErrorKeyPrefix)(renderId)); }),
+        };
     };
     return new Promise((resolve, reject) => {
         const loop = async () => {
-            const filesInBucket = await getFiles();
+            const { filesInBucket, errorContents } = await getFiles();
             const checkFinish = () => {
                 const areAllFilesDownloaded = Object.keys(downloaded).length === expectedFiles;
                 console.log('Checking for finish... ', Object.keys(downloaded), expectedFiles + ' files expected');
@@ -79,6 +83,17 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                 }
             };
             console.log('Found ', filesInBucket);
+            const errors = (await (0, inspect_errors_1.inspectErrors)({
+                bucket,
+                contents: errorContents,
+                expectedBucketOwner,
+                region,
+                renderId,
+            })).filter((e) => e.isFatal);
+            if (errors.length > 0) {
+                await onErrors(errors);
+                // Will die here
+            }
             filesInBucket.forEach(async (key) => {
                 if (alreadyDownloading[key]) {
                     return;
@@ -105,14 +120,14 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
             const areAllFilesDownloading = Object.keys(alreadyDownloading).length === expectedFiles;
             if (!areAllFilesDownloading) {
                 setTimeout(() => {
-                    loop();
+                    loop().catch((err) => reject(err));
                 }, 100);
             }
         };
-        loop();
+        loop().catch((err) => reject(err));
     });
 };
-const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, }) => {
+const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }) => {
     var _a;
     const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
     if ((0, fs_1.existsSync)(outdir)) {
@@ -128,6 +143,7 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
         renderId,
         region,
         expectedBucketOwner,
+        onErrors,
     });
     const outfile = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'));
     const combine = (0, timer_1.timer)('Combine videos');
@@ -143,6 +159,8 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
         codec: codecForCombining,
         fps,
         numberOfGifLoops,
+        ffmpegExecutable,
+        remotionRoot,
     });
     combine.end();
     const cleanupChunksProm = ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outdir, {

package/dist/functions/helpers/get-browser-instance.js

@@ -45,7 +45,7 @@ const getBrowserInstance = async (shouldDumpIo, chromiumOptions) => {
     });
     _browserInstance.on('disconnected', () => {
         console.log('Browser disconnected / crashed');
-        _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.close().catch(() => undefined);
+        _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.close(true).catch(() => undefined);
         _browserInstance = null;
     });
     launching = false;

package/dist/functions/helpers/get-custom-out-name.js

@@ -10,7 +10,7 @@ const getCustomOutName = ({ renderMetadata, customCredentials, }) => {
         return renderMetadata.outName;
     }
     if (renderMetadata.outName.s3OutputProvider) {
-        if (!customCredentials && renderMetadata.privacy !== 'public') {
+        if (!customCredentials && renderMetadata.privacy === 'private') {
             throw new TypeError(`The file was rendered with a custom S3 implementation and is not public, but no custom credentials were passed to downloadMedia().`);
         }
         return {

package/dist/functions/helpers/io.js

@@ -64,7 +64,9 @@ const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expecte
             : privacy === 'private'
                 ? 'private'
                 : 'public-read',
-        ExpectedBucketOwner: expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
+        ExpectedBucketOwner: customCredentials
+            ? undefined
+            : expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
         ContentType: mime_types_1.default.lookup(key) || 'application/octet-stream',
         ContentDisposition: (0, content_disposition_header_1.getContentDispositionHeader)(downloadBehavior),
     }));

package/dist/functions/helpers/read-with-progress.js

@@ -9,7 +9,7 @@ const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expecte
     const client = (0, aws_clients_1.getS3Client)(region, customCredentials);
     const command = new client_s3_1.GetObjectCommand({
         Bucket: bucketName,
-        ExpectedBucketOwner: expectedBucketOwner,
+        ExpectedBucketOwner: customCredentials ? undefined : expectedBucketOwner,
         Key: key,
     });
     const presigned = await (0, s3_request_presigner_1.getSignedUrl)(client, command);

package/dist/functions/helpers/validate-composition.d.ts

@@ -13,6 +13,8 @@ declare type ValidateCompositionOptions = {
     chromiumOptions: ChromiumOptions;
     port: number | null;
     downloadMap: DownloadMap;
+    forceHeight: number | null;
+    forceWidth: number | null;
 };
-export declare const validateComposition: ({ serveUrl, composition, browserInstance, inputProps, envVariables, timeoutInMilliseconds, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, downloadMap, }: ValidateCompositionOptions) => Promise<TCompMetadata>;
+export declare const validateComposition: ({ serveUrl, composition, browserInstance, inputProps, envVariables, timeoutInMilliseconds, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, downloadMap, forceHeight, forceWidth, }: ValidateCompositionOptions) => Promise<TCompMetadata>;
 export {};

package/dist/functions/helpers/validate-composition.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateComposition = void 0;
 const renderer_1 = require("@remotion/renderer");
-const validateComposition = async ({ serveUrl, composition, browserInstance, inputProps, envVariables, timeoutInMilliseconds, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, downloadMap, }) => {
+const validateComposition = async ({ serveUrl, composition, browserInstance, inputProps, envVariables, timeoutInMilliseconds, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, downloadMap, forceHeight, forceWidth, }) => {
     const compositions = await (0, renderer_1.getCompositions)(serveUrl, {
         puppeteerInstance: browserInstance,
         inputProps: inputProps,
@@ -20,6 +20,10 @@ const validateComposition = async ({ serveUrl, composition, browserInstance, inp
             .map((c) => c.id)
             .join(', ')}`);
     }
-    return found;
+    return {
+        ...found,
+        height: forceHeight !== null && forceHeight !== void 0 ? forceHeight : found.height,
+        width: forceWidth !== null && forceWidth !== void 0 ? forceWidth : found.width,
+    };
 };
 exports.validateComposition = validateComposition;

package/dist/functions/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = void 0;
 const renderer_1 = require("@remotion/renderer");
 const constants_1 = require("../shared/constants");
+const compositions_1 = require("./compositions");
 const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
 const is_warm_1 = require("./helpers/is-warm");
 const print_cloudwatch_helper_1 = require("./helpers/print-cloudwatch-helper");
@@ -44,7 +45,10 @@ const handler = async (params, context) => {
             inputProps: JSON.stringify(params.inputProps),
             isWarm,
         });
-        return (0, launch_1.launchHandler)(params, { expectedBucketOwner: currentUserId });
+        return (0, launch_1.launchHandler)(params, {
+            expectedBucketOwner: currentUserId,
+            getRemainingTimeInMillis: context.getRemainingTimeInMillis,
+        });
     }
     if (params.type === constants_1.LambdaRoutines.status) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.status, {
@@ -75,6 +79,14 @@ const handler = async (params, context) => {
         });
         return (0, info_1.infoHandler)(params);
     }
+    if (params.type === constants_1.LambdaRoutines.compositions) {
+        (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.compositions, {
+            isWarm,
+        });
+        return (0, compositions_1.compositionsHandler)(params, {
+            expectedBucketOwner: currentUserId,
+        });
+    }
     throw new Error(constants_1.COMMAND_NOT_FOUND);
 };
 exports.handler = handler;

package/dist/functions/launch.d.ts

@@ -1,6 +1,7 @@
 import type { LambdaPayload } from '../shared/constants';
 declare type Options = {
     expectedBucketOwner: string;
+    getRemainingTimeInMillis: () => number;
 };
 export declare const launchHandler: (params: LambdaPayload, options: Options) => Promise<void>;
 export {};