@remotion/lambda 4.0.0-alpha.217 → 4.0.0-alpha10

package/dist/functions/launch.js

@@ -26,8 +26,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchHandler = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
-const fs_1 = __importStar(require("fs"));
-const path_1 = require("path");
+const node_fs_1 = __importStar(require("node:fs"));
+const node_path_1 = require("node:path");
 const remotion_1 = require("remotion");
 const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
@@ -155,6 +155,7 @@ const innerLaunchHandler = async (params, options) => {
         downloadMap,
         forceHeight: params.forceHeight,
         forceWidth: params.forceWidth,
+        logLevel: params.logLevel,
     });
     remotion_1.Internals.validateDurationInFrames({
         durationInFrames: comp.durationInFrames,
@@ -179,7 +180,7 @@ const innerLaunchHandler = async (params, options) => {
         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#too-many-functions for help.`);
     }
     (0, validate_outname_1.validateOutname)(params.outName, params.codec, params.audioCodec);
-    (0, validate_privacy_1.validatePrivacy)(params.privacy);
+    (0, validate_privacy_1.validatePrivacy)(params.privacy, true);
     renderer_1.RenderInternals.validatePuppeteerTimeout(params.timeoutInMilliseconds);
     const { chunks } = (0, plan_frame_ranges_1.planFrameRanges)({
         framesPerLambda,
@@ -187,7 +188,6 @@ const innerLaunchHandler = async (params, options) => {
         everyNthFrame: params.everyNthFrame,
     });
     const sortedChunks = chunks.slice().sort((a, b) => a[0] - b[0]);
-    const invokers = Math.round(Math.sqrt(chunks.length));
     const reqSend = (0, timer_1.timer)('sending off requests');
     const lambdaPayloads = chunks.map((chunkPayload) => {
         var _a;
@@ -238,9 +238,8 @@ const innerLaunchHandler = async (params, options) => {
         estimatedTotalLambdaInvokations: [
             // Direct invokations
             chunks.length,
-            // Parent invokers
-            invokers,
             // This function
+            1,
         ].reduce((a, b) => a + b, 0),
         estimatedRenderLambdaInvokations: chunks.length,
         compositionId: comp.id,
@@ -362,13 +361,13 @@ const innerLaunchHandler = async (params, options) => {
         throw new Error('Stopping Lambda function because error occurred: ' + errors[0].stack);
     };
     const fps = comp.fps / params.everyNthFrame;
-    const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
-    if ((0, fs_1.existsSync)(outdir)) {
-        (0, fs_1.rmSync)(outdir, {
+    const outdir = (0, node_path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
+    if ((0, node_fs_1.existsSync)(outdir)) {
+        (0, node_fs_1.rmSync)(outdir, {
             recursive: true,
         });
     }
-    (0, fs_1.mkdirSync)(outdir);
+    (0, node_fs_1.mkdirSync)(outdir);
     const files = await (0, concat_videos_1.getAllFilesS3)({
         bucket: params.bucketName,
         expectedFiles: chunkCount,
@@ -390,11 +389,11 @@ const innerLaunchHandler = async (params, options) => {
         audioCodec: params.audioCodec,
     });
     const encodingStop = Date.now();
-    const outputSize = fs_1.default.statSync(outfile);
+    const outputSize = node_fs_1.default.statSync(outfile);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
         key,
-        body: fs_1.default.createReadStream(outfile),
+        body: node_fs_1.default.createReadStream(outfile),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
@@ -473,7 +472,7 @@ const innerLaunchHandler = async (params, options) => {
         customCredentials: null,
     });
     renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
-    await Promise.all([cleanupChunksProm, fs_1.default.promises.rm(outfile)]);
+    await Promise.all([cleanupChunksProm, node_fs_1.default.promises.rm(outfile)]);
     clearTimeout(webhookDueToTimeout);
     if (params.webhook && !webhookInvoked) {
         try {

package/dist/functions/renderer.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rendererHandler = void 0;
 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 node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const version_1 = require("remotion/version");
 const aws_clients_1 = require("../shared/aws-clients");
 const chunk_progress_1 = require("../shared/chunk-progress");
@@ -51,7 +51,7 @@ const renderHandler = async (params, options, logs) => {
     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({
+    const outputLocation = node_path_1.default.join(outdir, `localchunk-${String(params.chunk).padStart(8, '0')}.${renderer_1.RenderInternals.getFileExtensionFromCodec(chunkCodec, renderer_1.RenderInternals.getDefaultAudioCodec({
         codec: params.codec,
         preferLossless: true,
     }))}`);
@@ -178,7 +178,7 @@ const renderHandler = async (params, options, logs) => {
             renderId: params.renderId,
             index: params.chunk,
         }),
-        body: fs_1.default.createReadStream(outputLocation),
+        body: node_fs_1.default.createReadStream(outputLocation),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
@@ -186,8 +186,8 @@ const renderHandler = async (params, options, logs) => {
         customCredentials: null,
     });
     await Promise.all([
-        fs_1.default.promises.rm(outputLocation, { recursive: true }),
-        fs_1.default.promises.rm(outputPath, { recursive: true }),
+        node_fs_1.default.promises.rm(outputLocation, { recursive: true }),
+        node_fs_1.default.promises.rm(outputPath, { recursive: true }),
         (0, io_1.lambdaWriteFile)({
             bucketName: params.bucketName,
             body: JSON.stringify(condensedTimingData, null, 2),

package/dist/functions/still.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stillHandler = void 0;
 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 node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const version_1 = require("remotion/version");
 const estimate_price_1 = require("../api/estimate-price");
 const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
@@ -42,7 +42,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         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`);
     }
     (0, validate_download_behavior_1.validateDownloadBehavior)(lambdaParams.downloadBehavior);
-    (0, validate_privacy_1.validatePrivacy)(lambdaParams.privacy);
+    (0, validate_privacy_1.validatePrivacy)(lambdaParams.privacy, true);
     (0, validate_outname_1.validateOutname)(lambdaParams.outName, null, null);
     const start = Date.now();
     const [bucketName, browserInstance] = await Promise.all([
@@ -52,7 +52,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(lambdaParams.logLevel, 'verbose'), (_b = lambdaParams.chromiumOptions) !== null && _b !== void 0 ? _b : {}),
     ]);
     const outputDir = renderer_1.RenderInternals.tmpDir('remotion-render-');
-    const outputPath = path_1.default.join(outputDir, 'output');
+    const outputPath = node_path_1.default.join(outputDir, 'output');
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     const region = (0, get_current_region_1.getCurrentRegionInFunction)();
     const inputProps = await (0, deserialize_input_props_1.deserializeInputProps)({
@@ -78,6 +78,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         downloadMap,
         forceHeight: lambdaParams.forceHeight,
         forceWidth: lambdaParams.forceWidth,
+        logLevel: lambdaParams.logLevel,
     });
     const renderMetadata = {
         startedDate: Date.now(),
@@ -134,19 +135,19 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         browserExecutable: (0, get_chromium_executable_path_1.executablePath)(),
     });
     const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, (0, expected_out_name_1.getCredentialsFromOutName)(lambdaParams.outName));
-    const { size } = await fs_1.default.promises.stat(outputPath);
+    const { size } = await node_fs_1.default.promises.stat(outputPath);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
         key,
         privacy: lambdaParams.privacy,
-        body: fs_1.default.createReadStream(outputPath),
+        body: node_fs_1.default.createReadStream(outputPath),
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         downloadBehavior: lambdaParams.downloadBehavior,
         customCredentials,
     });
     await Promise.all([
-        fs_1.default.promises.rm(outputPath, { recursive: true }),
+        node_fs_1.default.promises.rm(outputPath, { recursive: true }),
         (0, cleanup_serialized_input_props_1.cleanupSerializedInputProps)({
             bucketName,
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),

package/dist/index.d.ts

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

package/dist/internals.d.ts

@@ -1,3 +1,5 @@
 export declare const LambdaInternals: {
     executeCommand: (args: string[], remotionRoot: string) => Promise<void>;
+    makeLambdaRenderMediaPayload: ({ rendererFunctionName, frameRange, framesPerLambda, forceBucketName: bucketName, codec, composition, serveUrl, imageFormat, inputProps, region, crf, envVariables, pixelFormat, proResProfile, maxRetries, privacy, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, everyNthFrame, numberOfGifLoops, audioBitrate, concurrencyPerLambda, audioCodec, forceHeight, forceWidth, webhook, videoBitrate, downloadBehavior, muted, overwrite, dumpBrowserLogs, jpegQuality, quality, }: import(".").RenderMediaOnLambdaInput) => Promise<import("./defaults").LambdaStartPayload>;
+    getRenderProgressPayload: ({ bucketName, renderId, s3OutputProvider, }: import(".").GetRenderInput) => import("./defaults").LambdaStatusPayload;
 };

package/dist/internals.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LambdaInternals = void 0;
+const make_lambda_payload_1 = require("./api/make-lambda-payload");
 const index_1 = require("./cli/index");
 exports.LambdaInternals = {
     executeCommand: index_1.executeCommand,
+    makeLambdaRenderMediaPayload: make_lambda_payload_1.makeLambdaRenderMediaPayload,
+    getRenderProgressPayload: make_lambda_payload_1.getRenderProgressPayload,
 };

package/dist/shared/aws-clients.js

@@ -8,7 +8,7 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const client_service_quotas_1 = require("@aws-sdk/client-service-quotas");
 const client_sts_1 = require("@aws-sdk/client-sts");
 const credential_providers_1 = require("@aws-sdk/credential-providers");
-const crypto_1 = require("crypto");
+const node_crypto_1 = require("node:crypto");
 const check_credentials_1 = require("./check-credentials");
 const is_in_lambda_1 = require("./is-in-lambda");
 const _clients = {};
@@ -90,7 +90,7 @@ const getCredentialsHash = ({ customCredentials, region, service, }) => {
     hashComponents.customCredentials = customCredentials;
     hashComponents.region = region;
     hashComponents.service = service;
-    return (0, crypto_1.createHash)('sha256')
+    return (0, node_crypto_1.createHash)('sha256')
         .update(JSON.stringify(hashComponents))
         .digest('base64');
 };

package/dist/shared/call-lambda.js

@@ -5,12 +5,29 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
 const aws_clients_1 = require("./aws-clients");
 const callLambda = async ({ functionName, type, payload, region, }) => {
     var _a;
-    const res = await (0, aws_clients_1.getLambdaClient)(region).send(new client_lambda_1.InvokeCommand({
+    const res = await (0, aws_clients_1.getLambdaClient)(region).send(new client_lambda_1.InvokeWithResponseStreamCommand({
         FunctionName: functionName,
         // @ts-expect-error
         Payload: JSON.stringify({ type, ...payload }),
     }));
-    const string = Buffer.from(res.Payload).toString();
+    const events = res.EventStream;
+    let responsePayload = new Uint8Array();
+    for await (const event of events) {
+        // There are two types of events you can get on a stream.
+        // `PayloadChunk`: These contain the actual raw bytes of the chunk
+        // It has a single property: `Payload`
+        if (event.PayloadChunk) {
+            // Decode the raw bytes into a string a human can read
+            const decoded = new TextDecoder('utf-8').decode(event.PayloadChunk.Payload);
+            responsePayload = Buffer.concat([responsePayload, Buffer.from(decoded)]);
+        }
+        if (event.InvokeComplete) {
+            if (event.InvokeComplete.ErrorCode) {
+                throw new Error(`Lambda function ${functionName} failed with error code ${event.InvokeComplete.ErrorCode}: ${event.InvokeComplete.ErrorDetails}}`);
+            }
+        }
+    }
+    const string = Buffer.from(responsePayload).toString();
     const json = JSON.parse(string);
     if ('errorMessage' in json) {
         const err = new Error(json.errorMessage);
@@ -18,6 +35,14 @@ const callLambda = async ({ functionName, type, payload, region, }) => {
         err.stack = ((_a = json.trace) !== null && _a !== void 0 ? _a : []).join('\n');
         throw err;
     }
+    // Streaming: 3.3.96+
+    if ('statusCode' in json) {
+        if (json.statusCode !== 200) {
+            throw new Error(`Lambda function ${functionName} failed with status code ${json.statusCode}: ${json.body}`);
+        }
+        return JSON.parse(json.body);
+    }
+    // Non-streaming: 3.3.95 and below
     return json;
 };
 exports.callLambda = callLambda;

package/dist/shared/constants.d.ts

@@ -104,48 +104,56 @@ export declare type SerializedInputProps = {
     type: 'payload';
     payload: unknown;
 };
+export declare type LambdaStartPayload = {
+    rendererFunctionName: string | null;
+    type: LambdaRoutines.start;
+    serveUrl: string;
+    composition: string;
+    framesPerLambda: number | null;
+    inputProps: SerializedInputProps;
+    codec: LambdaCodec;
+    audioCodec: AudioCodec | null;
+    imageFormat: VideoImageFormat;
+    crf: number | undefined;
+    envVariables: Record<string, string> | undefined;
+    pixelFormat: PixelFormat | undefined;
+    proResProfile: ProResProfile | undefined;
+    jpegQuality: number | undefined;
+    maxRetries: number;
+    privacy: Privacy;
+    logLevel: LogLevel;
+    frameRange: FrameRange | null;
+    outName: OutNameInput | null;
+    timeoutInMilliseconds: number;
+    chromiumOptions: ChromiumOptions;
+    scale: number;
+    everyNthFrame: number;
+    numberOfGifLoops: number | null;
+    concurrencyPerLambda: number;
+    downloadBehavior: DownloadBehavior;
+    muted: boolean;
+    version: string;
+    overwrite: boolean;
+    audioBitrate: string | null;
+    videoBitrate: string | null;
+    webhook: WebhookOption;
+    forceHeight: number | null;
+    forceWidth: number | null;
+    bucketName: string | null;
+    dumpBrowserLogs: boolean;
+};
+export declare type LambdaStatusPayload = {
+    type: LambdaRoutines.status;
+    bucketName: string;
+    renderId: string;
+    version: string;
+    s3OutputProvider?: CustomCredentials;
+};
 export declare type LambdaPayloads = {
     info: {
         type: LambdaRoutines.info;
     };
-    start: {
-        rendererFunctionName: string | null;
-        type: LambdaRoutines.start;
-        serveUrl: string;
-        composition: string;
-        framesPerLambda: number | null;
-        inputProps: SerializedInputProps;
-        codec: LambdaCodec;
-        audioCodec: AudioCodec | null;
-        imageFormat: VideoImageFormat;
-        crf: number | undefined;
-        envVariables: Record<string, string> | undefined;
-        pixelFormat: PixelFormat | undefined;
-        proResProfile: ProResProfile | undefined;
-        jpegQuality: number | undefined;
-        maxRetries: number;
-        privacy: Privacy;
-        logLevel: LogLevel;
-        frameRange: FrameRange | null;
-        outName: OutNameInput | null;
-        timeoutInMilliseconds: number;
-        chromiumOptions: ChromiumOptions;
-        scale: number;
-        everyNthFrame: number;
-        numberOfGifLoops: number | null;
-        concurrencyPerLambda: number;
-        downloadBehavior: DownloadBehavior;
-        muted: boolean;
-        version: string;
-        overwrite: boolean;
-        audioBitrate: string | null;
-        videoBitrate: string | null;
-        webhook: WebhookOption;
-        forceHeight: number | null;
-        forceWidth: number | null;
-        bucketName: string | null;
-        dumpBrowserLogs: boolean;
-    };
+    start: LambdaStartPayload;
     launch: {
         rendererFunctionName: string | null;
         type: LambdaRoutines.launch;
@@ -184,13 +192,7 @@ export declare type LambdaPayloads = {
         forceWidth: number | null;
         dumpBrowserLogs: boolean;
     };
-    status: {
-        type: LambdaRoutines.status;
-        bucketName: string;
-        renderId: string;
-        version: string;
-        s3OutputProvider?: CustomCredentials;
-    };
+    status: LambdaStatusPayload;
     renderer: {
         concurrencyPerLambda: number;
         type: LambdaRoutines.renderer;

package/dist/shared/deserialize-input-props.d.ts

@@ -5,4 +5,4 @@ export declare const deserializeInputProps: ({ serialized, region, bucketName, e
     region: AwsRegion;
     bucketName: string;
     expectedBucketOwner: string;
-}) => Promise<object>;
+}) => Promise<Record<string, unknown>>;

package/dist/shared/function-zip-path.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FUNCTION_ZIP_ARM64 = void 0;
-const path_1 = __importDefault(require("path"));
-exports.FUNCTION_ZIP_ARM64 = path_1.default.join(path_1.default.resolve(__dirname, '..', '..'), `remotionlambda-arm64.zip`);
+const node_path_1 = __importDefault(require("node:path"));
+exports.FUNCTION_ZIP_ARM64 = node_path_1.default.join(node_path_1.default.resolve(__dirname, '..', '..'), `remotionlambda-arm64.zip`);

package/dist/shared/get-etag.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEtagOfFile = void 0;
-const fs_1 = __importDefault(require("fs"));
-const crypto_1 = __importDefault(require("crypto"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const chunk = 1024 * 1024 * 5; // 5MB
-const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
+const md5 = (data) => node_crypto_1.default.createHash('md5').update(data).digest('hex');
 const getEtagOfFile = async (filePath) => {
-    const stream = await fs_1.default.promises.readFile(filePath);
+    const stream = await node_fs_1.default.promises.readFile(filePath);
     if (stream.length <= chunk) {
         return `"${md5(stream)}"`;
     }