@remotion/lambda 4.0.187 → 4.0.188

package/dist/shared/aws-clients.js

@@ -1,189 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 no_react_1 = require("remotion/no-react");
-const check_credentials_1 = require("./check-credentials");
-const constants_1 = require("./constants");
-const is_in_lambda_1 = require("./is-in-lambda");
-const _clients = {};
-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) {
-        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 {
-            accessKeyId: process.env.REMOTION_AWS_ACCESS_KEY_ID,
-            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) {
-        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,
-            secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        };
-    }
-    return undefined;
-};
-const getCredentialsHash = ({ customCredentials, region, service, }) => {
-    const hashComponents = {};
-    if (process.env.REMOTION_SKIP_AWS_CREDENTIALS_CHECK) {
-        hashComponents.credentials = {
-            credentialsSkipped: true,
-        };
-    }
-    else 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, no_react_1.random)(JSON.stringify(hashComponents)).toString().replace('0.', '');
-};
-const getServiceClient = ({ region, service, customCredentials, }) => {
-    var _a;
-    const Client = (() => {
-        if (service === 'cloudwatch') {
-            return client_cloudwatch_logs_1.CloudWatchLogsClient;
-        }
-        if (service === 'lambda') {
-            return client_lambda_1.LambdaClient;
-        }
-        if (service === 's3') {
-            return client_s3_1.S3Client;
-        }
-        if (service === 'iam') {
-            return client_iam_1.IAMClient;
-        }
-        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 = getCredentialsHash({
-        region,
-        customCredentials,
-        service,
-    });
-    if (!_clients[key]) {
-        (0, check_credentials_1.checkCredentials)();
-        const lambdaOptions = service === 'lambda'
-            ? {
-                httpsAgent: {
-                    maxSockets: constants_1.MAX_FUNCTIONS_PER_RENDER * 2,
-                },
-            }
-            : undefined;
-        const client = customCredentials
-            ? new Client({
-                region: (_a = customCredentials.region) !== null && _a !== void 0 ? _a : 'us-east-1',
-                credentials: customCredentials.accessKeyId && customCredentials.secretAccessKey
-                    ? {
-                        accessKeyId: customCredentials.accessKeyId,
-                        secretAccessKey: customCredentials.secretAccessKey,
-                    }
-                    : undefined,
-                endpoint: customCredentials.endpoint,
-                requestHandler: lambdaOptions,
-            })
-            : process.env.REMOTION_SKIP_AWS_CREDENTIALS_CHECK
-                ? new Client({
-                    region,
-                    requestHandler: lambdaOptions,
-                })
-                : new Client({
-                    region,
-                    credentials: getCredentials(),
-                    requestHandler: lambdaOptions,
-                });
-        if (process.env.REMOTION_DISABLE_AWS_CLIENT_CACHE) {
-            return client;
-        }
-        _clients[key] = client;
-    }
-    return _clients[key];
-};
-exports.getServiceClient = getServiceClient;
+exports.getStsClient = exports.getServiceQuotasClient = exports.getIamClient = exports.getLambdaClient = exports.getCloudWatchLogsClient = void 0;
+const get_service_client_1 = require("./get-service-client");
 const getCloudWatchLogsClient = (region) => {
-    return (0, exports.getServiceClient)({
+    return (0, get_service_client_1.getServiceClient)({
         region,
         service: 'cloudwatch',
         customCredentials: null,
     });
 };
 exports.getCloudWatchLogsClient = getCloudWatchLogsClient;
-const getS3Client = (region, customCredentials) => {
-    var _a;
-    return (0, exports.getServiceClient)({
-        region: (_a = customCredentials === null || customCredentials === void 0 ? void 0 : customCredentials.region) !== null && _a !== void 0 ? _a : region,
-        service: 's3',
-        customCredentials,
-    });
-};
-exports.getS3Client = getS3Client;
 const getLambdaClient = (region, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 _timeoutInTest) => {
-    return (0, exports.getServiceClient)({
+    return (0, get_service_client_1.getServiceClient)({
         region,
         service: 'lambda',
         customCredentials: null,
@@ -191,11 +21,11 @@ _timeoutInTest) => {
 };
 exports.getLambdaClient = getLambdaClient;
 const getIamClient = (region) => {
-    return (0, exports.getServiceClient)({ region, service: 'iam', customCredentials: null });
+    return (0, get_service_client_1.getServiceClient)({ region, service: 'iam', customCredentials: null });
 };
 exports.getIamClient = getIamClient;
 const getServiceQuotasClient = (region) => {
-    return (0, exports.getServiceClient)({
+    return (0, get_service_client_1.getServiceClient)({
         region,
         service: 'servicequotas',
         customCredentials: null,
@@ -203,6 +33,6 @@ const getServiceQuotasClient = (region) => {
 };
 exports.getServiceQuotasClient = getServiceQuotasClient;
 const getStsClient = (region) => {
-    return (0, exports.getServiceClient)({ region, service: 'sts', customCredentials: null });
+    return (0, get_service_client_1.getServiceClient)({ region, service: 'sts', customCredentials: null });
 };
 exports.getStsClient = getStsClient;

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

@@ -1,17 +1,16 @@
-import type { OnMessage } from '../functions/streaming/streaming';
-import type { AwsRegion } from '../pricing/aws-regions';
-import type { LambdaPayloads, LambdaRoutines } from './constants';
+import type { CloudProvider, OnMessage } from '@remotion/serverless';
+import type { ServerlessPayloads, ServerlessRoutines } from '@remotion/serverless/client';
 import type { LambdaReturnValues } from './return-values';
-type Options<T extends LambdaRoutines> = {
+type Options<T extends ServerlessRoutines, Provider extends CloudProvider> = {
     functionName: string;
     type: T;
-    payload: Omit<LambdaPayloads[T], 'type'>;
-    region: AwsRegion;
+    payload: Omit<ServerlessPayloads<Provider>[T], 'type'>;
+    region: Provider['region'];
     timeoutInTest: number;
 };
-export declare const callLambda: <T extends LambdaRoutines>(options: Options<T>) => Promise<LambdaReturnValues[T]>;
-export declare const callLambdaWithStreaming: <T extends LambdaRoutines>(options: Options<T> & {
-    receivedStreamingPayload: OnMessage;
+export declare const callLambda: <Provider extends CloudProvider<string, Record<string, unknown>>, T extends ServerlessRoutines>(options: Options<T, Provider>) => Promise<LambdaReturnValues<Provider>[T]>;
+export declare const callLambdaWithStreaming: <Provider extends CloudProvider<string, Record<string, unknown>>, T extends ServerlessRoutines>(options: Options<T, Provider> & {
+    receivedStreamingPayload: OnMessage<Provider>;
     retriesRemaining: number;
 }) => Promise<void>;
 export {};

package/dist/shared/call-lambda.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callLambdaWithStreaming = exports.callLambda = void 0;
 const client_lambda_1 = require("@aws-sdk/client-lambda");
+const client_1 = require("@remotion/serverless/client");
 const streaming_1 = require("@remotion/streaming");
-const streaming_2 = require("../functions/streaming/streaming");
 const aws_clients_1 = require("./aws-clients");
 const INVALID_JSON_MESSAGE = 'Cannot parse Lambda response as JSON';
 const parseJsonOrThrowSource = (data, type) => {
@@ -95,8 +95,8 @@ const callLambdaWithStreamingWithoutRetry = async ({ functionName, type, payload
         type,
     });
     const { onData, clear } = (0, streaming_1.makeStreamer)((status, messageTypeId, data) => {
-        const messageType = (0, streaming_2.messageTypeIdToMessageType)(messageTypeId);
-        const innerPayload = streaming_2.formatMap[messageType] === 'json'
+        const messageType = (0, client_1.messageTypeIdToMessageType)(messageTypeId);
+        const innerPayload = client_1.formatMap[messageType] === 'json'
             ? parseJsonOrThrowSource(data, messageType)
             : data;
         const message = {
@@ -108,6 +108,14 @@ const callLambdaWithStreamingWithoutRetry = async ({ functionName, type, payload
         };
         receivedStreamingPayload(message);
     });
+    const dumpBuffers = () => {
+        clear();
+    };
+    // @ts-expect-error - We are adding a listener to a global variable
+    if (globalThis._dumpUnreleasedBuffers) {
+        // @ts-expect-error - We are adding a listener to a global variable
+        globalThis._dumpUnreleasedBuffers.addListener('dump-unreleased-buffers', dumpBuffers);
+    }
     const events = res.EventStream;
     for await (const event of events) {
         // There are two types of events you can get on a stream.
@@ -127,5 +135,10 @@ const callLambdaWithStreamingWithoutRetry = async ({ functionName, type, payload
         }
         // Don't put a `break` statement here, as it will cause the socket to not properly exit.
     }
+    // @ts-expect-error - We are adding a listener to a global variable
+    if (globalThis._dumpUnreleasedBuffers) {
+        // @ts-expect-error - We are adding a listener to a global variable
+        globalThis._dumpUnreleasedBuffers.removeListener('dump-unreleased-buffers', dumpBuffers);
+    }
     clear();
 };

package/dist/shared/check-credentials.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCredentials = void 0;
+const client_1 = require("@remotion/serverless/client");
 const is_cli_1 = require("../cli/is-cli");
 const docs_url_1 = require("./docs-url");
 const is_likely_to_have_aws_profile_1 = require("./is-likely-to-have-aws-profile");
-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}.`,
@@ -14,7 +14,7 @@ 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(truthy_1.truthy)
+        .filter(client_1.truthy)
         .join('\n');
 };
 const checkCredentials = () => {

package/dist/shared/cleanup-serialized-input-props.d.ts

@@ -1,10 +1,12 @@
-import type { AwsRegion } from '../client';
-import type { SerializedInputProps } from './constants';
-export declare const cleanupSerializedInputProps: ({ serialized, region, }: {
+import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
+import { type SerializedInputProps } from '@remotion/serverless/client';
+export declare const cleanupSerializedInputProps: <Provider extends CloudProvider<string, Record<string, unknown>>>({ serialized, region, providerSpecifics, }: {
     serialized: SerializedInputProps;
-    region: AwsRegion;
+    region: Provider["region"];
+    providerSpecifics: ProviderSpecifics<Provider>;
 }) => Promise<number>;
-export declare const cleanupSerializedResolvedProps: ({ serialized, region, }: {
+export declare const cleanupSerializedResolvedProps: <Provider extends CloudProvider<string, Record<string, unknown>>>({ serialized, region, providerSpecifics, }: {
     serialized: SerializedInputProps;
-    region: AwsRegion;
+    region: Provider["region"];
+    providerSpecifics: ProviderSpecifics<Provider>;
 }) => Promise<number>;

package/dist/shared/cleanup-serialized-input-props.js

@@ -1,30 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanupSerializedResolvedProps = exports.cleanupSerializedInputProps = void 0;
-const io_1 = require("../functions/helpers/io");
-const constants_1 = require("./constants");
-const cleanupSerializedInputProps = async ({ serialized, region, }) => {
+const client_1 = require("@remotion/serverless/client");
+const cleanupSerializedInputProps = async ({ serialized, region, providerSpecifics, }) => {
     if (serialized.type === 'payload') {
         return 0;
     }
     const time = Date.now();
-    await (0, io_1.lambdaDeleteFile)({
+    await providerSpecifics.deleteFile({
         bucketName: serialized.bucketName,
-        key: (0, constants_1.inputPropsKey)(serialized.hash),
+        key: (0, client_1.inputPropsKey)(serialized.hash),
         region,
         customCredentials: null,
     });
     return Date.now() - time;
 };
 exports.cleanupSerializedInputProps = cleanupSerializedInputProps;
-const cleanupSerializedResolvedProps = async ({ serialized, region, }) => {
+const cleanupSerializedResolvedProps = async ({ serialized, region, providerSpecifics, }) => {
     if (serialized.type === 'payload') {
         return 0;
     }
     const time = Date.now();
-    await (0, io_1.lambdaDeleteFile)({
+    await providerSpecifics.deleteFile({
         bucketName: serialized.bucketName,
-        key: (0, constants_1.resolvedPropsKey)(serialized.hash),
+        key: (0, client_1.resolvedPropsKey)(serialized.hash),
         region,
         customCredentials: null,
     });

package/dist/shared/compress-props.d.ts

@@ -1,20 +1,22 @@
-import type { AwsRegion } from '../client';
-import type { SerializedInputProps } from './constants';
+import type { ProviderSpecifics } from '@remotion/serverless';
+import { type SerializedInputProps } from '@remotion/serverless/client';
 type PropsType = 'input-props' | 'resolved-props';
 export declare const serializeOrThrow: (inputProps: Record<string, unknown>, propsType: PropsType) => string;
 export declare const getNeedsToUpload: (type: 'still' | 'video-or-audio', sizes: number[]) => boolean;
-export declare const compressInputProps: ({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, }: {
+export declare const compressInputProps: <Region extends string>({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, providerSpecifics, }: {
     stringifiedInputProps: string;
-    region: AwsRegion;
+    region: Region;
     userSpecifiedBucketName: string | null;
     propsType: PropsType;
     needsToUpload: boolean;
+    providerSpecifics: ProviderSpecifics<Region>;
 }) => Promise<SerializedInputProps>;
-export declare const decompressInputProps: ({ serialized, region, bucketName, expectedBucketOwner, propsType, }: {
+export declare const decompressInputProps: <Region extends string>({ serialized, region, bucketName, expectedBucketOwner, propsType, providerSpecifics, }: {
     serialized: SerializedInputProps;
-    region: AwsRegion;
+    region: Region;
     bucketName: string;
     expectedBucketOwner: string;
     propsType: PropsType;
+    providerSpecifics: ProviderSpecifics<Region>;
 }) => Promise<string>;
 export {};

package/dist/shared/compress-props.js

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decompressInputProps = exports.compressInputProps = exports.getNeedsToUpload = exports.serializeOrThrow = void 0;
+const client_1 = require("@remotion/serverless/client");
 const no_react_1 = require("remotion/no-react");
-const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
-const io_1 = require("../functions/helpers/io");
-const constants_1 = require("./constants");
-const random_hash_1 = require("./random-hash");
-const stream_to_string_1 = require("./stream-to-string");
 const validate_webhook_1 = require("./validate-webhook");
 const makeKey = (type, hash) => {
     if (type === 'input-props') {
-        return (0, constants_1.inputPropsKey)(hash);
+        return (0, client_1.inputPropsKey)(hash);
     }
-    return (0, constants_1.resolvedPropsKey)(hash);
+    return (0, client_1.resolvedPropsKey)(hash);
 };
 const serializeOrThrow = (inputProps, propsType) => {
     try {
@@ -39,15 +35,16 @@ const getNeedsToUpload = (type, sizes) => {
     return false;
 };
 exports.getNeedsToUpload = getNeedsToUpload;
-const compressInputProps = async ({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, }) => {
-    const hash = (0, random_hash_1.randomHash)();
+const compressInputProps = async ({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, providerSpecifics, }) => {
+    const hash = providerSpecifics.randomHash();
     if (needsToUpload) {
-        const bucketName = userSpecifiedBucketName !== null && userSpecifiedBucketName !== void 0 ? userSpecifiedBucketName : (await (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
+        const bucketName = userSpecifiedBucketName !== null && userSpecifiedBucketName !== void 0 ? userSpecifiedBucketName : (await (0, client_1.internalGetOrCreateBucket)({
             region,
             enableFolderExpiry: null,
             customCredentials: null,
+            providerSpecifics,
         })).bucketName;
-        await (0, io_1.lambdaWriteFile)({
+        await providerSpecifics.writeFile({
             body: stringifiedInputProps,
             bucketName,
             region,
@@ -69,18 +66,18 @@ const compressInputProps = async ({ stringifiedInputProps, region, userSpecified
     };
 };
 exports.compressInputProps = compressInputProps;
-const decompressInputProps = async ({ serialized, region, bucketName, expectedBucketOwner, propsType, }) => {
+const decompressInputProps = async ({ serialized, region, bucketName, expectedBucketOwner, propsType, providerSpecifics, }) => {
     if (serialized.type === 'payload') {
         return serialized.payload;
     }
     try {
-        const response = await (0, io_1.lambdaReadFile)({
+        const response = await providerSpecifics.readFile({
             bucketName,
             expectedBucketOwner,
             key: makeKey(propsType, serialized.hash),
             region,
         });
-        const body = await (0, stream_to_string_1.streamToString)(response);
+        const body = await (0, client_1.streamToString)(response);
         const payload = body;
         return payload;
     }