@remotion/lambda 4.0.187 → 4.0.188

package/dist/shared/get-service-client.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 no_react_1 = require("remotion/no-react");
+const check_credentials_1 = require("./check-credentials");
+const constants_1 = require("./constants");
+const get_credentials_1 = require("./get-credentials");
+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 _clients = {};
+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: (0, get_credentials_1.getCredentials)(),
+                    requestHandler: lambdaOptions,
+                });
+        if (process.env.REMOTION_DISABLE_AWS_CLIENT_CACHE) {
+            return client;
+        }
+        _clients[key] = client;
+    }
+    return _clients[key];
+};
+exports.getServiceClient = getServiceClient;

package/dist/shared/hosted-layers.d.ts

@@ -1,4 +1,4 @@
-import type { AwsRegion } from '../pricing/aws-regions';
+import type { AwsRegion } from '../regions';
 export declare const REMOTION_HOSTED_LAYER_ARN = "arn:aws:lambda:*:678892195805:layer:remotion-binaries-*";
 export type HostedLayers = {
     [region in AwsRegion]: {

package/dist/shared/invoke-webhook.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import type { LogLevel } from '@remotion/renderer';
+import type { EnhancedErrorInfo } from '@remotion/serverless';
 import https from 'https';
 import http from 'node:http';
-import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';
 import type { AfterRenderCost } from './constants';
 /**
  * @description Calculates cryptographically secure signature for webhooks using Hmac.

package/dist/shared/lambda-insights-extensions.d.ts

@@ -1,4 +1,4 @@
-import type { AwsRegion } from '../pricing/aws-regions';
+import type { AwsRegion } from '../regions';
 export declare const lambdaInsightsExtensions: {
     [region in AwsRegion]: string;
 };

package/dist/shared/lifecycle-rules.d.ts

@@ -1,8 +1,9 @@
-import type { AwsRegion } from '../client';
-import type { CustomCredentials } from './aws-clients';
+import type { CustomCredentials } from '@remotion/serverless/client';
+import type { AwsProvider } from '../functions/aws-implementation';
+import type { AwsRegion } from '../regions';
 export declare const applyLifeCyleOperation: ({ enableFolderExpiry, bucketName, region, customCredentials, }: {
     enableFolderExpiry: boolean | null;
     bucketName: string;
     region: AwsRegion;
-    customCredentials: CustomCredentials | null;
+    customCredentials: CustomCredentials<AwsProvider> | null;
 }) => Promise<void>;

package/dist/shared/lifecycle-rules.js

@@ -4,7 +4,7 @@ exports.applyLifeCyleOperation = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const apply_lifecyle_1 = require("../functions/helpers/apply-lifecyle");
 const lifecycle_1 = require("../functions/helpers/lifecycle");
-const aws_clients_1 = require("./aws-clients");
+const get_s3_client_1 = require("./get-s3-client");
 const createLCRules = async ({ bucketName, region, customCredentials, }) => {
     var _a;
     const lcRules = (0, lifecycle_1.getLifeCycleRules)();
@@ -15,7 +15,7 @@ const createLCRules = async ({ bucketName, region, customCredentials, }) => {
     });
     const createCommand = new client_s3_1.PutBucketLifecycleConfigurationCommand(createCommandInput);
     try {
-        await (0, aws_clients_1.getS3Client)(region, customCredentials).send(createCommand);
+        await (0, get_s3_client_1.getS3Client)(region, customCredentials).send(createCommand);
     }
     catch (err) {
         if ((_a = err.stack) === null || _a === void 0 ? void 0 : _a.includes('AccessDenied')) {
@@ -29,7 +29,7 @@ const deleteLCRules = async ({ bucketName, region, customCredentials, }) => {
         bucketName,
     });
     try {
-        await (0, aws_clients_1.getS3Client)(region, customCredentials).send(new client_s3_1.DeleteBucketLifecycleCommand(deleteCommandInput));
+        await (0, get_s3_client_1.getS3Client)(region, customCredentials).send(new client_s3_1.DeleteBucketLifecycleCommand(deleteCommandInput));
     }
     catch (err) {
         if ((_a = err.stack) === null || _a === void 0 ? void 0 : _a.includes('AccessDenied')) {

package/dist/shared/make-s3-url.d.ts

@@ -1,4 +1,4 @@
-import type { AwsRegion } from '../pricing/aws-regions';
+import type { AwsRegion } from '../regions';
 export declare const makeS3ServeUrl: ({ bucketName, subFolder, region, }: {
     bucketName: string;
     subFolder: string;

package/dist/shared/random-hash.d.ts

@@ -1,3 +1 @@
-export declare const randomHash: (_options?: {
-    randomInTests: boolean;
-}) => string;
+export declare const randomHashImplementation: () => string;

package/dist/shared/random-hash.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomHash = void 0;
+exports.randomHashImplementation = void 0;
 const alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const randomHash = (_options) => {
+const randomHashImplementation = () => {
     return new Array(10)
         .fill(1)
         .map(() => {
@@ -11,4 +10,4 @@ const randomHash = (_options) => {
     })
         .join('');
 };
-exports.randomHash = randomHash;
+exports.randomHashImplementation = randomHashImplementation;

package/dist/shared/return-values.d.ts

@@ -1,17 +1,16 @@
-import type { compositionsHandler } from '../functions/compositions';
-import type { infoHandler } from '../functions/info';
+import type { CloudProvider, compositionsHandler, infoHandler } from '@remotion/serverless';
+import type { ServerlessRoutines } from '@remotion/serverless/client';
 import type { launchHandler } from '../functions/launch';
 import type { progressHandler } from '../functions/progress';
 import type { rendererHandler } from '../functions/renderer';
 import type { startHandler } from '../functions/start';
 import type { stillHandler } from '../functions/still';
-import type { LambdaRoutines } from './constants';
-export interface LambdaReturnValues {
-    [LambdaRoutines.start]: ReturnType<typeof startHandler>;
-    [LambdaRoutines.launch]: ReturnType<typeof launchHandler>;
-    [LambdaRoutines.renderer]: ReturnType<typeof rendererHandler>;
-    [LambdaRoutines.status]: ReturnType<typeof progressHandler>;
-    [LambdaRoutines.info]: ReturnType<typeof infoHandler>;
-    [LambdaRoutines.still]: ReturnType<typeof stillHandler>;
-    [LambdaRoutines.compositions]: ReturnType<typeof compositionsHandler>;
+export interface LambdaReturnValues<Provider extends CloudProvider> {
+    [ServerlessRoutines.start]: ReturnType<typeof startHandler>;
+    [ServerlessRoutines.launch]: ReturnType<typeof launchHandler>;
+    [ServerlessRoutines.renderer]: ReturnType<typeof rendererHandler>;
+    [ServerlessRoutines.status]: ReturnType<typeof progressHandler<Provider>>;
+    [ServerlessRoutines.info]: ReturnType<typeof infoHandler<Provider>>;
+    [ServerlessRoutines.still]: ReturnType<typeof stillHandler>;
+    [ServerlessRoutines.compositions]: ReturnType<typeof compositionsHandler>;
 }

package/dist/shared/validate-aws-region.d.ts

@@ -1,2 +1,2 @@
-import type { AwsRegion } from '../pricing/aws-regions';
+import type { AwsRegion } from '../regions';
 export declare function validateAwsRegion(region: unknown): asserts region is AwsRegion;

package/dist/shared/validate-aws-region.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAwsRegion = void 0;
-const aws_regions_1 = require("../pricing/aws-regions");
+const regions_1 = require("../regions");
 function validateAwsRegion(region) {
-    if (!aws_regions_1.AWS_REGIONS.includes(region)) {
-        throw new TypeError(`${region} is not a valid AWS region. Must be one of: ${aws_regions_1.AWS_REGIONS.join(', ')}`);
+    if (!regions_1.AWS_REGIONS.includes(region)) {
+        throw new TypeError(`${region} is not a valid AWS region. Must be one of: ${regions_1.AWS_REGIONS.join(', ')}`);
     }
 }
 exports.validateAwsRegion = validateAwsRegion;

package/dist/shared/validate-bucketname.d.ts

@@ -1,8 +1,4 @@
 import type { AwsRegion } from '../client';
-export declare const validateBucketName: (bucketName: unknown, options: {
-    mustStartWithRemotion: boolean;
-}) => void;
 export declare const parseBucketName: (name: string) => {
     region: AwsRegion | null;
 };
-export declare const makeBucketName: (region: AwsRegion) => string;

package/dist/shared/validate-bucketname.js

@@ -1,24 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeBucketName = exports.parseBucketName = exports.validateBucketName = void 0;
+exports.parseBucketName = void 0;
+const client_1 = require("@remotion/serverless/client");
 const regions_1 = require("../regions");
-const constants_1 = require("./constants");
-const random_hash_1 = require("./random-hash");
-const validateBucketName = (bucketName, options) => {
-    if (typeof bucketName !== 'string') {
-        throw new TypeError(`'bucketName' must be a string, but is ${JSON.stringify(bucketName)}`);
-    }
-    if (options.mustStartWithRemotion &&
-        !bucketName.startsWith(constants_1.REMOTION_BUCKET_PREFIX)) {
-        throw new Error(`The bucketName parameter must start with ${constants_1.REMOTION_BUCKET_PREFIX}.`);
-    }
-    if (!bucketName.match(/^(?=^.{3,63}$)(?!^(\d+\.)+\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])$)/)) {
-        throw new Error(`The bucket ${bucketName} `);
-    }
-};
-exports.validateBucketName = validateBucketName;
 const parseBucketName = (name) => {
-    const parsed = name.match(new RegExp(`^${constants_1.REMOTION_BUCKET_PREFIX}(.*)-([a-z0-9A-Z]+)$`));
+    const parsed = name.match(new RegExp(`^${client_1.REMOTION_BUCKET_PREFIX}(.*)-([a-z0-9A-Z]+)$`));
     const region = parsed === null || parsed === void 0 ? void 0 : parsed[1];
     if (!region) {
         return { region: null };
@@ -27,9 +13,3 @@ const parseBucketName = (name) => {
     return { region: realRegionFound !== null && realRegionFound !== void 0 ? realRegionFound : null };
 };
 exports.parseBucketName = parseBucketName;
-const makeBucketName = (region) => {
-    return `${constants_1.REMOTION_BUCKET_PREFIX}${region.replace(/-/g, '')}-${(0, random_hash_1.randomHash)({
-        randomInTests: false,
-    })}`;
-};
-exports.makeBucketName = makeBucketName;

package/dist/shared/validate-lambda-codec.d.ts

@@ -1,4 +1,2 @@
-declare const lambdaCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "gif", "prores"];
-export type LambdaCodec = (typeof lambdaCodecs)[number];
-export declare const validateLambdaCodec: (codec: unknown) => LambdaCodec;
-export {};
+import type { ServerlessCodec } from '@remotion/serverless/client';
+export declare const validateLambdaCodec: (codec: unknown) => ServerlessCodec;

package/dist/shared/validate-lambda-codec.js

@@ -1,26 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateLambdaCodec = void 0;
-const lambdaCodecs = [
-    'h264',
-    'h265',
-    'vp8',
-    'vp9',
-    'mp3',
-    'aac',
-    'wav',
-    'gif',
-    'prores',
-];
+const client_1 = require("@remotion/serverless/client");
 const validateLambdaCodec = (codec) => {
     if (typeof codec !== 'string') {
         throw new TypeError('"codec" must be a string ');
     }
-    if (!lambdaCodecs.includes(codec)) {
+    if (!client_1.serverlessCodecs.includes(codec)) {
         throw new TypeError("'" +
             codec +
             "' is not a valid codec for Lambda. The following values are supported: " +
-            lambdaCodecs.join(', '));
+            client_1.serverlessCodecs.join(', '));
     }
     if (codec === 'h264-mkv') {
         console.warn('The "h264-mkv" codec for renderMediaOnLambda() is deprecated - it\'s now just "h264".');

package/dist/shared/validate-outname.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOutname = void 0;
 const pure_1 = require("@remotion/renderer/pure");
-const validate_bucketname_1 = require("./validate-bucketname");
+const client_1 = require("@remotion/serverless/client");
 const validateS3Key = (s3Key) => {
     if (typeof s3Key !== 'string') {
         throw new TypeError('The S3 key must be a string. Passed an object of type ' + typeof s3Key);
@@ -20,7 +20,7 @@ const validateOutname = ({ outName, codec, audioCodecSetting, separateAudioTo, }
     }
     if (typeof outName !== 'string') {
         validateS3Key(outName.key);
-        (0, validate_bucketname_1.validateBucketName)(outName.bucketName, { mustStartWithRemotion: false });
+        (0, client_1.validateBucketName)(outName.bucketName, { mustStartWithRemotion: false });
         return;
     }
     if (codec) {

package/dist/shared/validate-privacy.d.ts

@@ -1,2 +1,2 @@
-import type { Privacy } from './constants';
+import type { Privacy } from '@remotion/serverless/client';
 export declare function validatePrivacy(privacy: unknown, allowPrivate: boolean): asserts privacy is Privacy;

package/dist/shared/validate-webhook.d.ts

@@ -1,3 +1,3 @@
-import type { WebhookOption } from './constants';
+import type { WebhookOption } from '@remotion/serverless/client';
 export declare const MAX_WEBHOOK_CUSTOM_DATA_SIZE = 1024;
 export declare const validateWebhook: (webhook?: WebhookOption | null) => void;

package/package.json

@@ -3,7 +3,7 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/lambda"
   },
   "name": "@remotion/lambda",
-  "version": "4.0.187",
+  "version": "4.0.188",
   "description": "Render Remotion videos on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -22,11 +22,13 @@
     "@aws-sdk/s3-request-presigner": "3.583.0",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.187",
-    "@remotion/streaming": "4.0.187",
-    "remotion": "4.0.187",
-    "@remotion/renderer": "4.0.187",
-    "@remotion/cli": "4.0.187"
+    "@remotion/cli": "4.0.188",
+    "@remotion/bundler": "4.0.188",
+    "@remotion/streaming": "4.0.188",
+    "@remotion/renderer": "4.0.188",
+    "@remotion/studio-server": "4.0.188",
+    "remotion": "4.0.188",
+    "@remotion/serverless": "4.0.188"
   },
   "devDependencies": {
     "@types/mime-types": "2.1.1",
@@ -35,11 +37,11 @@
     "pureimage": "0.4.13",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.187",
-    "@remotion/bundler": "4.0.187"
+    "@remotion/bundler": "4.0.188",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.188"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.187"
+    "@remotion/bundler": "4.0.188"
   },
   "publishConfig": {
     "access": "public"