Skip to content

🎥 Make videos programmatically with React

Remove @remotion/serverless and @remotion/serverless-client

JonnyBurgerd11148463e02
diff --git a/bun.lock b/bun.lock
index f54b2b5d96..14ab5d07ad 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1044,8 +1044,6 @@
"@remotion/player": "workspace:*",
"@remotion/preload": "workspace:*",
"@remotion/renderer": "workspace:*",
- "@remotion/serverless": "workspace:*",
- "@remotion/serverless-client": "workspace:*",
"@remotion/shapes": "workspace:*",
"@remotion/studio-server": "workspace:*",
"@remotion/studio-shared": "workspace:*",
@@ -1123,8 +1121,8 @@
"@remotion/bundler": "workspace:*",
"@remotion/cli": "workspace:*",
"@remotion/lambda-client": "workspace:*",
+ "@remotion/licensing": "workspace:*",
"@remotion/renderer": "workspace:*",
- "@remotion/serverless": "workspace:*",
"@remotion/streaming": "workspace:*",
"@smithy/abort-controller": "4.0.1",
"remotion": "workspace:*",
@@ -1163,7 +1161,8 @@
"@aws-sdk/lib-storage": "catalog:",
"@aws-sdk/s3-request-presigner": "catalog:",
"@remotion/eslint-config-internal": "workspace:*",
- "@remotion/serverless-client": "workspace:*",
+ "@remotion/renderer": "workspace:*",
+ "@remotion/streaming": "workspace:*",
"@types/express": "5.0.1",
"@types/mime-types": "2.1.1",
"@typescript/native-preview": "catalog:",
@@ -1171,6 +1170,7 @@
"express": "4.21.0",
"mime-types": "2.1.34",
"next": "catalog:",
+ "remotion": "workspace:*",
},
},
"packages/lambda-go": {
@@ -1724,33 +1724,6 @@
"react-dom": ">=16.8.0",
},
},
- "packages/serverless": {
- "name": "@remotion/serverless",
- "version": "4.0.537",
- "dependencies": {
- "@remotion/bundler": "workspace:*",
- "@remotion/licensing": "workspace:*",
- "@remotion/renderer": "workspace:*",
- "@remotion/serverless-client": "workspace:*",
- },
- "devDependencies": {
- "@remotion/eslint-config-internal": "workspace:*",
- "@typescript/native-preview": "catalog:",
- "eslint": "catalog:",
- },
- },
- "packages/serverless-client": {
- "name": "@remotion/serverless-client",
- "version": "4.0.537",
- "devDependencies": {
- "@remotion/eslint-config-internal": "workspace:*",
- "@remotion/renderer": "workspace:*",
- "@remotion/streaming": "workspace:*",
- "@typescript/native-preview": "catalog:",
- "eslint": "catalog:",
- "remotion": "workspace:*",
- },
- },
"packages/sfx": {
"name": "@remotion/sfx",
"version": "4.0.537",
@@ -4739,10 +4712,6 @@
"@remotion/sdk": ["@remotion/sdk@workspace:packages/sdk"],
- "@remotion/serverless": ["@remotion/serverless@workspace:packages/serverless"],
-
- "@remotion/serverless-client": ["@remotion/serverless-client@workspace:packages/serverless-client"],
-
"@remotion/sfx": ["@remotion/sfx@workspace:packages/sfx"],
"@remotion/shapes": ["@remotion/shapes@workspace:packages/shapes"],
diff --git a/package.json b/package.json
index 763904a210..f527d4ccc8 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
"watchplayer": "turbo watch make --experimental-write-cache --filter='@remotion/player'",
"makestudio": "turbo run make --filter='@remotion/studio' --filter='@remotion/studio-server'",
"watchstudio": "turbo watch make --experimental-write-cache --filter='@remotion/studio' --filter='@remotion/studio-server'",
- "makeserverless": "turbo run make --filter='@remotion/lambda' --filter='@remotion/serverless' --filter='@remotion/streaming'",
- "watchserverless": "turbo watch make --experimental-write-cache --filter='@remotion/lambda' --filter='@remotion/serverless' --filter='@remotion/streaming'",
+ "makelambda": "turbo run make --filter='@remotion/lambda' --filter='@remotion/streaming'",
+ "watchlambda": "turbo watch make --experimental-write-cache --filter='@remotion/lambda' --filter='@remotion/streaming'",
"makethree": "turbo run make --filter='@remotion/three'",
"watchthree": "turbo watch make --experimental-write-cache --filter='@remotion/three'",
"release": "bun publish.ts && turbo run publishprivate --concurrency=1 && git push --tags && git push",
diff --git a/packages/STATS.md b/packages/STATS.md
index 017bbb2a83..965dc1fa47 100644
--- a/packages/STATS.md
+++ b/packages/STATS.md
@@ -56,7 +56,6 @@ Monthly downloads of Remotion packages
[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/rough-notation.svg?style=flat&color=black&label=@remotion/rough-notation)](https://npmcharts.com/compare/@remotion/rough-notation?minimal=true)
[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/rounded-text-box.svg?style=flat&color=black&label=@remotion/rounded-text-box)](https://npmcharts.com/compare/@remotion/rounded-text-box?minimal=true)
[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/sdk.svg?style=flat&color=black&label=@remotion/sdk)](https://npmcharts.com/compare/@remotion/sdk?minimal=true)
-[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/serverless.svg?style=flat&color=black&label=@remotion/serverless)](https://npmcharts.com/compare/@remotion/serverless?minimal=true)
[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/sfx.svg?style=flat&color=black&label=@remotion/sfx)](https://npmcharts.com/compare/@remotion/sfx?minimal=true)
[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/shapes.svg?style=flat&color=black&label=@remotion/shapes)](https://npmcharts.com/compare/@remotion/shapes?minimal=true)
[![NPM Downloads](https://img.shields.io/npm/dm/@remotion/skia.svg?style=flat&color=black&label=@remotion/skia)](https://npmcharts.com/compare/@remotion/skia?minimal=true)
diff --git a/packages/cli/src/list-of-remotion-packages.ts b/packages/cli/src/list-of-remotion-packages.ts
index a008618480..b5a4f34e6c 100644
--- a/packages/cli/src/list-of-remotion-packages.ts
+++ b/packages/cli/src/list-of-remotion-packages.ts
@@ -68,8 +68,6 @@ export const listOfRemotionPackages = [
'@remotion/skia',
'@remotion/promo-pages',
'@remotion/streaming',
- '@remotion/serverless',
- '@remotion/serverless-client',
'@remotion/skills',
'@remotion/skills-evals',
'@remotion/codemods',
diff --git a/packages/create-video/src/list-of-remotion-packages.ts b/packages/create-video/src/list-of-remotion-packages.ts
index a008618480..b5a4f34e6c 100644
--- a/packages/create-video/src/list-of-remotion-packages.ts
+++ b/packages/create-video/src/list-of-remotion-packages.ts
@@ -68,8 +68,6 @@ export const listOfRemotionPackages = [
'@remotion/skia',
'@remotion/promo-pages',
'@remotion/streaming',
- '@remotion/serverless',
- '@remotion/serverless-client',
'@remotion/skills',
'@remotion/skills-evals',
'@remotion/codemods',
diff --git a/packages/it-tests/package.json b/packages/it-tests/package.json
index d1c905d687..2b9011c232 100644
--- a/packages/it-tests/package.json
+++ b/packages/it-tests/package.json
@@ -47,8 +47,6 @@
"@remotion/install-whisper-cpp": "workspace:*",
"@remotion/captions": "workspace:*",
"@remotion/google-fonts": "workspace:*",
- "@remotion/serverless": "workspace:*",
- "@remotion/serverless-client": "workspace:*",
"@remotion/studio-server": "workspace:*",
"@remotion/studio-shared": "workspace:*",
"@remotion/tailwind": "workspace:*",
diff --git a/packages/it-tests/src/bundle/bundle-studio.test.ts b/packages/it-tests/src/bundle/bundle-studio.test.ts
index c555285c45..ccb90e29b5 100644
--- a/packages/it-tests/src/bundle/bundle-studio.test.ts
+++ b/packages/it-tests/src/bundle/bundle-studio.test.ts
@@ -1,11 +1,9 @@
import {expect, test} from 'bun:test';
import {existsSync, readFileSync} from 'fs';
import path from 'path';
+import {LambdaClientInternals} from '@remotion/lambda-client';
import {openBrowser} from '@remotion/renderer';
-import {
- getRemotionVersionFromIndexHtml,
- VERSION,
-} from '@remotion/serverless-client';
+import {VERSION} from 'remotion/version';
test(
'Bundle studio',
@@ -45,7 +43,8 @@ test(
path.join(folder, 'index.html'),
'utf-8',
);
- const version = getRemotionVersionFromIndexHtml(indexHtmlContent);
+ const version =
+ LambdaClientInternals.getRemotionVersionFromIndexHtml(indexHtmlContent);
expect(version).toBe(VERSION);
const server = Bun.serve({
diff --git a/packages/lambda-client/package.json b/packages/lambda-client/package.json
index bc31416532..be59183416 100644
--- a/packages/lambda-client/package.json
+++ b/packages/lambda-client/package.json
@@ -26,7 +26,9 @@
"@aws-sdk/lib-storage": "catalog:",
"mime-types": "2.1.34",
"@aws-sdk/credential-provider-ini": "catalog:",
- "@remotion/serverless-client": "workspace:*",
+ "remotion": "workspace:*",
+ "@remotion/streaming": "workspace:*",
+ "@remotion/renderer": "workspace:*",
"@types/express": "5.0.1",
"express": "4.21.0",
"@remotion/eslint-config-internal": "workspace:*",
diff --git a/packages/lambda-client/src/app-router-webhook.ts b/packages/lambda-client/src/app-router-webhook.ts
index 05e3c13cb5..0c1d7e0bf1 100644
--- a/packages/lambda-client/src/app-router-webhook.ts
+++ b/packages/lambda-client/src/app-router-webhook.ts
@@ -1,10 +1,10 @@
+import {validateWebhookSignature} from './validate-webhook-signature';
import type {
WebhookErrorPayload,
WebhookPayload,
WebhookSuccessPayload,
WebhookTimeoutPayload,
-} from '@remotion/serverless-client';
-import {validateWebhookSignature} from './validate-webhook-signature';
+} from './webhook-types';
export type NextWebhookArgs = {
testing?: boolean;
diff --git a/packages/serverless-client/src/await.ts b/packages/lambda-client/src/await.ts
similarity index 100%
rename from packages/serverless-client/src/await.ts
rename to packages/lambda-client/src/await.ts
diff --git a/packages/lambda-client/src/aws-provider.ts b/packages/lambda-client/src/aws-provider.ts
index 1773c79006..7c279e7ea0 100644
--- a/packages/lambda-client/src/aws-provider.ts
+++ b/packages/lambda-client/src/aws-provider.ts
@@ -1,4 +1,6 @@
+import type {ProviderSpecifics} from './provider-implementation';
import type {AwsRegion} from './regions';
+import {expiryDays} from './shared-constants';
export type AwsProvider = {
type: 'aws';
@@ -25,8 +27,6 @@ export type AwsProvider = {
import {EventEmitter} from 'node:events';
import type {StorageClass} from '@aws-sdk/client-s3';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
-import {expiryDays} from '@remotion/serverless-client';
import {getAwsRegionMetadata} from './aws-region-metadata';
import {bucketExistsInRegionImplementation} from './bucket-exists';
import {callFunctionAsyncImplementation} from './call-lambda-async';
diff --git a/packages/serverless-client/src/best-frames-per-function-param.ts b/packages/lambda-client/src/best-frames-per-function-param.ts
similarity index 100%
rename from packages/serverless-client/src/best-frames-per-function-param.ts
rename to packages/lambda-client/src/best-frames-per-function-param.ts
diff --git a/packages/lambda-client/src/bucket-exists.ts b/packages/lambda-client/src/bucket-exists.ts
index 294f89fd7e..00ce0d9698 100644
--- a/packages/lambda-client/src/bucket-exists.ts
+++ b/packages/lambda-client/src/bucket-exists.ts
@@ -1,7 +1,7 @@
import {GetBucketLocationCommand} from '@aws-sdk/client-s3';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getS3Client} from './get-s3-client';
+import type {ProviderSpecifics} from './provider-implementation';
export const bucketExistsInRegionImplementation: ProviderSpecifics<AwsProvider>['bucketExists'] =
async ({
diff --git a/packages/serverless-client/src/calculate-billing-duration.ts b/packages/lambda-client/src/calculate-billing-duration.ts
similarity index 100%
rename from packages/serverless-client/src/calculate-billing-duration.ts
rename to packages/lambda-client/src/calculate-billing-duration.ts
diff --git a/packages/serverless-client/src/calculate-chunk-times.ts b/packages/lambda-client/src/calculate-chunk-times.ts
similarity index 100%
rename from packages/serverless-client/src/calculate-chunk-times.ts
rename to packages/lambda-client/src/calculate-chunk-times.ts
diff --git a/packages/lambda-client/src/call-lambda-async.ts b/packages/lambda-client/src/call-lambda-async.ts
index 41daee3c34..662442dea7 100644
--- a/packages/lambda-client/src/call-lambda-async.ts
+++ b/packages/lambda-client/src/call-lambda-async.ts
@@ -1,11 +1,8 @@
import {InvokeCommand} from '@aws-sdk/client-lambda';
-import type {
- CallFunctionOptions,
- CloudProvider,
- ServerlessRoutines,
-} from '@remotion/serverless-client';
import {getLambdaClient} from './aws-clients';
import type {AwsRegion} from './regions';
+import type {ServerlessRoutines} from './shared-constants';
+import type {CallFunctionOptions, CloudProvider} from './types';
import type {RequestHandler} from './types';
export const callFunctionAsyncImplementation = async <
diff --git a/packages/lambda-client/src/call-lambda-streaming.ts b/packages/lambda-client/src/call-lambda-streaming.ts
index 8c6ec34f2e..3ea0078545 100644
--- a/packages/lambda-client/src/call-lambda-streaming.ts
+++ b/packages/lambda-client/src/call-lambda-streaming.ts
@@ -1,27 +1,24 @@
-/* eslint-disable no-console */
import type {InvokeWithResponseStreamCommandOutput} from '@aws-sdk/client-lambda';
import {
InvokeWithResponseStreamCommand,
type InvokeWithResponseStreamResponseEvent,
} from '@aws-sdk/client-lambda';
-import type {
- CallFunctionOptions,
- CloudProvider,
- GetBinaryPayloadSink,
- MessageTypeId,
- OnMessage,
- ServerlessRoutines,
- StreamingMessage,
-} from '@remotion/serverless-client';
+import {makeStreamer} from '@remotion/streaming';
+import {getLambdaClient} from './aws-clients';
+import {getAwsRegionMetadata} from './aws-region-metadata';
+import type {AwsRegion} from './regions';
+/* eslint-disable no-console */
+import type {ServerlessRoutines} from './shared-constants';
import {
binaryPayloadSinkForStreamer,
formatMap,
- makeStreamer,
messageTypeIdToMessageType,
-} from '@remotion/serverless-client';
-import {getLambdaClient} from './aws-clients';
-import {getAwsRegionMetadata} from './aws-region-metadata';
-import type {AwsRegion} from './regions';
+ type GetBinaryPayloadSink,
+ type MessageTypeId,
+ type OnMessage,
+ type StreamingMessage,
+} from './streaming/streaming';
+import type {CallFunctionOptions, CloudProvider} from './types';
import type {RequestHandler} from './types';
const STREAM_STALL_TIMEOUT = 30000;
diff --git a/packages/lambda-client/src/call-lambda-sync.ts b/packages/lambda-client/src/call-lambda-sync.ts
index 5c0bcf27c7..f2c92ca3cf 100644
--- a/packages/lambda-client/src/call-lambda-sync.ts
+++ b/packages/lambda-client/src/call-lambda-sync.ts
@@ -1,13 +1,9 @@
import {InvokeCommand} from '@aws-sdk/client-lambda';
-import type {
- CallFunctionOptions,
- CloudProvider,
- OrError,
- ServerlessReturnValues,
- ServerlessRoutines,
-} from '@remotion/serverless-client';
import {getLambdaClient} from './aws-clients';
import type {AwsRegion} from './regions';
+import type {OrError, ServerlessReturnValues} from './return-values';
+import type {ServerlessRoutines} from './shared-constants';
+import type {CallFunctionOptions, CloudProvider} from './types';
import type {RequestHandler} from './types';
const callLambdaSyncWithoutRetry = async <
diff --git a/packages/lambda-client/src/cancel-render-on-lambda.ts b/packages/lambda-client/src/cancel-render-on-lambda.ts
index ce66a43274..e066dc3aff 100644
--- a/packages/lambda-client/src/cancel-render-on-lambda.ts
+++ b/packages/lambda-client/src/cancel-render-on-lambda.ts
@@ -1,11 +1,9 @@
-import type {ProviderSpecifics} from '@remotion/serverless-client';
-import {
- getOverallProgressFromStorage,
- writeCancellationSignal,
-} from '@remotion/serverless-client';
import {awsImplementation, type AwsProvider} from './aws-provider';
+import {getOverallProgressFromStorage} from './get-overall-progress-from-storage';
+import type {ProviderSpecifics} from './provider-implementation';
import type {AwsRegion} from './regions';
import type {RequestHandler} from './types';
+import {writeCancellationSignal} from './write-cancellation-signal';
export type CancelRenderOnLambdaInput = {
region: AwsRegion;
diff --git a/packages/serverless-client/src/check-bucket-listing.ts b/packages/lambda-client/src/check-bucket-listing.ts
similarity index 100%
rename from packages/serverless-client/src/check-bucket-listing.ts
rename to packages/lambda-client/src/check-bucket-listing.ts
diff --git a/packages/lambda-client/src/check-credentials.ts b/packages/lambda-client/src/check-credentials.ts
index b50fba8549..b00cd619f7 100644
--- a/packages/lambda-client/src/check-credentials.ts
+++ b/packages/lambda-client/src/check-credentials.ts
@@ -1,7 +1,8 @@
-import {DOCS_URL, truthy} from '@remotion/serverless-client';
+import {DOCS_URL} from './docs-url';
import {getEnvVariable} from './get-env-variable';
import {getIsCli} from './is-cli';
import {isLikelyToHaveAwsProfile} from './is-likely-to-have-aws-profile';
+import {truthy} from './truthy';
const messageForVariable = (variable: string) => {
return [
diff --git a/packages/lambda-client/src/clean-items.ts b/packages/lambda-client/src/clean-items.ts
index 55f841868e..96468fff28 100644
--- a/packages/lambda-client/src/clean-items.ts
+++ b/packages/lambda-client/src/clean-items.ts
@@ -1,8 +1,6 @@
-import type {
- CloudProvider,
- ProviderSpecifics,
-} from '@remotion/serverless-client';
import {pLimit} from './p-limit';
+import type {ProviderSpecifics} from './provider-implementation';
+import type {CloudProvider} from './types';
const limit = pLimit(10);
diff --git a/packages/serverless-client/src/compress-props.ts b/packages/lambda-client/src/compress-props.ts
similarity index 98%
rename from packages/serverless-client/src/compress-props.ts
rename to packages/lambda-client/src/compress-props.ts
index 4802ad3662..a09cf7a0a1 100644
--- a/packages/serverless-client/src/compress-props.ts
+++ b/packages/lambda-client/src/compress-props.ts
@@ -1,9 +1,9 @@
import type {LogLevel} from 'remotion';
import {NoReactInternals} from 'remotion/no-react';
-import type {SerializedInputProps} from './constants';
import {internalGetOrCreateBucket} from './get-or-create-bucket';
import {inputPropsKey, resolvedPropsKey} from './input-props-keys';
import type {ProviderSpecifics} from './provider-implementation';
+import type {SerializedInputProps} from './shared-constants';
import {streamToString} from './stream-to-string';
import type {CloudProvider} from './types';
import {MAX_WEBHOOK_CUSTOM_DATA_SIZE} from './validate-webhook';
diff --git a/packages/lambda-client/src/constants.ts b/packages/lambda-client/src/constants.ts
index bfddbe4e1d..49f57451ef 100644
--- a/packages/lambda-client/src/constants.ts
+++ b/packages/lambda-client/src/constants.ts
@@ -1,6 +1,7 @@
-import type {GenericRenderProgress, Privacy} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import type {AwsRegion} from './regions';
+import type {GenericRenderProgress} from './render-progress';
+import type {Privacy} from './shared-constants';
export const MIN_MEMORY = 512;
export const MAX_MEMORY = 10240;
diff --git a/packages/lambda-client/src/content-disposition-header.ts b/packages/lambda-client/src/content-disposition-header.ts
index 459ee6a4ec..9b343e7152 100644
--- a/packages/lambda-client/src/content-disposition-header.ts
+++ b/packages/lambda-client/src/content-disposition-header.ts
@@ -1,4 +1,4 @@
-import type {DownloadBehavior} from '@remotion/serverless-client';
+import type {DownloadBehavior} from 'remotion/no-react';
// By setting the Content-Disposition header in an S3 object,
// you can control if the user downloads the item if you
diff --git a/packages/lambda-client/src/convert-to-serve-url.ts b/packages/lambda-client/src/convert-to-serve-url.ts
index 83cfa50962..c6ea8240a3 100644
--- a/packages/lambda-client/src/convert-to-serve-url.ts
+++ b/packages/lambda-client/src/convert-to-serve-url.ts
@@ -1,5 +1,5 @@
-import {DOCS_URL} from '@remotion/serverless-client';
import {getAwsRegionMetadata} from './aws-region-metadata';
+import {DOCS_URL} from './docs-url';
import type {AwsRegion} from './regions';
export const convertToServeUrlImplementation = ({
diff --git a/packages/lambda-client/src/create-bucket.ts b/packages/lambda-client/src/create-bucket.ts
index 2c66fc4c67..b594cf20fa 100644
--- a/packages/lambda-client/src/create-bucket.ts
+++ b/packages/lambda-client/src/create-bucket.ts
@@ -5,10 +5,10 @@ import {
PutBucketAclCommand,
PutBucketPolicyCommand,
} from '@aws-sdk/client-s3';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getAwsRegionMetadata} from './aws-region-metadata';
import {getS3Client} from './get-s3-client';
+import type {ProviderSpecifics} from './provider-implementation';
export const createBucket: ProviderSpecifics<AwsProvider>['createBucket'] =
async ({region, bucketName, forcePathStyle, requestHandler}) => {
diff --git a/packages/lambda-client/src/delete-file.ts b/packages/lambda-client/src/delete-file.ts
index 49a83ba184..b0f64a1756 100644
--- a/packages/lambda-client/src/delete-file.ts
+++ b/packages/lambda-client/src/delete-file.ts
@@ -1,11 +1,9 @@
import {DeleteObjectCommand} from '@aws-sdk/client-s3';
-import type {
- CustomCredentials,
- ProviderSpecifics,
-} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getS3Client} from './get-s3-client';
+import type {ProviderSpecifics} from './provider-implementation';
import type {AwsRegion} from './regions';
+import type {CustomCredentials} from './shared-constants';
import type {RequestHandler} from './types';
export const lambdaDeleteFileImplementation: ProviderSpecifics<AwsProvider>['deleteFile'] =
diff --git a/packages/lambda-client/src/delete-function.ts b/packages/lambda-client/src/delete-function.ts
index a2fa7da605..fbd1ad1a95 100644
--- a/packages/lambda-client/src/delete-function.ts
+++ b/packages/lambda-client/src/delete-function.ts
@@ -1,10 +1,10 @@
import {DeleteFunctionCommand} from '@aws-sdk/client-lambda';
+import {getLambdaClient} from './aws-clients';
+import type {AwsProvider} from './aws-provider';
import type {
DeleteFunction,
DeleteFunctionInput as GenericDeleteFunctionInput,
-} from '@remotion/serverless-client';
-import {getLambdaClient} from './aws-clients';
-import type {AwsProvider} from './aws-provider';
+} from './provider-implementation';
import type {RequestHandler} from './types';
export type DeleteFunctionInput = GenericDeleteFunctionInput<AwsProvider> & {
diff --git a/packages/lambda-client/src/delete-render.ts b/packages/lambda-client/src/delete-render.ts
index 787fd68e18..34e2621484 100644
--- a/packages/lambda-client/src/delete-render.ts
+++ b/packages/lambda-client/src/delete-render.ts
@@ -1,16 +1,13 @@
-import type {ProviderSpecifics} from '@remotion/serverless-client';
-import {
- getExpectedOutName,
- getImageSequenceFrameKey,
- getOverallProgressFromStorage,
- rendersPrefix,
- type CustomCredentials,
-} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {awsImplementation} from './aws-provider';
import {cleanItems} from './clean-items';
import {REMOTION_BUCKET_PREFIX} from './constants';
+import {getExpectedOutName} from './expected-out-name';
+import {getOverallProgressFromStorage} from './get-overall-progress-from-storage';
+import {getImageSequenceFrameKey} from './image-sequence';
+import type {ProviderSpecifics} from './provider-implementation';
import type {AwsRegion} from './regions';
+import {rendersPrefix, type CustomCredentials} from './shared-constants';
import type {RequestHandler} from './types';
export type DeleteRenderInput = {
diff --git a/packages/serverless-client/src/docs-url.ts b/packages/lambda-client/src/docs-url.ts
similarity index 100%
rename from packages/serverless-client/src/docs-url.ts
rename to packages/lambda-client/src/docs-url.ts
diff --git a/packages/serverless-client/src/error-category.ts b/packages/lambda-client/src/error-category.ts
similarity index 100%
rename from packages/serverless-client/src/error-category.ts
rename to packages/lambda-client/src/error-category.ts
diff --git a/packages/serverless-client/src/estimate-price-from-bucket.ts b/packages/lambda-client/src/estimate-price-from-bucket.ts
similarity index 100%
rename from packages/serverless-client/src/estimate-price-from-bucket.ts
rename to packages/lambda-client/src/estimate-price-from-bucket.ts
diff --git a/packages/serverless-client/src/expected-out-name.ts b/packages/lambda-client/src/expected-out-name.ts
similarity index 99%
rename from packages/serverless-client/src/expected-out-name.ts
rename to packages/lambda-client/src/expected-out-name.ts
index 0581988944..8b503e18d1 100644
--- a/packages/serverless-client/src/expected-out-name.ts
+++ b/packages/lambda-client/src/expected-out-name.ts
@@ -1,5 +1,7 @@
import type {Codec} from '@remotion/renderer';
import {NoReactAPIs} from '@remotion/renderer/pure';
+import {getCustomOutName} from './get-custom-out-name';
+import type {RenderMetadata} from './render-metadata';
import {
customOutName,
outName,
@@ -8,9 +10,7 @@ import {
type OutNameInput,
type OutNameOutput,
type RenderOutput,
-} from './constants';
-import {getCustomOutName} from './get-custom-out-name';
-import type {RenderMetadata} from './render-metadata';
+} from './shared-constants';
import type {CloudProvider} from './types';
import {validateOutname} from './validate-outname';
diff --git a/packages/serverless-client/src/find-output-file-in-bucket.ts b/packages/lambda-client/src/find-output-file-in-bucket.ts
similarity index 96%
rename from packages/serverless-client/src/find-output-file-in-bucket.ts
rename to packages/lambda-client/src/find-output-file-in-bucket.ts
index e1eada1d84..2bbe861dbb 100644
--- a/packages/serverless-client/src/find-output-file-in-bucket.ts
+++ b/packages/lambda-client/src/find-output-file-in-bucket.ts
@@ -1,7 +1,7 @@
-import type {CustomCredentials, RenderOutput} from './constants';
import {getExpectedOutName} from './expected-out-name';
import type {ProviderSpecifics} from './provider-implementation';
import type {RenderMetadata} from './render-metadata';
+import type {CustomCredentials, RenderOutput} from './shared-constants';
import type {CloudProvider} from './types';
export type OutputFileMetadata = {
diff --git a/packages/serverless-client/src/format-costs-info.ts b/packages/lambda-client/src/format-costs-info.ts
similarity index 100%
rename from packages/serverless-client/src/format-costs-info.ts
rename to packages/lambda-client/src/format-costs-info.ts
diff --git a/packages/lambda-client/src/get-account-id.ts b/packages/lambda-client/src/get-account-id.ts
index 6809936ea6..4db44251af 100644
--- a/packages/lambda-client/src/get-account-id.ts
+++ b/packages/lambda-client/src/get-account-id.ts
@@ -1,7 +1,7 @@
import {GetCallerIdentityCommand} from '@aws-sdk/client-sts';
-import type {GetAccountId} from '@remotion/serverless-client';
import {getStsClient} from './aws-clients';
import type {AwsProvider} from './aws-provider';
+import type {GetAccountId} from './provider-implementation';
import type {AwsRegion} from './regions';
import {validateAwsRegion} from './validate-aws-region';
diff --git a/packages/lambda-client/src/get-aws-client.ts b/packages/lambda-client/src/get-aws-client.ts
index 9fe361f439..7626cb49a5 100644
--- a/packages/lambda-client/src/get-aws-client.ts
+++ b/packages/lambda-client/src/get-aws-client.ts
@@ -4,10 +4,10 @@ import * as LambdaSDK from '@aws-sdk/client-lambda';
import * as S3SDK from '@aws-sdk/client-s3';
import * as ServiceQuotasSDK from '@aws-sdk/client-service-quotas';
import * as StsSdk from '@aws-sdk/client-sts';
-import type {CustomCredentials} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getServiceClient, type ServiceMapping} from './get-service-client';
import type {AwsRegion} from './regions';
+import type {CustomCredentials} from './shared-constants';
import type {RequestHandler} from './types';
export type GetAwsClientInput<T extends keyof ServiceMapping> = {
diff --git a/packages/lambda-client/src/get-aws-urls.ts b/packages/lambda-client/src/get-aws-urls.ts
index 8fda23f27d..9a40266a05 100644
--- a/packages/lambda-client/src/get-aws-urls.ts
+++ b/packages/lambda-client/src/get-aws-urls.ts
@@ -1,11 +1,9 @@
-import type {
- GetLoggingUrlForRendererFunction,
- ServerlessRoutines,
-} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getAwsRegionMetadata} from './aws-region-metadata';
import {encodeAwsUrlParams} from './encode-aws-url-params';
+import type {GetLoggingUrlForRendererFunction} from './provider-implementation';
import type {AwsRegion} from './regions';
+import type {ServerlessRoutines} from './shared-constants';
const cloudWatchUrlWithQuery = ({
region,
diff --git a/packages/lambda-client/src/get-buckets.ts b/packages/lambda-client/src/get-buckets.ts
index c234a62c1b..1187dab547 100644
--- a/packages/lambda-client/src/get-buckets.ts
+++ b/packages/lambda-client/src/get-buckets.ts
@@ -1,8 +1,8 @@
import {GetBucketLocationCommand, ListBucketsCommand} from '@aws-sdk/client-s3';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {REMOTION_BUCKET_PREFIX} from './constants';
import {getS3Client} from './get-s3-client';
+import type {ProviderSpecifics} from './provider-implementation';
import type {AwsRegion} from './regions';
import {parseBucketName} from './validate-bucketname';
diff --git a/packages/lambda-client/src/get-compositions-on-lambda.ts b/packages/lambda-client/src/get-compositions-on-lambda.ts
index 6c00e261a9..c9ab468a70 100644
--- a/packages/lambda-client/src/get-compositions-on-lambda.ts
+++ b/packages/lambda-client/src/get-compositions-on-lambda.ts
@@ -1,19 +1,16 @@
-import type {
- BrowserSafeApis,
- ChromiumOptions,
- ToOptions,
- VideoConfig,
-} from '@remotion/serverless-client';
+import type {ChromiumOptions, ToOptions} from '@remotion/renderer';
+import type {BrowserSafeApis} from '@remotion/renderer/client';
+import type {VideoConfig} from 'remotion/no-react';
+import {VERSION} from 'remotion/version';
+import {awsImplementation} from './aws-provider';
import {
- ServerlessRoutines,
- VERSION,
compressInputProps,
getNeedsToUpload,
- getSizeInBytes,
serializeOrThrow,
-} from '@remotion/serverless-client';
-import {awsImplementation} from './aws-provider';
+} from './compress-props';
+import {getSizeInBytes} from './get-size-in-bytes';
import type {AwsRegion} from './regions';
+import {ServerlessRoutines} from './shared-constants';
import type {RequestHandler} from './types';
export type GetCompositionsOnLambdaInput = {
diff --git a/packages/serverless-client/src/get-custom-out-name.ts b/packages/lambda-client/src/get-custom-out-name.ts
similarity index 97%
rename from packages/serverless-client/src/get-custom-out-name.ts
rename to packages/lambda-client/src/get-custom-out-name.ts
index 43584dd5b3..0cafd8da4e 100644
--- a/packages/serverless-client/src/get-custom-out-name.ts
+++ b/packages/lambda-client/src/get-custom-out-name.ts
@@ -3,7 +3,7 @@ import type {
OutNameInput,
OutNameInputWithoutCredentials,
Privacy,
-} from './constants';
+} from './shared-constants';
import type {CloudProvider} from './types';
export const getCustomOutName = <Provider extends CloudProvider>({
diff --git a/packages/serverless-client/src/get-files-in-folder.ts b/packages/lambda-client/src/get-files-in-folder.ts
similarity index 100%
rename from packages/serverless-client/src/get-files-in-folder.ts
rename to packages/lambda-client/src/get-files-in-folder.ts
diff --git a/packages/lambda-client/src/get-function-version.ts b/packages/lambda-client/src/get-function-version.ts
index c6b06e6ffe..45cd32b7e6 100644
--- a/packages/lambda-client/src/get-function-version.ts
+++ b/packages/lambda-client/src/get-function-version.ts
@@ -1,10 +1,7 @@
-import type {LogLevel} from '@remotion/serverless-client';
-import {
- COMMAND_NOT_FOUND,
- ServerlessRoutines,
-} from '@remotion/serverless-client';
+import type {LogLevel} from '@remotion/renderer';
import {awsImplementation} from './aws-provider';
import type {AwsRegion} from './regions';
+import {COMMAND_NOT_FOUND, ServerlessRoutines} from './shared-constants';
import type {RequestHandler} from './types';
export async function getFunctionVersion({
diff --git a/packages/lambda-client/src/get-functions.ts b/packages/lambda-client/src/get-functions.ts
index 163e4ba3ac..40472d41ba 100644
--- a/packages/lambda-client/src/get-functions.ts
+++ b/packages/lambda-client/src/get-functions.ts
@@ -1,10 +1,11 @@
import type {FunctionConfiguration} from '@aws-sdk/client-lambda';
import {ListFunctionsCommand} from '@aws-sdk/client-lambda';
-import type {FunctionInfo, LogLevel} from '@remotion/serverless-client';
-import {VERSION} from '@remotion/serverless-client';
+import type {LogLevel} from '@remotion/renderer';
+import {VERSION} from 'remotion/version';
import {getLambdaClient} from './aws-clients';
import {DEFAULT_EPHEMERAL_STORAGE_IN_MB, RENDER_FN_PREFIX} from './constants';
import {getFunctionVersion} from './get-function-version';
+import type {FunctionInfo} from './provider-implementation';
import type {AwsRegion} from './regions';
import type {RequestHandler} from './types';
diff --git a/packages/serverless-client/src/get-or-create-bucket.ts b/packages/lambda-client/src/get-or-create-bucket.ts
similarity index 98%
rename from packages/serverless-client/src/get-or-create-bucket.ts
rename to packages/lambda-client/src/get-or-create-bucket.ts
index 42efa99232..4ac6e6c36c 100644
--- a/packages/serverless-client/src/get-or-create-bucket.ts
+++ b/packages/lambda-client/src/get-or-create-bucket.ts
@@ -1,8 +1,8 @@
import type {LogLevel} from 'remotion';
import {checkBucketListing} from './check-bucket-listing';
-import type {CustomCredentials} from './constants';
import {makeBucketName} from './make-bucket-name';
import type {ProviderSpecifics} from './provider-implementation';
+import type {CustomCredentials} from './shared-constants';
import type {CloudProvider} from './types';
type GetOrCreateBucketInputInner<Provider extends CloudProvider> = {
diff --git a/packages/lambda-client/src/get-output-url-from-metadata.ts b/packages/lambda-client/src/get-output-url-from-metadata.ts
index 4101b3eac5..63747e8cc2 100644
--- a/packages/lambda-client/src/get-output-url-from-metadata.ts
+++ b/packages/lambda-client/src/get-output-url-from-metadata.ts
@@ -1,9 +1,9 @@
import {S3Client} from '@aws-sdk/client-s3';
-import type {GetOutputUrl} from '@remotion/serverless-client';
-import {getExpectedOutName} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getAwsRegionMetadata} from './aws-region-metadata';
import {REMOTION_BUCKET_PREFIX} from './constants';
+import {getExpectedOutName} from './expected-out-name';
+import type {GetOutputUrl} from './provider-implementation';
const {endpointProvider} = new S3Client({region: 'us-east-1'}).config;
diff --git a/packages/serverless-client/src/get-overall-progress-from-storage.ts b/packages/lambda-client/src/get-overall-progress-from-storage.ts
similarity index 95%
rename from packages/serverless-client/src/get-overall-progress-from-storage.ts
rename to packages/lambda-client/src/get-overall-progress-from-storage.ts
index 7ee0a9dbf8..cb477773bc 100644
--- a/packages/serverless-client/src/get-overall-progress-from-storage.ts
+++ b/packages/lambda-client/src/get-overall-progress-from-storage.ts
@@ -1,6 +1,6 @@
-import {overallProgressKey} from './constants';
import type {OverallRenderProgress} from './overall-render-progress';
import type {ProviderSpecifics} from './provider-implementation';
+import {overallProgressKey} from './shared-constants';
import {streamToString} from './stream-to-string';
import type {CloudProvider} from './types';
diff --git a/packages/serverless-client/src/get-overall-progress.ts b/packages/lambda-client/src/get-overall-progress.ts
similarity index 100%
rename from packages/serverless-client/src/get-overall-progress.ts
rename to packages/lambda-client/src/get-overall-progress.ts
diff --git a/packages/serverless-client/src/get-remotion-version-from-index-html.ts b/packages/lambda-client/src/get-remotion-version-from-index-html.ts
similarity index 100%
rename from packages/serverless-client/src/get-remotion-version-from-index-html.ts
rename to packages/lambda-client/src/get-remotion-version-from-index-html.ts
diff --git a/packages/lambda-client/src/get-render-progress.ts b/packages/lambda-client/src/get-render-progress.ts
index ded83685bb..bbef64b6e2 100644
--- a/packages/lambda-client/src/get-render-progress.ts
+++ b/packages/lambda-client/src/get-render-progress.ts
@@ -1,10 +1,11 @@
-import type {CustomCredentials, LogLevel} from '@remotion/serverless-client';
-import {getProgress, ServerlessRoutines} from '@remotion/serverless-client';
+import type {LogLevel} from '@remotion/renderer';
import {awsImplementation, type AwsProvider} from './aws-provider';
import type {RenderProgress} from './constants';
import {getRenderProgressPayload} from './make-lambda-payload';
import {parseFunctionName} from './parse-function-name';
+import {getProgress} from './progress';
import type {AwsRegion} from './regions';
+import {ServerlessRoutines, type CustomCredentials} from './shared-constants';
import type {RequestHandler} from './types';
export type GetRenderProgressInput = {
diff --git a/packages/lambda-client/src/get-s3-client.ts b/packages/lambda-client/src/get-s3-client.ts
index 2e50b7fa91..5880f3e01f 100644
--- a/packages/lambda-client/src/get-s3-client.ts
+++ b/packages/lambda-client/src/get-s3-client.ts
@@ -1,8 +1,8 @@
import type {S3Client} from '@aws-sdk/client-s3';
-import type {CustomCredentials} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getServiceClient} from './get-service-client';
import type {AwsRegion} from './regions';
+import type {CustomCredentials} from './shared-constants';
import type {RequestHandler} from './types';
export function getS3Client({
diff --git a/packages/lambda-client/src/get-service-client.ts b/packages/lambda-client/src/get-service-client.ts
index 8f233f65c0..675775c010 100644
--- a/packages/lambda-client/src/get-service-client.ts
+++ b/packages/lambda-client/src/get-service-client.ts
@@ -4,12 +4,15 @@ import {LambdaClient} from '@aws-sdk/client-lambda';
import {S3Client} from '@aws-sdk/client-s3';
import {ServiceQuotasClient} from '@aws-sdk/client-service-quotas';
import {STSClient} from '@aws-sdk/client-sts';
-import type {CustomCredentials} from '@remotion/serverless-client';
-import {MAX_FUNCTIONS_PER_RENDER, random} from '@remotion/serverless-client';
+import {random} from 'remotion/no-react';
import type {AwsProvider} from './aws-provider';
import {checkCredentials} from './check-credentials';
import {getCredentials} from './get-credentials';
import {getEnvVariable} from './get-env-variable';
+import {
+ MAX_FUNCTIONS_PER_RENDER,
+ type CustomCredentials,
+} from './shared-constants';
import type {RequestHandler} from './types';
export type ServiceMapping = {
diff --git a/packages/lambda-client/src/get-sites.ts b/packages/lambda-client/src/get-sites.ts
index 445ccb0599..e4d368ba69 100644
--- a/packages/lambda-client/src/get-sites.ts
+++ b/packages/lambda-client/src/get-sites.ts
@@ -1,15 +1,13 @@
-import type {ProviderSpecifics} from '@remotion/serverless-client';
-import {
- getRemotionVersionFromIndexHtml,
- streamToString,
- VERSION,
-} from '@remotion/serverless-client';
+import {VERSION} from 'remotion/version';
import type {AwsProvider} from './aws-provider';
import {awsImplementation} from './aws-provider';
import {getSitesKey} from './constants';
import type {BucketWithLocation} from './get-buckets';
+import {getRemotionVersionFromIndexHtml} from './get-remotion-version-from-index-html';
import {makeS3ServeUrl} from './make-s3-url';
+import type {ProviderSpecifics} from './provider-implementation';
import type {AwsRegion} from './regions';
+import {streamToString} from './stream-to-string';
import type {RequestHandler} from './types';
type Site = {
diff --git a/packages/serverless-client/src/get-size-in-bytes.ts b/packages/lambda-client/src/get-size-in-bytes.ts
similarity index 100%
rename from packages/serverless-client/src/get-size-in-bytes.ts
rename to packages/lambda-client/src/get-size-in-bytes.ts
diff --git a/packages/lambda-client/src/head-file.ts b/packages/lambda-client/src/head-file.ts
index 2a6cfa257c..dc219550f4 100644
--- a/packages/lambda-client/src/head-file.ts
+++ b/packages/lambda-client/src/head-file.ts
@@ -1,8 +1,8 @@
import {HeadObjectCommand} from '@aws-sdk/client-s3';
-import {OutputFileAccessDeniedError} from '@remotion/serverless-client';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
+import {OutputFileAccessDeniedError} from './find-output-file-in-bucket';
import {getS3Client} from './get-s3-client';
+import type {ProviderSpecifics} from './provider-implementation';
export const lambdaHeadFileImplementation: ProviderSpecifics<AwsProvider>['headFile'] =
async ({
diff --git a/packages/serverless-client/src/image-sequence.ts b/packages/lambda-client/src/image-sequence.ts
similarity index 96%
rename from packages/serverless-client/src/image-sequence.ts
rename to packages/lambda-client/src/image-sequence.ts
index 651393b8d0..dc555cbc9f 100644
--- a/packages/serverless-client/src/image-sequence.ts
+++ b/packages/lambda-client/src/image-sequence.ts
@@ -1,5 +1,5 @@
import type {DownloadBehavior} from 'remotion/no-react';
-import type {CustomCredentials} from './constants';
+import type {CustomCredentials} from './shared-constants';
import type {CloudProvider} from './types';
export type ImageSequenceFormat = 'png' | 'jpeg';
diff --git a/packages/lambda-client/src/index.ts b/packages/lambda-client/src/index.ts
index f98823e76c..0249e2cc2f 100644
--- a/packages/lambda-client/src/index.ts
+++ b/packages/lambda-client/src/index.ts
@@ -1,8 +1,3 @@
-export type {
- EnhancedErrorInfo,
- GetOrCreateBucketInput,
- GetOrCreateBucketOutput,
-} from '@remotion/serverless-client';
export type {RuntimePreference} from './runtime-preference';
import {
getCloudWatchLogsClient,
@@ -16,9 +11,17 @@ import {
getAwsPartitionMetadata,
getAwsRegionMetadata,
} from './aws-region-metadata';
+import {calculateBillingDuration} from './calculate-billing-duration';
+import {calculateChunkTimes} from './calculate-chunk-times';
import {parseJsonOrThrowSource} from './call-lambda-streaming';
import {internalCancelRenderOnLambda} from './cancel-render-on-lambda';
import {cleanItems} from './clean-items';
+import {
+ compressInputProps,
+ decompressInputProps,
+ getNeedsToUpload,
+ serializeOrThrow,
+} from './compress-props';
import {
DEFAULT_CLOUDWATCH_RETENTION_PERIOD,
DEFAULT_EPHEMERAL_STORAGE_IN_MB,
@@ -26,6 +29,19 @@ import {
} from './constants';
import {convertToServeUrlImplementation} from './convert-to-serve-url';
import {internalDeleteRender} from './delete-render';
+import {DOCS_URL} from './docs-url';
+import {
+ errorIsOutOfSpaceError,
+ isBrowserCrashedError,
+ isErrInsufficientResourcesErr,
+} from './error-category';
+import {estimatePriceFromMetadata} from './estimate-price-from-bucket';
+import {
+ getCredentialsFromOutName,
+ getExpectedOutName,
+} from './expected-out-name';
+import {findOutputFileInBucket} from './find-output-file-in-bucket';
+import {formatCostsInfo} from './format-costs-info';
import {
getCloudwatchMethodUrl,
getCloudwatchRendererUrl,
@@ -34,47 +50,91 @@ import {
getS3RenderUrl,
} from './get-aws-urls';
import {getEnvVariable} from './get-env-variable';
+import {internalGetOrCreateBucket} from './get-or-create-bucket';
+import {getOverallProgressFromStorage} from './get-overall-progress-from-storage';
+import {getRemotionVersionFromIndexHtml} from './get-remotion-version-from-index-html';
import {getS3Client} from './get-s3-client';
import {internalGetSites} from './get-sites';
+import {getSizeInBytes} from './get-size-in-bytes';
+import {getImageSequenceFrameKey} from './image-sequence';
+import {inputPropsKey, resolvedPropsKey} from './input-props-keys';
+import {inspectErrors} from './inspect-error';
import {isFlakyError} from './is-flaky-error';
import {LAMBDA_VERSION_STRING} from './lambda-version-string';
import {
generateRandomHashWithLifeCycleRule,
getLifeCycleRules,
} from './lifecycle';
+import {makeBucketName} from './make-bucket-name';
import {
getRenderProgressPayload,
makeLambdaRenderMediaPayload,
makeLambdaRenderStillPayload,
} from './make-lambda-payload';
import {makeS3ServeUrl} from './make-s3-url';
+import {
+ getMostExpensiveChunks,
+ OVERHEAD_TIME_PER_LAMBDA,
+} from './most-expensive-chunks';
import {pLimit} from './p-limit';
import {parseFunctionName} from './parse-function-name';
+import {getProgress} from './progress';
import {randomHashImplementation} from './random-hash';
import {
internalRenderMediaOnLambdaRaw,
renderMediaOnLambdaOptionalToRequired,
} from './render-media-on-lambda';
import {internalRenderStillOnLambda} from './render-still-on-lambda';
+import {
+ parseS3RendererStatus,
+ rendererTransportArtifactKey,
+ rendererTransportAttemptPrefix,
+ rendererTransportAudioKey,
+ rendererTransportPrefix,
+ rendererTransportStatusKey,
+ rendererTransportVideoKey,
+} from './renderer-transport';
import {runtimePreferenceOptions} from './runtime-preference';
+import {deserializeArtifact, serializeArtifact} from './serialize-artifact';
+import {
+ artifactName,
+ cancellationKey,
+ COMMAND_NOT_FOUND,
+ CONCAT_FOLDER_TOKEN,
+ customOutName,
+ expiryDays,
+ MAX_FUNCTIONS_PER_RENDER,
+ MINIMUM_FRAMES_PER_FUNCTION,
+ outName,
+ outStillName,
+ overallProgressKey,
+ REMOTION_CONCATENATED_TOKEN,
+ RENDERER_PATH_TOKEN,
+ rendersPrefix,
+ serverlessCodecs,
+} from './shared-constants';
import {innerSpeculateFunctionName} from './speculate-function-name';
+import {streamToString} from './stream-to-string';
+import {
+ binaryPayloadSinkForStreamer,
+ formatMap,
+ makeStreamPayload,
+ messageTypeIdToMessageType,
+} from './streaming/streaming';
+import {truthy} from './truthy';
import {validateAwsRegion} from './validate-aws-region';
+import {validateBucketName} from './validate-bucket-name';
import {parseBucketName} from './validate-bucketname';
import {validateDiskSizeInMb} from './validate-disk-size-in-mb';
+import {validateDownloadBehavior} from './validate-download-behavior';
+import {validateFramesPerFunction} from './validate-frames-per-function';
import {validateMemorySize} from './validate-memory-size';
+import {validateOutname} from './validate-outname';
+import {validatePrivacy} from './validate-privacy';
import {validateServeUrl} from './validate-serveurl';
+import {validateWebhook} from './validate-webhook';
+import {writeCancellationSignal} from './write-cancellation-signal';
-export type {
- CustomCredentials,
- DeleteAfter,
- ImageSequenceOutput,
- ImageSequenceManifest,
- ImageSequenceOutputPrefix,
- WebhookErrorPayload,
- WebhookPayload,
- WebhookSuccessPayload,
- WebhookTimeoutPayload,
-} from '@remotion/serverless-client';
export {appRouterWebhook, NextWebhookArgs} from './app-router-webhook';
export {AwsProvider} from './aws-provider';
export {
@@ -126,6 +186,109 @@ export {
} from './speculate-function-name';
export type {RequestHandler} from './types';
export {validateWebhookSignature} from './validate-webhook-signature';
+export {
+ renderFramesOnLambda,
+ 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,
+ ProviderSpecifics,
+ WriteFileInput,
+} from './provider-implementation';
+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,
+ 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,
+ CloudProvider,
+ 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 const LambdaClientInternals: {
generateRandomHashWithLifeCycleRule: typeof generateRandomHashWithLifeCycleRule;
@@ -173,6 +336,70 @@ export const LambdaClientInternals: {
innerSpeculateFunctionName: typeof innerSpeculateFunctionName;
getAwsPartitionMetadata: typeof getAwsPartitionMetadata;
getAwsRegionMetadata: typeof getAwsRegionMetadata;
+ artifactName: typeof artifactName;
+ binaryPayloadSinkForStreamer: typeof binaryPayloadSinkForStreamer;
+ calculateBillingDuration: typeof calculateBillingDuration;
+ calculateChunkTimes: typeof calculateChunkTimes;
+ cancellationKey: typeof cancellationKey;
+ COMMAND_NOT_FOUND: typeof COMMAND_NOT_FOUND;
+ compressInputProps: typeof compressInputProps;
+ CONCAT_FOLDER_TOKEN: typeof CONCAT_FOLDER_TOKEN;
+ customOutName: typeof customOutName;
+ decompressInputProps: typeof decompressInputProps;
+ deserializeArtifact: typeof deserializeArtifact;
+ DOCS_URL: typeof DOCS_URL;
+ errorIsOutOfSpaceError: typeof errorIsOutOfSpaceError;
+ estimatePriceFromMetadata: typeof estimatePriceFromMetadata;
+ expiryDays: typeof expiryDays;
+ findOutputFileInBucket: typeof findOutputFileInBucket;
+ formatCostsInfo: typeof formatCostsInfo;
+ formatMap: typeof formatMap;
+ getCredentialsFromOutName: typeof getCredentialsFromOutName;
+ getExpectedOutName: typeof getExpectedOutName;
+ getImageSequenceFrameKey: typeof getImageSequenceFrameKey;
+ getMostExpensiveChunks: typeof getMostExpensiveChunks;
+ getNeedsToUpload: typeof getNeedsToUpload;
+ getOverallProgressFromStorage: typeof getOverallProgressFromStorage;
+ getProgress: typeof getProgress;
+ getRemotionVersionFromIndexHtml: typeof getRemotionVersionFromIndexHtml;
+ getSizeInBytes: typeof getSizeInBytes;
+ inputPropsKey: typeof inputPropsKey;
+ inspectErrors: typeof inspectErrors;
+ internalGetOrCreateBucket: typeof internalGetOrCreateBucket;
+ isBrowserCrashedError: typeof isBrowserCrashedError;
+ isErrInsufficientResourcesErr: typeof isErrInsufficientResourcesErr;
+ makeBucketName: typeof makeBucketName;
+ makeStreamPayload: typeof makeStreamPayload;
+ MAX_FUNCTIONS_PER_RENDER: typeof MAX_FUNCTIONS_PER_RENDER;
+ messageTypeIdToMessageType: typeof messageTypeIdToMessageType;
+ MINIMUM_FRAMES_PER_FUNCTION: typeof MINIMUM_FRAMES_PER_FUNCTION;
+ outName: typeof outName;
+ outStillName: typeof outStillName;
+ overallProgressKey: typeof overallProgressKey;
+ OVERHEAD_TIME_PER_LAMBDA: typeof OVERHEAD_TIME_PER_LAMBDA;
+ parseS3RendererStatus: typeof parseS3RendererStatus;
+ REMOTION_CONCATENATED_TOKEN: typeof REMOTION_CONCATENATED_TOKEN;
+ RENDERER_PATH_TOKEN: typeof RENDERER_PATH_TOKEN;
+ rendererTransportArtifactKey: typeof rendererTransportArtifactKey;
+ rendererTransportAttemptPrefix: typeof rendererTransportAttemptPrefix;
+ rendererTransportAudioKey: typeof rendererTransportAudioKey;
+ rendererTransportPrefix: typeof rendererTransportPrefix;
+ rendererTransportStatusKey: typeof rendererTransportStatusKey;
+ rendererTransportVideoKey: typeof rendererTransportVideoKey;
+ rendersPrefix: typeof rendersPrefix;
+ resolvedPropsKey: typeof resolvedPropsKey;
+ serializeArtifact: typeof serializeArtifact;
+ serializeOrThrow: typeof serializeOrThrow;
+ serverlessCodecs: typeof serverlessCodecs;
+ streamToString: typeof streamToString;
+ truthy: typeof truthy;
+ validateBucketName: typeof validateBucketName;
+ validateDownloadBehavior: typeof validateDownloadBehavior;
+ validateFramesPerFunction: typeof validateFramesPerFunction;
+ validateOutname: typeof validateOutname;
+ validatePrivacy: typeof validatePrivacy;
+ validateWebhook: typeof validateWebhook;
+ writeCancellationSignal: typeof writeCancellationSignal;
} = {
generateRandomHashWithLifeCycleRule,
getLambdaClient,
@@ -219,10 +446,68 @@ export const LambdaClientInternals: {
innerSpeculateFunctionName,
getAwsPartitionMetadata,
getAwsRegionMetadata,
+ artifactName,
+ binaryPayloadSinkForStreamer,
+ calculateBillingDuration,
+ calculateChunkTimes,
+ cancellationKey,
+ COMMAND_NOT_FOUND,
+ compressInputProps,
+ CONCAT_FOLDER_TOKEN,
+ customOutName,
+ decompressInputProps,
+ deserializeArtifact,
+ DOCS_URL,
+ errorIsOutOfSpaceError,
+ estimatePriceFromMetadata,
+ expiryDays,
+ findOutputFileInBucket,
+ formatCostsInfo,
+ formatMap,
+ getCredentialsFromOutName,
+ getExpectedOutName,
+ getImageSequenceFrameKey,
+ getMostExpensiveChunks,
+ getNeedsToUpload,
+ getOverallProgressFromStorage,
+ getProgress,
+ getRemotionVersionFromIndexHtml,
+ getSizeInBytes,
+ inputPropsKey,
+ inspectErrors,
+ internalGetOrCreateBucket,
+ isBrowserCrashedError,
+ isErrInsufficientResourcesErr,
+ makeBucketName,
+ makeStreamPayload,
+ MAX_FUNCTIONS_PER_RENDER,
+ messageTypeIdToMessageType,
+ MINIMUM_FRAMES_PER_FUNCTION,
+ outName,
+ outStillName,
+ overallProgressKey,
+ OVERHEAD_TIME_PER_LAMBDA,
+ parseS3RendererStatus,
+ REMOTION_CONCATENATED_TOKEN,
+ RENDERER_PATH_TOKEN,
+ rendererTransportArtifactKey,
+ rendererTransportAttemptPrefix,
+ rendererTransportAudioKey,
+ rendererTransportPrefix,
+ rendererTransportStatusKey,
+ rendererTransportVideoKey,
+ rendersPrefix,
+ resolvedPropsKey,
+ serializeArtifact,
+ serializeOrThrow,
+ serverlessCodecs,
+ streamToString,
+ truthy,
+ validateBucketName,
+ validateDownloadBehavior,
+ validateFramesPerFunction,
+ validateOutname,
+ validatePrivacy,
+ validateWebhook,
+ writeCancellationSignal,
};
-
-export {
- renderFramesOnLambda,
- type RenderFramesOnLambdaInput,
- type RenderFramesOnLambdaOutput,
-} from './render-frames-on-lambda';
diff --git a/packages/serverless-client/src/input-props-keys.ts b/packages/lambda-client/src/input-props-keys.ts
similarity index 100%
rename from packages/serverless-client/src/input-props-keys.ts
rename to packages/lambda-client/src/input-props-keys.ts
diff --git a/packages/serverless-client/src/inspect-error.ts b/packages/lambda-client/src/inspect-error.ts
similarity index 100%
rename from packages/serverless-client/src/inspect-error.ts
rename to packages/lambda-client/src/inspect-error.ts
diff --git a/packages/lambda-client/src/lambda-version-string.ts b/packages/lambda-client/src/lambda-version-string.ts
index c6166be812..dd1ece8120 100644
--- a/packages/lambda-client/src/lambda-version-string.ts
+++ b/packages/lambda-client/src/lambda-version-string.ts
@@ -1,4 +1,4 @@
-import {VERSION} from '@remotion/serverless-client';
+import {VERSION} from 'remotion/version';
export const LAMBDA_VERSION_STRING = VERSION.replace(/\./g, '-')
.replace(/\+/g, '-')
diff --git a/packages/lambda-client/src/lifecycle-rules.ts b/packages/lambda-client/src/lifecycle-rules.ts
index 4cd13e20d2..e97b83336a 100644
--- a/packages/lambda-client/src/lifecycle-rules.ts
+++ b/packages/lambda-client/src/lifecycle-rules.ts
@@ -2,12 +2,12 @@ import {
DeleteBucketLifecycleCommand,
PutBucketLifecycleConfigurationCommand,
} from '@aws-sdk/client-s3';
-import type {CustomCredentials} from '@remotion/serverless-client';
import {createLifeCycleInput, deleteLifeCycleInput} from './apply-lifecycle';
import type {AwsProvider} from './aws-provider';
import {getS3Client} from './get-s3-client';
import {getLifeCycleRules} from './lifecycle';
import type {AwsRegion} from './regions';
+import type {CustomCredentials} from './shared-constants';
import type {RequestHandler} from './types';
const createLCRules = async ({
diff --git a/packages/lambda-client/src/lifecycle.ts b/packages/lambda-client/src/lifecycle.ts
index 302343b572..38ef0a102c 100644
--- a/packages/lambda-client/src/lifecycle.ts
+++ b/packages/lambda-client/src/lifecycle.ts
@@ -1,10 +1,8 @@
import type {LifecycleRule} from '@aws-sdk/client-s3';
-import type {
- CloudProvider,
- DeleteAfter,
- ProviderSpecifics,
-} from '@remotion/serverless-client';
-import {expiryDays, truthy} from '@remotion/serverless-client';
+import type {ProviderSpecifics} from './provider-implementation';
+import {expiryDays, type DeleteAfter} from './shared-constants';
+import {truthy} from './truthy';
+import type {CloudProvider} from './types';
const getEnabledLifeCycleRule = ({
key,
diff --git a/packages/lambda-client/src/list-objects.ts b/packages/lambda-client/src/list-objects.ts
index f9d43c3c86..aa1fde52ca 100644
--- a/packages/lambda-client/src/list-objects.ts
+++ b/packages/lambda-client/src/list-objects.ts
@@ -1,7 +1,7 @@
import {ListObjectsV2Command} from '@aws-sdk/client-s3';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
import type {AwsProvider} from './aws-provider';
import {getS3Client} from './get-s3-client';
+import type {ProviderSpecifics} from './provider-implementation';
export const lambdaLsImplementation: ProviderSpecifics<AwsProvider>['listObjects'] =
async ({
diff --git a/packages/serverless-client/src/make-bucket-name.ts b/packages/lambda-client/src/make-bucket-name.ts
similarity index 100%
rename from packages/serverless-client/src/make-bucket-name.ts
rename to packages/lambda-client/src/make-bucket-name.ts
diff --git a/packages/lambda-client/src/make-lambda-payload.ts b/packages/lambda-client/src/make-lambda-payload.ts
index 42a700d4ff..775694cb9f 100644
--- a/packages/lambda-client/src/make-lambda-payload.ts
+++ b/packages/lambda-client/src/make-lambda-payload.ts
@@ -1,46 +1,47 @@
import type {StorageClass} from '@aws-sdk/client-s3';
import type {
- _InternalTypes,
AudioCodec,
- BrowserSafeApis,
ChromiumOptions,
ColorSpace,
- DeleteAfter,
- DownloadBehavior,
LogLevel,
- OutNameInput,
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 type {AwsProvider} from './aws-provider';
+import {awsImplementation} from './aws-provider';
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 {
+ ServerlessRoutines,
+ type DeleteAfter,
+ type OutNameInput,
+ 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;
@@ -232,7 +233,7 @@ export const makeLambdaRenderMediaPayload = async ({
downloadBehavior,
muted,
version: VERSION,
- overwrite: overwrite ?? ENABLE_V5_BREAKING_CHANGES,
+ overwrite: overwrite ?? NoReactInternals.ENABLE_V5_BREAKING_CHANGES,
audioBitrate: audioBitrate ?? null,
videoBitrate: videoBitrate ?? null,
encodingBufferSize: encodingBufferSize ?? null,
diff --git a/packages/serverless-client/src/make-timeout-error.ts b/packages/lambda-client/src/make-timeout-error.ts
similarity index 100%
rename from packages/serverless-client/src/make-timeout-error.ts
rename to packages/lambda-client/src/make-timeout-error.ts
diff --git a/packages/serverless-client/src/make-timeout-message.ts b/packages/lambda-client/src/make-timeout-message.ts
similarity index 98%
rename from packages/serverless-client/src/make-timeout-message.ts
rename to packages/lambda-client/src/make-timeout-message.ts
index 85b52b3bb6..03a2b73ae1 100644
--- a/packages/serverless-client/src/make-timeout-message.ts
+++ b/packages/lambda-client/src/make-timeout-message.ts
@@ -1,7 +1,7 @@
-import {ServerlessRoutines} from './constants';
import {DOCS_URL} from './docs-url';
import type {ProviderSpecifics} from './provider-implementation';
import type {RenderMetadata} from './render-metadata';
+import {ServerlessRoutines} from './shared-constants';
import type {CloudProvider} from './types';
const MAX_MISSING_CHUNKS = 5;
diff --git a/packages/serverless-client/src/min-max.ts b/packages/lambda-client/src/min-max.ts
similarity index 100%
rename from packages/serverless-client/src/min-max.ts
rename to packages/lambda-client/src/min-max.ts
diff --git a/packages/serverless-client/src/most-expensive-chunks.ts b/packages/lambda-client/src/most-expensive-chunks.ts
similarity index 100%
rename from packages/serverless-client/src/most-expensive-chunks.ts
rename to packages/lambda-client/src/most-expensive-chunks.ts
diff --git a/packages/serverless-client/src/overall-render-progress.ts b/packages/lambda-client/src/overall-render-progress.ts
similarity index 93%
rename from packages/serverless-client/src/overall-render-progress.ts
rename to packages/lambda-client/src/overall-render-progress.ts
index 4a3bef2199..090dfb0840 100644
--- a/packages/serverless-client/src/overall-render-progress.ts
+++ b/packages/lambda-client/src/overall-render-progress.ts
@@ -1,5 +1,5 @@
-import type {PostRenderData, SeparateAudioOutput} from './constants';
import type {RenderMetadata} from './render-metadata';
+import type {PostRenderData, SeparateAudioOutput} from './shared-constants';
import type {
ChunkRetry,
CloudProvider,
diff --git a/packages/lambda-client/src/pages-router-webhook.ts b/packages/lambda-client/src/pages-router-webhook.ts
index 9093cc9ca6..ca61460d92 100644
--- a/packages/lambda-client/src/pages-router-webhook.ts
+++ b/packages/lambda-client/src/pages-router-webhook.ts
@@ -1,8 +1,8 @@
-import type {WebhookPayload} from '@remotion/serverless-client';
import type {Response} from 'express';
import type {NextApiRequest, NextApiResponse} from 'next';
import type {NextWebhookArgs} from './app-router-webhook';
import {validateWebhookSignature} from './validate-webhook-signature';
+import type {WebhookPayload} from './webhook-types';
export const addHeaders = (
res: NextApiResponse | Response,
diff --git a/packages/lambda-client/src/presign-url.ts b/packages/lambda-client/src/presign-url.ts
index b95a274113..dbe123d8f1 100644
--- a/packages/lambda-client/src/presign-url.ts
+++ b/packages/lambda-client/src/presign-url.ts
@@ -1,10 +1,10 @@
import {GetObjectCommand, HeadObjectCommand} from '@aws-sdk/client-s3';
import {getSignedUrl} from '@aws-sdk/s3-request-presigner';
-import {validateBucketName} from '@remotion/serverless-client';
import {REMOTION_BUCKET_PREFIX} from './constants';
import {getS3Client} from './get-s3-client';
import type {AwsRegion} from './regions';
import type {RequestHandler} from './types';
+import {validateBucketName} from './validate-bucket-name';
import {validatePresignExpiration} from './validate-presign-expiration';
type MandatoryParameters = {
diff --git a/packages/serverless-client/src/progress.ts b/packages/lambda-client/src/progress.ts
similarity index 99%
rename from packages/serverless-client/src/progress.ts
rename to packages/lambda-client/src/progress.ts
index f23ddfaf4a..04094c073b 100644
--- a/packages/serverless-client/src/progress.ts
+++ b/packages/lambda-client/src/progress.ts
@@ -1,6 +1,5 @@
import {NoReactAPIs} from '@remotion/renderer/pure';
import {calculateChunkTimes} from './calculate-chunk-times';
-import type {CustomCredentials} from './constants';
import {estimatePriceFromMetadata} from './estimate-price-from-bucket';
import {getExpectedOutName} from './expected-out-name';
import {
@@ -14,6 +13,7 @@ import {inspectErrors} from './inspect-error';
import {makeTimeoutError} from './make-timeout-error';
import type {ProviderSpecifics} from './provider-implementation';
import type {CleanupInfo, GenericRenderProgress} from './render-progress';
+import type {CustomCredentials} from './shared-constants';
import {truthy} from './truthy';
import type {CloudProvider} from './types';
import type {EnhancedErrorInfo} from './write-error-to-storage';
diff --git a/packages/serverless-client/src/provider-implementation.ts b/packages/lambda-client/src/provider-implementation.ts
similarity index 99%
rename from packages/serverless-client/src/provider-implementation.ts
rename to packages/lambda-client/src/provider-implementation.ts
index 31f91b9026..fa83793681 100644
--- a/packages/serverless-client/src/provider-implementation.ts
+++ b/packages/lambda-client/src/provider-implementation.ts
@@ -1,16 +1,16 @@
import type {Readable} from 'node:stream';
import type {LogLevel} from '@remotion/renderer';
import type {DownloadBehavior} from 'remotion';
+import type {BillingCurrency} from './format-costs-info';
+import type {RenderMetadata} from './render-metadata';
+import type {RendererFunctionTransport} from './renderer-transport';
+import type {ServerlessReturnValues} from './return-values';
import type {
CustomCredentials,
Privacy,
RenderOutput,
ServerlessRoutines,
-} from './constants';
-import type {BillingCurrency} from './format-costs-info';
-import type {RenderMetadata} from './render-metadata';
-import type {RendererFunctionTransport} from './renderer-transport';
-import type {ServerlessReturnValues} from './return-values';
+} from './shared-constants';
import type {GetBinaryPayloadSink, OnMessage} from './streaming/streaming';
import type {CallFunctionOptions, CloudProvider} from './types';
diff --git a/packages/lambda-client/src/render-frames-on-lambda.ts b/packages/lambda-client/src/render-frames-on-lambda.ts
index 35c919ea77..01a8c6fcbe 100644
--- a/packages/lambda-client/src/render-frames-on-lambda.ts
+++ b/packages/lambda-client/src/render-frames-on-lambda.ts
@@ -1,9 +1,9 @@
+import {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
+import type {AwsProvider} from './aws-provider';
import type {
- ImageSequenceOutputPrefix,
ImageSequenceFormat,
-} from '@remotion/serverless-client';
-import {wrapWithErrorHandling} from '@remotion/serverless-client';
-import type {AwsProvider} from './aws-provider';
+ ImageSequenceOutputPrefix,
+} from './image-sequence';
import {
internalRenderMediaOnLambdaRaw,
renderMediaOnLambdaOptionalToRequired,
diff --git a/packages/serverless-client/src/render-has-audio-video.ts b/packages/lambda-client/src/render-has-audio-video.ts
similarity index 100%
rename from packages/serverless-client/src/render-has-audio-video.ts
rename to packages/lambda-client/src/render-has-audio-video.ts
diff --git a/packages/lambda-client/src/render-media-on-lambda.ts b/packages/lambda-client/src/render-media-on-lambda.ts
index a7f2d41b61..fd62c4697f 100644
--- a/packages/lambda-client/src/render-media-on-lambda.ts
+++ b/packages/lambda-client/src/render-media-on-lambda.ts
@@ -1,23 +1,16 @@
import type {StorageClass} from '@aws-sdk/client-s3';
import type {
- _InternalTypes,
AudioCodec,
- BrowserSafeApis,
ChromiumOptions,
- DownloadBehavior,
- OutNameInput,
PixelFormat,
- Privacy,
- ServerlessCodec,
SingleFrameRange,
ToOptions,
VideoImageFormat,
- WebhookOption,
-} from '@remotion/serverless-client';
-import {
- ServerlessRoutines,
- wrapWithErrorHandling,
-} from '@remotion/serverless-client';
+} from '@remotion/renderer';
+import type {BrowserSafeApis} from '@remotion/renderer/client';
+import {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
+import type {_InternalTypes} from 'remotion';
+import type {DownloadBehavior} from 'remotion/no-react';
import {awsImplementation, type AwsProvider} from './aws-provider';
import {
getCloudwatchMethodUrl,
@@ -29,6 +22,13 @@ import {
import type {InnerRenderMediaOnLambdaInput} from './make-lambda-payload';
import {makeLambdaRenderMediaPayload} from './make-lambda-payload';
import type {AwsRegion} from './regions';
+import {
+ ServerlessRoutines,
+ type OutNameInput,
+ type Privacy,
+ type ServerlessCodec,
+ type WebhookOption,
+} from './shared-constants';
import type {RequestHandler} from './types';
export type RenderMediaOnLambdaInput = {
diff --git a/packages/serverless-client/src/render-metadata.ts b/packages/lambda-client/src/render-metadata.ts
similarity index 98%
rename from packages/serverless-client/src/render-metadata.ts
rename to packages/lambda-client/src/render-metadata.ts
index 3cf421fe2a..877e71ee0f 100644
--- a/packages/serverless-client/src/render-metadata.ts
+++ b/packages/lambda-client/src/render-metadata.ts
@@ -5,13 +5,13 @@ import type {
VideoImageFormat,
} from '@remotion/renderer';
import type {DownloadBehavior} from 'remotion';
+import type {ImageSequenceOutput} from './image-sequence';
import type {
OutNameInputWithoutCredentials,
Privacy,
SerializedInputProps,
ServerlessCodec,
-} from './constants';
-import type {ImageSequenceOutput} from './image-sequence';
+} from './shared-constants';
import type {CloudProvider} from './types';
type Discriminated =
diff --git a/packages/serverless-client/src/render-progress.ts b/packages/lambda-client/src/render-progress.ts
similarity index 96%
rename from packages/serverless-client/src/render-progress.ts
rename to packages/lambda-client/src/render-progress.ts
index eff6a9d6f6..93966d68a2 100644
--- a/packages/serverless-client/src/render-progress.ts
+++ b/packages/lambda-client/src/render-progress.ts
@@ -1,7 +1,7 @@
-import type {SeparateAudioOutput} from './constants';
import type {ImageSequenceOutput} from './image-sequence';
import type {ExpensiveChunk} from './most-expensive-chunks';
import type {RenderMetadata} from './render-metadata';
+import type {SeparateAudioOutput} from './shared-constants';
import type {
ChunkRetry,
CloudProvider,
diff --git a/packages/lambda-client/src/render-still-on-lambda.ts b/packages/lambda-client/src/render-still-on-lambda.ts
index 764302bb57..6a97fb00f3 100644
--- a/packages/lambda-client/src/render-still-on-lambda.ts
+++ b/packages/lambda-client/src/render-still-on-lambda.ts
@@ -1,25 +1,27 @@
import type {StorageClass} from '@aws-sdk/client-s3';
import type {
- BrowserSafeApis,
ChromiumOptions,
- DownloadBehavior,
StillImageFormat,
ToOptions,
-} from '@remotion/serverless-client';
-import {ServerlessRoutines} from '@remotion/serverless-client';
-import type {
- CostsInfo,
- OutNameInput,
- Privacy,
- ReceivedArtifact,
- RenderStillFunctionResponsePayload,
-} from '@remotion/serverless-client';
-import {wrapWithErrorHandling} from '@remotion/serverless-client';
+} from '@remotion/renderer';
+import type {BrowserSafeApis} from '@remotion/renderer/client';
+import {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
+import type {DownloadBehavior} from 'remotion/no-react';
import {awsImplementation, type AwsProvider} from './aws-provider';
import {DEFAULT_MAX_RETRIES} from './constants';
import {getCloudwatchMethodUrl, getLambdaInsightsUrl} from './get-aws-urls';
import {makeLambdaRenderStillPayload} from './make-lambda-payload';
import type {AwsRegion} from './regions';
+import {
+ ServerlessRoutines,
+ type OutNameInput,
+ type Privacy,
+} from './shared-constants';
+import type {
+ CostsInfo,
+ ReceivedArtifact,
+ RenderStillFunctionResponsePayload,
+} from './types';
import type {RequestHandler} from './types';
type MandatoryParameters = {
diff --git a/packages/serverless-client/src/renderer-transport.ts b/packages/lambda-client/src/renderer-transport.ts
similarity index 98%
rename from packages/serverless-client/src/renderer-transport.ts
rename to packages/lambda-client/src/renderer-transport.ts
index 7124b5a79c..c567338365 100644
--- a/packages/serverless-client/src/renderer-transport.ts
+++ b/packages/lambda-client/src/renderer-transport.ts
@@ -1,5 +1,5 @@
import type {DownloadBehavior} from 'remotion/no-react';
-import {rendersPrefix} from './constants';
+import {rendersPrefix} from './shared-constants';
import type {FunctionErrorInfo} from './write-error-to-storage';
export type RendererFunctionTransport = 'response-streaming' | 's3';
diff --git a/packages/serverless-client/src/return-values.ts b/packages/lambda-client/src/return-values.ts
similarity index 94%
rename from packages/serverless-client/src/return-values.ts
rename to packages/lambda-client/src/return-values.ts
index d5a3fba3e4..24e645fa27 100644
--- a/packages/serverless-client/src/return-values.ts
+++ b/packages/lambda-client/src/return-values.ts
@@ -1,6 +1,6 @@
import type {VideoConfig} from 'remotion/no-react';
-import type {ServerlessRoutines} from './constants';
import type {GenericRenderProgress} from './render-progress';
+import type {ServerlessRoutines} from './shared-constants';
import type {CloudProvider} from './types';
export type OrError<T> =
diff --git a/packages/serverless-client/src/serialize-artifact.ts b/packages/lambda-client/src/serialize-artifact.ts
similarity index 100%
rename from packages/serverless-client/src/serialize-artifact.ts
rename to packages/lambda-client/src/serialize-artifact.ts
diff --git a/packages/serverless-client/src/constants.ts b/packages/lambda-client/src/shared-constants.ts
similarity index 100%
rename from packages/serverless-client/src/constants.ts
rename to packages/lambda-client/src/shared-constants.ts
diff --git a/packages/serverless-client/src/stream-to-string.ts b/packages/lambda-client/src/stream-to-string.ts
similarity index 100%
rename from packages/serverless-client/src/stream-to-string.ts
rename to packages/lambda-client/src/stream-to-string.ts
diff --git a/packages/serverless-client/src/streaming/streaming.ts b/packages/lambda-client/src/streaming/streaming.ts
similarity index 100%
rename from packages/serverless-client/src/streaming/streaming.ts
rename to packages/lambda-client/src/streaming/streaming.ts
diff --git a/packages/lambda-client/src/test/aws-china-regions.test.ts b/packages/lambda-client/src/test/aws-china-regions.test.ts
index 3086f87152..a3f9e490cc 100644
--- a/packages/lambda-client/src/test/aws-china-regions.test.ts
+++ b/packages/lambda-client/src/test/aws-china-regions.test.ts
@@ -1,5 +1,4 @@
import {expect, test} from 'bun:test';
-import {ServerlessRoutines} from '@remotion/serverless-client';
import {awsImplementation} from '../aws-provider';
import {getAwsRegionMetadata} from '../aws-region-metadata';
import {convertToServeUrlImplementation} from '../convert-to-serve-url';
@@ -15,6 +14,7 @@ import {getOutputUrlFromMetadata} from '../get-output-url-from-metadata';
import {makeLambdaRenderStillPayload} from '../make-lambda-payload';
import {makeS3ServeUrl} from '../make-s3-url';
import {AWS_REGIONS, DEFAULT_AWS_REGIONS} from '../regions';
+import {ServerlessRoutines} from '../shared-constants';
const chinaMetadata = {
partition: 'aws-cn',
diff --git a/packages/serverless-client/src/test/best-frames.test.ts b/packages/lambda-client/src/test/best-frames.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/best-frames.test.ts
rename to packages/lambda-client/src/test/best-frames.test.ts
diff --git a/packages/serverless-client/src/test/calculate-billing-duration.test.ts b/packages/lambda-client/src/test/calculate-billing-duration.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/calculate-billing-duration.test.ts
rename to packages/lambda-client/src/test/calculate-billing-duration.test.ts
diff --git a/packages/lambda-client/src/test/cancel-render-on-lambda.test.ts b/packages/lambda-client/src/test/cancel-render-on-lambda.test.ts
index 60462de112..9559f8eaca 100644
--- a/packages/lambda-client/src/test/cancel-render-on-lambda.test.ts
+++ b/packages/lambda-client/src/test/cancel-render-on-lambda.test.ts
@@ -1,12 +1,9 @@
import {expect, test} from 'bun:test';
import {Readable} from 'node:stream';
-import {
- cancellationKey,
- overallProgressKey,
- type ProviderSpecifics,
-} from '@remotion/serverless-client';
import {awsImplementation, type AwsProvider} from '../aws-provider';
import {internalCancelRenderOnLambda} from '../cancel-render-on-lambda';
+import type {ProviderSpecifics} from '../provider-implementation';
+import {cancellationKey, overallProgressKey} from '../shared-constants';
const makeProviderSpecifics = ({
cancellationEnabled,
diff --git a/packages/lambda-client/src/test/concurrency-payload.test.ts b/packages/lambda-client/src/test/concurrency-payload.test.ts
index 40974eb386..bde43b8956 100644
--- a/packages/lambda-client/src/test/concurrency-payload.test.ts
+++ b/packages/lambda-client/src/test/concurrency-payload.test.ts
@@ -1,6 +1,6 @@
import {expect, test} from 'bun:test';
-import {ServerlessRoutines} from '@remotion/serverless-client';
import {makeLambdaRenderMediaPayload} from '../make-lambda-payload';
+import {ServerlessRoutines} from '../shared-constants';
test('Should include concurrency field in payload', async () => {
const payload = await makeLambdaRenderMediaPayload({
diff --git a/packages/serverless-client/src/test/dont-contain-forbidden.test.ts b/packages/lambda-client/src/test/dont-contain-forbidden.test.ts
similarity index 96%
rename from packages/serverless-client/src/test/dont-contain-forbidden.test.ts
rename to packages/lambda-client/src/test/dont-contain-forbidden.test.ts
index bfc10ea561..b60ad51aa0 100644
--- a/packages/serverless-client/src/test/dont-contain-forbidden.test.ts
+++ b/packages/lambda-client/src/test/dont-contain-forbidden.test.ts
@@ -5,6 +5,7 @@ test('Should not contain forbidden imports', async () => {
const output = await Bun.build({
external: ['@remotion/renderer', 'react/jsx-runtime'],
entrypoints: [path.join(__filename, '..', '..', 'index.ts')],
+ target: 'node',
});
expect(output.outputs.length).toBe(1);
const text = await output.outputs[0].text();
diff --git a/packages/serverless-client/src/test/expected-out-name.test.ts b/packages/lambda-client/src/test/expected-out-name.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/expected-out-name.test.ts
rename to packages/lambda-client/src/test/expected-out-name.test.ts
diff --git a/packages/serverless-client/src/test/format-costs-info.test.ts b/packages/lambda-client/src/test/format-costs-info.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/format-costs-info.test.ts
rename to packages/lambda-client/src/test/format-costs-info.test.ts
diff --git a/packages/serverless-client/src/test/min-max.test.ts b/packages/lambda-client/src/test/min-max.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/min-max.test.ts
rename to packages/lambda-client/src/test/min-max.test.ts
diff --git a/packages/serverless-client/src/test/most-expensive-chunks.test.ts b/packages/lambda-client/src/test/most-expensive-chunks.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/most-expensive-chunks.test.ts
rename to packages/lambda-client/src/test/most-expensive-chunks.test.ts
diff --git a/packages/serverless-client/src/test/output-access-error.test.ts b/packages/lambda-client/src/test/output-access-error.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/output-access-error.test.ts
rename to packages/lambda-client/src/test/output-access-error.test.ts
diff --git a/packages/lambda-client/src/test/overwrite-default.test.ts b/packages/lambda-client/src/test/overwrite-default.test.ts
index ab2c2c24ef..01d659f296 100644
--- a/packages/lambda-client/src/test/overwrite-default.test.ts
+++ b/packages/lambda-client/src/test/overwrite-default.test.ts
@@ -1,5 +1,5 @@
import {expect, test} from 'bun:test';
-import {ENABLE_V5_BREAKING_CHANGES} from '@remotion/serverless-client';
+import {NoReactInternals} from 'remotion/no-react';
import {makeLambdaRenderMediaPayload} from '../make-lambda-payload';
import {renderMediaOnLambdaOptionalToRequired} from '../render-media-on-lambda';
@@ -42,5 +42,5 @@ test('resolves an omitted overwrite value using the v5 flag', async () => {
const options = renderMediaOnLambdaOptionalToRequired(getOptions());
const payload = await makeLambdaRenderMediaPayload(options);
- expect(payload.overwrite).toBe(ENABLE_V5_BREAKING_CHANGES);
+ expect(payload.overwrite).toBe(NoReactInternals.ENABLE_V5_BREAKING_CHANGES);
});
diff --git a/packages/lambda-client/src/test/price-calculation.test.ts b/packages/lambda-client/src/test/price-calculation.test.ts
index 3d5966f263..25fadc2506 100644
--- a/packages/lambda-client/src/test/price-calculation.test.ts
+++ b/packages/lambda-client/src/test/price-calculation.test.ts
@@ -1,7 +1,7 @@
import {expect, test} from 'bun:test';
-import {estimatePriceFromMetadata} from '@remotion/serverless-client';
import {awsImplementation} from '../aws-provider';
import {estimatePrice} from '../estimate-price';
+import {estimatePriceFromMetadata} from '../estimate-price-from-bucket';
test('Should not throw while calculating prices when time shifts occur', () => {
const aDate = Date.now();
diff --git a/packages/serverless-client/src/test/progress.test.ts b/packages/lambda-client/src/test/progress.test.ts
similarity index 99%
rename from packages/serverless-client/src/test/progress.test.ts
rename to packages/lambda-client/src/test/progress.test.ts
index f3c6c47771..f3672820fb 100644
--- a/packages/serverless-client/src/test/progress.test.ts
+++ b/packages/lambda-client/src/test/progress.test.ts
@@ -1,6 +1,5 @@
import {expect, test} from 'bun:test';
import {Readable} from 'node:stream';
-import {overallProgressKey} from '../constants';
import {getExpectedOutName} from '../expected-out-name';
import {OutputFileAccessDeniedError} from '../find-output-file-in-bucket';
import type {OverallRenderProgress} from '../overall-render-progress';
@@ -10,6 +9,7 @@ import type {
ProviderSpecifics,
} from '../provider-implementation';
import type {RenderMetadata} from '../render-metadata';
+import {overallProgressKey} from '../shared-constants';
import type {CloudProvider} from '../types';
type MockProvider = CloudProvider<
diff --git a/packages/serverless-client/src/test/renderer-transport.test.ts b/packages/lambda-client/src/test/renderer-transport.test.ts
similarity index 100%
rename from packages/serverless-client/src/test/renderer-transport.test.ts
rename to packages/lambda-client/src/test/renderer-transport.test.ts
diff --git a/packages/lambda-client/src/test/write-file.test.ts b/packages/lambda-client/src/test/write-file.test.ts
index fc3662673b..03c9c8cccd 100644
--- a/packages/lambda-client/src/test/write-file.test.ts
+++ b/packages/lambda-client/src/test/write-file.test.ts
@@ -1,6 +1,6 @@
import {beforeAll, expect, mock, test} from 'bun:test';
import {Readable} from 'node:stream';
-import {OutputFileAccessDeniedError} from '@remotion/serverless-client';
+import {OutputFileAccessDeniedError} from '../find-output-file-in-bucket';
import {lambdaHeadFileImplementation} from '../head-file';
import type {lambdaWriteFileImplementation as LambdaWriteFileImplementation} from '../write-file';
diff --git a/packages/serverless-client/src/truthy.ts b/packages/lambda-client/src/truthy.ts
similarity index 100%
rename from packages/serverless-client/src/truthy.ts
rename to packages/lambda-client/src/truthy.ts
diff --git a/packages/lambda-client/src/types.ts b/packages/lambda-client/src/types.ts
index 763b9353b6..640ac92abe 100644
--- a/packages/lambda-client/src/types.ts
+++ b/packages/lambda-client/src/types.ts
@@ -1,7 +1,89 @@
import type {LambdaClient} from '@aws-sdk/client-lambda';
+import type {ServerlessPayloads, ServerlessRoutines} from './shared-constants';
// Extract RequestHandler type from AWS SDK LambdaClient constructor
type LambdaClientConfig = NonNullable<
ConstructorParameters<typeof LambdaClient>[0]
>;
export type RequestHandler = LambdaClientConfig['requestHandler'];
+
+export interface CloudProvider<
+ Region extends string = string,
+ ReceivedArtifactType extends Record<string, unknown> = Record<
+ string,
+ unknown
+ >,
+ CreateFunctionSpecifics extends Record<string, unknown> = Record<
+ string,
+ unknown
+ >,
+ StorageClass extends string = string,
+ RequestHandlerType extends object = object,
+> {
+ type: string;
+ region: Region;
+ receivedArtifactType: ReceivedArtifactType;
+ creationFunctionOptions: CreateFunctionSpecifics;
+ storageClass: StorageClass;
+ requestHandler: RequestHandlerType | null | undefined;
+}
+
+export type ReceivedArtifact<Provider extends CloudProvider> = {
+ filename: string;
+ sizeInBytes: number;
+ s3Url: string;
+ s3Key: string;
+} & Provider['receivedArtifactType'];
+
+export type CostsInfo = {
+ accruedSoFar: number;
+ displayCost: string;
+ currency: string;
+ disclaimer: string;
+};
+
+export type RenderStillFunctionResponsePayload<Provider extends CloudProvider> =
+ {
+ type: 'success';
+ output: string;
+ outKey: string;
+ size: number;
+ bucketName: string;
+ sizeInBytes: number;
+ estimatedPrice: CostsInfo;
+ renderId: string;
+ receivedArtifacts: ReceivedArtifact<Provider>[];
+ };
+
+export type ChunkRetry = {
+ chunk: number;
+ attempt: number;
+ time: number;
+};
+
+export type ParsedTiming = {
+ chunk: number;
+ start: number;
+ rendered: number;
+};
+
+export type CallFunctionOptions<
+ T extends ServerlessRoutines,
+ Provider extends CloudProvider,
+> = {
+ functionName: string;
+ type: T;
+ payload: ServerlessPayloads<Provider>[T];
+ region: Provider['region'];
+ timeoutInTest: number;
+ requestHandler: Provider['requestHandler'] | null;
+};
+
+export type ObjectChunkTimingData = {
+ chunk: number;
+ frameRange: [number, number];
+ startDate: number;
+ timings: {
+ [key: number]: number;
+ };
+};
diff --git a/packages/serverless-client/src/validate-bucket-name.ts b/packages/lambda-client/src/validate-bucket-name.ts
similarity index 100%
rename from packages/serverless-client/src/validate-bucket-name.ts
rename to packages/lambda-client/src/validate-bucket-name.ts
diff --git a/packages/serverless-client/src/validate-download-behavior.ts b/packages/lambda-client/src/validate-download-behavior.ts
similarity index 100%
rename from packages/serverless-client/src/validate-download-behavior.ts
rename to packages/lambda-client/src/validate-download-behavior.ts
diff --git a/packages/serverless-client/src/validate-frames-per-function.ts b/packages/lambda-client/src/validate-frames-per-function.ts
similarity index 99%
rename from packages/serverless-client/src/validate-frames-per-function.ts
rename to packages/lambda-client/src/validate-frames-per-function.ts
index 118bfaf3e5..4244d9debf 100644
--- a/packages/serverless-client/src/validate-frames-per-function.ts
+++ b/packages/lambda-client/src/validate-frames-per-function.ts
@@ -2,7 +2,7 @@ import {bestFramesPerFunctionParam} from './best-frames-per-function-param';
import {
MAX_FUNCTIONS_PER_RENDER,
MINIMUM_FRAMES_PER_FUNCTION,
-} from './constants';
+} from './shared-constants';
export const validateFramesPerFunction = ({
framesPerFunction,
diff --git a/packages/lambda-client/src/validate-lambda-codec.ts b/packages/lambda-client/src/validate-lambda-codec.ts
index bdf79bb510..8e3f16ecd8 100644
--- a/packages/lambda-client/src/validate-lambda-codec.ts
+++ b/packages/lambda-client/src/validate-lambda-codec.ts
@@ -1,6 +1,5 @@
+import {serverlessCodecs, type ServerlessCodec} from './shared-constants';
/* eslint-disable no-console */
-import type {ServerlessCodec} from '@remotion/serverless-client';
-import {serverlessCodecs} from '@remotion/serverless-client';
export const validateLambdaCodec = (codec: unknown): ServerlessCodec => {
if (typeof codec !== 'string') {
diff --git a/packages/serverless-client/src/validate-outname.ts b/packages/lambda-client/src/validate-outname.ts
similarity index 95%
rename from packages/serverless-client/src/validate-outname.ts
rename to packages/lambda-client/src/validate-outname.ts
index b8e4dc4e60..36b69474e4 100644
--- a/packages/serverless-client/src/validate-outname.ts
+++ b/packages/lambda-client/src/validate-outname.ts
@@ -1,6 +1,6 @@
import type {AudioCodec, Codec} from '@remotion/renderer';
import {NoReactAPIs} from '@remotion/renderer/pure';
-import type {OutNameInputWithoutCredentials} from './constants';
+import type {OutNameInputWithoutCredentials} from './shared-constants';
import {validateBucketName} from './validate-bucket-name';
const validateS3Key = (s3Key: string) => {
diff --git a/packages/serverless-client/src/validate-privacy.ts b/packages/lambda-client/src/validate-privacy.ts
similarity index 90%
rename from packages/serverless-client/src/validate-privacy.ts
rename to packages/lambda-client/src/validate-privacy.ts
index 222240edb5..761e443737 100644
--- a/packages/serverless-client/src/validate-privacy.ts
+++ b/packages/lambda-client/src/validate-privacy.ts
@@ -1,4 +1,4 @@
-import type {Privacy} from './constants';
+import type {Privacy} from './shared-constants';
export function validatePrivacy(
privacy: unknown,
diff --git a/packages/serverless-client/src/validate-webhook.ts b/packages/lambda-client/src/validate-webhook.ts
similarity index 89%
rename from packages/serverless-client/src/validate-webhook.ts
rename to packages/lambda-client/src/validate-webhook.ts
index f400d049d5..340afd4b96 100644
--- a/packages/serverless-client/src/validate-webhook.ts
+++ b/packages/lambda-client/src/validate-webhook.ts
@@ -1,4 +1,4 @@
-import type {WebhookOption} from './constants';
+import type {WebhookOption} from './shared-constants';
export const MAX_WEBHOOK_CUSTOM_DATA_SIZE = 1024;
diff --git a/packages/serverless-client/src/webhook-types.ts b/packages/lambda-client/src/webhook-types.ts
similarity index 94%
rename from packages/serverless-client/src/webhook-types.ts
rename to packages/lambda-client/src/webhook-types.ts
index 83a96f97f0..bfd222ffcd 100644
--- a/packages/serverless-client/src/webhook-types.ts
+++ b/packages/lambda-client/src/webhook-types.ts
@@ -1,5 +1,5 @@
-import type {AfterRenderCost, SeparateAudioOutput} from './constants';
import type {ImageSequenceOutput} from './image-sequence';
+import type {AfterRenderCost, SeparateAudioOutput} from './shared-constants';
import type {EnhancedErrorInfo} from './write-error-to-storage';
type StaticWebhookPayload<BucketOwner extends string | null> = {
diff --git a/packages/serverless-client/src/write-cancellation-signal.ts b/packages/lambda-client/src/write-cancellation-signal.ts
similarity index 94%
rename from packages/serverless-client/src/write-cancellation-signal.ts
rename to packages/lambda-client/src/write-cancellation-signal.ts
index 6a976733b7..e5dcbc6e5e 100644
--- a/packages/serverless-client/src/write-cancellation-signal.ts
+++ b/packages/lambda-client/src/write-cancellation-signal.ts
@@ -1,5 +1,5 @@
-import {cancellationKey} from './constants';
import type {ProviderSpecifics} from './provider-implementation';
+import {cancellationKey} from './shared-constants';
import type {CloudProvider} from './types';
export const writeCancellationSignal = async <Provider extends CloudProvider>({
diff --git a/packages/serverless-client/src/write-error-to-storage.ts b/packages/lambda-client/src/write-error-to-storage.ts
similarity index 100%
rename from packages/serverless-client/src/write-error-to-storage.ts
rename to packages/lambda-client/src/write-error-to-storage.ts
diff --git a/packages/lambda-client/src/write-file.ts b/packages/lambda-client/src/write-file.ts
index 3402efdcaf..5d329130ef 100644
--- a/packages/lambda-client/src/write-file.ts
+++ b/packages/lambda-client/src/write-file.ts
@@ -1,18 +1,16 @@
-/* eslint-disable no-console */
import type {ObjectCannedACL, PutObjectCommandInput} from '@aws-sdk/client-s3';
import {
AbortMultipartUploadCommand,
PutObjectCommand,
} from '@aws-sdk/client-s3';
import {Upload} from '@aws-sdk/lib-storage';
-import type {
- CustomCredentials,
- WriteFileInput,
-} from '@remotion/serverless-client';
import mimeTypes from 'mime-types';
import type {AwsProvider} from './aws-provider';
import {getContentDispositionHeader} from './content-disposition-header';
import {getS3Client} from './get-s3-client';
+/* eslint-disable no-console */
+import type {WriteFileInput} from './provider-implementation';
+import type {CustomCredentials} from './shared-constants';
// Files larger than 100MB will use multipart upload
const MULTIPART_THRESHOLD = 100 * 1024 * 1024; // 5MB in bytes
diff --git a/packages/lambda-client/tsconfig.json b/packages/lambda-client/tsconfig.json
index c84d119760..f4e7c79fca 100644
--- a/packages/lambda-client/tsconfig.json
+++ b/packages/lambda-client/tsconfig.json
@@ -6,5 +6,9 @@
"emitDeclarationOnly": true
},
"include": ["src"],
- "references": [{"path": "../serverless-client"}, {"path": "../renderer"}]
+ "references": [
+ {"path": "../core"},
+ {"path": "../renderer"},
+ {"path": "../streaming"}
+ ]
}
diff --git a/packages/lambda/package.json b/packages/lambda/package.json
index 642125273f..2d8e5a6f78 100644
--- a/packages/lambda/package.json
+++ b/packages/lambda/package.json
@@ -31,8 +31,8 @@
"@remotion/bundler": "workspace:*",
"@remotion/cli": "workspace:*",
"@remotion/lambda-client": "workspace:*",
+ "@remotion/licensing": "workspace:*",
"@remotion/renderer": "workspace:*",
- "@remotion/serverless": "workspace:*",
"@remotion/streaming": "workspace:*",
"@smithy/abort-controller": "4.0.1",
"remotion": "workspace:*",
diff --git a/packages/lambda/src/api/create-function.ts b/packages/lambda/src/api/create-function.ts
index b4471572a1..cf734ba0d9 100644
--- a/packages/lambda/src/api/create-function.ts
+++ b/packages/lambda/src/api/create-function.ts
@@ -13,10 +13,10 @@ import {
TagResourceCommand,
UpdateFunctionConfigurationCommand,
} from '@aws-sdk/client-lambda';
-import type {RequestHandler} from '@remotion/lambda-client';
import {
LambdaClientInternals,
type AwsRegion,
+ type RequestHandler,
type RuntimePreference,
} from '@remotion/lambda-client';
import {LOG_GROUP_PREFIX} from '@remotion/lambda-client/constants';
diff --git a/packages/lambda/src/api/delete-site.ts b/packages/lambda/src/api/delete-site.ts
index b53f6a9a50..8d7db6f583 100644
--- a/packages/lambda/src/api/delete-site.ts
+++ b/packages/lambda/src/api/delete-site.ts
@@ -1,7 +1,11 @@
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type AwsRegion,
+ type ProviderSpecifics,
+ type RequestHandler,
+} from '@remotion/lambda-client';
import {getSitesKey} from '@remotion/lambda-client/constants';
-import type {ProviderSpecifics} from '@remotion/serverless';
type MandatoryParameters = {
bucketName: string;
diff --git a/packages/lambda/src/api/deploy-function.ts b/packages/lambda/src/api/deploy-function.ts
index ad2e7272ce..0db873e184 100644
--- a/packages/lambda/src/api/deploy-function.ts
+++ b/packages/lambda/src/api/deploy-function.ts
@@ -1,19 +1,18 @@
-import type {RequestHandler, RuntimePreference} from '@remotion/lambda-client';
import {
LambdaClientInternals,
speculateFunctionName,
type AwsRegion,
+ type CloudProvider,
+ type ProviderSpecifics,
+ type RequestHandler,
+ type RuntimePreference,
} from '@remotion/lambda-client';
import {DEFAULT_EPHEMERAL_STORAGE_IN_MB} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
import {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
-import type {
- CloudProvider,
- FullClientSpecifics,
- ProviderSpecifics,
-} from '@remotion/serverless';
import {VERSION} from 'remotion/version';
import {awsFullClientSpecifics} from '../functions/full-client-implementation';
+import type {FullClientSpecifics} from '../functions/provider-implementation';
import {FUNCTION_ZIP_ARM64} from '../shared/function-zip-path';
import {validateRuntimePreference} from '../shared/get-layers';
import {validateCustomLayerArns} from '../shared/validate-custom-layer-arns';
diff --git a/packages/lambda/src/api/deploy-site-from-bundle.ts b/packages/lambda/src/api/deploy-site-from-bundle.ts
index 506558479f..498290829c 100644
--- a/packages/lambda/src/api/deploy-site-from-bundle.ts
+++ b/packages/lambda/src/api/deploy-site-from-bundle.ts
@@ -1,13 +1,15 @@
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type AwsRegion,
+ type ProviderSpecifics,
+ type RequestHandler,
+} from '@remotion/lambda-client';
import type {ToOptions} from '@remotion/renderer';
import type {BrowserSafeApis} from '@remotion/renderer/client';
import {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
-import type {
- FullClientSpecifics,
- ProviderSpecifics,
-} from '@remotion/serverless';
import {awsFullClientSpecifics} from '../functions/full-client-implementation';
+import type {FullClientSpecifics} from '../functions/provider-implementation';
import {
deploySiteWithBundle,
type DeploySiteOutput,
diff --git a/packages/lambda/src/api/deploy-site.ts b/packages/lambda/src/api/deploy-site.ts
index b90f75bfb6..c3f53eabe1 100644
--- a/packages/lambda/src/api/deploy-site.ts
+++ b/packages/lambda/src/api/deploy-site.ts
@@ -5,18 +5,22 @@ import {
type RspackOverrideFn,
type WebpackOverrideFn,
} from '@remotion/bundler';
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type AwsRegion,
+ type ProviderSpecifics,
+ type RequestHandler,
+} from '@remotion/lambda-client';
import {getSitesKey} from '@remotion/lambda-client/constants';
import type {ToOptions} from '@remotion/renderer';
import type {BrowserSafeApis} from '@remotion/renderer/client';
import {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
+import {awsFullClientSpecifics} from '../functions/full-client-implementation';
import type {
FullClientSpecifics,
- ProviderSpecifics,
UploadDirProgress,
-} from '@remotion/serverless';
-import {awsFullClientSpecifics} from '../functions/full-client-implementation';
+} from '../functions/provider-implementation';
import {
deploySiteWithBundle,
type DeploySiteOutput,
diff --git a/packages/lambda/src/api/download-media.ts b/packages/lambda/src/api/download-media.ts
index c5a0710ba4..92fc777a72 100644
--- a/packages/lambda/src/api/download-media.ts
+++ b/packages/lambda/src/api/download-media.ts
@@ -1,18 +1,17 @@
import {mkdir} from 'node:fs/promises';
import path from 'node:path';
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
-import {REMOTION_BUCKET_PREFIX} from '@remotion/lambda-client/constants';
-import type {LogLevel} from '@remotion/renderer';
-import {RenderInternals} from '@remotion/renderer';
-import type {ProviderSpecifics} from '@remotion/serverless';
import {
- getExpectedOutName,
- getImageSequenceFrameKey,
- getOverallProgressFromStorage,
+ LambdaClientInternals,
+ type AwsProvider,
+ type AwsRegion,
type CustomCredentials,
+ type ProviderSpecifics,
type RenderOutput,
-} from '@remotion/serverless';
+ type RequestHandler,
+} from '@remotion/lambda-client';
+import {REMOTION_BUCKET_PREFIX} from '@remotion/lambda-client/constants';
+import type {LogLevel} from '@remotion/renderer';
+import {RenderInternals} from '@remotion/renderer';
import type {LambdaReadFileProgress} from '../functions/helpers/read-with-progress';
import {lambdaDownloadFileWithProgress} from '../functions/helpers/read-with-progress';
@@ -58,15 +57,16 @@ export const internalDownloadMedia = async (
const expectedBucketOwner = await input.providerSpecifics.getAccountId({
region: input.region,
});
- const overallProgress = await getOverallProgressFromStorage({
- bucketName: input.bucketName,
- expectedBucketOwner,
- region: input.region,
- renderId: input.renderId,
- providerSpecifics: input.providerSpecifics,
- forcePathStyle: input.forcePathStyle,
- requestHandler: input.requestHandler,
- });
+ const overallProgress =
+ await LambdaClientInternals.getOverallProgressFromStorage({
+ bucketName: input.bucketName,
+ expectedBucketOwner,
+ region: input.region,
+ renderId: input.renderId,
+ providerSpecifics: input.providerSpecifics,
+ forcePathStyle: input.forcePathStyle,
+ requestHandler: input.requestHandler,
+ });
if (!overallProgress.renderMetadata) {
throw new Error('Render did not finish yet');
@@ -87,7 +87,7 @@ export const internalDownloadMedia = async (
);
const keys = [
...frames.map((frame) =>
- getImageSequenceFrameKey({
+ LambdaClientInternals.getImageSequenceFrameKey({
frame,
keyPrefix: sequence.keyPrefix,
imageFormat: sequence.imageFormat,
@@ -143,13 +143,14 @@ export const internalDownloadMedia = async (
RenderInternals.ensureOutputDirectory(outputPath);
- const {key, renderBucketName, customCredentials} = getExpectedOutName({
- output: input.output,
- renderMetadata: overallProgress.renderMetadata,
- bucketName: input.bucketName,
- customCredentials: input.customCredentials ?? null,
- bucketNamePrefix: REMOTION_BUCKET_PREFIX,
- });
+ const {key, renderBucketName, customCredentials} =
+ LambdaClientInternals.getExpectedOutName({
+ output: input.output,
+ renderMetadata: overallProgress.renderMetadata,
+ bucketName: input.bucketName,
+ customCredentials: input.customCredentials ?? null,
+ bucketNamePrefix: REMOTION_BUCKET_PREFIX,
+ });
const {sizeInBytes} = await lambdaDownloadFileWithProgress({
bucketName: renderBucketName,
diff --git a/packages/lambda/src/api/get-function-info.ts b/packages/lambda/src/api/get-function-info.ts
index fc419895d6..f398501671 100644
--- a/packages/lambda/src/api/get-function-info.ts
+++ b/packages/lambda/src/api/get-function-info.ts
@@ -1,12 +1,13 @@
import {GetFunctionCommand} from '@aws-sdk/client-lambda';
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
import {
- getFunctionVersion,
LambdaClientInternals,
+ getFunctionVersion,
+ type AwsRegion,
+ type FunctionInfo,
+ type RequestHandler,
} from '@remotion/lambda-client';
import {DEFAULT_EPHEMERAL_STORAGE_IN_MB} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
-import type {FunctionInfo} from '@remotion/serverless';
export type GetFunctionInfoInput = {
region: AwsRegion;
diff --git a/packages/lambda/src/api/get-or-create-bucket.ts b/packages/lambda/src/api/get-or-create-bucket.ts
index fb1cd59164..2698c7f427 100644
--- a/packages/lambda/src/api/get-or-create-bucket.ts
+++ b/packages/lambda/src/api/get-or-create-bucket.ts
@@ -1,7 +1,8 @@
-import type {AwsProvider} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import type {GetOrCreateBucketInput} from '@remotion/serverless';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type GetOrCreateBucketInput,
+} from '@remotion/lambda-client';
/*
* @description Creates a Cloud Storage bucket for Remotion Cloud Run in your GCP project. If one already exists, it will get returned instead.
@@ -10,7 +11,7 @@ import {internalGetOrCreateBucket} from '@remotion/serverless';
export const getOrCreateBucket = (
options: GetOrCreateBucketInput<AwsProvider>,
) => {
- return internalGetOrCreateBucket({
+ return LambdaClientInternals.internalGetOrCreateBucket({
region: options.region,
enableFolderExpiry: options.enableFolderExpiry ?? null,
customCredentials: options.customCredentials ?? null,
diff --git a/packages/lambda/src/api/iam-validation/simulate-rule.ts b/packages/lambda/src/api/iam-validation/simulate-rule.ts
index a3478dbe2f..1fc5ba66ce 100644
--- a/packages/lambda/src/api/iam-validation/simulate-rule.ts
+++ b/packages/lambda/src/api/iam-validation/simulate-rule.ts
@@ -1,6 +1,9 @@
import {SimulatePrincipalPolicyCommand} from '@aws-sdk/client-iam';
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsRegion,
+ type RequestHandler,
+} from '@remotion/lambda-client';
export type EvalDecision = 'allowed' | 'explicitDeny' | 'implicitDeny';
diff --git a/packages/lambda/src/api/iam-validation/simulate.ts b/packages/lambda/src/api/iam-validation/simulate.ts
index 039198e39b..f27708f1e2 100644
--- a/packages/lambda/src/api/iam-validation/simulate.ts
+++ b/packages/lambda/src/api/iam-validation/simulate.ts
@@ -1,6 +1,9 @@
import {GetCallerIdentityCommand} from '@aws-sdk/client-sts';
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsRegion,
+ type RequestHandler,
+} from '@remotion/lambda-client';
import {resolveCallerArnForSimulation} from './resolve-caller-arn';
import type {EvalDecision, SimulationResult} from './simulate-rule';
import {simulateRule} from './simulate-rule';
diff --git a/packages/lambda/src/api/upload-dir.ts b/packages/lambda/src/api/upload-dir.ts
index 6313508170..e90f7f2843 100644
--- a/packages/lambda/src/api/upload-dir.ts
+++ b/packages/lambda/src/api/upload-dir.ts
@@ -2,10 +2,14 @@ import type {Dirent} from 'node:fs';
import {createReadStream, promises as fs} from 'node:fs';
import path from 'node:path';
import {Upload} from '@aws-sdk/lib-storage';
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import type {Privacy, UploadDirProgress} from '@remotion/serverless';
+import {
+ LambdaClientInternals,
+ type AwsRegion,
+ type Privacy,
+ type RequestHandler,
+} from '@remotion/lambda-client';
import mimeTypes from 'mime-types';
+import type {UploadDirProgress} from '../functions/provider-implementation';
import {makeS3Key} from '../shared/make-s3-key';
import {multipartUploadPartSize} from '../shared/multipart-upload-part-size';
import {waitForPromisesToFinish} from '../shared/wait-for-promises-to-finish';
diff --git a/packages/lambda/src/cli/args.ts b/packages/lambda/src/cli/args.ts
index 370419d6d1..b77d616143 100644
--- a/packages/lambda/src/cli/args.ts
+++ b/packages/lambda/src/cli/args.ts
@@ -1,7 +1,7 @@
import {StorageClass} from '@aws-sdk/client-s3';
import {CliInternals} from '@remotion/cli';
+import type {Privacy} from '@remotion/lambda-client';
import type {BrowserSafeApis} from '@remotion/renderer/client';
-import type {Privacy} from '@remotion/serverless';
import type {AwsRegion, DeleteAfter, RuntimePreference} from '../client';
const LambdaBooleanFlags = [
diff --git a/packages/lambda/src/cli/commands/compositions/index.ts b/packages/lambda/src/cli/commands/compositions/index.ts
index bb2bb1bd6d..e1e1faa543 100644
--- a/packages/lambda/src/cli/commands/compositions/index.ts
+++ b/packages/lambda/src/cli/commands/compositions/index.ts
@@ -1,13 +1,13 @@
import {CliInternals} from '@remotion/cli';
import {
AwsProvider,
- getCompositionsOnLambda,
LambdaClientInternals,
+ getCompositionsOnLambda,
+ type ProviderSpecifics,
} from '@remotion/lambda-client';
import {BINARY_NAME} from '@remotion/lambda-client/constants';
import type {ChromiumOptions, LogLevel} from '@remotion/renderer';
import {BrowserSafeApis} from '@remotion/renderer/client';
-import {ProviderSpecifics} from '@remotion/serverless';
import {parsedLambdaCli} from '../../args';
import {getAwsRegion} from '../../get-aws-region';
import {findFunctionName} from '../../helpers/find-function-name';
diff --git a/packages/lambda/src/cli/commands/functions/deploy.ts b/packages/lambda/src/cli/commands/functions/deploy.ts
index f324ee5432..86b39d13e2 100644
--- a/packages/lambda/src/cli/commands/functions/deploy.ts
+++ b/packages/lambda/src/cli/commands/functions/deploy.ts
@@ -1,5 +1,9 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider, LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {
DEFAULT_CLOUDWATCH_RETENTION_PERIOD,
DEFAULT_EPHEMERAL_STORAGE_IN_MB,
@@ -7,9 +11,9 @@ import {
DEFAULT_TIMEOUT,
} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
-import {FullClientSpecifics, ProviderSpecifics} from '@remotion/serverless';
import {VERSION} from 'remotion/version';
import {internalDeployFunction} from '../../../api/deploy-function';
+import type {FullClientSpecifics} from '../../../functions/provider-implementation';
import {validateCustomRoleArn} from '../../../shared/validate-custom-role-arn';
import {validateTimeout} from '../../../shared/validate-timeout';
import {validateVpcSecurityGroupIds} from '../../../shared/validate-vpc-security-group-ids';
diff --git a/packages/lambda/src/cli/commands/functions/index.ts b/packages/lambda/src/cli/commands/functions/index.ts
index 9dcf6fb26a..c62902a289 100644
--- a/packages/lambda/src/cli/commands/functions/index.ts
+++ b/packages/lambda/src/cli/commands/functions/index.ts
@@ -1,8 +1,9 @@
import {CliInternals} from '@remotion/cli';
+import type {ProviderSpecifics} from '@remotion/lambda-client';
import {BINARY_NAME} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
-import {FullClientSpecifics, ProviderSpecifics} from '@remotion/serverless';
import {AwsProvider} from '../../../client';
+import type {FullClientSpecifics} from '../../../functions/provider-implementation';
import {quit} from '../../helpers/quit';
import {FUNCTIONS_COMMAND} from '../command-names';
import {FUNCTIONS_DEPLOY_SUBCOMMAND, functionsDeploySubcommand} from './deploy';
diff --git a/packages/lambda/src/cli/commands/functions/ls.ts b/packages/lambda/src/cli/commands/functions/ls.ts
index 8d8bec7d6b..bd7278ddbd 100644
--- a/packages/lambda/src/cli/commands/functions/ls.ts
+++ b/packages/lambda/src/cli/commands/functions/ls.ts
@@ -1,7 +1,6 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider} from '@remotion/lambda-client';
+import {AwsProvider, type ProviderSpecifics} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
-import {ProviderSpecifics} from '@remotion/serverless';
import {parsedLambdaCli} from '../../args';
import {getAwsRegion} from '../../get-aws-region';
diff --git a/packages/lambda/src/cli/commands/functions/rmall.ts b/packages/lambda/src/cli/commands/functions/rmall.ts
index 4c724e8daf..727f5b8ae8 100644
--- a/packages/lambda/src/cli/commands/functions/rmall.ts
+++ b/packages/lambda/src/cli/commands/functions/rmall.ts
@@ -1,7 +1,10 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider, deleteFunction} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ deleteFunction,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
-import {ProviderSpecifics} from '@remotion/serverless';
import {getFunctionInfo} from '../../../api/get-function-info';
import {getAwsRegion} from '../../get-aws-region';
import {confirmCli} from '../../helpers/confirm';
diff --git a/packages/lambda/src/cli/commands/render/progress.ts b/packages/lambda/src/cli/commands/render/progress.ts
index 4a26db45b0..b62bb24f82 100644
--- a/packages/lambda/src/cli/commands/render/progress.ts
+++ b/packages/lambda/src/cli/commands/render/progress.ts
@@ -1,8 +1,11 @@
import {CliInternals} from '@remotion/cli';
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type ReceivedArtifact,
+} from '@remotion/lambda-client';
import type {RenderProgress} from '@remotion/lambda-client/constants';
import {RenderInternals} from '@remotion/renderer';
-import type {CloudProvider, ReceivedArtifact} from '@remotion/serverless';
-import {truthy} from '@remotion/serverless';
import {NoReactInternals} from 'remotion/no-react';
type LambdaInvokeProgress = {
@@ -100,7 +103,7 @@ const makeRenderProgress = (progress: RenderProgress) => {
? frames
: CliInternals.chalk.gray(`${progress.timeToRenderFrames}ms`),
]
- .filter(truthy)
+ .filter(LambdaClientInternals.truthy)
.join(' ');
const second = [
@@ -115,7 +118,7 @@ const makeRenderProgress = (progress: RenderProgress) => {
: `${framesEncoded}/${totalFrames}`
: CliInternals.chalk.gray(`${progress.timeToEncode}ms`),
]
- .filter(truthy)
+ .filter(LambdaClientInternals.truthy)
.join(' ');
if (progress.renderMetadata?.type === 'sequence') {
@@ -252,7 +255,7 @@ export const makeArtifactProgress = <Provider extends CloudProvider>(
),
].join(' ');
})
- .filter(truthy)
+ .filter(LambdaClientInternals.truthy)
.join('\n');
const moreSizeCombined = artifactProgress
@@ -265,7 +268,7 @@ export const makeArtifactProgress = <Provider extends CloudProvider>(
`${' '.repeat(CliInternals.LABEL_WIDTH)} ${artifactProgress.length - ARTIFACTS_SHOWN} more artifact${artifactProgress.length - ARTIFACTS_SHOWN === 1 ? '' : 's'} ${CliInternals.formatBytes(moreSizeCombined)}`,
)
: null;
- return [artifacts, more].filter(truthy).join('\n');
+ return [artifacts, more].filter(LambdaClientInternals.truthy).join('\n');
};
export const makeProgressString = ({
diff --git a/packages/lambda/src/cli/commands/render/render.ts b/packages/lambda/src/cli/commands/render/render.ts
index 9a7af4b5ec..e0195da8e3 100644
--- a/packages/lambda/src/cli/commands/render/render.ts
+++ b/packages/lambda/src/cli/commands/render/render.ts
@@ -3,8 +3,11 @@ import {CliInternals} from '@remotion/cli';
import {ConfigInternals} from '@remotion/cli/config';
import {
AwsProvider,
- getRenderProgress,
LambdaClientInternals,
+ getRenderProgress,
+ type EnhancedErrorInfo,
+ type ProviderSpecifics,
+ type ServerlessCodec,
} from '@remotion/lambda-client';
import {
BINARY_NAME,
@@ -18,8 +21,6 @@ import type {
} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
import {BrowserSafeApis} from '@remotion/renderer/client';
-import type {EnhancedErrorInfo, ProviderSpecifics} from '@remotion/serverless';
-import {validatePrivacy, type ServerlessCodec} from '@remotion/serverless';
import {NoReactInternals} from 'remotion/no-react';
import {internalDownloadMedia} from '../../../api/download-media';
import {sleep} from '../../../shared/sleep';
@@ -394,7 +395,7 @@ export const renderCommand = async ({
validateMaxRetries(maxRetries);
const privacy = parsedLambdaCli.privacy ?? DEFAULT_OUTPUT_PRIVACY;
- validatePrivacy(privacy, true);
+ LambdaClientInternals.validatePrivacy(privacy, true);
const framesPerLambda = parsedLambdaCli['frames-per-lambda'] ?? undefined;
const concurrency = parsedLambdaCli['concurrency'] ?? undefined;
const concurrencyPerLambda = parsedLambdaCli['concurrency-per-lambda'] ?? 1;
diff --git a/packages/lambda/src/cli/commands/sites/create.ts b/packages/lambda/src/cli/commands/sites/create.ts
index 3790b5f399..93b920812f 100644
--- a/packages/lambda/src/cli/commands/sites/create.ts
+++ b/packages/lambda/src/cli/commands/sites/create.ts
@@ -1,11 +1,14 @@
import {CliInternals} from '@remotion/cli';
import {ConfigInternals} from '@remotion/cli/config';
-import {AwsProvider} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ type Privacy,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {BINARY_NAME} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
import {BrowserSafeApis} from '@remotion/renderer/client';
-import type {ProviderSpecifics} from '@remotion/serverless';
-import {internalGetOrCreateBucket, type Privacy} from '@remotion/serverless';
import {NoReactInternals} from 'remotion/no-react';
import {awsFullClientSpecifics} from '../../../functions/full-client-implementation';
import {LambdaInternals} from '../../../internals';
@@ -136,7 +139,7 @@ export const sitesCreateSubcommand = async (
const bucketName =
cliBucketName ??
(
- await internalGetOrCreateBucket({
+ await LambdaClientInternals.internalGetOrCreateBucket({
region: getAwsRegion(),
enableFolderExpiry,
customCredentials: null,
diff --git a/packages/lambda/src/cli/commands/sites/index.ts b/packages/lambda/src/cli/commands/sites/index.ts
index 8b4242ece9..9cf2153b71 100644
--- a/packages/lambda/src/cli/commands/sites/index.ts
+++ b/packages/lambda/src/cli/commands/sites/index.ts
@@ -1,8 +1,7 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider} from '@remotion/lambda-client';
+import {AwsProvider, type ProviderSpecifics} from '@remotion/lambda-client';
import {BINARY_NAME} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
-import type {ProviderSpecifics} from '@remotion/serverless';
import {quit} from '../../helpers/quit';
import {SITES_COMMAND} from '../command-names';
import {SITES_CREATE_SUBCOMMAND, sitesCreateSubcommand} from './create';
diff --git a/packages/lambda/src/cli/commands/sites/rm.ts b/packages/lambda/src/cli/commands/sites/rm.ts
index 56cb0eed94..8f4cd8810e 100644
--- a/packages/lambda/src/cli/commands/sites/rm.ts
+++ b/packages/lambda/src/cli/commands/sites/rm.ts
@@ -1,8 +1,11 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider, getSites} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ getSites,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
-import type {ProviderSpecifics} from '@remotion/serverless';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
import {deleteSite} from '../../../api/delete-site';
import {parsedLambdaCli} from '../../args';
import {getAwsRegion} from '../../get-aws-region';
@@ -38,7 +41,7 @@ export const sitesRmSubcommand = async (
const bucketName =
parsedLambdaCli['force-bucket-name'] ??
(
- await internalGetOrCreateBucket({
+ await LambdaClientInternals.internalGetOrCreateBucket({
region,
enableFolderExpiry: false,
customCredentials: null,
diff --git a/packages/lambda/src/cli/commands/sites/rmall.ts b/packages/lambda/src/cli/commands/sites/rmall.ts
index 500e04ad81..4f9c1050e2 100644
--- a/packages/lambda/src/cli/commands/sites/rmall.ts
+++ b/packages/lambda/src/cli/commands/sites/rmall.ts
@@ -1,8 +1,11 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider, getSites} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ getSites,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
-import type {ProviderSpecifics} from '@remotion/serverless';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
import {deleteSite} from '../../../api/delete-site';
import {parsedLambdaCli} from '../../args';
import {getAwsRegion} from '../../get-aws-region';
@@ -23,7 +26,7 @@ export const sitesRmallSubcommand = async (
const bucketName =
parsedLambdaCli['force-bucket-name'] ??
(
- await internalGetOrCreateBucket({
+ await LambdaClientInternals.internalGetOrCreateBucket({
region,
enableFolderExpiry: false,
customCredentials: null,
diff --git a/packages/lambda/src/cli/commands/still.ts b/packages/lambda/src/cli/commands/still.ts
index ebd6437672..088425d77b 100644
--- a/packages/lambda/src/cli/commands/still.ts
+++ b/packages/lambda/src/cli/commands/still.ts
@@ -1,7 +1,11 @@
import path from 'path';
import {CliInternals} from '@remotion/cli';
import {ConfigInternals} from '@remotion/cli/config';
-import {AwsProvider, LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {
BINARY_NAME,
DEFAULT_MAX_RETRIES,
@@ -10,8 +14,6 @@ import {
import type {ChromiumOptions, LogLevel} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
import {BrowserSafeApis} from '@remotion/renderer/client';
-import type {ProviderSpecifics} from '@remotion/serverless';
-import {validatePrivacy} from '@remotion/serverless';
import {NoReactInternals} from 'remotion/no-react';
import {internalDownloadMedia} from '../../api/download-media';
import {validateMaxRetries} from '../../shared/validate-retries';
@@ -241,7 +243,7 @@ export const stillCommand = async ({
validateMaxRetries(maxRetries);
const privacy = parsedLambdaCli.privacy ?? DEFAULT_OUTPUT_PRIVACY;
- validatePrivacy(privacy, true);
+ LambdaClientInternals.validatePrivacy(privacy, true);
const {stillImageFormatOption} = BrowserSafeApis.options;
diff --git a/packages/lambda/src/cli/helpers/find-function-name.ts b/packages/lambda/src/cli/helpers/find-function-name.ts
index e8db440809..843e54a598 100644
--- a/packages/lambda/src/cli/helpers/find-function-name.ts
+++ b/packages/lambda/src/cli/helpers/find-function-name.ts
@@ -1,7 +1,10 @@
-import {AwsProvider, LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {BINARY_NAME} from '@remotion/lambda-client/constants';
import type {LogLevel, LogOptions} from '@remotion/renderer';
-import {ProviderSpecifics} from '@remotion/serverless';
import {VERSION} from 'remotion/version';
import {parsedLambdaCli} from '../args';
import {FUNCTIONS_COMMAND} from '../commands/functions';
diff --git 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
index e225e9acea..2230c9b60c 100644
--- 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,5 +1,8 @@
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import type {CustomCredentials, OutNameInput} from '@remotion/serverless';
+import {
+ LambdaClientInternals,
+ type CustomCredentials,
+ type OutNameInput,
+} from '@remotion/lambda-client';
import type {AwsProvider} from '../../client';
export const S3_OUTPUT_PROVIDER_ACCESS_KEY_ID_ENV_NAME =
diff --git a/packages/lambda/src/cli/index.ts b/packages/lambda/src/cli/index.ts
index 109c8fb286..95a72c0ae3 100644
--- a/packages/lambda/src/cli/index.ts
+++ b/packages/lambda/src/cli/index.ts
@@ -1,15 +1,15 @@
import {CliInternals} from '@remotion/cli';
-import {AwsProvider, LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ AwsProvider,
+ LambdaClientInternals,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {BINARY_NAME} from '@remotion/lambda-client/constants';
import type {LogLevel} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import {
- DOCS_URL,
- FullClientSpecifics,
- type ProviderSpecifics,
-} from '@remotion/serverless';
import {ROLE_NAME} from '../api/iam-validation/suggested-policy';
import {awsFullClientSpecifics} from '../functions/full-client-implementation';
+import type {FullClientSpecifics} from '../functions/provider-implementation';
import {parsedLambdaCli} from './args';
import {
COMPOSITIONS_COMMAND,
@@ -205,7 +205,7 @@ export const executeCommand = async (
- Remove the "--custom-role-arn" parameter and set up Remotion Lambda according to the setup guide
- Make sure the role has the same policy assigned as the one returned by "npx ${BINARY_NAME} ${POLICIES_COMMAND} ${ROLE_SUBCOMMAND}"
- Revisit ${DOCS_URL}/docs/lambda/setup and make sure you set up the role and role policy correctly. Also see the troubleshooting page: ${DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
+ Revisit ${LambdaClientInternals.DOCS_URL}/docs/lambda/setup and make sure you set up the role and role policy correctly. Also see the troubleshooting page: ${LambdaClientInternals.DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
`.trim(),
);
}
@@ -217,7 +217,7 @@ The role "${ROLE_NAME}" does not exist in your AWS account or has the wrong poli
- The name of the role is not "${ROLE_NAME}"
- The policy is not exactly as specified in the setup guide
-Revisit ${DOCS_URL}/docs/lambda/setup and make sure you set up the role and role policy correctly. Also see the troubleshooting page: ${DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
+Revisit ${LambdaClientInternals.DOCS_URL}/docs/lambda/setup and make sure you set up the role and role policy correctly. Also see the troubleshooting page: ${LambdaClientInternals.DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
`.trim(),
);
}
@@ -226,7 +226,7 @@ Revisit ${DOCS_URL}/docs/lambda/setup and make sure you set up the role and role
Log.error(
{indent: false, logLevel},
`
-AWS returned an "AccessDenied" error message meaning a permission is missing. Read the permissions troubleshooting page: ${DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
+AWS returned an "AccessDenied" error message meaning a permission is missing. Read the permissions troubleshooting page: ${LambdaClientInternals.DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
`.trim(),
);
}
@@ -235,7 +235,7 @@ AWS returned an "AccessDenied" error message meaning a permission is missing. Re
Log.error(
{indent: false, logLevel},
`
-AWS returned an "TooManyRequestsException" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${DOCS_URL}/docs/lambda/troubleshooting/rate-limit. The original error message is:
+AWS returned an "TooManyRequestsException" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${LambdaClientInternals.DOCS_URL}/docs/lambda/troubleshooting/rate-limit. The original error message is:
`.trim(),
);
}
@@ -244,7 +244,7 @@ AWS returned an "TooManyRequestsException" error message which could mean you re
Log.error(
{indent: false, logLevel},
`
-AWS returned an "ConcurrentInvocationLimitExceeded" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${DOCS_URL}/docs/lambda/troubleshooting/rate-limit. The original error message is:
+AWS returned an "ConcurrentInvocationLimitExceeded" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${LambdaClientInternals.DOCS_URL}/docs/lambda/troubleshooting/rate-limit. The original error message is:
`.trim(),
);
}
diff --git a/packages/serverless/src/artifact-registry.ts b/packages/lambda/src/functions/artifact-registry.ts
similarity index 100%
rename from packages/serverless/src/artifact-registry.ts
rename to packages/lambda/src/functions/artifact-registry.ts
diff --git a/packages/lambda/src/functions/aws-server-implementation.ts b/packages/lambda/src/functions/aws-server-implementation.ts
index 710c4b17d9..45ae3f24ba 100644
--- a/packages/lambda/src/functions/aws-server-implementation.ts
+++ b/packages/lambda/src/functions/aws-server-implementation.ts
@@ -1,13 +1,11 @@
import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
import {RenderInternals} from '@remotion/renderer';
-import type {InsideFunctionSpecifics} from '@remotion/serverless';
+import {NoReactInternals} from 'remotion/no-react';
import {
closeBrowserInstanceImplementation,
forgetBrowserEventLoopImplementation,
getBrowserInstanceImplementation,
- invokeWebhook,
-} from '@remotion/serverless';
-import {NoReactInternals} from 'remotion/no-react';
+} from './get-browser-instance';
import {deleteTmpDir} from './helpers/clean-tmpdir';
import {getCurrentRegionInFunctionImplementation} from './helpers/get-current-region';
import {getTmpDirStateIfENoSp} from './helpers/get-tmp-dir';
@@ -15,6 +13,8 @@ import {startLeakDetection} from './helpers/leak-detection';
import {makeAwsArtifact} from './helpers/make-aws-artifact';
import {timer} from './helpers/timer';
import {enableNodeIntrospection} from './helpers/why-is-node-running';
+import {invokeWebhook} from './invoke-webhook';
+import type {InsideFunctionSpecifics} from './provider-implementation';
const ENABLE_SLOW_LEAK_DETECTION = false;
diff --git a/packages/serverless/src/cancellation-polling.ts b/packages/lambda/src/functions/cancellation-polling.ts
similarity index 90%
rename from packages/serverless/src/cancellation-polling.ts
rename to packages/lambda/src/functions/cancellation-polling.ts
index 1fcf81a4ee..760b5a9920 100644
--- a/packages/serverless/src/cancellation-polling.ts
+++ b/packages/lambda/src/functions/cancellation-polling.ts
@@ -1,9 +1,9 @@
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {RenderInternals, type LogLevel} from '@remotion/renderer';
-import type {
- CloudProvider,
- ProviderSpecifics,
-} from '@remotion/serverless-client';
-import {cancellationKey} from '@remotion/serverless-client';
const isMissingCancellationSignalError = (err: unknown) => {
const error = err as {name?: string; Code?: string; code?: string};
@@ -41,7 +41,7 @@ export const startCancellationPolling = <Provider extends CloudProvider>({
try {
await providerSpecifics.headFile({
bucketName,
- key: cancellationKey(renderId),
+ key: LambdaClientInternals.cancellationKey(renderId),
region,
customCredentials: null,
forcePathStyle,
diff --git a/packages/serverless/src/cleanup-props.ts b/packages/lambda/src/functions/cleanup-props.ts
similarity index 96%
rename from packages/serverless/src/cleanup-props.ts
rename to packages/lambda/src/functions/cleanup-props.ts
index bc19a2c5b0..08c8ce56bb 100644
--- a/packages/serverless/src/cleanup-props.ts
+++ b/packages/lambda/src/functions/cleanup-props.ts
@@ -2,7 +2,7 @@ import type {
CloudProvider,
ProviderSpecifics,
SerializedInputProps,
-} from '@remotion/serverless-client';
+} from '@remotion/lambda-client';
import {
cleanupSerializedInputProps,
cleanupSerializedResolvedProps,
diff --git a/packages/serverless/src/cleanup-serialized-input-props.ts b/packages/lambda/src/functions/cleanup-serialized-input-props.ts
similarity index 81%
rename from packages/serverless/src/cleanup-serialized-input-props.ts
rename to packages/lambda/src/functions/cleanup-serialized-input-props.ts
index 52fe4beef5..3b5bc35322 100644
--- a/packages/serverless/src/cleanup-serialized-input-props.ts
+++ b/packages/lambda/src/functions/cleanup-serialized-input-props.ts
@@ -1,9 +1,9 @@
-import type {
- CloudProvider,
- ProviderSpecifics,
- SerializedInputProps,
-} from '@remotion/serverless-client';
-import {inputPropsKey, resolvedPropsKey} from '@remotion/serverless-client';
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type ProviderSpecifics,
+ type SerializedInputProps,
+} from '@remotion/lambda-client';
export const cleanupSerializedInputProps = async <
Provider extends CloudProvider,
@@ -25,7 +25,7 @@ export const cleanupSerializedInputProps = async <
const time = Date.now();
await providerSpecifics.deleteFile({
bucketName: serialized.bucketName,
- key: inputPropsKey(serialized.hash),
+ key: LambdaClientInternals.inputPropsKey(serialized.hash),
region,
customCredentials: null,
forcePathStyle,
@@ -55,7 +55,7 @@ export const cleanupSerializedResolvedProps = async <
const time = Date.now();
await providerSpecifics.deleteFile({
bucketName: serialized.bucketName,
- key: resolvedPropsKey(serialized.hash),
+ key: LambdaClientInternals.resolvedPropsKey(serialized.hash),
region,
customCredentials: null,
forcePathStyle,
diff --git a/packages/serverless/src/concat-videos.ts b/packages/lambda/src/functions/concat-videos.ts
similarity index 92%
rename from packages/serverless/src/concat-videos.ts
rename to packages/lambda/src/functions/concat-videos.ts
index eab7047b68..cc06fe216b 100644
--- a/packages/serverless/src/concat-videos.ts
+++ b/packages/lambda/src/functions/concat-videos.ts
@@ -1,5 +1,10 @@
import fs from 'node:fs';
import {join} from 'node:path';
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type ServerlessCodec,
+} from '@remotion/lambda-client';
import type {
AudioCodec,
CancelSignal,
@@ -8,8 +13,6 @@ import type {
LogLevel,
} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {CloudProvider, ServerlessCodec} from '@remotion/serverless-client';
-import {REMOTION_CONCATENATED_TOKEN} from '@remotion/serverless-client';
import type {InsideFunctionSpecifics} from './provider-implementation';
export const concatVideos = async <Provider extends CloudProvider>({
@@ -65,7 +68,9 @@ export const concatVideos = async <Provider extends CloudProvider>({
codec,
separateAudioFilename === null ? audioCodec : null,
);
- const outputDirectory = RenderInternals.tmpDir(REMOTION_CONCATENATED_TOKEN);
+ const outputDirectory = RenderInternals.tmpDir(
+ LambdaClientInternals.REMOTION_CONCATENATED_TOKEN,
+ );
const separateAudioFile =
separateAudioFilename === null
? null
diff --git a/packages/serverless/src/create-post-render-data.ts b/packages/lambda/src/functions/create-post-render-data.ts
similarity index 85%
rename from packages/serverless/src/create-post-render-data.ts
rename to packages/lambda/src/functions/create-post-render-data.ts
index 361206bdcf..cbdcdde808 100644
--- a/packages/serverless/src/create-post-render-data.ts
+++ b/packages/lambda/src/functions/create-post-render-data.ts
@@ -1,16 +1,12 @@
-import type {
- CloudProvider,
- EnhancedErrorInfo,
- OverallRenderProgress,
- PostRenderData,
- ProviderSpecifics,
- RenderMetadata,
-} from '@remotion/serverless-client';
import {
- calculateBillingDuration,
- calculateChunkTimes,
- getMostExpensiveChunks,
-} from '@remotion/serverless-client';
+ LambdaClientInternals,
+ type CloudProvider,
+ type EnhancedErrorInfo,
+ type OverallRenderProgress,
+ type PostRenderData,
+ type ProviderSpecifics,
+ type RenderMetadata,
+} from '@remotion/lambda-client';
import type {OutputFileMetadata} from './find-output-file-in-bucket';
export const createPostRenderData = <Provider extends CloudProvider>({
@@ -40,11 +36,12 @@ export const createPostRenderData = <Provider extends CloudProvider>({
}): PostRenderData<Provider> => {
const parsedTimings = overallProgress.timings;
- const estimatedBillingDurationInMilliseconds = calculateBillingDuration({
- timings: parsedTimings,
- functionsInvoked: parsedTimings.length,
- elapsedTimeOfUnfinishedChunks: 0,
- });
+ const estimatedBillingDurationInMilliseconds =
+ LambdaClientInternals.calculateBillingDuration({
+ timings: parsedTimings,
+ functionsInvoked: parsedTimings.length,
+ elapsedTimeOfUnfinishedChunks: 0,
+ });
const cost = providerSpecifics.estimatePrice({
durationInMilliseconds: estimatedBillingDurationInMilliseconds,
@@ -101,7 +98,7 @@ export const createPostRenderData = <Provider extends CloudProvider>({
filesCleanedUp: 0,
timeToEncode: overallProgress.timeToEncode,
timeToCleanUp: timeToDelete,
- timeToRenderChunks: calculateChunkTimes({
+ timeToRenderChunks: LambdaClientInternals.calculateChunkTimes({
type: 'absolute-time',
timings: overallProgress.timings,
}),
@@ -110,7 +107,7 @@ export const createPostRenderData = <Provider extends CloudProvider>({
mostExpensiveFrameRanges:
renderMetadata.type === 'still'
? []
- : getMostExpensiveChunks({
+ : LambdaClientInternals.getMostExpensiveChunks({
parsedTimings,
framesPerFunction: renderMetadata.framesPerLambda,
firstFrame: renderMetadata.frameRange[0],
diff --git a/packages/serverless/src/find-output-file-in-bucket.ts b/packages/lambda/src/functions/find-output-file-in-bucket.ts
similarity index 69%
rename from packages/serverless/src/find-output-file-in-bucket.ts
rename to packages/lambda/src/functions/find-output-file-in-bucket.ts
index ad7e30d8da..f670a89307 100644
--- a/packages/serverless/src/find-output-file-in-bucket.ts
+++ b/packages/lambda/src/functions/find-output-file-in-bucket.ts
@@ -1,14 +1,14 @@
-import type {
- CloudProvider,
- CustomCredentials,
- OutputFileMetadata,
- ProviderSpecifics,
- RenderMetadata,
- RenderOutput,
-} from '@remotion/serverless-client';
-import {findOutputFileInBucket as findOutputFileInBucketShared} from '@remotion/serverless-client';
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type CustomCredentials,
+ type OutputFileMetadata,
+ type ProviderSpecifics,
+ type RenderMetadata,
+ type RenderOutput,
+} from '@remotion/lambda-client';
-export type {OutputFileMetadata} from '@remotion/serverless-client';
+export type {OutputFileMetadata} from '@remotion/lambda-client';
export const findOutputFileInBucket = <Provider extends CloudProvider>({
region,
@@ -35,7 +35,7 @@ export const findOutputFileInBucket = <Provider extends CloudProvider>({
throw new Error('unexpectedly did not get renderMetadata');
}
- return findOutputFileInBucketShared({
+ return LambdaClientInternals.findOutputFileInBucket({
region,
renderMetadata,
bucketName,
diff --git a/packages/serverless/src/finish-render.ts b/packages/lambda/src/functions/finish-render.ts
similarity index 92%
rename from packages/serverless/src/finish-render.ts
rename to packages/lambda/src/functions/finish-render.ts
index c6ec74fc0c..f0b409e9a4 100644
--- a/packages/serverless/src/finish-render.ts
+++ b/packages/lambda/src/functions/finish-render.ts
@@ -1,17 +1,17 @@
import fs from 'node:fs';
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type CustomCredentials,
+ type PostRenderData,
+ type Privacy,
+ type ProviderSpecifics,
+ type RenderMetadata,
+ type SerializedInputProps,
+ type WriteFileInput,
+} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
-import type {
- CloudProvider,
- CustomCredentials,
- DownloadBehavior,
- PostRenderData,
- Privacy,
- ProviderSpecifics,
- RenderMetadata,
- WriteFileInput,
- SerializedInputProps,
-} from '@remotion/serverless-client';
-import {getExpectedOutName, inspectErrors} from '@remotion/serverless-client';
+import type {DownloadBehavior} from 'remotion/no-react';
import {cleanupProps} from './cleanup-props';
import {createPostRenderData} from './create-post-render-data';
import type {OverallProgressHelper} from './overall-render-progress';
@@ -76,7 +76,7 @@ export const finishRender = async <Provider extends CloudProvider>({
const separateAudioDestination =
separateAudioFile === null
? null
- : getExpectedOutName({
+ : LambdaClientInternals.getExpectedOutName({
output: 'separate-audio',
renderMetadata,
bucketName,
@@ -162,7 +162,7 @@ export const finishRender = async <Provider extends CloudProvider>({
}
}
- const errorExplanations = inspectErrors({
+ const errorExplanations = LambdaClientInternals.inspectErrors({
errors: overallProgress.get().errors,
});
diff --git a/packages/lambda/src/functions/full-client-implementation.ts b/packages/lambda/src/functions/full-client-implementation.ts
index fd646e9c87..99011538c4 100644
--- a/packages/lambda/src/functions/full-client-implementation.ts
+++ b/packages/lambda/src/functions/full-client-implementation.ts
@@ -1,9 +1,9 @@
import {bundle} from '@remotion/bundler';
import type {AwsProvider} from '@remotion/lambda-client';
-import type {FullClientSpecifics} from '@remotion/serverless';
import {createFunction} from '../api/create-function';
import {uploadDir} from '../api/upload-dir';
import {readDirectory} from '../shared/read-dir';
+import type {FullClientSpecifics} from './provider-implementation';
export const awsFullClientSpecifics: FullClientSpecifics<AwsProvider> = {
bundleSite: bundle,
diff --git a/packages/serverless/src/get-browser-instance.ts b/packages/lambda/src/functions/get-browser-instance.ts
similarity index 98%
rename from packages/serverless/src/get-browser-instance.ts
rename to packages/lambda/src/functions/get-browser-instance.ts
index 30006a7404..126b7fbdbf 100644
--- a/packages/serverless/src/get-browser-instance.ts
+++ b/packages/lambda/src/functions/get-browser-instance.ts
@@ -1,11 +1,11 @@
-import type {ChromiumOptions, LogLevel, openBrowser} from '@remotion/renderer';
-import {RenderInternals} from '@remotion/renderer';
import type {
Await,
CloudProvider,
ProviderSpecifics,
-} from '@remotion/serverless-client';
-import {VERSION} from '@remotion/serverless-client';
+} from '@remotion/lambda-client';
+import type {ChromiumOptions, LogLevel, openBrowser} from '@remotion/renderer';
+import {RenderInternals} from '@remotion/renderer';
+import {VERSION} from 'remotion/version';
import type {
CloseBrowserInstance,
ForgetBrowserEventLoop,
diff --git a/packages/serverless/src/handlers/check-version-mismatch.ts b/packages/lambda/src/functions/handlers/check-version-mismatch.ts
similarity index 89%
rename from packages/serverless/src/handlers/check-version-mismatch.ts
rename to packages/lambda/src/functions/handlers/check-version-mismatch.ts
index 22bc121c25..8d7a7e4b0d 100644
--- a/packages/serverless/src/handlers/check-version-mismatch.ts
+++ b/packages/lambda/src/functions/handlers/check-version-mismatch.ts
@@ -1,8 +1,9 @@
-import type {
- CloudProvider,
- ServerlessPayload,
-} from '@remotion/serverless-client';
-import {ServerlessRoutines, VERSION} from '@remotion/serverless-client';
+import {
+ ServerlessRoutines,
+ type CloudProvider,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import {VERSION} from 'remotion/version';
import type {InsideFunctionSpecifics} from '../provider-implementation';
export const checkVersionMismatch = <Provider extends CloudProvider>({
diff --git a/packages/serverless/src/handlers/compositions.ts b/packages/lambda/src/functions/handlers/compositions.ts
similarity index 82%
rename from packages/serverless/src/handlers/compositions.ts
rename to packages/lambda/src/functions/handlers/compositions.ts
index 00bd15899d..ee01ecf9db 100644
--- a/packages/serverless/src/handlers/compositions.ts
+++ b/packages/lambda/src/functions/handlers/compositions.ts
@@ -1,14 +1,11 @@
-import {RenderInternals} from '@remotion/renderer';
-import type {
- CloudProvider,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
import {
+ LambdaClientInternals,
ServerlessRoutines,
- decompressInputProps,
- internalGetOrCreateBucket,
-} from '@remotion/serverless-client';
+ type CloudProvider,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import {RenderInternals} from '@remotion/renderer';
import type {LaunchedBrowser} from '../get-browser-instance';
import type {InsideFunctionSpecifics} from '../provider-implementation';
import {checkVersionMismatch} from './check-version-mismatch';
@@ -52,7 +49,7 @@ export const compositionsHandler = async <Provider extends CloudProvider>({
});
const bucketName = await (params.bucketName
? Promise.resolve(params.bucketName)
- : internalGetOrCreateBucket({
+ : LambdaClientInternals.internalGetOrCreateBucket({
region,
enableFolderExpiry: null,
customCredentials: null,
@@ -63,16 +60,17 @@ export const compositionsHandler = async <Provider extends CloudProvider>({
logLevel: params.logLevel,
}).then((b) => b.bucketName));
- const serializedInputPropsWithCustomSchema = await decompressInputProps({
- bucketName,
- expectedBucketOwner: options.expectedBucketOwner,
- region: insideFunctionSpecifics.getCurrentRegionInFunction(),
- serialized: params.inputProps,
- propsType: 'input-props',
- providerSpecifics,
- forcePathStyle: params.forcePathStyle,
- requestHandler: null,
- });
+ const serializedInputPropsWithCustomSchema =
+ await LambdaClientInternals.decompressInputProps({
+ bucketName,
+ expectedBucketOwner: options.expectedBucketOwner,
+ region: insideFunctionSpecifics.getCurrentRegionInFunction(),
+ serialized: params.inputProps,
+ propsType: 'input-props',
+ providerSpecifics,
+ forcePathStyle: params.forcePathStyle,
+ requestHandler: null,
+ });
const realServeUrl = providerSpecifics.convertToServeUrl({
urlOrId: params.serveUrl,
diff --git a/packages/serverless/src/handlers/launch.ts b/packages/lambda/src/functions/handlers/launch.ts
similarity index 91%
rename from packages/serverless/src/handlers/launch.ts
rename to packages/lambda/src/functions/handlers/launch.ts
index 2c7545397e..87f98c5f7e 100644
--- a/packages/serverless/src/handlers/launch.ts
+++ b/packages/lambda/src/functions/handlers/launch.ts
@@ -1,44 +1,25 @@
import {existsSync, mkdirSync, rmSync} from 'fs';
import {type EventEmitter} from 'node:events';
import {join} from 'path';
+import {
+ LambdaClientInternals,
+ OutputFileAccessDeniedError,
+ ServerlessRoutines,
+ type CloudProvider,
+ type ImageSequenceManifest,
+ type ImageSequenceOutput,
+ type PostRenderData,
+ type ProviderSpecifics,
+ type RenderMetadata,
+ type RendererOutput,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
/* eslint-disable @typescript-eslint/no-use-before-define */
import type {LogOptions} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
import {NoReactAPIs} from '@remotion/renderer/pure';
-import {validateCodec, VERSION} from '@remotion/serverless-client';
-import type {
- CloudProvider,
- PostRenderData,
- ProviderSpecifics,
- RenderMetadata,
- ImageSequenceOutput,
- ImageSequenceManifest,
- RendererOutput,
- ServerlessPayload,
-} from '@remotion/serverless-client';
-import {
- artifactName,
- compressInputProps,
- CONCAT_FOLDER_TOKEN,
- decompressInputProps,
- DOCS_URL,
- getCredentialsFromOutName,
- getImageSequenceFrameKey,
- inspectErrors,
- rendersPrefix,
- getExpectedOutName,
- getNeedsToUpload,
- getSizeInBytes,
- MAX_FUNCTIONS_PER_RENDER,
- OutputFileAccessDeniedError,
- rendererTransportPrefix,
- serializeOrThrow,
- ServerlessRoutines,
- validateFramesPerFunction,
- validateOutname,
- validatePrivacy,
- writeCancellationSignal,
-} from '@remotion/serverless-client';
+import {NoReactInternals} from 'remotion/no-react';
+import {VERSION} from 'remotion/version';
import {
makeArtifactRegistry,
type OnArtifactFromRenderer,
@@ -88,7 +69,11 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
}
if (params.codec !== null) {
- validateCodec(params.codec, 'renderMediaOnLambda', 'codec');
+ NoReactInternals.validateCodec(
+ params.codec,
+ 'renderMediaOnLambda',
+ 'codec',
+ );
}
const separateAudioTo = params.separateAudioTo ?? null;
@@ -141,7 +126,7 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
);
}
- validateOutname({
+ LambdaClientInternals.validateOutname({
outName: separateAudioTo,
codec: null,
audioCodecSetting: audioCodec,
@@ -169,7 +154,7 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
onBrowser(b);
});
- const inputPropsPromise = decompressInputProps({
+ const inputPropsPromise = LambdaClientInternals.decompressInputProps({
bucketName: params.bucketName,
expectedBucketOwner: options.expectedBucketOwner,
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
@@ -279,7 +264,8 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
const rawPrefix =
typeof prefix === 'string'
? prefix
- : (prefix?.keyPrefix ?? `${rendersPrefix(params.renderId)}/frames/`);
+ : (prefix?.keyPrefix ??
+ `${LambdaClientInternals.rendersPrefix(params.renderId)}/frames/`);
if (
rawPrefix.length === 0 ||
rawPrefix.startsWith('/') ||
@@ -329,7 +315,7 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
storageClass: params.storageClass,
downloadBehavior: params.downloadBehavior,
};
- const lastKey = getImageSequenceFrameKey({
+ const lastKey = LambdaClientInternals.getImageSequenceFrameKey({
...rendererOutput,
frame: frameCount[frameCount.length - 1],
});
@@ -359,20 +345,20 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
throw new Error('Media renders require a codec');
}
- const framesPerLambda = validateFramesPerFunction({
+ const framesPerLambda = LambdaClientInternals.validateFramesPerFunction({
framesPerFunction: params.framesPerFunction,
durationInFrames: frameCount.length,
concurrency: params.concurrency,
});
- validateOutname({
+ LambdaClientInternals.validateOutname({
outName,
codec: params.codec,
audioCodecSetting: audioCodec,
separateAudioTo: separateAudioFilename?.toLowerCase() ?? null,
bucketNamePrefix: providerSpecifics.getBucketPrefix(),
});
- validatePrivacy(params.privacy, true);
+ LambdaClientInternals.validatePrivacy(params.privacy, true);
RenderInternals.validatePuppeteerTimeout(params.timeoutInMilliseconds);
const {chunks} = planFrameRanges({
@@ -381,9 +367,9 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
everyNthFrame: params.everyNthFrame,
});
- if (chunks.length > MAX_FUNCTIONS_PER_RENDER) {
+ if (chunks.length > LambdaClientInternals.MAX_FUNCTIONS_PER_RENDER) {
throw new Error(
- `Too many functions: This render would cause ${chunks.length} functions to spawn. We limit this amount to ${MAX_FUNCTIONS_PER_RENDER} functions as more would result in diminishing returns. Values set: frameCount = ${frameCount.length}, framesPerLambda=${framesPerLambda}. See ${DOCS_URL}/docs/lambda/concurrency#too-many-functions for help.`,
+ `Too many functions: This render would cause ${chunks.length} functions to spawn. We limit this amount to ${LambdaClientInternals.MAX_FUNCTIONS_PER_RENDER} functions as more would result in diminishing returns. Values set: frameCount = ${frameCount.length}, framesPerLambda=${framesPerLambda}. See ${LambdaClientInternals.DOCS_URL}/docs/lambda/concurrency#too-many-functions for help.`,
);
}
@@ -391,32 +377,36 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
const sortedChunks = chunks.slice().sort((a, b) => a[0] - b[0]);
- const serializedResolved = serializeOrThrow(comp.props, 'resolved-props');
+ const serializedResolved = LambdaClientInternals.serializeOrThrow(
+ comp.props,
+ 'resolved-props',
+ );
- const needsToUpload = getNeedsToUpload({
+ const needsToUpload = LambdaClientInternals.getNeedsToUpload({
type: 'video-or-audio',
sizes: [
- getSizeInBytes(serializedResolved),
+ LambdaClientInternals.getSizeInBytes(serializedResolved),
params.inputProps.type === 'bucket-url'
- ? getSizeInBytes(params.inputProps.hash)
- : getSizeInBytes(params.inputProps.payload),
- getSizeInBytes(JSON.stringify(params.envVariables)),
+ ? LambdaClientInternals.getSizeInBytes(params.inputProps.hash)
+ : LambdaClientInternals.getSizeInBytes(params.inputProps.payload),
+ LambdaClientInternals.getSizeInBytes(JSON.stringify(params.envVariables)),
],
providerSpecifics,
});
- const serializedResolvedProps = await compressInputProps({
- propsType: 'resolved-props',
- region: insideFunctionSpecifics.getCurrentRegionInFunction(),
- stringifiedInputProps: serializedResolved,
- userSpecifiedBucketName: params.bucketName,
- needsToUpload,
- providerSpecifics,
- forcePathStyle: params.forcePathStyle,
- skipPutAcl: false,
- requestHandler: null,
- logLevel: params.logLevel,
- });
+ const serializedResolvedProps =
+ await LambdaClientInternals.compressInputProps({
+ propsType: 'resolved-props',
+ region: insideFunctionSpecifics.getCurrentRegionInFunction(),
+ stringifiedInputProps: serializedResolved,
+ userSpecifiedBucketName: params.bucketName,
+ needsToUpload,
+ providerSpecifics,
+ forcePathStyle: params.forcePathStyle,
+ skipPutAcl: false,
+ requestHandler: null,
+ logLevel: params.logLevel,
+ });
registerCleanupTask(() => {
return cleanupProps<Provider>({
@@ -518,13 +508,15 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
? null
: !params.overwrite &&
providerSpecifics.supportsConditionalOutput({
- customCredentials: getCredentialsFromOutName(separateAudioTo),
+ customCredentials:
+ LambdaClientInternals.getCredentialsFromOutName(separateAudioTo),
}) &&
providerSpecifics.writeFileIfNotExists !== null,
outputFileIsConditional:
!params.overwrite &&
providerSpecifics.supportsConditionalOutput({
- customCredentials: getCredentialsFromOutName(outName),
+ customCredentials:
+ LambdaClientInternals.getCredentialsFromOutName(outName),
}) &&
providerSpecifics.writeFileIfNotExists !== null,
startedDate,
@@ -580,21 +572,24 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
scale: params.scale,
};
- const {key, renderBucketName, customCredentials} = getExpectedOutName({
- output: 'main',
- renderMetadata,
- bucketName: params.bucketName,
- customCredentials: getCredentialsFromOutName(outName),
- bucketNamePrefix: providerSpecifics.getBucketPrefix(),
- });
+ const {key, renderBucketName, customCredentials} =
+ LambdaClientInternals.getExpectedOutName({
+ output: 'main',
+ renderMetadata,
+ bucketName: params.bucketName,
+ customCredentials:
+ LambdaClientInternals.getCredentialsFromOutName(outName),
+ bucketNamePrefix: providerSpecifics.getBucketPrefix(),
+ });
const separateAudioDestination =
separateAudioTo === null
? null
- : getExpectedOutName({
+ : LambdaClientInternals.getExpectedOutName({
output: 'separate-audio',
renderMetadata,
bucketName: params.bucketName,
- customCredentials: getCredentialsFromOutName(separateAudioTo),
+ customCredentials:
+ LambdaClientInternals.getCredentialsFromOutName(separateAudioTo),
bucketNamePrefix: providerSpecifics.getBucketPrefix(),
});
if (
@@ -683,7 +678,10 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
params.output.outputPrefix === null
? []
: frameCount.map((frame) =>
- getImageSequenceFrameKey({...sequenceDestination, frame}),
+ LambdaClientInternals.getImageSequenceFrameKey({
+ ...sequenceDestination,
+ frame,
+ }),
)),
];
for (let index = 0; index < keys.length; index += 25) {
@@ -763,7 +761,10 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
}
const region = insideFunctionSpecifics.getCurrentRegionInFunction();
- const storageKey = artifactName(renderMetadata.renderId, artifact.filename);
+ const storageKey = LambdaClientInternals.artifactName(
+ renderMetadata.renderId,
+ artifact.filename,
+ );
const start = Date.now();
RenderInternals.Log.info(
@@ -830,7 +831,9 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
renderMetadata.type === 'sequence'
) {
const sequenceDestination = rendererOutput;
- const outdir = RenderInternals.tmpDir(CONCAT_FOLDER_TOKEN);
+ const outdir = RenderInternals.tmpDir(
+ LambdaClientInternals.CONCAT_FOLDER_TOKEN,
+ );
await Promise.all(
lambdaPayloads.map((payload) =>
renderRendererFunctionWithRetry({
@@ -869,7 +872,7 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
everyNthFrame: params.everyNthFrame,
frames: frameCount.map((frame) => ({
frame,
- key: getImageSequenceFrameKey({
+ key: LambdaClientInternals.getImageSequenceFrameKey({
...sequenceDestination,
frame,
}),
@@ -900,7 +903,9 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
memorySizeInMb: insideFunctionSpecifics.getCurrentMemorySizeInMb(),
renderMetadata,
- errorExplanations: inspectErrors({errors: progress.errors}),
+ errorExplanations: LambdaClientInternals.inspectErrors({
+ errors: progress.errors,
+ }),
timeToDelete: cleanup.reduce((max, time) => Math.max(max, time), 0),
outputFile: {
url: renderMetadata.outputSequence.manifestUrl,
@@ -972,7 +977,10 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
throw new Error('Media renders require a codec');
}
- const outdir = join(RenderInternals.tmpDir(CONCAT_FOLDER_TOKEN), 'bucket');
+ const outdir = join(
+ RenderInternals.tmpDir(LambdaClientInternals.CONCAT_FOLDER_TOKEN),
+ 'bucket',
+ );
if (existsSync(outdir)) {
rmSync(outdir, {
recursive: true,
@@ -1051,7 +1059,7 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
try {
const transportObjects = await providerSpecifics.listObjects({
bucketName: params.bucketName,
- prefix: rendererTransportPrefix(params.renderId),
+ prefix: LambdaClientInternals.rendererTransportPrefix(params.renderId),
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
expectedBucketOwner: options.expectedBucketOwner,
forcePathStyle: params.forcePathStyle,
@@ -1136,7 +1144,7 @@ export const launchHandler = async <Provider extends CloudProvider>({
}
try {
- await writeCancellationSignal({
+ await LambdaClientInternals.writeCancellationSignal({
bucketName: params.bucketName,
renderId: params.renderId,
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
@@ -1415,10 +1423,6 @@ export const launchHandler = async <Provider extends CloudProvider>({
});
webhookInvoked = true;
} catch (error) {
- if (process.env.NODE_ENV === 'test') {
- throw error;
- }
-
overallProgress.addErrorWithoutUpload({
type: 'webhook',
message: (err as Error).message,
diff --git a/packages/serverless/src/handlers/progress.ts b/packages/lambda/src/functions/handlers/progress.ts
similarity index 89%
rename from packages/serverless/src/handlers/progress.ts
rename to packages/lambda/src/functions/handlers/progress.ts
index 9b12fc7844..1ea1959beb 100644
--- a/packages/serverless/src/handlers/progress.ts
+++ b/packages/lambda/src/functions/handlers/progress.ts
@@ -1,10 +1,11 @@
-import type {
- CloudProvider,
- GenericRenderProgress,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
-import {ServerlessRoutines, getProgress} from '@remotion/serverless-client';
+import {
+ LambdaClientInternals,
+ ServerlessRoutines,
+ type CloudProvider,
+ type GenericRenderProgress,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
import type {InsideFunctionSpecifics} from '../provider-implementation';
import {checkVersionMismatch} from './check-version-mismatch';
@@ -34,7 +35,7 @@ export const progressHandler = async <Provider extends CloudProvider>({
});
try {
- const progress = await getProgress({
+ const progress = await LambdaClientInternals.getProgress({
bucketName: params.bucketName,
renderId: params.renderId,
expectedBucketOwner: options.expectedBucketOwner,
diff --git a/packages/serverless/src/handlers/renderer.ts b/packages/lambda/src/functions/handlers/renderer.ts
similarity index 96%
rename from packages/serverless/src/handlers/renderer.ts
rename to packages/lambda/src/functions/handlers/renderer.ts
index 6103aebf9f..c5dea52565 100644
--- a/packages/serverless/src/handlers/renderer.ts
+++ b/packages/lambda/src/functions/handlers/renderer.ts
@@ -1,5 +1,14 @@
import fs from 'node:fs';
import path from 'node:path';
+import {
+ LambdaClientInternals,
+ ServerlessRoutines,
+ type CloudProvider,
+ type ObjectChunkTimingData,
+ type OnStream,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
import type {
AudioCodec,
BrowserLog,
@@ -9,21 +18,7 @@ import type {
} from '@remotion/renderer';
import {makeCancelSignal, RenderInternals} from '@remotion/renderer';
import {NoReactAPIs} from '@remotion/renderer/pure';
-import type {
- CloudProvider,
- ObjectChunkTimingData,
- OnStream,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
-import {
- decompressInputProps,
- RENDERER_PATH_TOKEN,
- serializeArtifact,
- ServerlessRoutines,
- truthy,
- VERSION,
-} from '@remotion/serverless-client';
+import {VERSION} from 'remotion/version';
import {startCancellationPolling} from '../cancellation-polling';
import type {LaunchedBrowser} from '../get-browser-instance';
import {onDownloadsHelper} from '../on-downloads-helpers';
@@ -85,7 +80,7 @@ const renderHandler = async <Provider extends CloudProvider>({
);
}
- const inputPropsPromise = decompressInputProps({
+ const inputPropsPromise = LambdaClientInternals.decompressInputProps({
bucketName: params.bucketName,
expectedBucketOwner: options.expectedBucketOwner,
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
@@ -96,7 +91,7 @@ const renderHandler = async <Provider extends CloudProvider>({
requestHandler: null,
});
- const resolvedPropsPromise = decompressInputProps({
+ const resolvedPropsPromise = LambdaClientInternals.decompressInputProps({
bucketName: params.bucketName,
expectedBucketOwner: options.expectedBucketOwner,
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
@@ -166,7 +161,9 @@ const renderHandler = async <Provider extends CloudProvider>({
startDate: start,
};
- const outdir = RenderInternals.tmpDir(RENDERER_PATH_TOKEN);
+ const outdir = RenderInternals.tmpDir(
+ LambdaClientInternals.RENDERER_PATH_TOKEN,
+ );
const chunk = `localchunk-${String(params.chunk).padStart(8, '0')}`;
const defaultAudioCodec =
@@ -252,7 +249,7 @@ const renderHandler = async <Provider extends CloudProvider>({
onStream({
type: 'artifact-emitted',
payload: {
- artifact: serializeArtifact(artifact),
+ artifact: LambdaClientInternals.serializeArtifact(artifact),
},
})
.then(() => {
@@ -470,7 +467,7 @@ const renderHandler = async <Provider extends CloudProvider>({
? fs.promises.rm(audioOutputLocation, {recursive: true, force: true})
: null,
fs.promises.rm(outputPath, {recursive: true}),
- ].filter(truthy),
+ ].filter(LambdaClientInternals.truthy),
);
RenderInternals.Log.verbose(
{indent: false, logLevel: params.logLevel},
diff --git a/packages/serverless/src/handlers/send-telemetry-event.ts b/packages/lambda/src/functions/handlers/send-telemetry-event.ts
similarity index 100%
rename from packages/serverless/src/handlers/send-telemetry-event.ts
rename to packages/lambda/src/functions/handlers/send-telemetry-event.ts
diff --git a/packages/serverless/src/handlers/start.ts b/packages/lambda/src/functions/handlers/start.ts
similarity index 94%
rename from packages/serverless/src/handlers/start.ts
rename to packages/lambda/src/functions/handlers/start.ts
index 68c23b518e..9ed9b7f06f 100644
--- a/packages/serverless/src/handlers/start.ts
+++ b/packages/lambda/src/functions/handlers/start.ts
@@ -1,13 +1,10 @@
-import type {
- CloudProvider,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
import {
+ LambdaClientInternals,
ServerlessRoutines,
- internalGetOrCreateBucket,
- overallProgressKey,
-} from '@remotion/serverless-client';
+ type CloudProvider,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
import {makeInitialOverallRenderProgress} from '../overall-render-progress';
import type {InsideFunctionSpecifics} from '../provider-implementation';
import {checkVersionMismatch} from './check-version-mismatch';
@@ -46,7 +43,7 @@ export const startHandler = async <Provider extends CloudProvider>({
const bucketName =
params.bucketName ??
(
- await internalGetOrCreateBucket({
+ await LambdaClientInternals.internalGetOrCreateBucket({
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
enableFolderExpiry: null,
customCredentials: null,
@@ -76,7 +73,7 @@ export const startHandler = async <Provider extends CloudProvider>({
),
),
expectedBucketOwner: options.expectedBucketOwner,
- key: overallProgressKey(options.renderId),
+ key: LambdaClientInternals.overallProgressKey(options.renderId),
privacy: 'private',
customCredentials: null,
forcePathStyle: params.forcePathStyle,
diff --git a/packages/serverless/src/handlers/still.ts b/packages/lambda/src/functions/handlers/still.ts
similarity index 88%
rename from packages/serverless/src/handlers/still.ts
rename to packages/lambda/src/functions/handlers/still.ts
index 09a4d10e01..1a929d324d 100644
--- a/packages/serverless/src/handlers/still.ts
+++ b/packages/lambda/src/functions/handlers/still.ts
@@ -1,31 +1,20 @@
import fs from 'node:fs';
import path from 'node:path';
-import type {EmittedArtifact, StillImageFormat} from '@remotion/renderer';
-import {RenderInternals} from '@remotion/renderer';
-import type {
- CloudProvider,
- OnStream,
- ProviderSpecifics,
- ReceivedArtifact,
- RenderMetadata,
- RenderStillFunctionResponsePayload,
- ServerlessPayload,
-} from '@remotion/serverless-client';
import {
- artifactName,
- decompressInputProps,
- formatCostsInfo,
- getCredentialsFromOutName,
- getExpectedOutName,
- internalGetOrCreateBucket,
- overallProgressKey,
- serializeJSONWithSpecialTypes,
+ LambdaClientInternals,
ServerlessRoutines,
- validateDownloadBehavior,
- validateOutname,
- validatePrivacy,
- VERSION,
-} from '@remotion/serverless-client';
+ type CloudProvider,
+ type OnStream,
+ type ProviderSpecifics,
+ type ReceivedArtifact,
+ type RenderMetadata,
+ type RenderStillFunctionResponsePayload,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import type {EmittedArtifact, StillImageFormat} from '@remotion/renderer';
+import {RenderInternals} from '@remotion/renderer';
+import {NoReactInternals} from 'remotion/no-react';
+import {VERSION} from 'remotion/version';
import {cleanupSerializedInputProps} from '../cleanup-serialized-input-props';
import {onDownloadsHelper} from '../on-downloads-helpers';
import {makeInitialOverallRenderProgress} from '../overall-render-progress';
@@ -67,9 +56,9 @@ const innerStillHandler = async <Provider extends CloudProvider>(
params,
});
- validateDownloadBehavior(params.downloadBehavior);
- validatePrivacy(params.privacy, true);
- validateOutname({
+ LambdaClientInternals.validateDownloadBehavior(params.downloadBehavior);
+ LambdaClientInternals.validatePrivacy(params.privacy, true);
+ LambdaClientInternals.validateOutname({
outName: params.outName,
codec: null,
audioCodecSetting: null,
@@ -101,7 +90,7 @@ const innerStillHandler = async <Provider extends CloudProvider>(
const bucketNamePromise =
params.bucketName ??
- internalGetOrCreateBucket({
+ LambdaClientInternals.internalGetOrCreateBucket({
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
enableFolderExpiry: null,
customCredentials: null,
@@ -118,16 +107,17 @@ const innerStillHandler = async <Provider extends CloudProvider>(
const region = insideFunctionSpecifics.getCurrentRegionInFunction();
const bucketName = await bucketNamePromise;
- const serializedInputPropsWithCustomSchema = await decompressInputProps({
- bucketName,
- expectedBucketOwner,
- region,
- serialized: params.inputProps,
- propsType: 'input-props',
- providerSpecifics,
- forcePathStyle: params.forcePathStyle,
- requestHandler: null,
- });
+ const serializedInputPropsWithCustomSchema =
+ await LambdaClientInternals.decompressInputProps({
+ bucketName,
+ expectedBucketOwner,
+ region,
+ serialized: params.inputProps,
+ propsType: 'input-props',
+ providerSpecifics,
+ forcePathStyle: params.forcePathStyle,
+ requestHandler: null,
+ });
const serveUrl = providerSpecifics.convertToServeUrl({
urlOrId: params.serveUrl,
@@ -225,7 +215,7 @@ const innerStillHandler = async <Provider extends CloudProvider>(
await providerSpecifics.writeFile({
bucketName,
- key: overallProgressKey(renderId),
+ key: LambdaClientInternals.overallProgressKey(renderId),
body: JSON.stringify(still),
region: insideFunctionSpecifics.getCurrentRegionInFunction(),
privacy: 'private',
@@ -243,20 +233,26 @@ const innerStillHandler = async <Provider extends CloudProvider>(
const receivedArtifact: ReceivedArtifact<Provider>[] = [];
- const {key, renderBucketName, customCredentials} = getExpectedOutName({
- output: 'main',
- renderMetadata,
- bucketName,
- customCredentials: getCredentialsFromOutName(params.outName),
- bucketNamePrefix: providerSpecifics.getBucketPrefix(),
- });
+ const {key, renderBucketName, customCredentials} =
+ LambdaClientInternals.getExpectedOutName({
+ output: 'main',
+ renderMetadata,
+ bucketName,
+ customCredentials: LambdaClientInternals.getCredentialsFromOutName(
+ params.outName,
+ ),
+ bucketNamePrefix: providerSpecifics.getBucketPrefix(),
+ });
const onArtifact = (artifact: EmittedArtifact): {alreadyExisted: boolean} => {
if (receivedArtifact.find((a) => a.filename === artifact.filename)) {
return {alreadyExisted: true};
}
- const storageKey = artifactName(renderMetadata.renderId, artifact.filename);
+ const storageKey = LambdaClientInternals.artifactName(
+ renderMetadata.renderId,
+ artifact.filename,
+ );
receivedArtifact.push(
insideFunctionSpecifics.makeArtifactWithDetails({
@@ -327,11 +323,12 @@ const innerStillHandler = async <Provider extends CloudProvider>(
port: null,
server,
logLevel: params.logLevel,
- serializedResolvedPropsWithCustomSchema: serializeJSONWithSpecialTypes({
- indent: undefined,
- staticBase: null,
- data: composition.props,
- }).serializedString,
+ serializedResolvedPropsWithCustomSchema:
+ NoReactInternals.serializeJSONWithSpecialTypes({
+ indent: undefined,
+ staticBase: null,
+ data: composition.props,
+ }).serializedString,
offthreadVideoCacheSizeInBytes: params.offthreadVideoCacheSizeInBytes,
mediaCacheSizeInBytes: params.mediaCacheSizeInBytes,
binariesDirectory: null,
@@ -400,7 +397,7 @@ const innerStillHandler = async <Provider extends CloudProvider>(
size,
sizeInBytes: size,
bucketName,
- estimatedPrice: formatCostsInfo(
+ estimatedPrice: LambdaClientInternals.formatCostsInfo(
estimatedPrice,
providerSpecifics.getBillingCurrency(
insideFunctionSpecifics.getCurrentRegionInFunction(),
diff --git a/packages/lambda/src/functions/helpers/get-folder-files.ts b/packages/lambda/src/functions/helpers/get-folder-files.ts
index 8cac4affaa..d8bcb7af57 100644
--- a/packages/lambda/src/functions/helpers/get-folder-files.ts
+++ b/packages/lambda/src/functions/helpers/get-folder-files.ts
@@ -1,6 +1,6 @@
import fs from 'fs';
import path from 'path';
-import type {FileNameAndSize, GetFolderFiles} from '@remotion/serverless';
+import type {FileNameAndSize, GetFolderFiles} from '@remotion/lambda-client';
export const getFolderFiles: GetFolderFiles = (folder) => {
const files = fs.readdirSync(folder);
const paths: FileNameAndSize[] = [];
diff --git a/packages/lambda/src/functions/helpers/get-tmp-dir.ts b/packages/lambda/src/functions/helpers/get-tmp-dir.ts
index 93665a8746..62033150fd 100644
--- a/packages/lambda/src/functions/helpers/get-tmp-dir.ts
+++ b/packages/lambda/src/functions/helpers/get-tmp-dir.ts
@@ -1,11 +1,13 @@
-import type {FunctionErrorInfo} from '@remotion/serverless';
-import {errorIsOutOfSpaceError} from '@remotion/serverless';
+import {
+ LambdaClientInternals,
+ type FunctionErrorInfo,
+} from '@remotion/lambda-client';
import {getFolderFiles} from './get-folder-files';
export const getTmpDirStateIfENoSp = (
err: string,
): FunctionErrorInfo['tmpDir'] => {
- if (!errorIsOutOfSpaceError(err)) {
+ if (!LambdaClientInternals.errorIsOutOfSpaceError(err)) {
return null;
}
diff --git a/packages/lambda/src/functions/helpers/make-aws-artifact.ts b/packages/lambda/src/functions/helpers/make-aws-artifact.ts
index d8498b70ce..c8fc9c3c37 100644
--- a/packages/lambda/src/functions/helpers/make-aws-artifact.ts
+++ b/packages/lambda/src/functions/helpers/make-aws-artifact.ts
@@ -1,5 +1,5 @@
import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
-import type {MakeArtifactWithDetails} from '@remotion/serverless';
+import type {MakeArtifactWithDetails} from '../provider-implementation';
export const makeAwsArtifact: MakeArtifactWithDetails<AwsProvider> = ({
region,
diff --git a/packages/lambda/src/functions/helpers/read-with-progress.ts b/packages/lambda/src/functions/helpers/read-with-progress.ts
index f786746877..d0b54caf5e 100644
--- a/packages/lambda/src/functions/helpers/read-with-progress.ts
+++ b/packages/lambda/src/functions/helpers/read-with-progress.ts
@@ -1,14 +1,14 @@
import {GetObjectCommand} from '@aws-sdk/client-s3';
import {getSignedUrl} from '@aws-sdk/s3-request-presigner';
-import type {
- AwsProvider,
- AwsRegion,
- RequestHandler,
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type AwsRegion,
+ type CustomCredentials,
+ type RequestHandler,
} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {CustomCredentials} from '@remotion/serverless';
export type LambdaReadFileProgress = (progress: {
totalSize: number;
diff --git a/packages/lambda/src/functions/helpers/timer.ts b/packages/lambda/src/functions/helpers/timer.ts
index 577c4b2c96..f0628fc8b2 100644
--- a/packages/lambda/src/functions/helpers/timer.ts
+++ b/packages/lambda/src/functions/helpers/timer.ts
@@ -1,6 +1,6 @@
import type {LogLevel} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {DebuggingTimer} from '@remotion/serverless';
+import type {DebuggingTimer} from '../provider-implementation';
const formatTime = (time: number) => {
return time + 'ms';
diff --git a/packages/lambda/src/functions/index.ts b/packages/lambda/src/functions/index.ts
index e3fd9f51fb..d989362dd6 100644
--- a/packages/lambda/src/functions/index.ts
+++ b/packages/lambda/src/functions/index.ts
@@ -1,18 +1,16 @@
-import type {AwsProvider} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import type {
- OrError,
- ResponseStream,
- ServerlessPayload,
-} from '@remotion/serverless';
import {
- innerHandler,
+ LambdaClientInternals,
ServerlessRoutines,
- streamWriter,
-} from '@remotion/serverless';
+ type AwsProvider,
+ type OrError,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
import {serverAwsImplementation} from './aws-server-implementation';
import {setCurrentRequestId, stopLeakDetection} from './helpers/leak-detection';
import {streamifyResponse} from './helpers/streamify-response';
+import {innerHandler} from './inner-routine';
+import type {ResponseStream} from './streaming/response-stream';
+import {streamWriter} from './streaming/stream-writer';
type LambdaRequestContext = {
invokedFunctionArn: string;
diff --git a/packages/serverless/src/info.ts b/packages/lambda/src/functions/info.ts
similarity index 67%
rename from packages/serverless/src/info.ts
rename to packages/lambda/src/functions/info.ts
index 1d2fa74f70..a77e18c28e 100644
--- a/packages/serverless/src/info.ts
+++ b/packages/lambda/src/functions/info.ts
@@ -1,8 +1,9 @@
-import type {
- CloudProvider,
- ServerlessPayload,
-} from '@remotion/serverless-client';
-import {ServerlessRoutines, VERSION} from '@remotion/serverless-client';
+import {
+ ServerlessRoutines,
+ type CloudProvider,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import {VERSION} from 'remotion/version';
export const infoHandler = <Provider extends CloudProvider>(
serverlessParams: ServerlessPayload<Provider>,
diff --git a/packages/serverless/src/inner-routine.ts b/packages/lambda/src/functions/inner-routine.ts
similarity index 95%
rename from packages/serverless/src/inner-routine.ts
rename to packages/lambda/src/functions/inner-routine.ts
index dac5edf865..78624705d0 100644
--- a/packages/serverless/src/inner-routine.ts
+++ b/packages/lambda/src/functions/inner-routine.ts
@@ -1,16 +1,13 @@
-import {RenderInternals} from '@remotion/renderer';
-import type {
- CloudProvider,
- OrError,
- ProviderSpecifics,
- ServerlessPayload,
- StreamingPayload,
-} from '@remotion/serverless-client';
import {
- COMMAND_NOT_FOUND,
- makeStreamPayload,
+ LambdaClientInternals,
ServerlessRoutines,
-} from '@remotion/serverless-client';
+ type CloudProvider,
+ type OrError,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+ type StreamingPayload,
+} from '@remotion/lambda-client';
+import {RenderInternals} from '@remotion/renderer';
import {compositionsHandler} from './handlers/compositions';
import {launchHandler} from './handlers/launch';
import {progressHandler} from './handlers/progress';
@@ -82,7 +79,7 @@ export const innerHandler = async <Provider extends CloudProvider>({
return;
}
- const message = makeStreamPayload({
+ const message = LambdaClientInternals.makeStreamPayload({
message: payload,
});
return new Promise<void>((innerResolve, innerReject) => {
@@ -289,7 +286,7 @@ export const innerHandler = async <Provider extends CloudProvider>({
onStream: s3Output
? s3Output.onStream
: (payload) => {
- const message = makeStreamPayload({
+ const message = LambdaClientInternals.makeStreamPayload({
message: payload,
});
@@ -372,7 +369,9 @@ export const innerHandler = async <Provider extends CloudProvider>({
return;
}
- throw new Error(`${COMMAND_NOT_FOUND}: ${JSON.stringify(params)}`);
+ throw new Error(
+ `${LambdaClientInternals.COMMAND_NOT_FOUND}: ${JSON.stringify(params)}`,
+ );
};
export const innerRoutine = async <Provider extends CloudProvider>({
diff --git a/packages/serverless/src/invoke-webhook.ts b/packages/lambda/src/functions/invoke-webhook.ts
similarity index 100%
rename from packages/serverless/src/invoke-webhook.ts
rename to packages/lambda/src/functions/invoke-webhook.ts
diff --git a/packages/serverless/src/is-warm.ts b/packages/lambda/src/functions/is-warm.ts
similarity index 100%
rename from packages/serverless/src/is-warm.ts
rename to packages/lambda/src/functions/is-warm.ts
diff --git a/packages/serverless/src/merge-chunks.ts b/packages/lambda/src/functions/merge-chunks.ts
similarity index 93%
rename from packages/serverless/src/merge-chunks.ts
rename to packages/lambda/src/functions/merge-chunks.ts
index abd83edabe..273e7d41bf 100644
--- a/packages/serverless/src/merge-chunks.ts
+++ b/packages/lambda/src/functions/merge-chunks.ts
@@ -1,5 +1,15 @@
import {rm} from 'node:fs/promises';
import {dirname} from 'node:path';
+import type {
+ CloudProvider,
+ CustomCredentials,
+ PostRenderData,
+ Privacy,
+ ProviderSpecifics,
+ RenderMetadata,
+ SerializedInputProps,
+ ServerlessCodec,
+} from '@remotion/lambda-client';
import type {
AudioCodec,
CombineChunksOnProgress,
@@ -7,17 +17,7 @@ import type {
SingleFrameRange,
} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {DownloadBehavior} from '@remotion/serverless-client';
-import {
- type CloudProvider,
- type CustomCredentials,
- type PostRenderData,
- type Privacy,
- type ProviderSpecifics,
- type RenderMetadata,
- type SerializedInputProps,
- type ServerlessCodec,
-} from '@remotion/serverless-client';
+import type {DownloadBehavior} from 'remotion/no-react';
import {concatVideos} from './concat-videos';
import {finishRender} from './finish-render';
import type {OverallProgressHelper} from './overall-render-progress';
diff --git a/packages/serverless/src/on-downloads-helpers.ts b/packages/lambda/src/functions/on-downloads-helpers.ts
similarity index 100%
rename from packages/serverless/src/on-downloads-helpers.ts
rename to packages/lambda/src/functions/on-downloads-helpers.ts
diff --git a/packages/serverless/src/overall-render-progress.ts b/packages/lambda/src/functions/overall-render-progress.ts
similarity index 96%
rename from packages/serverless/src/overall-render-progress.ts
rename to packages/lambda/src/functions/overall-render-progress.ts
index bdf61f98ef..5c1df6a0fc 100644
--- a/packages/serverless/src/overall-render-progress.ts
+++ b/packages/lambda/src/functions/overall-render-progress.ts
@@ -1,16 +1,16 @@
+import {
+ LambdaClientInternals,
+ type ChunkRetry,
+ type CloudProvider,
+ type FunctionErrorInfo,
+ type OverallRenderProgress,
+ type PostRenderData,
+ type ProviderSpecifics,
+ type ReceivedArtifact,
+ type RenderMetadata,
+ type SeparateAudioOutput,
+} from '@remotion/lambda-client';
import {RenderInternals, type LogLevel} from '@remotion/renderer';
-import type {
- ChunkRetry,
- CloudProvider,
- FunctionErrorInfo,
- OverallRenderProgress,
- PostRenderData,
- ProviderSpecifics,
- ReceivedArtifact,
- RenderMetadata,
- SeparateAudioOutput,
-} from '@remotion/serverless-client';
-import {overallProgressKey} from '@remotion/serverless-client';
const progressUploadAttempts = 3;
@@ -144,7 +144,7 @@ export const makeOverallRenderProgress = <Provider extends CloudProvider>({
customCredentials: null,
downloadBehavior: null,
expectedBucketOwner,
- key: overallProgressKey(renderId),
+ key: LambdaClientInternals.overallProgressKey(renderId),
privacy: 'private',
region,
forcePathStyle,
diff --git a/packages/serverless/src/plan-frame-ranges.ts b/packages/lambda/src/functions/plan-frame-ranges.ts
similarity index 100%
rename from packages/serverless/src/plan-frame-ranges.ts
rename to packages/lambda/src/functions/plan-frame-ranges.ts
diff --git a/packages/serverless/src/print-logging-grep-helper.ts b/packages/lambda/src/functions/print-logging-grep-helper.ts
similarity index 88%
rename from packages/serverless/src/print-logging-grep-helper.ts
rename to packages/lambda/src/functions/print-logging-grep-helper.ts
index ea6f6ea676..d39bd01a33 100644
--- a/packages/serverless/src/print-logging-grep-helper.ts
+++ b/packages/lambda/src/functions/print-logging-grep-helper.ts
@@ -1,6 +1,6 @@
+import type {ServerlessRoutines} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {ServerlessRoutines} from '@remotion/serverless-client';
export type PrintLoggingHelper = (
type: ServerlessRoutines,
diff --git a/packages/serverless/src/provider-implementation.ts b/packages/lambda/src/functions/provider-implementation.ts
similarity index 99%
rename from packages/serverless/src/provider-implementation.ts
rename to packages/lambda/src/functions/provider-implementation.ts
index 08d9f9fe40..be22c81692 100644
--- a/packages/serverless/src/provider-implementation.ts
+++ b/packages/lambda/src/functions/provider-implementation.ts
@@ -1,10 +1,4 @@
import type {BundlerInternals} from '@remotion/bundler';
-import type {
- ChromiumOptions,
- EmittedArtifact,
- LogLevel,
- X264Preset,
-} from '@remotion/renderer';
import type {
CloudProvider,
DeleteAfter,
@@ -13,7 +7,13 @@ import type {
ProviderSpecifics,
ReceivedArtifact,
WebhookPayload,
-} from '@remotion/serverless-client';
+} from '@remotion/lambda-client';
+import type {
+ ChromiumOptions,
+ EmittedArtifact,
+ LogLevel,
+ X264Preset,
+} from '@remotion/renderer';
import type {LaunchedBrowser} from './get-browser-instance';
export type MakeArtifactWithDetails<Provider extends CloudProvider> = (params: {
diff --git a/packages/serverless/src/remove-outname-credentials.ts b/packages/lambda/src/functions/remove-outname-credentials.ts
similarity index 94%
rename from packages/serverless/src/remove-outname-credentials.ts
rename to packages/lambda/src/functions/remove-outname-credentials.ts
index 296699c5bb..85cc81b730 100644
--- a/packages/serverless/src/remove-outname-credentials.ts
+++ b/packages/lambda/src/functions/remove-outname-credentials.ts
@@ -2,7 +2,7 @@ import type {
CloudProvider,
OutNameInput,
OutNameInputWithoutCredentials,
-} from '@remotion/serverless-client';
+} from '@remotion/lambda-client';
export const removeOutnameCredentials = <Provider extends CloudProvider>(
outname: OutNameInput<Provider> | undefined,
diff --git a/packages/serverless/src/render-image-sequence-chunk.ts b/packages/lambda/src/functions/render-image-sequence-chunk.ts
similarity index 94%
rename from packages/serverless/src/render-image-sequence-chunk.ts
rename to packages/lambda/src/functions/render-image-sequence-chunk.ts
index 01e6888f33..de449a464b 100644
--- a/packages/serverless/src/render-image-sequence-chunk.ts
+++ b/packages/lambda/src/functions/render-image-sequence-chunk.ts
@@ -1,3 +1,11 @@
+import {
+ LambdaClientInternals,
+ ServerlessRoutines,
+ type CloudProvider,
+ type OnStream,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
import type {
BrowserLog,
CancelSignal,
@@ -5,17 +13,6 @@ import type {
HeadlessBrowser,
} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {
- CloudProvider,
- OnStream,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
-import {
- getImageSequenceFrameKey,
- serializeArtifact,
- ServerlessRoutines,
-} from '@remotion/serverless-client';
import {onDownloadsHelper} from './on-downloads-helpers';
import type {InsideFunctionSpecifics} from './provider-implementation';
@@ -100,7 +97,7 @@ export const renderImageSequenceChunk = async <Provider extends CloudProvider>({
onFrameBuffer: async (buffer, frame) => {
await providerSpecifics.writeFile({
bucketName: output.bucketName,
- key: getImageSequenceFrameKey({...output, frame}),
+ key: LambdaClientInternals.getImageSequenceFrameKey({...output, frame}),
body: new Uint8Array(
buffer.buffer,
buffer.byteOffset,
@@ -142,7 +139,9 @@ export const renderImageSequenceChunk = async <Provider extends CloudProvider>({
artifactUploads.push(
onStream({
type: 'artifact-emitted',
- payload: {artifact: serializeArtifact(artifact)},
+ payload: {
+ artifact: LambdaClientInternals.serializeArtifact(artifact),
+ },
}).catch((err) => {
artifactError ??= err as Error;
}),
diff --git a/packages/serverless/src/render-with-single-function.ts b/packages/lambda/src/functions/render-with-single-function.ts
similarity index 96%
rename from packages/serverless/src/render-with-single-function.ts
rename to packages/lambda/src/functions/render-with-single-function.ts
index d5d4b613d3..1140f79c71 100644
--- a/packages/serverless/src/render-with-single-function.ts
+++ b/packages/lambda/src/functions/render-with-single-function.ts
@@ -1,5 +1,11 @@
import fs from 'node:fs';
import {join} from 'node:path';
+import {
+ ServerlessRoutines,
+ type CloudProvider,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
import {
makeCancelSignal,
renderMedia,
@@ -10,13 +16,7 @@ import type {
ChromiumOptions,
ResolvedFrameRange,
} from '@remotion/renderer';
-import type {
- CloudProvider,
- ProviderSpecifics,
- ServerlessPayload,
- VideoConfig,
-} from '@remotion/serverless-client';
-import {ServerlessRoutines} from '@remotion/serverless-client';
+import type {VideoConfig} from 'remotion/no-react';
import type {OnArtifactFromRenderer} from './artifact-registry';
import {startCancellationPolling} from './cancellation-polling';
import type {LaunchedBrowser} from './get-browser-instance';
diff --git a/packages/serverless/src/s3-renderer-output.ts b/packages/lambda/src/functions/s3-renderer-output.ts
similarity index 91%
rename from packages/serverless/src/s3-renderer-output.ts
rename to packages/lambda/src/functions/s3-renderer-output.ts
index 2b19db3ee7..a1bdfa92ac 100644
--- a/packages/serverless/src/s3-renderer-output.ts
+++ b/packages/lambda/src/functions/s3-renderer-output.ts
@@ -1,21 +1,15 @@
import {createReadStream} from 'node:fs';
-import type {EmittedArtifact} from '@remotion/renderer';
-import type {
- CloudProvider,
- OnStream,
- ProviderSpecifics,
- S3RendererArtifactMetadata,
- S3RendererStatus,
- ServerlessPayload,
-} from '@remotion/serverless-client';
import {
- deserializeArtifact,
- rendererTransportArtifactKey,
- rendererTransportAudioKey,
- rendererTransportStatusKey,
- rendererTransportVideoKey,
+ LambdaClientInternals,
ServerlessRoutines,
-} from '@remotion/serverless-client';
+ type CloudProvider,
+ type OnStream,
+ type ProviderSpecifics,
+ type S3RendererArtifactMetadata,
+ type S3RendererStatus,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import type {EmittedArtifact} from '@remotion/renderer';
export const makeS3RendererOutput = <Provider extends CloudProvider>({
params,
@@ -45,7 +39,7 @@ export const makeS3RendererOutput = <Provider extends CloudProvider>({
}> = [];
const artifactUploads: Promise<void>[] = [];
- const statusKey = rendererTransportStatusKey({
+ const statusKey = LambdaClientInternals.rendererTransportStatusKey({
renderId: params.renderId,
chunk: params.chunk,
attempt: params.attempt,
@@ -110,8 +104,10 @@ export const makeS3RendererOutput = <Provider extends CloudProvider>({
}
if (message.type === 'artifact-emitted') {
- const artifact = deserializeArtifact(message.payload.artifact);
- const key = rendererTransportArtifactKey(
+ const artifact = LambdaClientInternals.deserializeArtifact(
+ message.payload.artifact,
+ );
+ const key = LambdaClientInternals.rendererTransportArtifactKey(
{
renderId: params.renderId,
chunk: params.chunk,
@@ -198,14 +194,14 @@ export const makeS3RendererOutput = <Provider extends CloudProvider>({
}) => {
const videoKey = isAudioOnly
? null
- : rendererTransportVideoKey({
+ : LambdaClientInternals.rendererTransportVideoKey({
renderId: params.renderId,
chunk: params.chunk,
attempt: params.attempt,
});
const audioKey =
audioOutputLocation || isAudioOnly
- ? rendererTransportAudioKey({
+ ? LambdaClientInternals.rendererTransportAudioKey({
renderId: params.renderId,
chunk: params.chunk,
attempt: params.attempt,
diff --git a/packages/serverless/src/stream-renderer.ts b/packages/lambda/src/functions/stream-renderer.ts
similarity index 97%
rename from packages/serverless/src/stream-renderer.ts
rename to packages/lambda/src/functions/stream-renderer.ts
index 48730f341e..24ac9d40fb 100644
--- a/packages/serverless/src/stream-renderer.ts
+++ b/packages/lambda/src/functions/stream-renderer.ts
@@ -1,22 +1,17 @@
import {createWriteStream, writeFileSync} from 'fs';
import {pipeline} from 'node:stream/promises';
import {join} from 'path';
-import type {EmittedArtifact, LogLevel} from '@remotion/renderer';
-import {RenderInternals} from '@remotion/renderer';
-import type {
- CloudProvider,
- GetBinaryPayloadSink,
- OnMessage,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
import {
- deserializeArtifact,
- parseS3RendererStatus,
- rendererTransportStatusKey,
+ LambdaClientInternals,
ServerlessRoutines,
- streamToString,
-} from '@remotion/serverless-client';
+ type CloudProvider,
+ type GetBinaryPayloadSink,
+ type OnMessage,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import type {EmittedArtifact, LogLevel} from '@remotion/renderer';
+import {RenderInternals} from '@remotion/renderer';
import type {OnArtifactFromRenderer} from './artifact-registry';
import type {OverallProgressHelper} from './overall-render-progress';
import type {InsideFunctionSpecifics} from './provider-implementation';
@@ -166,7 +161,9 @@ const streamRenderer = <Provider extends CloudProvider>({
}
if (message.type === 'artifact-emitted') {
- const artifact = deserializeArtifact(message.payload.artifact);
+ const artifact = LambdaClientInternals.deserializeArtifact(
+ message.payload.artifact,
+ );
RenderInternals.Log.info(
{indent: false, logLevel},
`Received artifact on frame ${message.payload.artifact.frame}:`,
@@ -356,7 +353,7 @@ const s3Renderer = async <Provider extends CloudProvider>({
};
}
- const statusKey = rendererTransportStatusKey({
+ const statusKey = LambdaClientInternals.rendererTransportStatusKey({
renderId: payload.renderId,
chunk: payload.chunk,
attempt: payload.attempt,
@@ -377,8 +374,10 @@ const s3Renderer = async <Provider extends CloudProvider>({
forcePathStyle: payload.forcePathStyle,
requestHandler,
});
- const status = parseS3RendererStatus({
- value: JSON.parse(await streamToString(statusStream)),
+ const status = LambdaClientInternals.parseS3RendererStatus({
+ value: JSON.parse(
+ await LambdaClientInternals.streamToString(statusStream),
+ ),
expectedChunk: payload.chunk,
expectedAttempt: payload.attempt,
});
diff --git a/packages/serverless/src/streaming/response-stream.ts b/packages/lambda/src/functions/streaming/response-stream.ts
similarity index 100%
rename from packages/serverless/src/streaming/response-stream.ts
rename to packages/lambda/src/functions/streaming/response-stream.ts
diff --git a/packages/serverless/src/streaming/stream-writer.ts b/packages/lambda/src/functions/streaming/stream-writer.ts
similarity index 100%
rename from packages/serverless/src/streaming/stream-writer.ts
rename to packages/lambda/src/functions/streaming/stream-writer.ts
diff --git a/packages/serverless/src/validate-composition.ts b/packages/lambda/src/functions/validate-composition.ts
similarity index 86%
rename from packages/serverless/src/validate-composition.ts
rename to packages/lambda/src/functions/validate-composition.ts
index 5d0334efdb..489abd7cba 100644
--- a/packages/serverless/src/validate-composition.ts
+++ b/packages/lambda/src/functions/validate-composition.ts
@@ -1,3 +1,8 @@
+import type {
+ Await,
+ CloudProvider,
+ ProviderSpecifics,
+} from '@remotion/lambda-client';
import type {
ChromiumOptions,
LogLevel,
@@ -6,17 +11,8 @@ import type {
RemotionServer,
} from '@remotion/renderer';
import {RenderInternals} from '@remotion/renderer';
-import type {
- Await,
- CloudProvider,
- ProviderSpecifics,
- VideoConfig,
-} from '@remotion/serverless-client';
-import {
- validateDimension,
- validateDurationInFrames,
- validateFps,
-} from './validate';
+import type {VideoConfig} from 'remotion/no-react';
+import {NoReactInternals} from 'remotion/no-react';
type ValidateCompositionOptions<Provider extends CloudProvider> = {
serveUrl: string;
@@ -96,13 +92,13 @@ export const validateComposition = async <Provider extends CloudProvider>({
const reason = `of the "<Composition />" component with the id "${composition}"`;
- validateDurationInFrames(comp.durationInFrames, {
+ NoReactInternals.validateDurationInFrames(comp.durationInFrames, {
component: reason,
allowFloats: false,
});
- validateFps(comp.fps, reason, false);
- validateDimension(comp.height, 'height', reason);
- validateDimension(comp.width, 'width', reason);
+ NoReactInternals.validateFps(comp.fps, reason, false);
+ NoReactInternals.validateDimension(comp.height, 'height', reason);
+ NoReactInternals.validateDimension(comp.width, 'width', reason);
return videoConfig;
};
diff --git a/packages/lambda/src/index.ts b/packages/lambda/src/index.ts
index 6b1ccb026a..3fd4ab9a22 100644
--- a/packages/lambda/src/index.ts
+++ b/packages/lambda/src/index.ts
@@ -1,43 +1,41 @@
-import type {
- AwsPartition,
- AwsRegion,
- CustomCredentials,
- DeleteFunctionInput,
- DeleteRenderInput,
- EnhancedErrorInfo,
- EstimatePriceInput,
- GetAwsClientInput,
- GetAwsClientOutput,
- GetCompositionsOnLambdaInput,
- GetCompositionsOnLambdaOutput,
- GetFunctionsInput,
- GetOrCreateBucketInput,
- GetOrCreateBucketOutput,
- GetRenderProgressInput,
- GetSitesInput,
- GetSitesOutput,
- RenderMediaOnLambdaInput,
- RenderMediaOnLambdaOutput,
- RenderProgress,
- RenderStillOnLambdaInput,
- RenderStillOnLambdaOutput,
-} from '@remotion/lambda-client';
import {
deleteFunction,
deleteRender,
+ estimatePrice,
+ getAwsClient,
+ getCompositionsOnLambda,
+ getFunctions,
getRenderProgress as deprecatedGetRenderProgress,
getSites as deprecatedGetSites,
presignUrl as deprecatedPresignUrl,
renderMediaOnLambda as deprecatedRenderMediaOnLambda,
renderStillOnLambda as deprecatedRenderStillOnLambda,
- estimatePrice,
- getAwsClient,
- getCompositionsOnLambda,
- getFunctions,
renderVideoOnLambda,
validateWebhookSignature,
+ type AwsPartition,
+ type AwsRegion,
+ type CustomCredentials,
+ type DeleteFunctionInput,
+ type DeleteRenderInput,
+ type EnhancedErrorInfo,
+ type EstimatePriceInput,
+ type FunctionInfo,
+ type GetAwsClientInput,
+ type GetAwsClientOutput,
+ type GetCompositionsOnLambdaInput,
+ type GetCompositionsOnLambdaOutput,
+ type GetFunctionsInput,
+ type GetOrCreateBucketInput,
+ type GetOrCreateBucketOutput,
+ type GetRenderProgressInput,
+ type GetSitesInput,
+ type GetSitesOutput,
+ type RenderMediaOnLambdaInput,
+ type RenderMediaOnLambdaOutput,
+ type RenderProgress,
+ type RenderStillOnLambdaInput,
+ type RenderStillOnLambdaOutput,
} from '@remotion/lambda-client';
-import type {FunctionInfo} from '@remotion/serverless';
import {NoReactInternals} from 'remotion/no-react';
import type {DeleteSiteInput, DeleteSiteOutput} from './api/delete-site';
import {deleteSite} from './api/delete-site';
diff --git a/packages/lambda/src/internals.ts b/packages/lambda/src/internals.ts
index df569da341..e64ae4b30a 100644
--- a/packages/lambda/src/internals.ts
+++ b/packages/lambda/src/internals.ts
@@ -1,19 +1,17 @@
import type {
AwsProvider,
AwsRegion,
+ ProviderSpecifics,
RuntimePreference,
} from '@remotion/lambda-client';
import type {LogLevel} from '@remotion/renderer';
-import type {
- FullClientSpecifics,
- ProviderSpecifics,
-} from '@remotion/serverless';
import type {
DeploySiteOutput,
InternalDeploySiteInput,
} from './api/deploy-site';
import {internalDeploySite} from './api/deploy-site';
import {executeCommand} from './cli/index';
+import type {FullClientSpecifics} from './functions/provider-implementation';
import {getLayers} from './shared/get-layers';
import type {AwsLayer} from './shared/hosted-layers';
@@ -36,4 +34,4 @@ export const LambdaInternals: {
getLayers,
};
-export type {OverallRenderProgress as _InternalOverallRenderProgress} from '@remotion/serverless';
+export type {OverallRenderProgress as _InternalOverallRenderProgress} from '@remotion/lambda-client';
diff --git a/packages/lambda/src/shared/deploy-site-with-bundle.ts b/packages/lambda/src/shared/deploy-site-with-bundle.ts
index 74a33ffd03..f3d6bd990c 100644
--- a/packages/lambda/src/shared/deploy-site-with-bundle.ts
+++ b/packages/lambda/src/shared/deploy-site-with-bundle.ts
@@ -1,15 +1,18 @@
-import type {AwsRegion, RequestHandler} from '@remotion/lambda-client';
-import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type AwsRegion,
+ type ProviderSpecifics,
+ type RequestHandler,
+} from '@remotion/lambda-client';
import {
getSitesKey,
REMOTION_BUCKET_PREFIX,
} from '@remotion/lambda-client/constants';
import type {
FullClientSpecifics,
- ProviderSpecifics,
UploadDirProgress,
-} from '@remotion/serverless';
-import {validateBucketName, validatePrivacy} from '@remotion/serverless';
+} from '../functions/provider-implementation';
import {getS3DiffOperations} from './get-s3-operations';
import {validateSiteName} from './validate-site-name';
import {waitForPromisesToFinish} from './wait-for-promises-to-finish';
@@ -62,7 +65,7 @@ export const deploySiteWithBundle: (
getBundle,
}) => {
LambdaClientInternals.validateAwsRegion(region);
- validateBucketName({
+ LambdaClientInternals.validateBucketName({
bucketName,
bucketNamePrefix: REMOTION_BUCKET_PREFIX,
options: {
@@ -71,7 +74,7 @@ export const deploySiteWithBundle: (
});
validateSiteName(siteName);
- validatePrivacy(privacy, false);
+ LambdaClientInternals.validatePrivacy(privacy, false);
const accountId = await providerSpecifics.getAccountId({region});
diff --git a/packages/lambda/src/shared/get-layers.ts b/packages/lambda/src/shared/get-layers.ts
index 75470a383e..ca55ea73f3 100644
--- a/packages/lambda/src/shared/get-layers.ts
+++ b/packages/lambda/src/shared/get-layers.ts
@@ -1,5 +1,8 @@
-import type {AwsRegion, RuntimePreference} from '@remotion/lambda-client';
-import {LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ type AwsRegion,
+ type RuntimePreference,
+} from '@remotion/lambda-client';
import type {AwsLayer, HostedLayerRegion} from './hosted-layers';
import {hostedLayers} from './hosted-layers';
diff --git a/packages/lambda/src/shared/get-s3-operations.ts b/packages/lambda/src/shared/get-s3-operations.ts
index ccd2bfd8dd..c221f927e5 100644
--- a/packages/lambda/src/shared/get-s3-operations.ts
+++ b/packages/lambda/src/shared/get-s3-operations.ts
@@ -1,6 +1,6 @@
import type {_Object} from '@aws-sdk/client-s3';
import type {AwsProvider} from '@remotion/lambda-client';
-import type {FullClientSpecifics} from '@remotion/serverless';
+import type {FullClientSpecifics} from '../functions/provider-implementation';
export const getS3DiffOperations = async ({
objects,
diff --git a/packages/lambda/src/shared/read-dir.ts b/packages/lambda/src/shared/read-dir.ts
index 2518f0230a..3c09b7bb75 100644
--- a/packages/lambda/src/shared/read-dir.ts
+++ b/packages/lambda/src/shared/read-dir.ts
@@ -1,6 +1,6 @@
import * as fs from 'node:fs';
import * as path from 'node:path';
-import type {ReadDir} from '@remotion/serverless';
+import type {ReadDir} from '../functions/provider-implementation';
import {getEtagOfFile} from './get-etag';
// Function to recursively read a directory and return a list of files
diff --git a/packages/lambda/src/test/integration/cli-render-logs.test.ts b/packages/lambda/src/test/integration/cli-render-logs.test.ts
index ea11aa525f..eda6f1d985 100644
--- a/packages/lambda/src/test/integration/cli-render-logs.test.ts
+++ b/packages/lambda/src/test/integration/cli-render-logs.test.ts
@@ -1,8 +1,10 @@
import {afterEach, beforeEach, expect, test} from 'bun:test';
// eslint-disable-next-line no-restricted-imports
import {CliInternals} from '@remotion/cli';
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import {ServerlessRoutines} from '@remotion/serverless';
+import {
+ LambdaClientInternals,
+ ServerlessRoutines,
+} from '@remotion/lambda-client';
import {parsedLambdaCli} from '../../cli/args';
import {renderCommand} from '../../cli/commands/render/render';
import {mockImplementation} from '../mocks/mock-implementation';
diff --git a/packages/lambda/src/test/integration/delete-site.test.ts b/packages/lambda/src/test/integration/delete-site.test.ts
index ff9e1a9fdb..40820e3965 100644
--- a/packages/lambda/src/test/integration/delete-site.test.ts
+++ b/packages/lambda/src/test/integration/delete-site.test.ts
@@ -1,12 +1,12 @@
import {expect, test} from 'bun:test';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
+import {LambdaClientInternals} from '@remotion/lambda-client';
import {internalDeleteSite} from '../../api/delete-site';
import {internalDeploySite} from '../../api/deploy-site';
import {mockFullClientSpecifics} from '../mock-implementation';
import {mockImplementation} from '../mocks/mock-implementation';
test('Return 0 total size if site did not exist', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'eu-west-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -29,7 +29,7 @@ test('Return 0 total size if site did not exist', async () => {
).toEqual({totalSizeInBytes: 0});
});
test('Return more than 0 total size if site did not exist', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'eu-west-1',
providerSpecifics: mockImplementation,
customCredentials: null,
diff --git a/packages/lambda/src/test/integration/deploy-site-from-bundle.test.ts b/packages/lambda/src/test/integration/deploy-site-from-bundle.test.ts
index 00583b9ece..1f741e5ae4 100644
--- a/packages/lambda/src/test/integration/deploy-site-from-bundle.test.ts
+++ b/packages/lambda/src/test/integration/deploy-site-from-bundle.test.ts
@@ -10,7 +10,7 @@ import {
} from 'node:fs';
import os from 'node:os';
import path from 'node:path';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
+import {LambdaClientInternals} from '@remotion/lambda-client';
import {VERSION} from 'remotion/version';
import {internalDeploySiteFromBundle} from '../../api/deploy-site-from-bundle';
import {mockFullClientSpecifics} from '../mock-implementation';
@@ -45,7 +45,7 @@ const makeBundle = (files: Record<string, string>) => {
};
const makeBucket = async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
diff --git a/packages/lambda/src/test/integration/deploy-site.test.ts b/packages/lambda/src/test/integration/deploy-site.test.ts
index 5b8c5971a1..46583190a2 100644
--- a/packages/lambda/src/test/integration/deploy-site.test.ts
+++ b/packages/lambda/src/test/integration/deploy-site.test.ts
@@ -4,7 +4,6 @@ import os from 'node:os';
import path from 'node:path';
import type {BundleOptions} from '@remotion/bundler';
import {LambdaClientInternals} from '@remotion/lambda-client';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
import {internalDeleteSite} from '../../api/delete-site';
import {internalDeploySite} from '../../api/deploy-site';
import {mockFullClientSpecifics} from '../mock-implementation';
@@ -24,7 +23,7 @@ const makeGeneratedBundle = () => {
};
const makeBucket = async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -164,7 +163,7 @@ test("Should throw if bucket doesn't exist", () => {
});
test('Should apply name if given', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -204,7 +203,7 @@ test('Should apply name if given', async () => {
});
test('Should overwrite site if given siteName is already taken', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -245,7 +244,7 @@ test('Should overwrite site if given siteName is already taken', async () => {
});
test('Should delete the previous site if deploying the new one', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -314,7 +313,7 @@ test('Should delete the previous site if deploying the new one', async () => {
});
test('Should keep the previous site if deploying the new one with different ID', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -406,7 +405,7 @@ test('Should keep the previous site if deploying the new one with different ID',
});
test('Should not delete site with same prefix', async () => {
- const {bucketName} = await internalGetOrCreateBucket({
+ const {bucketName} = await LambdaClientInternals.internalGetOrCreateBucket({
region: 'ap-northeast-1',
providerSpecifics: mockImplementation,
customCredentials: null,
diff --git a/packages/lambda/src/test/integration/get-sites.test.ts b/packages/lambda/src/test/integration/get-sites.test.ts
index 6e7de6a444..0d784e7266 100644
--- a/packages/lambda/src/test/integration/get-sites.test.ts
+++ b/packages/lambda/src/test/integration/get-sites.test.ts
@@ -1,6 +1,5 @@
import {expect, test} from 'bun:test';
import {LambdaClientInternals} from '@remotion/lambda-client';
-import {internalGetOrCreateBucket} from '@remotion/serverless';
import {VERSION} from 'remotion/version';
import {internalDeploySite} from '../../api/deploy-site';
import {mockFullClientSpecifics} from '../mock-implementation';
@@ -23,7 +22,7 @@ test('Should have no buckets at first', async () => {
test('Should have a site after deploying', async () => {
resetMockStore();
- await internalGetOrCreateBucket({
+ await LambdaClientInternals.internalGetOrCreateBucket({
region: 'eu-central-1',
providerSpecifics: mockImplementation,
customCredentials: null,
@@ -93,7 +92,7 @@ test('Should have a site after deploying', async () => {
test('Should filter sites by compatibleOnly', async () => {
resetMockStore();
- await internalGetOrCreateBucket({
+ await LambdaClientInternals.internalGetOrCreateBucket({
region: 'eu-central-1',
providerSpecifics: mockImplementation,
customCredentials: null,
diff --git a/packages/lambda/src/test/integration/handlers.test.ts b/packages/lambda/src/test/integration/handlers.test.ts
index e1bd731e50..17228cac6d 100644
--- a/packages/lambda/src/test/integration/handlers.test.ts
+++ b/packages/lambda/src/test/integration/handlers.test.ts
@@ -1,5 +1,5 @@
import {expect, test} from 'bun:test';
-import {ServerlessRoutines} from '@remotion/serverless';
+import {ServerlessRoutines} from '@remotion/lambda-client';
import {VERSION} from 'remotion/version';
import {mockImplementation} from '../mocks/mock-implementation';
diff --git a/packages/lambda/src/test/integration/renders/muted-render.test.ts b/packages/lambda/src/test/integration/renders/muted-render.test.ts
index 9404df708a..47b51ee628 100644
--- a/packages/lambda/src/test/integration/renders/muted-render.test.ts
+++ b/packages/lambda/src/test/integration/renders/muted-render.test.ts
@@ -2,9 +2,11 @@ import {expect, test} from 'bun:test';
import {createWriteStream, unlinkSync} from 'node:fs';
import {tmpdir} from 'node:os';
import path from 'path';
-import {LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ ServerlessRoutines,
+} from '@remotion/lambda-client';
import {RenderInternals, getVideoMetadata} from '@remotion/renderer';
-import {rendersPrefix, ServerlessRoutines} from '@remotion/serverless';
import {makeProgressString} from '../../../cli/commands/render/progress';
import {mockImplementation} from '../../mocks/mock-implementation';
import {getMockInvocationTypesForRender} from '../../mocks/mock-invocations';
@@ -72,7 +74,7 @@ test('Should directly render final media with one Lambda', async () => {
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
@@ -91,7 +93,7 @@ test('Should directly render final media with one Lambda', async () => {
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
diff --git a/packages/lambda/src/test/integration/renders/old-version.test.ts b/packages/lambda/src/test/integration/renders/old-version.test.ts
index dac41aa222..dc977e5ac9 100644
--- a/packages/lambda/src/test/integration/renders/old-version.test.ts
+++ b/packages/lambda/src/test/integration/renders/old-version.test.ts
@@ -1,6 +1,6 @@
import {expect, test} from 'bun:test';
import path from 'path';
-import {ServerlessRoutines} from '@remotion/serverless';
+import {ServerlessRoutines} from '@remotion/lambda-client';
import {mockImplementation} from '../../mocks/mock-implementation';
test(
diff --git a/packages/lambda/src/test/integration/renders/regular-audio.test.ts b/packages/lambda/src/test/integration/renders/regular-audio.test.ts
index e1e30c993c..e4e53c85d8 100644
--- a/packages/lambda/src/test/integration/renders/regular-audio.test.ts
+++ b/packages/lambda/src/test/integration/renders/regular-audio.test.ts
@@ -2,7 +2,6 @@ import {expect, test} from 'bun:test';
import {createWriteStream, unlinkSync} from 'fs';
import path from 'path';
import {LambdaClientInternals} from '@remotion/lambda-client';
-import {rendersPrefix} from '@remotion/serverless';
import {mockImplementation} from '../../mocks/mock-implementation';
import {Wavedraw} from '../draw-wav';
import {simulateLambdaRender} from '../simulate-lambda-render';
@@ -58,7 +57,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
@@ -77,7 +76,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
diff --git a/packages/lambda/src/test/integration/renders/seamless-audio.test.ts b/packages/lambda/src/test/integration/renders/seamless-audio.test.ts
index 0669a6f71d..55e734bc7c 100644
--- a/packages/lambda/src/test/integration/renders/seamless-audio.test.ts
+++ b/packages/lambda/src/test/integration/renders/seamless-audio.test.ts
@@ -2,7 +2,6 @@ import {expect, test} from 'bun:test';
import {existsSync, unlinkSync} from 'fs';
import path from 'path';
import {LambdaClientInternals} from '@remotion/lambda-client';
-import {rendersPrefix} from '@remotion/serverless';
import {$} from 'bun';
import {mockImplementation} from '../../mocks/mock-implementation';
import {streamToUint8Array} from '../../mocks/mock-store';
@@ -64,7 +63,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
@@ -83,7 +82,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
diff --git a/packages/lambda/src/test/integration/renders/slow-seamless-audio.test.ts b/packages/lambda/src/test/integration/renders/slow-seamless-audio.test.ts
index dbe639a25b..3163f1176a 100644
--- a/packages/lambda/src/test/integration/renders/slow-seamless-audio.test.ts
+++ b/packages/lambda/src/test/integration/renders/slow-seamless-audio.test.ts
@@ -2,7 +2,6 @@ import {expect, test} from 'bun:test';
import {existsSync, unlinkSync} from 'fs';
import path from 'path';
import {LambdaClientInternals} from '@remotion/lambda-client';
-import {rendersPrefix} from '@remotion/serverless';
import {$} from 'bun';
import {mockImplementation} from '../../mocks/mock-implementation';
import {streamToUint8Array} from '../../mocks/mock-store';
@@ -63,7 +62,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
@@ -82,7 +81,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
diff --git a/packages/lambda/src/test/integration/renders/transparent-webm.test.ts b/packages/lambda/src/test/integration/renders/transparent-webm.test.ts
index 97f05ea551..ff8255d8e3 100644
--- a/packages/lambda/src/test/integration/renders/transparent-webm.test.ts
+++ b/packages/lambda/src/test/integration/renders/transparent-webm.test.ts
@@ -4,7 +4,6 @@ import os from 'node:os';
import path from 'node:path';
import {LambdaClientInternals} from '@remotion/lambda-client';
import {ensureBrowser, RenderInternals} from '@remotion/renderer';
-import {rendersPrefix} from '@remotion/serverless';
import {mockImplementation} from '../../mocks/mock-implementation';
import {simulateLambdaRender} from '../simulate-lambda-render';
@@ -55,7 +54,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
@@ -74,7 +73,7 @@ test(
bucketName: progress.outBucket as string,
region: 'eu-central-1',
expectedBucketOwner: 'abc',
- prefix: rendersPrefix(renderId),
+ prefix: LambdaClientInternals.rendersPrefix(renderId),
forcePathStyle: false,
requestHandler: null,
});
diff --git a/packages/lambda/src/test/integration/renders/write-only-bucket.test.ts b/packages/lambda/src/test/integration/renders/write-only-bucket.test.ts
index 696d718b74..77fc1f4d9e 100644
--- a/packages/lambda/src/test/integration/renders/write-only-bucket.test.ts
+++ b/packages/lambda/src/test/integration/renders/write-only-bucket.test.ts
@@ -3,12 +3,12 @@ import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
import {bundle} from '@remotion/bundler';
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import {RenderInternals} from '@remotion/renderer';
import {
+ LambdaClientInternals,
OutputFileAccessDeniedError,
ServerlessRoutines,
-} from '@remotion/serverless';
+} from '@remotion/lambda-client';
+import {RenderInternals} from '@remotion/renderer';
import {mockImplementation} from '../../mocks/mock-implementation';
import {readMockS3File} from '../../mocks/mock-store';
import {waitUntilDone} from '../wait-until-done';
diff --git a/packages/lambda/src/test/integration/simulate-lambda-render.ts b/packages/lambda/src/test/integration/simulate-lambda-render.ts
index a261347007..8f78f72e0d 100644
--- a/packages/lambda/src/test/integration/simulate-lambda-render.ts
+++ b/packages/lambda/src/test/integration/simulate-lambda-render.ts
@@ -1,10 +1,10 @@
import path from 'path';
import {
LambdaClientInternals,
+ ServerlessRoutines,
type RenderMediaOnLambdaInput,
} from '@remotion/lambda-client';
import {RenderInternals} from '@remotion/renderer';
-import {ServerlessRoutines} from '@remotion/serverless';
import {mockImplementation} from '../mocks/mock-implementation';
import {waitUntilDone} from './wait-until-done';
diff --git a/packages/lambda/src/test/integration/wait-until-done.ts b/packages/lambda/src/test/integration/wait-until-done.ts
index b98ea91993..6bbf90a8c2 100644
--- a/packages/lambda/src/test/integration/wait-until-done.ts
+++ b/packages/lambda/src/test/integration/wait-until-done.ts
@@ -1,4 +1,4 @@
-import {ServerlessRoutines} from '@remotion/serverless';
+import {ServerlessRoutines} from '@remotion/lambda-client';
import {VERSION} from 'remotion/version';
import {mockImplementation} from '../mocks/mock-implementation';
diff --git a/packages/lambda/src/test/integration/webhooks.test.ts b/packages/lambda/src/test/integration/webhooks.test.ts
index 671f456e4b..8c7ecf2ee9 100644
--- a/packages/lambda/src/test/integration/webhooks.test.ts
+++ b/packages/lambda/src/test/integration/webhooks.test.ts
@@ -1,7 +1,7 @@
import {beforeAll, expect, test} from 'bun:test';
import path from 'path';
+import {ServerlessRoutines} from '@remotion/lambda-client';
import {RenderInternals, ensureBrowser} from '@remotion/renderer';
-import {ServerlessRoutines} from '@remotion/serverless';
import {VERSION} from 'remotion/version';
import {getWebhookCalls, resetWebhookCalls} from '../mock-implementation';
import {mockImplementation} from '../mocks/mock-implementation';
diff --git a/packages/lambda/src/test/mock-implementation.ts b/packages/lambda/src/test/mock-implementation.ts
index dede673b2d..742ed663f9 100644
--- a/packages/lambda/src/test/mock-implementation.ts
+++ b/packages/lambda/src/test/mock-implementation.ts
@@ -1,17 +1,17 @@
-import type {AwsProvider} from '@remotion/lambda-client';
import {
LambdaClientInternals,
speculateFunctionName,
+ type AwsProvider,
} from '@remotion/lambda-client';
import {openBrowser} from '@remotion/renderer';
+import {Log} from '../cli/log';
+import {serverAwsImplementation} from '../functions/aws-server-implementation';
import type {
FullClientSpecifics,
GetBrowserInstance,
InsideFunctionSpecifics,
InvokeWebhookParams,
-} from '@remotion/serverless';
-import {Log} from '../cli/log';
-import {serverAwsImplementation} from '../functions/aws-server-implementation';
+} from '../functions/provider-implementation';
import {mockBundleSite} from './mocks/mock-bundle-site';
import {mockCreateFunction} from './mocks/mock-create-function';
import {mockReadDirectory} from './mocks/mock-read-dir';
diff --git a/packages/lambda/src/test/mocks/aws-clients.ts b/packages/lambda/src/test/mocks/aws-clients.ts
index 9f7bc3d32d..ac915630fa 100644
--- a/packages/lambda/src/test/mocks/aws-clients.ts
+++ b/packages/lambda/src/test/mocks/aws-clients.ts
@@ -1,27 +1,23 @@
-import {LambdaClientInternals, type AwsProvider} from '@remotion/lambda-client';
-import type {
- CallFunctionAsync,
- CallFunctionOptions,
- CallFunctionStreaming,
- CallFunctionSync,
- GetBinaryPayloadSink,
- MessageTypeId,
- OnMessage,
- OrError,
- ServerlessReturnValues,
- ServerlessRoutines,
- StreamingMessage,
-} from '@remotion/serverless';
import {
- binaryPayloadSinkForStreamer,
- formatMap,
- innerHandler,
- messageTypeIdToMessageType,
- ResponseStream,
- streamWriter,
-} from '@remotion/serverless';
+ LambdaClientInternals,
+ type AwsProvider,
+ type CallFunctionAsync,
+ type CallFunctionOptions,
+ type CallFunctionStreaming,
+ type CallFunctionSync,
+ type GetBinaryPayloadSink,
+ type MessageTypeId,
+ type OnMessage,
+ type OrError,
+ type ServerlessReturnValues,
+ type ServerlessRoutines,
+ type StreamingMessage,
+} from '@remotion/lambda-client';
import {makeStreamer} from '@remotion/streaming';
import {Log} from '../../cli/log';
+import {innerHandler} from '../../functions/inner-routine';
+import {ResponseStream} from '../../functions/streaming/response-stream';
+import {streamWriter} from '../../functions/streaming/stream-writer';
import {mockServerImplementation} from '../mock-implementation';
import {mockImplementation} from './mock-implementation';
import {trackMockInvocation} from './mock-invocations';
@@ -40,11 +36,11 @@ export const getMockCallFunctionStreaming: CallFunctionStreaming<
const {onData, clear} = makeStreamer(
(status, messageTypeId, data) => {
- const messageType = messageTypeIdToMessageType(
+ const messageType = LambdaClientInternals.messageTypeIdToMessageType(
messageTypeId as MessageTypeId,
);
const innerPayload =
- formatMap[messageType] === 'json'
+ LambdaClientInternals.formatMap[messageType] === 'json'
? LambdaClientInternals.parseJsonOrThrowSource(data, messageType)
: data;
@@ -59,7 +55,9 @@ export const getMockCallFunctionStreaming: CallFunctionStreaming<
params.receivedStreamingPayload(message);
},
params.getBinaryPayloadSink
- ? binaryPayloadSinkForStreamer(params.getBinaryPayloadSink)
+ ? LambdaClientInternals.binaryPayloadSinkForStreamer(
+ params.getBinaryPayloadSink,
+ )
: null,
);
diff --git a/packages/lambda/src/test/mocks/mock-create-function.ts b/packages/lambda/src/test/mocks/mock-create-function.ts
index d763b17d0e..70d465d9f4 100644
--- a/packages/lambda/src/test/mocks/mock-create-function.ts
+++ b/packages/lambda/src/test/mocks/mock-create-function.ts
@@ -1,6 +1,6 @@
import type {AwsProvider} from '@remotion/lambda-client';
-import type {CreateFunction} from '@remotion/serverless';
import {VERSION} from 'remotion/version';
+import type {CreateFunction} from '../../functions/provider-implementation';
import {addFunction} from './mock-functions';
type MockCreateFunctionCall = {
diff --git a/packages/lambda/src/test/mocks/mock-functions.ts b/packages/lambda/src/test/mocks/mock-functions.ts
index b6bc9b4707..f88a10aa85 100644
--- a/packages/lambda/src/test/mocks/mock-functions.ts
+++ b/packages/lambda/src/test/mocks/mock-functions.ts
@@ -1,9 +1,10 @@
-import type {AwsProvider, AwsRegion} from '@remotion/lambda-client';
import type {
+ AwsProvider,
+ AwsRegion,
DeleteFunction,
FunctionInfo,
GetFunctions,
-} from '@remotion/serverless';
+} from '@remotion/lambda-client';
import {VERSION} from 'remotion/version';
export let mockFunctionsStore: (FunctionInfo & {
diff --git a/packages/lambda/src/test/mocks/mock-implementation.ts b/packages/lambda/src/test/mocks/mock-implementation.ts
index ab6a9cb729..13c7e5b7da 100644
--- a/packages/lambda/src/test/mocks/mock-implementation.ts
+++ b/packages/lambda/src/test/mocks/mock-implementation.ts
@@ -1,10 +1,13 @@
import {createReadStream, writeFileSync} from 'fs';
import path from 'path';
-import type {AwsProvider} from '@remotion/lambda-client';
-import {estimatePrice, LambdaClientInternals} from '@remotion/lambda-client';
+import {
+ LambdaClientInternals,
+ estimatePrice,
+ type AwsProvider,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
import {REMOTION_BUCKET_PREFIX} from '@remotion/lambda-client/constants';
import {RenderInternals} from '@remotion/renderer';
-import type {ProviderSpecifics} from '@remotion/serverless';
import {
getMockCallFunctionAsync,
getMockCallFunctionStreaming,
diff --git a/packages/lambda/src/test/mocks/mock-invocations.ts b/packages/lambda/src/test/mocks/mock-invocations.ts
index e73d5feefe..7c35d09def 100644
--- a/packages/lambda/src/test/mocks/mock-invocations.ts
+++ b/packages/lambda/src/test/mocks/mock-invocations.ts
@@ -1,4 +1,4 @@
-import type {ServerlessRoutines} from '@remotion/serverless';
+import type {ServerlessRoutines} from '@remotion/lambda-client';
const invocationTypesByRender = new Map<string, ServerlessRoutines[]>();
diff --git a/packages/lambda/src/test/mocks/mock-store.ts b/packages/lambda/src/test/mocks/mock-store.ts
index 2d6951dd2e..fdc0bee4f2 100644
--- a/packages/lambda/src/test/mocks/mock-store.ts
+++ b/packages/lambda/src/test/mocks/mock-store.ts
@@ -1,10 +1,11 @@
import {Readable} from 'stream';
-import type {AwsProvider, AwsRegion} from '@remotion/lambda-client';
import type {
+ AwsProvider,
+ AwsRegion,
BucketWithLocation,
CloudProvider,
Privacy,
-} from '@remotion/serverless';
+} from '@remotion/lambda-client';
export const mockBucketStore: BucketWithLocation<AwsProvider>[] = [];
diff --git a/packages/serverless/src/test/artifact-registry.test.ts b/packages/lambda/src/test/unit/artifact-registry.test.ts
similarity index 97%
rename from packages/serverless/src/test/artifact-registry.test.ts
rename to packages/lambda/src/test/unit/artifact-registry.test.ts
index b5172caefa..2ea47f1851 100644
--- a/packages/serverless/src/test/artifact-registry.test.ts
+++ b/packages/lambda/src/test/unit/artifact-registry.test.ts
@@ -2,7 +2,7 @@ import {expect, test} from 'bun:test';
import {
type ArtifactRegistrationResult,
makeArtifactRegistry,
-} from '../artifact-registry';
+} from '../../functions/artifact-registry';
test('classifies new artifacts, retry replays, and filename conflicts', () => {
const cases: Array<{
diff --git a/packages/lambda/src/test/unit/best-bucketnames.test.ts b/packages/lambda/src/test/unit/best-bucketnames.test.ts
index 1acfa6fdd2..b9675cf6d4 100644
--- a/packages/lambda/src/test/unit/best-bucketnames.test.ts
+++ b/packages/lambda/src/test/unit/best-bucketnames.test.ts
@@ -1,10 +1,12 @@
import {expect, test} from 'bun:test';
import {LambdaClientInternals} from '@remotion/lambda-client';
-import {makeBucketName} from '@remotion/serverless';
import {mockImplementation} from '../mocks/mock-implementation';
test('Generate and parse bucket names correctly', () => {
- const name = makeBucketName('us-east-1', mockImplementation);
+ const name = LambdaClientInternals.makeBucketName(
+ 'us-east-1',
+ mockImplementation,
+ );
expect(name).toBe('remotionlambda-useast1-abcdef');
const parsed = LambdaClientInternals.parseBucketName(name);
diff --git a/packages/serverless/src/test/cancellation-polling.test.ts b/packages/lambda/src/test/unit/cancellation-polling.test.ts
similarity index 78%
rename from packages/serverless/src/test/cancellation-polling.test.ts
rename to packages/lambda/src/test/unit/cancellation-polling.test.ts
index 59d80f695e..effc7aca6e 100644
--- a/packages/serverless/src/test/cancellation-polling.test.ts
+++ b/packages/lambda/src/test/unit/cancellation-polling.test.ts
@@ -1,10 +1,10 @@
import {expect, test} from 'bun:test';
-import type {
- CloudProvider,
- ProviderSpecifics,
-} from '@remotion/serverless-client';
-import {cancellationKey} from '@remotion/serverless-client';
-import {startCancellationPolling} from '../cancellation-polling';
+import {
+ LambdaClientInternals,
+ type CloudProvider,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
+import {startCancellationPolling} from '../../functions/cancellation-polling';
type MockProvider = CloudProvider<
'eu-central-1',
@@ -24,7 +24,7 @@ test('polls until the cancellation signal exists', async () => {
region: 'eu-central-1',
providerSpecifics: {
headFile: (({key}) => {
- expect(key).toBe(cancellationKey('render-id'));
+ expect(key).toBe(LambdaClientInternals.cancellationKey('render-id'));
checks++;
if (checks === 1) {
const error = new Error('Missing');
diff --git a/packages/lambda/src/test/unit/get-etag.test.ts b/packages/lambda/src/test/unit/get-etag.test.ts
index e339ace425..c8310756e9 100644
--- a/packages/lambda/src/test/unit/get-etag.test.ts
+++ b/packages/lambda/src/test/unit/get-etag.test.ts
@@ -4,7 +4,7 @@ import {tmpdir} from 'node:os';
import path from 'node:path';
import type {_Object} from '@aws-sdk/client-s3';
import type {AwsProvider} from '@remotion/lambda-client';
-import type {FullClientSpecifics} from '@remotion/serverless';
+import type {FullClientSpecifics} from '../../functions/provider-implementation';
import {getEtagOfFile} from '../../shared/get-etag';
import {getS3DiffOperations} from '../../shared/get-s3-operations';
import {multipartUploadPartSize} from '../../shared/multipart-upload-part-size';
diff --git a/packages/lambda/src/test/unit/handlers.test.ts b/packages/lambda/src/test/unit/handlers.test.ts
index 6635d6fea2..6a7a172979 100644
--- a/packages/lambda/src/test/unit/handlers.test.ts
+++ b/packages/lambda/src/test/unit/handlers.test.ts
@@ -1,5 +1,5 @@
import {expect, test} from 'bun:test';
-import {ServerlessRoutines} from '@remotion/serverless';
+import {ServerlessRoutines} from '@remotion/lambda-client';
import {mockImplementation} from '../mocks/mock-implementation';
test('Info handler should return version', async () => {
diff --git a/packages/serverless/src/test/inner-routine.test.ts b/packages/lambda/src/test/unit/inner-routine.test.ts
similarity index 92%
rename from packages/serverless/src/test/inner-routine.test.ts
rename to packages/lambda/src/test/unit/inner-routine.test.ts
index 56981a5bba..49bb21b104 100644
--- a/packages/serverless/src/test/inner-routine.test.ts
+++ b/packages/lambda/src/test/unit/inner-routine.test.ts
@@ -1,13 +1,14 @@
import {expect, test} from 'bun:test';
import {Readable} from 'node:stream';
-import type {
- CloudProvider,
- ProviderSpecifics,
-} from '@remotion/serverless-client';
-import {ServerlessRoutines, VERSION} from '@remotion/serverless-client';
-import {innerHandler, innerRoutine} from '../inner-routine';
-import {makeInitialOverallRenderProgress} from '../overall-render-progress';
-import type {InsideFunctionSpecifics} from '../provider-implementation';
+import {
+ ServerlessRoutines,
+ type CloudProvider,
+ type ProviderSpecifics,
+} from '@remotion/lambda-client';
+import {VERSION} from 'remotion/version';
+import {innerHandler, innerRoutine} from '../../functions/inner-routine';
+import {makeInitialOverallRenderProgress} from '../../functions/overall-render-progress';
+import type {InsideFunctionSpecifics} from '../../functions/provider-implementation';
type MockProvider = CloudProvider<
'mock-region',
diff --git a/packages/serverless/src/test/invoke-webhook.test.ts b/packages/lambda/src/test/unit/invoke-webhook.test.ts
similarity index 85%
rename from packages/serverless/src/test/invoke-webhook.test.ts
rename to packages/lambda/src/test/unit/invoke-webhook.test.ts
index 1f90be01d6..d68b95370c 100644
--- a/packages/serverless/src/test/invoke-webhook.test.ts
+++ b/packages/lambda/src/test/unit/invoke-webhook.test.ts
@@ -1,5 +1,5 @@
import {expect, test} from 'bun:test';
-import {calculateSignature} from '../invoke-webhook';
+import {calculateSignature} from '../../functions/invoke-webhook';
test('calculateSignature should return correct sha512 signature', () => {
const signature = calculateSignature(
diff --git a/packages/lambda/src/test/unit/output-access-error-identity.test.ts b/packages/lambda/src/test/unit/output-access-error-identity.test.ts
index 382d2a05e3..0937aeee17 100644
--- a/packages/lambda/src/test/unit/output-access-error-identity.test.ts
+++ b/packages/lambda/src/test/unit/output-access-error-identity.test.ts
@@ -1,43 +1,24 @@
import {expect, mock, spyOn, test} from 'bun:test';
import fs from 'node:fs';
-import {createRequire} from 'node:module';
import os from 'node:os';
import path from 'node:path';
import {Readable} from 'node:stream';
-import type * as LambdaClientPackage from '@remotion/lambda-client';
-import type {AwsProvider} from '@remotion/lambda-client';
-import type * as RendererPackage from '@remotion/renderer';
-import type * as ServerlessPackage from '@remotion/serverless';
-import type {
- InsideFunctionSpecifics,
- OverallRenderProgress,
- ProviderSpecifics,
- RenderMetadata,
- ServerlessPayloads,
-} from '@remotion/serverless';
-
-// Use the shipped CommonJS entrypoints, not source aliases. lambda-client
-// bundles its own serverless-client, while the handlers load another copy.
-const requirePackage = createRequire(__filename);
-const {LambdaClientInternals} = requirePackage(
- '@remotion/lambda-client',
-) as typeof LambdaClientPackage;
-const {RenderInternals} = requirePackage(
- '@remotion/renderer',
-) as typeof RendererPackage;
-const {
- launchHandler,
- progressHandler,
+import {
+ LambdaClientInternals,
OutputFileAccessDeniedError,
ServerlessRoutines,
- VERSION,
-} = requirePackage('@remotion/serverless') as typeof ServerlessPackage;
-const directRenderer = requirePackage(
- path.join(
- path.dirname(requirePackage.resolve('@remotion/serverless')),
- 'render-with-single-function.js',
- ),
-);
+ type AwsProvider,
+ type OverallRenderProgress,
+ type ProviderSpecifics,
+ type RenderMetadata,
+ type ServerlessPayloads,
+} from '@remotion/lambda-client';
+import {RenderInternals} from '@remotion/renderer';
+import {VERSION} from 'remotion/version';
+import {launchHandler} from '../../functions/handlers/launch';
+import {progressHandler} from '../../functions/handlers/progress';
+import type {InsideFunctionSpecifics} from '../../functions/provider-implementation';
+import * as directRenderer from '../../functions/render-with-single-function';
const region = 'us-east-1';
const renderId = 'output-access-test';
@@ -324,18 +305,14 @@ const invokeProgress = (
},
});
-test.each(['bundled', 'same package'] as const)(
+test.each(['normalized', 'constructed'] as const)(
'packaged launch accepts %s access errors and retains final overwrite protection',
async (copy) => {
const error =
- copy === 'bundled'
+ copy === 'normalized'
? await getBundledHeadError(403)
: new OutputFileAccessDeniedError('Denied');
- if (copy === 'bundled') {
- expect(Object.getPrototypeOf(error)).not.toBe(
- OutputFileAccessDeniedError.prototype,
- );
- }
+ expect(error).toBeInstanceOf(OutputFileAccessDeniedError);
const fixture = makeFixture(error);
const root = fs.mkdtempSync(path.join(os.tmpdir(), 'output-access-'));
@@ -461,11 +438,11 @@ test.each(['bundled', 'same package'] as const)(
},
);
-test.each(['bundled', 'same package'] as const)(
+test.each(['normalized', 'constructed'] as const)(
'packaged status falls back for %s access errors, including timed out recovery',
async (copy) => {
const fixture = makeFixture(
- copy === 'bundled'
+ copy === 'normalized'
? await getBundledHeadError(403)
: new OutputFileAccessDeniedError('Denied'),
);
diff --git a/packages/serverless/src/test/overall-render-progress.test.ts b/packages/lambda/src/test/unit/overall-render-progress.test.ts
similarity index 97%
rename from packages/serverless/src/test/overall-render-progress.test.ts
rename to packages/lambda/src/test/unit/overall-render-progress.test.ts
index 4631e691ae..472d9cdc94 100644
--- a/packages/serverless/src/test/overall-render-progress.test.ts
+++ b/packages/lambda/src/test/unit/overall-render-progress.test.ts
@@ -3,11 +3,11 @@ import type {
CloudProvider,
PostRenderData,
ProviderSpecifics,
-} from '@remotion/serverless-client';
+} from '@remotion/lambda-client';
import {
makeInitialOverallRenderProgress,
makeOverallRenderProgress,
-} from '../overall-render-progress';
+} from '../../functions/overall-render-progress';
type MockProvider = CloudProvider<
'eu-central-1',
diff --git a/packages/serverless/src/test/plan-frame-ranges.test.ts b/packages/lambda/src/test/unit/plan-frame-ranges.test.ts
similarity index 92%
rename from packages/serverless/src/test/plan-frame-ranges.test.ts
rename to packages/lambda/src/test/unit/plan-frame-ranges.test.ts
index 0a93e37226..402370b5c6 100644
--- a/packages/serverless/src/test/plan-frame-ranges.test.ts
+++ b/packages/lambda/src/test/unit/plan-frame-ranges.test.ts
@@ -1,5 +1,5 @@
import {expect, test} from 'bun:test';
-import {planFrameRanges} from '../plan-frame-ranges';
+import {planFrameRanges} from '../../functions/plan-frame-ranges';
test('Plan frame ranges should respect everyNthFrame', () => {
const planned = planFrameRanges({
diff --git a/packages/serverless/src/test/renderer-lifecycle.test.ts b/packages/lambda/src/test/unit/renderer-lifecycle.test.ts
similarity index 93%
rename from packages/serverless/src/test/renderer-lifecycle.test.ts
rename to packages/lambda/src/test/unit/renderer-lifecycle.test.ts
index 292dc38187..7ab9c2b4be 100644
--- a/packages/serverless/src/test/renderer-lifecycle.test.ts
+++ b/packages/lambda/src/test/unit/renderer-lifecycle.test.ts
@@ -2,20 +2,30 @@ import {expect, mock, spyOn, test} from 'bun:test';
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
-import {RenderInternals} from '@remotion/renderer';
import type {
CloudProvider,
ProviderSpecifics,
StreamingPayload,
-} from '@remotion/serverless-client';
-import {VERSION} from '@remotion/serverless-client';
+} from '@remotion/lambda-client';
+import {RenderInternals} from '@remotion/renderer';
+import {VERSION} from 'remotion/version';
import {
closeBrowserInstanceImplementation,
getBrowserInstanceImplementation,
-} from '../get-browser-instance';
-import type {LaunchedBrowser} from '../get-browser-instance';
-import {rendererHandler} from '../handlers/renderer';
-import type {InsideFunctionSpecifics} from '../provider-implementation';
+} from '../../functions/get-browser-instance';
+import type {LaunchedBrowser} from '../../functions/get-browser-instance';
+import {rendererHandler} from '../../functions/handlers/renderer';
+import type {InsideFunctionSpecifics} from '../../functions/provider-implementation';
+
+// Next.js declares process.env.NODE_ENV as readonly; the handlers branch on it.
+const setNodeEnv = (value: string | undefined) => {
+ const env = process.env as Record<string, string | undefined>;
+ if (value === undefined) {
+ delete env.NODE_ENV;
+ } else {
+ env.NODE_ENV = value;
+ }
+};
type MockProvider = CloudProvider<
'mock-region',
@@ -78,7 +88,7 @@ test.each(['browser launch', 'Chromium path lookup'] as const)(
const streamedMessages: StreamingPayload<MockProvider>[] = [];
try {
- process.env.NODE_ENV = 'production';
+ setNodeEnv('production');
const invoke = () =>
rendererHandler<MockProvider>({
params: {
@@ -197,11 +207,7 @@ test.each(['browser launch', 'Chromium path lookup'] as const)(
fs.rmSync(testRoot, {recursive: true, force: true});
timeoutSpy.mockRestore();
exitSpy.mockRestore();
- if (previousNodeEnv === undefined) {
- delete process.env.NODE_ENV;
- } else {
- process.env.NODE_ENV = previousNodeEnv;
- }
+ setNodeEnv(previousNodeEnv);
}
},
);
@@ -232,7 +238,7 @@ test('a flaky renderer invocation closes its browser before returning', async ()
});
try {
- process.env.NODE_ENV = 'production';
+ setNodeEnv('production');
const handlerPromise = rendererHandler<MockProvider>({
params: {
type: 'renderer',
@@ -307,11 +313,7 @@ test('a flaky renderer invocation closes its browser before returning', async ()
failClosing();
await Promise.resolve();
tmpDirSpy.mockRestore();
- if (previousNodeEnv === undefined) {
- delete process.env.NODE_ENV;
- } else {
- process.env.NODE_ENV = previousNodeEnv;
- }
+ setNodeEnv(previousNodeEnv);
}
});
diff --git a/packages/lambda/src/test/unit/routine.test.ts b/packages/lambda/src/test/unit/routine.test.ts
index c4b17e81c9..94837cff56 100644
--- a/packages/lambda/src/test/unit/routine.test.ts
+++ b/packages/lambda/src/test/unit/routine.test.ts
@@ -1,12 +1,12 @@
import {expect, spyOn, test} from 'bun:test';
-import {LambdaClientInternals} from '@remotion/lambda-client';
import {
- ResponseStream,
+ LambdaClientInternals,
ServerlessRoutines,
- VERSION,
-} from '@remotion/serverless';
+} from '@remotion/lambda-client';
+import {VERSION} from 'remotion/version';
import {routine} from '../../functions';
import {serverAwsImplementation} from '../../functions/aws-server-implementation';
+import {ResponseStream} from '../../functions/streaming/response-stream';
test('Lambda context is normalized while preserving storage ownership', async () => {
const previousFlag = process.env.__RESERVED_IS_INSIDE_REMOTION_LAMBDA;
diff --git a/packages/lambda/src/test/unit/runtime-policies.test.ts b/packages/lambda/src/test/unit/runtime-policies.test.ts
index 0cc80a5e8a..df252a06c6 100644
--- a/packages/lambda/src/test/unit/runtime-policies.test.ts
+++ b/packages/lambda/src/test/unit/runtime-policies.test.ts
@@ -2,15 +2,15 @@ import {expect, mock, spyOn, test} from 'bun:test';
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
-import {LambdaClientInternals} from '@remotion/lambda-client';
-import type {AwsProvider} from '@remotion/lambda-client';
-import type * as Renderer from '@remotion/renderer';
-import {rendererHandler, VERSION} from '@remotion/serverless';
-import type {StreamingPayload} from '@remotion/serverless';
+import {
+ LambdaClientInternals,
+ type AwsProvider,
+ type StreamingPayload,
+} from '@remotion/lambda-client';
+import {RenderInternals} from '@remotion/renderer';
+import {VERSION} from 'remotion/version';
import {serverAwsImplementation} from '../../functions/aws-server-implementation';
-
-// Serverless is published as CommonJS, so intercept its renderer instance.
-const {RenderInternals} = require('@remotion/renderer') as typeof Renderer;
+import {rendererHandler} from '../../functions/handlers/renderer';
test.each(['angle', null] as const)(
'Lambda renders with software GL and one browser process for gl=%s',
diff --git a/packages/serverless/src/test/s3-renderer-launcher.test.ts b/packages/lambda/src/test/unit/s3-renderer-launcher.test.ts
similarity index 88%
rename from packages/serverless/src/test/s3-renderer-launcher.test.ts
rename to packages/lambda/src/test/unit/s3-renderer-launcher.test.ts
index b5556f2fca..bc46e667cf 100644
--- a/packages/serverless/src/test/s3-renderer-launcher.test.ts
+++ b/packages/lambda/src/test/unit/s3-renderer-launcher.test.ts
@@ -3,19 +3,15 @@ import {mkdtemp, readFile, rm} from 'node:fs/promises';
import {tmpdir} from 'node:os';
import {join} from 'node:path';
import {Readable} from 'node:stream';
-import type {EmittedArtifact} from '@remotion/renderer';
-import type {
- ProviderSpecifics,
- S3RendererStatus,
-} from '@remotion/serverless-client';
import {
- rendererTransportArtifactKey,
- rendererTransportStatusKey,
- rendererTransportVideoKey,
-} from '@remotion/serverless-client';
-import type {OverallProgressHelper} from '../overall-render-progress';
-import type {InsideFunctionSpecifics} from '../provider-implementation';
-import {renderRendererFunctionWithRetry} from '../stream-renderer';
+ LambdaClientInternals,
+ type ProviderSpecifics,
+ type S3RendererStatus,
+} from '@remotion/lambda-client';
+import type {EmittedArtifact} from '@remotion/renderer';
+import type {OverallProgressHelper} from '../../functions/overall-render-progress';
+import type {InsideFunctionSpecifics} from '../../functions/provider-implementation';
+import {renderRendererFunctionWithRetry} from '../../functions/stream-renderer';
type MockProvider = {
type: 'mock';
@@ -32,16 +28,16 @@ test('S3 launcher invokes, polls, downloads, and normalizes a renderer result',
const objects = new Map<string, Uint8Array>();
const deleted: string[] = [];
let asyncInvocations = 0;
- const videoKey = rendererTransportVideoKey({
+ const videoKey = LambdaClientInternals.rendererTransportVideoKey({
renderId: 'render-id',
chunk: 0,
attempt: 1,
});
- const artifactKey = rendererTransportArtifactKey(
+ const artifactKey = LambdaClientInternals.rendererTransportArtifactKey(
{renderId: 'render-id', chunk: 0, attempt: 1},
0,
);
- const statusKey = rendererTransportStatusKey({
+ const statusKey = LambdaClientInternals.rendererTransportStatusKey({
renderId: 'render-id',
chunk: 0,
attempt: 1,
diff --git a/packages/serverless/src/test/s3-renderer-output.test.ts b/packages/lambda/src/test/unit/s3-renderer-output.test.ts
similarity index 96%
rename from packages/serverless/src/test/s3-renderer-output.test.ts
rename to packages/lambda/src/test/unit/s3-renderer-output.test.ts
index e0fd1f9d78..539c8d896d 100644
--- a/packages/serverless/src/test/s3-renderer-output.test.ts
+++ b/packages/lambda/src/test/unit/s3-renderer-output.test.ts
@@ -3,8 +3,8 @@ import {mkdtemp, rm, writeFile} from 'node:fs/promises';
import {tmpdir} from 'node:os';
import {join} from 'node:path';
import type {Readable} from 'node:stream';
-import type {ProviderSpecifics} from '@remotion/serverless-client';
-import {makeS3RendererOutput} from '../s3-renderer-output';
+import type {ProviderSpecifics} from '@remotion/lambda-client';
+import {makeS3RendererOutput} from '../../functions/s3-renderer-output';
type MockProvider = {
type: 'mock';
diff --git a/packages/serverless/src/test/streaming-renderer-launcher.test.ts b/packages/lambda/src/test/unit/streaming-renderer-launcher.test.ts
similarity index 91%
rename from packages/serverless/src/test/streaming-renderer-launcher.test.ts
rename to packages/lambda/src/test/unit/streaming-renderer-launcher.test.ts
index 6800c07366..a6a8ed631b 100644
--- a/packages/serverless/src/test/streaming-renderer-launcher.test.ts
+++ b/packages/lambda/src/test/unit/streaming-renderer-launcher.test.ts
@@ -1,19 +1,17 @@
import {expect, test} from 'bun:test';
import {join} from 'node:path';
-import type {EmittedArtifact} from '@remotion/renderer';
-import type {
- OnMessage,
- ProviderSpecifics,
- ServerlessPayload,
-} from '@remotion/serverless-client';
import {
- serializeArtifact,
+ LambdaClientInternals,
ServerlessRoutines,
-} from '@remotion/serverless-client';
-import {makeArtifactRegistry} from '../artifact-registry';
-import type {OverallProgressHelper} from '../overall-render-progress';
-import type {InsideFunctionSpecifics} from '../provider-implementation';
-import {renderRendererFunctionWithRetry} from '../stream-renderer';
+ type OnMessage,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+} from '@remotion/lambda-client';
+import type {EmittedArtifact} from '@remotion/renderer';
+import {makeArtifactRegistry} from '../../functions/artifact-registry';
+import type {OverallProgressHelper} from '../../functions/overall-render-progress';
+import type {InsideFunctionSpecifics} from '../../functions/provider-implementation';
+import {renderRendererFunctionWithRetry} from '../../functions/stream-renderer';
type MockProvider = {
type: 'mock';
@@ -45,7 +43,7 @@ test('an artifact replayed by a retried streaming chunk is idempotent', async ()
message: {
type: 'artifact-emitted',
payload: {
- artifact: serializeArtifact({
+ artifact: LambdaClientInternals.serializeArtifact({
filename: 'thumbnail.jpeg',
frame: 0,
content: 'thumbnail',
diff --git a/packages/lambda/src/test/unit/x264-preset-default.test.ts b/packages/lambda/src/test/unit/x264-preset-default.test.ts
index 33e2eb6899..2bc6283258 100644
--- a/packages/lambda/src/test/unit/x264-preset-default.test.ts
+++ b/packages/lambda/src/test/unit/x264-preset-default.test.ts
@@ -1,13 +1,15 @@
import {expect, test} from 'bun:test';
-import type {AwsProvider} from '@remotion/lambda-client';
-import type {
- ProviderSpecifics,
- ServerlessPayload,
- ServerlessStartPayload,
-} from '@remotion/serverless';
-import {ServerlessRoutines, startHandler, VERSION} from '@remotion/serverless';
+import {
+ ServerlessRoutines,
+ type AwsProvider,
+ type ProviderSpecifics,
+ type ServerlessPayload,
+ type ServerlessStartPayload,
+} from '@remotion/lambda-client';
import {NoReactInternals} from 'remotion/no-react';
+import {VERSION} from 'remotion/version';
import {serverAwsImplementation} from '../../functions/aws-server-implementation';
+import {startHandler} from '../../functions/handlers/start';
import {mockServerImplementation} from '../mock-implementation';
import {mockImplementation} from '../mocks/mock-implementation';
diff --git a/packages/lambda/tsconfig.json b/packages/lambda/tsconfig.json
index bbe43174f9..a3ef9c3208 100644
--- a/packages/lambda/tsconfig.json
+++ b/packages/lambda/tsconfig.json
@@ -9,9 +9,9 @@
{"path": "../core"},
{"path": "../bundler"},
{"path": "../lambda-client"},
+ {"path": "../licensing"},
{"path": "../cli"},
{"path": "../streaming"},
- {"path": "../serverless"},
{"path": "../renderer"}
]
}
diff --git a/packages/serverless-client/.npmignore b/packages/serverless-client/.npmignore
deleted file mode 100644
index b11a83b8b4..0000000000
--- a/packages/serverless-client/.npmignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.turbo
-bundle.ts
-eslint.config.mjs
-tsconfig.json
-tsconfig.tsbuildinfo
-src
-dist/test
\ No newline at end of file
diff --git a/packages/serverless-client/README.md b/packages/serverless-client/README.md
deleted file mode 100644
index 180cf07d70..0000000000
--- a/packages/serverless-client/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# @remotion/serverless-client
-
-## Usage
-
-This is an internal package and has no documentation.
diff --git a/packages/serverless-client/bundle.ts b/packages/serverless-client/bundle.ts
deleted file mode 100644
index c68993a090..0000000000
--- a/packages/serverless-client/bundle.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {buildPackage} from '../.monorepo/builder';
-
-await buildPackage({
- formats: {
- cjs: 'use-tsc',
- esm: 'build',
- },
- external: [],
- entrypoints: [
- {
- path: 'src/index.ts',
- target: 'node',
- },
- ],
-});
diff --git a/packages/serverless-client/eslint.config.mjs b/packages/serverless-client/eslint.config.mjs
deleted file mode 100644
index 33ab41c9d0..0000000000
--- a/packages/serverless-client/eslint.config.mjs
+++ /dev/null
@@ -1,5 +0,0 @@
-import {remotionFlatConfig} from '@remotion/eslint-config-internal';
-
-const config = remotionFlatConfig({react: false});
-
-export default config;
diff --git a/packages/serverless-client/package.json b/packages/serverless-client/package.json
deleted file mode 100644
index 0a95f94679..0000000000
--- a/packages/serverless-client/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "repository": {
- "url": "https://github.com/remotion-dev/remotion/tree/main/packages/serverless-client"
- },
- "name": "@remotion/serverless-client",
- "version": "4.0.537",
- "main": "dist",
- "scripts": {
- "lint": "eslint src",
- "formatting": "oxfmt src --check",
- "format": "oxfmt src",
- "test": "bun test src",
- "make": "tsgo -d && bun --env-file=../.env.bundle bundle.ts"
- },
- "author": "Jonny Burger <[email protected]>",
- "contributors": [],
- "license": "UNLICENSED",
- "bugs": {
- "url": "https://github.com/remotion-dev/remotion/issues"
- },
- "publishConfig": {
- "access": "public"
- },
- "dependencies": {},
- "devDependencies": {
- "remotion": "workspace:*",
- "@remotion/streaming": "workspace:*",
- "@remotion/renderer": "workspace:*",
- "@remotion/eslint-config-internal": "workspace:*",
- "eslint": "catalog:",
- "@typescript/native-preview": "catalog:"
- },
- "exports": {
- "./package.json": "./package.json",
- ".": {
- "types": "./dist/index.d.ts",
- "require": "./dist/index.js",
- "module": "./dist/esm/index.mjs",
- "import": "./dist/esm/index.mjs"
- }
- }
-}
diff --git a/packages/serverless-client/src/index.ts b/packages/serverless-client/src/index.ts
deleted file mode 100644
index 246b45cf2e..0000000000
--- a/packages/serverless-client/src/index.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import {interpolate, NoReactInternals, random} from 'remotion/no-react';
-export * from './constants';
-export {
- artifactName,
- cancellationKey,
- customOutName,
- expiryDays,
- MINIMUM_FRAMES_PER_FUNCTION,
- outName,
- outStillName,
- overallProgressKey,
- rendersPrefix,
- ServerlessCodec,
- serverlessCodecs,
- ServerlessPayload,
- ServerlessPayloads,
- ServerlessRoutines,
- ServerlessStartPayload,
- ServerlessStatusPayload,
- type CustomCredentials,
- type CustomCredentialsWithoutSensitiveData,
- type DeleteAfter,
- type OutNameInput,
- type OutNameInputWithoutCredentials,
- type OutNameOutput,
- type Privacy,
- type SerializedInputProps,
- type WebhookOption,
-} from './constants';
-export {GenericRenderProgress} from './render-progress';
-export {
- deserializeArtifact,
- serializeArtifact,
- SerializedArtifact,
-} from './serialize-artifact';
-
-export {validateDownloadBehavior} from './validate-download-behavior';
-export {validateFramesPerFunction} from './validate-frames-per-function';
-
-export type {
- AudioCodec,
- ChromiumOptions,
- ColorSpace,
- FrameRange,
- LogLevel,
- PixelFormat,
- StillImageFormat,
- SingleFrameRange,
- ToOptions,
- VideoImageFormat,
- X264Preset,
-} from '@remotion/renderer';
-export type {BrowserSafeApis} from '@remotion/renderer/client';
-export {wrapWithErrorHandling} from '@remotion/renderer/error-handling';
-export {makeStreamer, makeStreamPayloadMessage} from '@remotion/streaming';
-export type {_InternalTypes} from 'remotion';
-export type {DownloadBehavior, VideoConfig} from 'remotion/no-react';
-export {VERSION} from 'remotion/version';
-export {Await} from './await';
-export {calculateBillingDuration} from './calculate-billing-duration';
-export {calculateChunkTimes} from './calculate-chunk-times';
-export {
- compressInputProps,
- decompressInputProps,
- getNeedsToUpload,
- serializeOrThrow,
-} from './compress-props';
-export {MAX_FUNCTIONS_PER_RENDER} from './constants';
-export {DOCS_URL} from './docs-url';
-export {
- errorIsOutOfSpaceError,
- isBrowserCrashedError,
- isErrInsufficientResourcesErr,
-} from './error-category';
-export {estimatePriceFromMetadata} from './estimate-price-from-bucket';
-export {
- getCredentialsFromOutName,
- getExpectedOutName,
-} from './expected-out-name';
-export {
- findOutputFileInBucket,
- OutputFileAccessDeniedError,
- type OutputFileMetadata,
-} from './find-output-file-in-bucket';
-export {formatCostsInfo} from './format-costs-info';
-export {FileNameAndSize, GetFolderFiles} from './get-files-in-folder';
-export {
- GetOrCreateBucketInput,
- GetOrCreateBucketOutput,
- internalGetOrCreateBucket,
-} from './get-or-create-bucket';
-export {getOverallProgressFromStorage} from './get-overall-progress-from-storage';
-export {getRemotionVersionFromIndexHtml} from './get-remotion-version-from-index-html';
-export {getSizeInBytes} from './get-size-in-bytes';
-export {inputPropsKey, resolvedPropsKey} from './input-props-keys';
-export {inspectErrors} from './inspect-error';
-export {makeBucketName} from './make-bucket-name';
-export {
- getMostExpensiveChunks,
- OVERHEAD_TIME_PER_LAMBDA,
-} from './most-expensive-chunks';
-export {OverallRenderProgress} from './overall-render-progress';
-export {getProgress} from './progress';
-export * from './provider-implementation';
-export {RenderMetadata} from './render-metadata';
-export {
- parseS3RendererStatus,
- rendererTransportArtifactKey,
- rendererTransportAttemptPrefix,
- rendererTransportAudioKey,
- rendererTransportPrefix,
- rendererTransportStatusKey,
- rendererTransportVideoKey,
- type RendererFunctionTransport,
- type S3RendererArtifactMetadata,
- type S3RendererStatus,
-} from './renderer-transport';
-export {OrError, ServerlessReturnValues} from './return-values';
-export {streamToString} from './stream-to-string';
-export {
- BinaryMessageType,
- binaryPayloadSinkForStreamer,
- formatMap,
- GetBinaryPayloadSink,
- makeStreamPayload,
- MessageTypeId,
- messageTypeIdToMessageType,
- OnMessage,
- OnStream,
- StreamingMessage,
- StreamingPayload,
-} from './streaming/streaming';
-export {truthy} from './truthy';
-export * from './types';
-export {validateBucketName} from './validate-bucket-name';
-export {validateOutname} from './validate-outname';
-export {validatePrivacy} from './validate-privacy';
-export {validateWebhook} from './validate-webhook';
-export {writeCancellationSignal} from './write-cancellation-signal';
-export * from './webhook-types';
-export {EnhancedErrorInfo, FunctionErrorInfo} from './write-error-to-storage';
-export {interpolate, random};
-
-/* eslint-disable prefer-destructuring */
-export const ENABLE_V5_BREAKING_CHANGES =
- NoReactInternals.ENABLE_V5_BREAKING_CHANGES;
-export const serializeJSONWithSpecialTypes =
- NoReactInternals.serializeJSONWithSpecialTypes;
-export const validateFps: typeof NoReactInternals.validateFps =
- NoReactInternals.validateFps;
-export const validateDimension: typeof NoReactInternals.validateDimension =
- NoReactInternals.validateDimension;
-export const validateDurationInFrames: typeof NoReactInternals.validateDurationInFrames =
- NoReactInternals.validateDurationInFrames;
-export const validateCodec: typeof NoReactInternals.validateCodec =
- NoReactInternals.validateCodec;
-
-export * from './image-sequence';
diff --git a/packages/serverless-client/src/types.ts b/packages/serverless-client/src/types.ts
deleted file mode 100644
index 9fd9f24298..0000000000
--- a/packages/serverless-client/src/types.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import type {ServerlessPayloads, ServerlessRoutines} from './constants';
-
-export interface CloudProvider<
- Region extends string = string,
- ReceivedArtifactType extends Record<string, unknown> = Record<
- string,
- unknown
- >,
- CreateFunctionSpecifics extends Record<string, unknown> = Record<
- string,
- unknown
- >,
- StorageClass extends string = string,
- RequestHandler extends object = object,
-> {
- type: string;
- region: Region;
- receivedArtifactType: ReceivedArtifactType;
- creationFunctionOptions: CreateFunctionSpecifics;
- storageClass: StorageClass;
- requestHandler: RequestHandler | null | undefined;
-}
-
-export type ReceivedArtifact<Provider extends CloudProvider> = {
- filename: string;
- sizeInBytes: number;
- s3Url: string;
- s3Key: string;
-} & Provider['receivedArtifactType'];
-
-export type CostsInfo = {
- accruedSoFar: number;
- displayCost: string;
- currency: string;
- disclaimer: string;
-};
-
-export type RenderStillFunctionResponsePayload<Provider extends CloudProvider> =
- {
- type: 'success';
- output: string;
- outKey: string;
- size: number;
- bucketName: string;
- sizeInBytes: number;
- estimatedPrice: CostsInfo;
- renderId: string;
- receivedArtifacts: ReceivedArtifact<Provider>[];
- };
-
-export type ChunkRetry = {
- chunk: number;
- attempt: number;
- time: number;
-};
-
-export type ParsedTiming = {
- chunk: number;
- start: number;
- rendered: number;
-};
-
-export type CallFunctionOptions<
- T extends ServerlessRoutines,
- Provider extends CloudProvider,
-> = {
- functionName: string;
- type: T;
- payload: ServerlessPayloads<Provider>[T];
- region: Provider['region'];
- timeoutInTest: number;
- requestHandler: Provider['requestHandler'] | null;
-};
-
-export type ObjectChunkTimingData = {
- chunk: number;
- frameRange: [number, number];
- startDate: number;
- timings: {
- [key: number]: number;
- };
-};
diff --git a/packages/serverless-client/tsconfig.json b/packages/serverless-client/tsconfig.json
deleted file mode 100644
index 8984a1d19a..0000000000
--- a/packages/serverless-client/tsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "extends": "../tsconfig.settings.json",
- "compilerOptions": {
- "composite": true,
- "rootDir": "./src",
- "outDir": "dist",
- "skipLibCheck": true
- },
- "include": ["src"],
- "references": [
- {
- "path": "../licensing"
- },
- {
- "path": "../streaming"
- }
- ]
-}
diff --git a/packages/serverless/.npmignore b/packages/serverless/.npmignore
deleted file mode 100644
index 5200f1f026..0000000000
--- a/packages/serverless/.npmignore
+++ /dev/null
@@ -1,7 +0,0 @@
-src
-tsconfig.json
-dist/test
-eslint.config.mjs
-.prettierrc.js
-.turbo
-tsconfig.tsbuildinfo
\ No newline at end of file
diff --git a/packages/serverless/README.md b/packages/serverless/README.md
deleted file mode 100644
index 1a5dda3449..0000000000
--- a/packages/serverless/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @remotion/serverless
-
-A runtime for distributed rendering
-
-## Usage
-
-This is an internal package and has no documentation.
diff --git a/packages/serverless/eslint.config.mjs b/packages/serverless/eslint.config.mjs
deleted file mode 100644
index 04fd4fac11..0000000000
--- a/packages/serverless/eslint.config.mjs
+++ /dev/null
@@ -1,7 +0,0 @@
-import {remotionFlatConfig} from '@remotion/eslint-config-internal';
-
-const config = remotionFlatConfig({react: false});
-
-export default {
- ...config,
-};
diff --git a/packages/serverless/package.json b/packages/serverless/package.json
deleted file mode 100644
index b361dfbb83..0000000000
--- a/packages/serverless/package.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "repository": {
- "url": "https://github.com/remotion-dev/remotion/tree/main/packages/serverless"
- },
- "name": "@remotion/serverless",
- "version": "4.0.537",
- "description": "A runtime for distributed rendering",
- "main": "dist",
- "scripts": {
- "lint": "eslint src",
- "formatting": "oxfmt src --check",
- "format": "oxfmt src",
- "test": "bun test src",
- "make": "tsgo -d"
- },
- "author": "Jonny Burger <[email protected]>",
- "contributors": [],
- "license": "UNLICENSED",
- "bugs": {
- "url": "https://github.com/remotion-dev/remotion/issues"
- },
- "publishConfig": {
- "access": "public"
- },
- "dependencies": {
- "@remotion/renderer": "workspace:*",
- "@remotion/bundler": "workspace:*",
- "@remotion/licensing": "workspace:*",
- "@remotion/serverless-client": "workspace:*"
- },
- "devDependencies": {
- "@remotion/eslint-config-internal": "workspace:*",
- "eslint": "catalog:",
- "@typescript/native-preview": "catalog:"
- },
- "exports": {
- ".": "./dist/index.js",
- "./package.json": "./package.json"
- }
-}
diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts
deleted file mode 100644
index e74dac86bb..0000000000
--- a/packages/serverless/src/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export * from '@remotion/serverless-client';
-export {
- closeBrowserInstanceImplementation,
- forgetBrowserEventLoopImplementation,
- getBrowserInstanceImplementation,
-} from './get-browser-instance';
-export {compositionsHandler} from './handlers/compositions';
-export {launchHandler} from './handlers/launch';
-export {progressHandler} from './handlers/progress';
-export {type RequestContext, rendererHandler} from './handlers/renderer';
-export {startHandler} from './handlers/start';
-export {stillHandler} from './handlers/still';
-export {infoHandler} from './info';
-export {innerHandler, innerRoutine} from './inner-routine';
-export {invokeWebhook} from './invoke-webhook';
-export * from './provider-implementation';
-export {ResponseStream} from './streaming/response-stream';
-export {
- type ResponseStreamWriter,
- streamWriter,
-} from './streaming/stream-writer';
-
-export {validateComposition} from './validate-composition';
diff --git a/packages/serverless/src/validate.ts b/packages/serverless/src/validate.ts
deleted file mode 100644
index 0fd8632d7e..0000000000
--- a/packages/serverless/src/validate.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
- validateDimension,
- validateDurationInFrames,
- validateFps,
-} from '@remotion/serverless-client';
diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json
deleted file mode 100644
index 9e6be45912..0000000000
--- a/packages/serverless/tsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "extends": "../tsconfig.settings.json",
- "compilerOptions": {
- "composite": true,
- "rootDir": "./src",
- "outDir": "dist",
- "skipLibCheck": true
- },
- "include": ["src"],
- "references": [
- {
- "path": "../renderer"
- },
- {
- "path": "../serverless-client"
- },
- {
- "path": "../streaming"
- }
- ]
-}
diff --git a/packages/studio-shared/src/package-info.ts b/packages/studio-shared/src/package-info.ts
index b64dafe944..f07999ec5e 100644
--- a/packages/studio-shared/src/package-info.ts
+++ b/packages/studio-shared/src/package-info.ts
@@ -70,8 +70,6 @@ const allPackages = [
'skia',
'promo-pages',
'streaming',
- 'serverless',
- 'serverless-client',
'skills',
'skills-evals',
'codemods',
@@ -265,7 +263,6 @@ export const descriptions: {[key in Pkgs]: string | null} = {
'discord-poster': null,
'docusaurus-plugin': null,
'animated-emoji': 'Google Fonts Animated Emojis as Remotion components',
- serverless: 'A runtime for distributed rendering',
webcodecs: 'Media conversion in the browser',
convert: 'Video conversion tool - convert.remotion.dev',
captions: 'Primitives for dealing with captions',
@@ -275,7 +272,6 @@ export const descriptions: {[key in Pkgs]: string | null} = {
'example-videos': null,
'promo-pages': null,
'svg-3d-engine': '3D SVG extrusion effects',
- 'serverless-client': null,
media: 'Experimental WebCodecs-based media tags',
'remotion-media': null,
'web-renderer': 'Render videos in the browser',
@@ -310,7 +306,6 @@ export const installableMap: {[key in Pkgs]: boolean} = {
'agent-plugin': false,
'kimi-code-plugin': false,
'lambda-client': false,
- 'serverless-client': false,
'compositor-darwin-arm64': false,
'compositor-darwin-x64': false,
'compositor-linux-arm64-gnu': false,
@@ -370,7 +365,6 @@ export const installableMap: {[key in Pkgs]: boolean} = {
'skills-evals': false,
'promo-pages': false,
streaming: false,
- serverless: false,
codemods: false,
'studio-server': false,
'studio-shared': false,
@@ -437,7 +431,6 @@ export const apiDocs: {[key in Pkgs]: string | null} = {
sdk: 'https://www.remotion.dev/docs/sdk',
codemods: 'https://www.remotion.dev/docs/codemods',
'lambda-client': null,
- 'serverless-client': null,
'studio-server': null,
'install-whisper-cpp': 'https://www.remotion.dev/docs/install-whisper-cpp',
'whisper-web': 'https://www.remotion.dev/docs/whisper-web',
@@ -503,7 +496,6 @@ export const apiDocs: {[key in Pkgs]: string | null} = {
skia: 'https://www.remotion.dev/docs/skia',
three: 'https://www.remotion.dev/docs/three',
streaming: null,
- serverless: null,
skills: null,
'skills-evals': null,
studio: 'https://www.remotion.dev/docs/studio/api',
diff --git a/tsconfig.json b/tsconfig.json
index 39e9b57ebc..8e1fa42828 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -234,12 +234,6 @@
{
"path": "./packages/streaming"
},
- {
- "path": "./packages/serverless"
- },
- {
- "path": "./packages/serverless-client"
- },
{
"path": "./packages/docusaurus-plugin"
},