@remotion/lambda 3.3.6 → 3.3.7

package/dist/admin/make-layer-public.js

@@ -20,6 +20,17 @@ const layerInfo = {
         'us-east-1': [],
         'us-east-2': [],
         'us-west-2': [],
+        'af-south-1': [],
+        'ap-east-1': [],
+        'ap-northeast-2': [],
+        'ap-northeast-3': [],
+        'ca-central-1': [],
+        'eu-north-1': [],
+        'eu-south-1': [],
+        'eu-west-3': [],
+        'me-south-1': [],
+        'sa-east-1': [],
+        'us-west-1': [],
     },
     x86_64: {
         'ap-northeast-1': [],
@@ -32,6 +43,17 @@ const layerInfo = {
         'us-east-1': [],
         'us-east-2': [],
         'us-west-2': [],
+        'af-south-1': [],
+        'ap-east-1': [],
+        'ap-northeast-2': [],
+        'ap-northeast-3': [],
+        'ca-central-1': [],
+        'eu-north-1': [],
+        'eu-south-1': [],
+        'eu-west-3': [],
+        'me-south-1': [],
+        'sa-east-1': [],
+        'us-west-1': [],
     },
 };
 const makeLayerPublic = async () => {
@@ -43,7 +65,7 @@ const makeLayerPublic = async () => {
                 const { Version, LayerArn } = await (0, aws_clients_1.getLambdaClient)(region).send(new client_lambda_1.PublishLayerVersionCommand({
                     Content: {
                         S3Bucket: 'remotionlambda-binaries-' + region,
-                        S3Key: `remotion-layer-${layer}-v8-${architecture}.zip`,
+                        S3Key: `remotion-layer-${layer}-v9-${architecture}.zip`,
                     },
                     LayerName: layerName,
                     LicenseInfo: layer === 'chromium'

package/dist/api/deploy-site.d.ts

@@ -18,6 +18,11 @@ export declare type DeploySiteInput = {
 export declare type DeploySiteOutput = Promise<{
     serveUrl: string;
     siteName: string;
+    stats: {
+        uploadedFiles: number;
+        deletedFiles: number;
+        untouchedFiles: number;
+    };
 }>;
 /**
  * @description Deploys a Remotion project to an S3 bucket to prepare it for rendering on AWS Lambda.

package/dist/api/deploy-site.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploySite = void 0;
-const delete_site_1 = require("../api/delete-site");
+const io_1 = require("../functions/helpers/io");
 const bundle_site_1 = require("../shared/bundle-site");
 const constants_1 = require("../shared/constants");
 const get_account_id_1 = require("../shared/get-account-id");
+const get_s3_operations_1 = require("../shared/get-s3-operations");
 const make_s3_url_1 = require("../shared/make-s3-url");
 const random_hash_1 = require("../shared/random-hash");
 const validate_aws_region_1 = require("../shared/validate-aws-region");
@@ -28,37 +29,54 @@ const deploySite = async ({ bucketName, entryPoint, siteName, options, region, }
     (0, validate_bucketname_1.validateBucketName)(bucketName, { mustStartWithRemotion: true });
     const siteId = siteName !== null && siteName !== void 0 ? siteName : (0, random_hash_1.randomHash)();
     (0, validate_site_name_1.validateSiteName)(siteId);
+    const accountId = await (0, get_account_id_1.getAccountId)({ region });
     const bucketExists = await (0, bucket_exists_1.bucketExistsInRegion)({
         bucketName,
         region,
-        expectedBucketOwner: await (0, get_account_id_1.getAccountId)({ region }),
+        expectedBucketOwner: accountId,
     });
     if (!bucketExists) {
         throw new Error(`No bucket with the name ${bucketName} exists`);
     }
     const subFolder = (0, constants_1.getSitesKey)(siteId);
-    await (0, delete_site_1.deleteSite)({
-        bucketName,
-        onAfterItemDeleted: () => undefined,
-        region,
-        siteName: siteId,
-    });
-    const bundled = await (0, bundle_site_1.bundleSite)(entryPoint, (_a = options === null || options === void 0 ? void 0 : options.onBundleProgress) !== null && _a !== void 0 ? _a : (() => undefined), {
-        publicPath: `/${subFolder}/`,
-        webpackOverride: (_b = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
-        enableCaching: (_c = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _c !== void 0 ? _c : true,
-        publicDir: options === null || options === void 0 ? void 0 : options.publicDir,
-        rootDir: options === null || options === void 0 ? void 0 : options.rootDir,
+    const [files, bundled] = await Promise.all([
+        (0, io_1.lambdaLs)({
+            bucketName,
+            expectedBucketOwner: accountId,
+            region,
+            prefix: subFolder,
+        }),
+        (0, bundle_site_1.bundleSite)(entryPoint, (_a = options === null || options === void 0 ? void 0 : options.onBundleProgress) !== null && _a !== void 0 ? _a : (() => undefined), {
+            publicPath: `/${subFolder}/`,
+            webpackOverride: (_b = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
+            enableCaching: (_c = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _c !== void 0 ? _c : true,
+            publicDir: options === null || options === void 0 ? void 0 : options.publicDir,
+            rootDir: options === null || options === void 0 ? void 0 : options.rootDir,
+        }),
+    ]);
+    const { toDelete, toUpload, existingCount } = await (0, get_s3_operations_1.getS3DiffOperations)({
+        objects: files,
+        bundle: bundled,
+        prefix: subFolder,
     });
     await Promise.all([
         (0, upload_dir_1.uploadDir)({
             bucket: bucketName,
             region,
-            dir: bundled,
+            localDir: bundled,
             onProgress: (_d = options === null || options === void 0 ? void 0 : options.onUploadProgress) !== null && _d !== void 0 ? _d : (() => undefined),
-            folder: subFolder,
+            keyPrefix: subFolder,
             privacy: 'public',
+            toUpload,
         }),
+        Promise.all(toDelete.map((d) => {
+            return (0, io_1.lambdaDeleteFile)({
+                bucketName,
+                customCredentials: null,
+                key: d.Key,
+                region,
+            });
+        })),
         (0, enable_s3_website_1.enableS3Website)({
             region,
             bucketName,
@@ -67,6 +85,11 @@ const deploySite = async ({ bucketName, entryPoint, siteName, options, region, }
     return {
         serveUrl: (0, make_s3_url_1.makeS3ServeUrl)({ bucketName, subFolder, region }),
         siteName: siteId,
+        stats: {
+            uploadedFiles: toUpload.length,
+            deletedFiles: toDelete.length,
+            untouchedFiles: existingCount,
+        },
     };
 };
 exports.deploySite = deploySite;

package/dist/api/upload-dir.d.ts

@@ -11,11 +11,12 @@ export declare type MockFile = {
     content: string;
 };
 export declare const getDirFiles: (entry: string) => MockFile[];
-export declare const uploadDir: ({ bucket, region, dir, onProgress, folder, privacy, }: {
+export declare const uploadDir: ({ bucket, region, localDir, onProgress, keyPrefix, privacy, toUpload, }: {
     bucket: string;
     region: AwsRegion;
-    dir: string;
-    folder: string;
+    localDir: string;
+    keyPrefix: string;
     onProgress: (progress: UploadDirProgress) => void;
     privacy: Privacy;
+    toUpload: string[];
 }) => Promise<void>;

package/dist/api/upload-dir.js

@@ -15,31 +15,45 @@ const getDirFiles = (entry) => {
     throw new TypeError('should only be executed in test ' + JSON.stringify(entry));
 };
 exports.getDirFiles = getDirFiles;
-const uploadDir = async ({ bucket, region, dir, onProgress, folder, privacy, }) => {
-    async function getFiles(directory) {
-        const dirents = await fs_1.promises.readdir(directory, { withFileTypes: true });
-        const _files = await Promise.all(dirents.map(async (dirent) => {
-            const res = path_1.default.resolve(directory, dirent.name);
-            const { size } = await fs_1.promises.stat(res);
-            return dirent.isDirectory()
-                ? getFiles(res)
-                : [
-                    {
-                        name: res,
-                        size,
-                    },
-                ];
-        }));
-        return _files.flat(1);
-    }
-    const files = await getFiles(dir);
+async function getFiles(directory, originalDirectory, toUpload) {
+    const dirents = await fs_1.promises.readdir(directory, { withFileTypes: true });
+    const _files = await Promise.all(dirents
+        .map((dirent) => {
+        const res = path_1.default.resolve(directory, dirent.name);
+        return [dirent, res];
+    })
+        .filter(([dirent, res]) => {
+        const relative = path_1.default.relative(originalDirectory, res);
+        if (dirent.isDirectory()) {
+            return true;
+        }
+        if (!toUpload.includes(relative)) {
+            return false;
+        }
+        return true;
+    })
+        .map(async ([dirent, res]) => {
+        const { size } = await fs_1.promises.stat(res);
+        return dirent.isDirectory()
+            ? getFiles(res, originalDirectory, toUpload)
+            : [
+                {
+                    name: res,
+                    size,
+                },
+            ];
+    }));
+    return _files.flat(1);
+}
+const uploadDir = async ({ bucket, region, localDir, onProgress, keyPrefix, privacy, toUpload, }) => {
+    const files = await getFiles(localDir, localDir, toUpload);
     const progresses = {};
     for (const file of files) {
         progresses[file.name] = 0;
     }
     const client = (0, aws_clients_1.getS3Client)(region, null);
     const uploads = files.map(async (filePath) => {
-        const Key = (0, make_s3_key_1.makeS3Key)(folder, dir, filePath.name);
+        const Key = (0, make_s3_key_1.makeS3Key)(keyPrefix, localDir, filePath.name);
         const Body = (0, fs_1.createReadStream)(filePath.name);
         const ContentType = mime_types_1.default.lookup(Key) || 'application/octet-stream';
         const ACL = privacy === 'no-acl'

package/dist/cli/commands/sites/create.js

@@ -7,6 +7,7 @@ exports.sitesCreateSubcommand = exports.SITES_CREATE_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
+const remotion_1 = require("remotion");
 const deploy_site_1 = require("../../../api/deploy-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const constants_1 = require("../../../shared/constants");
@@ -57,6 +58,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
             doneIn: null,
             totalSize: null,
             sizeUploaded: 0,
+            stats: null,
         },
     };
     const updateProgress = () => {
@@ -79,7 +81,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
     updateProgress();
     const bundleStart = Date.now();
     const uploadStart = Date.now();
-    const { serveUrl, siteName } = await (0, deploy_site_1.deploySite)({
+    const { serveUrl, siteName, stats } = await (0, deploy_site_1.deploySite)({
         entryPoint: absoluteFile,
         siteName: desiredSiteName,
         bucketName,
@@ -95,6 +97,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
                     sizeUploaded: p.sizeUploaded,
                     totalSize: p.totalSize,
                     doneIn: null,
+                    stats: null,
                 };
                 updateProgress();
             },
@@ -108,6 +111,11 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
         sizeUploaded: 1,
         totalSize: 1,
         doneIn: uploadDuration,
+        stats: {
+            addedFiles: stats.uploadedFiles,
+            removedFiles: stats.deletedFiles,
+            untouchedFiles: stats.untouchedFiles,
+        },
     };
     updateProgress();
     log_1.Log.info();
@@ -117,6 +125,8 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
     log_1.Log.info(`Site Name: ${siteName}`);
     log_1.Log.info();
     log_1.Log.info(cli_1.CliInternals.chalk.blueBright('ℹ️ If you make changes to your code, you need to redeploy the site. You can overwrite the existing site by running:'));
-    log_1.Log.info(cli_1.CliInternals.chalk.blueBright(`npx remotion lambda sites create ${args[0]} --site-name=${siteName}`));
+    log_1.Log.info(cli_1.CliInternals.chalk.blueBright(['npx remotion lambda sites create', args[0], `--site-name=${siteName}`]
+        .filter(remotion_1.Internals.truthy)
+        .join(' ')));
 };
 exports.sitesCreateSubcommand = sitesCreateSubcommand;

package/dist/cli/helpers/progress-bar.d.ts

@@ -9,9 +9,16 @@ export declare type BucketCreationProgress = {
     doneIn: number | null;
 };
 export declare const makeBucketProgress: ({ bucketCreated, websiteEnabled, doneIn, }: BucketCreationProgress) => string;
+declare type UploadStats = {
+    addedFiles: number;
+    removedFiles: number;
+    untouchedFiles: number;
+};
 export declare type DeployToS3Progress = {
     sizeUploaded: number;
     totalSize: number | null;
     doneIn: number | null;
+    stats: UploadStats | null;
 };
-export declare const makeDeployProgressBar: ({ sizeUploaded, totalSize, doneIn, }: DeployToS3Progress) => string;
+export declare const makeDeployProgressBar: ({ sizeUploaded, totalSize, doneIn, stats, }: DeployToS3Progress) => string;
+export {};

package/dist/cli/helpers/progress-bar.js

@@ -30,7 +30,22 @@ const makeBucketProgress = ({ bucketCreated, websiteEnabled, doneIn, }) => {
     ].join(' ');
 };
 exports.makeBucketProgress = makeBucketProgress;
-const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, }) => {
+const makeUploadDiff = ({ stats }) => {
+    if (!stats) {
+        return null;
+    }
+    if (stats.addedFiles === 0 && stats.removedFiles === 0) {
+        return cli_1.CliInternals.chalk.gray(`(Unchanged)`);
+    }
+    const total = stats.addedFiles + stats.removedFiles;
+    return cli_1.CliInternals.chalk.gray(`(${[
+        stats.addedFiles ? `+${stats.addedFiles}` : null,
+        stats.removedFiles ? `-${stats.removedFiles}` : null,
+    ]
+        .filter(remotion_1.Internals.truthy)
+        .join(',')} ${total === 1 ? 'file' : 'files'})`);
+};
+const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, stats, }) => {
     const progress = totalSize === null ? 0 : sizeUploaded / totalSize;
     return [
         '☁️ ',
@@ -42,6 +57,7 @@ const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, }) => {
                 ? `${cli_1.CliInternals.formatBytes(sizeUploaded)}/${cli_1.CliInternals.formatBytes(totalSize)}`
                 : ''
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        makeUploadDiff({ stats }),
     ]
         .filter(remotion_1.Internals.truthy)
         .join(' ');

package/dist/cli/index.js

@@ -97,7 +97,7 @@ const matchCommand = (args, remotionRoot) => {
     (0, quit_1.quit)(1);
 };
 const executeCommand = async (args, remotionRoot) => {
-    var _a, _b;
+    var _a, _b, _c;
     try {
         (0, is_cli_1.setIsCli)(true);
         await matchCommand(args, remotionRoot);
@@ -131,6 +131,11 @@ AWS returned an "AccessDenied" error message meaning a permission is missing. Re
             log_1.Log.error(`
 AWS returned an "TooManyRequestsException" error message which could mean you reached the concurrency limit of AWS Lambda. You can increase the limit - read this troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/rate-limit. The original error message is:
 `.trim());
+        }
+        if ((_c = error.stack) === null || _c === void 0 ? void 0 : _c.includes('The security token included in the request is invalid')) {
+            log_1.Log.error(`
+AWS returned an error message "The security token included in the request is invalid". A possible reason for this is that you did not enable the region in your AWS account under "Account". The original message is: 
+`);
         }
         log_1.Log.error(error.stack);
         (0, quit_1.quit)(1);

package/dist/functions/helpers/get-chromium-executable-path.js

@@ -2,9 +2,10 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executablePath = void 0;
-if (/^AWS_Lambda_nodejs(?:10|12|14)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV) !== null && _a !== void 0 ? _a : '') === true) {
+if (/^AWS_Lambda_nodejs(?:10|12|14|16|18)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV) !== null && _a !== void 0 ? _a : '') === true) {
     if (process.env.FONTCONFIG_PATH === undefined) {
         process.env.FONTCONFIG_PATH = '/opt';
+        process.env.FONTCONFIG_FILE = '/opt/fonts.conf';
     }
     process.env.LD_LIBRARY_PATH = '/opt/lib:/opt/bin';
 }

package/dist/functions/helpers/get-current-region.d.ts

@@ -1 +1 @@
-export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "us-east-1" | "us-east-2" | "us-west-2" | "ap-south-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1";
+export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-south-1" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "af-south-1" | "ap-south-1" | "ap-east-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "me-south-1" | "sa-east-1";

package/dist/pricing/aws-regions.d.ts

@@ -1,2 +1,2 @@
-export declare const AWS_REGIONS: readonly ["eu-central-1", "eu-west-1", "eu-west-2", "us-east-1", "us-east-2", "us-west-2", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1"];
+export declare const AWS_REGIONS: readonly ["eu-central-1", "eu-west-1", "eu-west-2", "eu-west-3", "eu-south-1", "eu-north-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2", "af-south-1", "ap-south-1", "ap-east-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ca-central-1", "me-south-1", "sa-east-1"];
 export declare type AwsRegion = typeof AWS_REGIONS[number];

package/dist/pricing/aws-regions.js

@@ -5,11 +5,22 @@ exports.AWS_REGIONS = [
     'eu-central-1',
     'eu-west-1',
     'eu-west-2',
+    'eu-west-3',
+    'eu-south-1',
+    'eu-north-1',
     'us-east-1',
     'us-east-2',
+    'us-west-1',
     'us-west-2',
+    'af-south-1',
     'ap-south-1',
+    'ap-east-1',
     'ap-southeast-1',
     'ap-southeast-2',
     'ap-northeast-1',
+    'ap-northeast-2',
+    'ap-northeast-3',
+    'ca-central-1',
+    'me-south-1',
+    'sa-east-1',
 ];