@remotion/lambda-client 4.0.314 → 4.0.316

package/src/delete-render.ts

@@ -10,6 +10,7 @@ import {awsImplementation} from './aws-provider';
 import {cleanItems} from './clean-items';
 import {REMOTION_BUCKET_PREFIX} from './constants';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 export type DeleteRenderInput = {
 	region: AwsRegion;
@@ -17,6 +18,7 @@ export type DeleteRenderInput = {
 	renderId: string;
 	customCredentials?: CustomCredentials<AwsProvider>;
 	forcePathStyle?: boolean;
+	requestHandler?: RequestHandler;
 };
 
 export const internalDeleteRender = async (
@@ -35,6 +37,7 @@ export const internalDeleteRender = async (
 		renderId: input.renderId,
 		providerSpecifics: input.providerSpecifics,
 		forcePathStyle: input.forcePathStyle,
+		requestHandler: input.requestHandler,
 	});
 
 	// Render did not start yet
@@ -55,6 +58,7 @@ export const internalDeleteRender = async (
 		key,
 		region: input.region,
 		forcePathStyle: input.forcePathStyle,
+		requestHandler: input.requestHandler,
 	});
 
 	let files = await input.providerSpecifics.listObjects({
@@ -63,6 +67,7 @@ export const internalDeleteRender = async (
 		region: input.region,
 		expectedBucketOwner,
 		forcePathStyle: input.forcePathStyle,
+		requestHandler: input.requestHandler,
 	});
 
 	let totalSize = 0;
@@ -79,6 +84,7 @@ export const internalDeleteRender = async (
 			region: input.region,
 			providerSpecifics: input.providerSpecifics,
 			forcePathStyle: input.forcePathStyle,
+			requestHandler: input.requestHandler,
 		});
 		files = await input.providerSpecifics.listObjects({
 			bucketName: input.bucketName,
@@ -86,6 +92,7 @@ export const internalDeleteRender = async (
 			region: input.region,
 			expectedBucketOwner,
 			forcePathStyle: input.forcePathStyle,
+			requestHandler: input.requestHandler,
 		});
 	}
 
@@ -102,6 +109,6 @@ export const deleteRender = (input: DeleteRenderInput) => {
 	return internalDeleteRender({
 		...input,
 		providerSpecifics: awsImplementation,
-		forcePathStyle: false,
+		forcePathStyle: input.forcePathStyle ?? false,
 	});
 };

package/src/get-account-id.ts

@@ -10,7 +10,7 @@ export const getAccountIdImplementation: GetAccountId<
 > = async (options: {region: AwsRegion}) => {
 	validateAwsRegion(options.region);
 
-	const callerIdentity = await getStsClient(options.region).send(
+	const callerIdentity = await getStsClient(options.region, null).send(
 		new GetCallerIdentityCommand({}),
 	);
 

package/src/get-aws-client.ts

@@ -8,12 +8,14 @@ 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 {RequestHandler} from './types';
 
 export type GetAwsClientInput<T extends keyof ServiceMapping> = {
 	region: AwsRegion;
 	service: T;
 	customCredentials?: CustomCredentials<AwsProvider> | null;
 	forcePathStyle?: boolean;
+	requestHandler?: RequestHandler;
 };
 
 type SdkMapping = {
@@ -39,6 +41,7 @@ export const getAwsClient = <T extends keyof ServiceMapping>({
 	service,
 	customCredentials,
 	forcePathStyle,
+	requestHandler,
 }: GetAwsClientInput<T>): GetAwsClientOutput<T> => {
 	return {
 		client: getServiceClient({
@@ -46,6 +49,7 @@ export const getAwsClient = <T extends keyof ServiceMapping>({
 			service,
 			customCredentials: customCredentials ?? null,
 			forcePathStyle: forcePathStyle ?? false,
+			requestHandler,
 		}),
 		sdk: {
 			lambda: LambdaSDK,

package/src/get-buckets.ts

@@ -17,11 +17,13 @@ export const getRemotionBuckets: ProviderSpecifics<AwsProvider>['getBuckets'] =
 		region,
 		forceBucketName,
 		forcePathStyle,
+		requestHandler,
 	}): Promise<BucketWithLocation[]> => {
 		const {Buckets} = await getS3Client({
 			region,
 			customCredentials: null,
 			forcePathStyle,
+			requestHandler,
 		}).send(new ListBucketsCommand({}));
 		if (!Buckets) {
 			return [];
@@ -47,6 +49,7 @@ export const getRemotionBuckets: ProviderSpecifics<AwsProvider>['getBuckets'] =
 						region,
 						customCredentials: null,
 						forcePathStyle,
+						requestHandler,
 					}).send(
 						new GetBucketLocationCommand({
 							Bucket: bucket.Name as string,

package/src/get-compositions-on-lambda.ts

@@ -13,6 +13,7 @@ import {
 } from '@remotion/serverless-client';
 import {awsImplementation} from './aws-provider';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 export type GetCompositionsOnLambdaInput = {
 	chromiumOptions?: ChromiumOptions;
@@ -27,6 +28,7 @@ export type GetCompositionsOnLambdaInput = {
 	 */
 	dumpBrowserLogs?: boolean;
 	forcePathStyle?: boolean;
+	requestHandler?: RequestHandler | null;
 } & Partial<
 	ToOptions<typeof BrowserSafeApis.optionsMap.getCompositionsOnLambda>
 >;
@@ -50,6 +52,7 @@ export const getCompositionsOnLambda = async ({
 	dumpBrowserLogs,
 	offthreadVideoCacheSizeInBytes,
 	forcePathStyle,
+	requestHandler,
 }: GetCompositionsOnLambdaInput): Promise<GetCompositionsOnLambdaOutput> => {
 	const stringifiedInputProps = serializeOrThrow(inputProps, 'input-props');
 
@@ -69,6 +72,7 @@ export const getCompositionsOnLambda = async ({
 		providerSpecifics: awsImplementation,
 		forcePathStyle: forcePathStyle ?? false,
 		skipPutAcl: false,
+		requestHandler,
 	});
 
 	try {
@@ -90,6 +94,7 @@ export const getCompositionsOnLambda = async ({
 			},
 			region,
 			timeoutInTest: 120000,
+			requestHandler,
 		});
 		return res.compositions;
 	} catch (err) {

package/src/get-function-version.ts

@@ -5,17 +5,22 @@ import {
 } from '@remotion/serverless-client';
 import {awsImplementation} from './aws-provider';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 export const getFunctionVersion = async ({
 	functionName,
 	region,
 	logLevel,
+	requestHandler,
 }: {
 	functionName: string;
 	region: AwsRegion;
 	logLevel: LogLevel;
+	requestHandler: RequestHandler | null | undefined;
 }): Promise<string> => {
 	try {
+		// For now, we'll pass requestHandler to the awsImplementation if needed
+		// This might require deeper changes in the serverless-client framework
 		const result = await awsImplementation.callFunctionSync({
 			functionName,
 			payload: {
@@ -25,6 +30,7 @@ export const getFunctionVersion = async ({
 			region,
 			type: ServerlessRoutines.info,
 			timeoutInTest: 120000,
+			requestHandler,
 		});
 		return result.version;
 	} catch (err) {

package/src/get-functions.ts

@@ -6,24 +6,32 @@ import {getLambdaClient} from './aws-clients';
 import {DEFAULT_EPHEMERAL_STORAGE_IN_MB, RENDER_FN_PREFIX} from './constants';
 import {getFunctionVersion} from './get-function-version';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 export type GetFunctionsInput = {
 	region: AwsRegion;
 	compatibleOnly: boolean;
 	logLevel?: LogLevel;
+	requestHandler?: RequestHandler;
 };
 
 const getAllFunctions = async ({
 	existing,
 	nextMarker,
 	region,
+	requestHandler,
 }: {
 	existing: FunctionConfiguration[];
 	nextMarker: string | null;
 	region: AwsRegion;
+	requestHandler?: RequestHandler;
 }): Promise<FunctionConfiguration[]> => {
 	const allLambdas: FunctionConfiguration[] = [...existing];
-	const lambdas = await getLambdaClient(region).send(
+	const lambdas = await getLambdaClient(
+		region,
+		undefined,
+		requestHandler ?? null,
+	).send(
 		new ListFunctionsCommand({
 			Marker: nextMarker ?? undefined,
 		}),
@@ -41,6 +49,7 @@ const getAllFunctions = async ({
 			existing: allLambdas,
 			nextMarker: lambdas.NextMarker,
 			region,
+			requestHandler,
 		});
 	}
 
@@ -58,6 +67,7 @@ export const getFunctions = async (
 		existing: [],
 		nextMarker: null,
 		region: params.region,
+		requestHandler: params.requestHandler,
 	});
 
 	const remotionLambdas = lambdas.filter((f) => {
@@ -71,6 +81,7 @@ export const getFunctions = async (
 					functionName: fn.FunctionName as string,
 					region: params.region,
 					logLevel: params.logLevel ?? 'info',
+					requestHandler: params.requestHandler,
 				});
 				return version;
 			} catch {

package/src/get-render-progress.ts

@@ -5,6 +5,7 @@ import type {RenderProgress} from './constants';
 import {getRenderProgressPayload} from './make-lambda-payload';
 import {parseFunctionName} from './parse-function-name';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 export type GetRenderProgressInput = {
 	functionName: string;
@@ -15,6 +16,7 @@ export type GetRenderProgressInput = {
 	s3OutputProvider?: CustomCredentials<AwsProvider>;
 	forcePathStyle?: boolean;
 	skipLambdaInvocation?: boolean;
+	requestHandler?: RequestHandler;
 };
 
 /*
@@ -47,6 +49,7 @@ export const getRenderProgress = async (
 			memorySizeInMb: parsed.memorySizeInMb,
 			timeoutInMilliseconds: parsed.timeoutInSeconds * 1000,
 			functionName: input.functionName,
+			requestHandler: input.requestHandler,
 		});
 	}
 
@@ -57,6 +60,7 @@ export const getRenderProgress = async (
 			payload: getRenderProgressPayload(input),
 			region: input.region,
 			timeoutInTest: 120000,
+			requestHandler: input.requestHandler,
 		});
 	return result;
 };

package/src/get-s3-client.ts

@@ -3,20 +3,24 @@ 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 {RequestHandler} from './types';
 
 export const getS3Client = ({
 	region,
 	customCredentials,
 	forcePathStyle,
+	requestHandler,
 }: {
 	region: AwsRegion;
 	customCredentials: CustomCredentials<AwsProvider> | null;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 }): S3Client => {
 	return getServiceClient({
 		region: customCredentials?.region ?? region,
 		service: 's3',
 		customCredentials,
 		forcePathStyle,
+		requestHandler,
 	});
 };

package/src/get-service-client.ts

@@ -11,6 +11,7 @@ import {checkCredentials} from './check-credentials';
 import {getCredentials} from './get-credentials';
 import {getEnvVariable} from './get-env-variable';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 export type ServiceMapping = {
 	s3: S3Client;
@@ -26,11 +27,13 @@ const getCredentialsHash = ({
 	region,
 	service,
 	forcePathStyle,
+	requestHandler,
 }: {
 	region: AwsRegion;
 	customCredentials: CustomCredentials<AwsProvider> | null;
 	service: keyof ServiceMapping;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 }): string => {
 	const hashComponents: {[key: string]: unknown} = {};
 
@@ -68,6 +71,7 @@ const getCredentialsHash = ({
 	hashComponents.region = region;
 	hashComponents.service = service;
 	hashComponents.forcePathStyle = forcePathStyle;
+	hashComponents.requestHandler = requestHandler;
 
 	return random(JSON.stringify(hashComponents)).toString().replace('0.', '');
 };
@@ -89,11 +93,13 @@ export const getServiceClient = <T extends keyof ServiceMapping>({
 	service,
 	customCredentials,
 	forcePathStyle,
+	requestHandler,
 }: {
 	region: AwsRegion;
 	service: T;
 	customCredentials: CustomCredentials<AwsProvider> | null;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 }): ServiceMapping[T] => {
 	const Client = (() => {
 		if (service === 'cloudwatch') {
@@ -128,6 +134,7 @@ export const getServiceClient = <T extends keyof ServiceMapping>({
 		customCredentials,
 		service,
 		forcePathStyle,
+		requestHandler,
 	});
 
 	if (!_clients[key]) {
@@ -142,6 +149,13 @@ export const getServiceClient = <T extends keyof ServiceMapping>({
 					}
 				: undefined;
 
+		// Merge custom requestHandler with lambda options
+		const finalRequestHandler = requestHandler
+			? lambdaOptions
+				? {...requestHandler, ...lambdaOptions}
+				: requestHandler
+			: lambdaOptions;
+
 		const client = customCredentials
 			? new Client({
 					region: customCredentials.region ?? 'us-east-1',
@@ -153,20 +167,20 @@ export const getServiceClient = <T extends keyof ServiceMapping>({
 								}
 							: undefined,
 					endpoint: customCredentials.endpoint,
-					requestHandler: lambdaOptions,
+					requestHandler: finalRequestHandler,
 					forcePathStyle: customCredentials.forcePathStyle,
 					maxAttempts: service === 'lambda' ? 1 : undefined,
 				})
 			: getEnvVariable('REMOTION_SKIP_AWS_CREDENTIALS_CHECK')
 				? new Client({
 						region,
-						requestHandler: lambdaOptions,
+						requestHandler: finalRequestHandler,
 						maxAttempts: service === 'lambda' ? 1 : undefined,
 					})
 				: new Client({
 						region,
 						credentials: getCredentials(),
-						requestHandler: lambdaOptions,
+						requestHandler: finalRequestHandler,
 						maxAttempts: service === 'lambda' ? 1 : undefined,
 					});
 

package/src/get-sites.ts

@@ -5,6 +5,7 @@ import {getSitesKey} from './constants';
 import type {BucketWithLocation} from './get-buckets';
 import {makeS3ServeUrl} from './make-s3-url';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 type Site = {
 	sizeInBytes: number;
@@ -21,6 +22,7 @@ type MandatoryParameters = {
 type OptionalParameters = {
 	forceBucketName: string | null;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 };
 
 type GetSitesInternalInput = MandatoryParameters & OptionalParameters;
@@ -36,6 +38,7 @@ export const internalGetSites = async ({
 	forceBucketName,
 	providerSpecifics,
 	forcePathStyle,
+	requestHandler,
 }: GetSitesInternalInput & {
 	providerSpecifics: ProviderSpecifics<AwsProvider>;
 }): Promise<GetSitesOutput> => {
@@ -44,11 +47,13 @@ export const internalGetSites = async ({
 				region,
 				forceBucketName,
 				forcePathStyle,
+				requestHandler,
 			})
 		: await providerSpecifics.getBuckets({
 				region,
 				forceBucketName: null,
 				forcePathStyle,
+				requestHandler,
 			});
 	const accountId = await providerSpecifics.getAccountId({region});
 
@@ -61,6 +66,7 @@ export const internalGetSites = async ({
 			region,
 			expectedBucketOwner: accountId,
 			forcePathStyle,
+			requestHandler,
 		});
 
 		for (const file of ls) {
@@ -118,11 +124,13 @@ export const getSites = ({
 	region,
 	forceBucketName,
 	forcePathStyle,
+	requestHandler,
 }: GetSitesInput): Promise<GetSitesOutput> => {
 	return internalGetSites({
 		region,
 		forceBucketName: forceBucketName ?? null,
 		forcePathStyle: forcePathStyle ?? false,
 		providerSpecifics: awsImplementation,
+		requestHandler: requestHandler ?? null,
 	});
 };

package/src/head-file.ts

@@ -10,6 +10,7 @@ export const lambdaHeadFileImplementation: ProviderSpecifics<AwsProvider>['headF
 		region,
 		customCredentials,
 		forcePathStyle,
+		requestHandler,
 	}): Promise<{
 		LastModified?: Date | undefined;
 		ContentLength?: number | undefined;
@@ -18,6 +19,7 @@ export const lambdaHeadFileImplementation: ProviderSpecifics<AwsProvider>['headF
 			region,
 			customCredentials,
 			forcePathStyle,
+			requestHandler,
 		}).send(
 			new HeadObjectCommand({
 				Bucket: bucketName,

package/src/index.ts

@@ -105,6 +105,7 @@ export {
 	speculateFunctionName,
 	type SpeculateFunctionNameInput,
 } from './speculate-function-name';
+export type {RequestHandler} from './types';
 export {validateWebhookSignature} from './validate-webhook-signature';
 
 export const LambdaClientInternals = {

package/src/is-flaky-error.ts

@@ -34,7 +34,10 @@ export const isFlakyError = (err: Error): boolean => {
 		return true;
 	}
 
-	if (message.includes('Timed out while setting up the headless browser')) {
+	if (
+		message.includes('Timed out') &&
+		message.includes('while setting up the headless browser')
+	) {
 		return true;
 	}
 

package/src/lifecycle-rules.ts

@@ -8,17 +8,20 @@ import type {AwsProvider} from './aws-provider';
 import {getS3Client} from './get-s3-client';
 import {getLifeCycleRules} from './lifecycle';
 import type {AwsRegion} from './regions';
+import type {RequestHandler} from './types';
 
 const createLCRules = async ({
 	bucketName,
 	region,
 	customCredentials,
 	forcePathStyle,
+	requestHandler,
 }: {
 	bucketName: string;
 	region: AwsRegion;
 	customCredentials: CustomCredentials<AwsProvider> | null;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 }) => {
 	const lcRules = getLifeCycleRules();
 	// create the lifecyle rules
@@ -30,9 +33,12 @@ const createLCRules = async ({
 		createCommandInput,
 	);
 	try {
-		await getS3Client({region, customCredentials, forcePathStyle}).send(
-			createCommand,
-		);
+		await getS3Client({
+			region,
+			customCredentials,
+			forcePathStyle,
+			requestHandler,
+		}).send(createCommand);
 	} catch (err) {
 		if ((err as Error).stack?.includes('AccessDenied')) {
 			throw new Error(
@@ -47,19 +53,24 @@ const deleteLCRules = async ({
 	region,
 	customCredentials,
 	forcePathStyle,
+	requestHandler,
 }: {
 	bucketName: string;
 	region: AwsRegion;
 	customCredentials: CustomCredentials<AwsProvider> | null;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 }) => {
 	const deleteCommandInput = deleteLifeCycleInput({
 		bucketName,
 	});
 	try {
-		await getS3Client({region, customCredentials, forcePathStyle}).send(
-			new DeleteBucketLifecycleCommand(deleteCommandInput),
-		);
+		await getS3Client({
+			region,
+			customCredentials,
+			forcePathStyle,
+			requestHandler,
+		}).send(new DeleteBucketLifecycleCommand(deleteCommandInput));
 	} catch (err) {
 		if ((err as Error).stack?.includes('AccessDenied')) {
 			throw new Error(
@@ -75,12 +86,14 @@ export const applyLifeCyleOperation = async ({
 	region,
 	customCredentials,
 	forcePathStyle,
+	requestHandler,
 }: {
 	enableFolderExpiry: boolean | null;
 	bucketName: string;
 	region: AwsRegion;
 	customCredentials: CustomCredentials<AwsProvider> | null;
 	forcePathStyle: boolean;
+	requestHandler: RequestHandler | null;
 }) => {
 	if (enableFolderExpiry === null) {
 		return;
@@ -92,6 +105,7 @@ export const applyLifeCyleOperation = async ({
 			region,
 			customCredentials,
 			forcePathStyle,
+			requestHandler,
 		});
 	} else {
 		await deleteLCRules({
@@ -99,6 +113,7 @@ export const applyLifeCyleOperation = async ({
 			region,
 			customCredentials,
 			forcePathStyle,
+			requestHandler,
 		});
 	}
 };

package/src/list-objects.ts

@@ -11,12 +11,14 @@ export const lambdaLsImplementation: ProviderSpecifics<AwsProvider>['listObjects
 		expectedBucketOwner,
 		continuationToken,
 		forcePathStyle,
+		requestHandler,
 	}) => {
 		try {
 			const list = await getS3Client({
 				region,
 				customCredentials: null,
 				forcePathStyle,
+				requestHandler,
 			}).send(
 				new ListObjectsV2Command({
 					Bucket: bucketName,
@@ -42,6 +44,7 @@ export const lambdaLsImplementation: ProviderSpecifics<AwsProvider>['listObjects
 						region,
 						continuationToken: list.NextContinuationToken,
 						forcePathStyle,
+						requestHandler,
 					})),
 				];
 			}
@@ -67,6 +70,7 @@ export const lambdaLsImplementation: ProviderSpecifics<AwsProvider>['listObjects
 					region,
 					customCredentials: null,
 					forcePathStyle,
+					requestHandler,
 				}).send(
 					new ListObjectsV2Command({
 						Bucket: bucketName,

package/src/make-lambda-payload.ts

@@ -38,6 +38,7 @@ import {validateWebhook} from '@remotion/serverless-client';
 import type {GetRenderProgressInput} from './get-render-progress';
 import type {AwsRegion} from './regions';
 import type {RenderStillOnLambdaNonNullInput} from './render-still-on-lambda';
+import type {RequestHandler} from './types';
 import {validateLambdaCodec} from './validate-lambda-codec';
 import {validateServeUrl} from './validate-serveurl';
 
@@ -86,6 +87,7 @@ export type InnerRenderMediaOnLambdaInput = {
 	forcePathStyle: boolean;
 	metadata: Record<string, string> | null;
 	storageClass: StorageClass | null;
+	requestHandler: RequestHandler | null;
 } & ToOptions<typeof BrowserSafeApis.optionsMap.renderMediaOnLambda>;
 
 export const makeLambdaRenderMediaPayload = async ({
@@ -135,6 +137,7 @@ export const makeLambdaRenderMediaPayload = async ({
 	apiKey,
 	offthreadVideoThreads,
 	storageClass,
+	requestHandler,
 }: InnerRenderMediaOnLambdaInput): Promise<
 	ServerlessStartPayload<AwsProvider>
 > => {
@@ -168,6 +171,7 @@ export const makeLambdaRenderMediaPayload = async ({
 		providerSpecifics: awsImplementation,
 		forcePathStyle: forcePathStyle ?? false,
 		skipPutAcl: privacy === 'no-acl',
+		requestHandler: requestHandler ?? null,
 	});
 	return {
 		rendererFunctionName,
@@ -263,6 +267,7 @@ export const makeLambdaRenderStillPayload = async ({
 	forcePathStyle,
 	apiKey,
 	storageClass,
+	requestHandler,
 }: RenderStillOnLambdaNonNullInput): Promise<
 	ServerlessPayloads<AwsProvider>[ServerlessRoutines.still]
 > => {
@@ -284,6 +289,7 @@ export const makeLambdaRenderStillPayload = async ({
 		providerSpecifics: awsImplementation,
 		forcePathStyle,
 		skipPutAcl: privacy === 'no-acl',
+		requestHandler,
 	});
 
 	return {