@remotion/lambda 3.3.7 → 3.3.8

package/dist/admin/generate-etag-list.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/admin/generate-etag-list.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const crypto_1 = __importDefault(require("crypto"));
+const fs_1 = require("fs");
+const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
+const chunks = [];
+for (let i = 0; i < 2000; i++) {
+    const etag = `"${md5(String(i))}"`;
+    chunks.push(etag);
+}
+(0, fs_1.writeFileSync)('etags.json', JSON.stringify(chunks));

package/dist/api/get-aws-client.d.ts

@@ -3,6 +3,7 @@ import * as IamSdk from '@aws-sdk/client-iam';
 import * as LambdaSDK from '@aws-sdk/client-lambda';
 import * as S3SDK from '@aws-sdk/client-s3';
 import * as ServiceQuotasSDK from '@aws-sdk/client-service-quotas';
+import * as StsSdk from '@aws-sdk/client-sts';
 import type { AwsRegion } from '../client';
 import type { CustomCredentials, ServiceMapping } from '../shared/aws-clients';
 export declare type GetAwsClientInput<T extends keyof ServiceMapping> = {
@@ -16,6 +17,7 @@ declare type SdkMapping = {
     iam: typeof IamSdk;
     lambda: typeof LambdaSDK;
     servicequotas: typeof ServiceQuotasSDK;
+    sts: typeof StsSdk;
 };
 export declare type GetAwsClientOutput<T extends keyof ServiceMapping> = {
     client: ServiceMapping[T];

package/dist/api/get-aws-client.js

@@ -29,6 +29,7 @@ const IamSdk = __importStar(require("@aws-sdk/client-iam"));
 const LambdaSDK = __importStar(require("@aws-sdk/client-lambda"));
 const S3SDK = __importStar(require("@aws-sdk/client-s3"));
 const ServiceQuotasSDK = __importStar(require("@aws-sdk/client-service-quotas"));
+const StsSdk = __importStar(require("@aws-sdk/client-sts"));
 const aws_clients_1 = require("../shared/aws-clients");
 /**
  * @description Gets the full AWS SDK and an instantiated client for an AWS service
@@ -51,6 +52,7 @@ const getAwsClient = ({ region, service, customCredentials, }) => {
             iam: IamSdk,
             s3: S3SDK,
             servicequotas: ServiceQuotasSDK,
+            sts: StsSdk,
         }[service],
     };
 };

package/dist/api/iam-validation/simulate-rule.js

@@ -2,32 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulateRule = void 0;
 const client_iam_1 = require("@aws-sdk/client-iam");
-const aws_policies_1 = require("aws-policies");
 const aws_clients_1 = require("../../shared/aws-clients");
 const simulateRule = async (options) => {
     var _a;
     try {
-        if (options.actionNames.includes(aws_policies_1.iam.GetUser)) {
-            try {
-                await (0, aws_clients_1.getIamClient)(options.region).send(new client_iam_1.GetUserCommand({}));
-                const result = [
-                    {
-                        decision: 'allowed',
-                        name: aws_policies_1.iam.GetUser,
-                    },
-                ];
-                return result;
-            }
-            catch (err) {
-                const result = [
-                    {
-                        decision: 'explicitDeny',
-                        name: aws_policies_1.iam.GetUser,
-                    },
-                ];
-                return result;
-            }
-        }
         const res = await (0, aws_clients_1.getIamClient)(options.region).send(new client_iam_1.SimulatePrincipalPolicyCommand({
             ActionNames: options.actionNames,
             PolicySourceArn: options.arn,

package/dist/api/iam-validation/simulate.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulatePermissions = exports.logPermissionOutput = void 0;
-const client_iam_1 = require("@aws-sdk/client-iam");
+const client_sts_1 = require("@aws-sdk/client-sts");
 const aws_clients_1 = require("../../shared/aws-clients");
 const simulate_rule_1 = require("./simulate-rule");
 const user_permissions_1 = require("./user-permissions");
@@ -26,15 +26,27 @@ exports.logPermissionOutput = logPermissionOutput;
  */
 const simulatePermissions = async (options) => {
     var _a;
-    const user = await (0, aws_clients_1.getIamClient)(options.region).send(new client_iam_1.GetUserCommand({}));
-    if (!user || !user.User) {
-        throw new Error('No valid AWS user detected');
+    const callerIdentity = await (0, aws_clients_1.getStsClient)(options.region).send(new client_sts_1.GetCallerIdentityCommand({}));
+    if (!callerIdentity || !callerIdentity.Arn) {
+        throw new Error('No valid AWS Caller Identity detected');
+    }
+    const callerIdentityArnComponents = callerIdentity.Arn.match(/arn:aws:([^:]+)::(\d+):([^/]+)(.*)/);
+    if (!callerIdentityArnComponents) {
+        throw new Error('Unknown AWS Caller Identity ARN detected');
+    }
+    const callerIdentityArnType = callerIdentityArnComponents[1];
+    let callerArn;
+    if (callerIdentityArnType === 'iam' && callerIdentityArnComponents[3] === 'user') {
+        callerArn = callerIdentity.Arn;
+    }
+    else {
+        throw new Error('Unsupported AWS Caller Identity ARN detected');
     }
     const results = [];
     for (const per of user_permissions_1.requiredPermissions) {
         const result = await (0, simulate_rule_1.simulateRule)({
             actionNames: per.actions,
-            arn: user.User.Arn,
+            arn: callerArn,
             region: options.region,
             resource: per.resource,
             retries: 2,

package/dist/api/iam-validation/user-permissions.js

@@ -15,12 +15,6 @@ exports.requiredPermissions = [
         ],
         resource: ['*'],
     },
-    {
-        id: 'Identity',
-        actions: [aws_policies_1.iam.GetUser],
-        // eslint-disable-next-line no-template-curly-in-string
-        resource: ['arn:aws:iam::*:user/${aws:username}'],
-    },
     {
         id: 'PermissionValidation',
         actions: [aws_policies_1.iam.SimulatePrincipalPolicy],

package/dist/cli/commands/render/progress.d.ts

@@ -3,12 +3,13 @@ import type { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
 declare type LambdaInvokeProgress = {
     totalLambdas: number | null;
     lambdasInvoked: number;
-    doneIn: number | null;
 };
 declare type ChunkProgress = {
+    doneIn: number | null;
+    framesRendered: number;
+    totalFrames: number | null;
     totalChunks: number | null;
     chunksInvoked: number;
-    doneIn: number | null;
 };
 declare type MultiRenderProgress = {
     lambdaInvokeProgress: LambdaInvokeProgress;
@@ -22,11 +23,13 @@ declare type DownloadedInfo = {
     downloaded: number;
     doneIn: number | null;
 };
-export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, }: {
+export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }: {
     progress: MultiRenderProgress;
     steps: number;
     downloadInfo: DownloadedInfo | null;
     retriesInfo: ChunkRetry[];
     verbose: boolean;
+    timeToEncode: number | null;
+    totalFrames: number | null;
 }) => string;
 export {};

package/dist/cli/commands/render/progress.js

@@ -2,45 +2,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
 const cli_1 = require("@remotion/cli");
+const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
+const truthy_1 = require("../../../shared/truthy");
 const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
-    const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
-    const progress = doneIn
-        ? 1
-        : totalLambdas === null
-            ? 0
-            : lambdasInvoked / totalLambdas;
+    const { lambdasInvoked, totalLambdas } = invokeProgress;
+    const progress = totalLambdas === null ? 0 : lambdasInvoked / totalLambdas;
     return [
         '⚡️',
         `(1/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Invoking' : 'Invoked'} lambdas`,
-        doneIn === null
-            ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        `${progress === 0 ? 'Invoked' : 'Invoking'} lambdas`,
+        progress === 1
+            ? cli_1.CliInternals.chalk.gray('100%')
+            : `${Math.round(progress * 100)}%`,
         retriesInfo.length > 0 ? `(+${retriesInfo.length} retries)` : [],
     ].join(' ');
 };
-const makeChunkProgress = ({ chunkProgress, invokeProgress, totalSteps, }) => {
-    const lambdaIsDone = invokeProgress.doneIn !== null;
+const makeRenderProgress = ({ chunkProgress, totalSteps, }) => {
     const { chunksInvoked, totalChunks, doneIn } = chunkProgress;
-    const progress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
-    const shouldShow = lambdaIsDone || progress > 0;
-    if (!shouldShow) {
-        return '';
-    }
-    return [
+    const renderProgress = chunkProgress.totalFrames === null
+        ? 0
+        : chunkProgress.framesRendered / chunkProgress.totalFrames;
+    const encodingProgress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
+    const frames = chunkProgress.totalFrames === null
+        ? null
+        : `(${chunkProgress.framesRendered}/${chunkProgress.totalFrames})`;
+    const first = [
         '🧩',
         `(2/${totalSteps})`,
-        cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Rendering' : 'Rendered'} chunks`,
+        cli_1.CliInternals.makeProgressBar(renderProgress),
+        doneIn === null ? 'Rendering frames' : 'Rendered frames',
+        doneIn === null ? frames : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+    const second = [
+        '🏗️ ',
+        `(3/${totalSteps})`,
+        cli_1.CliInternals.makeProgressBar(encodingProgress),
+        `${doneIn === null ? 'Encoding' : 'Encoded'} chunks`,
         doneIn === null
-            ? `${Math.round(progress * 100)}%`
+            ? `${Math.round(encodingProgress * 100)}%`
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
+    return [first, second];
 };
-const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, }) => {
-    const { framesEncoded, totalFrames, doneIn } = encodingProgress;
+const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, totalFrames, timeToEncode, }) => {
+    const { framesEncoded } = encodingProgress;
     const progress = totalFrames === null ? 0 : framesEncoded / totalFrames;
     const chunksDone = chunkProgress.doneIn !== null;
     const shouldShow = progress > 0 || chunksDone;
@@ -49,12 +58,12 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
     }
     return [
         '📽 ',
-        `(3/${totalSteps})`,
+        `(4/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Combining' : 'Combined'} videos`,
-        doneIn === null
+        `${timeToEncode === null ? 'Combining' : 'Combined'} videos`,
+        timeToEncode === null
             ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+            : cli_1.CliInternals.chalk.gray(`${timeToEncode}ms`),
     ].join(' ');
 };
 const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
@@ -64,7 +73,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     if (skipped) {
         return [
             '🪣 ',
-            `(4/${totalSteps})`,
+            `(5/${totalSteps})`,
             cli_1.CliInternals.chalk.blueBright(`Not cleaning up because --log=verbose was set`),
         ].join(' ');
     }
@@ -72,7 +81,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     const progress = filesDeleted / minFilesToDelete;
     return [
         '🪣 ',
-        `(4/${totalSteps})`,
+        `(5/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Cleaning up' : 'Cleaned up'} artifacts`,
         doneIn === null
@@ -83,7 +92,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
 const makeDownloadProgress = (downloadInfo, totalSteps) => {
     return [
         '💾',
-        `(5/${totalSteps})`,
+        `(6/${totalSteps})`,
         downloadInfo.totalSize === null
             ? cli_1.CliInternals.getFileSizeDownloadBar(downloadInfo.downloaded)
             : cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
@@ -101,40 +110,41 @@ const makeDownloadProgress = (downloadInfo, totalSteps) => {
     ].join(' ');
 };
 const makeMultiProgressFromStatus = (status) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f;
     return {
         chunkProgress: {
             chunksInvoked: status.chunks,
             totalChunks: (_b = (_a = status.renderMetadata) === null || _a === void 0 ? void 0 : _a.totalChunks) !== null && _b !== void 0 ? _b : null,
             doneIn: status.timeToFinishChunks,
+            framesRendered: status.framesRendered,
+            totalFrames: status.renderMetadata
+                ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+                : null,
         },
         encodingProgress: {
             framesEncoded: (_d = (_c = status.encodingStatus) === null || _c === void 0 ? void 0 : _c.framesEncoded) !== null && _d !== void 0 ? _d : 0,
-            totalFrames: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.videoConfig.durationInFrames) !== null && _f !== void 0 ? _f : 1,
-            doneIn: (_h = (_g = status.encodingStatus) === null || _g === void 0 ? void 0 : _g.doneIn) !== null && _h !== void 0 ? _h : null,
-            timeToInvoke: (_k = (_j = status.encodingStatus) === null || _j === void 0 ? void 0 : _j.timeToInvoke) !== null && _k !== void 0 ? _k : null,
         },
         lambdaInvokeProgress: {
-            doneIn: status.timeToInvokeLambdas,
             lambdasInvoked: status.lambdasInvoked,
-            totalLambdas: (_m = (_l = status.renderMetadata) === null || _l === void 0 ? void 0 : _l.estimatedRenderLambdaInvokations) !== null && _m !== void 0 ? _m : null,
+            totalLambdas: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.estimatedRenderLambdaInvokations) !== null && _f !== void 0 ? _f : null,
         },
         cleanupInfo: status.cleanup,
     };
 };
 exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, }) => {
+const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }) => {
     return [
         makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
-        makeChunkProgress({
+        ...makeRenderProgress({
             chunkProgress: progress.chunkProgress,
-            invokeProgress: progress.lambdaInvokeProgress,
             totalSteps: steps,
         }),
         makeEncodingProgress({
             encodingProgress: progress.encodingProgress,
             chunkProgress: progress.chunkProgress,
             totalSteps: steps,
+            timeToEncode,
+            totalFrames,
         }),
         makeCleanupProgress(progress.cleanupInfo, steps, verbose),
         downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,

package/dist/cli/commands/render/render.js

@@ -97,7 +97,7 @@ const renderCommand = async (args, remotionRoot) => {
             }
             : undefined,
     });
-    const totalSteps = downloadName ? 5 : 4;
+    const totalSteps = downloadName ? 6 : 5;
     const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
     log_1.Log.info(cli_1.CliInternals.chalk.gray(`bucket = ${res.bucketName}, function = ${functionName}`));
     log_1.Log.info(cli_1.CliInternals.chalk.gray(`renderId = ${res.renderId}, codec = ${codec} (${reason})`));
@@ -117,6 +117,8 @@ const renderCommand = async (args, remotionRoot) => {
         downloadInfo: null,
         retriesInfo: status.retriesInfo,
         verbose,
+        totalFrames: getTotalFrames(status),
+        timeToEncode: status.timeToEncode,
     }));
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -134,6 +136,8 @@ const renderCommand = async (args, remotionRoot) => {
             retriesInfo: newStatus.retriesInfo,
             downloadInfo: null,
             verbose,
+            timeToEncode: newStatus.timeToEncode,
+            totalFrames: getTotalFrames(newStatus),
         }));
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
@@ -142,6 +146,8 @@ const renderCommand = async (args, remotionRoot) => {
                 downloadInfo: null,
                 retriesInfo: newStatus.retriesInfo,
                 verbose,
+                timeToEncode: newStatus.timeToEncode,
+                totalFrames: getTotalFrames(newStatus),
             }));
             if (downloadName) {
                 const downloadStart = Date.now();
@@ -161,6 +167,8 @@ const renderCommand = async (args, remotionRoot) => {
                                 totalSize,
                             },
                             verbose,
+                            timeToEncode: newStatus.timeToEncode,
+                            totalFrames: getTotalFrames(newStatus),
                         }));
                     },
                 });
@@ -174,6 +182,8 @@ const renderCommand = async (args, remotionRoot) => {
                         totalSize: sizeInBytes,
                     },
                     verbose,
+                    timeToEncode: newStatus.timeToEncode,
+                    totalFrames: getTotalFrames(newStatus),
                 }));
                 log_1.Log.info();
                 log_1.Log.info();
@@ -226,3 +236,8 @@ const renderCommand = async (args, remotionRoot) => {
     }
 };
 exports.renderCommand = renderCommand;
+function getTotalFrames(status) {
+    return status.renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+        : null;
+}

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

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

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

@@ -23,7 +23,7 @@ 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"));
@@ -127,34 +127,18 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
         loop().catch((err) => reject(err));
     });
 };
-const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }) => {
+exports.getAllFilesS3 = getAllFilesS3;
+const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, files, outdir, }) => {
     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,
-        onErrors,
-    });
     const outfile = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'));
     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)({
         files,
         filelistDir,
         output: outfile,
-        onProgress: (p) => onProgress(p, encodingStart),
+        onProgress: (p) => onProgress(p),
         numberOfFrames,
         codec: codecForCombining,
         fps,
@@ -166,6 +150,6 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
     const cleanupChunksProm = ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outdir, {
         recursive: true,
     });
-    return { outfile, cleanupChunksProm, encodingStart };
+    return { outfile, cleanupChunksProm };
 };
 exports.concatVideosS3 = concatVideosS3;

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

@@ -8,7 +8,6 @@ const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-ke
 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, }) => {
@@ -41,17 +40,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,7 +70,6 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
             renderId,
             type: 'absolute-time',
         }),
-        timeToInvokeLambdas,
         retriesInfo,
         mostExpensiveFrameRanges: (0, get_most_expensive_chunks_1.getMostExpensiveChunks)(parsedTimings, renderMetadata.framesPerLambda),
     };

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

@@ -0,0 +1 @@
+"use strict";

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

@@ -1,9 +1,5 @@
+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, }: {
+    exists: _Object | undefined;
+}) => EncodingProgress | null;

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

@@ -1,26 +1,12 @@
 "use strict";
 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, }) => {
     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);
+    return { framesEncoded };
 };
 exports.getEncodingMetadata = getEncodingMetadata;

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,12 +1,8 @@
 import type { _Object } from '@aws-sdk/client-s3';
 export declare type LambdaInvokeStats = {
-    timeToInvokeLambdas: number | null;
     lambdasInvoked: number;
 };
-export declare const getLambdasInvokedStats: ({ contents, renderId, estimatedRenderLambdaInvokations, startDate, checkIfAllLambdasWereInvoked, }: {
+export declare const getLambdasInvokedStats: ({ contents, renderId, }: {
     contents: _Object[];
     renderId: string;
-    estimatedRenderLambdaInvokations: number | null;
-    startDate: number | null;
-    checkIfAllLambdasWereInvoked: boolean;
 }) => 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, checkIfAllLambdasWereInvoked, }) => {
-    var _a;
+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.lambdaChunkInitializedPrefix)(renderId)); })
         .filter((c) => (0, parse_lambda_initialized_key_1.parseLambdaInitializedKey)(c.Key).attempt === 1);
-    const allLambdasInvoked = !checkIfAllLambdasWereInvoked ||
-        lambdasInvoked.length === estimatedRenderLambdaInvokations;
-    const timeToInvokeLambdas = !allLambdasInvoked || startDate === null
-        ? null
-        : ((_a = (0, min_max_1.max)(lambdasInvoked.map((l) => { var _a; return (_a = l.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(); }))) !== null && _a !== void 0 ? _a : 0) - startDate;
     return {
-        timeToInvokeLambdas,
         lambdasInvoked: lambdasInvoked.length,
     };
 };