@remotion/lambda 3.0.0-lambda.41 → 3.0.0-lambda.413

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeProgressString = exports.makeMultiProgressFromStatus = exports.makeDownloadProgess = exports.makeCleanupProgress = exports.makeEncodingProgress = exports.makeChunkProgress = exports.makeInvokeProgress = void 0;
+exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
 const cli_1 = require("@remotion/cli");
 const remotion_1 = require("remotion");
-const makeInvokeProgress = (invokeProgress, totalSteps) => {
+const format_bytes_1 = require("../../helpers/format-bytes");
+const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
     const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
     const progress = doneIn
         ? 1
@@ -11,16 +12,16 @@ const makeInvokeProgress = (invokeProgress, totalSteps) => {
             ? 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`),
+        retriesInfo.length > 0 ? `(+${retriesInfo.length} retries)` : [],
     ].join(' ');
 };
-exports.makeInvokeProgress = makeInvokeProgress;
 const makeChunkProgress = ({ chunkProgress, invokeProgress, totalSteps, }) => {
     const lambdaIsDone = invokeProgress.doneIn !== null;
     const { chunksInvoked, totalChunks, doneIn } = chunkProgress;
@@ -39,7 +40,6 @@ const makeChunkProgress = ({ chunkProgress, invokeProgress, totalSteps, }) => {
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
 };
-exports.makeChunkProgress = makeChunkProgress;
 const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, }) => {
     const { framesEncoded, totalFrames, doneIn } = encodingProgress;
     const progress = totalFrames === null ? 0 : framesEncoded / totalFrames;
@@ -58,13 +58,12 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
 };
-exports.makeEncodingProgress = makeEncodingProgress;
 const makeCleanupProgress = (cleanupInfo, totalSteps) => {
     if (!cleanupInfo) {
         return '';
     }
-    const { doneIn, filesDeleted, filesToDelete } = cleanupInfo;
-    const progress = filesDeleted / filesToDelete;
+    const { doneIn, filesDeleted, minFilesToDelete } = cleanupInfo;
+    const progress = filesDeleted / minFilesToDelete;
     return [
         '🪣 ',
         `(4/${totalSteps})`,
@@ -75,19 +74,17 @@ const makeCleanupProgress = (cleanupInfo, totalSteps) => {
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
 };
-exports.makeCleanupProgress = makeCleanupProgress;
-const makeDownloadProgess = (totalSteps, downloadedYet) => {
+const makeDownloadProgress = (downloadInfo, totalSteps) => {
     return [
         '💾',
         `(5/${totalSteps})`,
-        // TODO: More granularly
-        cli_1.CliInternals.makeProgressBar(Number(downloadedYet)),
-        `${downloadedYet ? 'Downloaded' : 'Downloading'} video`,
-        // TODO
-        downloadedYet ? cli_1.CliInternals.chalk.gray('TODOms') : '0%',
+        cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
+        `${downloadInfo.doneIn === null ? 'Downloading' : 'Downloaded'} video`,
+        downloadInfo.doneIn === null
+            ? `${(0, format_bytes_1.formatBytes)(downloadInfo.downloaded)}/${(0, format_bytes_1.formatBytes)(downloadInfo.totalSize)}`
+            : cli_1.CliInternals.chalk.gray(`${downloadInfo.doneIn}ms`),
     ].join(' ');
 };
-exports.makeDownloadProgess = makeDownloadProgess;
 const makeMultiProgressFromStatus = (status) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     return {
@@ -111,21 +108,42 @@ const makeMultiProgressFromStatus = (status) => {
     };
 };
 exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ outName, progress, steps, }) => {
+const makeErrors = (errors) => {
+    if (errors.length === 0) {
+        return null;
+    }
+    return errors
+        .map((err) => {
+        const shortStack = `${err.stack.substr(0, 90)}...`;
+        if (err.willRetry) {
+            if (err.chunk === null) {
+                return `Error while preparing render (will retry): ${shortStack}`;
+            }
+            return `Error in chunk (will retry) ${err.chunk}: ${shortStack}`;
+        }
+        if (err.chunk === null) {
+            return `Error during preparation: ${shortStack}.`;
+        }
+        return `Error in chunk ${err.chunk}: ${shortStack}`;
+    })
+        .join('\n');
+};
+const makeProgressString = ({ progress, steps, downloadInfo, errors, retriesInfo, }) => {
     return [
-        (0, exports.makeInvokeProgress)(progress.lambdaInvokeProgress, steps),
-        (0, exports.makeChunkProgress)({
+        makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
+        makeChunkProgress({
             chunkProgress: progress.chunkProgress,
             invokeProgress: progress.lambdaInvokeProgress,
             totalSteps: steps,
         }),
-        (0, exports.makeEncodingProgress)({
+        makeErrors(errors),
+        makeEncodingProgress({
             encodingProgress: progress.encodingProgress,
             chunkProgress: progress.chunkProgress,
             totalSteps: steps,
         }),
-        (0, exports.makeCleanupProgress)(progress.cleanupInfo, steps),
-        outName ? (0, exports.makeDownloadProgess)(steps, true) : null,
+        makeCleanupProgress(progress.cleanupInfo, steps),
+        downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,
     ]
         .filter(remotion_1.Internals.truthy)
         .join('\n');

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

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/progress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/progress.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,aAAa,SAAgB,MAAM,EAAE,kBAyIjD,CAAC"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,aAAa,SAAgB,MAAM,EAAE,kBA4NjD,CAAC"}

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

@@ -2,15 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderCommand = exports.RENDER_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const download_video_1 = require("../../../api/download-video");
+const download_media_1 = require("../../../api/download-media");
 const get_render_progress_1 = require("../../../api/get-render-progress");
-const render_video_on_lambda_1 = require("../../../api/render-video-on-lambda");
+const render_media_on_lambda_1 = require("../../../api/render-media-on-lambda");
 const constants_1 = require("../../../shared/constants");
 const sleep_1 = require("../../../shared/sleep");
+const validate_privacy_1 = require("../../../shared/validate-privacy");
+const validate_retries_1 = require("../../../shared/validate-retries");
 const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 const find_function_name_1 = require("../../helpers/find-function-name");
 const format_bytes_1 = require("../../helpers/format-bytes");
+const get_cloudwatch_stream_url_1 = require("../../helpers/get-cloudwatch-stream-url");
+const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 const progress_1 = require("./progress");
 exports.RENDER_COMMAND = 'render';
@@ -21,48 +25,60 @@ const renderCommand = async (args) => {
         log_1.Log.error('No serve URL passed.');
         log_1.Log.info('Pass an additional argument specifying a URL where your Remotion project is hosted.');
         log_1.Log.info();
-        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id>`);
-        process.exit(1);
+        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id> [output-location]`);
+        (0, quit_1.quit)(1);
     }
     const composition = args[1];
     if (!composition) {
         log_1.Log.error('No composition ID passed.');
         log_1.Log.info('Pass an additional argument specifying the composition ID.');
         log_1.Log.info();
-        // TODO: Rename serveURL
-        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id>`);
-        process.exit(1);
+        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id> [output-location]`);
+        (0, quit_1.quit)(1);
     }
     const outName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
-    // TODO: Further validate serveUrl
-    const cliOptions = await cli_1.CliInternals.getCliOptions({
+    const { chromiumOptions, codec, crf, envVariables, frameRange, framesPerLambda, imageFormat, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, quality, scale, } = await cli_1.CliInternals.getCliOptions({
         type: 'series',
         isLambda: true,
     });
     const functionName = await (0, find_function_name_1.findFunctionName)();
-    const res = await (0, render_video_on_lambda_1.renderVideoOnLambda)({
+    const region = (0, get_aws_region_1.getAwsRegion)();
+    const maxRetries = (_b = args_1.parsedLambdaCli['max-retries']) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_MAX_RETRIES;
+    (0, validate_retries_1.validateMaxRetries)(maxRetries);
+    const privacy = (_c = args_1.parsedLambdaCli.privacy) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_OUTPUT_PRIVACY;
+    (0, validate_privacy_1.validatePrivacy)(privacy);
+    const res = await (0, render_media_on_lambda_1.renderMediaOnLambda)({
         functionName,
         serveUrl,
-        inputProps: cliOptions.inputProps,
-        codec: cliOptions.codec,
-        imageFormat: cliOptions.imageFormat,
-        crf: (_b = cliOptions.crf) !== null && _b !== void 0 ? _b : undefined,
-        envVariables: cliOptions.envVariables,
-        pixelFormat: cliOptions.pixelFormat,
-        proResProfile: cliOptions.proResProfile,
-        quality: cliOptions.quality,
-        region: (0, get_aws_region_1.getAwsRegion)(),
-        // TODO: Unhardcode retries
-        maxRetries: 3,
+        inputProps,
+        codec: codec,
+        imageFormat,
+        crf: crf !== null && crf !== void 0 ? crf : undefined,
+        envVariables,
+        pixelFormat,
+        proResProfile,
+        quality,
+        region,
+        maxRetries,
         composition,
-        framesPerLambda: (_c = cliOptions.framesPerLambda) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_FRAMES_PER_LAMBDA,
-        // TODO: Unhardcode and specify as parameter
-        privacy: 'public',
-        enableChunkOptimization: !args_1.parsedLambdaCli['disable-chunk-optimization'],
-        saveBrowserLogs: args_1.parsedLambdaCli['save-browser-logs'],
+        framesPerLambda: framesPerLambda !== null && framesPerLambda !== void 0 ? framesPerLambda : constants_1.DEFAULT_FRAMES_PER_LAMBDA,
+        privacy,
+        logLevel,
+        frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : undefined,
+        outName: args_1.parsedLambdaCli['out-name'],
+        timeoutInMilliseconds: puppeteerTimeout,
+        chromiumOptions,
+        scale,
     });
     const totalSteps = outName ? 5 : 4;
-    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput();
+    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+    log_1.Log.info(cli_1.CliInternals.chalk.gray(`Bucket = ${res.bucketName}, renderId = ${res.renderId}, functionName = ${functionName}`));
+    log_1.Log.verbose(`CloudWatch logs (if enabled): ${(0, get_cloudwatch_stream_url_1.getCloudwatchStreamUrl)({
+        functionName,
+        region,
+        renderId: res.renderId,
+        method: constants_1.LambdaRoutines.renderer,
+    })}`);
     const status = await (0, get_render_progress_1.getRenderProgress)({
         functionName,
         bucketName: res.bucketName,
@@ -72,8 +88,10 @@ const renderCommand = async (args) => {
     const multiProgress = (0, progress_1.makeMultiProgressFromStatus)(status);
     progressBar.update((0, progress_1.makeProgressString)({
         progress: multiProgress,
-        outName,
+        errors: status.errors,
         steps: totalSteps,
+        downloadInfo: null,
+        retriesInfo: status.retriesInfo,
     }));
     for (let i = 0; i < 3000; i++) {
         await (0, sleep_1.sleep)(1000);
@@ -83,35 +101,58 @@ const renderCommand = async (args) => {
             renderId: res.renderId,
             region: (0, get_aws_region_1.getAwsRegion)(),
         });
-        cli_1.CliInternals.Log.verbose(JSON.stringify(newStatus, null, 2));
         const newProgress = (0, progress_1.makeMultiProgressFromStatus)(newStatus);
         progressBar.update((0, progress_1.makeProgressString)({
-            outName,
             progress: newProgress,
             steps: totalSteps,
+            errors: newStatus.errors,
+            retriesInfo: newStatus.retriesInfo,
+            downloadInfo: null,
         }));
         //	Log.info(newStatus);
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
-                outName,
                 progress: newProgress,
                 steps: totalSteps,
+                downloadInfo: null,
+                errors: newStatus.errors,
+                retriesInfo: newStatus.retriesInfo,
             }));
             if (outName) {
-                const { outputPath, size } = await (0, download_video_1.downloadVideo)({
+                const downloadStart = Date.now();
+                const { outputPath, sizeInBytes } = await (0, download_media_1.downloadMedia)({
                     bucketName: res.bucketName,
                     outPath: outName,
                     region: (0, get_aws_region_1.getAwsRegion)(),
                     renderId: res.renderId,
+                    onProgress: ({ downloaded, totalSize }) => {
+                        progressBar.update((0, progress_1.makeProgressString)({
+                            progress: newProgress,
+                            steps: totalSteps,
+                            errors: newStatus.errors,
+                            retriesInfo: newStatus.retriesInfo,
+                            downloadInfo: {
+                                doneIn: null,
+                                downloaded,
+                                totalSize,
+                            },
+                        }));
+                    },
                 });
                 progressBar.update((0, progress_1.makeProgressString)({
-                    outName,
                     progress: newProgress,
                     steps: totalSteps,
+                    errors: newStatus.errors,
+                    retriesInfo: newStatus.retriesInfo,
+                    downloadInfo: {
+                        doneIn: Date.now() - downloadStart,
+                        downloaded: sizeInBytes,
+                        totalSize: sizeInBytes,
+                    },
                 }));
                 log_1.Log.info();
                 log_1.Log.info();
-                log_1.Log.info('Done!', outputPath, (0, format_bytes_1.formatBytes)(size));
+                log_1.Log.info('Done!', outputPath, (0, format_bytes_1.formatBytes)(sizeInBytes));
             }
             else {
                 log_1.Log.info();
@@ -119,12 +160,25 @@ const renderCommand = async (args) => {
                 log_1.Log.info('Done! ' + newStatus.outputFile);
             }
             log_1.Log.info(`${(_d = newStatus.renderMetadata) === null || _d === void 0 ? void 0 : _d.estimatedTotalLambdaInvokations} λ's used, Estimated cost $${newStatus.costs.displayCost}`);
-            process.exit(0);
+            (0, quit_1.quit)(0);
         }
         if (newStatus.fatalErrorEncountered) {
-            log_1.Log.error(JSON.stringify(newStatus.errors));
+            log_1.Log.error('\n');
+            for (const err of newStatus.errors) {
+                const attemptString = `(Attempt ${err.attempt}/${err.totalAttempts})`;
+                if (err.chunk === null) {
+                    log_1.Log.error('Error occured while preparing video: ' + attemptString);
+                }
+                else {
+                    log_1.Log.error(`Error occurred when rendering chunk ${err.chunk}:`);
+                }
+                if (err.explanation) {
+                    log_1.Log.error(err.explanation);
+                }
+                log_1.Log.error(err.stack);
+            }
             log_1.Log.error('Fatal error encountered. Exiting.');
-            process.exit(1);
+            (0, quit_1.quit)(1);
         }
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/sites/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/create.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,eAAO,MAAM,qBAAqB,SAAgB,MAAM,EAAE,kBAiHzD,CAAC"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/create.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,eAAO,MAAM,qBAAqB,SAAgB,MAAM,EAAE,kBA4HzD,CAAC"}

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

@@ -7,34 +7,41 @@ 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");
+const validate_site_name_1 = require("../../../shared/validate-site-name");
 const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 const progress_bar_1 = require("../../helpers/progress-bar");
+const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 exports.SITES_CREATE_SUBCOMMAND = 'create';
 const sitesCreateSubcommand = async (args) => {
-    var _a;
+    var _a, _b;
     const fileName = args[0];
     if (!fileName) {
         log_1.Log.error('No entry file passed.');
         log_1.Log.info('Pass an additional argument specifying the entry file of your Remotion project:');
         log_1.Log.info();
         log_1.Log.info(`${constants_1.BINARY_NAME} deploy <entry-file.ts>`);
-        process.exit(1);
+        (0, quit_1.quit)(1);
     }
     const absoluteFile = path_1.default.join(process.cwd(), fileName);
     if (!(0, fs_1.existsSync)(absoluteFile)) {
         log_1.Log.error(`No file exists at ${absoluteFile}. Make sure the path exists and try again.`);
-        process.exit(1);
+        (0, quit_1.quit)(1);
     }
     if ((0, fs_1.lstatSync)(absoluteFile).isDirectory()) {
         log_1.Log.error(`You passed a path ${absoluteFile} but it is a directory. Pass a file instead.`);
-        process.exit(1);
+        (0, quit_1.quit)(1);
     }
-    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput();
+    const desiredSiteName = (_a = args_1.parsedLambdaCli['site-name']) !== null && _a !== void 0 ? _a : undefined;
+    if (desiredSiteName !== undefined) {
+        (0, validate_site_name_1.validateSiteName)(desiredSiteName);
+    }
+    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
     const multiProgress = {
         bundleProgress: {
             doneIn: null,
@@ -71,10 +78,9 @@ const sitesCreateSubcommand = async (args) => {
     updateProgress();
     const bundleStart = Date.now();
     const uploadStart = Date.now();
-    const { url } = await (0, deploy_site_1.deploySite)({
+    const { serveUrl, siteName } = await (0, deploy_site_1.deploySite)({
         entryPoint: absoluteFile,
-        // TODO: Make better
-        siteName: (_a = args_1.parsedLambdaCli['site-name']) !== null && _a !== void 0 ? _a : undefined,
+        siteName: desiredSiteName,
         bucketName,
         options: {
             onBundleProgress: (progress) => {
@@ -91,6 +97,8 @@ const sitesCreateSubcommand = async (args) => {
                 };
                 updateProgress();
             },
+            enableCaching: remotion_1.Internals.getWebpackCaching(),
+            webpackOverride: (_b = remotion_1.Internals.getWebpackOverrideFn()) !== null && _b !== void 0 ? _b : remotion_1.Internals.defaultOverrideFunction,
         },
         region: (0, get_aws_region_1.getAwsRegion)(),
     });
@@ -104,7 +112,8 @@ const sitesCreateSubcommand = async (args) => {
     log_1.Log.info();
     log_1.Log.info();
     log_1.Log.info('Deployed to S3!');
-    log_1.Log.info(url);
+    log_1.Log.info(`Serve URL: ${serveUrl}`);
+    log_1.Log.info(`Site Name: ${siteName}`);
 };
 exports.sitesCreateSubcommand = sitesCreateSubcommand;
 //# sourceMappingURL=create.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/create.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/sites/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,aAAa,UAAU,CAAC;AAqBrC,eAAO,MAAM,YAAY,SAAU,MAAM,EAAE,8BAoB1C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,aAAa,UAAU,CAAC;AAqBrC,eAAO,MAAM,YAAY,SAAU,MAAM,EAAE,8BAwB1C,CAAC"}

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

@@ -4,9 +4,11 @@ exports.sitesCommand = exports.SITES_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const log_1 = require("@remotion/cli/dist/log");
 const constants_1 = require("../../../shared/constants");
+const quit_1 = require("../../helpers/quit");
 const create_1 = require("./create");
 const ls_1 = require("./ls");
 const rm_1 = require("./rm");
+const rmall_1 = require("./rmall");
 exports.SITES_COMMAND = 'sites';
 const printSitesHelp = () => {
     log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} <subcommand>`);
@@ -29,13 +31,16 @@ const sitesCommand = (args) => {
     if (args[0] === rm_1.SITES_RM_COMMAND) {
         return (0, rm_1.sitesRmSubcommand)(args.slice(1));
     }
+    if (args[0] === rmall_1.SITES_RMALL_COMMAND) {
+        return (0, rmall_1.sitesRmallSubcommand)();
+    }
     if (args[0] === create_1.SITES_CREATE_SUBCOMMAND) {
         return (0, create_1.sitesCreateSubcommand)(args.slice(1));
     }
     if (args[0]) {
         log_1.Log.error(`Subcommand ${args[0]} not found.`);
         printSitesHelp();
-        process.exit(1);
+        (0, quit_1.quit)(1);
     }
     printSitesHelp();
 };

package/dist/cli/commands/sites/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/index.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,gDAA2C;AAC3C,yDAAsD;AACtD,qCAAwE;AACxE,6BAA4D;AAC5D,6BAAyD;AAE5C,QAAA,aAAa,GAAG,OAAO,CAAC;AAErC,MAAM,cAAc,GAAG,GAAG,EAAE;IAC3B,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,qBAAa,eAAe,CAAC,CAAC;IACzD,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACnC,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CACP,GAAG,uBAAW,IAAI,qBAAa,IAAI,gCAAuB,gBAAgB,CAC1E,CAAC;IACF,SAAG,CAAC,IAAI,CACP,kBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC,CACzE,CAAC;IACF,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,qBAAa,IAAI,wBAAmB,EAAE,CAAC,CAAC;IACnE,SAAG,CAAC,IAAI,CAAC,kBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,CAAC;IACxE,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,qBAAa,IAAI,qBAAgB,YAAY,CAAC,CAAC;IAC1E,SAAG,CAAC,IAAI,CAAC,kBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,EAAE;IAC9C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,wBAAmB,EAAE;QACpC,OAAO,IAAA,sBAAiB,GAAE,CAAC;KAC3B;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,qBAAgB,EAAE;QACjC,OAAO,IAAA,sBAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,gCAAuB,EAAE;QACxC,OAAO,IAAA,8BAAqB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5C;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;QACZ,SAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAC9C,cAAc,EAAE,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,cAAc,EAAE,CAAC;AAClB,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/index.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,gDAA2C;AAC3C,yDAAsD;AACtD,6CAAwC;AACxC,qCAAwE;AACxE,6BAA4D;AAC5D,6BAAyD;AACzD,mCAAkE;AAErD,QAAA,aAAa,GAAG,OAAO,CAAC;AAErC,MAAM,cAAc,GAAG,GAAG,EAAE;IAC3B,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,qBAAa,eAAe,CAAC,CAAC;IACzD,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACnC,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CACP,GAAG,uBAAW,IAAI,qBAAa,IAAI,gCAAuB,gBAAgB,CAC1E,CAAC;IACF,SAAG,CAAC,IAAI,CACP,kBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC,CACzE,CAAC;IACF,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,qBAAa,IAAI,wBAAmB,EAAE,CAAC,CAAC;IACnE,SAAG,CAAC,IAAI,CAAC,kBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,CAAC;IACxE,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,qBAAa,IAAI,qBAAgB,YAAY,CAAC,CAAC;IAC1E,SAAG,CAAC,IAAI,CAAC,kBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,EAAE;IAC9C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,wBAAmB,EAAE;QACpC,OAAO,IAAA,sBAAiB,GAAE,CAAC;KAC3B;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,qBAAgB,EAAE;QACjC,OAAO,IAAA,sBAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,2BAAmB,EAAE;QACpC,OAAO,IAAA,4BAAoB,GAAE,CAAC;KAC9B;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,gCAAuB,EAAE;QACxC,OAAO,IAAA,8BAAqB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5C;IAED,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;QACZ,SAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAC9C,cAAc,EAAE,CAAC;QACjB,IAAA,WAAI,EAAC,CAAC,CAAC,CAAC;KACR;IAED,cAAc,EAAE,CAAC;AAClB,CAAC,CAAC;AAxBW,QAAA,YAAY,gBAwBvB"}

package/dist/cli/commands/sites/ls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/ls.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAaxC,eAAO,MAAM,iBAAiB,qBAsC7B,CAAC"}
+{"version":3,"file":"ls.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/ls.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAaxC,eAAO,MAAM,iBAAiB,qBA2C7B,CAAC"}

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

@@ -4,7 +4,6 @@ exports.sitesLsSubcommand = exports.SITES_LS_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const log_1 = require("@remotion/cli/dist/log");
 const get_sites_1 = require("../../../api/get-sites");
-const make_s3_url_1 = require("../../../shared/make-s3-url");
 const get_aws_region_1 = require("../../get-aws-region");
 const date_string_1 = require("../../helpers/date-string");
 const format_bytes_1 = require("../../helpers/format-bytes");
@@ -21,13 +20,22 @@ const logRow = (data) => {
 const sitesLsSubcommand = async () => {
     const region = (0, get_aws_region_1.getAwsRegion)();
     const { sites, buckets } = await (0, get_sites_1.getSites)({ region });
-    if (buckets.length > 1) {
+    if (buckets.length > 1 && !cli_1.CliInternals.quietFlagProvided()) {
         log_1.Log.warn('Warning: You have more than one Remotion S3 bucket, but only one is needed. This can lead to conflicts. Remove all but one of them.');
     }
     const sitesPluralized = sites.length === 1 ? 'site' : 'sites';
-    log_1.Log.info(`${sites.length} ${sitesPluralized} in the ${region} region.`);
+    if (!cli_1.CliInternals.quietFlagProvided()) {
+        log_1.Log.info(`${sites.length} ${sitesPluralized} in the ${region} region.`);
+    }
+    if (cli_1.CliInternals.quietFlagProvided()) {
+        if (sites.length === 0) {
+            log_1.Log.info('()');
+            return;
+        }
+        return log_1.Log.info(sites.map((s) => s.id).join(' '));
+    }
     log_1.Log.info();
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(logRow(['Site ID', 'Bucket', 'Size', 'Last updated'])));
+    log_1.Log.info(cli_1.CliInternals.chalk.gray(logRow(['Site Name', 'Bucket', 'Size', 'Last updated'])));
     for (const site of sites) {
         log_1.Log.info(logRow([
             site.id,
@@ -35,11 +43,7 @@ const sitesLsSubcommand = async () => {
             (0, format_bytes_1.formatBytes)(site.sizeInBytes),
             site.lastModified ? (0, date_string_1.dateString)(new Date(site.lastModified)) : 'n/a',
         ]));
-        log_1.Log.info((0, make_s3_url_1.makeS3Url)({
-            bucketName: site.bucketName,
-            region,
-            subFolder: `sites/${site.id}`,
-        }));
+        log_1.Log.info(site.serveUrl);
         log_1.Log.info();
     }
 };

package/dist/cli/commands/sites/ls.js.map

@@ -1 +1 @@
-{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/ls.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,gDAA2C;AAC3C,sDAAgD;AAChD,6DAAsD;AACtD,yDAAkD;AAClD,2DAAqD;AACrD,6DAAuD;AAE1C,QAAA,mBAAmB,GAAG,IAAI,CAAC;AAExC,MAAM,IAAI,GAAqC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAEhE,MAAM,MAAM,GAAG,CAAC,IAAsC,EAAE,EAAE;IACzD,OAAO;QACN,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;KACpC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACZ,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;IAC3C,MAAM,MAAM,GAAG,IAAA,6BAAY,GAAE,CAAC;IAC9B,MAAM,EAAC,KAAK,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,oBAAQ,EAAC,EAAC,MAAM,EAAC,CAAC,CAAC;IAElD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,SAAG,CAAC,IAAI,CACP,qIAAqI,CACrI,CAAC;KACF;IAED,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,SAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,eAAe,WAAW,MAAM,UAAU,CAAC,CAAC;IAExE,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CACP,kBAAY,CAAC,KAAK,CAAC,IAAI,CACtB,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CACrD,CACD,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACzB,SAAG,CAAC,IAAI,CACP,MAAM,CAAC;YACN,IAAI,CAAC,EAAE;YACP,IAAI,CAAC,UAAU;YACf,IAAA,0BAAW,EAAC,IAAI,CAAC,WAAW,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAA,wBAAU,EAAC,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;SACnE,CAAC,CACF,CAAC;QACF,SAAG,CAAC,IAAI,CACP,IAAA,uBAAS,EAAC;YACT,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,MAAM;YACN,SAAS,EAAE,SAAS,IAAI,CAAC,EAAE,EAAE;SAC7B,CAAC,CACF,CAAC;QACF,SAAG,CAAC,IAAI,EAAE,CAAC;KACX;AACF,CAAC,CAAC;AAtCW,QAAA,iBAAiB,qBAsC5B"}
+{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/ls.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,gDAA2C;AAC3C,sDAAgD;AAChD,yDAAkD;AAClD,2DAAqD;AACrD,6DAAuD;AAE1C,QAAA,mBAAmB,GAAG,IAAI,CAAC;AAExC,MAAM,IAAI,GAAqC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAEhE,MAAM,MAAM,GAAG,CAAC,IAAsC,EAAE,EAAE;IACzD,OAAO;QACN,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;KACpC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACZ,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;IAC3C,MAAM,MAAM,GAAG,IAAA,6BAAY,GAAE,CAAC;IAC9B,MAAM,EAAC,KAAK,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,oBAAQ,EAAC,EAAC,MAAM,EAAC,CAAC,CAAC;IAElD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAY,CAAC,iBAAiB,EAAE,EAAE;QAC5D,SAAG,CAAC,IAAI,CACP,qIAAqI,CACrI,CAAC;KACF;IAED,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,IAAI,CAAC,kBAAY,CAAC,iBAAiB,EAAE,EAAE;QACtC,SAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,eAAe,WAAW,MAAM,UAAU,CAAC,CAAC;KACxE;IAED,IAAI,kBAAY,CAAC,iBAAiB,EAAE,EAAE;QACrC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,SAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,OAAO;SACP;QAED,OAAO,SAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;KAClD;IAED,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CACP,kBAAY,CAAC,KAAK,CAAC,IAAI,CACtB,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CACvD,CACD,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACzB,SAAG,CAAC,IAAI,CACP,MAAM,CAAC;YACN,IAAI,CAAC,EAAE;YACP,IAAI,CAAC,UAAU;YACf,IAAA,0BAAW,EAAC,IAAI,CAAC,WAAW,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAA,wBAAU,EAAC,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;SACnE,CAAC,CACF,CAAC;QACF,SAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,SAAG,CAAC,IAAI,EAAE,CAAC;KACX;AACF,CAAC,CAAC;AA3CW,QAAA,iBAAiB,qBA2C5B"}

package/dist/cli/commands/sites/rm.d.ts

@@ -1,3 +1,3 @@
 export declare const SITES_RM_COMMAND = "rm";
-export declare const sitesRmSubcommand: (args: string[]) => Promise<void>;
+export declare const sitesRmSubcommand: (args: string[]) => Promise<undefined>;
 //# sourceMappingURL=rm.d.ts.map