Skip to content

🎥 Make videos programmatically with React

Merge remote-tracking branch 'origin/main' into cursor/2e01153f

JonnyBurger263266c2e86b
diff --cc packages/lambda-client/src/index.ts
index 061d63ec04,f98823e76c..b32bc9c630
--- a/packages/lambda-client/src/index.ts
+++ b/packages/lambda-client/src/index.ts
@@@ -55,101 -226,3 +55,102 @@@ export
type RenderFramesOnLambdaInput,
type RenderFramesOnLambdaOutput,
} from './render-frames-on-lambda';
+
+// Shared between the client and the Lambda function runtime.
+export {OutputFileAccessDeniedError} from './find-output-file-in-bucket';
+export {ServerlessRoutines} from './shared-constants';
+
+export type {Await} from './await';
+export type {OutputFileMetadata} from './find-output-file-in-bucket';
+export type {BillingCurrency} from './format-costs-info';
+export type {FileNameAndSize, GetFolderFiles} from './get-files-in-folder';
+export type {
+ GetOrCreateBucketInput,
+ GetOrCreateBucketOutput,
+} from './get-or-create-bucket';
+export type {
+ ImageSequenceFormat,
+ ImageSequenceManifest,
+ ImageSequenceOutput,
+ ImageSequenceOutputPrefix,
+ RendererOutput,
+ ServerlessRenderOutput,
+} from './image-sequence';
+export type {ExpensiveChunk} from './most-expensive-chunks';
+export type {OverallRenderProgress} from './overall-render-progress';
+export type {
+ BucketWithLocation,
+ CallFunctionAsync,
+ CallFunctionStreaming,
+ CallFunctionSync,
+ DeleteFunction,
+ EstimatePrice,
+ FunctionInfo,
+ GetAccountId,
+ GetFunctions,
+ GetLoggingUrlForMethod,
+ GetLoggingUrlForRendererFunction,
+ GetOutputUrl,
+ ParseFunctionName,
+ WriteFileInput,
+} from './aws-operations';
+export type {RenderMetadata} from './render-metadata';
+export type {CleanupInfo, GenericRenderProgress} from './render-progress';
+export type {
+ RendererFunctionTransport,
+ S3RendererArtifactMetadata,
+ S3RendererStatus,
+} from './renderer-transport';
+export type {OrError, ServerlessReturnValues} from './return-values';
+export type {SerializedArtifact} from './serialize-artifact';
+export type {
+ AfterRenderCost,
+ CustomCredentials,
+ CustomCredentialsWithoutSensitiveData,
+ DeleteAfter,
+ OutNameInput,
++ OutNameInputWithKey,
+ OutNameInputWithoutCredentials,
+ OutNameOutput,
+ PostRenderData,
+ Privacy,
+ RenderOutput,
+ SeparateAudioOutput,
+ SerializedInputProps,
+ ServerlessCodec,
+ ServerlessPayload,
+ ServerlessPayloads,
+ ServerlessStartPayload,
+ ServerlessStatusPayload,
+ WebhookOption,
+} from './shared-constants';
+export type {
+ BinaryMessageType,
+ GetBinaryPayloadSink,
+ MessageTypeId,
+ OnMessage,
+ OnStream,
+ StreamingMessage,
+ StreamingPayload,
+} from './streaming/streaming';
+export type {
+ CallFunctionOptions,
+ ChunkRetry,
+ CostsInfo,
+ ObjectChunkTimingData,
+ ParsedTiming,
+ ReceivedArtifact,
+ RenderStillFunctionResponsePayload,
+} from './types';
+export type {
+ WebhookErrorPayload,
+ WebhookPayload,
+ WebhookSuccessPayload,
+ WebhookTimeoutPayload,
+} from './webhook-types';
+export type {
+ EnhancedErrorInfo,
+ FunctionErrorInfo,
+} from './write-error-to-storage';
+
+export * as LambdaClientInternals from './internals';
diff --cc packages/lambda-client/src/make-lambda-payload.ts
index 7a275212b8,3c685b2807..76f2c71de6
--- a/packages/lambda-client/src/make-lambda-payload.ts
+++ b/packages/lambda-client/src/make-lambda-payload.ts
@@@ -1,46 -1,47 +1,47 @@@
import type {StorageClass} from '@aws-sdk/client-s3';
import type {
- _InternalTypes,
AudioCodec,
- BrowserSafeApis,
ChromiumOptions,
ColorSpace,
- DeleteAfter,
- DownloadBehavior,
LogLevel,
- OutNameInput,
- OutNameInputWithKey,
PixelFormat,
- Privacy,
- ServerlessCodec,
- ServerlessRenderOutput,
SingleFrameRange,
- ServerlessPayloads,
- ServerlessStartPayload,
- ServerlessStatusPayload,
ToOptions,
VideoImageFormat,
- WebhookOption,
X264Preset,
-} from '@remotion/serverless-client';
+} from '@remotion/renderer';
+import type {BrowserSafeApis} from '@remotion/renderer/client';
+import type {_InternalTypes} from 'remotion';
+import {NoReactInternals, type DownloadBehavior} from 'remotion/no-react';
+import {VERSION} from 'remotion/version';
import {
compressInputProps,
- ENABLE_V5_BREAKING_CHANGES,
getNeedsToUpload,
- getSizeInBytes,
serializeOrThrow,
- ServerlessRoutines,
- validateDownloadBehavior,
- VERSION,
-} from '@remotion/serverless-client';
-import {validateWebhook} from '@remotion/serverless-client';
-import type {AwsProvider} from './aws-provider';
-import {awsImplementation} from './aws-provider';
+} from './compress-props';
import type {GetRenderProgressInput} from './get-render-progress';
+import {getSizeInBytes} from './get-size-in-bytes';
+import type {ServerlessRenderOutput} from './image-sequence';
import type {AwsRegion} from './regions';
import type {RenderStillOnLambdaNonNullInput} from './render-still-on-lambda';
+import {getRendererFunctionTransport} from './renderer-transport';
+import {
+ ServerlessRoutines,
+ type DeleteAfter,
+ type OutNameInput,
++ type OutNameInputWithKey,
+ type Privacy,
+ type ServerlessCodec,
+ type ServerlessPayloads,
+ type ServerlessStartPayload,
+ type ServerlessStatusPayload,
+ type WebhookOption,
+} from './shared-constants';
import type {RequestHandler} from './types';
+import {validateDownloadBehavior} from './validate-download-behavior';
import {validateLambdaCodec} from './validate-lambda-codec';
import {validateServeUrl} from './validate-serveurl';
+import {validateWebhook} from './validate-webhook';
export type InnerRenderMediaOnLambdaInput = {
enableCancellation: boolean;
@@@ -65,8 -66,8 +66,8 @@@
concurrency: number | null;
logLevel: LogLevel;
frameRange: SingleFrameRange | null;
- outName: OutNameInput<AwsProvider> | null;
- separateAudioTo: OutNameInputWithKey<AwsProvider> | null;
+ outName: OutNameInput | null;
- separateAudioTo: OutNameInput | null;
++ separateAudioTo: OutNameInputWithKey | null;
timeoutInMilliseconds: number;
chromiumOptions: ChromiumOptions;
scale: number;
diff --cc packages/lambda-client/src/render-media-on-lambda.ts
index 8de9e05f0c,9283704a8a..5da8242b6c
--- a/packages/lambda-client/src/render-media-on-lambda.ts
+++ b/packages/lambda-client/src/render-media-on-lambda.ts
@@@ -22,13 -30,6 +22,14 @@@ import
import type {InnerRenderMediaOnLambdaInput} from './make-lambda-payload';
import {makeLambdaRenderMediaPayload} from './make-lambda-payload';
import type {AwsRegion} from './regions';
+import {
+ ServerlessRoutines,
+ type OutNameInput,
++ type OutNameInputWithKey,
+ type Privacy,
+ type ServerlessCodec,
+ type WebhookOption,
+} from './shared-constants';
import type {RequestHandler} from './types';
export type RenderMediaOnLambdaInput = {
@@@ -54,8 -55,8 +55,8 @@@
framesPerLambda?: number;
concurrency?: number;
frameRange?: SingleFrameRange;
- outName?: OutNameInput<AwsProvider>;
- separateAudioTo?: OutNameInputWithKey<AwsProvider>;
+ outName?: OutNameInput;
- separateAudioTo?: OutNameInput;
++ separateAudioTo?: OutNameInputWithKey;
chromiumOptions?: Omit<ChromiumOptions, 'enableMultiProcessOnLinux'>;
scale?: number;
everyNthFrame?: number;
diff --cc packages/lambda-client/src/shared-constants.ts
index 6891c5a60f,36a20fd0f2..b63e1e0c1e
--- a/packages/lambda-client/src/shared-constants.ts
+++ b/packages/lambda-client/src/shared-constants.ts
@@@ -60,10 -59,14 +60,12 @@@ export type OutNameInput
| string
| {
bucketName: string;
- key: string;
+ key?: string;
- s3OutputProvider?: CustomCredentials<Provider>;
+ s3OutputProvider?: CustomCredentials;
};
-export type OutNameInputWithKey<Provider extends CloudProvider> =
- | string
- | (OutNameInput<Provider> & {key: string});
++export type OutNameInputWithKey = string | (OutNameInput & {key: string});
+
export type RenderOutput = 'main' | 'separate-audio';
export type SeparateAudioOutput = {
@@@ -150,8 -153,8 +152,8 @@@ export type ServerlessStartPayload =
privacy: Privacy;
logLevel: LogLevel;
frameRange: SingleFrameRange | null;
- outName: OutNameInput<Provider> | null;
- separateAudioTo: OutNameInputWithKey<Provider> | null;
+ outName: OutNameInput | null;
- separateAudioTo: OutNameInput | null;
++ separateAudioTo: OutNameInputWithKey | null;
timeoutInMilliseconds: number;
chromiumOptions: ChromiumOptions;
scale: number;
@@@ -219,8 -222,8 +221,8 @@@ export type ServerlessPayloads =
privacy: Privacy;
logLevel: LogLevel;
frameRange: SingleFrameRange | null;
- outName: OutNameInput<Provider> | null;
- separateAudioTo: OutNameInputWithKey<Provider> | null;
+ outName: OutNameInput | null;
- separateAudioTo: OutNameInput | null;
++ separateAudioTo: OutNameInputWithKey | null;
timeoutInMilliseconds: number;
// Non-JS SDKs may not set chromiumOptions, may be undefined
chromiumOptions: ChromiumOptions | undefined;
@@@ -385,11 -389,11 +387,11 @@@ export const outStillName = (renderId:
export const outName = (renderId: string, extension: string) =>
`${rendersPrefix(renderId)}/out.${extension}`;
-export const customOutName = <Provider extends CloudProvider>(
+export const customOutName = (
renderId: string,
bucketName: string,
- name: OutNameInput,
- name: OutNameInputWithKey<Provider>,
-): OutNameOutput<Provider> => {
++ name: OutNameInputWithKey,
+): OutNameOutput => {
if (typeof name === 'string') {
return {
renderBucketName: bucketName,
diff --cc packages/lambda-client/src/test/expected-out-name.test.ts
index 97cc1d3e97,5298d549d2..7d79082849
--- a/packages/lambda-client/src/test/expected-out-name.test.ts
+++ b/packages/lambda-client/src/test/expected-out-name.test.ts
@@@ -125,8 -137,90 +125,90 @@@ test('Should preserve custom provider r
});
});
+ test('Should default key when outName specifies custom s3OutputProvider without key for video', () => {
- const newRenderMetadata: RenderMetadata<MockProvider> = {
++ const newRenderMetadata: RenderMetadata = {
+ ...testRenderMetadata,
+ audioCodec: 'pcm-16',
+ outName: {
+ bucketName: 'renders-dev.mykaraoke.video',
+ s3OutputProvider: {
+ endpoint: 'https://fly.storage.tigris.dev',
+ },
+ },
+ privacy: 'private',
+ };
+
+ expect(
+ getExpectedOutName({
+ output: 'main',
+ renderMetadata: newRenderMetadata,
+ bucketName,
+ customCredentials: {
+ endpoint: 'https://fly.storage.tigris.dev',
+ accessKeyId: 'access-key',
+ secretAccessKey: 'secret-key',
+ region: 'auto',
+ forcePathStyle: false,
+ },
+ bucketNamePrefix: 'remotionlambda-',
+ }),
+ ).toEqual({
+ customCredentials: {
+ endpoint: 'https://fly.storage.tigris.dev',
+ accessKeyId: 'access-key',
+ secretAccessKey: 'secret-key',
+ region: 'auto',
+ forcePathStyle: false,
+ },
+ renderBucketName: 'renders-dev.mykaraoke.video',
+ key: 'renders/9n8dsfafs/out.mkv',
+ });
+ });
+
+ test('Should default key when outName specifies custom s3OutputProvider without key for still', () => {
- const newRenderMetadata: RenderMetadata<MockProvider> = {
++ const newRenderMetadata: RenderMetadata = {
+ ...testRenderMetadata,
+ type: 'still',
+ codec: null,
+ imageFormat: 'png',
+ outName: {
+ bucketName: 'renders-dev.mykaraoke.video',
+ s3OutputProvider: {
+ endpoint: 'https://fly.storage.tigris.dev',
+ },
+ },
+ privacy: 'no-acl',
+ };
+
+ expect(
+ getExpectedOutName({
+ output: 'main',
+ renderMetadata: newRenderMetadata,
+ bucketName,
+ customCredentials: {
+ endpoint: 'https://fly.storage.tigris.dev',
+ accessKeyId: 'access-key',
+ secretAccessKey: 'secret-key',
+ region: 'auto',
+ forcePathStyle: true,
+ },
+ bucketNamePrefix: 'remotionlambda-',
+ }),
+ ).toEqual({
+ customCredentials: {
+ endpoint: 'https://fly.storage.tigris.dev',
+ accessKeyId: 'access-key',
+ secretAccessKey: 'secret-key',
+ region: 'auto',
+ forcePathStyle: true,
+ },
+ renderBucketName: 'renders-dev.mykaraoke.video',
+ key: 'renders/9n8dsfafs/out.png',
+ });
+ });
+
test('For stills', () => {
- const newRenderMetadata: RenderMetadata<MockProvider> = {
+ const newRenderMetadata: RenderMetadata = {
...testRenderMetadata,
codec: null,
type: 'still',
diff --cc packages/lambda/src/cli/helpers/get-s3-output-provider-from-cli.ts
index 80b4ecde11,54e95d3b8a..224b9f18e4
--- a/packages/lambda/src/cli/helpers/get-s3-output-provider-from-cli.ts
+++ b/packages/lambda/src/cli/helpers/get-s3-output-provider-from-cli.ts
@@@ -1,9 -1,9 +1,9 @@@
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import type {
- CustomCredentials,
- OutNameInputWithKey,
-} from '@remotion/serverless';
-import type {AwsProvider} from '../../client';
+import {
+ LambdaClientInternals,
+ type AwsRegion,
+ type CustomCredentials,
- type OutNameInput,
++ type OutNameInputWithKey,
+} from '@remotion/lambda-client';
export const S3_OUTPUT_PROVIDER_ACCESS_KEY_ID_ENV_NAME =
'REMOTION_S3_OUTPUT_PROVIDER_ACCESS_KEY_ID';
@@@ -56,8 -56,8 +56,8 @@@ export const makeOutNameWithCustomCrede
}: {
bucketName: string | undefined;
key: string | undefined;
- s3OutputProvider: CustomCredentials<AwsProvider> | null;
-}): OutNameInputWithKey<AwsProvider> | null => {
+ s3OutputProvider: CustomCredentials | null;
- }): OutNameInput | null => {
++}): OutNameInputWithKey | null => {
if (!s3OutputProvider) {
return key ?? null;
}