@remotion/lambda 4.0.0-oops.3 → 4.0.0-prefetch.10
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/dist/admin/bundle-lambda.js +1 -0
- package/dist/admin/make-layer-public.js +8 -8
- package/dist/api/bucket-exists.d.ts +1 -1
- package/dist/api/clean-items.d.ts +1 -1
- package/dist/api/clean-items.js +2 -5
- package/dist/api/create-bucket.d.ts +1 -1
- package/dist/api/create-function.d.ts +4 -3
- package/dist/api/create-function.js +3 -2
- package/dist/api/delete-function.d.ts +1 -1
- package/dist/api/delete-site.d.ts +1 -1
- package/dist/api/deploy-function.d.ts +3 -2
- package/dist/api/deploy-function.js +7 -2
- package/dist/api/deploy-site.d.ts +3 -3
- package/dist/api/deploy-site.js +2 -3
- package/dist/api/download-media.d.ts +2 -2
- package/dist/api/enable-s3-website.d.ts +1 -1
- package/dist/api/estimate-price.d.ts +2 -2
- package/dist/api/get-aws-client.d.ts +2 -2
- package/dist/api/get-aws-client.js +5 -1
- package/dist/api/get-buckets.d.ts +1 -1
- package/dist/api/get-function-info.d.ts +2 -3
- package/dist/api/get-functions.d.ts +2 -2
- package/dist/api/get-functions.js +2 -1
- package/dist/api/get-or-create-bucket.d.ts +1 -1
- package/dist/api/get-regions.d.ts +1 -1
- package/dist/api/get-render-progress.d.ts +2 -2
- package/dist/api/get-render-progress.js +2 -0
- package/dist/api/get-sites.d.ts +2 -2
- package/dist/api/iam-validation/role-permissions.d.ts +2 -1
- package/dist/api/iam-validation/simulate-rule.d.ts +1 -1
- package/dist/api/iam-validation/simulate.d.ts +2 -2
- package/dist/api/mock-functions.d.ts +6 -7
- package/dist/api/presign-url.d.ts +3 -2
- package/dist/api/presign-url.js +5 -0
- package/dist/api/render-media-on-lambda.d.ts +15 -8
- package/dist/api/render-media-on-lambda.js +58 -32
- package/dist/api/render-still-on-lambda.d.ts +9 -7
- package/dist/api/render-still-on-lambda.js +49 -31
- package/dist/api/upload-dir.d.ts +2 -2
- package/dist/api/upload-dir.js +9 -4
- package/dist/cli/args.d.ts +5 -3
- package/dist/cli/commands/functions/deploy.js +8 -3
- package/dist/cli/commands/render/progress.d.ts +4 -4
- package/dist/cli/commands/render/progress.js +11 -3
- package/dist/cli/commands/render/render.js +15 -10
- package/dist/cli/commands/sites/create.js +2 -3
- package/dist/cli/commands/sites/ls.js +1 -2
- package/dist/cli/commands/sites/rm.js +2 -3
- package/dist/cli/commands/sites/rmall.js +2 -3
- package/dist/cli/commands/still.js +2 -9
- package/dist/cli/get-aws-region.d.ts +1 -1
- package/dist/cli/get-aws-region.js +2 -1
- package/dist/cli/helpers/find-function-name.js +3 -2
- package/dist/cli/helpers/get-cloudwatch-stream-url.d.ts +2 -2
- package/dist/cli/helpers/progress-bar.js +1 -2
- package/dist/cli/index.js +11 -1
- package/dist/defaults.js +5 -1
- package/dist/functions/chunk-optimization/can-use-optimization.d.ts +1 -1
- package/dist/functions/chunk-optimization/can-use-optimization.js +2 -2
- package/dist/functions/chunk-optimization/collect-data.d.ts +1 -1
- package/dist/functions/chunk-optimization/get-frame-ranges-from-profile.d.ts +1 -1
- package/dist/functions/chunk-optimization/get-profile-duration.d.ts +1 -1
- package/dist/functions/chunk-optimization/is-valid-profile.d.ts +1 -1
- package/dist/functions/chunk-optimization/is-valid-profile.js +2 -2
- package/dist/functions/chunk-optimization/optimize-invocation-order.d.ts +1 -1
- package/dist/functions/chunk-optimization/optimize-profile.d.ts +1 -1
- package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts +3 -3
- package/dist/functions/chunk-optimization/plan-frame-ranges.js +7 -6
- package/dist/functions/chunk-optimization/s3-optimization-file.d.ts +2 -2
- package/dist/functions/chunk-optimization/s3-optimization-file.js +1 -0
- package/dist/functions/chunk-optimization/simulate-frame-ranges.d.ts +1 -1
- package/dist/functions/chunk-optimization/sort-by-duration.d.ts +1 -1
- package/dist/functions/chunk-optimization/types.d.ts +2 -2
- package/dist/functions/helpers/calculate-chunk-times.d.ts +1 -1
- package/dist/functions/helpers/calculate-price-from-bucket.d.ts +4 -4
- package/dist/functions/helpers/check-if-render-exists.d.ts +3 -0
- package/dist/functions/helpers/check-if-render-exists.js +14 -0
- package/dist/functions/helpers/concat-videos.d.ts +6 -4
- package/dist/functions/helpers/concat-videos.js +8 -2
- package/dist/functions/helpers/create-post-render-data.d.ts +6 -6
- package/dist/functions/helpers/create-post-render-data.js +12 -7
- package/dist/functions/helpers/delete-chunks.d.ts +3 -3
- package/dist/functions/helpers/expected-out-name.d.ts +1 -1
- package/dist/functions/helpers/find-output-file-in-bucket.d.ts +2 -2
- package/dist/functions/helpers/find-output-file-in-bucket.js +6 -0
- package/dist/functions/helpers/format-costs-info.d.ts +1 -1
- package/dist/functions/helpers/get-browser-instance.d.ts +2 -1
- package/dist/functions/helpers/get-browser-instance.js +3 -1
- package/dist/functions/helpers/get-cleanup-progress.d.ts +2 -2
- package/dist/functions/helpers/get-current-architecture.d.ts +1 -1
- package/dist/functions/helpers/get-encoding-metadata.d.ts +2 -2
- package/dist/functions/helpers/get-files-to-delete.js +3 -3
- package/dist/functions/helpers/get-final-encoding-status.d.ts +2 -2
- package/dist/functions/helpers/get-lambdas-invoked-stats.d.ts +8 -3
- package/dist/functions/helpers/get-lambdas-invoked-stats.js +8 -8
- package/dist/functions/helpers/get-output-url-from-metadata.d.ts +1 -1
- package/dist/functions/helpers/get-post-render-data.d.ts +2 -2
- package/dist/functions/helpers/get-progress.d.ts +2 -2
- package/dist/functions/helpers/get-progress.js +22 -11
- package/dist/functions/helpers/get-render-metadata.d.ts +2 -2
- package/dist/functions/helpers/get-retry-stats.d.ts +1 -1
- package/dist/functions/helpers/get-retry-stats.js +1 -1
- package/dist/functions/helpers/get-time-to-finish.d.ts +1 -1
- package/dist/functions/helpers/inspect-errors.d.ts +3 -3
- package/dist/functions/helpers/io.d.ts +13 -6
- package/dist/functions/helpers/io.js +21 -3
- package/dist/functions/helpers/min-max.d.ts +1 -1
- package/dist/functions/helpers/min-max.js +1 -1
- package/dist/functions/helpers/print-cloudwatch-helper.d.ts +2 -2
- package/dist/functions/helpers/read-with-progress.d.ts +3 -2
- package/dist/functions/helpers/read-with-progress.js +13 -1
- package/dist/functions/helpers/validate-composition.d.ts +10 -4
- package/dist/functions/helpers/validate-composition.js +7 -1
- package/dist/functions/helpers/write-lambda-error.d.ts +1 -1
- package/dist/functions/helpers/write-lambda-error.js +1 -0
- package/dist/functions/helpers/write-post-render-data.d.ts +2 -2
- package/dist/functions/helpers/write-post-render-data.js +1 -0
- package/dist/functions/index.d.ts +3 -2
- package/dist/functions/index.js +14 -7
- package/dist/functions/info.d.ts +2 -2
- package/dist/functions/info.js +2 -1
- package/dist/functions/launch.d.ts +1 -1
- package/dist/functions/launch.js +73 -26
- package/dist/functions/progress.d.ts +1 -1
- package/dist/functions/progress.js +7 -0
- package/dist/functions/renderer.d.ts +1 -1
- package/dist/functions/renderer.js +105 -71
- package/dist/functions/start.d.ts +6 -2
- package/dist/functions/start.js +25 -3
- package/dist/functions/still.d.ts +1 -1
- package/dist/functions/still.js +26 -7
- package/dist/index.d.ts +33 -18
- package/dist/pricing/price-per-1-s.d.ts +1 -1
- package/dist/shared/aws-clients.d.ts +1 -1
- package/dist/shared/bundle-site.d.ts +1 -6
- package/dist/shared/call-lambda.d.ts +3 -3
- package/dist/shared/check-credentials.js +2 -2
- package/dist/shared/constants.d.ts +38 -17
- package/dist/shared/constants.js +8 -7
- package/dist/shared/content-disposition-header.d.ts +7 -0
- package/dist/shared/content-disposition-header.js +19 -0
- package/dist/shared/convert-to-serve-url.d.ts +1 -1
- package/dist/shared/get-account-id.d.ts +1 -1
- package/dist/shared/get-cloudwatch-stream-url.d.ts +8 -0
- package/dist/shared/get-cloudwatch-stream-url.js +7 -0
- package/dist/shared/get-function-version.d.ts +2 -3
- package/dist/shared/get-most-expensive-chunks.d.ts +8 -0
- package/dist/shared/get-most-expensive-chunks.js +25 -0
- package/dist/shared/hosted-layers.d.ts +2 -2
- package/dist/shared/hosted-layers.js +60 -60
- package/dist/shared/is-in-lambda.js +5 -1
- package/dist/shared/lambda-version-string.d.ts +1 -0
- package/dist/shared/lambda-version-string.js +7 -0
- package/dist/shared/make-s3-key.d.ts +1 -0
- package/dist/shared/make-s3-key.js +11 -0
- package/dist/shared/make-s3-url.d.ts +1 -1
- package/dist/shared/p-limit.d.ts +1 -0
- package/dist/shared/p-limit.js +57 -0
- package/dist/shared/random-hash.d.ts +2 -2
- package/dist/shared/random-hash.js +1 -1
- package/dist/shared/return-values.d.ts +7 -7
- package/dist/shared/return-values.js +0 -1
- package/dist/shared/stream-to-string.d.ts +2 -1
- package/dist/shared/truthy.d.ts +3 -0
- package/dist/shared/truthy.js +7 -0
- package/dist/shared/validate-aws-region.d.ts +1 -1
- package/dist/shared/validate-custom-role-arn.d.ts +1 -0
- package/dist/shared/validate-custom-role-arn.js +11 -0
- package/dist/shared/validate-download-behavior.d.ts +1 -0
- package/dist/shared/validate-download-behavior.js +21 -0
- package/dist/shared/validate-frames-per-lambda.js +1 -1
- package/dist/shared/validate-lambda-codec.d.ts +4 -0
- package/dist/shared/validate-lambda-codec.js +30 -0
- package/dist/shared/validate-outname.d.ts +1 -1
- package/dist/shared/validate-presign-expiration.d.ts +0 -2
- package/dist/shared/validate-presign-expiration.js +7 -7
- package/dist/shared/validate-privacy.d.ts +1 -1
- package/dist/shared/validate-privacy.js +2 -2
- package/package.json +13 -14
- package/remotionlambda.zip +0 -0
- package/dist/cli/helpers/format-bytes.d.ts +0 -6
- package/dist/cli/helpers/format-bytes.js +0 -103
- package/dist/shared/chunk.d.ts +0 -1
- package/dist/shared/chunk.js +0 -11
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.renderVideoOnLambda = exports.renderMediaOnLambda = void 0;
|
|
4
|
-
const
|
|
4
|
+
const version_1 = require("remotion/version");
|
|
5
5
|
const call_lambda_1 = require("../shared/call-lambda");
|
|
6
6
|
const constants_1 = require("../shared/constants");
|
|
7
7
|
const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
|
|
8
|
+
const get_cloudwatch_stream_url_1 = require("../shared/get-cloudwatch-stream-url");
|
|
9
|
+
const validate_download_behavior_1 = require("../shared/validate-download-behavior");
|
|
8
10
|
const validate_frames_per_lambda_1 = require("../shared/validate-frames-per-lambda");
|
|
11
|
+
const validate_lambda_codec_1 = require("../shared/validate-lambda-codec");
|
|
9
12
|
const validate_serveurl_1 = require("../shared/validate-serveurl");
|
|
10
13
|
/**
|
|
11
14
|
* @description Triggers a render on a lambda given a composition and a lambda function.
|
|
@@ -25,40 +28,63 @@ const validate_serveurl_1 = require("../shared/validate-serveurl");
|
|
|
25
28
|
* @param params.logLevel Level of logging that Lambda function should perform. Default "info".
|
|
26
29
|
* @returns {Promise<RenderMediaOnLambdaOutput>} See documentation for detailed structure
|
|
27
30
|
*/
|
|
28
|
-
const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, }) => {
|
|
31
|
+
const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec, imageFormat, crf, envVariables, pixelFormat, proResProfile, quality, region, maxRetries, composition, framesPerLambda, privacy, logLevel, frameRange, outName, timeoutInMilliseconds, chromiumOptions, scale, numberOfGifLoops, everyNthFrame, concurrencyPerLambda, downloadBehavior, muted, }) => {
|
|
32
|
+
var _a;
|
|
33
|
+
const actualCodec = (0, validate_lambda_codec_1.validateLambdaCodec)(codec);
|
|
29
34
|
(0, validate_serveurl_1.validateServeUrl)(serveUrl);
|
|
30
35
|
(0, validate_frames_per_lambda_1.validateFramesPerLambda)(framesPerLambda !== null && framesPerLambda !== void 0 ? framesPerLambda : null);
|
|
36
|
+
(0, validate_download_behavior_1.validateDownloadBehavior)(downloadBehavior);
|
|
31
37
|
const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
38
|
+
try {
|
|
39
|
+
const res = await (0, call_lambda_1.callLambda)({
|
|
40
|
+
functionName,
|
|
41
|
+
type: constants_1.LambdaRoutines.start,
|
|
42
|
+
payload: {
|
|
43
|
+
framesPerLambda: framesPerLambda !== null && framesPerLambda !== void 0 ? framesPerLambda : null,
|
|
44
|
+
composition,
|
|
45
|
+
serveUrl: realServeUrl,
|
|
46
|
+
inputProps,
|
|
47
|
+
codec: actualCodec,
|
|
48
|
+
imageFormat,
|
|
49
|
+
crf,
|
|
50
|
+
envVariables,
|
|
51
|
+
pixelFormat,
|
|
52
|
+
proResProfile,
|
|
53
|
+
quality,
|
|
54
|
+
maxRetries,
|
|
55
|
+
privacy,
|
|
56
|
+
logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
|
|
57
|
+
frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
|
|
58
|
+
outName: outName !== null && outName !== void 0 ? outName : null,
|
|
59
|
+
timeoutInMilliseconds: timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : 30000,
|
|
60
|
+
chromiumOptions: chromiumOptions !== null && chromiumOptions !== void 0 ? chromiumOptions : {},
|
|
61
|
+
scale: scale !== null && scale !== void 0 ? scale : 1,
|
|
62
|
+
everyNthFrame: everyNthFrame !== null && everyNthFrame !== void 0 ? everyNthFrame : 1,
|
|
63
|
+
numberOfGifLoops: numberOfGifLoops !== null && numberOfGifLoops !== void 0 ? numberOfGifLoops : 0,
|
|
64
|
+
concurrencyPerLambda: concurrencyPerLambda !== null && concurrencyPerLambda !== void 0 ? concurrencyPerLambda : 1,
|
|
65
|
+
downloadBehavior: downloadBehavior !== null && downloadBehavior !== void 0 ? downloadBehavior : { type: 'play-in-browser' },
|
|
66
|
+
muted: muted !== null && muted !== void 0 ? muted : false,
|
|
67
|
+
version: version_1.VERSION,
|
|
68
|
+
},
|
|
69
|
+
region,
|
|
70
|
+
});
|
|
71
|
+
return {
|
|
72
|
+
renderId: res.renderId,
|
|
73
|
+
bucketName: res.bucketName,
|
|
74
|
+
cloudWatchLogs: (0, get_cloudwatch_stream_url_1.getCloudwatchStreamUrl)({
|
|
75
|
+
functionName,
|
|
76
|
+
method: constants_1.LambdaRoutines.renderer,
|
|
77
|
+
region,
|
|
78
|
+
renderId: res.renderId,
|
|
79
|
+
}),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
if ((_a = err.stack) === null || _a === void 0 ? void 0 : _a.includes('UnrecognizedClientException')) {
|
|
84
|
+
throw new Error('UnrecognizedClientException: The AWS credentials provided were probably mixed up. Learn how to fix this issue here: https://remotion.dev/docs/lambda/troubleshooting/unrecognizedclientexception');
|
|
85
|
+
}
|
|
86
|
+
throw err;
|
|
87
|
+
}
|
|
62
88
|
};
|
|
63
89
|
exports.renderMediaOnLambda = renderMediaOnLambda;
|
|
64
90
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ChromiumOptions } from '@remotion/renderer';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import type { ChromiumOptions, LogLevel, StillImageFormat } from '@remotion/renderer';
|
|
2
|
+
import type { AwsRegion } from '../pricing/aws-regions';
|
|
3
|
+
import type { CostsInfo, OutNameInput, Privacy } from '../shared/constants';
|
|
4
|
+
import type { DownloadBehavior } from '../shared/content-disposition-header';
|
|
5
5
|
export declare type RenderStillOnLambdaInput = {
|
|
6
6
|
region: AwsRegion;
|
|
7
7
|
functionName: string;
|
|
@@ -9,16 +9,17 @@ export declare type RenderStillOnLambdaInput = {
|
|
|
9
9
|
composition: string;
|
|
10
10
|
inputProps: unknown;
|
|
11
11
|
imageFormat: StillImageFormat;
|
|
12
|
-
privacy:
|
|
12
|
+
privacy: Privacy;
|
|
13
13
|
maxRetries?: number;
|
|
14
14
|
envVariables?: Record<string, string>;
|
|
15
15
|
quality?: number;
|
|
16
16
|
frame?: number;
|
|
17
17
|
logLevel?: LogLevel;
|
|
18
|
-
outName?:
|
|
18
|
+
outName?: OutNameInput;
|
|
19
19
|
timeoutInMilliseconds?: number;
|
|
20
20
|
chromiumOptions?: ChromiumOptions;
|
|
21
21
|
scale?: number;
|
|
22
|
+
downloadBehavior?: DownloadBehavior;
|
|
22
23
|
};
|
|
23
24
|
export declare type RenderStillOnLambdaOutput = {
|
|
24
25
|
estimatedPrice: CostsInfo;
|
|
@@ -26,6 +27,7 @@ export declare type RenderStillOnLambdaOutput = {
|
|
|
26
27
|
sizeInBytes: number;
|
|
27
28
|
bucketName: string;
|
|
28
29
|
renderId: string;
|
|
30
|
+
cloudWatchLogs: string;
|
|
29
31
|
};
|
|
30
32
|
/**
|
|
31
33
|
* @description Renders a still frame on Lambda
|
|
@@ -43,4 +45,4 @@ export declare type RenderStillOnLambdaOutput = {
|
|
|
43
45
|
* @param params.privacy Whether the item in the S3 bucket should be public. Possible values: `"private"` and `"public"`
|
|
44
46
|
* @returns {Promise<RenderStillOnLambdaOutput>} See documentation for exact response structure.
|
|
45
47
|
*/
|
|
46
|
-
export declare const renderStillOnLambda: ({ functionName, serveUrl, inputProps, imageFormat, envVariables, quality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, }: RenderStillOnLambdaInput) => Promise<RenderStillOnLambdaOutput>;
|
|
48
|
+
export declare const renderStillOnLambda: ({ functionName, serveUrl, inputProps, imageFormat, envVariables, quality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, downloadBehavior, }: RenderStillOnLambdaInput) => Promise<RenderStillOnLambdaOutput>;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.renderStillOnLambda = void 0;
|
|
4
|
-
const
|
|
4
|
+
const version_1 = require("remotion/version");
|
|
5
5
|
const call_lambda_1 = require("../shared/call-lambda");
|
|
6
6
|
const constants_1 = require("../shared/constants");
|
|
7
7
|
const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
|
|
8
|
+
const get_cloudwatch_stream_url_1 = require("../shared/get-cloudwatch-stream-url");
|
|
8
9
|
/**
|
|
9
10
|
* @description Renders a still frame on Lambda
|
|
10
11
|
* @link https://remotion.dev/docs/lambda/renderstillonlambda
|
|
@@ -21,36 +22,53 @@ const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
|
|
|
21
22
|
* @param params.privacy Whether the item in the S3 bucket should be public. Possible values: `"private"` and `"public"`
|
|
22
23
|
* @returns {Promise<RenderStillOnLambdaOutput>} See documentation for exact response structure.
|
|
23
24
|
*/
|
|
24
|
-
const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFormat, envVariables, quality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, }) => {
|
|
25
|
+
const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFormat, envVariables, quality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, downloadBehavior, }) => {
|
|
26
|
+
var _a;
|
|
25
27
|
const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
28
|
+
try {
|
|
29
|
+
const res = await (0, call_lambda_1.callLambda)({
|
|
30
|
+
functionName,
|
|
31
|
+
type: constants_1.LambdaRoutines.still,
|
|
32
|
+
payload: {
|
|
33
|
+
composition,
|
|
34
|
+
serveUrl: realServeUrl,
|
|
35
|
+
inputProps,
|
|
36
|
+
imageFormat,
|
|
37
|
+
envVariables,
|
|
38
|
+
quality,
|
|
39
|
+
maxRetries: maxRetries !== null && maxRetries !== void 0 ? maxRetries : constants_1.DEFAULT_MAX_RETRIES,
|
|
40
|
+
frame: frame !== null && frame !== void 0 ? frame : 0,
|
|
41
|
+
privacy,
|
|
42
|
+
attempt: 1,
|
|
43
|
+
logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
|
|
44
|
+
outName: outName !== null && outName !== void 0 ? outName : null,
|
|
45
|
+
timeoutInMilliseconds: timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : 30000,
|
|
46
|
+
chromiumOptions: chromiumOptions !== null && chromiumOptions !== void 0 ? chromiumOptions : {},
|
|
47
|
+
scale: scale !== null && scale !== void 0 ? scale : 1,
|
|
48
|
+
downloadBehavior: downloadBehavior !== null && downloadBehavior !== void 0 ? downloadBehavior : { type: 'play-in-browser' },
|
|
49
|
+
version: version_1.VERSION,
|
|
50
|
+
},
|
|
51
|
+
region,
|
|
52
|
+
});
|
|
53
|
+
return {
|
|
54
|
+
estimatedPrice: res.estimatedPrice,
|
|
55
|
+
url: res.output,
|
|
56
|
+
sizeInBytes: res.size,
|
|
57
|
+
bucketName: res.bucketName,
|
|
58
|
+
renderId: res.renderId,
|
|
59
|
+
cloudWatchLogs: (0, get_cloudwatch_stream_url_1.getCloudwatchStreamUrl)({
|
|
60
|
+
functionName,
|
|
61
|
+
method: constants_1.LambdaRoutines.still,
|
|
62
|
+
region,
|
|
63
|
+
renderId: res.renderId,
|
|
64
|
+
}),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
if ((_a = err.stack) === null || _a === void 0 ? void 0 : _a.includes('UnrecognizedClientException')) {
|
|
69
|
+
throw new Error('UnrecognizedClientException: The AWS credentials provided were probably mixed up. Learn how to fix this issue here: https://remotion.dev/docs/lambda/troubleshooting/unrecognizedclientexception');
|
|
70
|
+
}
|
|
71
|
+
throw err;
|
|
72
|
+
}
|
|
55
73
|
};
|
|
56
74
|
exports.renderStillOnLambda = renderStillOnLambda;
|
package/dist/api/upload-dir.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Privacy } from '../defaults';
|
|
2
|
-
import { AwsRegion } from '../pricing/aws-regions';
|
|
1
|
+
import type { Privacy } from '../defaults';
|
|
2
|
+
import type { AwsRegion } from '../pricing/aws-regions';
|
|
3
3
|
export declare type UploadDirProgress = {
|
|
4
4
|
totalFiles: number;
|
|
5
5
|
filesUploaded: number;
|
package/dist/api/upload-dir.js
CHANGED
|
@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.uploadDir = exports.getDirFiles = void 0;
|
|
7
7
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
8
8
|
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
9
|
-
const bundler_1 = require("@remotion/bundler");
|
|
10
9
|
const fs_1 = require("fs");
|
|
10
|
+
const mime_types_1 = __importDefault(require("mime-types"));
|
|
11
11
|
const path_1 = __importDefault(require("path"));
|
|
12
12
|
const aws_clients_1 = require("../shared/aws-clients");
|
|
13
|
+
const make_s3_key_1 = require("../shared/make-s3-key");
|
|
13
14
|
const getDirFiles = (entry) => {
|
|
14
15
|
throw new TypeError('should only be executed in test ' + JSON.stringify(entry));
|
|
15
16
|
};
|
|
@@ -38,10 +39,14 @@ const uploadDir = async ({ bucket, region, dir, onProgress, folder, privacy, })
|
|
|
38
39
|
}
|
|
39
40
|
const client = (0, aws_clients_1.getS3Client)(region);
|
|
40
41
|
const uploads = files.map(async (filePath) => {
|
|
41
|
-
const Key =
|
|
42
|
+
const Key = (0, make_s3_key_1.makeS3Key)(folder, dir, filePath.name);
|
|
42
43
|
const Body = (0, fs_1.createReadStream)(filePath.name);
|
|
43
|
-
const ContentType =
|
|
44
|
-
const ACL = privacy === '
|
|
44
|
+
const ContentType = mime_types_1.default.lookup(Key) || 'application/octet-stream';
|
|
45
|
+
const ACL = privacy === 'no-acl'
|
|
46
|
+
? undefined
|
|
47
|
+
: privacy === 'private'
|
|
48
|
+
? 'private'
|
|
49
|
+
: 'public-read';
|
|
45
50
|
if (filePath.size > 5 * 1024 * 1024) {
|
|
46
51
|
const paralellUploads3 = new lib_storage_1.Upload({
|
|
47
52
|
client,
|
package/dist/cli/args.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import minimist from 'minimist';
|
|
2
|
-
import { AwsRegion } from '../pricing/aws-regions';
|
|
3
|
-
import { Privacy } from '../shared/constants';
|
|
4
|
-
import { LambdaArchitecture } from '../shared/validate-architecture';
|
|
2
|
+
import type { AwsRegion } from '../pricing/aws-regions';
|
|
3
|
+
import type { Privacy } from '../shared/constants';
|
|
4
|
+
import type { LambdaArchitecture } from '../shared/validate-architecture';
|
|
5
5
|
declare type LambdaCommandLineOptions = {
|
|
6
6
|
help: boolean;
|
|
7
7
|
region: AwsRegion;
|
|
@@ -19,8 +19,10 @@ declare type LambdaCommandLineOptions = {
|
|
|
19
19
|
['disable-cloudwatch']: boolean;
|
|
20
20
|
['max-retries']: number;
|
|
21
21
|
['frames-per-lambda']: number;
|
|
22
|
+
['concurrency-per-lambda']: number;
|
|
22
23
|
['out-name']: string | undefined;
|
|
23
24
|
['architecture']: LambdaArchitecture;
|
|
25
|
+
['custom-role-arn']: string | undefined;
|
|
24
26
|
privacy: Privacy;
|
|
25
27
|
};
|
|
26
28
|
export declare const parsedLambdaCli: LambdaCommandLineOptions & minimist.ParsedArgs;
|
|
@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.functionsDeploySubcommand = exports.FUNCTIONS_DEPLOY_SUBCOMMAND = void 0;
|
|
4
4
|
const cli_1 = require("@remotion/cli");
|
|
5
5
|
const log_1 = require("@remotion/cli/dist/log");
|
|
6
|
+
const version_1 = require("remotion/version");
|
|
6
7
|
const deploy_function_1 = require("../../../api/deploy-function");
|
|
7
8
|
const constants_1 = require("../../../shared/constants");
|
|
8
9
|
const validate_architecture_1 = require("../../../shared/validate-architecture");
|
|
10
|
+
const validate_custom_role_arn_1 = require("../../../shared/validate-custom-role-arn");
|
|
9
11
|
const validate_disk_size_in_mb_1 = require("../../../shared/validate-disk-size-in-mb");
|
|
10
12
|
const validate_memory_size_1 = require("../../../shared/validate-memory-size");
|
|
11
13
|
const validate_timeout_1 = require("../../../shared/validate-timeout");
|
|
@@ -13,25 +15,27 @@ const args_1 = require("../../args");
|
|
|
13
15
|
const get_aws_region_1 = require("../../get-aws-region");
|
|
14
16
|
exports.FUNCTIONS_DEPLOY_SUBCOMMAND = 'deploy';
|
|
15
17
|
const functionsDeploySubcommand = async () => {
|
|
16
|
-
var _a, _b, _c, _d, _e;
|
|
18
|
+
var _a, _b, _c, _d, _e, _f;
|
|
17
19
|
const region = (0, get_aws_region_1.getAwsRegion)();
|
|
18
20
|
const timeoutInSeconds = (_a = args_1.parsedLambdaCli.timeout) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_TIMEOUT;
|
|
19
21
|
const memorySizeInMb = (_b = args_1.parsedLambdaCli.memory) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_MEMORY_SIZE;
|
|
20
22
|
const diskSizeInMb = (_c = args_1.parsedLambdaCli.disk) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_EPHEMERAL_STORAGE_IN_MB;
|
|
21
23
|
const architecture = (_d = args_1.parsedLambdaCli.architecture) !== null && _d !== void 0 ? _d : constants_1.DEFAULT_ARCHITECTURE;
|
|
24
|
+
const customRoleArn = (_e = args_1.parsedLambdaCli['custom-role-arn']) !== null && _e !== void 0 ? _e : undefined;
|
|
22
25
|
const createCloudWatchLogGroup = !args_1.parsedLambdaCli['disable-cloudwatch'];
|
|
23
|
-
const cloudWatchLogRetentionPeriodInDays = (
|
|
26
|
+
const cloudWatchLogRetentionPeriodInDays = (_f = args_1.parsedLambdaCli['retention-period']) !== null && _f !== void 0 ? _f : constants_1.DEFAULT_CLOUDWATCH_RETENTION_PERIOD;
|
|
24
27
|
(0, validate_memory_size_1.validateMemorySize)(memorySizeInMb);
|
|
25
28
|
(0, validate_timeout_1.validateTimeout)(timeoutInSeconds);
|
|
26
29
|
(0, validate_architecture_1.validateArchitecture)(architecture);
|
|
27
30
|
(0, validate_disk_size_in_mb_1.validateDiskSizeInMb)(diskSizeInMb);
|
|
31
|
+
(0, validate_custom_role_arn_1.validateCustomRoleArn)(customRoleArn);
|
|
28
32
|
if (!cli_1.CliInternals.quietFlagProvided()) {
|
|
29
33
|
log_1.Log.info(cli_1.CliInternals.chalk.gray(`
|
|
30
34
|
Region = ${region}
|
|
31
35
|
Memory = ${memorySizeInMb}MB
|
|
32
36
|
Disk size = ${diskSizeInMb}MB
|
|
33
37
|
Timeout = ${timeoutInSeconds}sec
|
|
34
|
-
Version = ${
|
|
38
|
+
Version = ${version_1.VERSION}
|
|
35
39
|
Architecture = ${architecture}
|
|
36
40
|
CloudWatch Logging Enabled = ${createCloudWatchLogGroup}
|
|
37
41
|
CloudWatch Retention Period = ${cloudWatchLogRetentionPeriodInDays} days
|
|
@@ -47,6 +51,7 @@ CloudWatch Retention Period = ${cloudWatchLogRetentionPeriodInDays} days
|
|
|
47
51
|
cloudWatchLogRetentionPeriodInDays,
|
|
48
52
|
architecture,
|
|
49
53
|
diskSizeInMb,
|
|
54
|
+
customRoleArn,
|
|
50
55
|
});
|
|
51
56
|
if (cli_1.CliInternals.quietFlagProvided()) {
|
|
52
57
|
log_1.Log.info(functionName);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { CleanupInfo, EncodingProgress, RenderProgress } from '../../../defaults';
|
|
2
|
-
import { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
|
|
1
|
+
import type { CleanupInfo, EncodingProgress, RenderProgress } from '../../../defaults';
|
|
2
|
+
import type { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
|
|
3
3
|
declare type LambdaInvokeProgress = {
|
|
4
4
|
totalLambdas: number | null;
|
|
5
5
|
lambdasInvoked: number;
|
|
@@ -10,7 +10,7 @@ declare type ChunkProgress = {
|
|
|
10
10
|
chunksInvoked: number;
|
|
11
11
|
doneIn: number | null;
|
|
12
12
|
};
|
|
13
|
-
|
|
13
|
+
declare type MultiRenderProgress = {
|
|
14
14
|
lambdaInvokeProgress: LambdaInvokeProgress;
|
|
15
15
|
chunkProgress: ChunkProgress;
|
|
16
16
|
encodingProgress: EncodingProgress;
|
|
@@ -18,7 +18,7 @@ export declare type MultiRenderProgress = {
|
|
|
18
18
|
};
|
|
19
19
|
export declare const makeMultiProgressFromStatus: (status: RenderProgress) => MultiRenderProgress;
|
|
20
20
|
declare type DownloadedInfo = {
|
|
21
|
-
totalSize: number;
|
|
21
|
+
totalSize: number | null;
|
|
22
22
|
downloaded: number;
|
|
23
23
|
doneIn: number | null;
|
|
24
24
|
};
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
|
|
4
4
|
const cli_1 = require("@remotion/cli");
|
|
5
5
|
const remotion_1 = require("remotion");
|
|
6
|
-
const format_bytes_1 = require("../../helpers/format-bytes");
|
|
7
6
|
const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
|
|
8
7
|
const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
|
|
9
8
|
const progress = doneIn
|
|
@@ -78,10 +77,19 @@ const makeDownloadProgress = (downloadInfo, totalSteps) => {
|
|
|
78
77
|
return [
|
|
79
78
|
'💾',
|
|
80
79
|
`(5/${totalSteps})`,
|
|
81
|
-
|
|
80
|
+
downloadInfo.totalSize === null
|
|
81
|
+
? cli_1.CliInternals.getFileSizeDownloadBar(downloadInfo.downloaded)
|
|
82
|
+
: cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
|
|
82
83
|
`${downloadInfo.doneIn === null ? 'Downloading' : 'Downloaded'} video`,
|
|
83
84
|
downloadInfo.doneIn === null
|
|
84
|
-
?
|
|
85
|
+
? [
|
|
86
|
+
`${cli_1.CliInternals.formatBytes(downloadInfo.downloaded)}`,
|
|
87
|
+
downloadInfo.totalSize === null
|
|
88
|
+
? null
|
|
89
|
+
: `${cli_1.CliInternals.formatBytes(downloadInfo.totalSize)}`,
|
|
90
|
+
]
|
|
91
|
+
.filter(remotion_1.Internals.truthy)
|
|
92
|
+
.join('/')
|
|
85
93
|
: cli_1.CliInternals.chalk.gray(`${downloadInfo.doneIn}ms`),
|
|
86
94
|
].join(' ');
|
|
87
95
|
};
|
|
@@ -14,8 +14,6 @@ const validate_retries_1 = require("../../../shared/validate-retries");
|
|
|
14
14
|
const args_1 = require("../../args");
|
|
15
15
|
const get_aws_region_1 = require("../../get-aws-region");
|
|
16
16
|
const find_function_name_1 = require("../../helpers/find-function-name");
|
|
17
|
-
const format_bytes_1 = require("../../helpers/format-bytes");
|
|
18
|
-
const get_cloudwatch_stream_url_1 = require("../../helpers/get-cloudwatch-stream-url");
|
|
19
17
|
const quit_1 = require("../../helpers/quit");
|
|
20
18
|
const log_1 = require("../../log");
|
|
21
19
|
const progress_1 = require("./progress");
|
|
@@ -39,7 +37,7 @@ const renderCommand = async (args) => {
|
|
|
39
37
|
(0, quit_1.quit)(1);
|
|
40
38
|
}
|
|
41
39
|
const outName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
|
|
42
|
-
const { chromiumOptions, codec, crf, envVariables, frameRange, imageFormat, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, quality, scale, } = await cli_1.CliInternals.getCliOptions({
|
|
40
|
+
const { chromiumOptions, codec, crf, envVariables, frameRange, imageFormat, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, quality, scale, everyNthFrame, numberOfGifLoops, muted, } = await cli_1.CliInternals.getCliOptions({
|
|
43
41
|
type: 'series',
|
|
44
42
|
isLambda: true,
|
|
45
43
|
});
|
|
@@ -73,16 +71,15 @@ const renderCommand = async (args) => {
|
|
|
73
71
|
timeoutInMilliseconds: puppeteerTimeout,
|
|
74
72
|
chromiumOptions,
|
|
75
73
|
scale,
|
|
74
|
+
numberOfGifLoops,
|
|
75
|
+
everyNthFrame,
|
|
76
|
+
concurrencyPerLambda: args_1.parsedLambdaCli['concurrency-per-lambda'],
|
|
77
|
+
muted,
|
|
76
78
|
});
|
|
77
79
|
const totalSteps = outName ? 5 : 4;
|
|
78
80
|
const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
|
|
79
81
|
log_1.Log.info(cli_1.CliInternals.chalk.gray(`Bucket = ${res.bucketName}, renderId = ${res.renderId}, functionName = ${functionName}`));
|
|
80
|
-
log_1.Log.verbose(`CloudWatch logs (if enabled): ${
|
|
81
|
-
functionName,
|
|
82
|
-
region,
|
|
83
|
-
renderId: res.renderId,
|
|
84
|
-
method: constants_1.LambdaRoutines.renderer,
|
|
85
|
-
})}`);
|
|
82
|
+
log_1.Log.verbose(`CloudWatch logs (if enabled): ${res.cloudWatchLogs}`);
|
|
86
83
|
const status = await (0, get_render_progress_1.getRenderProgress)({
|
|
87
84
|
functionName,
|
|
88
85
|
bucketName: res.bucketName,
|
|
@@ -151,7 +148,7 @@ const renderCommand = async (args) => {
|
|
|
151
148
|
}));
|
|
152
149
|
log_1.Log.info();
|
|
153
150
|
log_1.Log.info();
|
|
154
|
-
log_1.Log.info('Done!', outputPath,
|
|
151
|
+
log_1.Log.info('Done!', outputPath, cli_1.CliInternals.formatBytes(sizeInBytes));
|
|
155
152
|
}
|
|
156
153
|
else {
|
|
157
154
|
log_1.Log.info();
|
|
@@ -169,6 +166,14 @@ const renderCommand = async (args) => {
|
|
|
169
166
|
]
|
|
170
167
|
.filter(Boolean)
|
|
171
168
|
.join(', '));
|
|
169
|
+
if (newStatus.mostExpensiveFrameRanges) {
|
|
170
|
+
log_1.Log.verbose('Most expensive frame ranges:');
|
|
171
|
+
log_1.Log.verbose(newStatus.mostExpensiveFrameRanges
|
|
172
|
+
.map((f) => {
|
|
173
|
+
return `${f.frameRange[0]}-${f.frameRange[1]} (${f.timeInMilliseconds}ms)`;
|
|
174
|
+
})
|
|
175
|
+
.join(', '));
|
|
176
|
+
}
|
|
172
177
|
(0, quit_1.quit)(0);
|
|
173
178
|
}
|
|
174
179
|
if (newStatus.fatalErrorEncountered) {
|
|
@@ -7,7 +7,6 @@ exports.sitesCreateSubcommand = exports.SITES_CREATE_SUBCOMMAND = void 0;
|
|
|
7
7
|
const cli_1 = require("@remotion/cli");
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const remotion_1 = require("remotion");
|
|
11
10
|
const deploy_site_1 = require("../../../api/deploy-site");
|
|
12
11
|
const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
|
|
13
12
|
const constants_1 = require("../../../shared/constants");
|
|
@@ -97,8 +96,8 @@ const sitesCreateSubcommand = async (args) => {
|
|
|
97
96
|
};
|
|
98
97
|
updateProgress();
|
|
99
98
|
},
|
|
100
|
-
enableCaching:
|
|
101
|
-
webpackOverride: (_b =
|
|
99
|
+
enableCaching: cli_1.ConfigInternals.getWebpackCaching(),
|
|
100
|
+
webpackOverride: (_b = cli_1.ConfigInternals.getWebpackOverrideFn()) !== null && _b !== void 0 ? _b : ((f) => f),
|
|
102
101
|
},
|
|
103
102
|
region: (0, get_aws_region_1.getAwsRegion)(),
|
|
104
103
|
});
|
|
@@ -6,7 +6,6 @@ const log_1 = require("@remotion/cli/dist/log");
|
|
|
6
6
|
const get_sites_1 = require("../../../api/get-sites");
|
|
7
7
|
const get_aws_region_1 = require("../../get-aws-region");
|
|
8
8
|
const date_string_1 = require("../../helpers/date-string");
|
|
9
|
-
const format_bytes_1 = require("../../helpers/format-bytes");
|
|
10
9
|
exports.SITES_LS_SUBCOMMAND = 'ls';
|
|
11
10
|
const COLS = [20, 30, 10, 15];
|
|
12
11
|
const logRow = (data) => {
|
|
@@ -40,7 +39,7 @@ const sitesLsSubcommand = async () => {
|
|
|
40
39
|
log_1.Log.info(logRow([
|
|
41
40
|
site.id,
|
|
42
41
|
site.bucketName,
|
|
43
|
-
|
|
42
|
+
cli_1.CliInternals.formatBytes(site.sizeInBytes),
|
|
44
43
|
site.lastModified ? (0, date_string_1.dateString)(new Date(site.lastModified)) : 'n/a',
|
|
45
44
|
]));
|
|
46
45
|
log_1.Log.info(site.serveUrl);
|
|
@@ -7,7 +7,6 @@ const get_buckets_1 = require("../../../api/get-buckets");
|
|
|
7
7
|
const get_sites_1 = require("../../../api/get-sites");
|
|
8
8
|
const get_aws_region_1 = require("../../get-aws-region");
|
|
9
9
|
const confirm_1 = require("../../helpers/confirm");
|
|
10
|
-
const format_bytes_1 = require("../../helpers/format-bytes");
|
|
11
10
|
const quit_1 = require("../../helpers/quit");
|
|
12
11
|
const log_1 = require("../../log");
|
|
13
12
|
exports.SITES_RM_COMMAND = 'rm';
|
|
@@ -44,7 +43,7 @@ const sitesRmSubcommand = async (args) => {
|
|
|
44
43
|
return (0, quit_1.quit)(1);
|
|
45
44
|
}
|
|
46
45
|
await (0, confirm_1.confirmCli)({
|
|
47
|
-
delMessage: `Site ${site.id} in bucket ${site.bucketName} (${
|
|
46
|
+
delMessage: `Site ${site.id} in bucket ${site.bucketName} (${cli_1.CliInternals.formatBytes(site.sizeInBytes)}): Delete? (Y/n)`,
|
|
48
47
|
allowForceFlag: true,
|
|
49
48
|
});
|
|
50
49
|
const { totalSizeInBytes: totalSize } = await (0, delete_site_1.deleteSite)({
|
|
@@ -55,7 +54,7 @@ const sitesRmSubcommand = async (args) => {
|
|
|
55
54
|
log_1.Log.info(cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
|
|
56
55
|
},
|
|
57
56
|
});
|
|
58
|
-
log_1.Log.info(`Deleted site ${siteName} and freed up ${
|
|
57
|
+
log_1.Log.info(`Deleted site ${siteName} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
|
|
59
58
|
}
|
|
60
59
|
};
|
|
61
60
|
exports.sitesRmSubcommand = sitesRmSubcommand;
|
|
@@ -7,7 +7,6 @@ const get_buckets_1 = require("../../../api/get-buckets");
|
|
|
7
7
|
const get_sites_1 = require("../../../api/get-sites");
|
|
8
8
|
const get_aws_region_1 = require("../../get-aws-region");
|
|
9
9
|
const confirm_1 = require("../../helpers/confirm");
|
|
10
|
-
const format_bytes_1 = require("../../helpers/format-bytes");
|
|
11
10
|
const quit_1 = require("../../helpers/quit");
|
|
12
11
|
const log_1 = require("../../log");
|
|
13
12
|
exports.SITES_RMALL_COMMAND = 'rmall';
|
|
@@ -31,7 +30,7 @@ const sitesRmallSubcommand = async () => {
|
|
|
31
30
|
}
|
|
32
31
|
for (const site of deployedSites.sites) {
|
|
33
32
|
await (0, confirm_1.confirmCli)({
|
|
34
|
-
delMessage: `Site ${site.id} in bucket ${site.bucketName} (${
|
|
33
|
+
delMessage: `Site ${site.id} in bucket ${site.bucketName} (${cli_1.CliInternals.formatBytes(site.sizeInBytes)}): Delete? (Y/n)`,
|
|
35
34
|
allowForceFlag: true,
|
|
36
35
|
});
|
|
37
36
|
const { totalSizeInBytes: totalSize } = await (0, delete_site_1.deleteSite)({
|
|
@@ -42,7 +41,7 @@ const sitesRmallSubcommand = async () => {
|
|
|
42
41
|
log_1.Log.info(cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
|
|
43
42
|
},
|
|
44
43
|
});
|
|
45
|
-
log_1.Log.info(`Deleted site ${site.id} and freed up ${
|
|
44
|
+
log_1.Log.info(`Deleted site ${site.id} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
|
|
46
45
|
}
|
|
47
46
|
};
|
|
48
47
|
exports.sitesRmallSubcommand = sitesRmallSubcommand;
|
|
@@ -11,8 +11,6 @@ const validate_retries_1 = require("../../shared/validate-retries");
|
|
|
11
11
|
const args_1 = require("../args");
|
|
12
12
|
const get_aws_region_1 = require("../get-aws-region");
|
|
13
13
|
const find_function_name_1 = require("../helpers/find-function-name");
|
|
14
|
-
const format_bytes_1 = require("../helpers/format-bytes");
|
|
15
|
-
const get_cloudwatch_stream_url_1 = require("../helpers/get-cloudwatch-stream-url");
|
|
16
14
|
const quit_1 = require("../helpers/quit");
|
|
17
15
|
const log_1 = require("../log");
|
|
18
16
|
exports.STILL_COMMAND = 'still';
|
|
@@ -64,12 +62,7 @@ const stillCommand = async (args) => {
|
|
|
64
62
|
scale,
|
|
65
63
|
});
|
|
66
64
|
log_1.Log.verbose(cli_1.CliInternals.chalk.gray(`Bucket = ${res.bucketName}, renderId = ${res.renderId}, functionName = ${functionName}`));
|
|
67
|
-
log_1.Log.verbose(`CloudWatch logs (if enabled): ${
|
|
68
|
-
functionName,
|
|
69
|
-
region: (0, get_aws_region_1.getAwsRegion)(),
|
|
70
|
-
renderId: res.renderId,
|
|
71
|
-
method: constants_1.LambdaRoutines.still,
|
|
72
|
-
})}`);
|
|
65
|
+
log_1.Log.verbose(`CloudWatch logs (if enabled): ${res.cloudWatchLogs}`);
|
|
73
66
|
if (outName) {
|
|
74
67
|
log_1.Log.info('Finished rendering. Downloading...');
|
|
75
68
|
const { outputPath, sizeInBytes } = await (0, download_media_1.downloadMedia)({
|
|
@@ -78,7 +71,7 @@ const stillCommand = async (args) => {
|
|
|
78
71
|
region: (0, get_aws_region_1.getAwsRegion)(),
|
|
79
72
|
renderId: res.renderId,
|
|
80
73
|
});
|
|
81
|
-
log_1.Log.info('Done!', outputPath,
|
|
74
|
+
log_1.Log.info('Done!', outputPath, cli_1.CliInternals.formatBytes(sizeInBytes));
|
|
82
75
|
}
|
|
83
76
|
else {
|
|
84
77
|
log_1.Log.info(`Finished still!`);
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { AwsRegion } from '../pricing/aws-regions';
|
|
1
|
+
import type { AwsRegion } from '../pricing/aws-regions';
|
|
2
2
|
export declare const getAwsRegion: () => AwsRegion;
|
|
@@ -6,6 +6,7 @@ const is_in_lambda_1 = require("../shared/is-in-lambda");
|
|
|
6
6
|
const validate_aws_region_1 = require("../shared/validate-aws-region");
|
|
7
7
|
const args_1 = require("./args");
|
|
8
8
|
const getAwsRegion = () => {
|
|
9
|
+
var _a;
|
|
9
10
|
if ((0, is_in_lambda_1.isInsideLambda)()) {
|
|
10
11
|
throw new Error('Should not call getAwsRegion() if in lambda');
|
|
11
12
|
}
|
|
@@ -13,7 +14,7 @@ const getAwsRegion = () => {
|
|
|
13
14
|
(0, validate_aws_region_1.validateAwsRegion)(args_1.parsedLambdaCli.region);
|
|
14
15
|
return args_1.parsedLambdaCli.region;
|
|
15
16
|
}
|
|
16
|
-
const envVariable = process.env.AWS_REGION;
|
|
17
|
+
const envVariable = (_a = process.env.REMOTION_AWS_REGION) !== null && _a !== void 0 ? _a : process.env.AWS_REGION;
|
|
17
18
|
if (envVariable) {
|
|
18
19
|
(0, validate_aws_region_1.validateAwsRegion)(envVariable);
|
|
19
20
|
return envVariable;
|