@remotion/lambda 4.0.0-copy.4 → 4.0.0-esm.17

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/args.d.ts

@@ -13,6 +13,7 @@ declare type LambdaCommandLineOptions = {
     yes: boolean;
     force: boolean;
     f: boolean;
+    ['default-only']: boolean;
     ['site-name']: string | undefined;
     ['disable-chunk-optimization']: boolean;
     ['save-browser-logs']: boolean;

package/dist/cli/commands/compositions/index.js

@@ -4,7 +4,6 @@ exports.compositionsCommand = exports.COMPOSITIONS_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const __1 = require("../../..");
 const constants_1 = require("../../../shared/constants");
-const convert_to_serve_url_1 = require("../../../shared/convert-to-serve-url");
 const validate_serveurl_1 = require("../../../shared/validate-serveurl");
 const get_aws_region_1 = require("../../get-aws-region");
 const find_function_name_1 = require("../../helpers/find-function-name");
@@ -28,10 +27,9 @@ const compositionsCommand = async (args, remotionRoot) => {
     const region = (0, get_aws_region_1.getAwsRegion)();
     (0, validate_serveurl_1.validateServeUrl)(serveUrl);
     const functionName = await (0, find_function_name_1.findFunctionName)();
-    const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
     const comps = await (0, __1.getCompositionsOnLambda)({
         functionName,
-        serveUrl: realServeUrl,
+        serveUrl,
         inputProps,
         region,
         chromiumOptions,

package/dist/cli/commands/regions.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.regionsCommand = exports.REGIONS_COMMAND = void 0;
 const log_1 = require("@remotion/cli/dist/log");
 const get_regions_1 = require("../../api/get-regions");
+const args_1 = require("../args");
 exports.REGIONS_COMMAND = 'regions';
 const regionsCommand = () => {
-    log_1.Log.info((0, get_regions_1.getRegions)().join(' '));
+    var _a;
+    log_1.Log.info((0, get_regions_1.getRegions)({
+        enabledByDefaultOnly: (_a = args_1.parsedLambdaCli['default-only']) !== null && _a !== void 0 ? _a : false,
+    }).join(' '));
 };
 exports.regionsCommand = regionsCommand;

package/dist/cli/commands/render/progress.d.ts

@@ -3,12 +3,13 @@ import type { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
 declare type LambdaInvokeProgress = {
     totalLambdas: number | null;
     lambdasInvoked: number;
-    doneIn: number | null;
 };
 declare type ChunkProgress = {
+    doneIn: number | null;
+    framesRendered: number;
+    totalFrames: number | null;
     totalChunks: number | null;
     chunksInvoked: number;
-    doneIn: number | null;
 };
 declare type MultiRenderProgress = {
     lambdaInvokeProgress: LambdaInvokeProgress;
@@ -22,11 +23,13 @@ declare type DownloadedInfo = {
     downloaded: number;
     doneIn: number | null;
 };
-export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, }: {
+export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }: {
     progress: MultiRenderProgress;
     steps: number;
     downloadInfo: DownloadedInfo | null;
     retriesInfo: ChunkRetry[];
     verbose: boolean;
+    timeToEncode: number | null;
+    totalFrames: number | null;
 }) => string;
 export {};

package/dist/cli/commands/render/progress.js

@@ -2,45 +2,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
 const cli_1 = require("@remotion/cli");
+const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
+const truthy_1 = require("../../../shared/truthy");
 const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
-    const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
-    const progress = doneIn
-        ? 1
-        : totalLambdas === null
-            ? 0
-            : lambdasInvoked / totalLambdas;
+    const { lambdasInvoked, totalLambdas } = invokeProgress;
+    const progress = totalLambdas === null ? 0 : lambdasInvoked / totalLambdas;
     return [
         '⚡️',
         `(1/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Invoking' : 'Invoked'} lambdas`,
-        doneIn === null
-            ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        `${progress === 0 ? 'Invoked' : 'Invoking'} lambdas`,
+        progress === 1
+            ? cli_1.CliInternals.chalk.gray('100%')
+            : `${Math.round(progress * 100)}%`,
         retriesInfo.length > 0 ? `(+${retriesInfo.length} retries)` : [],
     ].join(' ');
 };
-const makeChunkProgress = ({ chunkProgress, invokeProgress, totalSteps, }) => {
-    const lambdaIsDone = invokeProgress.doneIn !== null;
+const makeRenderProgress = ({ chunkProgress, totalSteps, }) => {
     const { chunksInvoked, totalChunks, doneIn } = chunkProgress;
-    const progress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
-    const shouldShow = lambdaIsDone || progress > 0;
-    if (!shouldShow) {
-        return '';
-    }
-    return [
+    const renderProgress = chunkProgress.totalFrames === null
+        ? 0
+        : chunkProgress.framesRendered / chunkProgress.totalFrames;
+    const encodingProgress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
+    const frames = chunkProgress.totalFrames === null
+        ? null
+        : `(${chunkProgress.framesRendered}/${chunkProgress.totalFrames})`;
+    const first = [
         '🧩',
         `(2/${totalSteps})`,
-        cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Rendering' : 'Rendered'} chunks`,
+        cli_1.CliInternals.makeProgressBar(renderProgress),
+        doneIn === null ? 'Rendering frames' : 'Rendered frames',
+        doneIn === null ? frames : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+    const second = [
+        '🏗️ ',
+        `(3/${totalSteps})`,
+        cli_1.CliInternals.makeProgressBar(encodingProgress),
+        `${doneIn === null ? 'Encoding' : 'Encoded'} chunks`,
         doneIn === null
-            ? `${Math.round(progress * 100)}%`
+            ? `${Math.round(encodingProgress * 100)}%`
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
+    return [first, second];
 };
-const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, }) => {
-    const { framesEncoded, totalFrames, doneIn } = encodingProgress;
+const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, totalFrames, timeToEncode, }) => {
+    const { framesEncoded } = encodingProgress;
     const progress = totalFrames === null ? 0 : framesEncoded / totalFrames;
     const chunksDone = chunkProgress.doneIn !== null;
     const shouldShow = progress > 0 || chunksDone;
@@ -49,12 +58,12 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
     }
     return [
         '📽 ',
-        `(3/${totalSteps})`,
+        `(4/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Combining' : 'Combined'} videos`,
-        doneIn === null
+        `${timeToEncode === null ? 'Combining' : 'Combined'} videos`,
+        timeToEncode === null
             ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+            : cli_1.CliInternals.chalk.gray(`${timeToEncode}ms`),
     ].join(' ');
 };
 const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
@@ -64,7 +73,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     if (skipped) {
         return [
             '🪣 ',
-            `(4/${totalSteps})`,
+            `(5/${totalSteps})`,
             cli_1.CliInternals.chalk.blueBright(`Not cleaning up because --log=verbose was set`),
         ].join(' ');
     }
@@ -72,7 +81,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     const progress = filesDeleted / minFilesToDelete;
     return [
         '🪣 ',
-        `(4/${totalSteps})`,
+        `(5/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Cleaning up' : 'Cleaned up'} artifacts`,
         doneIn === null
@@ -83,7 +92,7 @@ const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
 const makeDownloadProgress = (downloadInfo, totalSteps) => {
     return [
         '💾',
-        `(5/${totalSteps})`,
+        `(6/${totalSteps})`,
         downloadInfo.totalSize === null
             ? cli_1.CliInternals.getFileSizeDownloadBar(downloadInfo.downloaded)
             : cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
@@ -101,40 +110,41 @@ const makeDownloadProgress = (downloadInfo, totalSteps) => {
     ].join(' ');
 };
 const makeMultiProgressFromStatus = (status) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f;
     return {
         chunkProgress: {
             chunksInvoked: status.chunks,
             totalChunks: (_b = (_a = status.renderMetadata) === null || _a === void 0 ? void 0 : _a.totalChunks) !== null && _b !== void 0 ? _b : null,
             doneIn: status.timeToFinishChunks,
+            framesRendered: status.framesRendered,
+            totalFrames: status.renderMetadata
+                ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+                : null,
         },
         encodingProgress: {
             framesEncoded: (_d = (_c = status.encodingStatus) === null || _c === void 0 ? void 0 : _c.framesEncoded) !== null && _d !== void 0 ? _d : 0,
-            totalFrames: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.videoConfig.durationInFrames) !== null && _f !== void 0 ? _f : 1,
-            doneIn: (_h = (_g = status.encodingStatus) === null || _g === void 0 ? void 0 : _g.doneIn) !== null && _h !== void 0 ? _h : null,
-            timeToInvoke: (_k = (_j = status.encodingStatus) === null || _j === void 0 ? void 0 : _j.timeToInvoke) !== null && _k !== void 0 ? _k : null,
         },
         lambdaInvokeProgress: {
-            doneIn: status.timeToInvokeLambdas,
             lambdasInvoked: status.lambdasInvoked,
-            totalLambdas: (_m = (_l = status.renderMetadata) === null || _l === void 0 ? void 0 : _l.estimatedRenderLambdaInvokations) !== null && _m !== void 0 ? _m : null,
+            totalLambdas: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.estimatedRenderLambdaInvokations) !== null && _f !== void 0 ? _f : null,
         },
         cleanupInfo: status.cleanup,
     };
 };
 exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, }) => {
+const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }) => {
     return [
         makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
-        makeChunkProgress({
+        ...makeRenderProgress({
             chunkProgress: progress.chunkProgress,
-            invokeProgress: progress.lambdaInvokeProgress,
             totalSteps: steps,
         }),
         makeEncodingProgress({
             encodingProgress: progress.encodingProgress,
             chunkProgress: progress.chunkProgress,
             totalSteps: steps,
+            timeToEncode,
+            totalFrames,
         }),
         makeCleanupProgress(progress.cleanupInfo, steps, verbose),
         downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,

package/dist/cli/commands/render/render.js

@@ -7,7 +7,6 @@ const download_media_1 = require("../../../api/download-media");
 const get_render_progress_1 = require("../../../api/get-render-progress");
 const render_media_on_lambda_1 = require("../../../api/render-media-on-lambda");
 const constants_1 = require("../../../shared/constants");
-const convert_to_serve_url_1 = require("../../../shared/convert-to-serve-url");
 const sleep_1 = require("../../../shared/sleep");
 const validate_frames_per_lambda_1 = require("../../../shared/validate-frames-per-lambda");
 const validate_privacy_1 = require("../../../shared/validate-privacy");
@@ -35,8 +34,7 @@ const renderCommand = async (args, remotionRoot) => {
     if (!composition) {
         log_1.Log.info('No compositions passed. Fetching compositions...');
         (0, validate_serveurl_1.validateServeUrl)(serveUrl);
-        const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
-        const comps = await (0, renderer_1.getCompositions)(realServeUrl);
+        const comps = await (0, renderer_1.getCompositions)(serveUrl);
         const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
         composition = compositionId;
     }
@@ -97,7 +95,7 @@ const renderCommand = async (args, remotionRoot) => {
             }
             : undefined,
     });
-    const totalSteps = downloadName ? 5 : 4;
+    const totalSteps = downloadName ? 6 : 5;
     const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
     log_1.Log.info(cli_1.CliInternals.chalk.gray(`bucket = ${res.bucketName}, function = ${functionName}`));
     log_1.Log.info(cli_1.CliInternals.chalk.gray(`renderId = ${res.renderId}, codec = ${codec} (${reason})`));
@@ -117,6 +115,8 @@ const renderCommand = async (args, remotionRoot) => {
         downloadInfo: null,
         retriesInfo: status.retriesInfo,
         verbose,
+        totalFrames: getTotalFrames(status),
+        timeToEncode: status.timeToEncode,
     }));
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -134,6 +134,8 @@ const renderCommand = async (args, remotionRoot) => {
             retriesInfo: newStatus.retriesInfo,
             downloadInfo: null,
             verbose,
+            timeToEncode: newStatus.timeToEncode,
+            totalFrames: getTotalFrames(newStatus),
         }));
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
@@ -142,6 +144,8 @@ const renderCommand = async (args, remotionRoot) => {
                 downloadInfo: null,
                 retriesInfo: newStatus.retriesInfo,
                 verbose,
+                timeToEncode: newStatus.timeToEncode,
+                totalFrames: getTotalFrames(newStatus),
             }));
             if (downloadName) {
                 const downloadStart = Date.now();
@@ -161,6 +165,8 @@ const renderCommand = async (args, remotionRoot) => {
                                 totalSize,
                             },
                             verbose,
+                            timeToEncode: newStatus.timeToEncode,
+                            totalFrames: getTotalFrames(newStatus),
                         }));
                     },
                 });
@@ -174,6 +180,8 @@ const renderCommand = async (args, remotionRoot) => {
                         totalSize: sizeInBytes,
                     },
                     verbose,
+                    timeToEncode: newStatus.timeToEncode,
+                    totalFrames: getTotalFrames(newStatus),
                 }));
                 log_1.Log.info();
                 log_1.Log.info();
@@ -226,3 +234,8 @@ const renderCommand = async (args, remotionRoot) => {
     }
 };
 exports.renderCommand = renderCommand;
+function getTotalFrames(status) {
+    return status.renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+        : null;
+}

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");
@@ -51,12 +52,12 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
         bucketProgress: {
             bucketCreated: false,
             doneIn: null,
-            websiteEnabled: false,
         },
         deployProgress: {
             doneIn: null,
             totalSize: null,
             sizeUploaded: 0,
+            stats: null,
         },
     };
     const updateProgress = () => {
@@ -74,12 +75,11 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
             updateProgress();
         },
     });
-    multiProgress.bucketProgress.websiteEnabled = true;
     multiProgress.bucketProgress.doneIn = Date.now() - bucketStart;
     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 +95,7 @@ const sitesCreateSubcommand = async (args, remotionRoot) => {
                     sizeUploaded: p.sizeUploaded,
                     totalSize: p.totalSize,
                     doneIn: null,
+                    stats: null,
                 };
                 updateProgress();
             },
@@ -108,6 +109,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 +123,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/commands/still.js

@@ -6,7 +6,6 @@ const renderer_1 = require("@remotion/renderer");
 const download_media_1 = require("../../api/download-media");
 const render_still_on_lambda_1 = require("../../api/render-still-on-lambda");
 const constants_1 = require("../../shared/constants");
-const convert_to_serve_url_1 = require("../../shared/convert-to-serve-url");
 const validate_privacy_1 = require("../../shared/validate-privacy");
 const validate_retries_1 = require("../../shared/validate-retries");
 const validate_serveurl_1 = require("../../shared/validate-serveurl");
@@ -29,14 +28,11 @@ const stillCommand = async (args, remotionRoot) => {
     const region = (0, get_aws_region_1.getAwsRegion)();
     let composition = args[1];
     if (!composition) {
-        if (!composition) {
-            log_1.Log.info('No compositions passed. Fetching compositions...');
-            (0, validate_serveurl_1.validateServeUrl)(serveUrl);
-            const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
-            const comps = await (0, renderer_1.getCompositions)(realServeUrl);
-            const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
-            composition = compositionId;
-        }
+        log_1.Log.info('No compositions passed. Fetching compositions...');
+        (0, validate_serveurl_1.validateServeUrl)(serveUrl);
+        const comps = await (0, renderer_1.getCompositions)(serveUrl);
+        const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
+        composition = compositionId;
     }
     const downloadName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
     const outName = args_1.parsedLambdaCli['out-name'];

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

@@ -5,13 +5,19 @@ export declare type BundleProgress = {
 export declare const makeBundleProgress: ({ progress, doneIn }: BundleProgress) => string;
 export declare type BucketCreationProgress = {
     bucketCreated: boolean;
-    websiteEnabled: boolean;
     doneIn: number | null;
 };
-export declare const makeBucketProgress: ({ bucketCreated, websiteEnabled, doneIn, }: BucketCreationProgress) => string;
+export declare const makeBucketProgress: ({ bucketCreated, 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

@@ -15,8 +15,8 @@ const makeBundleProgress = ({ progress, doneIn }) => {
     ].join(' ');
 };
 exports.makeBundleProgress = makeBundleProgress;
-const makeBucketProgress = ({ bucketCreated, websiteEnabled, doneIn, }) => {
-    const states = [bucketCreated, websiteEnabled];
+const makeBucketProgress = ({ bucketCreated, doneIn, }) => {
+    const states = [bucketCreated];
     const statesFinished = states.filter(Boolean).map((p) => p).length;
     const progress = statesFinished / states.length;
     return [
@@ -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/compositions.js

@@ -5,6 +5,7 @@ const renderer_1 = require("@remotion/renderer");
 const version_1 = require("remotion/version");
 const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const defaults_1 = require("../defaults");
+const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const deserialize_input_props_1 = require("../shared/deserialize-input-props");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
@@ -19,9 +20,10 @@ const compositionsHandler = async (lambdaParams, options) => {
         }
         throw new Error(`Version mismatch: When calling getCompositionsOnLambda(), you passed ${process.env.AWS_LAMBDA_FUNCTION_NAME} as the function, which has the version ${version_1.VERSION}, but the @remotion/lambda package you used to invoke the function has version ${lambdaParams.version}. Deploy a new function and use it to call getCompositionsOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
     }
+    const region = (0, get_current_region_1.getCurrentRegionInFunction)();
     const [{ bucketName }, browserInstance] = await Promise.all([
         (0, get_or_create_bucket_1.getOrCreateBucket)({
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+            region,
         }),
         (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(lambdaParams.logLevel, 'verbose'), (_a = lambdaParams.chromiumOptions) !== null && _a !== void 0 ? _a : {}),
     ]);
@@ -31,10 +33,15 @@ const compositionsHandler = async (lambdaParams, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         serialized: lambdaParams.inputProps,
     });
+    const realServeUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
+        urlOrId: lambdaParams.serveUrl,
+        region,
+        bucketName,
+    });
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
-    const compositions = await (0, renderer_1.getCompositions)(lambdaParams.serveUrl, {
+    const compositions = await (0, renderer_1.getCompositions)(realServeUrl, {
         puppeteerInstance: browserInstance,
-        inputProps: inputProps,
+        inputProps,
         envVariables: lambdaParams.envVariables,
         ffmpegExecutable: null,
         ffprobeExecutable: null,

package/dist/functions/helpers/concat-videos.d.ts

@@ -2,22 +2,26 @@ import type { FfmpegExecutable } from '@remotion/renderer';
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { LambdaCodec } from '../../shared/validate-lambda-codec';
 import type { EnhancedErrorInfo } from './write-lambda-error';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, onErrors, }: {
+export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }: {
     bucket: string;
     expectedFiles: number;
-    onProgress: (frames: number, encodingStart: number) => void;
-    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
-    numberOfFrames: number;
+    outdir: string;
     renderId: string;
     region: AwsRegion;
-    codec: LambdaCodec;
     expectedBucketOwner: string;
+    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
+}) => Promise<string[]>;
+export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, files, outdir, }: {
+    onProgress: (frames: number) => void;
+    numberOfFrames: number;
+    codec: LambdaCodec;
     fps: number;
     numberOfGifLoops: number | null;
     ffmpegExecutable: FfmpegExecutable;
     remotionRoot: string;
+    files: string[];
+    outdir: string;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;
-    encodingStart: number;
 }>;