@remotion/lambda 4.0.164 → 4.0.165

package/dist/shared/call-lambda.js

@@ -1,48 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callLambda = void 0;
+exports.callLambdaWithStreaming = exports.callLambda = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
-const streaming_payloads_1 = require("../functions/helpers/streaming-payloads");
+const pure_1 = require("@remotion/renderer/pure");
+const streaming_1 = require("../functions/streaming/streaming");
 const aws_clients_1 = require("./aws-clients");
 const INVALID_JSON_MESSAGE = 'Cannot parse Lambda response as JSON';
-const parseJsonWithErrorSurfacing = (input) => {
+const parseJsonOrThrowSource = (data, type) => {
+    const asString = new TextDecoder('utf-8').decode(data);
     try {
-        return JSON.parse(input);
+        return JSON.parse(asString);
     }
-    catch (_a) {
-        throw new Error(`${INVALID_JSON_MESSAGE}. Response: ${input}`);
+    catch (err) {
+        throw new Error(`Invalid JSON (${type}): ${asString}`);
     }
 };
-const parseJson = (input) => {
-    var _a;
-    let json = parseJsonWithErrorSurfacing(input);
-    if ('statusCode' in json) {
-        json = parseJsonWithErrorSurfacing(json.body);
-    }
-    if ('errorMessage' in json) {
-        const err = new Error(json.errorMessage);
-        err.name = json.errorType;
-        err.stack = ((_a = json.trace) !== null && _a !== void 0 ? _a : []).join('\n');
-        throw err;
-    }
-    // This will not happen, it is for narrowing purposes
-    if ('statusCode' in json) {
-        throw new Error(`Lambda function failed with status code ${json.statusCode}`);
-    }
-    if (json.type === 'error') {
-        const err = new Error(json.message);
-        err.stack = json.stack;
+const callLambda = async (options) => {
+    // Do not remove this await
+    const res = await callLambdaWithoutRetry(options);
+    if (res.type === 'error') {
+        const err = new Error(res.message);
+        err.stack = res.stack;
         throw err;
     }
-    return json;
+    return res;
 };
-const callLambda = async (options) => {
+exports.callLambda = callLambda;
+const callLambdaWithStreaming = async (options) => {
     // As of August 2023, Lambda streaming sometimes misses parts of the JSON response.
     // Handling this for now by applying a retry mechanism.
     try {
         // Do not remove this await
-        const res = await callLambdaWithoutRetry(options);
-        return res;
+        await callLambdaWithStreamingWithoutRetry(options);
     }
     catch (err) {
         if (options.retriesRemaining === 0) {
@@ -51,33 +40,54 @@ const callLambda = async (options) => {
         if (!err.message.includes(INVALID_JSON_MESSAGE)) {
             throw err;
         }
-        return (0, exports.callLambda)({
+        return (0, exports.callLambdaWithStreaming)({
             ...options,
             retriesRemaining: options.retriesRemaining - 1,
         });
     }
 };
-exports.callLambda = callLambda;
-const callLambdaWithoutRetry = async ({ functionName, type, payload, region, receivedStreamingPayload, timeoutInTest, }) => {
+exports.callLambdaWithStreaming = callLambdaWithStreaming;
+const callLambdaWithoutRetry = async ({ functionName, type, payload, region, timeoutInTest, }) => {
+    const Payload = JSON.stringify({ type, ...payload });
+    const res = await (0, aws_clients_1.getLambdaClient)(region, timeoutInTest).send(new client_lambda_1.InvokeCommand({
+        FunctionName: functionName,
+        Payload,
+        InvocationType: 'RequestResponse',
+    }));
+    const decoded = new TextDecoder('utf-8').decode(res.Payload);
+    try {
+        return JSON.parse(decoded);
+    }
+    catch (err) {
+        throw new Error(`Invalid JSON (${type}): ${JSON.stringify(decoded)}`);
+    }
+};
+const callLambdaWithStreamingWithoutRetry = async ({ functionName, type, payload, region, timeoutInTest, receivedStreamingPayload, }) => {
     const res = await (0, aws_clients_1.getLambdaClient)(region, timeoutInTest).send(new client_lambda_1.InvokeWithResponseStreamCommand({
         FunctionName: functionName,
         Payload: JSON.stringify({ type, ...payload }),
     }));
+    const { onData, clear } = pure_1.NoReactAPIs.makeStreamer((status, messageTypeId, data) => {
+        const messageType = (0, streaming_1.messageTypeIdToMessageType)(messageTypeId);
+        const innerPayload = streaming_1.formatMap[messageType] === 'json'
+            ? parseJsonOrThrowSource(data, messageType)
+            : data;
+        const message = {
+            successType: status,
+            message: {
+                type: messageType,
+                payload: innerPayload,
+            },
+        };
+        receivedStreamingPayload(message);
+    });
     const events = res.EventStream;
-    let responsePayload = '';
     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);
-            const streamPayload = (0, streaming_payloads_1.isStreamingPayload)(decoded);
-            if (streamPayload) {
-                receivedStreamingPayload(streamPayload);
-                continue;
-            }
-            responsePayload += decoded;
+        if (event.PayloadChunk && event.PayloadChunk.Payload) {
+            onData(event.PayloadChunk.Payload);
         }
         if (event.InvokeComplete) {
             if (event.InvokeComplete.ErrorCode) {
@@ -89,6 +99,5 @@ const callLambdaWithoutRetry = async ({ functionName, type, payload, region, rec
             }
         }
     }
-    const json = parseJson(responsePayload.trim());
-    return json;
+    clear();
 };

package/dist/shared/constants.d.ts

@@ -32,36 +32,7 @@ export declare const RENDER_FN_PREFIX = "remotion-render-";
 export declare const LOG_GROUP_PREFIX = "/aws/lambda/";
 export declare const LAMBDA_INSIGHTS_PREFIX = "/aws/lambda-insights";
 export declare const rendersPrefix: (renderId: string) => string;
-export declare const encodingProgressKey: (renderId: string) => string;
-export declare const renderMetadataKey: (renderId: string) => string;
-export declare const initalizedMetadataKey: (renderId: string) => string;
-export declare const lambdaChunkInitializedPrefix: (renderId: string) => string;
-export declare const lambdaChunkInitializedKey: ({ renderId, chunk, attempt, }: {
-    attempt: number;
-    renderId: string;
-    chunk: number;
-}) => string;
-export declare const lambdaTimingsPrefix: (renderId: string) => string;
-export declare const lambdaTimingsPrefixForChunk: (renderId: string, chunk: number) => string;
-export declare const lambdaLogsPrefix: (renderId: string, chunk: number, startFrame: number, endFrame: number) => string;
-export declare const lambdaTimingsKey: ({ renderId, chunk, start, rendered, }: {
-    renderId: string;
-    chunk: number;
-    start: number;
-    rendered: number;
-}) => string;
-export declare const chunkKey: (renderId: string) => string;
-export declare const chunkKeyForIndex: ({ renderId, index, type, }: {
-    renderId: string;
-    index: number;
-    type: 'video' | 'audio';
-}) => string;
-export declare const getErrorKeyPrefix: (renderId: string) => string;
-export declare const getErrorFileName: ({ renderId, chunk, attempt, }: {
-    renderId: string;
-    chunk: number | null;
-    attempt: number;
-}) => string;
+export declare const overallProgressKey: (renderId: string) => string;
 export type OutNameInput = string | {
     bucketName: string;
     key: string;
@@ -81,7 +52,6 @@ export declare const getSitesKey: (siteId: string) => string;
 export declare const outName: (renderId: string, extension: string) => string;
 export declare const outStillName: (renderId: string, imageFormat: StillImageFormat) => string;
 export declare const customOutName: (renderId: string, bucketName: string, name: OutNameInput) => OutNameOutput;
-export declare const postRenderDataKey: (renderId: string) => string;
 export declare const defaultPropsKey: (hash: string) => string;
 export declare const inputPropsKey: (hash: string) => string;
 export declare const resolvedPropsKey: (hash: string) => string;
@@ -262,6 +232,7 @@ export type LambdaPayloads = {
         colorSpace: ColorSpace | null;
         compositionStart: number;
         framesPerLambda: number;
+        progressEveryNthFrame: number;
     };
     still: {
         type: LambdaRoutines.still;
@@ -287,6 +258,7 @@ export type LambdaPayloads = {
         bucketName: string | null;
         offthreadVideoCacheSizeInBytes: number | null;
         deleteAfter: DeleteAfter | null;
+        streamed: boolean;
     };
     compositions: {
         type: LambdaRoutines.compositions;
@@ -302,9 +274,6 @@ export type LambdaPayloads = {
     };
 };
 export type LambdaPayload = LambdaPayloads[LambdaRoutines];
-export type EncodingProgress = {
-    framesEncoded: number;
-};
 type Discriminated = {
     type: 'still';
     imageFormat: StillImageFormat;
@@ -351,11 +320,11 @@ export type PostRenderData = {
     outputSize: number;
     renderSize: number;
     timeToFinish: number;
+    timeToRenderFrames: number;
     errors: EnhancedErrorInfo[];
     startTime: number;
     endTime: number;
     filesCleanedUp: number;
-    renderMetadata: RenderMetadata;
     timeToEncode: number;
     timeToCleanUp: number;
     timeToRenderChunks: number;
@@ -363,6 +332,7 @@ export type PostRenderData = {
     mostExpensiveFrameRanges: ExpensiveChunk[] | undefined;
     estimatedBillingDurationInMilliseconds: number;
     deleteAfter: DeleteAfter | null;
+    timeToCombine: number | null;
 };
 export type CostsInfo = {
     accruedSoFar: number;
@@ -375,6 +345,11 @@ export type CleanupInfo = {
     minFilesToDelete: number;
     filesDeleted: number;
 };
+type EncodingProgress = {
+    framesEncoded: number;
+    combinedFrames: number;
+    timeToCombine: number | null;
+};
 export type RenderProgress = {
     chunks: number;
     done: boolean;
@@ -394,6 +369,7 @@ export type RenderProgress = {
     lambdasInvoked: number;
     cleanup: CleanupInfo | null;
     timeToFinishChunks: number | null;
+    timeToRenderFrames: number | null;
     timeToEncode: number | null;
     overallProgress: number;
     retriesInfo: ChunkRetry[];
@@ -402,6 +378,9 @@ export type RenderProgress = {
     outputSizeInBytes: number | null;
     type: 'success';
     estimatedBillingDurationInMilliseconds: number | null;
+    combinedFrames: number;
+    timeToCombine: number | null;
+    timeoutTimestamp: number;
 };
 export type Privacy = 'public' | 'private' | 'no-acl';
 export declare const LAMBDA_CONCURRENCY_LIMIT_QUOTA = "L-B99A9384";

package/dist/shared/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.resolvedPropsKey = exports.inputPropsKey = exports.defaultPropsKey = exports.postRenderDataKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.getErrorFileName = exports.getErrorKeyPrefix = exports.chunkKeyForIndex = exports.chunkKey = exports.lambdaTimingsKey = exports.lambdaLogsPrefix = exports.lambdaTimingsPrefixForChunk = exports.lambdaTimingsPrefix = exports.lambdaChunkInitializedKey = exports.lambdaChunkInitializedPrefix = exports.initalizedMetadataKey = exports.renderMetadataKey = exports.encodingProgressKey = exports.rendersPrefix = exports.LAMBDA_INSIGHTS_PREFIX = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
+exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.resolvedPropsKey = exports.inputPropsKey = exports.defaultPropsKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.overallProgressKey = exports.rendersPrefix = exports.LAMBDA_INSIGHTS_PREFIX = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
 exports.MIN_MEMORY = 512;
 exports.MAX_MEMORY = 10240;
 exports.DEFAULT_MEMORY_SIZE = 2048;
@@ -25,32 +25,8 @@ exports.LOG_GROUP_PREFIX = '/aws/lambda/';
 exports.LAMBDA_INSIGHTS_PREFIX = '/aws/lambda-insights';
 const rendersPrefix = (renderId) => `renders/${renderId}`;
 exports.rendersPrefix = rendersPrefix;
-const encodingProgressKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/encoding-progress.json`;
-exports.encodingProgressKey = encodingProgressKey;
-const renderMetadataKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/pre-render-metadata.json`;
-exports.renderMetadataKey = renderMetadataKey;
-const initalizedMetadataKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/initialized.txt`;
-exports.initalizedMetadataKey = initalizedMetadataKey;
-const lambdaChunkInitializedPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/lambda-initialized`;
-exports.lambdaChunkInitializedPrefix = lambdaChunkInitializedPrefix;
-const lambdaChunkInitializedKey = ({ renderId, chunk, attempt, }) => `${(0, exports.lambdaChunkInitializedPrefix)(renderId)}-chunk:${chunk}-attempt:${attempt}.txt`;
-exports.lambdaChunkInitializedKey = lambdaChunkInitializedKey;
-const lambdaTimingsPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/lambda-timings/chunk:`;
-exports.lambdaTimingsPrefix = lambdaTimingsPrefix;
-const lambdaTimingsPrefixForChunk = (renderId, chunk) => (0, exports.lambdaTimingsPrefix)(renderId) + String(chunk).padStart(8, '0');
-exports.lambdaTimingsPrefixForChunk = lambdaTimingsPrefixForChunk;
-const lambdaLogsPrefix = (renderId, chunk, startFrame, endFrame) => `${(0, exports.rendersPrefix)(renderId)}/logs/chunk:${String(chunk).padStart(8, '0')}:frames:${startFrame}-${endFrame}.json`;
-exports.lambdaLogsPrefix = lambdaLogsPrefix;
-const lambdaTimingsKey = ({ renderId, chunk, start, rendered, }) => `${(0, exports.lambdaTimingsPrefixForChunk)(renderId, chunk)}-start:${start}-rendered:${rendered}.txt`;
-exports.lambdaTimingsKey = lambdaTimingsKey;
-const chunkKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/chunks/chunk`;
-exports.chunkKey = chunkKey;
-const chunkKeyForIndex = ({ renderId, index, type, }) => `${(0, exports.chunkKey)(renderId)}:${String(index).padStart(8, '0')}:${type}`;
-exports.chunkKeyForIndex = chunkKeyForIndex;
-const getErrorKeyPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/errors/`;
-exports.getErrorKeyPrefix = getErrorKeyPrefix;
-const getErrorFileName = ({ renderId, chunk, attempt, }) => (0, exports.getErrorKeyPrefix)(renderId) + ':chunk-' + chunk + ':attempt-' + attempt;
-exports.getErrorFileName = getErrorFileName;
+const overallProgressKey = (renderId) => `${(0, exports.rendersPrefix)(renderId)}/progress.json`;
+exports.overallProgressKey = overallProgressKey;
 const getSitesKey = (siteId) => `sites/${siteId}`;
 exports.getSitesKey = getSitesKey;
 const outName = (renderId, extension) => `${(0, exports.rendersPrefix)(renderId)}/out.${extension}`;
@@ -73,10 +49,6 @@ const customOutName = (renderId, bucketName, name) => {
     };
 };
 exports.customOutName = customOutName;
-const postRenderDataKey = (renderId) => {
-    return `${(0, exports.rendersPrefix)(renderId)}/post-render-metadata.json`;
-};
-exports.postRenderDataKey = postRenderDataKey;
 const defaultPropsKey = (hash) => {
     return `default-props/${hash}.json`;
 };

package/dist/shared/content-disposition-header.d.ts

@@ -4,7 +4,4 @@ export type DownloadBehavior = {
     type: 'download';
     fileName: string | null;
 };
-export type HexInfo = {
-    containsHex: boolean;
-};
 export declare const getContentDispositionHeader: (behavior: DownloadBehavior | null) => string | undefined;

package/dist/shared/get-function-version.js

@@ -12,9 +12,7 @@ const getFunctionVersion = async ({ functionName, region, logLevel, }) => {
             },
             region,
             type: constants_1.LambdaRoutines.info,
-            receivedStreamingPayload: () => undefined,
             timeoutInTest: 120000,
-            retriesRemaining: 0,
         });
         return result.version;
     }

package/dist/shared/is-flaky-error.js

@@ -49,6 +49,10 @@ const isFlakyError = (err) => {
     if (message.includes('Timeout exceeded rendering the component')) {
         return true;
     }
+    // CDN slowness
+    if (message.includes('Loading root component')) {
+        return true;
+    }
     // Internet flakiness
     if (message.includes('getaddrinfo') ||
         message.includes('ECONNRESET') ||

package/dist/shared/parse-lambda-timings-key.d.ts

@@ -1,7 +1,5 @@
 export type ParsedTiming = {
-    renderId: string;
     chunk: number;
     start: number;
     rendered: number;
 };
-export declare const parseLambdaTimingsKey: (key: string) => ParsedTiming;

package/dist/shared/parse-lambda-timings-key.js

@@ -1,16 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLambdaTimingsKey = void 0;
-const parseLambdaTimingsKey = (key) => {
-    const match = key.match(/^renders\/(.*)\/lambda-timings\/chunk:([0-9]+)-start:([0-9]+)-rendered:([0-9]+).txt$/);
-    if (!match) {
-        throw new Error(`Cannot parse filename ${key} into timing information. Malformed data.`);
-    }
-    return {
-        renderId: match[1],
-        chunk: Number(match[2]),
-        start: Number(match[3]),
-        rendered: Number(match[4]),
-    };
-};
-exports.parseLambdaTimingsKey = parseLambdaTimingsKey;

package/dist/shared/return-values.d.ts

@@ -6,11 +6,6 @@ import type { rendererHandler } from '../functions/renderer';
 import type { startHandler } from '../functions/start';
 import type { stillHandler } from '../functions/still';
 import type { LambdaRoutines } from './constants';
-export type OrError<T> = T | {
-    type: 'error';
-    message: string;
-    stack: string;
-};
 export interface LambdaReturnValues {
     [LambdaRoutines.start]: ReturnType<typeof startHandler>;
     [LambdaRoutines.launch]: ReturnType<typeof launchHandler>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.164",
+  "version": "4.0.165",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -13,22 +13,22 @@
     "url": "https://github.com/JonnyBurger/remotion"
   },
   "dependencies": {
-    "@smithy/abort-controller": "2.0.1",
-    "@aws-sdk/client-cloudwatch-logs": "3.382.0",
-    "@aws-sdk/client-iam": "3.382.0",
-    "@aws-sdk/client-lambda": "3.382.0",
-    "@aws-sdk/client-s3": "3.382.0",
-    "@aws-sdk/client-service-quotas": "3.382.0",
-    "@aws-sdk/client-sts": "3.382.0",
-    "@aws-sdk/credential-providers": "3.382.0",
-    "@aws-sdk/lib-storage": "3.382.0",
-    "@aws-sdk/s3-request-presigner": "3.382.0",
+    "@smithy/abort-controller": "3.0.0",
+    "@aws-sdk/client-cloudwatch-logs": "3.583.0",
+    "@aws-sdk/client-iam": "3.583.0",
+    "@aws-sdk/client-lambda": "3.583.0",
+    "@aws-sdk/client-s3": "3.583.0",
+    "@aws-sdk/client-service-quotas": "3.583.0",
+    "@aws-sdk/client-sts": "3.583.0",
+    "@aws-sdk/credential-providers": "3.583.0",
+    "@aws-sdk/lib-storage": "3.583.0",
+    "@aws-sdk/s3-request-presigner": "3.583.0",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.164",
-    "@remotion/renderer": "4.0.164",
-    "@remotion/cli": "4.0.164",
-    "remotion": "4.0.164"
+    "@remotion/bundler": "4.0.165",
+    "@remotion/cli": "4.0.165",
+    "@remotion/renderer": "4.0.165",
+    "remotion": "4.0.165"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.281",
@@ -44,11 +44,11 @@
     "ts-node": "10.9.2",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.164",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.164"
+    "@remotion/compositor-linux-arm64-gnu": "4.0.165",
+    "@remotion/bundler": "4.0.165"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.164"
+    "@remotion/bundler": "4.0.165"
   },
   "publishConfig": {
     "access": "public"