@remotion/lambda 4.0.0-lambda.3 → 4.0.0-newpaths.13

package/dist/shared/aws-clients.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceQuotasClient = exports.getIamClient = exports.getLambdaClient = exports.getS3Client = exports.getCloudWatchLogsClient = exports.getServiceClient = void 0;
+exports.getStsClient = exports.getServiceQuotasClient = exports.getIamClient = exports.getLambdaClient = exports.getS3Client = exports.getCloudWatchLogsClient = exports.getServiceClient = void 0;
 const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
 const client_iam_1 = require("@aws-sdk/client-iam");
 const client_lambda_1 = require("@aws-sdk/client-lambda");
 const client_s3_1 = require("@aws-sdk/client-s3");
 const client_service_quotas_1 = require("@aws-sdk/client-service-quotas");
+const client_sts_1 = require("@aws-sdk/client-sts");
+const credential_providers_1 = require("@aws-sdk/credential-providers");
+const crypto_1 = require("crypto");
 const check_credentials_1 = require("./check-credentials");
 const is_in_lambda_1 = require("./is-in-lambda");
 const _clients = {};
@@ -13,6 +16,21 @@ const getCredentials = () => {
     if ((0, is_in_lambda_1.isInsideLambda)()) {
         return undefined;
     }
+    if (process.env.REMOTION_AWS_PROFILE) {
+        return (0, credential_providers_1.fromIni)({
+            profile: process.env.REMOTION_AWS_PROFILE,
+        });
+    }
+    if (process.env.REMOTION_AWS_ACCESS_KEY_ID &&
+        process.env.REMOTION_AWS_SECRET_ACCESS_KEY &&
+        process.env.REMOTION_AWS_SESSION_TOKEN) {
+        console.log('Using credentials from Remotion assumed role.');
+        return {
+            accessKeyId: process.env.REMOTION_AWS_ACCESS_KEY_ID,
+            secretAccessKey: process.env.REMOTION_AWS_SECRET_ACCESS_KEY,
+            sessionToken: process.env.REMOTION_AWS_SESSION_TOKEN,
+        };
+    }
     if (process.env.REMOTION_AWS_ACCESS_KEY_ID &&
         process.env.REMOTION_AWS_SECRET_ACCESS_KEY) {
         return {
@@ -20,6 +38,21 @@ const getCredentials = () => {
             secretAccessKey: process.env.REMOTION_AWS_SECRET_ACCESS_KEY,
         };
     }
+    if (process.env.AWS_PROFILE) {
+        return (0, credential_providers_1.fromIni)({
+            profile: process.env.AWS_PROFILE,
+        });
+    }
+    if (process.env.AWS_ACCESS_KEY_ID &&
+        process.env.AWS_SECRET_ACCESS_KEY &&
+        process.env.AWS_SESSION_TOKEN) {
+        console.log('Using credentials from AWS STS');
+        return {
+            accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+            secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+            sessionToken: process.env.AWS_SESSION_TOKEN,
+        };
+    }
     if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
         return {
             accessKeyId: process.env.AWS_ACCESS_KEY_ID,
@@ -28,11 +61,40 @@ const getCredentials = () => {
     }
     return undefined;
 };
-const getCredentialsKey = () => JSON.stringify(getCredentials());
-const getServiceClient = (region, service) => {
-    if (!_clients[region]) {
-        _clients[region] = {};
+const getCredentialsHash = ({ customCredentials, region, service, }) => {
+    const hashComponents = {};
+    if (process.env.REMOTION_AWS_PROFILE) {
+        hashComponents.credentials = {
+            awsProfile: process.env.REMOTION_AWS_PROFILE,
+        };
+    }
+    else if (process.env.REMOTION_AWS_ACCESS_KEY_ID &&
+        process.env.REMOTION_AWS_SECRET_ACCESS_KEY) {
+        hashComponents.credentials = {
+            accessKeyId: process.env.REMOTION_AWS_ACCESS_KEY_ID,
+            secretAccessKey: process.env.REMOTION_AWS_SECRET_ACCESS_KEY,
+        };
     }
+    else if (process.env.AWS_PROFILE) {
+        hashComponents.credentials = {
+            awsProfile: process.env.AWS_PROFILE,
+        };
+    }
+    else if (process.env.AWS_ACCESS_KEY_ID &&
+        process.env.AWS_SECRET_ACCESS_KEY) {
+        hashComponents.credentials = {
+            accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+            secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+        };
+    }
+    hashComponents.customCredentials = customCredentials;
+    hashComponents.region = region;
+    hashComponents.service = service;
+    return (0, crypto_1.createHash)('sha256')
+        .update(JSON.stringify(hashComponents))
+        .digest('base64');
+};
+const getServiceClient = ({ region, service, customCredentials, }) => {
     const Client = (() => {
         if (service === 'cloudwatch') {
             return client_cloudwatch_logs_1.CloudWatchLogsClient;
@@ -49,43 +111,73 @@ const getServiceClient = (region, service) => {
         if (service === 'servicequotas') {
             return client_service_quotas_1.ServiceQuotasClient;
         }
+        if (service === 'sts') {
+            return client_sts_1.STSClient;
+        }
+        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 = getCredentialsHash({
+        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;
+const getStsClient = (region) => {
+    return (0, exports.getServiceClient)({ region, service: 'sts', customCredentials: null });
+};
+exports.getStsClient = getStsClient;

package/dist/shared/bundle-site.d.ts

@@ -1,6 +1,2 @@
-export declare const bundleSite: (entryPoint: string, onProgressUpdate?: ((progress: number) => void) | undefined, options?: {
-    webpackOverride?: import("remotion").WebpackOverrideFn | undefined;
-    outDir?: string | undefined;
-    enableCaching?: boolean | undefined;
-    publicPath?: string | undefined;
-} | undefined) => Promise<string>;
+import { bundle } from '@remotion/bundler';
+export declare const bundleSite: typeof bundle;

package/dist/shared/call-lambda.d.ts

@@ -1,6 +1,6 @@
-import { AwsRegion } from '../pricing/aws-regions';
-import { LambdaPayloads, LambdaRoutines } from './constants';
-import { LambdaReturnValues } from './return-values';
+import type { AwsRegion } from '../pricing/aws-regions';
+import type { LambdaPayloads, LambdaRoutines } from './constants';
+import type { LambdaReturnValues } from './return-values';
 export declare const callLambda: <T extends LambdaRoutines>({ functionName, type, payload, region, }: {
     functionName: string;
     type: T;

package/dist/shared/check-credentials.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCredentials = void 0;
-const remotion_1 = require("remotion");
 const is_cli_1 = require("../cli/is-cli");
 const docs_url_1 = require("./docs-url");
+const truthy_1 = require("./truthy");
 const messageForVariable = (variable) => {
     return [
         `You have tried to call a Remotion Lambda function, but have not set the environment variable ${variable}.`,
@@ -13,10 +13,13 @@ const messageForVariable = (variable) => {
         `- Please refer to the Remotion Lambda docs (${docs_url_1.DOCS_URL}/docs/lambda/setup) to see how to generate the credentials for your AWS account and then set the environment variables.`,
         `- For more reasons see the troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/permissions`,
     ]
-        .filter(remotion_1.Internals.truthy)
+        .filter(truthy_1.truthy)
         .join('\n');
 };
 const checkCredentials = () => {
+    if (process.env.REMOTION_AWS_PROFILE || process.env.AWS_PROFILE) {
+        return;
+    }
     if (!process.env.AWS_ACCESS_KEY_ID &&
         !process.env.REMOTION_AWS_ACCESS_KEY_ID) {
         throw new Error(messageForVariable('AWS_ACCESS_KEY_ID or REMOTION_AWS_ACCESS_KEY_ID'));

package/dist/shared/chunk-progress.d.ts

@@ -0,0 +1,9 @@
+export declare const writeLambdaInitializedFile: ({ bucketName, expectedBucketOwner, attempt, chunk, renderId, framesRendered, }: {
+    bucketName: string;
+    expectedBucketOwner: string;
+    renderId: string;
+    chunk: number;
+    attempt: number;
+    framesRendered: number;
+}) => Promise<void>;
+export declare const getProgressOfChunk: (etag: string) => number;