@remotion/lambda 4.1.0-alpha5 → 4.1.0-alpha8
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/api/get-compositions-on-lambda.d.ts +2 -2
- package/dist/api/get-compositions-on-lambda.js +4 -4
- package/dist/api/make-lambda-payload.js +4 -4
- package/dist/api/render-still-on-lambda.js +4 -4
- package/dist/cli/commands/render/render.js +8 -3
- package/dist/cli/commands/still.js +8 -3
- package/dist/cli/log.d.ts +3 -3
- package/dist/functions/compositions.js +3 -3
- package/dist/functions/helpers/get-progress.js +0 -6
- package/dist/functions/helpers/make-timeout-message.js +2 -0
- package/dist/functions/helpers/validate-composition.d.ts +2 -2
- package/dist/functions/helpers/validate-composition.js +2 -4
- package/dist/functions/launch.js +16 -25
- package/dist/functions/renderer.js +6 -15
- package/dist/functions/still.js +14 -4
- package/dist/shared/compress-props.d.ts +20 -0
- package/dist/shared/compress-props.js +85 -0
- package/dist/shared/constants.d.ts +2 -3
- package/dist/shared/invoke-webhook.d.ts +0 -2
- package/dist/shared/serialize-props.d.ts +13 -19
- package/dist/shared/serialize-props.js +33 -80
- package/package.json +8 -8
- package/remotionlambda-arm64.zip +0 -0
- package/remotionlambda-x64.zip +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ChromiumOptions, LogLevel } from '@remotion/renderer';
|
|
2
|
-
import type {
|
|
2
|
+
import type { VideoConfig } from 'remotion';
|
|
3
3
|
import type { AwsRegion } from '../client';
|
|
4
4
|
export type GetCompositionsOnLambdaInput = {
|
|
5
5
|
chromiumOptions?: ChromiumOptions;
|
|
@@ -16,7 +16,7 @@ export type GetCompositionsOnLambdaInput = {
|
|
|
16
16
|
*/
|
|
17
17
|
dumpBrowserLogs?: boolean;
|
|
18
18
|
};
|
|
19
|
-
export type GetCompositionsOnLambdaOutput =
|
|
19
|
+
export type GetCompositionsOnLambdaOutput = VideoConfig[];
|
|
20
20
|
/**
|
|
21
21
|
* @description Returns the compositions from a serveUrl
|
|
22
22
|
* @see [Documentation](https://remotion.dev/docs/lambda/getcompositionsonlambda)
|
|
@@ -4,7 +4,7 @@ exports.getCompositionsOnLambda = void 0;
|
|
|
4
4
|
const version_1 = require("remotion/version");
|
|
5
5
|
const defaults_1 = require("../defaults");
|
|
6
6
|
const call_lambda_1 = require("../shared/call-lambda");
|
|
7
|
-
const
|
|
7
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
8
8
|
/**
|
|
9
9
|
* @description Returns the compositions from a serveUrl
|
|
10
10
|
* @see [Documentation](https://remotion.dev/docs/lambda/getcompositionsonlambda)
|
|
@@ -20,13 +20,13 @@ const serialize_props_1 = require("../shared/serialize-props");
|
|
|
20
20
|
*/
|
|
21
21
|
const getCompositionsOnLambda = async ({ chromiumOptions, serveUrl, region, inputProps, functionName, envVariables, logLevel, timeoutInMilliseconds, forceBucketName: bucketName, dumpBrowserLogs, }) => {
|
|
22
22
|
var _a;
|
|
23
|
-
const stringifiedInputProps = (0,
|
|
24
|
-
const serializedInputProps = await (0,
|
|
23
|
+
const stringifiedInputProps = (0, compress_props_1.serializeOrThrow)(inputProps, 'input-props');
|
|
24
|
+
const serializedInputProps = await (0, compress_props_1.compressInputProps)({
|
|
25
25
|
stringifiedInputProps,
|
|
26
26
|
region,
|
|
27
27
|
userSpecifiedBucketName: bucketName !== null && bucketName !== void 0 ? bucketName : null,
|
|
28
28
|
propsType: 'input-props',
|
|
29
|
-
needsToUpload: (0,
|
|
29
|
+
needsToUpload: (0, compress_props_1.getNeedsToUpload)('video-or-audio', stringifiedInputProps),
|
|
30
30
|
});
|
|
31
31
|
try {
|
|
32
32
|
const res = await (0, call_lambda_1.callLambda)({
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getRenderProgressPayload = exports.makeLambdaRenderMediaPayload = void 0;
|
|
4
4
|
const version_1 = require("remotion/version");
|
|
5
5
|
const defaults_1 = require("../defaults");
|
|
6
|
-
const
|
|
6
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
7
7
|
const validate_download_behavior_1 = require("../shared/validate-download-behavior");
|
|
8
8
|
const validate_frames_per_lambda_1 = require("../shared/validate-frames-per-lambda");
|
|
9
9
|
const validate_lambda_codec_1 = require("../shared/validate-lambda-codec");
|
|
@@ -19,11 +19,11 @@ const makeLambdaRenderMediaPayload = async ({ rendererFunctionName, frameRange,
|
|
|
19
19
|
durationInFrames: 1,
|
|
20
20
|
});
|
|
21
21
|
(0, validate_download_behavior_1.validateDownloadBehavior)(downloadBehavior);
|
|
22
|
-
const stringifiedInputProps = (0,
|
|
23
|
-
const serialized = await (0,
|
|
22
|
+
const stringifiedInputProps = (0, compress_props_1.serializeOrThrow)(inputProps !== null && inputProps !== void 0 ? inputProps : {}, 'input-props');
|
|
23
|
+
const serialized = await (0, compress_props_1.compressInputProps)({
|
|
24
24
|
stringifiedInputProps,
|
|
25
25
|
region,
|
|
26
|
-
needsToUpload: (0,
|
|
26
|
+
needsToUpload: (0, compress_props_1.getNeedsToUpload)('video-or-audio', stringifiedInputProps),
|
|
27
27
|
userSpecifiedBucketName: bucketName !== null && bucketName !== void 0 ? bucketName : null,
|
|
28
28
|
propsType: 'input-props',
|
|
29
29
|
});
|
|
@@ -5,7 +5,7 @@ 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 get_aws_urls_1 = require("../shared/get-aws-urls");
|
|
8
|
-
const
|
|
8
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
9
9
|
/**
|
|
10
10
|
* @description Renders a still frame on Lambda
|
|
11
11
|
* @link https://remotion.dev/docs/lambda/renderstillonlambda
|
|
@@ -27,11 +27,11 @@ const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFo
|
|
|
27
27
|
if (quality) {
|
|
28
28
|
throw new Error('The `quality` option is deprecated. Use `jpegQuality` instead.');
|
|
29
29
|
}
|
|
30
|
-
const stringifiedInputProps = (0,
|
|
31
|
-
const serializedInputProps = await (0,
|
|
30
|
+
const stringifiedInputProps = (0, compress_props_1.serializeOrThrow)(inputProps, 'input-props');
|
|
31
|
+
const serializedInputProps = await (0, compress_props_1.compressInputProps)({
|
|
32
32
|
stringifiedInputProps,
|
|
33
33
|
region,
|
|
34
|
-
needsToUpload: (0,
|
|
34
|
+
needsToUpload: (0, compress_props_1.getNeedsToUpload)('still', stringifiedInputProps),
|
|
35
35
|
userSpecifiedBucketName: forceBucketName !== null && forceBucketName !== void 0 ? forceBucketName : null,
|
|
36
36
|
propsType: 'input-props',
|
|
37
37
|
});
|
|
@@ -19,6 +19,7 @@ const find_function_name_1 = require("../../helpers/find-function-name");
|
|
|
19
19
|
const quit_1 = require("../../helpers/quit");
|
|
20
20
|
const log_1 = require("../../log");
|
|
21
21
|
const progress_1 = require("./progress");
|
|
22
|
+
const remotion_1 = require("remotion");
|
|
22
23
|
exports.RENDER_COMMAND = 'render';
|
|
23
24
|
const renderCommand = async (args, remotionRoot) => {
|
|
24
25
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
@@ -40,7 +41,7 @@ const renderCommand = async (args, remotionRoot) => {
|
|
|
40
41
|
if (!composition) {
|
|
41
42
|
log_1.Log.info('No compositions passed. Fetching compositions...');
|
|
42
43
|
(0, validate_serveurl_1.validateServeUrl)(serveUrl);
|
|
43
|
-
const server = renderer_1.RenderInternals.prepareServer({
|
|
44
|
+
const server = await renderer_1.RenderInternals.prepareServer({
|
|
44
45
|
concurrency: 1,
|
|
45
46
|
indent: false,
|
|
46
47
|
port,
|
|
@@ -56,14 +57,18 @@ const renderCommand = async (args, remotionRoot) => {
|
|
|
56
57
|
envVariables,
|
|
57
58
|
height,
|
|
58
59
|
indent: false,
|
|
59
|
-
|
|
60
|
+
serializedInputPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
|
|
61
|
+
indent: undefined,
|
|
62
|
+
staticBase: null,
|
|
63
|
+
data: inputProps,
|
|
64
|
+
}).serializedString,
|
|
60
65
|
port,
|
|
61
66
|
puppeteerInstance: undefined,
|
|
62
67
|
serveUrlOrWebpackUrl: serveUrl,
|
|
63
68
|
timeoutInMilliseconds: puppeteerTimeout,
|
|
64
69
|
logLevel,
|
|
65
70
|
width,
|
|
66
|
-
server
|
|
71
|
+
server,
|
|
67
72
|
});
|
|
68
73
|
composition = compositionId;
|
|
69
74
|
}
|
|
@@ -15,6 +15,7 @@ const get_aws_region_1 = require("../get-aws-region");
|
|
|
15
15
|
const find_function_name_1 = require("../helpers/find-function-name");
|
|
16
16
|
const quit_1 = require("../helpers/quit");
|
|
17
17
|
const log_1 = require("../log");
|
|
18
|
+
const remotion_1 = require("remotion");
|
|
18
19
|
exports.STILL_COMMAND = 'still';
|
|
19
20
|
const stillCommand = async (args, remotionRoot) => {
|
|
20
21
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -36,7 +37,7 @@ const stillCommand = async (args, remotionRoot) => {
|
|
|
36
37
|
if (!composition) {
|
|
37
38
|
log_1.Log.info('No compositions passed. Fetching compositions...');
|
|
38
39
|
(0, validate_serveurl_1.validateServeUrl)(serveUrl);
|
|
39
|
-
const server = renderer_1.RenderInternals.prepareServer({
|
|
40
|
+
const server = await renderer_1.RenderInternals.prepareServer({
|
|
40
41
|
concurrency: 1,
|
|
41
42
|
indent: false,
|
|
42
43
|
port,
|
|
@@ -53,13 +54,17 @@ const stillCommand = async (args, remotionRoot) => {
|
|
|
53
54
|
browserExecutable,
|
|
54
55
|
chromiumOptions,
|
|
55
56
|
envVariables,
|
|
56
|
-
|
|
57
|
+
serializedInputPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
|
|
58
|
+
indent: undefined,
|
|
59
|
+
staticBase: null,
|
|
60
|
+
data: inputProps,
|
|
61
|
+
}).serializedString,
|
|
57
62
|
port,
|
|
58
63
|
puppeteerInstance: undefined,
|
|
59
64
|
timeoutInMilliseconds: puppeteerTimeout,
|
|
60
65
|
height,
|
|
61
66
|
width,
|
|
62
|
-
server
|
|
67
|
+
server,
|
|
63
68
|
});
|
|
64
69
|
composition = compositionId;
|
|
65
70
|
}
|
package/dist/cli/log.d.ts
CHANGED
|
@@ -2,19 +2,19 @@ export declare const Log: {
|
|
|
2
2
|
verbose: (message?: any, ...optionalParams: any[]) => void;
|
|
3
3
|
verboseAdvanced: (options: {
|
|
4
4
|
indent: boolean;
|
|
5
|
-
logLevel: "
|
|
5
|
+
logLevel: "verbose" | "info" | "warn" | "error";
|
|
6
6
|
} & {
|
|
7
7
|
tag?: string | undefined;
|
|
8
8
|
}, message?: any, ...optionalParams: any[]) => void;
|
|
9
9
|
info: (message?: any, ...optionalParams: any[]) => void;
|
|
10
10
|
infoAdvanced: (options: {
|
|
11
11
|
indent: boolean;
|
|
12
|
-
logLevel: "
|
|
12
|
+
logLevel: "verbose" | "info" | "warn" | "error";
|
|
13
13
|
}, message?: any, ...optionalParams: any[]) => void;
|
|
14
14
|
warn: (message?: any, ...optionalParams: any[]) => void;
|
|
15
15
|
warnAdvanced: (options: {
|
|
16
16
|
indent: boolean;
|
|
17
|
-
logLevel: "
|
|
17
|
+
logLevel: "verbose" | "info" | "warn" | "error";
|
|
18
18
|
}, message?: any, ...optionalParams: any[]) => void;
|
|
19
19
|
error: (message?: any, ...optionalParams: any[]) => void;
|
|
20
20
|
};
|
|
@@ -8,7 +8,7 @@ const defaults_1 = require("../defaults");
|
|
|
8
8
|
const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
|
|
9
9
|
const get_browser_instance_1 = require("./helpers/get-browser-instance");
|
|
10
10
|
const get_current_region_1 = require("./helpers/get-current-region");
|
|
11
|
-
const
|
|
11
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
12
12
|
const compositionsHandler = async (lambdaParams, options) => {
|
|
13
13
|
var _a, _b, _c;
|
|
14
14
|
if (lambdaParams.type !== defaults_1.LambdaRoutines.compositions) {
|
|
@@ -27,7 +27,7 @@ const compositionsHandler = async (lambdaParams, options) => {
|
|
|
27
27
|
}).then((b) => b.bucketName),
|
|
28
28
|
(0, get_browser_instance_1.getBrowserInstance)(lambdaParams.logLevel, false, (_b = lambdaParams.chromiumOptions) !== null && _b !== void 0 ? _b : {}),
|
|
29
29
|
]);
|
|
30
|
-
const
|
|
30
|
+
const serializedInputPropsWithCustomSchema = await (0, compress_props_1.decompressInputProps)({
|
|
31
31
|
bucketName,
|
|
32
32
|
expectedBucketOwner: options.expectedBucketOwner,
|
|
33
33
|
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
@@ -42,7 +42,7 @@ const compositionsHandler = async (lambdaParams, options) => {
|
|
|
42
42
|
const compositions = await renderer_1.RenderInternals.internalGetCompositions({
|
|
43
43
|
serveUrlOrWebpackUrl: realServeUrl,
|
|
44
44
|
puppeteerInstance: browserInstance,
|
|
45
|
-
|
|
45
|
+
serializedInputPropsWithCustomSchema,
|
|
46
46
|
envVariables: (_c = lambdaParams.envVariables) !== null && _c !== void 0 ? _c : {},
|
|
47
47
|
timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
|
|
48
48
|
chromiumOptions: lambdaParams.chromiumOptions,
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getProgress = void 0;
|
|
4
4
|
const renderer_1 = require("@remotion/renderer");
|
|
5
5
|
const remotion_1 = require("remotion");
|
|
6
|
-
const chunk_progress_1 = require("../../shared/chunk-progress");
|
|
7
6
|
const constants_1 = require("../../shared/constants");
|
|
8
7
|
const calculate_chunk_times_1 = require("./calculate-chunk-times");
|
|
9
8
|
const calculate_price_from_bucket_1 = require("./calculate-price-from-bucket");
|
|
@@ -140,11 +139,6 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
|
|
|
140
139
|
renderId,
|
|
141
140
|
})
|
|
142
141
|
: 0;
|
|
143
|
-
console.log('etags', contents
|
|
144
|
-
.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.lambdaChunkInitializedPrefix)(renderId)); })
|
|
145
|
-
.map((c) => {
|
|
146
|
-
return (0, chunk_progress_1.getProgressOfChunk)(c.ETag);
|
|
147
|
-
}));
|
|
148
142
|
const allChunks = chunks.length === ((_f = renderMetadata === null || renderMetadata === void 0 ? void 0 : renderMetadata.totalChunks) !== null && _f !== void 0 ? _f : Infinity);
|
|
149
143
|
const renderSize = contents
|
|
150
144
|
.map((c) => { var _a; return (_a = c.Size) !== null && _a !== void 0 ? _a : 0; })
|
|
@@ -25,6 +25,8 @@ const makeTimeoutMessage = ({ timeoutInMilliseconds, missingChunks, renderMetada
|
|
|
25
25
|
makeChunkMissingMessage({ missingChunks, renderMetadata }),
|
|
26
26
|
`You can use the "--timeout" parameter when deploying a function via CLI, or the "timeoutInSeconds" parameter when using the deployFunction() API.`,
|
|
27
27
|
`${docs_url_1.DOCS_URL}/docs/lambda/cli/functions#deploy`,
|
|
28
|
+
'Get help on debugging this error:',
|
|
29
|
+
`${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/debug`,
|
|
28
30
|
].join('\n');
|
|
29
31
|
return message;
|
|
30
32
|
};
|
|
@@ -5,7 +5,7 @@ type ValidateCompositionOptions = {
|
|
|
5
5
|
serveUrl: string;
|
|
6
6
|
composition: string;
|
|
7
7
|
browserInstance: Await<ReturnType<typeof openBrowser>>;
|
|
8
|
-
|
|
8
|
+
serializedInputPropsWithCustomSchema: string;
|
|
9
9
|
envVariables: Record<string, string>;
|
|
10
10
|
timeoutInMilliseconds: number;
|
|
11
11
|
chromiumOptions: ChromiumOptions;
|
|
@@ -15,5 +15,5 @@ type ValidateCompositionOptions = {
|
|
|
15
15
|
logLevel: LogLevel;
|
|
16
16
|
server: RemotionServer | undefined;
|
|
17
17
|
};
|
|
18
|
-
export declare const validateComposition: ({ serveUrl, composition, browserInstance,
|
|
18
|
+
export declare const validateComposition: ({ serveUrl, composition, browserInstance, serializedInputPropsWithCustomSchema, envVariables, timeoutInMilliseconds, chromiumOptions, port, forceHeight, forceWidth, logLevel, server, }: ValidateCompositionOptions) => Promise<VideoConfig>;
|
|
19
19
|
export {};
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.validateComposition = void 0;
|
|
4
4
|
const renderer_1 = require("@remotion/renderer");
|
|
5
5
|
const get_chromium_executable_path_1 = require("./get-chromium-executable-path");
|
|
6
|
-
const validateComposition = async ({ serveUrl, composition, browserInstance,
|
|
6
|
+
const validateComposition = async ({ serveUrl, composition, browserInstance, serializedInputPropsWithCustomSchema, envVariables, timeoutInMilliseconds, chromiumOptions, port, forceHeight, forceWidth, logLevel, server, }) => {
|
|
7
7
|
const { metadata: comp } = await renderer_1.RenderInternals.internalSelectComposition({
|
|
8
8
|
id: composition,
|
|
9
9
|
puppeteerInstance: browserInstance,
|
|
10
|
-
|
|
10
|
+
serializedInputPropsWithCustomSchema,
|
|
11
11
|
envVariables,
|
|
12
12
|
timeoutInMilliseconds,
|
|
13
13
|
chromiumOptions,
|
|
@@ -23,8 +23,6 @@ const validateComposition = async ({ serveUrl, composition, browserInstance, inp
|
|
|
23
23
|
...comp,
|
|
24
24
|
height: forceHeight !== null && forceHeight !== void 0 ? forceHeight : comp.height,
|
|
25
25
|
width: forceWidth !== null && forceWidth !== void 0 ? forceWidth : comp.width,
|
|
26
|
-
defaultProps: comp.defaultProps,
|
|
27
|
-
props: comp.props,
|
|
28
26
|
};
|
|
29
27
|
};
|
|
30
28
|
exports.validateComposition = validateComposition;
|
package/dist/functions/launch.js
CHANGED
|
@@ -56,7 +56,7 @@ const timer_1 = require("./helpers/timer");
|
|
|
56
56
|
const validate_composition_1 = require("./helpers/validate-composition");
|
|
57
57
|
const write_lambda_error_1 = require("./helpers/write-lambda-error");
|
|
58
58
|
const write_post_render_data_1 = require("./helpers/write-post-render-data");
|
|
59
|
-
const
|
|
59
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
60
60
|
const callFunctionWithRetry = async ({ payload, retries, functionName, }) => {
|
|
61
61
|
try {
|
|
62
62
|
await (0, aws_clients_1.getLambdaClient)((0, get_current_region_1.getCurrentRegionInFunction)()).send(new client_lambda_1.InvokeCommand({
|
|
@@ -136,18 +136,20 @@ const innerLaunchHandler = async (params, options) => {
|
|
|
136
136
|
}
|
|
137
137
|
}, Math.max(options.getRemainingTimeInMillis() - 1000, 1000));
|
|
138
138
|
const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, params.chromiumOptions);
|
|
139
|
-
const inputPropsPromise = (0,
|
|
139
|
+
const inputPropsPromise = (0, compress_props_1.decompressInputProps)({
|
|
140
140
|
bucketName: params.bucketName,
|
|
141
141
|
expectedBucketOwner: options.expectedBucketOwner,
|
|
142
142
|
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
143
143
|
serialized: params.inputProps,
|
|
144
144
|
propsType: 'input-props',
|
|
145
145
|
});
|
|
146
|
+
const serializedInputPropsWithCustomSchema = await inputPropsPromise;
|
|
147
|
+
renderer_1.RenderInternals.Log.info('Validating composition, input props:', serializedInputPropsWithCustomSchema);
|
|
146
148
|
const comp = await (0, validate_composition_1.validateComposition)({
|
|
147
149
|
serveUrl: params.serveUrl,
|
|
148
150
|
composition: params.composition,
|
|
149
151
|
browserInstance,
|
|
150
|
-
|
|
152
|
+
serializedInputPropsWithCustomSchema,
|
|
151
153
|
envVariables: (_b = params.envVariables) !== null && _b !== void 0 ? _b : {},
|
|
152
154
|
timeoutInMilliseconds: params.timeoutInMilliseconds,
|
|
153
155
|
chromiumOptions: params.chromiumOptions,
|
|
@@ -157,8 +159,8 @@ const innerLaunchHandler = async (params, options) => {
|
|
|
157
159
|
logLevel: params.logLevel,
|
|
158
160
|
server: undefined,
|
|
159
161
|
});
|
|
160
|
-
|
|
161
|
-
|
|
162
|
+
renderer_1.RenderInternals.Log.info('Composition validated, resolved props', comp.props);
|
|
163
|
+
remotion_1.Internals.validateDurationInFrames(comp.durationInFrames, {
|
|
162
164
|
component: 'passed to a Lambda render',
|
|
163
165
|
allowFloats: false,
|
|
164
166
|
});
|
|
@@ -189,25 +191,15 @@ const innerLaunchHandler = async (params, options) => {
|
|
|
189
191
|
});
|
|
190
192
|
const sortedChunks = chunks.slice().sort((a, b) => a[0] - b[0]);
|
|
191
193
|
const reqSend = (0, timer_1.timer)('sending off requests');
|
|
192
|
-
const serializedResolved = (0,
|
|
193
|
-
const
|
|
194
|
-
const
|
|
195
|
-
|
|
196
|
-
(0,
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
needsToUpload,
|
|
202
|
-
}),
|
|
203
|
-
(0, serialize_props_1.serializeInputProps)({
|
|
204
|
-
propsType: 'default-props',
|
|
205
|
-
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
206
|
-
stringifiedInputProps: serializedDefault,
|
|
207
|
-
userSpecifiedBucketName: params.bucketName,
|
|
208
|
-
needsToUpload,
|
|
209
|
-
}),
|
|
210
|
-
]);
|
|
194
|
+
const serializedResolved = (0, compress_props_1.serializeOrThrow)(comp.props, 'resolved-props');
|
|
195
|
+
const needsToUpload = (0, compress_props_1.getNeedsToUpload)('video-or-audio', serializedResolved + params.inputProps);
|
|
196
|
+
const serializedResolvedProps = await (0, compress_props_1.compressInputProps)({
|
|
197
|
+
propsType: 'resolved-props',
|
|
198
|
+
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
199
|
+
stringifiedInputProps: serializedResolved,
|
|
200
|
+
userSpecifiedBucketName: params.bucketName,
|
|
201
|
+
needsToUpload,
|
|
202
|
+
});
|
|
211
203
|
const lambdaPayloads = chunks.map((chunkPayload) => {
|
|
212
204
|
var _a;
|
|
213
205
|
const payload = {
|
|
@@ -246,7 +238,6 @@ const innerLaunchHandler = async (params, options) => {
|
|
|
246
238
|
version: version_1.VERSION,
|
|
247
239
|
},
|
|
248
240
|
resolvedProps: serializedResolvedProps,
|
|
249
|
-
defaultProps: serializedDefaultProps,
|
|
250
241
|
};
|
|
251
242
|
return payload;
|
|
252
243
|
});
|
|
@@ -17,7 +17,7 @@ const get_chromium_executable_path_1 = require("./helpers/get-chromium-executabl
|
|
|
17
17
|
const get_current_region_1 = require("./helpers/get-current-region");
|
|
18
18
|
const io_1 = require("./helpers/io");
|
|
19
19
|
const write_lambda_error_1 = require("./helpers/write-lambda-error");
|
|
20
|
-
const
|
|
20
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
21
21
|
const renderHandler = async (params, options, logs) => {
|
|
22
22
|
var _a;
|
|
23
23
|
if (params.type !== constants_1.LambdaRoutines.renderer) {
|
|
@@ -26,27 +26,20 @@ const renderHandler = async (params, options, logs) => {
|
|
|
26
26
|
if (params.launchFunctionConfig.version !== version_1.VERSION) {
|
|
27
27
|
throw new Error(`The version of the function that was specified as "rendererFunctionName" is ${version_1.VERSION} but the version of the function that invoked the render is ${params.launchFunctionConfig.version}. Please make sure that the version of the function that is specified as "rendererFunctionName" is the same as the version of the function that is invoked.`);
|
|
28
28
|
}
|
|
29
|
-
const inputPropsPromise = (0,
|
|
29
|
+
const inputPropsPromise = (0, compress_props_1.decompressInputProps)({
|
|
30
30
|
bucketName: params.bucketName,
|
|
31
31
|
expectedBucketOwner: options.expectedBucketOwner,
|
|
32
32
|
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
33
33
|
serialized: params.inputProps,
|
|
34
34
|
propsType: 'input-props',
|
|
35
35
|
});
|
|
36
|
-
const resolvedPropsPromise = (0,
|
|
36
|
+
const resolvedPropsPromise = (0, compress_props_1.decompressInputProps)({
|
|
37
37
|
bucketName: params.bucketName,
|
|
38
38
|
expectedBucketOwner: options.expectedBucketOwner,
|
|
39
39
|
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
40
40
|
serialized: params.resolvedProps,
|
|
41
41
|
propsType: 'resolved-props',
|
|
42
42
|
});
|
|
43
|
-
const defaultPropsPromise = (0, serialize_props_1.deserializeInputProps)({
|
|
44
|
-
bucketName: params.bucketName,
|
|
45
|
-
expectedBucketOwner: options.expectedBucketOwner,
|
|
46
|
-
region: (0, get_current_region_1.getCurrentRegionInFunction)(),
|
|
47
|
-
serialized: params.defaultProps,
|
|
48
|
-
propsType: 'default-props',
|
|
49
|
-
});
|
|
50
43
|
const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, (_a = params.chromiumOptions) !== null && _a !== void 0 ? _a : {});
|
|
51
44
|
const outputPath = renderer_1.RenderInternals.tmpDir('remotion-render-');
|
|
52
45
|
if (typeof params.chunk !== 'number') {
|
|
@@ -71,9 +64,8 @@ const renderHandler = async (params, options, logs) => {
|
|
|
71
64
|
preferLossless: true,
|
|
72
65
|
}))}`);
|
|
73
66
|
const downloads = {};
|
|
74
|
-
const inputProps = await inputPropsPromise;
|
|
75
67
|
const resolvedProps = await resolvedPropsPromise;
|
|
76
|
-
const
|
|
68
|
+
const serializedInputPropsWithCustomSchema = await inputPropsPromise;
|
|
77
69
|
await new Promise((resolve, reject) => {
|
|
78
70
|
var _a, _b, _c, _d;
|
|
79
71
|
renderer_1.RenderInternals.internalRenderMedia({
|
|
@@ -83,11 +75,9 @@ const renderHandler = async (params, options, logs) => {
|
|
|
83
75
|
fps: params.fps,
|
|
84
76
|
height: params.height,
|
|
85
77
|
width: params.width,
|
|
86
|
-
props: resolvedProps,
|
|
87
|
-
defaultProps,
|
|
88
78
|
},
|
|
89
79
|
imageFormat: params.imageFormat,
|
|
90
|
-
|
|
80
|
+
serializedInputPropsWithCustomSchema,
|
|
91
81
|
frameRange: params.frameRange,
|
|
92
82
|
onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
|
|
93
83
|
if (renderedFrames % 5 === 0 &&
|
|
@@ -176,6 +166,7 @@ const renderHandler = async (params, options, logs) => {
|
|
|
176
166
|
indent: false,
|
|
177
167
|
onCtrlCExit: () => undefined,
|
|
178
168
|
server: undefined,
|
|
169
|
+
serializedResolvedPropsWithCustomSchema: resolvedProps,
|
|
179
170
|
})
|
|
180
171
|
.then(({ slowestFrames }) => {
|
|
181
172
|
console.log(`Slowest frames:`);
|
package/dist/functions/still.js
CHANGED
|
@@ -29,7 +29,8 @@ const get_output_url_from_metadata_1 = require("./helpers/get-output-url-from-me
|
|
|
29
29
|
const io_1 = require("./helpers/io");
|
|
30
30
|
const validate_composition_1 = require("./helpers/validate-composition");
|
|
31
31
|
const write_lambda_error_1 = require("./helpers/write-lambda-error");
|
|
32
|
-
const
|
|
32
|
+
const compress_props_1 = require("../shared/compress-props");
|
|
33
|
+
const remotion_1 = require("remotion");
|
|
33
34
|
const innerStillHandler = async (lambdaParams, renderId, options) => {
|
|
34
35
|
var _a, _b, _c, _d, _e, _f;
|
|
35
36
|
if (lambdaParams.type !== constants_1.LambdaRoutines.still) {
|
|
@@ -54,7 +55,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
|
|
|
54
55
|
const outputDir = renderer_1.RenderInternals.tmpDir('remotion-render-');
|
|
55
56
|
const outputPath = node_path_1.default.join(outputDir, 'output');
|
|
56
57
|
const region = (0, get_current_region_1.getCurrentRegionInFunction)();
|
|
57
|
-
const
|
|
58
|
+
const serializedInputPropsWithCustomSchema = await (0, compress_props_1.decompressInputProps)({
|
|
58
59
|
bucketName,
|
|
59
60
|
expectedBucketOwner: options.expectedBucketOwner,
|
|
60
61
|
region,
|
|
@@ -78,7 +79,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
|
|
|
78
79
|
serveUrl,
|
|
79
80
|
browserInstance,
|
|
80
81
|
composition: lambdaParams.composition,
|
|
81
|
-
|
|
82
|
+
serializedInputPropsWithCustomSchema,
|
|
82
83
|
envVariables: (_c = lambdaParams.envVariables) !== null && _c !== void 0 ? _c : {},
|
|
83
84
|
chromiumOptions: lambdaParams.chromiumOptions,
|
|
84
85
|
timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
|
|
@@ -131,7 +132,11 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
|
|
|
131
132
|
durationInFrames: composition.durationInFrames,
|
|
132
133
|
}),
|
|
133
134
|
imageFormat: lambdaParams.imageFormat,
|
|
134
|
-
|
|
135
|
+
serializedInputPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
|
|
136
|
+
data: lambdaParams.inputProps,
|
|
137
|
+
indent: undefined,
|
|
138
|
+
staticBase: null,
|
|
139
|
+
}).serializedString,
|
|
135
140
|
overwrite: false,
|
|
136
141
|
puppeteerInstance: browserInstance,
|
|
137
142
|
jpegQuality: (_f = lambdaParams.jpegQuality) !== null && _f !== void 0 ? _f : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
|
|
@@ -146,6 +151,11 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
|
|
|
146
151
|
port: null,
|
|
147
152
|
server,
|
|
148
153
|
logLevel: lambdaParams.logLevel,
|
|
154
|
+
serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
|
|
155
|
+
indent: undefined,
|
|
156
|
+
staticBase: null,
|
|
157
|
+
data: composition.props,
|
|
158
|
+
}).serializedString,
|
|
149
159
|
});
|
|
150
160
|
const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, (0, expected_out_name_1.getCredentialsFromOutName)(lambdaParams.outName));
|
|
151
161
|
const { size } = await node_fs_1.default.promises.stat(outputPath);
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { AwsRegion } from '../client';
|
|
2
|
+
import type { SerializedInputProps } from './constants';
|
|
3
|
+
type PropsType = 'input-props' | 'resolved-props';
|
|
4
|
+
export declare const serializeOrThrow: (inputProps: Record<string, unknown>, propsType: PropsType) => string;
|
|
5
|
+
export declare const getNeedsToUpload: (type: 'still' | 'video-or-audio', stringifiedInputProps: string) => boolean;
|
|
6
|
+
export declare const compressInputProps: ({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, }: {
|
|
7
|
+
stringifiedInputProps: string;
|
|
8
|
+
region: AwsRegion;
|
|
9
|
+
userSpecifiedBucketName: string | null;
|
|
10
|
+
propsType: PropsType;
|
|
11
|
+
needsToUpload: boolean;
|
|
12
|
+
}) => Promise<SerializedInputProps>;
|
|
13
|
+
export declare const decompressInputProps: ({ serialized, region, bucketName, expectedBucketOwner, propsType, }: {
|
|
14
|
+
serialized: SerializedInputProps;
|
|
15
|
+
region: AwsRegion;
|
|
16
|
+
bucketName: string;
|
|
17
|
+
expectedBucketOwner: string;
|
|
18
|
+
propsType: PropsType;
|
|
19
|
+
}) => Promise<string>;
|
|
20
|
+
export {};
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.decompressInputProps = exports.compressInputProps = exports.getNeedsToUpload = exports.serializeOrThrow = void 0;
|
|
4
|
+
const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
|
|
5
|
+
const io_1 = require("../functions/helpers/io");
|
|
6
|
+
const constants_1 = require("./constants");
|
|
7
|
+
const random_hash_1 = require("./random-hash");
|
|
8
|
+
const stream_to_string_1 = require("./stream-to-string");
|
|
9
|
+
const serialize_props_1 = require("./serialize-props");
|
|
10
|
+
const serializeOrThrow = (inputProps, propsType) => {
|
|
11
|
+
try {
|
|
12
|
+
const payload = (0, serialize_props_1.serializeJSONWithDate)({
|
|
13
|
+
indent: undefined,
|
|
14
|
+
staticBase: null,
|
|
15
|
+
data: inputProps,
|
|
16
|
+
});
|
|
17
|
+
return payload.serializedString;
|
|
18
|
+
}
|
|
19
|
+
catch (err) {
|
|
20
|
+
throw new Error(`Error serializing ${propsType}. Check it has no circular references or reduce the size if the object is big.`);
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
exports.serializeOrThrow = serializeOrThrow;
|
|
24
|
+
const getNeedsToUpload = (type, stringifiedInputProps) => {
|
|
25
|
+
const MAX_INLINE_PAYLOAD_SIZE = type === 'still' ? 5000000 : 200000;
|
|
26
|
+
if (stringifiedInputProps.length > MAX_INLINE_PAYLOAD_SIZE) {
|
|
27
|
+
console.warn(`Warning: The props are over ${Math.round(MAX_INLINE_PAYLOAD_SIZE / 1000)}KB (${Math.ceil(stringifiedInputProps.length / 1024)}KB) in size. Uploading them to S3 to circumvent AWS Lambda payload size, which may lead to slowdown.`);
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
return false;
|
|
31
|
+
};
|
|
32
|
+
exports.getNeedsToUpload = getNeedsToUpload;
|
|
33
|
+
const compressInputProps = async ({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, }) => {
|
|
34
|
+
const hash = (0, random_hash_1.randomHash)();
|
|
35
|
+
if (needsToUpload) {
|
|
36
|
+
const bucketName = userSpecifiedBucketName !== null && userSpecifiedBucketName !== void 0 ? userSpecifiedBucketName : (await (0, get_or_create_bucket_1.getOrCreateBucket)({
|
|
37
|
+
region,
|
|
38
|
+
})).bucketName;
|
|
39
|
+
await (0, io_1.lambdaWriteFile)({
|
|
40
|
+
body: stringifiedInputProps,
|
|
41
|
+
bucketName,
|
|
42
|
+
region,
|
|
43
|
+
customCredentials: null,
|
|
44
|
+
downloadBehavior: null,
|
|
45
|
+
expectedBucketOwner: null,
|
|
46
|
+
key: makeKey(propsType, hash),
|
|
47
|
+
privacy: 'public',
|
|
48
|
+
});
|
|
49
|
+
return {
|
|
50
|
+
type: 'bucket-url',
|
|
51
|
+
hash,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
type: 'payload',
|
|
56
|
+
payload: stringifiedInputProps,
|
|
57
|
+
};
|
|
58
|
+
};
|
|
59
|
+
exports.compressInputProps = compressInputProps;
|
|
60
|
+
const decompressInputProps = async ({ serialized, region, bucketName, expectedBucketOwner, propsType, }) => {
|
|
61
|
+
if (serialized.type === 'payload') {
|
|
62
|
+
return serialized.payload;
|
|
63
|
+
}
|
|
64
|
+
try {
|
|
65
|
+
const response = await (0, io_1.lambdaReadFile)({
|
|
66
|
+
bucketName,
|
|
67
|
+
expectedBucketOwner,
|
|
68
|
+
key: makeKey(propsType, serialized.hash),
|
|
69
|
+
region,
|
|
70
|
+
});
|
|
71
|
+
const body = await (0, stream_to_string_1.streamToString)(response);
|
|
72
|
+
const payload = body;
|
|
73
|
+
return payload;
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
throw new Error(`Failed to parse input props that were serialized: ${err.stack}`);
|
|
77
|
+
}
|
|
78
|
+
};
|
|
79
|
+
exports.decompressInputProps = decompressInputProps;
|
|
80
|
+
const makeKey = (type, hash) => {
|
|
81
|
+
if (type === 'input-props') {
|
|
82
|
+
return (0, constants_1.inputPropsKey)(hash);
|
|
83
|
+
}
|
|
84
|
+
return (0, constants_1.resolvedPropsKey)(hash);
|
|
85
|
+
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AudioCodec, ChromiumOptions, Codec, FrameRange, LogLevel, PixelFormat, ProResProfile, StillImageFormat, VideoImageFormat } from '@remotion/renderer';
|
|
2
|
-
import type {
|
|
2
|
+
import type { VideoConfig } from 'remotion';
|
|
3
3
|
import type { ChunkRetry } from '../functions/helpers/get-retry-stats';
|
|
4
4
|
import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';
|
|
5
5
|
import type { AwsRegion } from '../pricing/aws-regions';
|
|
@@ -221,7 +221,6 @@ export type LambdaPayloads = {
|
|
|
221
221
|
timeoutInMilliseconds: number;
|
|
222
222
|
chromiumOptions: ChromiumOptions;
|
|
223
223
|
resolvedProps: SerializedInputProps;
|
|
224
|
-
defaultProps: SerializedInputProps;
|
|
225
224
|
scale: number;
|
|
226
225
|
everyNthFrame: number;
|
|
227
226
|
muted: boolean;
|
|
@@ -279,7 +278,7 @@ type Discriminated = {
|
|
|
279
278
|
};
|
|
280
279
|
export type RenderMetadata = Discriminated & {
|
|
281
280
|
siteId: string;
|
|
282
|
-
videoConfig:
|
|
281
|
+
videoConfig: VideoConfig;
|
|
283
282
|
startedDate: number;
|
|
284
283
|
totalChunks: number;
|
|
285
284
|
estimatedTotalLambdaInvokations: number;
|
|
@@ -1,20 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
serialized: SerializedInputProps;
|
|
15
|
-
region: AwsRegion;
|
|
16
|
-
bucketName: string;
|
|
17
|
-
expectedBucketOwner: string;
|
|
18
|
-
propsType: PropsType;
|
|
19
|
-
}) => Promise<Record<string, unknown>>;
|
|
1
|
+
type SerializedJSONWithCustomFields = {
|
|
2
|
+
serializedString: string;
|
|
3
|
+
customDateUsed: boolean;
|
|
4
|
+
customFileUsed: boolean;
|
|
5
|
+
mapUsed: boolean;
|
|
6
|
+
setUsed: boolean;
|
|
7
|
+
};
|
|
8
|
+
export declare const FILE_TOKEN = "remotion-file:";
|
|
9
|
+
export declare const serializeJSONWithDate: ({ data, indent, staticBase, }: {
|
|
10
|
+
data: Record<string, unknown>;
|
|
11
|
+
indent: number | undefined;
|
|
12
|
+
staticBase: string | null;
|
|
13
|
+
}) => SerializedJSONWithCustomFields;
|
|
20
14
|
export {};
|
|
@@ -1,83 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// Must keep this file in sync with the one in packages/core/src/input-props-serialization.ts!
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
await (0, io_1.lambdaWriteFile)({
|
|
35
|
-
body: stringifiedInputProps,
|
|
36
|
-
bucketName,
|
|
37
|
-
region,
|
|
38
|
-
customCredentials: null,
|
|
39
|
-
downloadBehavior: null,
|
|
40
|
-
expectedBucketOwner: null,
|
|
41
|
-
key: makeKey(propsType, hash),
|
|
42
|
-
privacy: 'public',
|
|
43
|
-
});
|
|
44
|
-
return {
|
|
45
|
-
type: 'bucket-url',
|
|
46
|
-
hash,
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
return {
|
|
50
|
-
type: 'payload',
|
|
51
|
-
payload: stringifiedInputProps,
|
|
52
|
-
};
|
|
53
|
-
};
|
|
54
|
-
exports.serializeInputProps = serializeInputProps;
|
|
55
|
-
const deserializeInputProps = async ({ serialized, region, bucketName, expectedBucketOwner, propsType, }) => {
|
|
56
|
-
if (serialized.type === 'payload') {
|
|
57
|
-
return JSON.parse(serialized.payload);
|
|
58
|
-
}
|
|
59
|
-
try {
|
|
60
|
-
const response = await (0, io_1.lambdaReadFile)({
|
|
61
|
-
bucketName,
|
|
62
|
-
expectedBucketOwner,
|
|
63
|
-
key: makeKey(propsType, serialized.hash),
|
|
64
|
-
region,
|
|
65
|
-
});
|
|
66
|
-
const body = await (0, stream_to_string_1.streamToString)(response);
|
|
67
|
-
const payload = JSON.parse(body);
|
|
68
|
-
return payload;
|
|
69
|
-
}
|
|
70
|
-
catch (err) {
|
|
71
|
-
throw new Error(`Failed to parse input props that were serialized: ${err.stack}`);
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
exports.deserializeInputProps = deserializeInputProps;
|
|
75
|
-
const makeKey = (type, hash) => {
|
|
76
|
-
if (type === 'input-props') {
|
|
77
|
-
return (0, constants_1.inputPropsKey)(hash);
|
|
78
|
-
}
|
|
79
|
-
if (type === 'default-props') {
|
|
80
|
-
return (0, constants_1.defaultPropsKey)(hash);
|
|
81
|
-
}
|
|
82
|
-
return (0, constants_1.resolvedPropsKey)(hash);
|
|
4
|
+
exports.serializeJSONWithDate = exports.FILE_TOKEN = void 0;
|
|
5
|
+
const DATE_TOKEN = 'remotion-date:';
|
|
6
|
+
exports.FILE_TOKEN = 'remotion-file:';
|
|
7
|
+
const serializeJSONWithDate = ({ data, indent, staticBase, }) => {
|
|
8
|
+
let customDateUsed = false;
|
|
9
|
+
let customFileUsed = false;
|
|
10
|
+
let mapUsed = false;
|
|
11
|
+
let setUsed = false;
|
|
12
|
+
const serializedString = JSON.stringify(data, function (key, value) {
|
|
13
|
+
const item = this[key];
|
|
14
|
+
if (item instanceof Date) {
|
|
15
|
+
customDateUsed = true;
|
|
16
|
+
return `${DATE_TOKEN}${item.toISOString()}`;
|
|
17
|
+
}
|
|
18
|
+
if (item instanceof Map) {
|
|
19
|
+
mapUsed = true;
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
if (item instanceof Set) {
|
|
23
|
+
setUsed = true;
|
|
24
|
+
return value;
|
|
25
|
+
}
|
|
26
|
+
if (typeof item === 'string' &&
|
|
27
|
+
staticBase !== null &&
|
|
28
|
+
item.startsWith(staticBase)) {
|
|
29
|
+
customFileUsed = true;
|
|
30
|
+
return `${exports.FILE_TOKEN}${item.replace(staticBase + '/', '')}`;
|
|
31
|
+
}
|
|
32
|
+
return value;
|
|
33
|
+
}, indent);
|
|
34
|
+
return { serializedString, customDateUsed, customFileUsed, mapUsed, setUsed };
|
|
83
35
|
};
|
|
36
|
+
exports.serializeJSONWithDate = serializeJSONWithDate;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remotion/lambda",
|
|
3
|
-
"version": "4.1.0-
|
|
3
|
+
"version": "4.1.0-alpha8",
|
|
4
4
|
"description": "Distributed renderer for Remotion based on AWS Lambda",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -25,10 +25,10 @@
|
|
|
25
25
|
"@aws-sdk/s3-request-presigner": "3.338.0",
|
|
26
26
|
"aws-policies": "^1.0.1",
|
|
27
27
|
"mime-types": "2.1.34",
|
|
28
|
-
"@remotion/bundler": "4.1.0-
|
|
29
|
-
"@remotion/
|
|
30
|
-
"@remotion/
|
|
31
|
-
"remotion": "4.1.0-
|
|
28
|
+
"@remotion/bundler": "4.1.0-alpha8",
|
|
29
|
+
"@remotion/cli": "4.1.0-alpha8",
|
|
30
|
+
"@remotion/renderer": "4.1.0-alpha8",
|
|
31
|
+
"remotion": "4.1.0-alpha8"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@jonny/eslint-config": "3.0.266",
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
"typescript": "4.9.5",
|
|
44
44
|
"vitest": "0.31.1",
|
|
45
45
|
"zip-lib": "^0.7.2",
|
|
46
|
-
"@remotion/bundler": "4.1.0-
|
|
47
|
-
"@remotion/compositor-linux-arm64-gnu": "4.1.0-
|
|
46
|
+
"@remotion/bundler": "4.1.0-alpha8",
|
|
47
|
+
"@remotion/compositor-linux-arm64-gnu": "4.1.0-alpha8"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@remotion/bundler": "4.1.0-
|
|
50
|
+
"@remotion/bundler": "4.1.0-alpha8"
|
|
51
51
|
},
|
|
52
52
|
"publishConfig": {
|
|
53
53
|
"access": "public"
|
package/remotionlambda-arm64.zip
CHANGED
|
Binary file
|
package/remotionlambda-x64.zip
CHANGED
|
Binary file
|