Skip to content

🎥 Make videos programmatically with React

fix(lambda): Match recovered output to its render ID

JonnyBurger29065c755f8d
diff --git a/packages/lambda-client/src/head-file.ts b/packages/lambda-client/src/head-file.ts
index 47905f832e..2a6cfa257c 100644
--- a/packages/lambda-client/src/head-file.ts
+++ b/packages/lambda-client/src/head-file.ts
@@ -15,6 +15,7 @@ export const lambdaHeadFileImplementation: ProviderSpecifics<AwsProvider>['headF
}): Promise<{
LastModified?: Date | undefined;
ContentLength?: number | undefined;
+ Metadata?: Record<string, string> | undefined;
}> => {
try {
const head = await getS3Client({
diff --git a/packages/lambda-client/src/write-file.ts b/packages/lambda-client/src/write-file.ts
index 4470bd98ba..3402efdcaf 100644
--- a/packages/lambda-client/src/write-file.ts
+++ b/packages/lambda-client/src/write-file.ts
@@ -29,6 +29,7 @@ const tryLambdaWriteFile = async ({
forcePathStyle,
storageClass,
requestHandler,
+ metadata,
ifNotExists,
}: WriteFileInput<AwsProvider> & {ifNotExists: boolean}): Promise<void> => {
const client = getS3Client({
@@ -55,6 +56,7 @@ const tryLambdaWriteFile = async ({
ContentDisposition: getContentDispositionHeader(downloadBehavior),
StorageClass: storageClass ?? undefined,
IfNoneMatch: ifNotExists ? '*' : undefined,
+ Metadata: metadata ?? undefined,
};
// Determine file size
diff --git a/packages/serverless-client/src/find-output-file-in-bucket.ts b/packages/serverless-client/src/find-output-file-in-bucket.ts
index 781291fdd8..e1eada1d84 100644
--- a/packages/serverless-client/src/find-output-file-in-bucket.ts
+++ b/packages/serverless-client/src/find-output-file-in-bucket.ts
@@ -7,6 +7,7 @@ import type {CloudProvider} from './types';
export type OutputFileMetadata = {
url: string;
sizeInBytes: number | null;
+ renderId: string | null;
};
const outputFileAccessDenied = Symbol.for(
@@ -74,6 +75,7 @@ export const findOutputFileInBucket = async <Provider extends CloudProvider>({
output,
}).url,
sizeInBytes: metadata.ContentLength ?? null,
+ renderId: metadata.Metadata?.['remotion-render-id'] ?? null,
};
} catch (err) {
if ((err as Error).name === 'NotFound') {
diff --git a/packages/serverless-client/src/progress.ts b/packages/serverless-client/src/progress.ts
index f32b10d584..f23ddfaf4a 100644
--- a/packages/serverless-client/src/progress.ts
+++ b/packages/serverless-client/src/progress.ts
@@ -292,7 +292,9 @@ export const getProgress = async <Provider extends CloudProvider>({
throw err;
});
- if (outputFile) {
+ // A shared output key can still contain an earlier render while uploading.
+ // Untagged outputs must rely on persisted postRenderData for completion.
+ if (outputFile && outputFile.renderId === renderId) {
const outData = getExpectedOutName({
output: 'main',
renderMetadata,
diff --git a/packages/serverless-client/src/provider-implementation.ts b/packages/serverless-client/src/provider-implementation.ts
index 04e32f54ef..31f91b9026 100644
--- a/packages/serverless-client/src/provider-implementation.ts
+++ b/packages/serverless-client/src/provider-implementation.ts
@@ -110,6 +110,7 @@ type ConvertToServeUrl<Provider extends CloudProvider> = (params: {
type HeadFileOutput = {
LastModified?: Date | undefined;
ContentLength?: number | undefined;
+ Metadata?: Record<string, string> | undefined;
};
export type DeleteFunctionInput<Provider extends CloudProvider> = {
@@ -133,6 +134,7 @@ export type WriteFileInput<Provider extends CloudProvider> = {
forcePathStyle: boolean;
storageClass: Provider['storageClass'] | null;
requestHandler: Provider['requestHandler'] | null;
+ metadata?: Record<string, string> | null;
};
type WriteFile<Provider extends CloudProvider> = (
diff --git a/packages/serverless-client/src/test/progress.test.ts b/packages/serverless-client/src/test/progress.test.ts
index 2adf214b50..f3c6c47771 100644
--- a/packages/serverless-client/src/test/progress.test.ts
+++ b/packages/serverless-client/src/test/progress.test.ts
@@ -184,7 +184,10 @@ test('getProgress treats an existing output file as finished if postRenderData w
billingCurrency: 'CNY',
onHeadFile: ({bucketName: headedBucketName, key}) => {
headedFiles.push({bucketName: headedBucketName, key});
- return Promise.resolve({ContentLength: 1234});
+ return Promise.resolve({
+ ContentLength: 1234,
+ Metadata: {'remotion-render-id': renderId},
+ });
},
renderProgress: null,
});
diff --git a/packages/serverless/src/finish-render.ts b/packages/serverless/src/finish-render.ts
index 928b71104f..c6ec74fc0c 100644
--- a/packages/serverless/src/finish-render.ts
+++ b/packages/serverless/src/finish-render.ts
@@ -124,6 +124,7 @@ export const finishRender = async <Provider extends CloudProvider>({
forcePathStyle,
storageClass,
requestHandler,
+ metadata: {'remotion-render-id': renderMetadata.renderId},
};
try {
if (file.conditional) {
@@ -190,6 +191,7 @@ export const finishRender = async <Provider extends CloudProvider>({
outputFile: {
sizeInBytes: outputSize,
url: outputUrl,
+ renderId: renderMetadata.renderId,
},
outputSize,
timeToCombine,
diff --git a/packages/serverless/src/handlers/launch.ts b/packages/serverless/src/handlers/launch.ts
index 9a40ecf7a3..2c7545397e 100644
--- a/packages/serverless/src/handlers/launch.ts
+++ b/packages/serverless/src/handlers/launch.ts
@@ -905,6 +905,7 @@ const innerLaunchHandler = async <Provider extends CloudProvider>({
outputFile: {
url: renderMetadata.outputSequence.manifestUrl,
sizeInBytes: Buffer.byteLength(manifestBody),
+ renderId: renderMetadata.renderId,
},
timeToCombine: null,
overallProgress: progress,