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

package/dist/functions/helpers/calculate-price-from-bucket.d.ts

@@ -1,13 +1,11 @@
 import type { _Object } from '@aws-sdk/client-s3';
 import type { RenderMetadata } from '../../shared/constants';
-import type { LambdaArchitecture } from '../../shared/validate-architecture';
 import type { OutputFileMetadata } from './find-output-file-in-bucket';
-export declare const estimatePriceFromBucket: ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, architecture, diskSizeInMb, lambdasInvoked, }: {
+export declare const estimatePriceFromBucket: ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, diskSizeInMb, lambdasInvoked, }: {
     contents: _Object[];
     renderMetadata: RenderMetadata | null;
     memorySizeInMb: number;
     outputFileMetadata: OutputFileMetadata | null;
-    architecture: LambdaArchitecture;
     diskSizeInMb: number;
     lambdasInvoked: number;
 }) => number | null;

package/dist/functions/helpers/calculate-price-from-bucket.js

@@ -7,7 +7,7 @@ const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-ke
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
 const get_current_region_1 = require("./get-current-region");
 const get_time_to_finish_1 = require("./get-time-to-finish");
-const estimatePriceFromBucket = ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, architecture, diskSizeInMb, lambdasInvoked, }) => {
+const estimatePriceFromBucket = ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, diskSizeInMb, lambdasInvoked, }) => {
     var _a, _b, _c;
     if (!renderMetadata) {
         return null;
@@ -35,7 +35,6 @@ const estimatePriceFromBucket = ({ contents, renderMetadata, memorySizeInMb, out
             type: 'combined-time-for-cost-calculation',
         }) + timeElapsedOfUnfinished,
         memorySizeInMb,
-        architecture,
         diskSizeInMb,
         lambdasInvoked,
     }).toPrecision(5));

package/dist/functions/helpers/check-if-render-exists.d.ts

@@ -0,0 +1,3 @@
+import type { _Object } from '@aws-sdk/client-s3';
+import type { AwsRegion } from '../../client';
+export declare const checkIfRenderExists: (contents: _Object[], renderId: string, bucketName: string, region: AwsRegion) => void;

package/dist/functions/helpers/check-if-render-exists.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkIfRenderExists = void 0;
+const constants_1 = require("../../shared/constants");
+const checkIfRenderExists = (contents, renderId, bucketName, region) => {
+    const initializedExists = Boolean(contents.find((c) => {
+        var _a;
+        return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.initalizedMetadataKey)(renderId));
+    }));
+    if (!initializedExists) {
+        throw new TypeError(`No render with ID "${renderId}" found in bucket ${bucketName} and region ${region}`);
+    }
+};
+exports.checkIfRenderExists = checkIfRenderExists;

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

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

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

@@ -1,18 +1,26 @@
+import type { AudioCodec } from '@remotion/renderer';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { LambdaCodec } from '../../shared/validate-lambda-codec';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, }: {
+import type { EnhancedErrorInfo } from './write-lambda-error';
+export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }: {
     bucket: string;
     expectedFiles: number;
-    onProgress: (frames: number, encodingStart: number) => void;
-    numberOfFrames: number;
+    outdir: string;
     renderId: string;
     region: AwsRegion;
-    codec: LambdaCodec;
     expectedBucketOwner: string;
+    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
+}) => Promise<string[]>;
+export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, }: {
+    onProgress: (frames: number) => void;
+    numberOfFrames: number;
+    codec: LambdaCodec;
     fps: number;
     numberOfGifLoops: number | null;
+    files: string[];
+    outdir: string;
+    audioCodec: AudioCodec | null;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;
-    encodingStart: number;
 }>;

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

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

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

@@ -6,9 +6,7 @@ const constants_1 = require("../../shared/constants");
 const get_most_expensive_chunks_1 = require("../../shared/get-most-expensive-chunks");
 const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-key");
 const calculate_chunk_times_1 = require("./calculate-chunk-times");
-const get_current_architecture_1 = require("./get-current-architecture");
 const get_files_to_delete_1 = require("./get-files-to-delete");
-const get_lambdas_invoked_stats_1 = require("./get-lambdas-invoked-stats");
 const get_retry_stats_1 = require("./get-retry-stats");
 const get_time_to_finish_1 = require("./get-time-to-finish");
 const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }) => {
@@ -21,7 +19,6 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
         durationInMiliseconds: times,
         memorySizeInMb,
         region,
-        architecture: (0, get_current_architecture_1.getCurrentArchitecture)(),
         lambdasInvoked: renderMetadata.estimatedTotalLambdaInvokations,
         // We cannot determine the ephemeral storage size, so we
         // overestimate the price, but will only have a miniscule effect (~0.2%)
@@ -41,17 +38,7 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
     const renderSize = contents
         .map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
         .reduce((a, b) => a + b, 0);
-    const { timeToInvokeLambdas } = (0, get_lambdas_invoked_stats_1.getLambdasInvokedStats)({
-        contents,
-        renderId,
-        estimatedRenderLambdaInvokations: renderMetadata.estimatedRenderLambdaInvokations,
-        startDate: renderMetadata.startedDate,
-        checkIfAllLambdasWereInvoked: false,
-    });
     const retriesInfo = (0, get_retry_stats_1.getRetryStats)({ contents, renderId });
-    if (timeToInvokeLambdas === null) {
-        throw new Error('should have timing for all lambdas');
-    }
     return {
         cost: {
             currency: 'USD',
@@ -81,9 +68,8 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
             renderId,
             type: 'absolute-time',
         }),
-        timeToInvokeLambdas,
         retriesInfo,
-        mostExpensiveFrameRanges: (0, get_most_expensive_chunks_1.getMostExpensiveChunks)(parsedTimings, renderMetadata.framesPerLambda),
+        mostExpensiveFrameRanges: (0, get_most_expensive_chunks_1.getMostExpensiveChunks)(parsedTimings, renderMetadata.framesPerLambda, renderMetadata.frameRange[1]),
     };
 };
 exports.createPostRenderData = createPostRenderData;

package/dist/functions/helpers/expected-out-name.d.ts

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

package/dist/functions/helpers/expected-out-name.js

@@ -1,24 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpectedOutName = void 0;
+exports.getExpectedOutName = exports.getCredentialsFromOutName = void 0;
 const renderer_1 = require("@remotion/renderer");
 const defaults_1 = require("../../defaults");
 const validate_outname_1 = require("../../shared/validate-outname");
-const getExpectedOutName = (renderMetadata, bucketName) => {
-    if (renderMetadata.outName) {
-        (0, validate_outname_1.validateOutname)(renderMetadata.outName);
-        return (0, defaults_1.customOutName)(renderMetadata.renderId, bucketName, renderMetadata.outName);
+const get_custom_out_name_1 = require("./get-custom-out-name");
+const getCredentialsFromOutName = (name) => {
+    var _a;
+    if (typeof name === 'string') {
+        return null;
+    }
+    if (name === null) {
+        return null;
+    }
+    if (typeof name === 'undefined') {
+        return null;
+    }
+    return (_a = name.s3OutputProvider) !== null && _a !== void 0 ? _a : null;
+};
+exports.getCredentialsFromOutName = getCredentialsFromOutName;
+const getExpectedOutName = (renderMetadata, bucketName, customCredentials) => {
+    const outNameValue = (0, get_custom_out_name_1.getCustomOutName)({
+        customCredentials,
+        renderMetadata,
+    });
+    if (outNameValue) {
+        (0, validate_outname_1.validateOutname)(outNameValue, renderMetadata.codec, renderMetadata.audioCodec);
+        return (0, defaults_1.customOutName)(renderMetadata.renderId, bucketName, outNameValue);
     }
     if (renderMetadata.type === 'still') {
         return {
             renderBucketName: bucketName,
             key: (0, defaults_1.outStillName)(renderMetadata.renderId, renderMetadata.imageFormat),
+            customCredentials: null,
         };
     }
     if (renderMetadata.type === 'video') {
         return {
             renderBucketName: bucketName,
-            key: (0, defaults_1.outName)(renderMetadata.renderId, renderer_1.RenderInternals.getFileExtensionFromCodec(renderMetadata.codec, 'final')),
+            key: (0, defaults_1.outName)(renderMetadata.renderId, renderer_1.RenderInternals.getFileExtensionFromCodec(renderMetadata.codec, renderMetadata.audioCodec)),
+            customCredentials: null,
         };
     }
     throw new TypeError('no type passed');

package/dist/functions/helpers/find-output-file-in-bucket.d.ts

@@ -1,12 +1,14 @@
 import type { AwsRegion } from '../..';
+import type { CustomCredentials } from '../../shared/aws-clients';
 import type { RenderMetadata } from '../../shared/constants';
 export declare type OutputFileMetadata = {
     url: string;
     size: number;
     lastModified: number;
 };
-export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, }: {
+export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, customCredentials, }: {
     region: AwsRegion;
     renderMetadata: RenderMetadata;
     bucketName: string;
+    customCredentials: CustomCredentials | null;
 }) => Promise<OutputFileMetadata | null>;

package/dist/functions/helpers/find-output-file-in-bucket.js

@@ -1,31 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findOutputFileInBucket = void 0;
-const client_s3_1 = require("@aws-sdk/client-s3");
-const aws_clients_1 = require("../../shared/aws-clients");
+const suggested_policy_1 = require("../../api/iam-validation/suggested-policy");
 const expected_out_name_1 = require("./expected-out-name");
 const get_output_url_from_metadata_1 = require("./get-output-url-from-metadata");
-const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, }) => {
+const io_1 = require("./io");
+const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, customCredentials, }) => {
     var _a;
     if (!renderMetadata) {
         throw new Error('unexpectedly did not get renderMetadata');
     }
-    const expectedOutData = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
+    const { renderBucketName, key } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, null);
     try {
-        const head = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.HeadObjectCommand({
-            Bucket: expectedOutData.renderBucketName,
-            Key: expectedOutData.key,
-        }));
+        const head = await (0, io_1.lambdaHeadCommand)({
+            bucketName,
+            key,
+            region,
+        });
         return {
             lastModified: (_a = head.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(),
             size: head.ContentLength,
-            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName),
+            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials),
         };
     }
     catch (err) {
         if (err.name === 'NotFound') {
             return null;
         }
+        if (err.message === 'UnknownError' ||
+            err.$metadata
+                .httpStatusCode === 403) {
+            throw new Error(`Unable to access item "${key}" from bucket "${renderBucketName}" ${(customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint)
+                ? `(S3 Endpoint = ${customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint})`
+                : ''}. The "${suggested_policy_1.ROLE_NAME}" role must have permission for both "s3:GetObject" and "s3:ListBucket" actions.`);
+        }
         throw err;
     }
 };

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

@@ -32,7 +32,7 @@ const getBrowserInstance = async (shouldDumpIo, chromiumOptions) => {
         return _browserInstance;
     }
     launching = true;
-    const execPath = await (0, get_chromium_executable_path_1.executablePath)();
+    const execPath = (0, get_chromium_executable_path_1.executablePath)();
     const actualChromiumOptions = {
         ...chromiumOptions,
         // Override the `null` value, which might come from CLI with swANGLE
@@ -45,7 +45,7 @@ const getBrowserInstance = async (shouldDumpIo, chromiumOptions) => {
     });
     _browserInstance.on('disconnected', () => {
         console.log('Browser disconnected / crashed');
-        _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.close().catch(() => undefined);
+        _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.close(true).catch(() => undefined);
         _browserInstance = null;
     });
     launching = false;

package/dist/functions/helpers/get-chromium-executable-path.d.ts

@@ -1 +1 @@
-export declare const executablePath: () => Promise<string | undefined>;
+export declare const executablePath: () => string;

package/dist/functions/helpers/get-chromium-executable-path.js

@@ -2,13 +2,19 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executablePath = void 0;
-if (/^AWS_Lambda_nodejs(?:10|12|14)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV) !== null && _a !== void 0 ? _a : '') === true) {
+if (/^AWS_Lambda_nodejs(?:18)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV) !== null && _a !== void 0 ? _a : '') ===
+    true) {
     if (process.env.FONTCONFIG_PATH === undefined) {
         process.env.FONTCONFIG_PATH = '/opt';
+        process.env.FONTCONFIG_FILE = '/opt/fonts.conf';
     }
     process.env.LD_LIBRARY_PATH = '/opt/lib:/opt/bin';
+    process.env.FFMPEG_BIN_PATH = '/opt/ffmpeg/remotion/bin/ffmpeg';
+    process.env.FFPROBE_BIN_PATH = '/opt/ffmpeg/remotion/bin/ffprobe';
+    process.env.FFMPEG_CWD = '/opt/ffmpeg';
+    process.env.COMPOSITOR_PATH = './compositor';
 }
-const executablePath = async () => {
+const executablePath = () => {
     return '/opt/bin/chromium';
 };
 exports.executablePath = executablePath;

package/dist/functions/helpers/get-current-region.d.ts

@@ -1 +1 @@
-export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "us-east-1" | "us-east-2" | "us-west-2" | "ap-south-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1";
+export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "ap-south-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "sa-east-1" | "eu-south-1" | "af-south-1" | "ap-east-1" | "me-south-1";

package/dist/functions/helpers/get-custom-out-name.d.ts

@@ -0,0 +1,6 @@
+import type { OutNameInput, RenderMetadata } from '../../defaults';
+import type { CustomCredentials } from '../../shared/aws-clients';
+export declare const getCustomOutName: ({ renderMetadata, customCredentials, }: {
+    renderMetadata: RenderMetadata;
+    customCredentials: CustomCredentials | null;
+}) => OutNameInput | null;

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomOutName = void 0;
+const getCustomOutName = ({ renderMetadata, customCredentials, }) => {
+    var _a, _b;
+    if (!renderMetadata.outName) {
+        return null;
+    }
+    if (typeof renderMetadata.outName === 'string') {
+        return renderMetadata.outName;
+    }
+    if (renderMetadata.outName.s3OutputProvider) {
+        if (!customCredentials && renderMetadata.privacy === 'private') {
+            throw new TypeError(`The file was rendered with a custom S3 implementation and is not public, but no custom credentials were passed to downloadMedia().`);
+        }
+        return {
+            bucketName: renderMetadata.outName.bucketName,
+            key: renderMetadata.outName.key,
+            s3OutputProvider: {
+                endpoint: renderMetadata.outName.s3OutputProvider.endpoint,
+                accessKeyId: (_a = customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.accessKeyId) !== null && _a !== void 0 ? _a : null,
+                secretAccessKey: (_b = customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.secretAccessKey) !== null && _b !== void 0 ? _b : null,
+            },
+        };
+    }
+    return {
+        bucketName: renderMetadata.outName.bucketName,
+        key: renderMetadata.outName.key,
+    };
+};
+exports.getCustomOutName = getCustomOutName;

package/dist/functions/helpers/get-encoding-metadata.d.ts

@@ -1,9 +1,6 @@
+import type { _Object } from '@aws-sdk/client-s3';
 import type { EncodingProgress } from '../../defaults';
-import type { AwsRegion } from '../../pricing/aws-regions';
-export declare const getEncodingMetadata: ({ exists, bucketName, renderId, region, expectedBucketOwner, }: {
-    exists: boolean;
-    bucketName: string;
-    renderId: string;
-    region: AwsRegion;
-    expectedBucketOwner: string;
-}) => Promise<EncodingProgress | null>;
+export declare const getEncodingMetadata: ({ exists, frameCount, }: {
+    exists: _Object | undefined;
+    frameCount: number;
+}) => EncodingProgress | null;

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;