@remotion/lambda 4.0.0-bitrate.16 → 4.0.0-copy.4

package/dist/shared/constants.d.ts

@@ -75,12 +75,12 @@ export declare type OutNameOutput = {
     key: string;
     customCredentials: CustomCredentials | null;
 };
-export declare const optimizationProfile: (siteId: string, compositionId: string) => string;
 export declare const getSitesKey: (siteId: string) => string;
 export declare const outName: (renderId: string, extension: string) => string;
 export declare const outStillName: (renderId: string, imageFormat: ImageFormat) => string;
 export declare const customOutName: (renderId: string, bucketName: string, name: OutNameInput) => OutNameOutput;
 export declare const postRenderDataKey: (renderId: string) => string;
+export declare const inputPropsKey: (hash: string) => string;
 export declare const RENDERER_PATH_TOKEN = "remotion-bucket";
 export declare const CONCAT_FOLDER_TOKEN = "remotion-concat";
 export declare const REMOTION_CONCATED_TOKEN = "remotion-concated-token";
@@ -91,12 +91,20 @@ export declare enum LambdaRoutines {
     launch = "launch",
     status = "status",
     renderer = "renderer",
-    still = "still"
+    still = "still",
+    compositions = "compositions"
 }
 declare type WebhookOption = null | {
     url: string;
     secret: string | null;
 };
+export declare type SerializedInputProps = {
+    type: 'bucket-url';
+    hash: string;
+} | {
+    type: 'payload';
+    payload: unknown;
+};
 export declare type LambdaPayloads = {
     info: {
         type: LambdaRoutines.info;
@@ -106,7 +114,7 @@ export declare type LambdaPayloads = {
         serveUrl: string;
         composition: string;
         framesPerLambda: number | null;
-        inputProps: unknown;
+        inputProps: SerializedInputProps;
         codec: LambdaCodec;
         imageFormat: ImageFormat;
         crf: number | undefined;
@@ -129,9 +137,11 @@ export declare type LambdaPayloads = {
         muted: boolean;
         version: string;
         overwrite: boolean;
-        audioBitrate?: string | null;
-        videoBitrate?: string | null;
+        audioBitrate: string | null;
+        videoBitrate: string | null;
         webhook: WebhookOption;
+        forceHeight: number | null;
+        forceWidth: number | null;
     };
     launch: {
         type: LambdaRoutines.launch;
@@ -139,7 +149,7 @@ export declare type LambdaPayloads = {
         composition: string;
         framesPerLambda: number | null;
         bucketName: string;
-        inputProps: unknown;
+        inputProps: SerializedInputProps;
         renderId: string;
         imageFormat: ImageFormat;
         codec: LambdaCodec;
@@ -162,9 +172,11 @@ export declare type LambdaPayloads = {
         downloadBehavior: DownloadBehavior;
         muted: boolean;
         overwrite: boolean;
-        audioBitrate?: string | null;
-        videoBitrate?: string | null;
+        audioBitrate: string | null;
+        videoBitrate: string | null;
         webhook: WebhookOption;
+        forceHeight: number | null;
+        forceWidth: number | null;
     };
     status: {
         type: LambdaRoutines.status;
@@ -186,7 +198,7 @@ export declare type LambdaPayloads = {
         width: number;
         durationInFrames: number;
         retriesLeft: number;
-        inputProps: unknown;
+        inputProps: SerializedInputProps;
         renderId: string;
         imageFormat: ImageFormat;
         codec: Exclude<Codec, 'h264'>;
@@ -203,14 +215,14 @@ export declare type LambdaPayloads = {
         scale: number;
         everyNthFrame: number;
         muted: boolean;
-        audioBitrate?: string | null;
-        videoBitrate?: string | null;
+        audioBitrate: string | null;
+        videoBitrate: string | null;
     };
     still: {
         type: LambdaRoutines.still;
         serveUrl: string;
         composition: string;
-        inputProps: unknown;
+        inputProps: SerializedInputProps;
         imageFormat: ImageFormat;
         envVariables: Record<string, string> | undefined;
         attempt: number;
@@ -225,6 +237,18 @@ export declare type LambdaPayloads = {
         scale: number;
         downloadBehavior: DownloadBehavior | null;
         version: string;
+        forceHeight: number | null;
+        forceWidth: number | null;
+    };
+    compositions: {
+        type: LambdaRoutines.compositions;
+        version: string;
+        chromiumOptions: ChromiumOptions;
+        logLevel: LogLevel;
+        inputProps: SerializedInputProps;
+        envVariables: Record<string, string> | undefined;
+        timeoutInMilliseconds: number;
+        serveUrl: string;
     };
 };
 export declare type LambdaPayload = LambdaPayloads[LambdaRoutines];
@@ -243,10 +267,9 @@ export declare type RenderMetadata = {
     estimatedRenderLambdaInvokations: number;
     compositionId: string;
     codec: Codec | null;
-    usesOptimizationProfile: boolean;
     type: 'still' | 'video';
     imageFormat: ImageFormat;
-    inputProps: unknown;
+    inputProps: SerializedInputProps;
     framesPerLambda: number;
     memorySizeInMb: number;
     lambdaVersion: string;

package/dist/shared/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMBDA_BURST_LIMIT_QUOTA = exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.postRenderDataKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.optimizationProfile = exports.getErrorFileName = exports.getErrorKeyPrefix = exports.chunkKeyForIndex = exports.chunkKey = exports.lambdaTimingsKey = exports.lambdaLogsPrefix = exports.lambdaTimingsPrefixForChunk = exports.lambdaTimingsPrefix = exports.lambdaChunkInitializedKey = exports.lambdaChunkInitializedPrefix = exports.initalizedMetadataKey = exports.renderMetadataKey = exports.encodingProgressKey = exports.rendersPrefix = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_ARCHITECTURE = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
+exports.LAMBDA_BURST_LIMIT_QUOTA = exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.inputPropsKey = exports.postRenderDataKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.getErrorFileName = exports.getErrorKeyPrefix = exports.chunkKeyForIndex = exports.chunkKey = exports.lambdaTimingsKey = exports.lambdaLogsPrefix = exports.lambdaTimingsPrefixForChunk = exports.lambdaTimingsPrefix = exports.lambdaChunkInitializedKey = exports.lambdaChunkInitializedPrefix = exports.initalizedMetadataKey = exports.renderMetadataKey = exports.encodingProgressKey = exports.rendersPrefix = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_ARCHITECTURE = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
 exports.MIN_MEMORY = 512;
 exports.MAX_MEMORY = 10240;
 exports.DEFAULT_MEMORY_SIZE = 2048;
@@ -51,8 +51,6 @@ const getErrorKeyPrefix = (renderId) => `${(0, exports.rendersPrefix)(renderId)}
 exports.getErrorKeyPrefix = getErrorKeyPrefix;
 const getErrorFileName = ({ renderId, chunk, attempt, }) => (0, exports.getErrorKeyPrefix)(renderId) + ':chunk-' + chunk + ':attempt-' + attempt;
 exports.getErrorFileName = getErrorFileName;
-const optimizationProfile = (siteId, compositionId) => `optimization-profiles/${siteId}/${compositionId}/optimization-profile`;
-exports.optimizationProfile = optimizationProfile;
 const getSitesKey = (siteId) => `sites/${siteId}`;
 exports.getSitesKey = getSitesKey;
 const outName = (renderId, extension) => `${(0, exports.rendersPrefix)(renderId)}/out.${extension}`;
@@ -79,6 +77,10 @@ const postRenderDataKey = (renderId) => {
     return `${(0, exports.rendersPrefix)(renderId)}/post-render-metadata.json`;
 };
 exports.postRenderDataKey = postRenderDataKey;
+const inputPropsKey = (hash) => {
+    return `input-props/${hash}.json`;
+};
+exports.inputPropsKey = inputPropsKey;
 exports.RENDERER_PATH_TOKEN = 'remotion-bucket';
 exports.CONCAT_FOLDER_TOKEN = 'remotion-concat';
 exports.REMOTION_CONCATED_TOKEN = 'remotion-concated-token';
@@ -91,6 +93,7 @@ var LambdaRoutines;
     LambdaRoutines["status"] = "status";
     LambdaRoutines["renderer"] = "renderer";
     LambdaRoutines["still"] = "still";
+    LambdaRoutines["compositions"] = "compositions";
 })(LambdaRoutines = exports.LambdaRoutines || (exports.LambdaRoutines = {}));
 exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = 'L-B99A9384';
 exports.LAMBDA_BURST_LIMIT_QUOTA = 'L-548AE339';

package/dist/shared/deserialize-input-props.d.ts

@@ -0,0 +1,8 @@
+import type { AwsRegion } from '../client';
+import type { SerializedInputProps } from './constants';
+export declare const deserializeInputProps: ({ serialized, region, bucketName, expectedBucketOwner, }: {
+    serialized: SerializedInputProps;
+    region: AwsRegion;
+    bucketName: string;
+    expectedBucketOwner: string;
+}) => Promise<unknown>;

package/dist/shared/deserialize-input-props.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deserializeInputProps = void 0;
+const io_1 = require("../functions/helpers/io");
+const constants_1 = require("./constants");
+const stream_to_string_1 = require("./stream-to-string");
+const deserializeInputProps = async ({ serialized, region, bucketName, expectedBucketOwner, }) => {
+    if (serialized.type === 'payload') {
+        return JSON.parse(serialized.payload);
+    }
+    try {
+        const response = await (0, io_1.lambdaReadFile)({
+            bucketName,
+            expectedBucketOwner,
+            key: (0, constants_1.inputPropsKey)(serialized.hash),
+            region,
+        });
+        const body = await (0, stream_to_string_1.streamToString)(response);
+        const payload = JSON.parse(body);
+        return payload;
+    }
+    catch (err) {
+        throw new Error('Failed to parse input props that were');
+    }
+};
+exports.deserializeInputProps = deserializeInputProps;

package/dist/shared/get-aws-urls.d.ts

@@ -0,0 +1,13 @@
+import type { AwsRegion } from '../client';
+import type { LambdaRoutines } from './constants';
+export declare const getCloudwatchStreamUrl: ({ region, functionName, method, renderId, }: {
+    region: AwsRegion;
+    functionName: string;
+    method: LambdaRoutines;
+    renderId: string;
+}) => string;
+export declare const getS3RenderUrl: ({ renderId, region, bucketName, }: {
+    renderId: string;
+    region: AwsRegion;
+    bucketName: string;
+}) => string;

package/dist/{cli/helpers/get-cloudwatch-stream-url.js → shared/get-aws-urls.js}

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCloudwatchStreamUrl = void 0;
+exports.getS3RenderUrl = exports.getCloudwatchStreamUrl = void 0;
 const getCloudwatchStreamUrl = ({ region, functionName, method, renderId, }) => {
     return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionName}/log-events$3FfilterPattern$3D$2522method$253D${method}$252CrenderId$253D${renderId}$2522`;
 };
 exports.getCloudwatchStreamUrl = getCloudwatchStreamUrl;
+const getS3RenderUrl = ({ renderId, region, bucketName, }) => {
+    return `https://s3.console.aws.amazon.com/s3/buckets/${bucketName}?region=${region}&prefix=renders/${renderId}/`;
+};
+exports.getS3RenderUrl = getS3RenderUrl;

package/dist/shared/return-values.d.ts

@@ -1,3 +1,4 @@
+import type { compositionsHandler } from '../functions/compositions';
 import type { infoHandler } from '../functions/info';
 import type { launchHandler } from '../functions/launch';
 import type { progressHandler } from '../functions/progress';
@@ -12,4 +13,5 @@ export interface LambdaReturnValues {
     [LambdaRoutines.status]: ReturnType<typeof progressHandler>;
     [LambdaRoutines.info]: ReturnType<typeof infoHandler>;
     [LambdaRoutines.still]: ReturnType<typeof stillHandler>;
+    [LambdaRoutines.compositions]: ReturnType<typeof compositionsHandler>;
 }

package/dist/shared/serialize-input-props.d.ts

@@ -0,0 +1,7 @@
+import type { AwsRegion } from '../client';
+import type { SerializedInputProps } from './constants';
+export declare const serializeInputProps: ({ inputProps, region, type, }: {
+    inputProps: unknown;
+    region: AwsRegion;
+    type: 'still' | 'video-or-audio';
+}) => Promise<SerializedInputProps>;

package/dist/shared/serialize-input-props.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializeInputProps = void 0;
+const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
+const io_1 = require("../functions/helpers/io");
+const constants_1 = require("./constants");
+const random_hash_1 = require("./random-hash");
+const serializeInputProps = async ({ inputProps, region, type, }) => {
+    try {
+        const payload = JSON.stringify(inputProps);
+        const hash = (0, random_hash_1.randomHash)();
+        const MAX_INLINE_PAYLOAD_SIZE = type === 'still' ? 5000000 : 200000;
+        if (payload.length > MAX_INLINE_PAYLOAD_SIZE) {
+            console.warn(`Warning: inputProps are over ${Math.round(MAX_INLINE_PAYLOAD_SIZE / 1000)}KB (${Math.ceil(payload.length / 1024)}KB) in size. Uploading them to S3 to circumvent AWS Lambda payload size.`);
+            const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
+                region,
+            });
+            await (0, io_1.lambdaWriteFile)({
+                body: payload,
+                bucketName,
+                region,
+                customCredentials: null,
+                downloadBehavior: null,
+                expectedBucketOwner: null,
+                key: (0, constants_1.inputPropsKey)(hash),
+                privacy: 'public',
+            });
+            return {
+                type: 'bucket-url',
+                hash,
+            };
+        }
+        return {
+            type: 'payload',
+            payload,
+        };
+    }
+    catch (err) {
+        throw new Error('Error serializing inputProps. Check it has no circular references or reduce the size if the object is big.');
+    }
+};
+exports.serializeInputProps = serializeInputProps;

package/package.json

@@ -1,22 +1,21 @@
 {
 	"name": "@remotion/lambda",
-	"version": "4.0.0-bitrate.16+0c3bf01cd",
+	"version": "4.0.0-copy.4+07d4897fb",
 	"description": "Distributed renderer for Remotion based on AWS Lambda",
 	"main": "dist/index.js",
 	"sideEffects": false,
 	"bin": {
 		"remotion-lambda": "remotion-lambda-cli.js"
 	},
-	"module": "true",
 	"scripts": {
-		"testintegration": "jest src/test/integration --runInBand --forceExit",
+		"testintegration": "vitest src/test/integration --run",
 		"lint": "eslint src --ext ts,tsx",
-		"test": "jest src/test/unit",
+		"test": "vitest src/test/unit --run",
 		"watch": "tsc -w",
 		"build": "tsc -d && pnpm run buildlambda",
 		"buildlambda": "ts-node src/admin/bundle-lambda.ts",
 		"start": "ts-node src/run.ts",
-		"prepublish": "ts-node src/admin/bundle-lambda.ts && node ensure-version-match.js"
+		"prepublishOnly": "ts-node src/admin/bundle-lambda.ts && node ensure-version-match.js"
 	},
 	"author": "",
 	"license": "MIT",
@@ -24,20 +23,20 @@
 		"url": "https://github.com/JonnyBurger/remotion"
 	},
 	"dependencies": {
-		"@aws-sdk/abort-controller": "3.55.0",
-		"@aws-sdk/client-cloudwatch-logs": "3.58.0",
-		"@aws-sdk/client-iam": "3.58.0",
-		"@aws-sdk/client-lambda": "3.58.0",
-		"@aws-sdk/client-s3": "3.58.0",
-		"@aws-sdk/client-service-quotas": "3.58.0",
-		"@aws-sdk/lib-storage": "3.58.0",
-		"@aws-sdk/s3-request-presigner": "3.58.0",
-		"@remotion/bundler": "4.0.0-bitrate.16+0c3bf01cd",
-		"@remotion/cli": "4.0.0-bitrate.16+0c3bf01cd",
-		"@remotion/renderer": "4.0.0-bitrate.16+0c3bf01cd",
+		"@aws-sdk/abort-controller": "3.190.0",
+		"@aws-sdk/client-cloudwatch-logs": "3.190.0",
+		"@aws-sdk/client-iam": "3.190.0",
+		"@aws-sdk/client-lambda": "3.190.0",
+		"@aws-sdk/client-s3": "3.190.0",
+		"@aws-sdk/client-service-quotas": "3.190.0",
+		"@aws-sdk/lib-storage": "3.190.0",
+		"@aws-sdk/s3-request-presigner": "3.190.0",
+		"@remotion/bundler": "4.0.0-copy.4+07d4897fb",
+		"@remotion/cli": "4.0.0-copy.4+07d4897fb",
+		"@remotion/renderer": "4.0.0-copy.4+07d4897fb",
 		"aws-policies": "^1.0.1",
 		"mime-types": "2.1.34",
-		"remotion": "4.0.0-bitrate.16+0c3bf01cd"
+		"remotion": "4.0.0-copy.4+07d4897fb"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -45,22 +44,20 @@
 	},
 	"devDependencies": {
 		"@jonny/eslint-config": "3.0.266",
-		"@types/jest": "^27.0.2",
 		"@types/mime-types": "2.1.1",
 		"@types/minimist": "1.2.2",
 		"@types/node": "^14.14.14",
 		"@types/prompt": "^1.1.0",
-		"eslint": "8.13.0",
-		"jest": "^27.2.4",
+		"eslint": "8.25.0",
 		"prettier": "^2.4.1",
 		"prettier-plugin-organize-imports": "^2.3.4",
-		"ts-jest": "^27.0.5",
 		"ts-node": "^10.8.0",
 		"typescript": "^4.7.0",
+		"vitest": "^0.24.3",
 		"zip-lib": "^0.7.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0c3bf01cdf3c1849ec8dddf3a82ce7dc81f65663"
+	"gitHead": "07d4897fb44920b58dc85cf7465d990a0a139994"
 }

package/dist/cli/helpers/determine-image-format.d.ts

@@ -1,10 +0,0 @@
-import type { ImageFormat, StillImageFormat } from '@remotion/renderer';
-export declare const getImageFormat: ({ downloadName, outName, configImageFormat, cliFlag, }: {
-    downloadName: string | null;
-    outName: string | null;
-    configImageFormat: ImageFormat | null;
-    cliFlag: ImageFormat | null;
-}) => {
-    format: StillImageFormat;
-    source: string;
-};