@remotion/lambda 3.0.0-lambda.42 → 3.0.0-lambda.424

package/dist/functions/chunk-optimization/types.d.ts

@@ -12,10 +12,10 @@ export declare type ChunkTimingData = Omit<ObjectChunkTimingData, 'timings'> & {
 };
 export declare type TimingProfile = ChunkTimingData[];
 export declare type OptimizationProfile = {
-    frameRange: [number, number][];
+    ranges: [number, number][];
+    frameRange: [number, number];
     oldTiming: number;
     newTiming: number;
-    frameCount: number;
     createdFromRenderId: string;
     framesPerLambda: number;
     lambdaVersion: LambdaVersions;

package/dist/functions/chunk-optimization/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAEtD,oBAAY,qBAAqB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACtB,CAAC;CACF,CAAC;AAEF,oBAAY,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,GAAG;IACtE,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,oBAAY,aAAa,GAAG,eAAe,EAAE,CAAC;AAE9C,oBAAY,mBAAmB,GAAG;IACjC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,cAAc,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAEtD,oBAAY,qBAAqB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACtB,CAAC;CACF,CAAC;AAEF,oBAAY,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,GAAG;IACtE,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,oBAAY,aAAa,GAAG,eAAe,EAAE,CAAC;AAE9C,oBAAY,mBAAmB,GAAG;IACjC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,cAAc,CAAC;CAC9B,CAAC"}

package/dist/functions/helpers/best-frames-per-lambda-param.d.ts

@@ -0,0 +1,2 @@
+export declare const bestFramesPerLambdaParam: (frameCount: number) => number;
+//# sourceMappingURL=best-frames-per-lambda-param.d.ts.map

package/dist/functions/helpers/best-frames-per-lambda-param.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"best-frames-per-lambda-param.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/best-frames-per-lambda-param.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,wBAAwB,eAAgB,MAAM,WAa1D,CAAC"}

package/dist/functions/helpers/best-frames-per-lambda-param.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bestFramesPerLambdaParam = void 0;
+const remotion_1 = require("remotion");
+// Always update the code in docs/lambda/concurrency.md too
+const bestFramesPerLambdaParam = (frameCount) => {
+    // Between 0 and 10 minutes (at 30fps), interpolate the concurrency from 75 to 150
+    const concurrency = (0, remotion_1.interpolate)(frameCount, [0, 18000], [75, 150], {
+        extrapolateRight: 'clamp',
+    });
+    // At least have 20 as a `framesPerLambda` value
+    const framesPerLambda = Math.max(frameCount / concurrency, 20);
+    // Evenly distribute: For 21 frames over 2 lambda functions, distribute as 11 + 10 ==> framesPerLambda = 11
+    const lambdasNeeded = Math.ceil(frameCount / framesPerLambda);
+    return Math.ceil(frameCount / lambdasNeeded);
+};
+exports.bestFramesPerLambdaParam = bestFramesPerLambdaParam;
+//# sourceMappingURL=best-frames-per-lambda-param.js.map

package/dist/functions/helpers/best-frames-per-lambda-param.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"best-frames-per-lambda-param.js","sourceRoot":"","sources":["../../../src/functions/helpers/best-frames-per-lambda-param.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,2DAA2D;AAEpD,MAAM,wBAAwB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAC9D,kFAAkF;IAClF,MAAM,WAAW,GAAG,IAAA,sBAAW,EAAC,UAAU,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE;QAClE,gBAAgB,EAAE,OAAO;KACzB,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,WAAW,EAAE,EAAE,CAAC,CAAC;IAE/D,2GAA2G;IAC3G,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC,CAAC;IAE9D,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,CAAC;AAC9C,CAAC,CAAC;AAbW,QAAA,wBAAwB,4BAanC"}

package/dist/functions/helpers/calculate-chunk-times.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-chunk-times.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-chunk-times.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAK3C,eAAO,MAAM,mBAAmB;cAKrB,OAAO,EAAE;cACT,MAAM;UACV,oCAAoC,GAAG,eAAe;YAkC5D,CAAC"}
+{"version":3,"file":"calculate-chunk-times.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-chunk-times.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAK3C,eAAO,MAAM,mBAAmB;cAKrB,OAAO,EAAE;cACT,MAAM;UACV,oCAAoC,GAAG,eAAe;YA8B5D,CAAC"}

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateChunkTimes = void 0;
-const renderer_1 = require("@remotion/renderer");
 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 calculateChunkTimes = ({ contents, renderId, type, }) => {
-    const finishedTimings = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderId)); });
-    const parsedTimings = finishedTimings.map((f) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(f.Key));
+    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));
     if (type === 'combined-time-for-cost-calculation') {
         // TODO: Should also calculate invoker functions, and main function
         const totalEncodingTimings = parsedTimings
-            .map((p) => p.encoded - p.start)
+            .map((p) => p.rendered - p.start)
             .reduce((a, b) => a + b, 0);
         return totalEncodingTimings;
     }
@@ -18,10 +19,10 @@ const calculateChunkTimes = ({ contents, renderId, type, }) => {
         if (parsedTimings.length === 0) {
             return 0;
         }
-        const allEnds = parsedTimings.map((p) => p.encoded);
+        const allEnds = parsedTimings.map((p) => p.rendered);
         const allStarts = parsedTimings.map((p) => p.start);
-        const biggestEnd = renderer_1.RenderInternals.max(allEnds);
-        const smallestStart = renderer_1.RenderInternals.min(allStarts);
+        const biggestEnd = (0, min_max_1.max)(allEnds);
+        const smallestStart = (0, min_max_1.min)(allStarts);
         return biggestEnd - smallestStart;
     }
     throw new Error('invalid time for calculate chunk times');

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

@@ -1 +1 @@
-{"version":3,"file":"calculate-chunk-times.js","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-chunk-times.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,sDAA2D;AAC3D,oFAA4E;AAErE,MAAM,mBAAmB,GAAG,CAAC,EACnC,QAAQ,EACR,QAAQ,EACR,IAAI,GAKJ,EAAE,EAAE;IACJ,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAC7C,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAA,+BAAmB,EAAC,QAAQ,CAAC,CAAC,CAAA,EAAA,CAChD,CAAC;IAEF,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,IAAA,gDAAqB,EAAC,CAAC,CAAC,GAAa,CAAC,CACtC,CAAC;IAEF,IAAI,IAAI,KAAK,oCAAoC,EAAE;QAClD,mEAAmE;QACnE,MAAM,oBAAoB,GAAG,aAAa;aACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC;aAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAE7B,OAAO,oBAAoB,CAAC;KAC5B;IAED,IAAI,IAAI,KAAK,eAAe,EAAE;QAC7B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,CAAC,CAAC;SACT;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEpD,MAAM,UAAU,GAAG,0BAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,0BAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAErD,OAAO,UAAU,GAAG,aAAa,CAAC;KAClC;IAED,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC3D,CAAC,CAAC;AAzCW,QAAA,mBAAmB,uBAyC9B"}
+{"version":3,"file":"calculate-chunk-times.js","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-chunk-times.ts"],"names":[],"mappings":";;;AACA,sDAA2D;AAC3D,oFAA4E;AAC5E,uCAAmC;AAE5B,MAAM,mBAAmB,GAAG,CAAC,EACnC,QAAQ,EACR,QAAQ,EACR,IAAI,GAKJ,EAAE,EAAE;IACJ,MAAM,aAAa,GAAG,QAAQ;SAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAA,+BAAmB,EAAC,QAAQ,CAAC,CAAC,CAAA,EAAA,CAAC;SAC/D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gDAAqB,EAAC,CAAC,CAAC,GAAa,CAAC,CAAC,CAAC;IAErD,IAAI,IAAI,KAAK,oCAAoC,EAAE;QAClD,mEAAmE;QACnE,MAAM,oBAAoB,GAAG,aAAa;aACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAE7B,OAAO,oBAAoB,CAAC;KAC5B;IAED,IAAI,IAAI,KAAK,eAAe,EAAE;QAC7B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,CAAC,CAAC;SACT;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEpD,MAAM,UAAU,GAAG,IAAA,aAAG,EAAC,OAAO,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,IAAA,aAAG,EAAC,SAAS,CAAC,CAAC;QAErC,OAAO,UAAU,GAAG,aAAa,CAAC;KAClC;IAED,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC3D,CAAC,CAAC;AArCW,QAAA,mBAAmB,uBAqC9B"}

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

@@ -1,10 +1,14 @@
 import { _Object } from '@aws-sdk/client-s3';
 import { RenderMetadata } from '../../shared/constants';
-export declare const estimatePriceFromBucket: ({ renderId, contents, renderMetadata, bucketName, memorySizeInMb, }: {
-    renderId: string;
+import { LambdaArchitecture } from '../../shared/validate-architecture';
+import { OutputFileMetadata } from './find-output-file-in-bucket';
+export declare const estimatePriceFromBucket: ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, architecture, diskSizeInMb, lambdasInvoked, }: {
     contents: _Object[];
     renderMetadata: RenderMetadata | null;
-    bucketName: string;
     memorySizeInMb: number;
+    outputFileMetadata: OutputFileMetadata | null;
+    architecture: LambdaArchitecture;
+    diskSizeInMb: number;
+    lambdasInvoked: number;
 }) => number | null;
 //# sourceMappingURL=calculate-price-from-bucket.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"calculate-price-from-bucket.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-price-from-bucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAsB,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAQ3E,eAAO,MAAM,uBAAuB;cAOzB,MAAM;cACN,OAAO,EAAE;oBACH,cAAc,GAAG,IAAI;gBACzB,MAAM;oBACF,MAAM;mBAoDtB,CAAC"}
+{"version":3,"file":"calculate-price-from-bucket.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-price-from-bucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAsB,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAE3E,OAAO,EAAC,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAIhE,eAAO,MAAM,uBAAuB;cASzB,OAAO,EAAE;oBACH,cAAc,GAAG,IAAI;oBACrB,MAAM;wBACF,kBAAkB,GAAG,IAAI;kBAC/B,kBAAkB;kBAClB,MAAM;oBACJ,MAAM;mBA+CtB,CAAC"}

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

@@ -1,46 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimatePriceFromBucket = void 0;
-const calculate_price_1 = require("../../pricing/calculate-price");
+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 find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
 const get_current_region_1 = require("./get-current-region");
 const get_time_to_finish_1 = require("./get-time-to-finish");
-// TODO: Should differentiate between finished and in progress
-const estimatePriceFromBucket = ({ renderId, contents, renderMetadata, bucketName, memorySizeInMb, }) => {
+const estimatePriceFromBucket = ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, architecture, diskSizeInMb, lambdasInvoked, }) => {
     var _a, _b, _c;
     if (!renderMetadata) {
         return null;
     }
-    const finishedTimings = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderId)); });
-    const parsedTimings = finishedTimings.map((f) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(f.Key));
-    const outputFile = (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
-        bucketName,
-        contents,
-        renderMetadata,
-    });
+    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 = outputFile === null || outputFile === void 0 ? void 0 : outputFile.lastModified) !== null && _a !== void 0 ? _a : null,
+        lastModified: (_a = outputFileMetadata === null || outputFileMetadata === void 0 ? void 0 : outputFileMetadata.lastModified) !== null && _a !== void 0 ? _a : null,
         renderMetadata,
     });
     const elapsedTime = timeToFinish === null
-        ? Date.now() - ((_b = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.startedDate) !== null && _b !== void 0 ? _b : 0)
+        ? 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 timeElapsedOfUnfinished = new Array(unfinished)
         .fill(true)
         .map(() => elapsedTime)
         .reduce((a, b) => a + b, 0);
-    const accruedSoFar = Number((0, calculate_price_1.estimatePrice)({
+    const accruedSoFar = Number((0, estimate_price_1.estimatePrice)({
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         durationInMiliseconds: (0, calculate_chunk_times_1.calculateChunkTimes)({
             contents,
-            renderId,
+            renderId: renderMetadata.renderId,
             type: 'combined-time-for-cost-calculation',
         }) + timeElapsedOfUnfinished,
         memorySizeInMb,
+        architecture,
+        diskSizeInMb,
+        lambdasInvoked,
     }).toPrecision(5));
     return accruedSoFar;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"calculate-price-from-bucket.js","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-price-from-bucket.ts"],"names":[],"mappings":";;;AACA,mEAA4D;AAC5D,sDAA2E;AAC3E,oFAA4E;AAC5E,mEAA4D;AAC5D,6EAAoE;AACpE,6DAAgE;AAChE,6DAAqD;AAErD,8DAA8D;AACvD,MAAM,uBAAuB,GAAG,CAAC,EACvC,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,UAAU,EACV,cAAc,GAOd,EAAE,EAAE;;IACJ,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAC7C,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAA,+BAAmB,EAAC,QAAQ,CAAC,CAAC,CAAA,EAAA,CAChD,CAAC;IAEF,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,IAAA,gDAAqB,EAAC,CAAC,CAAC,GAAa,CAAC,CACtC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,mDAAsB,EAAC;QACzC,UAAU;QACV,QAAQ;QACR,cAAc;KACd,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,oCAAe,EAAC;QACpC,YAAY,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,mCAAI,IAAI;QAC9C,cAAc;KACd,CAAC,CAAC;IAEH,MAAM,WAAW,GAChB,YAAY,KAAK,IAAI;QACpB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,CAAC,CAAC;QACjD,CAAC,CAAC,YAAY,CAAC;IAEjB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAC1B,CAAC,EACD,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,CACzD,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;SACtB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7B,MAAM,YAAY,GAAG,MAAM,CAC1B,IAAA,+BAAa,EAAC;QACb,MAAM,EAAE,IAAA,+CAA0B,GAAE;QACpC,qBAAqB,EACpB,IAAA,2CAAmB,EAAC;YACnB,QAAQ;YACR,QAAQ;YACR,IAAI,EAAE,oCAAoC;SAC1C,CAAC,GAAG,uBAAuB;QAC7B,cAAc;KACd,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CACjB,CAAC;IACF,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AA/DW,QAAA,uBAAuB,2BA+DlC"}
+{"version":3,"file":"calculate-price-from-bucket.js","sourceRoot":"","sources":["../../../src/functions/helpers/calculate-price-from-bucket.ts"],"names":[],"mappings":";;;AACA,6DAAuD;AACvD,sDAA2E;AAC3E,oFAA4E;AAE5E,mEAA4D;AAE5D,6DAAgE;AAChE,6DAAqD;AAE9C,MAAM,uBAAuB,GAAG,CAAC,EACvC,QAAQ,EACR,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,YAAY,EACZ,YAAY,EACZ,cAAc,GASd,EAAE,EAAE;;IACJ,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,aAAa,GAAG,QAAQ;SAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WACb,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAA,+BAAmB,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAA,EAAA,CAC/D;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gDAAqB,EAAC,CAAC,CAAC,GAAa,CAAC,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,IAAA,oCAAe,EAAC;QACpC,YAAY,EAAE,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,YAAY,mCAAI,IAAI;QACtD,cAAc;KACd,CAAC,CAAC;IAEH,MAAM,WAAW,GAChB,YAAY,KAAK,IAAI;QACpB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,YAAY,CAAC;IAEjB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAC1B,CAAC,EACD,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,mCAAI,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,CACzD,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;SACtB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7B,MAAM,YAAY,GAAG,MAAM,CAC1B,IAAA,8BAAa,EAAC;QACb,MAAM,EAAE,IAAA,+CAA0B,GAAE;QACpC,qBAAqB,EACpB,IAAA,2CAAmB,EAAC;YACnB,QAAQ;YACR,QAAQ,EAAE,cAAc,CAAC,QAAQ;YACjC,IAAI,EAAE,oCAAoC;SAC1C,CAAC,GAAG,uBAAuB;QAC7B,cAAc;QACd,YAAY;QACZ,YAAY;QACZ,cAAc;KACd,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CACjB,CAAC;IACF,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AA9DW,QAAA,uBAAuB,2BA8DlC"}

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

@@ -1 +1 @@
-{"version":3,"file":"concat-videos.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/concat-videos.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,KAAK,EAAC,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAyIpD,eAAO,MAAM,cAAc;YAUlB,MAAM;mBACC,MAAM;yBACA,MAAM,iBAAiB,MAAM,KAAK,IAAI;oBAC3C,MAAM;cACZ,MAAM;YACR,SAAS;WACV,KAAK;yBACS,MAAM;;;;;EAwC3B,CAAC"}
+{"version":3,"file":"concat-videos.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/concat-videos.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,KAAK,EAAC,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAgJpD,eAAO,MAAM,cAAc;YAUlB,MAAM;mBACC,MAAM;yBACA,MAAM,iBAAiB,MAAM,KAAK,IAAI;oBAC3C,MAAM;cACZ,MAAM;YACR,SAAS;WACV,KAAK;yBACS,MAAM;;;;;EA2C3B,CAAC"}

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

@@ -24,8 +24,6 @@ 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 get_file_extension_from_codec_1 = require("../../shared/get-file-extension-from-codec");
-const tmpdir_1 = require("../../shared/tmpdir");
 const io_1 = require("./io");
 const timer_1 = require("./timer");
 const getChunkDownloadOutputLocation = ({ outdir, file, }) => {
@@ -70,10 +68,13 @@ const getAllFilesS3 = async ({ bucket, expectedFiles, outdir, renderId, region,
             const filesInBucket = await getFiles();
             const checkFinish = () => {
                 const areAllFilesDownloaded = Object.keys(downloaded).length === expectedFiles;
+                console.log('Checking for finish... ', Object.keys(downloaded), expectedFiles + ' files expected');
                 if (areAllFilesDownloaded) {
+                    console.log('All files are downloaded!');
                     resolve(filesInBucket.map((file) => getChunkDownloadOutputLocation({ outdir, file })));
                 }
             };
+            console.log('Found ', filesInBucket);
             filesInBucket.forEach(async (key) => {
                 if (alreadyDownloading[key]) {
                     return;
@@ -88,6 +89,7 @@ const getAllFilesS3 = async ({ bucket, expectedFiles, outdir, renderId, region,
                         region,
                         expectedBucketOwner,
                     });
+                    console.log('Successfully downloaded', key);
                     downloadTimer.end();
                     downloaded[key] = true;
                     checkFinish();
@@ -107,7 +109,8 @@ const getAllFilesS3 = async ({ bucket, expectedFiles, outdir, renderId, region,
     });
 };
 const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, }) => {
-    const outdir = (0, path_1.join)((0, tmpdir_1.tmpDir)(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
+    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,
@@ -122,20 +125,21 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
         region,
         expectedBucketOwner,
     });
-    const outfile = (0, path_1.join)((0, tmpdir_1.tmpDir)(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + (0, get_file_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final'));
+    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 = (0, tmpdir_1.tmpDir)(constants_1.REMOTION_FILELIST_TOKEN);
+    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),
         numberOfFrames,
-        codec,
+        codec: codecForCombining,
     });
     combine.end();
-    const cleanupChunksProm = fs_1.default.promises.rmdir(outdir, {
+    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 };

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

@@ -1 +1 @@
-{"version":3,"file":"concat-videos.js","sourceRoot":"","sources":["../../../src/functions/helpers/concat-videos.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"concat-videos.js","sourceRoot":"","sources":["../../../src/functions/helpers/concat-videos.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,10 @@
 import { _Object } from '@aws-sdk/client-s3';
-import { AwsRegion } from '../..';
+import { AwsRegion } from '../../pricing/aws-regions';
 import { PostRenderData, RenderMetadata } from '../../shared/constants';
+import { OutputFileMetadata } from './find-output-file-in-bucket';
 import { EnhancedErrorInfo } from './write-lambda-error';
-export declare const createPostRenderData: ({ renderId, bucketName, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, }: {
+export declare const createPostRenderData: ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }: {
     renderId: string;
-    bucketName: string;
     expectedBucketOwner: string;
     region: AwsRegion;
     memorySizeInMb: number;
@@ -13,5 +13,6 @@ export declare const createPostRenderData: ({ renderId, bucketName, region, memo
     timeToEncode: number;
     timeToDelete: number;
     errorExplanations: EnhancedErrorInfo[];
-}) => PostRenderData;
+    outputFile: OutputFileMetadata;
+}) => Promise<PostRenderData>;
 //# sourceMappingURL=create-post-render-data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"create-post-render-data.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/create-post-render-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAEhC,OAAO,EAEN,cAAc,EACd,cAAc,EACd,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAIvD,eAAO,MAAM,oBAAoB;cAWtB,MAAM;gBACJ,MAAM;yBACG,MAAM;YACnB,SAAS;oBACD,MAAM;oBACN,cAAc;cACpB,OAAO,EAAE;kBACL,MAAM;kBACN,MAAM;uBACD,iBAAiB,EAAE;oBAmFtC,CAAC"}
+{"version":3,"file":"create-post-render-data.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/create-post-render-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAGN,cAAc,EACd,cAAc,EACd,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAMhE,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAIvD,eAAO,MAAM,oBAAoB;cAWtB,MAAM;yBACK,MAAM;YACnB,SAAS;oBACD,MAAM;oBACN,cAAc;cACpB,OAAO,EAAE;kBACL,MAAM;kBACN,MAAM;uBACD,iBAAiB,EAAE;gBAC1B,kBAAkB;6BA2F9B,CAAC"}

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

@@ -1,41 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPostRenderData = void 0;
-const calculate_price_1 = require("../../pricing/calculate-price");
+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 find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
+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 OVERHEAD_TIME_PER_LAMBDA = 100;
-const createPostRenderData = ({ renderId, bucketName, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, }) => {
+const createPostRenderData = async ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }) => {
     var _a;
     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 times = parsedTimings
-        .map((p) => p.encoded - p.start + OVERHEAD_TIME_PER_LAMBDA)
+        .map((p) => p.rendered - p.start + OVERHEAD_TIME_PER_LAMBDA)
         .reduce((a, b) => a + b);
-    const cost = (0, calculate_price_1.estimatePrice)({
+    const cost = (0, estimate_price_1.estimatePrice)({
         durationInMiliseconds: times,
         memorySizeInMb,
         region,
-    });
-    const outputFile = (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
-        contents,
-        bucketName,
-        renderMetadata,
+        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%)
+        diskSizeInMb: constants_1.MAX_EPHEMERAL_STORAGE_IN_MB,
     });
     if (!outputFile) {
         throw new Error('Cannot wrap up without an output file in the S3 bucket.');
     }
     const endTime = Date.now();
-    const startTime = renderMetadata.startedDate;
-    const timeToFinish = endTime - startTime;
+    const timeToFinish = (0, get_time_to_finish_1.getTimeToFinish)({
+        renderMetadata,
+        lastModified: endTime,
+    });
+    if (!timeToFinish) {
+        throw new TypeError(`Cannot calculate timeToFinish value`);
+    }
     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, (_a = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.estimatedRenderLambdaInvokations) !== null && _a !== void 0 ? _a : null, renderMetadata.startedDate);
+    const retriesInfo = (0, get_retry_stats_1.getRetryStats)({ contents, renderId });
     if (timeToInvokeLambdas === null) {
         throw new Error('should have timing for all lambdas');
     }
@@ -69,6 +77,7 @@ const createPostRenderData = ({ renderId, bucketName, region, memorySizeInMb, re
             type: 'absolute-time',
         }),
         timeToInvokeLambdas,
+        retriesInfo,
     };
     return data;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"create-post-render-data.js","sourceRoot":"","sources":["../../../src/functions/helpers/create-post-render-data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-post-render-data.js","sourceRoot":"","sources":["../../../src/functions/helpers/create-post-render-data.ts"],"names":[],"mappings":"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"}

package/dist/functions/helpers/delete-chunks.d.ts

@@ -1,5 +1,5 @@
 import { _Object } from '@aws-sdk/client-s3';
-import { AwsRegion } from '../..';
+import { AwsRegion } from '../../pricing/aws-regions';
 import { CleanupJob } from './get-files-to-delete';
 export declare const cleanupFiles: ({ bucket, region, contents, jobs, }: {
     bucket: string;

package/dist/functions/helpers/delete-chunks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-chunks.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/delete-chunks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,YAAY;YAMhB,MAAM;YACN,SAAS;cACP,OAAO,EAAE;UACb,UAAU,EAAE;qBAuBlB,CAAC"}
+{"version":3,"file":"delete-chunks.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/delete-chunks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,YAAY;YAMhB,MAAM;YACN,SAAS;cACP,OAAO,EAAE;UACb,UAAU,EAAE;qBAuBlB,CAAC"}

package/dist/functions/helpers/delete-chunks.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-chunks.js","sourceRoot":"","sources":["../../../src/functions/helpers/delete-chunks.ts"],"names":[],"mappings":";;;AAEA,uDAAiD;AAG1C,MAAM,YAAY,GAAG,KAAK,EAAE,EAClC,MAAM,EACN,MAAM,EACN,QAAQ,EACR,IAAI,GAMJ,EAAE,EAAE;IACJ,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,MAAM,IAAA,wBAAU,EAAC;QAChB,MAAM;QACN,MAAM;QACN,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;YACvB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;aACjB;YAED,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC3B,OAAO,MAAA,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA,EAAA,CAAC,0CACtD,GAAa,CAAC;aACjB;YAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,CAAC,CAAC;QACF,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS;QACnC,mBAAmB,EAAE,GAAG,EAAE,CAAC,SAAS;KACpC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;AAC3B,CAAC,CAAC;AAhCW,QAAA,YAAY,gBAgCvB"}
+{"version":3,"file":"delete-chunks.js","sourceRoot":"","sources":["../../../src/functions/helpers/delete-chunks.ts"],"names":[],"mappings":";;;AACA,uDAAiD;AAI1C,MAAM,YAAY,GAAG,KAAK,EAAE,EAClC,MAAM,EACN,MAAM,EACN,QAAQ,EACR,IAAI,GAMJ,EAAE,EAAE;IACJ,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,MAAM,IAAA,wBAAU,EAAC;QAChB,MAAM;QACN,MAAM;QACN,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;YACvB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;aACjB;YAED,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC3B,OAAO,MAAA,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,GAAG,0CAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA,EAAA,CAAC,0CACtD,GAAa,CAAC;aACjB;YAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,CAAC,CAAC;QACF,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS;QACnC,mBAAmB,EAAE,GAAG,EAAE,CAAC,SAAS;KACpC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;AAC3B,CAAC,CAAC;AAhCW,QAAA,YAAY,gBAgCvB"}

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

@@ -1,3 +1,3 @@
-import { RenderMetadata } from '../../defaults';
-export declare const getExpectedOutName: (renderMetadata: RenderMetadata) => string;
+import { OutNameOutput, RenderMetadata } from '../../defaults';
+export declare const getExpectedOutName: (renderMetadata: RenderMetadata, bucketName: string) => OutNameOutput;
 //# sourceMappingURL=expected-out-name.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"expected-out-name.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/expected-out-name.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAErE,eAAO,MAAM,kBAAkB,mBAAoB,cAAc,WAUhE,CAAC"}
+{"version":3,"file":"expected-out-name.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/expected-out-name.ts"],"names":[],"mappings":"AAEA,OAAO,EAGN,aAAa,EAEb,cAAc,EACd,MAAM,gBAAgB,CAAC;AAGxB,eAAO,MAAM,kBAAkB,mBACd,cAAc,cAClB,MAAM,KAChB,aA+BF,CAAC"}

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

@@ -1,13 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpectedOutName = void 0;
+const renderer_1 = require("@remotion/renderer");
 const defaults_1 = require("../../defaults");
-const getExpectedOutName = (renderMetadata) => {
+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);
+    }
     if (renderMetadata.type === 'still') {
-        return (0, defaults_1.outStillName)(renderMetadata.renderId, renderMetadata.imageFormat);
+        return {
+            renderBucketName: bucketName,
+            key: (0, defaults_1.outStillName)(renderMetadata.renderId, renderMetadata.imageFormat),
+        };
     }
     if (renderMetadata.type === 'video') {
-        return (0, defaults_1.outName)(renderMetadata.renderId, renderMetadata.codec);
+        return {
+            renderBucketName: bucketName,
+            key: (0, defaults_1.outName)(renderMetadata.renderId, renderer_1.RenderInternals.getFileExtensionFromCodec(renderMetadata.codec, 'final')),
+        };
     }
     throw new TypeError('no type passed');
 };

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

@@ -1 +1 @@
-{"version":3,"file":"expected-out-name.js","sourceRoot":"","sources":["../../../src/functions/helpers/expected-out-name.ts"],"names":[],"mappings":";;;AACA,6CAAqE;AAE9D,MAAM,kBAAkB,GAAG,CAAC,cAA8B,EAAE,EAAE;IACpE,IAAI,cAAc,CAAC,IAAI,KAAK,OAAO,EAAE;QACpC,OAAO,IAAA,uBAAY,EAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;KACzE;IAED,IAAI,cAAc,CAAC,IAAI,KAAK,OAAO,EAAE;QACpC,OAAO,IAAA,kBAAO,EAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,KAAc,CAAC,CAAC;KACvE;IAED,MAAM,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAC;AACvC,CAAC,CAAC;AAVW,QAAA,kBAAkB,sBAU7B"}
+{"version":3,"file":"expected-out-name.js","sourceRoot":"","sources":["../../../src/functions/helpers/expected-out-name.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAEnD,6CAMwB;AACxB,oEAA8D;AAEvD,MAAM,kBAAkB,GAAG,CACjC,cAA8B,EAC9B,UAAkB,EACF,EAAE;IAClB,IAAI,cAAc,CAAC,OAAO,EAAE;QAC3B,IAAA,kCAAe,EAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,IAAA,wBAAa,EACnB,cAAc,CAAC,QAAQ,EACvB,UAAU,EACV,cAAc,CAAC,OAAO,CACtB,CAAC;KACF;IAED,IAAI,cAAc,CAAC,IAAI,KAAK,OAAO,EAAE;QACpC,OAAO;YACN,gBAAgB,EAAE,UAAU;YAC5B,GAAG,EAAE,IAAA,uBAAY,EAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,WAAW,CAAC;SACtE,CAAC;KACF;IAED,IAAI,cAAc,CAAC,IAAI,KAAK,OAAO,EAAE;QACpC,OAAO;YACN,gBAAgB,EAAE,UAAU;YAC5B,GAAG,EAAE,IAAA,kBAAO,EACX,cAAc,CAAC,QAAQ,EACvB,0BAAe,CAAC,yBAAyB,CACxC,cAAc,CAAC,KAAc,EAC7B,OAAO,CACP,CACD;SACD,CAAC;KACF;IAED,MAAM,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAC;AACvC,CAAC,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}

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

@@ -1,12 +1,13 @@
-import { _Object } from '@aws-sdk/client-s3';
+import { AwsRegion } from '../..';
 import { RenderMetadata } from '../../shared/constants';
-export declare const findOutputFileInBucket: ({ contents, renderMetadata, bucketName, }: {
-    contents: _Object[];
-    renderMetadata: RenderMetadata | null;
-    bucketName: string;
-}) => {
+export declare type OutputFileMetadata = {
     url: string;
     size: number;
     lastModified: number;
-} | null;
+};
+export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, }: {
+    region: AwsRegion;
+    renderMetadata: RenderMetadata;
+    bucketName: string;
+}) => Promise<OutputFileMetadata | null>;
 //# sourceMappingURL=find-output-file-in-bucket.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"find-output-file-in-bucket.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/find-output-file-in-bucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAItD,eAAO,MAAM,sBAAsB;cAKxB,OAAO,EAAE;oBACH,cAAc,GAAG,IAAI;gBACzB,MAAM;MACf;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACrB,GAAG,IAuBH,CAAC"}
+{"version":3,"file":"find-output-file-in-bucket.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/find-output-file-in-bucket.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAC,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAItD,oBAAY,kBAAkB,GAAG;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,sBAAsB;YAK1B,SAAS;oBACD,cAAc;gBAClB,MAAM;MACf,QAAQ,kBAAkB,GAAG,IAAI,CA0BpC,CAAC"}