@remotion/lambda 4.0.164 → 4.0.165

package/dist/functions/helpers/calculate-chunk-times.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateChunkTimes = void 0;
-const constants_1 = require("../../shared/constants");
-const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-key");
 const min_max_1 = require("./min-max");
 const getAbsoluteTime = (parsedTimings) => {
     if (parsedTimings.length === 0) {
@@ -12,16 +10,14 @@ const getAbsoluteTime = (parsedTimings) => {
     const allStarts = parsedTimings.map((p) => p.start);
     const biggestEnd = (0, min_max_1.max)(allEnds);
     const smallestStart = (0, min_max_1.min)(allStarts);
-    return biggestEnd - smallestStart;
+    return Math.max(0, biggestEnd - smallestStart);
 };
-const calculateChunkTimes = ({ contents, renderId, type, }) => {
-    const parsedTimings = contents
-        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderId)); })
-        .map((f) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(f.Key));
+const calculateChunkTimes = ({ type, timings, }) => {
+    const parsedTimings = timings;
     const absoluteTime = getAbsoluteTime(parsedTimings);
     if (type === 'combined-time-for-cost-calculation') {
         const totalEncodingTimings = parsedTimings
-            .map((p) => p.rendered - p.start)
+            .map((p) => Math.max(0, p.rendered - p.start))
             .reduce((a, b) => a + b, 0);
         return totalEncodingTimings + absoluteTime;
     }

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 { OutputFileMetadata } from './find-output-file-in-bucket';
-export declare const estimatePriceFromBucket: ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, diskSizeInMb, lambdasInvoked, }: {
-    contents: _Object[];
+import type { ParsedTiming } from '../../shared/parse-lambda-timings-key';
+export declare const estimatePriceFromBucket: ({ renderMetadata, memorySizeInMb, diskSizeInMb, lambdasInvoked, timings, }: {
     renderMetadata: RenderMetadata | null;
     memorySizeInMb: number;
-    outputFileMetadata: OutputFileMetadata | null;
     diskSizeInMb: number;
     lambdasInvoked: number;
+    timings: ParsedTiming[];
 }) => {
     accruedSoFar: number;
     estimatedBillingDurationInMilliseconds: number;

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

@@ -2,35 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimatePriceFromBucket = void 0;
 const estimate_price_1 = require("../../api/estimate-price");
-const constants_1 = require("../../shared/constants");
-const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-key");
 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, diskSizeInMb, lambdasInvoked, }) => {
-    var _a, _b, _c;
+const estimatePriceFromBucket = ({ renderMetadata, memorySizeInMb, diskSizeInMb, lambdasInvoked, timings, }) => {
+    var _a, _b;
     if (!renderMetadata) {
         return null;
     }
-    const parsedTimings = contents
-        .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderMetadata.renderId)); })
-        .map((f) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(f.Key));
-    const timeToFinish = (0, get_time_to_finish_1.getTimeToFinish)({
-        lastModified: (_a = outputFileMetadata === null || outputFileMetadata === void 0 ? void 0 : outputFileMetadata.lastModified) !== null && _a !== void 0 ? _a : null,
-        renderMetadata,
-    });
-    const elapsedTime = timeToFinish === null
-        ? Math.max(0, Date.now() - ((_b = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _b !== void 0 ? _b : 0))
-        : timeToFinish;
-    const unfinished = Math.max(0, ((_c = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _c !== void 0 ? _c : 0) - parsedTimings.length);
+    const elapsedTime = Math.max(0, Date.now() - ((_a = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _a !== void 0 ? _a : 0));
+    const unfinished = Math.max(0, ((_b = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _b !== void 0 ? _b : 0) - timings.length);
     const timeElapsedOfUnfinished = new Array(unfinished)
         .fill(true)
         .map(() => elapsedTime)
         .reduce((a, b) => a + b, 0);
     const estimatedBillingDurationInMilliseconds = (0, calculate_chunk_times_1.calculateChunkTimes)({
-        contents,
-        renderId: renderMetadata.renderId,
         type: 'combined-time-for-cost-calculation',
+        timings,
     }) + timeElapsedOfUnfinished;
     const accruedSoFar = Number((0, estimate_price_1.estimatePrice)({
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),

package/dist/functions/helpers/clean-tmpdir.d.ts

@@ -1,3 +1 @@
-export declare let deletedFiles: string[];
-export declare let deletedFilesSize: number;
 export declare const deleteTmpDir: () => void;

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

@@ -3,11 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteTmpDir = exports.deletedFilesSize = exports.deletedFiles = void 0;
+exports.deleteTmpDir = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = require("node:path");
-exports.deletedFiles = [];
-exports.deletedFilesSize = 0;
 const deleteAllFilesInAFolderRecursively = (path) => {
     const files = node_fs_1.default.readdirSync(path);
     files.forEach((file) => {
@@ -19,22 +17,18 @@ const deleteAllFilesInAFolderRecursively = (path) => {
             }
             else {
                 node_fs_1.default.unlinkSync(filePath);
-                exports.deletedFilesSize += stat.size;
             }
         }
         catch (err) {
             // Can fail if file was already deleted by cleanup. In that case
             // let's ignore it
         }
-        exports.deletedFiles.push(filePath);
     });
     if (path !== '/tmp') {
         node_fs_1.default.rmSync(path, { recursive: true, force: true });
     }
 };
 const deleteTmpDir = () => {
-    exports.deletedFiles = [];
-    exports.deletedFilesSize = 0;
     if (!process.env.VITEST) {
         deleteAllFilesInAFolderRecursively('/tmp');
     }

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

@@ -1,18 +1,6 @@
 import type { AudioCodec, CancelSignal, LogLevel } 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 getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, logLevel, }: {
-    bucket: string;
-    expectedFiles: number;
-    outdir: string;
-    renderId: string;
-    region: AwsRegion;
-    expectedBucketOwner: string;
-    onErrors: (errors: EnhancedErrorInfo[]) => void;
-    logLevel: LogLevel;
-}) => Promise<string[]>;
-export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, muted, }: {
+export declare const concatVideos: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, muted, }: {
     onProgress: (frames: number) => void;
     numberOfFrames: number;
     codec: LambdaCodec;

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

@@ -1,140 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.concatVideosS3 = exports.getAllFilesS3 = void 0;
+exports.concatVideos = void 0;
 const renderer_1 = require("@remotion/renderer");
-const node_fs_1 = __importStar(require("node:fs"));
-const node_path_1 = __importStar(require("node:path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = require("node:path");
 const constants_1 = require("../../shared/constants");
 const can_concat_seamlessly_1 = require("./can-concat-seamlessly");
-const inspect_errors_1 = require("./inspect-errors");
-const io_1 = require("./io");
 const timer_1 = require("./timer");
-const getChunkDownloadOutputLocation = ({ outdir, file, }) => {
-    return node_path_1.default.join(outdir, node_path_1.default.basename(file));
-};
-const downloadS3File = async ({ bucket, key, outdir, region, expectedBucketOwner, }) => {
-    const Body = await (0, io_1.lambdaReadFile)({
-        bucketName: bucket,
-        key,
-        region,
-        expectedBucketOwner,
-    });
-    const outpath = getChunkDownloadOutputLocation({ outdir, file: key });
-    if (Buffer.isBuffer(Body)) {
-        return node_fs_1.promises.writeFile(outpath, Body);
-    }
-    return new Promise((resolve, reject) => {
-        Body.pipe((0, node_fs_1.createWriteStream)(outpath))
-            .on('error', (err) => reject(err))
-            .on('close', () => resolve());
-    });
-};
-const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, logLevel, }) => {
-    const alreadyDownloading = {};
-    const downloaded = {};
-    const getFiles = async () => {
-        const prefix = (0, constants_1.rendersPrefix)(renderId);
-        const lsTimer = (0, timer_1.timer)('Listing files', logLevel);
-        const contents = await (0, io_1.lambdaLs)({
-            bucketName: bucket,
-            prefix,
-            region,
-            expectedBucketOwner,
-        });
-        lsTimer.end();
-        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, errorContents } = await getFiles();
-            const checkFinish = () => {
-                const areAllFilesDownloaded = Object.keys(downloaded).length === expectedFiles;
-                renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Checking for finish... ', Object.keys(downloaded), expectedFiles + ' files expected');
-                if (areAllFilesDownloaded) {
-                    renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'All files are downloaded!');
-                    resolve(
-                    // Need to use downloaded variable, not filesInBucket
-                    // as it may be out of date
-                    Object.keys(downloaded)
-                        .sort()
-                        .map((file) => getChunkDownloadOutputLocation({ outdir, file })));
-                }
-            };
-            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `Found ${filesInBucket.length} out of ${expectedFiles}`);
-            const errors = (await (0, inspect_errors_1.inspectErrors)({
-                bucket,
-                contents: errorContents,
-                expectedBucketOwner,
-                region,
-                renderId,
-            })).filter((e) => e.isFatal);
-            if (errors.length > 0) {
-                onErrors(errors);
-                // Will die here
-            }
-            filesInBucket.forEach(async (key) => {
-                if (alreadyDownloading[key]) {
-                    return;
-                }
-                alreadyDownloading[key] = true;
-                try {
-                    const downloadTimer = (0, timer_1.timer)('Downloading ' + key, logLevel);
-                    await downloadS3File({
-                        bucket,
-                        key,
-                        outdir,
-                        region,
-                        expectedBucketOwner,
-                    });
-                    renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Successfully downloaded', key);
-                    downloadTimer.end();
-                    downloaded[key] = true;
-                    checkFinish();
-                }
-                catch (err) {
-                    reject(err);
-                }
-            });
-            const areAllFilesDownloading = Object.keys(alreadyDownloading).length === expectedFiles;
-            if (!areAllFilesDownloading) {
-                setTimeout(() => {
-                    loop().catch((err) => reject(err));
-                }, 100);
-            }
-        };
-        loop().catch((err) => reject(err));
-    });
-};
-exports.getAllFilesS3 = getAllFilesS3;
-const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, muted, }) => {
+const concatVideos = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, audioBitrate, logLevel, framesPerLambda, binariesDirectory, cancelSignal, preferLossless, muted, }) => {
     const outfile = (0, node_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 chunks', logLevel);
     const filelistDir = renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_FILELIST_TOKEN);
@@ -174,4 +50,4 @@ const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOf
     });
     return { outfile, cleanupChunksProm };
 };
-exports.concatVideosS3 = concatVideosS3;
+exports.concatVideos = concatVideos;

package/dist/functions/helpers/create-post-render-data.d.ts

@@ -1,17 +1,17 @@
-import type { _Object } from '@aws-sdk/client-s3';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { PostRenderData, RenderMetadata } from '../../shared/constants';
 import type { OutputFileMetadata } from './find-output-file-in-bucket';
+import type { OverallRenderProgress } from './overall-render-progress';
 import type { EnhancedErrorInfo } from './write-lambda-error';
-export declare const createPostRenderData: ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }: {
-    renderId: string;
-    expectedBucketOwner: string;
+export declare const createPostRenderData: ({ region, memorySizeInMb, renderMetadata, errorExplanations, timeToDelete, outputFile, timeToCombine, overallProgress, timeToFinish, outputSize, }: {
     region: AwsRegion;
     memorySizeInMb: number;
     renderMetadata: RenderMetadata;
-    contents: _Object[];
-    timeToEncode: number;
     timeToDelete: number;
     errorExplanations: EnhancedErrorInfo[];
     outputFile: OutputFileMetadata;
+    timeToCombine: number | null;
+    overallProgress: OverallRenderProgress;
+    timeToFinish: number;
+    outputSize: number;
 }) => PostRenderData;

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

@@ -4,15 +4,9 @@ exports.createPostRenderData = void 0;
 const estimate_price_1 = require("../../api/estimate-price");
 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_files_to_delete_1 = require("./get-files-to-delete");
-const get_retry_stats_1 = require("./get-retry-stats");
-const get_time_to_finish_1 = require("./get-time-to-finish");
-const render_has_audio_video_1 = require("./render-has-audio-video");
-const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }) => {
-    const initializedKeys = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderId)); });
-    const parsedTimings = initializedKeys.map(({ Key }) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(Key));
+const createPostRenderData = ({ region, memorySizeInMb, renderMetadata, errorExplanations, timeToDelete, outputFile, timeToCombine, overallProgress, timeToFinish, outputSize, }) => {
+    const parsedTimings = overallProgress.timings;
     const estimatedBillingDurationInMilliseconds = parsedTimings
         .map((p) => p.rendered - p.start + get_most_expensive_chunks_1.OVERHEAD_TIME_PER_LAMBDA)
         .reduce((a, b) => a + b);
@@ -29,58 +23,44 @@ const createPostRenderData = ({ renderId, region, memorySizeInMb, renderMetadata
         throw new Error('Cannot wrap up without an output file in the S3 bucket.');
     }
     const endTime = Date.now();
-    const timeToFinish = (0, get_time_to_finish_1.getTimeToFinish)({
-        renderMetadata,
-        lastModified: endTime,
-    });
-    if (!timeToFinish) {
-        throw new TypeError(`Cannot calculate timeToFinish value`);
+    if (overallProgress.timeToEncode === null) {
+        throw new Error('Expected time to encode to be set');
+    }
+    if (overallProgress.timeToRenderFrames === null) {
+        throw new Error('Expected time to encode to be set');
     }
-    const renderSize = contents
-        .map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
-        .reduce((a, b) => a + b, 0);
-    const retriesInfo = (0, get_retry_stats_1.getRetryStats)({
-        contents,
-        renderId,
-    });
-    const { hasAudio, hasVideo } = (0, render_has_audio_video_1.lambdaRenderHasAudioVideo)(renderMetadata);
     return {
         cost: {
             currency: 'USD',
             disclaimer: 'Estimated cost for lambda invocations only. Does not include cost for S3 storage and data transfer.',
             estimatedCost: cost,
-            estimatedDisplayCost: new Intl.NumberFormat('en-US', {
+            estimatedDisplayCost: `$${new Intl.NumberFormat('en-US', {
                 currency: 'USD',
                 currencyDisplay: 'narrowSymbol',
-            }).format(cost),
+            }).format(cost)}`,
         },
         outputFile: outputFile.url,
         timeToFinish,
         errors: errorExplanations,
         startTime: renderMetadata.startedDate,
         endTime,
-        outputSize: outputFile.size,
-        renderSize,
-        renderMetadata,
-        filesCleanedUp: (0, get_files_to_delete_1.getFilesToDelete)({
-            chunkCount: renderMetadata.totalChunks,
-            renderId,
-            hasAudio,
-            hasVideo,
-        }).length,
-        timeToEncode,
+        outputSize,
+        renderSize: outputSize,
+        filesCleanedUp: 0,
+        timeToEncode: overallProgress.timeToEncode,
         timeToCleanUp: timeToDelete,
         timeToRenderChunks: (0, calculate_chunk_times_1.calculateChunkTimes)({
-            contents,
-            renderId,
             type: 'absolute-time',
+            timings: overallProgress.timings,
         }),
-        retriesInfo,
+        timeToRenderFrames: overallProgress.timeToRenderFrames,
+        retriesInfo: overallProgress.retries,
         mostExpensiveFrameRanges: renderMetadata.type === 'still'
             ? []
             : (0, get_most_expensive_chunks_1.getMostExpensiveChunks)(parsedTimings, renderMetadata.framesPerLambda, renderMetadata.frameRange[0], renderMetadata.frameRange[1]),
         deleteAfter: renderMetadata.deleteAfter,
         estimatedBillingDurationInMilliseconds,
+        timeToCombine: timeToCombine !== null && timeToCombine !== void 0 ? timeToCombine : null,
     };
 };
 exports.createPostRenderData = createPostRenderData;

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

@@ -1,10 +1,8 @@
-import type { AwsRegion } from '../..';
+import type { AwsRegion } from '../../client';
 import type { CustomCredentials } from '../../shared/aws-clients';
 import type { RenderMetadata } from '../../shared/constants';
 export type OutputFileMetadata = {
     url: string;
-    size: number;
-    lastModified: number;
 };
 export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, customCredentials, }: {
     region: AwsRegion;

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

@@ -6,21 +6,18 @@ const expected_out_name_1 = require("./expected-out-name");
 const get_output_url_from_metadata_1 = require("./get-output-url-from-metadata");
 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 { renderBucketName, key } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
     try {
-        const head = await (0, io_1.lambdaHeadCommand)({
+        await (0, io_1.lambdaHeadCommand)({
             bucketName,
             key,
             region,
             customCredentials,
         });
         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, customCredentials).url,
         };
     }

package/dist/functions/helpers/get-encoding-progress-step-size.d.ts

@@ -1 +1 @@
-export declare const getEncodingProgressStepSize: (totalFrames: number) => number;
+declare const getEncodingProgressStepSize: (totalFrames: number) => number;

package/dist/functions/helpers/get-encoding-progress-step-size.js

@@ -1,7 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEncodingProgressStepSize = void 0;
 const getEncodingProgressStepSize = (totalFrames) => {
     return Math.min(100, Math.max(5, totalFrames / 10));
 };
-exports.getEncodingProgressStepSize = getEncodingProgressStepSize;

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

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

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

@@ -1,14 +1 @@
 "use strict";
-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 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);
-    return {
-        lambdasInvoked: lambdasInvoked.length,
-    };
-};
-exports.getLambdasInvokedStats = getLambdasInvokedStats;

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

@@ -1,6 +1,8 @@
+import type { AwsRegion } from '../../client';
 import type { OverallRenderProgress } from './overall-render-progress';
-export declare const getOverallProgressS3: ({ renderId, bucketName, expectedBucketOwner, }: {
+export declare const getOverallProgressS3: ({ renderId, bucketName, expectedBucketOwner, region, }: {
     renderId: string;
     expectedBucketOwner: string;
     bucketName: string;
-}) => Promise<OverallRenderProgress | null>;
+    region: AwsRegion;
+}) => Promise<OverallRenderProgress>;

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

@@ -1,23 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOverallProgressS3 = void 0;
-const defaults_1 = require("../../defaults");
+const constants_1 = require("../../shared/constants");
 const stream_to_string_1 = require("../../shared/stream-to-string");
-const get_current_region_1 = require("./get-current-region");
 const io_1 = require("./io");
-const getOverallProgressS3 = async ({ renderId, bucketName, expectedBucketOwner, }) => {
+const getOverallProgressS3 = async ({ renderId, bucketName, expectedBucketOwner, region, }) => {
     try {
         const Body = await (0, io_1.lambdaReadFile)({
             bucketName,
-            key: (0, defaults_1.overallProgressKey)(renderId),
+            key: (0, constants_1.overallProgressKey)(renderId),
             expectedBucketOwner,
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+            region,
         });
         const str = await (0, stream_to_string_1.streamToString)(Body);
         return JSON.parse(str);
     }
     catch (err) {
-        return null;
+        if (err.name === 'NotFound') {
+            throw new TypeError(`No render with ID "${renderId}" found in bucket ${bucketName} and region ${region}`);
+        }
+        throw err;
     }
 };
 exports.getOverallProgressS3 = getOverallProgressS3;

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

@@ -1,5 +1,4 @@
-export declare const getOverallProgress: ({ cleanup, encoding, rendering, invoking, frames, }: {
-    cleanup: number;
+export declare const getOverallProgress: ({ encoding, rendering, invoking, frames, }: {
     encoding: number;
     rendering: number;
     invoking: number;

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

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