@remotion/lambda 3.2.21 → 3.2.23

package/dist/functions/helpers/read-with-progress.d.ts

@@ -1,16 +1,18 @@
 import type { AwsRegion } from '../../pricing/aws-regions';
+import type { CustomCredentials } from '../../shared/aws-clients';
 export declare type LambdaReadFileProgress = (progress: {
     totalSize: number;
     downloaded: number;
     percent: number;
 }) => unknown;
-export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, }: {
+export declare const lambdaDownloadFileWithProgress: ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, customCredentials, }: {
     bucketName: string;
     key: string;
     region: AwsRegion;
     expectedBucketOwner: string;
     outputPath: string;
     onProgress: LambdaReadFileProgress;
+    customCredentials: CustomCredentials | null;
 }) => Promise<{
     sizeInBytes: number;
     to: string;

package/dist/functions/helpers/read-with-progress.js

@@ -5,8 +5,8 @@ const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
 const renderer_1 = require("@remotion/renderer");
 const aws_clients_1 = require("../../shared/aws-clients");
-const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, }) => {
-    const client = (0, aws_clients_1.getS3Client)(region);
+const lambdaDownloadFileWithProgress = async ({ bucketName, key, region, expectedBucketOwner, outputPath, onProgress, customCredentials, }) => {
+    const client = (0, aws_clients_1.getS3Client)(region, customCredentials);
     const command = new client_s3_1.GetObjectCommand({
         Bucket: bucketName,
         ExpectedBucketOwner: expectedBucketOwner,

package/dist/functions/helpers/write-lambda-error.js

@@ -34,6 +34,7 @@ const writeLambdaError = async ({ bucketName, renderId, errorInfo, expectedBucke
         privacy: 'private',
         expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
 };
 exports.writeLambdaError = writeLambdaError;

package/dist/functions/helpers/write-post-render-data.js

@@ -12,6 +12,7 @@ const writePostRenderData = async ({ bucketName, renderId, postRenderData, expec
         expectedBucketOwner,
         region,
         downloadBehavior: null,
+        customCredentials: null,
     });
 };
 exports.writePostRenderData = writePostRenderData;

package/dist/functions/launch.js

@@ -62,7 +62,7 @@ const callFunctionWithRetry = async (payload, retries = 0) => {
     }
 };
 const innerLaunchHandler = async (params, options) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
     }
@@ -181,6 +181,7 @@ const innerLaunchHandler = async (params, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId: params.renderId,
         outName: (_b = params.outName) !== null && _b !== void 0 ? _b : undefined,
+        privacy: params.privacy,
     };
     await (0, io_1.lambdaWriteFile)({
         bucketName: params.bucketName,
@@ -190,6 +191,7 @@ const innerLaunchHandler = async (params, options) => {
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     await Promise.all(lambdaPayloads.map(async (payload, index) => {
         const callingLambdaTimer = (0, timer_1.timer)('Calling chunk ' + index);
@@ -223,6 +225,7 @@ const innerLaunchHandler = async (params, options) => {
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
             downloadBehavior: null,
+            customCredentials: null,
         }).catch((err) => {
             (0, write_lambda_error_1.writeLambdaError)({
                 bucketName: params.bucketName,
@@ -260,7 +263,9 @@ const innerLaunchHandler = async (params, options) => {
     if (!encodingStop) {
         encodingStop = Date.now();
     }
-    const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName);
+    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, params.bucketName, typeof params.outName === 'string' || typeof params.outName === 'undefined'
+        ? null
+        : (_d = (_c = params.outName) === null || _c === void 0 ? void 0 : _c.s3OutputProvider) !== null && _d !== void 0 ? _d : null);
     const outputSize = fs_1.default.statSync(outfile);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
@@ -270,6 +275,7 @@ const innerLaunchHandler = async (params, options) => {
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: params.downloadBehavior,
+        customCredentials,
     });
     let chunkProm = Promise.resolve();
     // TODO: Enable in a later release
@@ -332,6 +338,7 @@ const innerLaunchHandler = async (params, options) => {
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     const errorExplanationsProm = (0, inspect_errors_1.inspectErrors)({
         contents,
@@ -363,7 +370,7 @@ const innerLaunchHandler = async (params, options) => {
         outputFile: {
             lastModified: Date.now(),
             size: outputSize.size,
-            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, params.bucketName),
+            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, params.bucketName, customCredentials),
         },
     });
     await finalEncodingProgressProm;
@@ -378,6 +385,7 @@ const innerLaunchHandler = async (params, options) => {
         bucketName: params.bucketName,
         key: (0, constants_1.initalizedMetadataKey)(params.renderId),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        customCredentials: null,
     });
     await Promise.all([cleanupChunksProm, fs_1.default.promises.rm(outfile)]);
 };

package/dist/functions/progress.js

@@ -6,6 +6,7 @@ const constants_1 = require("../shared/constants");
 const get_current_region_1 = require("./helpers/get-current-region");
 const get_progress_1 = require("./helpers/get-progress");
 const progressHandler = (lambdaParams, options) => {
+    var _a;
     if (lambdaParams.type !== constants_1.LambdaRoutines.status) {
         throw new TypeError('Expected status type');
     }
@@ -22,6 +23,7 @@ const progressHandler = (lambdaParams, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
         timeoutInMiliseconds: options.timeoutInMiliseconds,
+        customCredentials: (_a = lambdaParams.s3OutputProvider) !== null && _a !== void 0 ? _a : null,
     });
 };
 exports.progressHandler = progressHandler;

package/dist/functions/renderer.js

@@ -87,6 +87,7 @@ const renderHandler = async (params, options, logs) => {
                     region: (0, get_current_region_1.getCurrentRegionInFunction)(),
                     expectedBucketOwner: options.expectedBucketOwner,
                     downloadBehavior: null,
+                    customCredentials: null,
                 }).catch((err) => reject(err));
             },
             puppeteerInstance: browserInstance,
@@ -155,6 +156,7 @@ const renderHandler = async (params, options, logs) => {
         privacy: params.privacy,
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     await Promise.all([
         fs_1.default.promises.rm(outputLocation, { recursive: true }),
@@ -172,6 +174,7 @@ const renderHandler = async (params, options, logs) => {
             privacy: 'private',
             expectedBucketOwner: options.expectedBucketOwner,
             downloadBehavior: null,
+            customCredentials: null,
         }),
     ]);
 };

package/dist/functions/start.js

@@ -32,6 +32,7 @@ const startHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         key: (0, constants_1.initalizedMetadataKey)(renderId),
         privacy: 'private',
+        customCredentials: null,
     });
     const payload = {
         type: constants_1.LambdaRoutines.launch,

package/dist/functions/still.js

@@ -83,6 +83,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId,
         outName: (_b = lambdaParams.outName) !== null && _b !== void 0 ? _b : undefined,
+        privacy: lambdaParams.privacy,
     };
     await (0, io_1.lambdaWriteFile)({
         bucketName,
@@ -92,6 +93,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         privacy: 'private',
         expectedBucketOwner: options.expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
     await (0, renderer_1.renderStill)({
         composition,
@@ -110,7 +112,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
         downloadMap,
     });
-    const { key, renderBucketName } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
+    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, (0, expected_out_name_1.getCredentialsFromOutName)(lambdaParams.outName));
     const { size } = await fs_1.default.promises.stat(outputPath);
     await (0, io_1.lambdaWriteFile)({
         bucketName: renderBucketName,
@@ -120,6 +122,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         downloadBehavior: lambdaParams.downloadBehavior,
+        customCredentials,
     });
     await fs_1.default.promises.rm(outputPath, { recursive: true });
     const estimatedPrice = (0, estimate_price_1.estimatePrice)({
@@ -133,7 +136,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         diskSizeInMb: constants_1.MAX_EPHEMERAL_STORAGE_IN_MB,
     });
     return {
-        output: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName),
+        output: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials),
         size,
         bucketName,
         estimatedPrice: (0, format_costs_info_1.formatCostsInfo)(estimatedPrice),

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import type { DeleteFunctionInput } from './api/delete-function';
 import { deleteFunction } from './api/delete-function';
+import { deleteRender } from './api/delete-render';
 import type { DeleteSiteInput, DeleteSiteOutput } from './api/delete-site';
 import { deleteSite } from './api/delete-site';
 import type { DeployFunctionInput, DeployFunctionOutput } from './api/deploy-function';
@@ -34,7 +35,8 @@ import { renderStillOnLambda } from './api/render-still-on-lambda';
 import type { LambdaLSInput, LambdaLsReturnType } from './functions/helpers/io';
 import { LambdaInternals } from './internals';
 import type { AwsRegion } from './pricing/aws-regions';
+import type { CustomCredentials } from './shared/aws-clients';
 import type { RenderProgress } from './shared/constants';
 import type { LambdaArchitecture } from './shared/validate-architecture';
-export { deleteSite, deployFunction, deploySite, downloadMedia, downloadVideo, getFunctions, getUserPolicy, getRolePolicy, getSites, getOrCreateBucket, getRenderProgress, renderVideoOnLambda, renderMediaOnLambda, simulatePermissions, deleteFunction, getFunctionInfo, estimatePrice, LambdaInternals, renderStillOnLambda, getRegions, getAwsClient, presignUrl, };
-export type { AwsRegion, RenderProgress, DeploySiteInput, DeploySiteOutput, LambdaLsReturnType, LambdaLSInput, DeleteSiteInput, DeleteSiteOutput, EstimatePriceInput, DeployFunctionInput, DeployFunctionOutput, DeleteFunctionInput, GetFunctionInfoInput, FunctionInfo, GetFunctionsInput, GetSitesInput, GetSitesOutput, DownloadMediaInput, DownloadMediaOutput, GetOrCreateBucketInput, GetOrCreateBucketOutput, GetRenderInput, RenderMediaOnLambdaInput, RenderMediaOnLambdaOutput, RenderStillOnLambdaInput, RenderStillOnLambdaOutput, SimulatePermissionsInput, SimulatePermissionsOutput, GetAwsClientInput, GetAwsClientOutput, LambdaArchitecture, };
+export { deleteSite, deployFunction, deploySite, downloadMedia, downloadVideo, getFunctions, getUserPolicy, getRolePolicy, getSites, getOrCreateBucket, getRenderProgress, renderVideoOnLambda, renderMediaOnLambda, simulatePermissions, deleteFunction, getFunctionInfo, estimatePrice, LambdaInternals, renderStillOnLambda, getRegions, getAwsClient, presignUrl, deleteRender, };
+export type { AwsRegion, RenderProgress, DeploySiteInput, DeploySiteOutput, LambdaLsReturnType, LambdaLSInput, DeleteSiteInput, DeleteSiteOutput, EstimatePriceInput, DeployFunctionInput, DeployFunctionOutput, DeleteFunctionInput, GetFunctionInfoInput, FunctionInfo, GetFunctionsInput, GetSitesInput, GetSitesOutput, DownloadMediaInput, DownloadMediaOutput, GetOrCreateBucketInput, GetOrCreateBucketOutput, GetRenderInput, RenderMediaOnLambdaInput, RenderMediaOnLambdaOutput, RenderStillOnLambdaInput, RenderStillOnLambdaOutput, SimulatePermissionsInput, SimulatePermissionsOutput, GetAwsClientInput, GetAwsClientOutput, LambdaArchitecture, CustomCredentials, };

package/dist/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.presignUrl = exports.getAwsClient = exports.getRegions = exports.renderStillOnLambda = exports.LambdaInternals = exports.estimatePrice = exports.getFunctionInfo = exports.deleteFunction = exports.simulatePermissions = exports.renderMediaOnLambda = exports.renderVideoOnLambda = exports.getRenderProgress = exports.getOrCreateBucket = exports.getSites = exports.getRolePolicy = exports.getUserPolicy = exports.getFunctions = exports.downloadVideo = exports.downloadMedia = exports.deploySite = exports.deployFunction = exports.deleteSite = void 0;
+exports.deleteRender = exports.presignUrl = exports.getAwsClient = exports.getRegions = exports.renderStillOnLambda = exports.LambdaInternals = exports.estimatePrice = exports.getFunctionInfo = exports.deleteFunction = exports.simulatePermissions = exports.renderMediaOnLambda = exports.renderVideoOnLambda = exports.getRenderProgress = exports.getOrCreateBucket = exports.getSites = exports.getRolePolicy = exports.getUserPolicy = exports.getFunctions = exports.downloadVideo = exports.downloadMedia = exports.deploySite = exports.deployFunction = exports.deleteSite = void 0;
 const delete_function_1 = require("./api/delete-function");
 Object.defineProperty(exports, "deleteFunction", { enumerable: true, get: function () { return delete_function_1.deleteFunction; } });
+const delete_render_1 = require("./api/delete-render");
+Object.defineProperty(exports, "deleteRender", { enumerable: true, get: function () { return delete_render_1.deleteRender; } });
 const delete_site_1 = require("./api/delete-site");
 Object.defineProperty(exports, "deleteSite", { enumerable: true, get: function () { return delete_site_1.deleteSite; } });
 const deploy_function_1 = require("./api/deploy-function");

package/dist/shared/aws-clients.d.ts

@@ -11,9 +11,20 @@ export declare type ServiceMapping = {
     lambda: LambdaClient;
     servicequotas: ServiceQuotasClient;
 };
-export declare const getServiceClient: <T extends keyof ServiceMapping>(region: AwsRegion, service: T) => ServiceMapping[T];
+export declare type CustomCredentialsWithoutSensitiveData = {
+    endpoint: string;
+};
+export declare type CustomCredentials = CustomCredentialsWithoutSensitiveData & {
+    accessKeyId: string | null;
+    secretAccessKey: string | null;
+};
+export declare const getServiceClient: <T extends keyof ServiceMapping>({ region, service, customCredentials, }: {
+    region: AwsRegion;
+    service: T;
+    customCredentials: CustomCredentials | null;
+}) => ServiceMapping[T];
 export declare const getCloudWatchLogsClient: (region: AwsRegion) => CloudWatchLogsClient;
-export declare const getS3Client: (region: AwsRegion) => S3Client;
+export declare const getS3Client: (region: AwsRegion, customCredentials: CustomCredentials | null) => S3Client;
 export declare const getLambdaClient: (region: AwsRegion) => LambdaClient;
 export declare const getIamClient: (region: AwsRegion) => IAMClient;
 export declare const getServiceQuotasClient: (region: AwsRegion) => ServiceQuotasClient;

package/dist/shared/aws-clients.js

@@ -28,11 +28,17 @@ const getCredentials = () => {
     }
     return undefined;
 };
-const getCredentialsKey = () => JSON.stringify(getCredentials());
-const getServiceClient = (region, service) => {
-    if (!_clients[region]) {
-        _clients[region] = {};
-    }
+const getKey = ({ credentials, customCredentials, region, service, }) => [
+    credentials === null || credentials === void 0 ? void 0 : credentials.accessKeyId,
+    credentials === null || credentials === void 0 ? void 0 : credentials.secretAccessKey,
+    customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.accessKeyId,
+    customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint,
+    customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.secretAccessKey,
+    region,
+    service,
+].join('-');
+const getServiceClient = ({ region, service, customCredentials, }) => {
+    var _a;
     const Client = (() => {
         if (service === 'cloudwatch') {
             return client_cloudwatch_logs_1.CloudWatchLogsClient;
@@ -49,43 +55,67 @@ const getServiceClient = (region, service) => {
         if (service === 'servicequotas') {
             return client_service_quotas_1.ServiceQuotasClient;
         }
+        throw new TypeError('unknown client ' + service);
     })();
-    const key = getCredentialsKey();
-    // @ts-expect-error
-    if (!_clients[region][key]) {
-        // @ts-expect-error
-        _clients[region][key] = {};
-    }
-    // @ts-expect-error
-    if (!_clients[region][key][service]) {
+    const key = getKey({
+        credentials: (_a = getCredentials()) !== null && _a !== void 0 ? _a : null,
+        region,
+        customCredentials,
+        service,
+    });
+    if (!_clients[key]) {
         (0, check_credentials_1.checkCredentials)();
-        // @ts-expect-error
-        _clients[region][key][service] = new Client({
-            region,
-            credentials: getCredentials(),
-        });
+        if (customCredentials) {
+            _clients[key] = new Client({
+                region: 'us-east-1',
+                credentials: customCredentials.accessKeyId && customCredentials.secretAccessKey
+                    ? {
+                        accessKeyId: customCredentials.accessKeyId,
+                        secretAccessKey: customCredentials.secretAccessKey,
+                    }
+                    : undefined,
+                endpoint: customCredentials.endpoint,
+            });
+        }
+        else {
+            _clients[key] = new Client({
+                region,
+                credentials: getCredentials(),
+            });
+        }
     }
-    // @ts-expect-error
-    return _clients[region][key][service];
+    return _clients[key];
 };
 exports.getServiceClient = getServiceClient;
 const getCloudWatchLogsClient = (region) => {
-    return (0, exports.getServiceClient)(region, 'cloudwatch');
+    return (0, exports.getServiceClient)({
+        region,
+        service: 'cloudwatch',
+        customCredentials: null,
+    });
 };
 exports.getCloudWatchLogsClient = getCloudWatchLogsClient;
-const getS3Client = (region) => {
-    return (0, exports.getServiceClient)(region, 's3');
+const getS3Client = (region, customCredentials) => {
+    return (0, exports.getServiceClient)({ region, service: 's3', customCredentials });
 };
 exports.getS3Client = getS3Client;
 const getLambdaClient = (region) => {
-    return (0, exports.getServiceClient)(region, 'lambda');
+    return (0, exports.getServiceClient)({
+        region,
+        service: 'lambda',
+        customCredentials: null,
+    });
 };
 exports.getLambdaClient = getLambdaClient;
 const getIamClient = (region) => {
-    return (0, exports.getServiceClient)(region, 'iam');
+    return (0, exports.getServiceClient)({ region, service: 'iam', customCredentials: null });
 };
 exports.getIamClient = getIamClient;
 const getServiceQuotasClient = (region) => {
-    return (0, exports.getServiceClient)(region, 'servicequotas');
+    return (0, exports.getServiceClient)({
+        region,
+        service: 'servicequotas',
+        customCredentials: null,
+    });
 };
 exports.getServiceQuotasClient = getServiceQuotasClient;

package/dist/shared/constants.d.ts

@@ -3,6 +3,7 @@ import type { VideoConfig } from 'remotion';
 import type { ChunkRetry } from '../functions/helpers/get-retry-stats';
 import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';
 import type { AwsRegion } from '../pricing/aws-regions';
+import type { CustomCredentials, CustomCredentialsWithoutSensitiveData } from './aws-clients';
 import type { DownloadBehavior } from './content-disposition-header';
 import type { ExpensiveChunk } from './get-most-expensive-chunks';
 import type { LambdaArchitecture } from './validate-architecture';
@@ -62,10 +63,17 @@ export declare const getErrorFileName: ({ renderId, chunk, attempt, }: {
 export declare type OutNameInput = string | {
     bucketName: string;
     key: string;
+    s3OutputProvider?: CustomCredentials;
+};
+export declare type OutNameInputWithoutCredentials = string | {
+    bucketName: string;
+    key: string;
+    s3OutputProvider?: CustomCredentialsWithoutSensitiveData;
 };
 export declare type OutNameOutput = {
     renderBucketName: string;
     key: string;
+    customCredentials: CustomCredentials | null;
 };
 export declare const optimizationProfile: (siteId: string, compositionId: string) => string;
 export declare const getSitesKey: (siteId: string) => string;
@@ -151,6 +159,7 @@ export declare type LambdaPayloads = {
         bucketName: string;
         renderId: string;
         version: string;
+        s3OutputProvider?: CustomCredentials;
     };
     renderer: {
         concurrencyPerLambda: number;
@@ -229,7 +238,8 @@ export declare type RenderMetadata = {
     lambdaVersion: string;
     region: AwsRegion;
     renderId: string;
-    outName: OutNameInput | undefined;
+    outName: OutNameInputWithoutCredentials | undefined;
+    privacy: Privacy;
 };
 export declare type PostRenderData = {
     cost: {

package/dist/shared/constants.js

@@ -60,13 +60,19 @@ exports.outName = outName;
 const outStillName = (renderId, imageFormat) => `${(0, exports.rendersPrefix)(renderId)}/out.${imageFormat}`;
 exports.outStillName = outStillName;
 const customOutName = (renderId, bucketName, name) => {
+    var _a;
     if (typeof name === 'string') {
         return {
             renderBucketName: bucketName,
             key: `${(0, exports.rendersPrefix)(renderId)}/${name}`,
+            customCredentials: null,
         };
     }
-    return { key: name.key, renderBucketName: name.bucketName };
+    return {
+        key: name.key,
+        renderBucketName: name.bucketName,
+        customCredentials: (_a = name.s3OutputProvider) !== null && _a !== void 0 ? _a : null,
+    };
 };
 exports.customOutName = customOutName;
 const postRenderDataKey = (renderId) => {