@remotion/lambda 3.0.0-lambda.387 → 3.0.0-lambda.400
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/dist/api/deploy-site.js +1 -1
- package/dist/api/deploy-site.js.map +1 -1
- package/dist/api/download-media.d.ts.map +1 -1
- package/dist/api/download-media.js +3 -2
- package/dist/api/download-media.js.map +1 -1
- package/dist/api/get-functions.d.ts.map +1 -1
- package/dist/api/get-functions.js +26 -2
- package/dist/api/get-functions.js.map +1 -1
- package/dist/api/presign-url.js +1 -1
- package/dist/api/presign-url.js.map +1 -1
- package/dist/functions/chunk-optimization/collect-data.d.ts +3 -2
- package/dist/functions/chunk-optimization/collect-data.d.ts.map +1 -1
- package/dist/functions/chunk-optimization/get-frame-ranges-from-profile.d.ts +4 -1
- package/dist/functions/chunk-optimization/get-frame-ranges-from-profile.d.ts.map +1 -1
- package/dist/functions/chunk-optimization/optimize-profile.d.ts +8 -2
- package/dist/functions/chunk-optimization/optimize-profile.d.ts.map +1 -1
- package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts +4 -1
- package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts.map +1 -1
- package/dist/functions/chunk-optimization/simulate-frame-ranges.d.ts +4 -1
- package/dist/functions/chunk-optimization/simulate-frame-ranges.d.ts.map +1 -1
- package/dist/functions/helpers/calculate-price-from-bucket.d.ts +3 -2
- package/dist/functions/helpers/calculate-price-from-bucket.d.ts.map +1 -1
- package/dist/functions/helpers/calculate-price-from-bucket.js +2 -8
- package/dist/functions/helpers/calculate-price-from-bucket.js.map +1 -1
- package/dist/functions/helpers/create-post-render-data.d.ts +4 -3
- package/dist/functions/helpers/create-post-render-data.d.ts.map +1 -1
- package/dist/functions/helpers/create-post-render-data.js +1 -7
- package/dist/functions/helpers/create-post-render-data.js.map +1 -1
- package/dist/functions/helpers/expected-out-name.d.ts +2 -2
- package/dist/functions/helpers/expected-out-name.d.ts.map +1 -1
- package/dist/functions/helpers/expected-out-name.js +12 -4
- package/dist/functions/helpers/expected-out-name.js.map +1 -1
- package/dist/functions/helpers/find-output-file-in-bucket.d.ts +8 -7
- package/dist/functions/helpers/find-output-file-in-bucket.d.ts.map +1 -1
- package/dist/functions/helpers/find-output-file-in-bucket.js +23 -17
- package/dist/functions/helpers/find-output-file-in-bucket.js.map +1 -1
- package/dist/functions/helpers/get-output-url-from-metadata.d.ts +3 -0
- package/dist/functions/helpers/get-output-url-from-metadata.d.ts.map +1 -0
- package/dist/functions/helpers/get-output-url-from-metadata.js +11 -0
- package/dist/functions/helpers/get-output-url-from-metadata.js.map +1 -0
- package/dist/functions/helpers/get-progress.d.ts.map +1 -1
- package/dist/functions/helpers/get-progress.js +17 -8
- package/dist/functions/helpers/get-progress.js.map +1 -1
- package/dist/functions/launch.d.ts.map +1 -1
- package/dist/functions/launch.js +11 -4
- package/dist/functions/launch.js.map +1 -1
- package/dist/functions/still.d.ts.map +1 -1
- package/dist/functions/still.js +4 -3
- package/dist/functions/still.js.map +1 -1
- package/dist/shared/constants.d.ts +14 -5
- package/dist/shared/constants.d.ts.map +1 -1
- package/dist/shared/constants.js +10 -2
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/validate-bucketname.d.ts +3 -1
- package/dist/shared/validate-bucketname.d.ts.map +1 -1
- package/dist/shared/validate-bucketname.js +6 -2
- package/dist/shared/validate-bucketname.js.map +1 -1
- package/dist/shared/validate-outname.d.ts +2 -1
- package/dist/shared/validate-outname.d.ts.map +1 -1
- package/dist/shared/validate-outname.js +17 -9
- package/dist/shared/validate-outname.js.map +1 -1
- package/package.json +8 -8
- package/remotionlambda.zip +0 -0
- package/dist/functions/helpers/presign-url.d.ts +0 -2
- package/dist/functions/helpers/presign-url.d.ts.map +0 -1
- package/dist/functions/helpers/presign-url.js +0 -9
- package/dist/functions/helpers/presign-url.js.map +0 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
[33m@remotion/lambda:build: [0mcache hit, replaying output [
|
|
1
|
+
[33m@remotion/lambda:build: [0mcache hit, replaying output [2mfa81270797102fb5[0m
|
|
2
2
|
[33m@remotion/lambda:build: [0m
|
|
3
3
|
[33m@remotion/lambda:build: [0m> @remotion/lambda@2.6.9 build /Users/jonathanburger/remotion/packages/lambda
|
|
4
4
|
[33m@remotion/lambda:build: [0m> tsc -d && pnpm run buildlambda
|
package/dist/api/deploy-site.js
CHANGED
|
@@ -26,7 +26,7 @@ const upload_dir_1 = require("./upload-dir");
|
|
|
26
26
|
const deploySite = async ({ bucketName, entryPoint, siteName, options, region, }) => {
|
|
27
27
|
var _a, _b, _c, _d;
|
|
28
28
|
(0, validate_aws_region_1.validateAwsRegion)(region);
|
|
29
|
-
(0, validate_bucketname_1.validateBucketName)(bucketName);
|
|
29
|
+
(0, validate_bucketname_1.validateBucketName)(bucketName, { mustStartWithRemotion: true });
|
|
30
30
|
const siteId = siteName !== null && siteName !== void 0 ? siteName : (0, random_hash_1.randomHash)();
|
|
31
31
|
(0, validate_site_name_1.validateSiteName)(siteId);
|
|
32
32
|
const bucketExists = await (0, bucket_exists_1.bucketExistsInRegion)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../src/api/deploy-site.ts"],"names":[],"mappings":";;;AAAA,uCAAsD;AACtD,oDAA8C;AAE9C,uDAAiD;AACjD,mDAAgD;AAChD,6DAAsD;AACtD,uDAAqD;AACrD,uDAAiD;AACjD,uEAAgE;AAChE,uEAAiE;AACjE,qEAA8D;AAC9D,mDAAqD;AACrD,2DAAoD;AACpD,6CAA0D;AAoB1D;;;;;;;;GAQG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,EAChC,UAAU,EACV,UAAU,EACV,QAAQ,EACR,OAAO,EACP,MAAM,GACW,EAAoB,EAAE;;IACvC,IAAA,uCAAiB,EAAC,MAAM,CAAC,CAAC;IAC1B,IAAA,wCAAkB,EAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../src/api/deploy-site.ts"],"names":[],"mappings":";;;AAAA,uCAAsD;AACtD,oDAA8C;AAE9C,uDAAiD;AACjD,mDAAgD;AAChD,6DAAsD;AACtD,uDAAqD;AACrD,uDAAiD;AACjD,uEAAgE;AAChE,uEAAiE;AACjE,qEAA8D;AAC9D,mDAAqD;AACrD,2DAAoD;AACpD,6CAA0D;AAoB1D;;;;;;;;GAQG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,EAChC,UAAU,EACV,UAAU,EACV,QAAQ,EACR,OAAO,EACP,MAAM,GACW,EAAoB,EAAE;;IACvC,IAAA,uCAAiB,EAAC,MAAM,CAAC,CAAC;IAC1B,IAAA,wCAAkB,EAAC,UAAU,EAAE,EAAC,qBAAqB,EAAE,IAAI,EAAC,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,IAAA,wBAAU,GAAE,CAAC;IACxC,IAAA,qCAAgB,EAAC,MAAM,CAAC,CAAC;IAEzB,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAoB,EAAC;QAC/C,UAAU;QACV,MAAM;QACN,mBAAmB,EAAE,MAAM,IAAA,6BAAY,EAAC,EAAC,MAAM,EAAC,CAAC;KACjD,CAAC,CAAC;IACH,IAAI,CAAC,YAAY,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,SAAS,CAAC,CAAC;KAChE;IAED,MAAM,SAAS,GAAG,IAAA,uBAAW,EAAC,MAAM,CAAC,CAAC;IACtC,MAAM,IAAA,wBAAU,EAAC;QAChB,UAAU;QACV,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS;QACnC,MAAM;QACN,QAAQ,EAAE,MAAM;KAChB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAU,EAC/B,UAAU,EACV,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,mCAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAC9C;QACC,UAAU,EAAE,IAAI,SAAS,GAAG;QAC5B,eAAe,EACd,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,mCAAI,oBAAS,CAAC,oBAAoB,EAAE;QAC7D,aAAa,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,mCAAI,oBAAS,CAAC,iBAAiB,EAAE;KACtE,CACD,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QACjB,IAAA,sBAAS,EAAC;YACT,MAAM,EAAE,UAAU;YAClB,MAAM;YACN,GAAG,EAAE,OAAO;YACZ,UAAU,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,mCAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;YAC1D,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,QAAQ;SACjB,CAAC;QACF,IAAA,mCAAe,EAAC;YACf,MAAM;YACN,UAAU;SACV,CAAC;KACF,CAAC,CAAC;IAEH,OAAO;QACN,QAAQ,EAAE,IAAA,4BAAc,EAAC,EAAC,UAAU,EAAE,SAAS,EAAE,MAAM,EAAC,CAAC;QACzD,QAAQ,EAAE,MAAM;KAChB,CAAC;AACH,CAAC,CAAC;AA3DW,QAAA,UAAU,cA2DrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-media.d.ts","sourceRoot":"","sources":["../../src/api/download-media.ts"],"names":[],"mappings":"AAIA,OAAO,EAEN,sBAAsB,EACtB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAGjD,oBAAY,kBAAkB,GAAG;IAChC,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,sBAAsB,CAAC;CACpC,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,aAAa,UAClB,kBAAkB,KACvB,QAAQ,mBAAmB,
|
|
1
|
+
{"version":3,"file":"download-media.d.ts","sourceRoot":"","sources":["../../src/api/download-media.ts"],"names":[],"mappings":"AAIA,OAAO,EAEN,sBAAsB,EACtB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAGjD,oBAAY,kBAAkB,GAAG;IAChC,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,sBAAsB,CAAC;CACpC,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,aAAa,UAClB,kBAAkB,KACvB,QAAQ,mBAAmB,CA8B7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,UApClB,kBAAkB,KACvB,QAAQ,mBAAmB,CAmCY,CAAC"}
|
|
@@ -23,10 +23,11 @@ const downloadMedia = async (input) => {
|
|
|
23
23
|
});
|
|
24
24
|
const outputPath = path_1.default.resolve(process.cwd(), input.outPath);
|
|
25
25
|
renderer_1.RenderInternals.ensureOutputDirectory(outputPath);
|
|
26
|
+
const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, input.bucketName);
|
|
26
27
|
const { sizeInBytes } = await (0, read_with_progress_1.lambdaDownloadFileWithProgress)({
|
|
27
|
-
bucketName:
|
|
28
|
+
bucketName: renderBucketName,
|
|
28
29
|
expectedBucketOwner,
|
|
29
|
-
key
|
|
30
|
+
key,
|
|
30
31
|
region: input.region,
|
|
31
32
|
onProgress: (_a = input.onProgress) !== null && _a !== void 0 ? _a : (() => undefined),
|
|
32
33
|
outputPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-media.js","sourceRoot":"","sources":["../../src/api/download-media.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAmD;AACnD,gDAAwB;AACxB,8EAA0E;AAC1E,kFAA2E;AAC3E,gFAGiD;AAEjD,6DAAsD;AAe/C,MAAM,aAAa,GAAG,KAAK,EACjC,KAAyB,EACM,EAAE;;IACjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,6BAAY,EAAC;QAC9C,MAAM,EAAE,KAAK,CAAC,MAAM;KACpB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,IAAA,uCAAiB,EAAC;QAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,mBAAmB;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9D,0BAAe,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,EAAC,
|
|
1
|
+
{"version":3,"file":"download-media.js","sourceRoot":"","sources":["../../src/api/download-media.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAmD;AACnD,gDAAwB;AACxB,8EAA0E;AAC1E,kFAA2E;AAC3E,gFAGiD;AAEjD,6DAAsD;AAe/C,MAAM,aAAa,GAAG,KAAK,EACjC,KAAyB,EACM,EAAE;;IACjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,6BAAY,EAAC;QAC9C,MAAM,EAAE,KAAK,CAAC,MAAM;KACpB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,IAAA,uCAAiB,EAAC;QAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,mBAAmB;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9D,0BAAe,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,EAAC,GAAG,EAAE,gBAAgB,EAAC,GAAG,IAAA,sCAAkB,EACjD,cAAc,EACd,KAAK,CAAC,UAAU,CAChB,CAAC;IACF,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,IAAA,mDAA8B,EAAC;QAC1D,UAAU,EAAE,gBAAgB;QAC5B,mBAAmB;QACnB,GAAG;QACH,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,UAAU,EAAE,MAAA,KAAK,CAAC,UAAU,mCAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACjD,UAAU;KACV,CAAC,CAAC;IAEH,OAAO;QACN,UAAU;QACV,WAAW;KACX,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,aAAa,iBAgCxB;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,qBAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-functions.d.ts","sourceRoot":"","sources":["../../src/api/get-functions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-functions.d.ts","sourceRoot":"","sources":["../../src/api/get-functions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAIjD,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAEjD,oBAAY,iBAAiB,GAAG;IAC/B,MAAM,EAAE,SAAS,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;CACxB,CAAC;AAoCF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,YACf,iBAAiB,KACxB,QAAQ,YAAY,EAAE,CA4CxB,CAAC"}
|
|
@@ -5,6 +5,26 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
|
5
5
|
const aws_clients_1 = require("../shared/aws-clients");
|
|
6
6
|
const constants_1 = require("../shared/constants");
|
|
7
7
|
const get_function_version_1 = require("../shared/get-function-version");
|
|
8
|
+
const getAllFunctions = async ({ existing, nextMarker, region, }) => {
|
|
9
|
+
const allLambdas = [...existing];
|
|
10
|
+
const lambdas = await (0, aws_clients_1.getLambdaClient)(region).send(new client_lambda_1.ListFunctionsCommand({
|
|
11
|
+
Marker: nextMarker !== null && nextMarker !== void 0 ? nextMarker : undefined,
|
|
12
|
+
}));
|
|
13
|
+
if (!lambdas.Functions) {
|
|
14
|
+
return allLambdas;
|
|
15
|
+
}
|
|
16
|
+
for (const lambda of lambdas.Functions) {
|
|
17
|
+
allLambdas.push(lambda);
|
|
18
|
+
}
|
|
19
|
+
if (lambdas.NextMarker) {
|
|
20
|
+
return getAllFunctions({
|
|
21
|
+
existing: allLambdas,
|
|
22
|
+
nextMarker: lambdas.NextMarker,
|
|
23
|
+
region,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
return allLambdas;
|
|
27
|
+
};
|
|
8
28
|
/**
|
|
9
29
|
*
|
|
10
30
|
*
|
|
@@ -15,8 +35,12 @@ const get_function_version_1 = require("../shared/get-function-version");
|
|
|
15
35
|
* @returns {Promise<FunctionInfo[]>} An array with the objects containing information about the deployed functions.
|
|
16
36
|
*/
|
|
17
37
|
const getFunctions = async (options) => {
|
|
18
|
-
const lambdas = await (
|
|
19
|
-
|
|
38
|
+
const lambdas = await getAllFunctions({
|
|
39
|
+
existing: [],
|
|
40
|
+
nextMarker: null,
|
|
41
|
+
region: options.region,
|
|
42
|
+
});
|
|
43
|
+
const remotionLambdas = lambdas.filter((f) => {
|
|
20
44
|
var _a;
|
|
21
45
|
return (_a = f.FunctionName) === null || _a === void 0 ? void 0 : _a.startsWith(constants_1.RENDER_FN_PREFIX);
|
|
22
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-functions.js","sourceRoot":"","sources":["../../src/api/get-functions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"get-functions.js","sourceRoot":"","sources":["../../src/api/get-functions.ts"],"names":[],"mappings":";;;AAAA,0DAGgC;AAEhC,uDAAsD;AACtD,mDAAsE;AACtE,yEAAkE;AAQlE,MAAM,eAAe,GAAG,KAAK,EAAE,EAC9B,QAAQ,EACR,UAAU,EACV,MAAM,GAKN,EAAoC,EAAE;IACtC,MAAM,UAAU,GAA4B,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,IAAA,6BAAe,EAAC,MAAM,CAAC,CAAC,IAAI,CACjD,IAAI,oCAAoB,CAAC;QACxB,MAAM,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,SAAS;KAC/B,CAAC,CACF,CAAC;IACF,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACvB,OAAO,UAAU,CAAC;KAClB;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE;QACvC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACxB;IAED,IAAI,OAAO,CAAC,UAAU,EAAE;QACvB,OAAO,eAAe,CAAC;YACtB,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM;SACN,CAAC,CAAC;KACH;IAED,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,YAAY,GAAG,KAAK,EAChC,OAA0B,EACA,EAAE;IAC5B,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;QACrC,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;KACtB,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;;QAC5C,OAAO,MAAA,CAAC,CAAC,YAAY,0CAAE,UAAU,CAAC,4BAAgB,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAChC,IAAI;YACH,MAAM,OAAO,GAAG,MAAM,IAAA,yCAAkB,EAAC;gBACxC,YAAY,EAAE,EAAE,CAAC,YAAsB;gBACvC,MAAM,EAAE,OAAO,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;SACf;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,IAAI,CAAC;SACZ;IACF,CAAC,CAAC,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAgB,EAAE;QAC5D,OAAO;YACN,YAAY,EAAE,MAAM,CAAC,YAAsB;YAC3C,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YACnB,cAAc,EAAE,MAAM,CAAC,UAAoB;YAC3C,gBAAgB,EAAE,MAAM,CAAC,OAAiB;SAC1C,CAAC;IACH,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC5B,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YAC5B,OAAO,IAAI,CAAC;SACZ;QAED,OAAO,CAAC,CAAC,OAAO,KAAK,2BAAe,CAAC;IACtC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,YAAY,gBA8CvB"}
|
package/dist/api/presign-url.js
CHANGED
|
@@ -17,7 +17,7 @@ const validate_presign_expiration_1 = require("../shared/validate-presign-expira
|
|
|
17
17
|
* @returns {Promise<string | null>} The public url of an object or `null` if `checkIfObjectExists=true` & object does not exist.
|
|
18
18
|
*/
|
|
19
19
|
const presignUrl = async ({ region, bucketName, objectKey, checkIfObjectExists = false, expiresInSeconds, }) => {
|
|
20
|
-
(0, validate_bucketname_1.validateBucketName)(bucketName);
|
|
20
|
+
(0, validate_bucketname_1.validateBucketName)(bucketName, { mustStartWithRemotion: false });
|
|
21
21
|
(0, validate_presign_expiration_1.validatePresignExpiration)(expiresInSeconds);
|
|
22
22
|
const s3Client = (0, aws_clients_1.getS3Client)(region);
|
|
23
23
|
if (checkIfObjectExists) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presign-url.js","sourceRoot":"","sources":["../../src/api/presign-url.ts"],"names":[],"mappings":";;;AAAA,kDAAuE;AACvE,wEAA2D;AAE3D,uDAAkD;AAClD,uEAAiE;AACjE,uFAAgF;AAUhF;;;;;;;;;GASG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,EAChC,MAAM,EACN,UAAU,EACV,SAAS,EACT,mBAAmB,GAAG,KAAK,EAC3B,gBAAgB,GACC,EAA0B,EAAE;IAC7C,IAAA,wCAAkB,EAAC,UAAU,CAAC,CAAC;IAC/
|
|
1
|
+
{"version":3,"file":"presign-url.js","sourceRoot":"","sources":["../../src/api/presign-url.ts"],"names":[],"mappings":";;;AAAA,kDAAuE;AACvE,wEAA2D;AAE3D,uDAAkD;AAClD,uEAAiE;AACjE,uFAAgF;AAUhF;;;;;;;;;GASG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,EAChC,MAAM,EACN,UAAU,EACV,SAAS,EACT,mBAAmB,GAAG,KAAK,EAC3B,gBAAgB,GACC,EAA0B,EAAE;IAC7C,IAAA,wCAAkB,EAAC,UAAU,EAAE,EAAC,qBAAqB,EAAE,KAAK,EAAC,CAAC,CAAC;IAC/D,IAAA,uDAAyB,EAAC,gBAAgB,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,MAAM,CAAC,CAAC;IAErC,IAAI,mBAAmB,EAAE;QACxB,IAAI;YACH,MAAM,QAAQ,CAAC,IAAI,CAClB,IAAI,6BAAiB,CAAC;gBACrB,MAAM,EAAE,UAAU;gBAClB,GAAG,EAAE,SAAS;aACd,CAAC,CACF,CAAC;SACF;QAAC,OAAO,GAAG,EAAE;YACb,IAAK,GAAsB,CAAC,IAAI,KAAK,UAAU,EAAE;gBAChD,OAAO,IAAI,CAAC;aACZ;YAED,MAAM,GAAG,CAAC;SACV;KACD;IAED,MAAM,UAAU,GAAG,IAAI,4BAAgB,CAAC;QACvC,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,SAAS;KACd,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,IAAA,mCAAY,EAAC,QAAQ,EAAE,UAAU,EAAE;QAC1D,SAAS,EAAE,gBAAgB;KAC3B,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAvCW,QAAA,UAAU,cAuCrB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { AwsRegion } from '../../pricing/aws-regions';
|
|
2
|
-
import { ChunkTimingData } from './types';
|
|
3
2
|
export declare const collectChunkInformation: ({ bucketName, renderId, region, expectedBucketOwner, }: {
|
|
4
3
|
bucketName: string;
|
|
5
4
|
renderId: string;
|
|
6
5
|
region: AwsRegion;
|
|
7
6
|
expectedBucketOwner: string;
|
|
8
|
-
}) => Promise<
|
|
7
|
+
}) => Promise<(Omit<import("./types").ObjectChunkTimingData, "timings"> & {
|
|
8
|
+
timings: number[];
|
|
9
|
+
})[]>;
|
|
9
10
|
//# sourceMappingURL=collect-data.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-data.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/collect-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"collect-data.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/collect-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAMpD,eAAO,MAAM,uBAAuB;gBAMvB,MAAM;cACR,MAAM;YACR,SAAS;yBACI,MAAM;;;KAsB3B,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { TimingProfile } from './types';
|
|
2
|
-
export declare const getFrameRangesFromProfile: (profile: TimingProfile) => [
|
|
2
|
+
export declare const getFrameRangesFromProfile: (profile: TimingProfile) => [
|
|
3
|
+
number,
|
|
4
|
+
number
|
|
5
|
+
][];
|
|
3
6
|
export declare const sortProfileByFrameRanges: (profile: TimingProfile) => import("./types").ChunkTimingData[];
|
|
4
7
|
//# sourceMappingURL=get-frame-ranges-from-profile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-frame-ranges-from-profile.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/get-frame-ranges-from-profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAEtC,eAAO,MAAM,yBAAyB,8BAEnC,
|
|
1
|
+
{"version":3,"file":"get-frame-ranges-from-profile.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/get-frame-ranges-from-profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAEtC,eAAO,MAAM,yBAAyB,8BAEnC;IAAC,MAAM;IAAE,MAAM;CAAC,EAElB,CAAC;AAEF,eAAO,MAAM,wBAAwB,iEAEpC,CAAC"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import { TimingProfile } from './types';
|
|
2
2
|
export declare const assignFrameToOther: ({ frameRanges, fromChunk, toChunk, framesToShift, }: {
|
|
3
|
-
frameRanges: [
|
|
3
|
+
frameRanges: [
|
|
4
|
+
number,
|
|
5
|
+
number
|
|
6
|
+
][];
|
|
4
7
|
fromChunk: number;
|
|
5
8
|
toChunk: number;
|
|
6
9
|
framesToShift: number;
|
|
7
|
-
}) => [
|
|
10
|
+
}) => [
|
|
11
|
+
number,
|
|
12
|
+
number
|
|
13
|
+
][];
|
|
8
14
|
export declare const optimizeProfile: (_profile: TimingProfile) => TimingProfile;
|
|
9
15
|
export declare const optimizeProfileRecursively: (profile: TimingProfile, amount: number) => TimingProfile;
|
|
10
16
|
//# sourceMappingURL=optimize-profile.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optimize-profile.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/optimize-profile.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAEtC,eAAO,MAAM,kBAAkB;iBAMjB,
|
|
1
|
+
{"version":3,"file":"optimize-profile.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/optimize-profile.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAEtC,eAAO,MAAM,kBAAkB;iBAMjB;QAAC,MAAM;QAAE,MAAM;KAAC,EAAE;eACpB,MAAM;aACR,MAAM;mBACA,MAAM;MAClB;IAAC,MAAM;IAAE,MAAM;CAAC,EAkCnB,CAAC;AAEF,eAAO,MAAM,eAAe,4CAsC3B,CAAC;AAEF,eAAO,MAAM,0BAA0B,mCAE9B,MAAM,kBAQd,CAAC"}
|
|
@@ -6,7 +6,10 @@ export declare const planFrameRanges: ({ chunkCount, framesPerLambda, optimizati
|
|
|
6
6
|
shouldUseOptimization: boolean;
|
|
7
7
|
frameRange: [number, number];
|
|
8
8
|
}) => {
|
|
9
|
-
chunks: [
|
|
9
|
+
chunks: [
|
|
10
|
+
number,
|
|
11
|
+
number
|
|
12
|
+
][];
|
|
10
13
|
didUseOptimization: boolean;
|
|
11
14
|
};
|
|
12
15
|
//# sourceMappingURL=plan-frame-ranges.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-frame-ranges.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/plan-frame-ranges.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,eAAe;gBAOf,MAAM;qBACD,MAAM;kBACT,mBAAmB,GAAG,IAAI;2BACjB,OAAO;gBAClB,CAAC,MAAM,EAAE,MAAM,CAAC;MACzB;IAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"plan-frame-ranges.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/plan-frame-ranges.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,eAAe;gBAOf,MAAM;qBACD,MAAM;kBACT,mBAAmB,GAAG,IAAI;2BACjB,OAAO;gBAClB,CAAC,MAAM,EAAE,MAAM,CAAC;MACzB;IAAC,MAAM,EAAE;QAAC,MAAM;QAAE,MAAM;KAAC,EAAE,CAAC;IAAC,kBAAkB,EAAE,OAAO,CAAA;CA0B3D,CAAC"}
|
|
@@ -3,6 +3,9 @@ export declare const getTimingForFrame: (profile: TimingProfile, frame: number)
|
|
|
3
3
|
export declare const getSimulatedTimingForFrameRange: (profile: TimingProfile, frameRange: [number, number]) => ChunkTimingData['timings'];
|
|
4
4
|
export declare const simulateFrameRanges: ({ profile, newFrameRanges, }: {
|
|
5
5
|
profile: TimingProfile;
|
|
6
|
-
newFrameRanges: [
|
|
6
|
+
newFrameRanges: [
|
|
7
|
+
number,
|
|
8
|
+
number
|
|
9
|
+
][];
|
|
7
10
|
}) => TimingProfile;
|
|
8
11
|
//# sourceMappingURL=simulate-frame-ranges.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulate-frame-ranges.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/simulate-frame-ranges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAEvD,eAAO,MAAM,iBAAiB,kCAAmC,MAAM,WAoBtE,CAAC;AAEF,eAAO,MAAM,+BAA+B,uCAE/B,CAAC,MAAM,EAAE,MAAM,CAAC,KAC1B,eAAe,CAAC,SAAS,CAW3B,CAAC;AAEF,eAAO,MAAM,mBAAmB;;oBAKf,
|
|
1
|
+
{"version":3,"file":"simulate-frame-ranges.d.ts","sourceRoot":"","sources":["../../../src/functions/chunk-optimization/simulate-frame-ranges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAEvD,eAAO,MAAM,iBAAiB,kCAAmC,MAAM,WAoBtE,CAAC;AAEF,eAAO,MAAM,+BAA+B,uCAE/B,CAAC,MAAM,EAAE,MAAM,CAAC,KAC1B,eAAe,CAAC,SAAS,CAW3B,CAAC;AAEF,eAAO,MAAM,mBAAmB;;oBAKf;QAAC,MAAM;QAAE,MAAM;KAAC,EAAE;mBAclC,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { _Object } from '@aws-sdk/client-s3';
|
|
2
2
|
import { RenderMetadata } from '../../shared/constants';
|
|
3
|
-
|
|
3
|
+
import { OutputFileMetadata } from './find-output-file-in-bucket';
|
|
4
|
+
export declare const estimatePriceFromBucket: ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, }: {
|
|
4
5
|
contents: _Object[];
|
|
5
6
|
renderMetadata: RenderMetadata | null;
|
|
6
|
-
bucketName: string;
|
|
7
7
|
memorySizeInMb: number;
|
|
8
|
+
outputFileMetadata: OutputFileMetadata | null;
|
|
8
9
|
}) => number | null;
|
|
9
10
|
//# sourceMappingURL=calculate-price-from-bucket.d.ts.map
|
|
@@ -1 +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;
|
|
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;AAG3E,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAIhE,eAAO,MAAM,uBAAuB;cAMzB,OAAO,EAAE;oBACH,cAAc,GAAG,IAAI;oBACrB,MAAM;wBACF,kBAAkB,GAAG,IAAI;mBA4C7C,CAAC"}
|
|
@@ -5,10 +5,9 @@ const estimate_price_1 = require("../../api/estimate-price");
|
|
|
5
5
|
const constants_1 = require("../../shared/constants");
|
|
6
6
|
const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-key");
|
|
7
7
|
const calculate_chunk_times_1 = require("./calculate-chunk-times");
|
|
8
|
-
const find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
|
|
9
8
|
const get_current_region_1 = require("./get-current-region");
|
|
10
9
|
const get_time_to_finish_1 = require("./get-time-to-finish");
|
|
11
|
-
const estimatePriceFromBucket = ({ contents, renderMetadata,
|
|
10
|
+
const estimatePriceFromBucket = ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, }) => {
|
|
12
11
|
var _a, _b, _c;
|
|
13
12
|
if (!renderMetadata) {
|
|
14
13
|
return null;
|
|
@@ -16,13 +15,8 @@ const estimatePriceFromBucket = ({ contents, renderMetadata, bucketName, memoryS
|
|
|
16
15
|
const parsedTimings = contents
|
|
17
16
|
.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderMetadata.renderId)); })
|
|
18
17
|
.map((f) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(f.Key));
|
|
19
|
-
const outputFile = (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
|
|
20
|
-
bucketName,
|
|
21
|
-
contents,
|
|
22
|
-
renderMetadata,
|
|
23
|
-
});
|
|
24
18
|
const timeToFinish = (0, get_time_to_finish_1.getTimeToFinish)({
|
|
25
|
-
lastModified: (_a =
|
|
19
|
+
lastModified: (_a = outputFileMetadata === null || outputFileMetadata === void 0 ? void 0 : outputFileMetadata.lastModified) !== null && _a !== void 0 ? _a : null,
|
|
26
20
|
renderMetadata,
|
|
27
21
|
});
|
|
28
22
|
const elapsedTime = timeToFinish === null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;AAC5E,mEAA4D;
|
|
1
|
+
{"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;AAC5E,mEAA4D;AAE5D,6DAAgE;AAChE,6DAAqD;AAE9C,MAAM,uBAAuB,GAAG,CAAC,EACvC,QAAQ,EACR,cAAc,EACd,cAAc,EACd,kBAAkB,GAMlB,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;KACd,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CACjB,CAAC;IACF,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AArDW,QAAA,uBAAuB,2BAqDlC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { _Object } from '@aws-sdk/client-s3';
|
|
2
2
|
import { AwsRegion } from '../../pricing/aws-regions';
|
|
3
3
|
import { PostRenderData, RenderMetadata } from '../../shared/constants';
|
|
4
|
+
import { OutputFileMetadata } from './find-output-file-in-bucket';
|
|
4
5
|
import { EnhancedErrorInfo } from './write-lambda-error';
|
|
5
|
-
export declare const createPostRenderData: ({ renderId,
|
|
6
|
+
export declare const createPostRenderData: ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }: {
|
|
6
7
|
renderId: string;
|
|
7
|
-
bucketName: string;
|
|
8
8
|
expectedBucketOwner: string;
|
|
9
9
|
region: AwsRegion;
|
|
10
10
|
memorySizeInMb: number;
|
|
@@ -13,5 +13,6 @@ export declare const createPostRenderData: ({ renderId, bucketName, region, memo
|
|
|
13
13
|
timeToEncode: number;
|
|
14
14
|
timeToDelete: number;
|
|
15
15
|
errorExplanations: EnhancedErrorInfo[];
|
|
16
|
-
|
|
16
|
+
outputFile: OutputFileMetadata;
|
|
17
|
+
}) => Promise<PostRenderData>;
|
|
17
18
|
//# sourceMappingURL=create-post-render-data.d.ts.map
|
|
@@ -1 +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;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAEN,cAAc,EACd,cAAc,EACd,MAAM,wBAAwB,CAAC;
|
|
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;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAEN,cAAc,EACd,cAAc,EACd,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAKhE,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;6BAsF9B,CAAC"}
|
|
@@ -5,13 +5,12 @@ const estimate_price_1 = require("../../api/estimate-price");
|
|
|
5
5
|
const constants_1 = require("../../shared/constants");
|
|
6
6
|
const parse_lambda_timings_key_1 = require("../../shared/parse-lambda-timings-key");
|
|
7
7
|
const calculate_chunk_times_1 = require("./calculate-chunk-times");
|
|
8
|
-
const find_output_file_in_bucket_1 = require("./find-output-file-in-bucket");
|
|
9
8
|
const get_files_to_delete_1 = require("./get-files-to-delete");
|
|
10
9
|
const get_lambdas_invoked_stats_1 = require("./get-lambdas-invoked-stats");
|
|
11
10
|
const get_retry_stats_1 = require("./get-retry-stats");
|
|
12
11
|
const get_time_to_finish_1 = require("./get-time-to-finish");
|
|
13
12
|
const OVERHEAD_TIME_PER_LAMBDA = 100;
|
|
14
|
-
const createPostRenderData = ({ renderId,
|
|
13
|
+
const createPostRenderData = async ({ renderId, region, memorySizeInMb, renderMetadata, contents, timeToEncode, errorExplanations, timeToDelete, outputFile, }) => {
|
|
15
14
|
var _a;
|
|
16
15
|
const initializedKeys = contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaTimingsPrefix)(renderId)); });
|
|
17
16
|
const parsedTimings = initializedKeys.map(({ Key }) => (0, parse_lambda_timings_key_1.parseLambdaTimingsKey)(Key));
|
|
@@ -23,11 +22,6 @@ const createPostRenderData = ({ renderId, bucketName, region, memorySizeInMb, re
|
|
|
23
22
|
memorySizeInMb,
|
|
24
23
|
region,
|
|
25
24
|
});
|
|
26
|
-
const outputFile = (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
|
|
27
|
-
contents,
|
|
28
|
-
bucketName,
|
|
29
|
-
renderMetadata,
|
|
30
|
-
});
|
|
31
25
|
if (!outputFile) {
|
|
32
26
|
throw new Error('Cannot wrap up without an output file in the S3 bucket.');
|
|
33
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-post-render-data.js","sourceRoot":"","sources":["../../../src/functions/helpers/create-post-render-data.ts"],"names":[],"mappings":";;;AACA,6DAAuD;AAEvD,sDAIgC;AAChC,oFAA4E;AAC5E,mEAA4D;
|
|
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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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { RenderMetadata } from '../../defaults';
|
|
2
|
-
export declare const getExpectedOutName: (renderMetadata: RenderMetadata) =>
|
|
1
|
+
import { OutNameOutput, RenderMetadata } from '../../defaults';
|
|
2
|
+
export declare const getExpectedOutName: (renderMetadata: RenderMetadata, bucketName: string) => OutNameOutput;
|
|
3
3
|
//# sourceMappingURL=expected-out-name.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expected-out-name.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/expected-out-name.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"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"}
|
|
@@ -3,15 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getExpectedOutName = void 0;
|
|
4
4
|
const renderer_1 = require("@remotion/renderer");
|
|
5
5
|
const defaults_1 = require("../../defaults");
|
|
6
|
-
const
|
|
6
|
+
const validate_outname_1 = require("../../shared/validate-outname");
|
|
7
|
+
const getExpectedOutName = (renderMetadata, bucketName) => {
|
|
7
8
|
if (renderMetadata.outName) {
|
|
8
|
-
|
|
9
|
+
(0, validate_outname_1.validateOutname)(renderMetadata.outName);
|
|
10
|
+
return (0, defaults_1.customOutName)(renderMetadata.renderId, bucketName, renderMetadata.outName);
|
|
9
11
|
}
|
|
10
12
|
if (renderMetadata.type === 'still') {
|
|
11
|
-
return
|
|
13
|
+
return {
|
|
14
|
+
renderBucketName: bucketName,
|
|
15
|
+
key: (0, defaults_1.outStillName)(renderMetadata.renderId, renderMetadata.imageFormat),
|
|
16
|
+
};
|
|
12
17
|
}
|
|
13
18
|
if (renderMetadata.type === 'video') {
|
|
14
|
-
return
|
|
19
|
+
return {
|
|
20
|
+
renderBucketName: bucketName,
|
|
21
|
+
key: (0, defaults_1.outName)(renderMetadata.renderId, renderer_1.RenderInternals.getFileExtensionFromCodec(renderMetadata.codec, 'final')),
|
|
22
|
+
};
|
|
15
23
|
}
|
|
16
24
|
throw new TypeError('no type passed');
|
|
17
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expected-out-name.js","sourceRoot":"","sources":["../../../src/functions/helpers/expected-out-name.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAEnD,
|
|
1
|
+
{"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AwsRegion } from '../..';
|
|
2
2
|
import { RenderMetadata } from '../../shared/constants';
|
|
3
|
-
export declare
|
|
4
|
-
contents: _Object[];
|
|
5
|
-
renderMetadata: RenderMetadata | null;
|
|
6
|
-
bucketName: string;
|
|
7
|
-
}) => {
|
|
3
|
+
export declare type OutputFileMetadata = {
|
|
8
4
|
url: string;
|
|
9
5
|
size: number;
|
|
10
6
|
lastModified: number;
|
|
11
|
-
}
|
|
7
|
+
};
|
|
8
|
+
export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, }: {
|
|
9
|
+
region: AwsRegion;
|
|
10
|
+
renderMetadata: RenderMetadata;
|
|
11
|
+
bucketName: string;
|
|
12
|
+
}) => Promise<OutputFileMetadata | null>;
|
|
12
13
|
//# sourceMappingURL=find-output-file-in-bucket.d.ts.map
|
|
@@ -1 +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":"
|
|
1
|
+
{"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"}
|
|
@@ -1,27 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findOutputFileInBucket = void 0;
|
|
4
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
5
|
+
const aws_clients_1 = require("../../shared/aws-clients");
|
|
4
6
|
const expected_out_name_1 = require("./expected-out-name");
|
|
5
|
-
const
|
|
6
|
-
const findOutputFileInBucket = ({
|
|
7
|
-
var _a
|
|
8
|
-
const expectedOutName = renderMetadata === null ? null : (0, expected_out_name_1.getExpectedOutName)(renderMetadata);
|
|
9
|
-
const output = expectedOutName
|
|
10
|
-
? renderMetadata
|
|
11
|
-
? (_a = contents.find((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.includes(expectedOutName); })) !== null && _a !== void 0 ? _a : null
|
|
12
|
-
: null
|
|
13
|
-
: null;
|
|
14
|
-
if (!output) {
|
|
15
|
-
return null;
|
|
16
|
-
}
|
|
7
|
+
const get_output_url_from_metadata_1 = require("./get-output-url-from-metadata");
|
|
8
|
+
const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, }) => {
|
|
9
|
+
var _a;
|
|
17
10
|
if (!renderMetadata) {
|
|
18
11
|
throw new Error('unexpectedly did not get renderMetadata');
|
|
19
12
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
13
|
+
const expectedOutData = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
|
|
14
|
+
try {
|
|
15
|
+
const head = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.HeadObjectCommand({
|
|
16
|
+
Bucket: expectedOutData.renderBucketName,
|
|
17
|
+
Key: expectedOutData.key,
|
|
18
|
+
}));
|
|
19
|
+
return {
|
|
20
|
+
lastModified: (_a = head.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(),
|
|
21
|
+
size: head.ContentLength,
|
|
22
|
+
url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
if (err.name === 'NotFound') {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
throw err;
|
|
30
|
+
}
|
|
25
31
|
};
|
|
26
32
|
exports.findOutputFileInBucket = findOutputFileInBucket;
|
|
27
33
|
//# sourceMappingURL=find-output-file-in-bucket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-output-file-in-bucket.js","sourceRoot":"","sources":["../../../src/functions/helpers/find-output-file-in-bucket.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"find-output-file-in-bucket.js","sourceRoot":"","sources":["../../../src/functions/helpers/find-output-file-in-bucket.ts"],"names":[],"mappings":";;;AAAA,kDAAqD;AAErD,0DAAqD;AAErD,2DAAuD;AACvD,iFAAwE;AAQjE,MAAM,sBAAsB,GAAG,KAAK,EAAE,EAC5C,MAAM,EACN,cAAc,EACd,UAAU,GAKV,EAAsC,EAAE;;IACxC,IAAI,CAAC,cAAc,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;KAC3D;IAED,MAAM,eAAe,GAAG,IAAA,sCAAkB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAEvE,IAAI;QACH,MAAM,IAAI,GAAG,MAAM,IAAA,yBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAC1C,IAAI,6BAAiB,CAAC;YACrB,MAAM,EAAE,eAAe,CAAC,gBAAgB;YACxC,GAAG,EAAE,eAAe,CAAC,GAAG;SACxB,CAAC,CACF,CAAC;QACF,OAAO;YACN,YAAY,EAAE,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,EAAY;YACpD,IAAI,EAAE,IAAI,CAAC,aAAuB;YAClC,GAAG,EAAE,IAAA,uDAAwB,EAAC,cAAc,EAAE,UAAU,CAAC;SACzD,CAAC;KACF;IAAC,OAAO,GAAG,EAAE;QACb,IAAK,GAAsB,CAAC,IAAI,KAAK,UAAU,EAAE;YAChD,OAAO,IAAI,CAAC;SACZ;QAED,MAAM,GAAG,CAAC;KACV;AACF,CAAC,CAAC;AAlCW,QAAA,sBAAsB,0BAkCjC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-output-url-from-metadata.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-output-url-from-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAI9C,eAAO,MAAM,wBAAwB,mBACpB,cAAc,cAClB,MAAM,WAMlB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getOutputUrlFromMetadata = void 0;
|
|
4
|
+
const expected_out_name_1 = require("./expected-out-name");
|
|
5
|
+
const get_current_region_1 = require("./get-current-region");
|
|
6
|
+
const getOutputUrlFromMetadata = (renderMetadata, bucketName) => {
|
|
7
|
+
const outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
|
|
8
|
+
return `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${outname.renderBucketName}/${outname.key}`;
|
|
9
|
+
};
|
|
10
|
+
exports.getOutputUrlFromMetadata = getOutputUrlFromMetadata;
|
|
11
|
+
//# sourceMappingURL=get-output-url-from-metadata.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-output-url-from-metadata.js","sourceRoot":"","sources":["../../../src/functions/helpers/get-output-url-from-metadata.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AACvD,6DAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACvC,cAA8B,EAC9B,UAAkB,EACjB,EAAE;IACH,MAAM,OAAO,GAAG,IAAA,sCAAkB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAC/D,OAAO,cAAc,IAAA,+CAA0B,GAAE,kBAChD,OAAO,CAAC,gBACT,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AACnB,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-progress.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-progress.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAIN,cAAc,EAEd,MAAM,wBAAwB,CAAC;AAoBhC,eAAO,MAAM,WAAW;gBAQX,MAAM;cACR,MAAM;yBACK,MAAM;YACnB,SAAS;oBACD,MAAM;0BACA,MAAM;MACzB,QAAQ,cAAc,
|
|
1
|
+
{"version":3,"file":"get-progress.d.ts","sourceRoot":"","sources":["../../../src/functions/helpers/get-progress.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAIN,cAAc,EAEd,MAAM,wBAAwB,CAAC;AAoBhC,eAAO,MAAM,WAAW;gBAQX,MAAM;cACR,MAAM;yBACK,MAAM;YACnB,SAAS;oBACD,MAAM;0BACA,MAAM;MACzB,QAAQ,cAAc,CA+NzB,CAAC"}
|
|
@@ -29,6 +29,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
|
|
|
29
29
|
expectedBucketOwner,
|
|
30
30
|
});
|
|
31
31
|
if (postRenderData) {
|
|
32
|
+
const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName);
|
|
32
33
|
return {
|
|
33
34
|
bucket: bucketName,
|
|
34
35
|
renderSize: postRenderData.renderSize,
|
|
@@ -63,7 +64,8 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
|
|
|
63
64
|
timeToInvokeLambdas: postRenderData.timeToInvokeLambdas,
|
|
64
65
|
overallProgress: 1,
|
|
65
66
|
retriesInfo: postRenderData.retriesInfo,
|
|
66
|
-
outKey:
|
|
67
|
+
outKey: outData.key,
|
|
68
|
+
outBucket: outData.renderBucketName,
|
|
67
69
|
};
|
|
68
70
|
}
|
|
69
71
|
const contents = await (0, io_1.lambdaLs)({
|
|
@@ -97,17 +99,19 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
|
|
|
97
99
|
expectedBucketOwner,
|
|
98
100
|
}),
|
|
99
101
|
]);
|
|
102
|
+
const outputFile = renderMetadata
|
|
103
|
+
? await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
|
|
104
|
+
bucketName,
|
|
105
|
+
renderMetadata,
|
|
106
|
+
region,
|
|
107
|
+
})
|
|
108
|
+
: null;
|
|
100
109
|
const accruedSoFar = Number((0, calculate_price_from_bucket_1.estimatePriceFromBucket)({
|
|
101
110
|
contents,
|
|
102
111
|
renderMetadata,
|
|
103
|
-
bucketName,
|
|
104
112
|
memorySizeInMb,
|
|
113
|
+
outputFileMetadata: outputFile,
|
|
105
114
|
}));
|
|
106
|
-
const outputFile = (0, find_output_file_in_bucket_1.findOutputFileInBucket)({
|
|
107
|
-
bucketName,
|
|
108
|
-
contents,
|
|
109
|
-
renderMetadata,
|
|
110
|
-
});
|
|
111
115
|
const cleanup = (0, get_cleanup_progress_1.getCleanupProgress)({
|
|
112
116
|
chunkCount: (_a = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _a !== void 0 ? _a : 0,
|
|
113
117
|
contents,
|
|
@@ -195,7 +199,12 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
|
|
|
195
199
|
rendering: renderMetadata ? chunkCount / renderMetadata.totalChunks : 0,
|
|
196
200
|
}),
|
|
197
201
|
retriesInfo,
|
|
198
|
-
outKey: outputFile && renderMetadata
|
|
202
|
+
outKey: outputFile && renderMetadata
|
|
203
|
+
? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).key
|
|
204
|
+
: null,
|
|
205
|
+
outBucket: outputFile && renderMetadata
|
|
206
|
+
? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).renderBucketName
|
|
207
|
+
: null,
|
|
199
208
|
};
|
|
200
209
|
};
|
|
201
210
|
exports.getProgress = getProgress;
|