@remotion/lambda 4.0.0-4x.2 → 4.0.0-audio-mixing.3

package/dist/functions/helpers/get-encoding-metadata.js

@@ -2,25 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEncodingMetadata = void 0;
 const defaults_1 = require("../../defaults");
-const stream_to_string_1 = require("../../shared/stream-to-string");
-const io_1 = require("./io");
-const getEncodingMetadata = async ({ exists, bucketName, renderId, region, expectedBucketOwner, }) => {
+const chunk_progress_1 = require("../../shared/chunk-progress");
+const getEncodingMetadata = ({ exists, frameCount, }) => {
     if (!exists) {
         return null;
     }
-    try {
-        const Body = await (0, io_1.lambdaReadFile)({
-            bucketName,
-            key: (0, defaults_1.encodingProgressKey)(renderId),
-            region,
-            expectedBucketOwner,
-        });
-        const encodingProgress = JSON.parse(await (0, stream_to_string_1.streamToString)(Body));
-        return encodingProgress;
-    }
-    catch (err) {
-        // The file may not yet have been fully written or already have been cleaned up again
-        return null;
-    }
+    const framesEncoded = (0, chunk_progress_1.getProgressOfChunk)(exists.ETag);
+    // We only report every 100 frames encoded so that we are able to report up to 2000 * 100 ETags => 200000 frames
+    return {
+        framesEncoded: Math.min(frameCount, framesEncoded * defaults_1.ENCODING_PROGRESS_STEP_SIZE),
+    };
 };
 exports.getEncodingMetadata = getEncodingMetadata;

package/dist/functions/helpers/get-files-to-delete.js

@@ -12,7 +12,7 @@ const getFilesToDelete = ({ chunkCount, renderId, }) => {
         .map((_x, i) => (0, constants_1.lambdaTimingsPrefixForChunk)(renderId, i));
     return [
         {
-            name: (0, constants_1.lambdaInitializedPrefix)(renderId),
+            name: (0, constants_1.lambdaChunkInitializedPrefix)(renderId),
             type: 'prefix',
         },
         ...chunks.map((i) => {

package/dist/functions/helpers/get-final-encoding-status.d.ts

@@ -1,8 +1,6 @@
 import type { EncodingProgress, RenderMetadata } from '../../shared/constants';
-import type { LambdaInvokeStats } from './get-lambdas-invoked-stats';
-export declare const getFinalEncodingStatus: ({ encodingStatus: encodingProgress, renderMetadata, outputFileExists, lambdaInvokeStatus, }: {
-    encodingStatus: EncodingProgress | null;
+export declare const getFinalEncodingStatus: ({ encodingProgress, renderMetadata, outputFileExists, }: {
+    encodingProgress: EncodingProgress | null;
     renderMetadata: RenderMetadata | null;
     outputFileExists: boolean;
-    lambdaInvokeStatus: LambdaInvokeStats;
 }) => EncodingProgress | null;

package/dist/functions/helpers/get-final-encoding-status.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFinalEncodingStatus = void 0;
-const getFinalEncodingStatus = ({ encodingStatus: encodingProgress, renderMetadata, outputFileExists, lambdaInvokeStatus, }) => {
+const getFinalEncodingStatus = ({ encodingProgress, renderMetadata, outputFileExists, }) => {
     if (!renderMetadata) {
         return null;
     }
@@ -11,9 +11,6 @@ const getFinalEncodingStatus = ({ encodingStatus: encodingProgress, renderMetada
     if (outputFileExists) {
         return {
             framesEncoded: renderMetadata.videoConfig.durationInFrames,
-            totalFrames: renderMetadata.videoConfig.durationInFrames,
-            doneIn: null,
-            timeToInvoke: lambdaInvokeStatus.timeToInvokeLambdas,
         };
     }
     return null;

package/dist/functions/helpers/get-lambdas-invoked-stats.d.ts

@@ -1,7 +1,8 @@
 import type { _Object } from '@aws-sdk/client-s3';
 export declare type LambdaInvokeStats = {
-    timeToInvokeLambdas: number | null;
-    allLambdasInvoked: boolean;
     lambdasInvoked: number;
 };
-export declare const getLambdasInvokedStats: (contents: _Object[], renderId: string, estimatedRenderLambdaInvokations: number | null, startDate: number | null) => LambdaInvokeStats;
+export declare const getLambdasInvokedStats: ({ contents, renderId, }: {
+    contents: _Object[];
+    renderId: string;
+}) => LambdaInvokeStats;

package/dist/functions/helpers/get-lambdas-invoked-stats.js

@@ -3,19 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLambdasInvokedStats = void 0;
 const constants_1 = require("../../shared/constants");
 const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
-const min_max_1 = require("./min-max");
-const getLambdasInvokedStats = (contents, renderId, estimatedRenderLambdaInvokations, startDate) => {
+const getLambdasInvokedStats = ({ contents, renderId, }) => {
     const lambdasInvoked = contents
-        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaInitializedPrefix)(renderId)); })
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
         .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt === 1);
-    const allLambdasInvoked = lambdasInvoked.length === estimatedRenderLambdaInvokations;
-    const timeToInvokeLambdas = allLambdasInvoked && startDate
-        ? (0, min_max_1.max)(lambdasInvoked.map((l) => { var _a; return (_a = l.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(); })) -
-            startDate
-        : null;
     return {
-        timeToInvokeLambdas,
-        allLambdasInvoked,
         lambdasInvoked: lambdasInvoked.length,
     };
 };

package/dist/functions/helpers/get-output-url-from-metadata.d.ts

@@ -1,2 +1,3 @@
 import type { RenderMetadata } from '../../defaults';
-export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string) => string;
+import type { CustomCredentials } from '../../shared/aws-clients';
+export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string, customCredentials: CustomCredentials | null) => string;

package/dist/functions/helpers/get-output-url-from-metadata.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputUrlFromMetadata = void 0;
 const expected_out_name_1 = require("./expected-out-name");
 const get_current_region_1 = require("./get-current-region");
-const getOutputUrlFromMetadata = (renderMetadata, bucketName) => {
-    const outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
+const getOutputUrlFromMetadata = (renderMetadata, bucketName, customCredentials) => {
+    const outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
     return `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${outname.renderBucketName}/${outname.key}`;
 };
 exports.getOutputUrlFromMetadata = getOutputUrlFromMetadata;

package/dist/functions/helpers/get-overall-progress.d.ts

@@ -1,6 +1,7 @@
-export declare const getOverallProgress: ({ cleanup, encoding, rendering, invoking, }: {
+export declare const getOverallProgress: ({ cleanup, encoding, rendering, invoking, frames, }: {
     cleanup: number;
     encoding: number;
     rendering: number;
     invoking: number;
+    frames: number;
 }) => number;

package/dist/functions/helpers/get-overall-progress.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOverallProgress = void 0;
 const weights = {
     cleanup: 0.1,
-    encoding: 0.3,
-    rendering: 0.3,
-    invoking: 0.3,
+    encoding: 0.225,
+    rendering: 0.225,
+    frames: 0.225,
+    invoking: 0.225,
 };
-const getOverallProgress = ({ cleanup, encoding, rendering, invoking, }) => {
+const getOverallProgress = ({ cleanup, encoding, rendering, invoking, frames, }) => {
     return (cleanup * weights.cleanup +
         encoding * weights.encoding +
         rendering * weights.rendering +
-        invoking * weights.invoking);
+        invoking * weights.invoking +
+        frames * weights.frames);
 };
 exports.getOverallProgress = getOverallProgress;

package/dist/functions/helpers/get-progress.d.ts

@@ -1,10 +1,12 @@
 import type { AwsRegion } from '../../pricing/aws-regions';
+import type { CustomCredentials } from '../../shared/aws-clients';
 import type { RenderProgress } from '../../shared/constants';
-export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, }: {
+export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, }: {
     bucketName: string;
     renderId: string;
     expectedBucketOwner: string;
     region: AwsRegion;
     memorySizeInMb: number;
-    timeoutInMiliseconds: number;
+    timeoutInMilliseconds: number;
+    customCredentials: CustomCredentials | null;
 }) => Promise<RenderProgress>;

package/dist/functions/helpers/get-progress.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgress = void 0;
+const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
+const chunk_progress_1 = require("../../shared/chunk-progress");
 const constants_1 = require("../../shared/constants");
-const docs_url_1 = require("../../shared/docs-url");
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
 const calculate_price_from_bucket_1 = require("./calculate-price-from-bucket");
+const check_if_render_exists_1 = require("./check-if-render-exists");
 const expected_out_name_1 = require("./expected-out-name");
 const find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
 const format_costs_info_1 = require("./format-costs-info");
@@ -18,12 +20,14 @@ const get_lambdas_invoked_stats_1 = require("./get-lambdas-invoked-stats");
 const get_overall_progress_1 = require("./get-overall-progress");
 const get_post_render_data_1 = require("./get-post-render-data");
 const get_render_metadata_1 = require("./get-render-metadata");
+const get_rendered_frames_progress_1 = require("./get-rendered-frames-progress");
 const get_retry_stats_1 = require("./get-retry-stats");
 const get_time_to_finish_1 = require("./get-time-to-finish");
 const inspect_errors_1 = require("./inspect-errors");
 const io_1 = require("./io");
-const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+const make_timeout_error_1 = require("./make-timeout-error");
+const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const postRenderData = await (0, get_post_render_data_1.getPostRenderData)({
         bucketName,
         region,
@@ -31,8 +35,10 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         expectedBucketOwner,
     });
     if (postRenderData) {
-        const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName);
+        const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName, customCredentials);
+        const totalFrameCount = renderer_1.RenderInternals.getFramesToRender(postRenderData.renderMetadata.frameRange, postRenderData.renderMetadata.everyNthFrame).length;
         return {
+            framesRendered: totalFrameCount,
             bucket: bucketName,
             renderSize: postRenderData.renderSize,
             chunks: postRenderData.renderMetadata.totalChunks,
@@ -50,10 +56,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             currentTime: Date.now(),
             done: true,
             encodingStatus: {
-                framesEncoded: postRenderData.renderMetadata.videoConfig.durationInFrames,
-                totalFrames: postRenderData.renderMetadata.videoConfig.durationInFrames,
-                doneIn: postRenderData.timeToEncode,
-                timeToInvoke: postRenderData.timeToInvokeLambdas,
+                framesEncoded: totalFrameCount,
             },
             errors: postRenderData.errors,
             fatalErrorEncountered: false,
@@ -63,12 +66,13 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             renderMetadata: postRenderData.renderMetadata,
             timeToFinish: postRenderData.timeToFinish,
             timeToFinishChunks: postRenderData.timeToRenderChunks,
-            timeToInvokeLambdas: postRenderData.timeToInvokeLambdas,
             overallProgress: 1,
             retriesInfo: postRenderData.retriesInfo,
             outKey: outData.key,
             outBucket: outData.renderBucketName,
             mostExpensiveFrameRanges: (_a = postRenderData.mostExpensiveFrameRanges) !== null && _a !== void 0 ? _a : null,
+            timeToEncode: postRenderData.timeToEncode,
+            outputSizeInBytes: postRenderData.outputSize,
         };
     }
     const contents = await (0, io_1.lambdaLs)({
@@ -78,14 +82,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         expectedBucketOwner,
     });
     const renderMetadataExists = Boolean(contents.find((c) => c.Key === (0, constants_1.renderMetadataKey)(renderId)));
-    const [encodingStatus, renderMetadata, errorExplanations] = await Promise.all([
-        (0, get_encoding_metadata_1.getEncodingMetadata)({
-            exists: Boolean(contents.find((c) => c.Key === (0, constants_1.encodingProgressKey)(renderId))),
-            bucketName,
-            renderId,
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-            expectedBucketOwner,
-        }),
+    const [renderMetadata, errorExplanations] = await Promise.all([
         renderMetadataExists
             ? (0, get_render_metadata_1.getRenderMetadata)({
                 bucketName,
@@ -102,11 +99,16 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             expectedBucketOwner,
         }),
     ]);
+    if ((renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.type) === 'still') {
+        throw new Error("You don't need to call getRenderProgress() on a still render. Once you have obtained the `renderId`, the render is already done! 😉");
+    }
+    (0, check_if_render_exists_1.checkIfRenderExists)(contents, renderId, bucketName, (0, get_current_region_1.getCurrentRegionInFunction)());
     const outputFile = renderMetadata
         ? await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
             bucketName,
             renderMetadata,
             region,
+            customCredentials,
         })
         : null;
     const accruedSoFar = Number((0, calculate_price_from_bucket_1.estimatePriceFromBucket)({
@@ -131,46 +133,58 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         renderMetadata,
     });
     const chunks = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); });
+    const framesRendered = renderMetadata
+        ? (0, get_rendered_frames_progress_1.getRenderedFramesProgress)({
+            contents,
+            everyNthFrame: renderMetadata.everyNthFrame,
+            frameRange: renderMetadata.frameRange,
+            framesPerLambda: renderMetadata.framesPerLambda,
+            renderId,
+        })
+        : 0;
+    console.log('etags', contents
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
+        .map((c) => {
+        return (0, chunk_progress_1.getProgressOfChunk)(c.ETag);
+    }));
     const allChunks = chunks.length === ((_f = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _f !== void 0 ? _f : Infinity);
     const renderSize = contents
         .map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
         .reduce((a, b) => a + b, 0);
-    const lambdasInvokedStats = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)(contents, renderId, (_g = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.estimatedRenderLambdaInvokations) !== null && _g !== void 0 ? _g : null, (_h = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _h !== void 0 ? _h : null);
+    const lambdasInvokedStats = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)({
+        contents,
+        renderId,
+    });
     const retriesInfo = (0, get_retry_stats_1.getRetryStats)({
         contents,
         renderId,
     });
+    const frameCount = renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(renderMetadata.frameRange, renderMetadata.everyNthFrame).length
+        : null;
+    const encodingStatus = (0, get_encoding_metadata_1.getEncodingMetadata)({
+        exists: contents.find((c) => c.Key === (0, constants_1.encodingProgressKey)(renderId)),
+        frameCount: frameCount === null ? 0 : frameCount,
+    });
     const finalEncodingStatus = (0, get_final_encoding_status_1.getFinalEncodingStatus)({
-        encodingStatus,
+        encodingProgress: encodingStatus,
         outputFileExists: Boolean(outputFile),
         renderMetadata,
-        lambdaInvokeStatus: lambdasInvokedStats,
     });
     const chunkCount = outputFile
-        ? (_j = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _j !== void 0 ? _j : 0
+        ? (_g = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _g !== void 0 ? _g : 0
         : chunks.length;
     // We add a 20 second buffer for it, since AWS timeshifts can be quite a lot. Once it's 20sec over the limit, we consider it timed out
     const isBeyondTimeout = renderMetadata &&
-        Date.now() > renderMetadata.startedDate + timeoutInMiliseconds + 20000;
+        Date.now() > renderMetadata.startedDate + timeoutInMilliseconds + 20000;
     const allErrors = [
         isBeyondTimeout
-            ? {
-                attempt: 1,
-                chunk: null,
-                explanation: `The main function timed out after ${timeoutInMiliseconds}ms. Consider increasing the timeout of your function. 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`,
-                frame: null,
-                isFatal: true,
-                s3Location: '',
-                stack: new Error().stack,
-                tmpDir: null,
-                totalAttempts: 1,
-                type: 'stitcher',
-                willRetry: false,
-            }
+            ? (0, make_timeout_error_1.makeTimeoutError)({ timeoutInMilliseconds, renderMetadata, chunks })
             : null,
         ...errorExplanations,
     ].filter(remotion_1.Internals.truthy);
     return {
+        framesRendered,
         chunks: chunkCount,
         done: false,
         encodingStatus,
@@ -178,7 +192,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         renderId,
         renderMetadata,
         bucket: bucketName,
-        outputFile: (_k = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _k !== void 0 ? _k : null,
+        outputFile: (_h = outputFile === null || outputFile === void 0 ? void 0 : outputFile.url) !== null && _h !== void 0 ? _h : null,
         timeToFinish,
         errors: allErrors,
         fatalErrorEncountered: allErrors.some((f) => f.isFatal && !f.willRetry),
@@ -193,27 +207,29 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 type: 'absolute-time',
             })
             : null,
-        timeToInvokeLambdas: (_l = encodingStatus === null || encodingStatus === void 0 ? void 0 : encodingStatus.timeToInvoke) !== null && _l !== void 0 ? _l : lambdasInvokedStats.timeToInvokeLambdas,
         overallProgress: (0, get_overall_progress_1.getOverallProgress)({
             cleanup: cleanup ? cleanup.filesDeleted / cleanup.minFilesToDelete : 0,
-            encoding: finalEncodingStatus && renderMetadata
-                ? finalEncodingStatus.framesEncoded /
-                    renderMetadata.videoConfig.durationInFrames
+            encoding: finalEncodingStatus && renderMetadata && frameCount
+                ? finalEncodingStatus.framesEncoded / frameCount
                 : 0,
             invoking: renderMetadata
                 ? lambdasInvokedStats.lambdasInvoked /
                     renderMetadata.estimatedRenderLambdaInvokations
                 : 0,
             rendering: renderMetadata ? chunkCount / renderMetadata.totalChunks : 0,
+            frames: frameCount === null ? 0 : framesRendered / frameCount,
         }),
         retriesInfo,
         outKey: outputFile && renderMetadata
-            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).key
+            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials).key
             : null,
         outBucket: outputFile && renderMetadata
-            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).renderBucketName
+            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials)
+                .renderBucketName
             : null,
         mostExpensiveFrameRanges: null,
+        timeToEncode: null,
+        outputSizeInBytes: (_j = outputFile === null || outputFile === void 0 ? void 0 : outputFile.size) !== null && _j !== void 0 ? _j : null,
     };
 };
 exports.getProgress = getProgress;

package/dist/functions/helpers/get-rendered-frames-progress.d.ts

@@ -0,0 +1,8 @@
+import type { _Object } from '@aws-sdk/client-s3';
+export declare const getRenderedFramesProgress: ({ contents, renderId, framesPerLambda, everyNthFrame, frameRange, }: {
+    contents: _Object[];
+    renderId: string;
+    framesPerLambda: number;
+    frameRange: [number, number];
+    everyNthFrame: number;
+}) => number;

package/dist/functions/helpers/get-rendered-frames-progress.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRenderedFramesProgress = void 0;
+const chunk_progress_1 = require("../../shared/chunk-progress");
+const constants_1 = require("../../shared/constants");
+const parse_chunk_key_1 = require("../../shared/parse-chunk-key");
+const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
+const plan_frame_ranges_1 = require("../chunk-optimization/plan-frame-ranges");
+const getRenderedFramesProgress = ({ contents, renderId, framesPerLambda, everyNthFrame, frameRange, }) => {
+    const chunkProgress = {};
+    const { chunks } = (0, plan_frame_ranges_1.planFrameRanges)({
+        everyNthFrame,
+        frameRange,
+        framesPerLambda,
+    });
+    // Sort, so only the latest attempt is used
+    const sortedChunks = contents
+        .filter((c) => {
+        return c.Key.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId));
+    })
+        .sort((a, b) => {
+        return a.Key.localeCompare(b.Key);
+    });
+    for (const chunk of sortedChunks) {
+        const key = (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(chunk.Key);
+        chunkProgress[key.chunk] = (0, chunk_progress_1.getProgressOfChunk)(chunk.ETag);
+    }
+    for (const chunk of contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); })) {
+        const parsed = (0, parse_chunk_key_1.parseLambdaChunkKey)(chunk.Key);
+        const frameRangeInChunk = chunks[parsed.chunk];
+        chunkProgress[parsed.chunk] =
+            frameRangeInChunk[1] - frameRangeInChunk[0] + 1;
+    }
+    const framesRendered = Object.values(chunkProgress).reduce((a, b) => a + b, 0);
+    return framesRendered;
+};
+exports.getRenderedFramesProgress = getRenderedFramesProgress;

package/dist/functions/helpers/get-retry-stats.js

@@ -5,7 +5,7 @@ const constants_1 = require("../../shared/constants");
 const parse_lambda_initialized_key_1 = require("../../shared/parse-lambda-initialized-key");
 const getRetryStats = ({ contents, renderId, }) => {
     const retries = contents
-        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaInitializedPrefix)(renderId)); })
+        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
         .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt !== 1);
     return retries.map((retry) => {
         var _a;

package/dist/functions/helpers/io.d.ts

@@ -2,7 +2,9 @@ import type { _Object } from '@aws-sdk/client-s3';
 import type { ReadStream } from 'fs';
 import type { Readable } from 'stream';
 import type { AwsRegion } from '../../pricing/aws-regions';
+import type { CustomCredentials } from '../../shared/aws-clients';
 import type { Privacy } from '../../shared/constants';
+import type { DownloadBehavior } from '../../shared/content-disposition-header';
 export declare type LambdaLSInput = {
     bucketName: string;
     prefix: string;
@@ -12,13 +14,21 @@ export declare type LambdaLSInput = {
 };
 export declare type LambdaLsReturnType = Promise<_Object[]>;
 export declare const lambdaLs: ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }: LambdaLSInput) => LambdaLsReturnType;
-export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, }: {
+export declare const lambdaDeleteFile: ({ bucketName, key, region, customCredentials, }: {
+    region: AwsRegion;
+    bucketName: string;
+    key: string;
+    customCredentials: CustomCredentials | null;
+}) => Promise<void>;
+export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, customCredentials, }: {
     bucketName: string;
     key: string;
     body: ReadStream | string;
     region: AwsRegion;
     privacy: Privacy;
     expectedBucketOwner: string | null;
+    downloadBehavior: DownloadBehavior | null;
+    customCredentials: CustomCredentials | null;
 }) => Promise<void>;
 export declare const lambdaReadFile: ({ bucketName, key, region, expectedBucketOwner, }: {
     bucketName: string;
@@ -26,3 +36,11 @@ export declare const lambdaReadFile: ({ bucketName, key, region, expectedBucketO
     region: AwsRegion;
     expectedBucketOwner: string;
 }) => Promise<Readable>;
+export declare const lambdaHeadCommand: ({ bucketName, key, region, }: {
+    bucketName: string;
+    key: string;
+    region: AwsRegion;
+}) => Promise<{
+    LastModified?: Date | undefined;
+    ContentLength?: number | undefined;
+}>;

package/dist/functions/helpers/io.js

@@ -3,14 +3,15 @@ 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");
+const content_disposition_header_1 = require("../../shared/content-disposition-header");
 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,
@@ -36,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,
             }));
@@ -46,19 +47,33 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
     }
 };
 exports.lambdaLs = lambdaLs;
-const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, }) => {
-    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,
-        ACL: privacy === 'private' ? 'private' : 'public-read',
-        ExpectedBucketOwner: expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
+        ACL: privacy === 'no-acl'
+            ? undefined
+            : privacy === 'private'
+                ? 'private'
+                : 'public-read',
+        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,
@@ -66,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;