@remotion/lambda 4.0.0-alpha.4 → 4.0.0-alpha4

package/dist/functions/helpers/io.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lambdaReadFile = exports.lambdaWriteFile = exports.lambdaLs = void 0;
+exports.lambdaHeadCommand = exports.lambdaReadFile = exports.lambdaWriteFile = exports.lambdaDeleteFile = exports.lambdaLs = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const mime_types_1 = __importDefault(require("mime-types"));
 const aws_clients_1 = require("../../shared/aws-clients");
@@ -11,7 +11,7 @@ const content_disposition_header_1 = require("../../shared/content-disposition-h
 const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }) => {
     var _a, _b, _c;
     try {
-        const list = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.ListObjectsV2Command({
+        const list = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.ListObjectsV2Command({
             Bucket: bucketName,
             Prefix: prefix,
             ExpectedBucketOwner: expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
@@ -37,7 +37,7 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
         }
         // Prevent from accessing a foreign bucket, retry without ExpectedBucketOwner and see if it works. If it works then it's an owner mismatch.
         if ((_c = err.stack) === null || _c === void 0 ? void 0 : _c.includes('AccessDenied')) {
-            await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.ListObjectsV2Command({
+            await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.ListObjectsV2Command({
                 Bucket: bucketName,
                 Prefix: prefix,
             }));
@@ -47,8 +47,15 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
     }
 };
 exports.lambdaLs = lambdaLs;
-const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, }) => {
-    await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.PutObjectCommand({
+const lambdaDeleteFile = async ({ bucketName, key, region, customCredentials, }) => {
+    await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.DeleteObjectCommand({
+        Bucket: bucketName,
+        Key: key,
+    }));
+};
+exports.lambdaDeleteFile = lambdaDeleteFile;
+const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, customCredentials, }) => {
+    await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.PutObjectCommand({
         Bucket: bucketName,
         Key: key,
         Body: body,
@@ -57,14 +64,16 @@ 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),
     }));
 };
 exports.lambdaWriteFile = lambdaWriteFile;
 const lambdaReadFile = async ({ bucketName, key, region, expectedBucketOwner, }) => {
-    const { Body } = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.GetObjectCommand({
+    const { Body } = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.GetObjectCommand({
         Bucket: bucketName,
         Key: key,
         ExpectedBucketOwner: expectedBucketOwner,
@@ -72,3 +81,11 @@ const lambdaReadFile = async ({ bucketName, key, region, expectedBucketOwner, })
     return Body;
 };
 exports.lambdaReadFile = lambdaReadFile;
+const lambdaHeadCommand = async ({ bucketName, key, region, }) => {
+    const head = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.HeadObjectCommand({
+        Bucket: bucketName,
+        Key: key,
+    }));
+    return head;
+};
+exports.lambdaHeadCommand = lambdaHeadCommand;

package/dist/functions/helpers/make-timeout-error.d.ts

@@ -0,0 +1,8 @@
+import type { _Object } from '@aws-sdk/client-s3';
+import type { RenderMetadata } from '../../defaults';
+import type { EnhancedErrorInfo } from './write-lambda-error';
+export declare const makeTimeoutError: ({ timeoutInMilliseconds, chunks, renderMetadata, }: {
+    timeoutInMilliseconds: number;
+    chunks: _Object[];
+    renderMetadata: RenderMetadata;
+}) => EnhancedErrorInfo;

package/dist/functions/helpers/make-timeout-error.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeTimeoutError = void 0;
+const parse_chunk_key_1 = require("../../shared/parse-chunk-key");
+const make_timeout_message_1 = require("./make-timeout-message");
+const makeTimeoutError = ({ timeoutInMilliseconds, chunks, renderMetadata, }) => {
+    const availableChunks = chunks.map((c) => (0, parse_chunk_key_1.parseLambdaChunkKey)(c.Key));
+    const missingChunks = new Array(renderMetadata.totalChunks)
+        .fill(true)
+        .filter((_, i) => {
+        return !availableChunks.find((c) => c.chunk === i);
+    })
+        .map((_, i) => i);
+    const message = (0, make_timeout_message_1.makeTimeoutMessage)({
+        missingChunks,
+        renderMetadata,
+        timeoutInMilliseconds,
+    });
+    return {
+        attempt: 1,
+        chunk: null,
+        explanation: message,
+        frame: null,
+        isFatal: true,
+        s3Location: '',
+        stack: new Error().stack,
+        tmpDir: null,
+        totalAttempts: 1,
+        type: 'stitcher',
+        willRetry: false,
+        message,
+        name: 'TimeoutError',
+    };
+};
+exports.makeTimeoutError = makeTimeoutError;

package/dist/functions/helpers/make-timeout-message.d.ts

@@ -0,0 +1,6 @@
+import type { RenderMetadata } from '../../defaults';
+export declare const makeTimeoutMessage: ({ timeoutInMilliseconds, missingChunks, renderMetadata, }: {
+    timeoutInMilliseconds: number;
+    missingChunks: number[];
+    renderMetadata: RenderMetadata;
+}) => string;

package/dist/functions/helpers/make-timeout-message.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeTimeoutMessage = void 0;
+const docs_url_1 = require("../../shared/docs-url");
+const makeChunkMissingMessage = ({ missingChunks, renderMetadata, }) => {
+    const missingChunksMessageList = missingChunks
+        .map((ch) => {
+        const isLastChunk = ch === renderMetadata.totalChunks - 1;
+        const start = ch * renderMetadata.framesPerLambda;
+        const end = isLastChunk
+            ? renderMetadata.frameRange[1]
+            : (ch + 1) * renderMetadata.framesPerLambda - 1;
+        return `Chunk ${ch} (Frames ${start} - ${end})`;
+    })
+        .slice(0, 5);
+    if (missingChunksMessageList.length === 0) {
+        return 'All chunks have been successfully rendered, but the main function has timed out.';
+    }
+    return `The following chunks are missing (showing ${missingChunksMessageList.length} out of ${missingChunks.length}): ${missingChunksMessageList.join(', ')}.`;
+};
+const makeTimeoutMessage = ({ timeoutInMilliseconds, missingChunks, renderMetadata, }) => {
+    const message = [
+        `The main function timed out after ${timeoutInMilliseconds}ms.`,
+        `Consider increasing the timeout of your function.`,
+        makeChunkMissingMessage({ missingChunks, renderMetadata }),
+        `You can use the "--timeout" parameter when deploying a function via CLI, or the "timeoutInSeconds" parameter when using the deployFunction() API.`,
+        `${docs_url_1.DOCS_URL}/docs/lambda/cli/functions#deploy`,
+    ].join('\n');
+    return message;
+};
+exports.makeTimeoutMessage = makeTimeoutMessage;

package/dist/functions/helpers/read-with-progress.d.ts

@@ -1,16 +1,18 @@
 import type { AwsRegion } from '../../pricing/aws-regions';
+import type { CustomCredentials } from '../../shared/aws-clients';
 export declare type LambdaReadFileProgress = (progress: {
     totalSize: number;
     downloaded: number;
     percent: number;
 }) => unknown;
-export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, }: {
+export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, customCredentials, }: {
     bucketName: string;
     key: string;
     region: AwsRegion;
     expectedBucketOwner: string;
     outputPath: string;
     onProgress: LambdaReadFileProgress;
+    customCredentials: CustomCredentials | null;
 }) => Promise<{
     sizeInBytes: number;
     to: string;

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

@@ -5,11 +5,11 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
 const renderer_1 = require("@remotion/renderer");
 const aws_clients_1 = require("../../shared/aws-clients");
-const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, }) => {
-    const client = (0, aws_clients_1.getS3Client)(region);
+const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, customCredentials, }) => {
+    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,8 @@
 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 get_chromium_executable_path_1 = require("./get-chromium-executable-path");
+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,
@@ -13,6 +14,7 @@ const validateComposition = async ({ serveUrl, composition, browserInstance, inp
         chromiumOptions,
         port,
         downloadMap,
+        browserExecutable: (0, get_chromium_executable_path_1.executablePath)(),
     });
     const found = compositions.find((c) => c.id === composition);
     if (!found) {
@@ -20,6 +22,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/helpers/write-lambda-error.d.ts

@@ -1,6 +1,6 @@
 import type { FileNameAndSize } from './get-files-in-folder';
 export declare type LambdaErrorInfo = {
-    type: 'renderer' | 'browser' | 'stitcher';
+    type: 'renderer' | 'browser' | 'stitcher' | 'webhook';
     message: string;
     name: string;
     stack: string;

package/dist/functions/helpers/write-lambda-error.js

@@ -34,6 +34,7 @@ const writeLambdaError = async ({ bucketName, renderId, errorInfo, expectedBucke
         privacy: 'private',
         expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
 };
 exports.writeLambdaError = writeLambdaError;

package/dist/functions/helpers/write-post-render-data.js

@@ -12,6 +12,7 @@ const writePostRenderData = async ({ bucketName, renderId, postRenderData, expec
         expectedBucketOwner,
         region,
         downloadBehavior: null,
+        customCredentials: null,
     });
 };
 exports.writePostRenderData = writePostRenderData;

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");
@@ -13,8 +14,8 @@ const renderer_2 = require("./renderer");
 const start_1 = require("./start");
 const still_1 = require("./still");
 const handler = async (params, context) => {
-    process.env.REMOTION_LAMBDA = 'true';
-    const timeoutInMiliseconds = context.getRemainingTimeInMillis();
+    process.env.__RESERVED_IS_INSIDE_REMOTION_LAMBDA = 'true';
+    const timeoutInMilliseconds = context.getRemainingTimeInMillis();
     if (!context || !context.invokedFunctionArn) {
         throw new Error('Lambda function unexpectedly does not have context.invokedFunctionArn');
     }
@@ -36,7 +37,7 @@ const handler = async (params, context) => {
             inputProps: JSON.stringify(params.inputProps),
             isWarm,
         });
-        return (0, start_1.startHandler)(params);
+        return (0, start_1.startHandler)(params, { expectedBucketOwner: currentUserId });
     }
     if (params.type === constants_1.LambdaRoutines.launch) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.launch, {
@@ -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, {
@@ -53,7 +57,7 @@ const handler = async (params, context) => {
         });
         return (0, progress_1.progressHandler)(params, {
             expectedBucketOwner: currentUserId,
-            timeoutInMiliseconds,
+            timeoutInMilliseconds,
         });
     }
     if (params.type === constants_1.LambdaRoutines.renderer) {
@@ -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/info.d.ts

@@ -1,4 +1,4 @@
-import type { LambdaPayload, LambdaVersions } from '../shared/constants';
+import type { LambdaPayload } from '../shared/constants';
 export declare const infoHandler: (lambdaParams: LambdaPayload) => Promise<{
-    version: LambdaVersions;
+    version: string;
 }>;

package/dist/functions/info.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.infoHandler = void 0;
+const version_1 = require("remotion/version");
 const constants_1 = require("../shared/constants");
 const infoHandler = (lambdaParams) => {
     if (lambdaParams.type !== constants_1.LambdaRoutines.info) {
         throw new TypeError('Expected info type');
     }
     const returnValue = {
-        version: constants_1.CURRENT_VERSION,
+        version: version_1.VERSION,
     };
     return Promise.resolve(returnValue);
 };

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 {};