@remotion/lambda 3.2.21 → 3.2.23

package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts

@@ -6,9 +6,6 @@ export declare const planFrameRanges: ({ framesPerLambda, optimization, shouldUs
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [
-        number,
-        number
-    ][];
+    chunks: [number, number][];
     didUseOptimization: boolean;
 };

package/dist/functions/chunk-optimization/s3-optimization-file.js

@@ -13,6 +13,7 @@ const writeOptimization = async ({ bucketName, optimization, compositionId, site
         privacy: 'private',
         expectedBucketOwner,
         downloadBehavior: null,
+        customCredentials: null,
     });
 };
 exports.writeOptimization = writeOptimization;

package/dist/functions/helpers/expected-out-name.d.ts

@@ -1,2 +1,4 @@
-import type { OutNameOutput, RenderMetadata } from '../../defaults';
-export declare const getExpectedOutName: (renderMetadata: RenderMetadata, bucketName: string) => OutNameOutput;
+import type { OutNameInput, OutNameOutput, RenderMetadata } from '../../defaults';
+import type { CustomCredentials } from '../../shared/aws-clients';
+export declare const getCredentialsFromOutName: (name: OutNameInput | null) => CustomCredentials | null;
+export declare const getExpectedOutName: (renderMetadata: RenderMetadata, bucketName: string, customCredentials: CustomCredentials | null) => OutNameOutput;

package/dist/functions/helpers/expected-out-name.js

@@ -1,24 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpectedOutName = void 0;
+exports.getExpectedOutName = exports.getCredentialsFromOutName = void 0;
 const renderer_1 = require("@remotion/renderer");
 const defaults_1 = require("../../defaults");
 const validate_outname_1 = require("../../shared/validate-outname");
-const getExpectedOutName = (renderMetadata, bucketName) => {
-    if (renderMetadata.outName) {
-        (0, validate_outname_1.validateOutname)(renderMetadata.outName);
-        return (0, defaults_1.customOutName)(renderMetadata.renderId, bucketName, renderMetadata.outName);
+const get_custom_out_name_1 = require("./get-custom-out-name");
+const getCredentialsFromOutName = (name) => {
+    var _a;
+    if (typeof name === 'string') {
+        return null;
+    }
+    if (name === null) {
+        return null;
+    }
+    if (typeof name === 'undefined') {
+        return null;
+    }
+    return (_a = name.s3OutputProvider) !== null && _a !== void 0 ? _a : null;
+};
+exports.getCredentialsFromOutName = getCredentialsFromOutName;
+const getExpectedOutName = (renderMetadata, bucketName, customCredentials) => {
+    const outNameValue = (0, get_custom_out_name_1.getCustomOutName)({
+        customCredentials,
+        renderMetadata,
+    });
+    if (outNameValue) {
+        (0, validate_outname_1.validateOutname)(outNameValue);
+        return (0, defaults_1.customOutName)(renderMetadata.renderId, bucketName, outNameValue);
     }
     if (renderMetadata.type === 'still') {
         return {
             renderBucketName: bucketName,
             key: (0, defaults_1.outStillName)(renderMetadata.renderId, renderMetadata.imageFormat),
+            customCredentials: null,
         };
     }
     if (renderMetadata.type === 'video') {
         return {
             renderBucketName: bucketName,
             key: (0, defaults_1.outName)(renderMetadata.renderId, renderer_1.RenderInternals.getFileExtensionFromCodec(renderMetadata.codec, 'final')),
+            customCredentials: null,
         };
     }
     throw new TypeError('no type passed');

package/dist/functions/helpers/find-output-file-in-bucket.d.ts

@@ -1,12 +1,14 @@
 import type { AwsRegion } from '../..';
+import type { CustomCredentials } from '../../shared/aws-clients';
 import type { RenderMetadata } from '../../shared/constants';
 export declare type OutputFileMetadata = {
     url: string;
     size: number;
     lastModified: number;
 };
-export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, }: {
+export declare const findOutputFileInBucket: ({ region, renderMetadata, bucketName, customCredentials, }: {
     region: AwsRegion;
     renderMetadata: RenderMetadata;
     bucketName: string;
+    customCredentials: CustomCredentials | null;
 }) => Promise<OutputFileMetadata | null>;

package/dist/functions/helpers/find-output-file-in-bucket.js

@@ -6,21 +6,21 @@ const suggested_policy_1 = require("../../api/iam-validation/suggested-policy");
 const aws_clients_1 = require("../../shared/aws-clients");
 const expected_out_name_1 = require("./expected-out-name");
 const get_output_url_from_metadata_1 = require("./get-output-url-from-metadata");
-const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, }) => {
+const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, customCredentials, }) => {
     var _a;
     if (!renderMetadata) {
         throw new Error('unexpectedly did not get renderMetadata');
     }
-    const expectedOutData = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
+    const { renderBucketName, key } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, null);
     try {
-        const head = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.HeadObjectCommand({
-            Bucket: expectedOutData.renderBucketName,
-            Key: expectedOutData.key,
+        const head = await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.HeadObjectCommand({
+            Bucket: renderBucketName,
+            Key: key,
         }));
         return {
             lastModified: (_a = head.LastModified) === null || _a === void 0 ? void 0 : _a.getTime(),
             size: head.ContentLength,
-            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName),
+            url: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials),
         };
     }
     catch (err) {
@@ -30,7 +30,9 @@ const findOutputFileInBucket = async ({ region, renderMetadata, bucketName, }) =
         if (err.message === 'UnknownError' ||
             err.$metadata
                 .httpStatusCode === 403) {
-            throw new Error(`Unable to access item "${expectedOutData.key}" from bucket "${expectedOutData.renderBucketName}". The "${suggested_policy_1.ROLE_NAME}" role must have permission for both "s3:GetObject" and "s3:ListBucket" actions.`);
+            throw new Error(`Unable to access item "${key}" from bucket "${renderBucketName}" ${(customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint)
+                ? `(S3 Endpoint = ${customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.endpoint})`
+                : ''}. The "${suggested_policy_1.ROLE_NAME}" role must have permission for both "s3:GetObject" and "s3:ListBucket" actions.`);
         }
         throw err;
     }

package/dist/functions/helpers/get-custom-out-name.d.ts

@@ -0,0 +1,6 @@
+import type { OutNameInput, RenderMetadata } from '../../defaults';
+import type { CustomCredentials } from '../../shared/aws-clients';
+export declare const getCustomOutName: ({ renderMetadata, customCredentials, }: {
+    renderMetadata: RenderMetadata;
+    customCredentials: CustomCredentials | null;
+}) => OutNameInput | null;

package/dist/functions/helpers/get-custom-out-name.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomOutName = void 0;
+const getCustomOutName = ({ renderMetadata, customCredentials, }) => {
+    var _a, _b;
+    if (!renderMetadata.outName) {
+        return null;
+    }
+    if (typeof renderMetadata.outName === 'string') {
+        return renderMetadata.outName;
+    }
+    if (renderMetadata.outName.s3OutputProvider) {
+        if (!customCredentials && renderMetadata.privacy !== 'public') {
+            throw new TypeError(`The file was rendered with a custom S3 implementation and is not public, but no custom credentials were passed to downloadMedia().`);
+        }
+        return {
+            bucketName: renderMetadata.outName.bucketName,
+            key: renderMetadata.outName.key,
+            s3OutputProvider: {
+                endpoint: renderMetadata.outName.s3OutputProvider.endpoint,
+                accessKeyId: (_a = customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.accessKeyId) !== null && _a !== void 0 ? _a : null,
+                secretAccessKey: (_b = customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.secretAccessKey) !== null && _b !== void 0 ? _b : null,
+            },
+        };
+    }
+    return {
+        bucketName: renderMetadata.outName.bucketName,
+        key: renderMetadata.outName.key,
+    };
+};
+exports.getCustomOutName = getCustomOutName;

package/dist/functions/helpers/get-output-url-from-metadata.d.ts

@@ -1,2 +1,3 @@
 import type { RenderMetadata } from '../../defaults';
-export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string) => string;
+import type { CustomCredentials } from '../../shared/aws-clients';
+export declare const getOutputUrlFromMetadata: (renderMetadata: RenderMetadata, bucketName: string, customCredentials: CustomCredentials | null) => string;

package/dist/functions/helpers/get-output-url-from-metadata.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputUrlFromMetadata = void 0;
 const expected_out_name_1 = require("./expected-out-name");
 const get_current_region_1 = require("./get-current-region");
-const getOutputUrlFromMetadata = (renderMetadata, bucketName) => {
-    const outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName);
+const getOutputUrlFromMetadata = (renderMetadata, bucketName, customCredentials) => {
+    const outname = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials);
     return `https://s3.${(0, get_current_region_1.getCurrentRegionInFunction)()}.amazonaws.com/${outname.renderBucketName}/${outname.key}`;
 };
 exports.getOutputUrlFromMetadata = getOutputUrlFromMetadata;

package/dist/functions/helpers/get-progress.d.ts

@@ -1,10 +1,12 @@
 import type { AwsRegion } from '../../pricing/aws-regions';
+import type { CustomCredentials } from '../../shared/aws-clients';
 import type { RenderProgress } from '../../shared/constants';
-export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, }: {
+export declare const getProgress: ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, customCredentials, }: {
     bucketName: string;
     renderId: string;
     expectedBucketOwner: string;
     region: AwsRegion;
     memorySizeInMb: number;
     timeoutInMiliseconds: number;
+    customCredentials: CustomCredentials | null;
 }) => Promise<RenderProgress>;

package/dist/functions/helpers/get-progress.js

@@ -23,7 +23,7 @@ const get_retry_stats_1 = require("./get-retry-stats");
 const get_time_to_finish_1 = require("./get-time-to-finish");
 const inspect_errors_1 = require("./inspect-errors");
 const io_1 = require("./io");
-const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, }) => {
+const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMiliseconds, customCredentials, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const postRenderData = await (0, get_post_render_data_1.getPostRenderData)({
         bucketName,
@@ -32,7 +32,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         expectedBucketOwner,
     });
     if (postRenderData) {
-        const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName);
+        const outData = (0, expected_out_name_1.getExpectedOutName)(postRenderData.renderMetadata, bucketName, customCredentials);
         return {
             bucket: bucketName,
             renderSize: postRenderData.renderSize,
@@ -112,6 +112,7 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
             bucketName,
             renderMetadata,
             region,
+            customCredentials,
         })
         : null;
     const accruedSoFar = Number((0, calculate_price_from_bucket_1.estimatePriceFromBucket)({
@@ -219,10 +220,11 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
         }),
         retriesInfo,
         outKey: outputFile && renderMetadata
-            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).key
+            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials).key
             : null,
         outBucket: outputFile && renderMetadata
-            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName).renderBucketName
+            ? (0, expected_out_name_1.getExpectedOutName)(renderMetadata, bucketName, customCredentials)
+                .renderBucketName
             : null,
         mostExpensiveFrameRanges: null,
     };

package/dist/functions/helpers/io.d.ts

@@ -2,6 +2,7 @@ import type { _Object } from '@aws-sdk/client-s3';
 import type { ReadStream } from 'fs';
 import type { Readable } from 'stream';
 import type { AwsRegion } from '../../pricing/aws-regions';
+import type { CustomCredentials } from '../../shared/aws-clients';
 import type { Privacy } from '../../shared/constants';
 import type { DownloadBehavior } from '../../shared/content-disposition-header';
 export declare type LambdaLSInput = {
@@ -13,12 +14,13 @@ export declare type LambdaLSInput = {
 };
 export declare type LambdaLsReturnType = Promise<_Object[]>;
 export declare const lambdaLs: ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }: LambdaLSInput) => LambdaLsReturnType;
-export declare const lambdaDeleteFile: ({ bucketName, key, region, }: {
+export declare const lambdaDeleteFile: ({ bucketName, key, region, customCredentials, }: {
     region: AwsRegion;
     bucketName: string;
     key: string;
+    customCredentials: CustomCredentials | null;
 }) => Promise<void>;
-export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, }: {
+export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, customCredentials, }: {
     bucketName: string;
     key: string;
     body: ReadStream | string;
@@ -26,6 +28,7 @@ export declare const lambdaWriteFile: ({ bucketName, key, body, region, privacy,
     privacy: Privacy;
     expectedBucketOwner: string | null;
     downloadBehavior: DownloadBehavior | null;
+    customCredentials: CustomCredentials | null;
 }) => Promise<void>;
 export declare const lambdaReadFile: ({ bucketName, key, region, expectedBucketOwner, }: {
     bucketName: string;

package/dist/functions/helpers/io.js

@@ -11,7 +11,7 @@ const content_disposition_header_1 = require("../../shared/content-disposition-h
 const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, continuationToken, }) => {
     var _a, _b, _c;
     try {
-        const list = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.ListObjectsV2Command({
+        const list = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.ListObjectsV2Command({
             Bucket: bucketName,
             Prefix: prefix,
             ExpectedBucketOwner: expectedBucketOwner !== null && expectedBucketOwner !== void 0 ? expectedBucketOwner : undefined,
@@ -37,7 +37,7 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
         }
         // Prevent from accessing a foreign bucket, retry without ExpectedBucketOwner and see if it works. If it works then it's an owner mismatch.
         if ((_c = err.stack) === null || _c === void 0 ? void 0 : _c.includes('AccessDenied')) {
-            await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.ListObjectsV2Command({
+            await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.ListObjectsV2Command({
                 Bucket: bucketName,
                 Prefix: prefix,
             }));
@@ -47,15 +47,15 @@ const lambdaLs = async ({ bucketName, prefix, region, expectedBucketOwner, conti
     }
 };
 exports.lambdaLs = lambdaLs;
-const lambdaDeleteFile = async ({ bucketName, key, region, }) => {
-    await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.DeleteObjectCommand({
+const lambdaDeleteFile = async ({ bucketName, key, region, customCredentials, }) => {
+    await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.DeleteObjectCommand({
         Bucket: bucketName,
         Key: key,
     }));
 };
 exports.lambdaDeleteFile = lambdaDeleteFile;
-const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, }) => {
-    await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.PutObjectCommand({
+const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expectedBucketOwner, downloadBehavior, customCredentials, }) => {
+    await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.PutObjectCommand({
         Bucket: bucketName,
         Key: key,
         Body: body,
@@ -71,7 +71,7 @@ const lambdaWriteFile = async ({ bucketName, key, body, region, privacy, expecte
 };
 exports.lambdaWriteFile = lambdaWriteFile;
 const lambdaReadFile = async ({ bucketName, key, region, expectedBucketOwner, }) => {
-    const { Body } = await (0, aws_clients_1.getS3Client)(region).send(new client_s3_1.GetObjectCommand({
+    const { Body } = await (0, aws_clients_1.getS3Client)(region, null).send(new client_s3_1.GetObjectCommand({
         Bucket: bucketName,
         Key: key,
         ExpectedBucketOwner: expectedBucketOwner,