@remotion/lambda 4.0.164 → 4.0.166

package/dist/api/delete-render.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteRender = void 0;
 const defaults_1 = require("../defaults");
 const expected_out_name_1 = require("../functions/helpers/expected-out-name");
-const get_render_metadata_1 = require("../functions/helpers/get-render-metadata");
+const get_overall_progress_s3_1 = require("../functions/helpers/get-overall-progress-s3");
 const io_1 = require("../functions/helpers/io");
 const get_account_id_1 = require("../shared/get-account-id");
 const clean_items_1 = require("./clean-items");
@@ -20,13 +20,17 @@ const deleteRender = async (input) => {
     const expectedBucketOwner = await (0, get_account_id_1.getAccountId)({
         region: input.region,
     });
-    const renderMetadata = await (0, get_render_metadata_1.getRenderMetadata)({
+    const progress = await (0, get_overall_progress_s3_1.getOverallProgressS3)({
         bucketName: input.bucketName,
         expectedBucketOwner,
         region: input.region,
         renderId: input.renderId,
     });
-    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, input.bucketName, (_a = input.customCredentials) !== null && _a !== void 0 ? _a : null);
+    // Render did not start yet
+    if (progress.renderMetadata === null) {
+        return { freedBytes: 0 };
+    }
+    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(progress.renderMetadata, input.bucketName, (_a = input.customCredentials) !== null && _a !== void 0 ? _a : null);
     await (0, io_1.lambdaDeleteFile)({
         bucketName: renderBucketName,
         customCredentials,

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

@@ -23,7 +23,6 @@ export type DeployFunctionOutput = {
     alreadyExisted: boolean;
 };
 export declare const internalDeployFunction: (params: MandatoryParameters & OptionalParameters) => Promise<DeployFunctionOutput>;
-export declare const errorHandled: (params: MandatoryParameters & OptionalParameters) => Promise<DeployFunctionOutput>;
 /**
  * @description Creates an AWS Lambda function in your account that will be able to render a video in the cloud.
  * @see [Documentation](https://www.remotion.dev/docs/lambda/deployfunction)

package/dist/api/deploy-function.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployFunction = exports.errorHandled = exports.internalDeployFunction = void 0;
+exports.deployFunction = exports.internalDeployFunction = void 0;
 const pure_1 = require("@remotion/renderer/pure");
 const no_react_1 = require("remotion/no-react");
 const version_1 = require("remotion/version");
@@ -66,7 +66,7 @@ const internalDeployFunction = async (params) => {
     };
 };
 exports.internalDeployFunction = internalDeployFunction;
-exports.errorHandled = pure_1.NoReactAPIs.wrapWithErrorHandling(exports.internalDeployFunction);
+const errorHandled = pure_1.NoReactAPIs.wrapWithErrorHandling(exports.internalDeployFunction);
 /**
  * @description Creates an AWS Lambda function in your account that will be able to render a video in the cloud.
  * @see [Documentation](https://www.remotion.dev/docs/lambda/deployfunction)
@@ -82,7 +82,7 @@ exports.errorHandled = pure_1.NoReactAPIs.wrapWithErrorHandling(exports.internal
 const deployFunction = ({ createCloudWatchLogGroup, memorySizeInMb, region, timeoutInSeconds, cloudWatchLogRetentionPeriodInDays, customRoleArn, enableLambdaInsights, indent, logLevel, enableV5Runtime, vpcSubnetIds, vpcSecurityGroupIds, ...options }) => {
     var _a;
     const diskSizeInMb = (_a = options.diskSizeInMb) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_EPHEMERAL_STORAGE_IN_MB;
-    return (0, exports.errorHandled)({
+    return errorHandled({
         indent: indent !== null && indent !== void 0 ? indent : false,
         logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
         createCloudWatchLogGroup,

package/dist/api/download-media.js

@@ -7,7 +7,7 @@ exports.downloadMedia = void 0;
 const renderer_1 = require("@remotion/renderer");
 const node_path_1 = __importDefault(require("node:path"));
 const expected_out_name_1 = require("../functions/helpers/expected-out-name");
-const get_render_metadata_1 = require("../functions/helpers/get-render-metadata");
+const get_overall_progress_s3_1 = require("../functions/helpers/get-overall-progress-s3");
 const read_with_progress_1 = require("../functions/helpers/read-with-progress");
 const get_account_id_1 = require("../shared/get-account-id");
 /**
@@ -26,15 +26,18 @@ const downloadMedia = async (input) => {
     const expectedBucketOwner = await (0, get_account_id_1.getAccountId)({
         region: input.region,
     });
-    const renderMetadata = await (0, get_render_metadata_1.getRenderMetadata)({
+    const overallProgress = await (0, get_overall_progress_s3_1.getOverallProgressS3)({
         bucketName: input.bucketName,
         expectedBucketOwner,
         region: input.region,
         renderId: input.renderId,
     });
+    if (!overallProgress.renderMetadata) {
+        throw new Error('Render did not finish yet');
+    }
     const outputPath = node_path_1.default.resolve(process.cwd(), input.outPath);
     renderer_1.RenderInternals.ensureOutputDirectory(outputPath);
-    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(renderMetadata, input.bucketName, (_a = input.customCredentials) !== null && _a !== void 0 ? _a : null);
+    const { key, renderBucketName, customCredentials } = (0, expected_out_name_1.getExpectedOutName)(overallProgress.renderMetadata, input.bucketName, (_a = input.customCredentials) !== null && _a !== void 0 ? _a : null);
     const { sizeInBytes } = await (0, read_with_progress_1.lambdaDownloadFileWithProgress)({
         bucketName: renderBucketName,
         expectedBucketOwner,

package/dist/api/get-compositions-on-lambda.js

@@ -46,9 +46,7 @@ const getCompositionsOnLambda = async ({ chromiumOptions, serveUrl, region, inpu
                 offthreadVideoCacheSizeInBytes: offthreadVideoCacheSizeInBytes !== null && offthreadVideoCacheSizeInBytes !== void 0 ? offthreadVideoCacheSizeInBytes : null,
             },
             region,
-            receivedStreamingPayload: () => undefined,
             timeoutInTest: 120000,
-            retriesRemaining: 0,
         });
         return res.compositions;
     }

package/dist/api/get-render-progress.js

@@ -20,9 +20,7 @@ const getRenderProgress = async (input) => {
         type: constants_1.LambdaRoutines.status,
         payload: (0, make_lambda_payload_1.getRenderProgressPayload)(input),
         region: input.region,
-        receivedStreamingPayload: () => undefined,
         timeoutInTest: 120000,
-        retriesRemaining: 2,
     });
     return result;
 };

package/dist/api/make-lambda-payload.js

@@ -54,7 +54,7 @@ const makeLambdaRenderMediaPayload = async ({ rendererFunctionName, frameRange,
         numberOfGifLoops,
         concurrencyPerLambda,
         downloadBehavior,
-        muted: muted !== null && muted !== void 0 ? muted : false,
+        muted,
         version: version_1.VERSION,
         overwrite: overwrite !== null && overwrite !== void 0 ? overwrite : false,
         audioBitrate: audioBitrate !== null && audioBitrate !== void 0 ? audioBitrate : null,
@@ -121,6 +121,7 @@ const makeLambdaRenderStillPayload = async ({ serveUrl, inputProps, imageFormat,
         offthreadVideoCacheSizeInBytes,
         deleteAfter,
         type: defaults_1.LambdaRoutines.still,
+        streamed: true,
     };
 };
 exports.makeLambdaRenderStillPayload = makeLambdaRenderStillPayload;

package/dist/api/render-media-on-lambda.js

@@ -15,9 +15,7 @@ const internalRenderMediaOnLambdaRaw = async (input) => {
             type: constants_1.LambdaRoutines.start,
             payload: await (0, make_lambda_payload_1.makeLambdaRenderMediaPayload)(input),
             region,
-            receivedStreamingPayload: () => undefined,
             timeoutInTest: 120000,
-            retriesRemaining: 0,
         });
         return {
             renderId: res.renderId,

package/dist/api/render-still-on-lambda.js

@@ -10,31 +10,43 @@ const internalRenderStillOnLambda = async (input) => {
     var _a;
     const { functionName, region, onInit } = input;
     try {
-        const res = await (0, call_lambda_1.callLambda)({
-            functionName,
-            type: constants_1.LambdaRoutines.still,
-            payload: await (0, make_lambda_payload_1.makeLambdaRenderStillPayload)(input),
-            region,
-            receivedStreamingPayload: (payload) => {
-                if (payload.type === 'render-id-determined') {
-                    onInit({
-                        renderId: payload.renderId,
-                        cloudWatchLogs: (0, get_aws_urls_1.getCloudwatchMethodUrl)({
-                            functionName,
-                            method: constants_1.LambdaRoutines.still,
-                            region,
-                            rendererFunctionName: null,
-                            renderId: payload.renderId,
-                        }),
-                        lambdaInsightsUrl: (0, get_aws_urls_1.getLambdaInsightsUrl)({
-                            functionName,
-                            region,
-                        }),
-                    });
-                }
-            },
-            timeoutInTest: 120000,
-            retriesRemaining: 0,
+        const payload = await (0, make_lambda_payload_1.makeLambdaRenderStillPayload)(input);
+        const res = await new Promise((resolve, reject) => {
+            (0, call_lambda_1.callLambdaWithStreaming)({
+                functionName,
+                type: constants_1.LambdaRoutines.still,
+                payload,
+                region,
+                receivedStreamingPayload: ({ message }) => {
+                    if (message.type === 'render-id-determined') {
+                        onInit === null || onInit === void 0 ? void 0 : onInit({
+                            renderId: message.payload.renderId,
+                            cloudWatchLogs: (0, get_aws_urls_1.getCloudwatchMethodUrl)({
+                                functionName,
+                                method: constants_1.LambdaRoutines.still,
+                                region,
+                                rendererFunctionName: null,
+                                renderId: message.payload.renderId,
+                            }),
+                            lambdaInsightsUrl: (0, get_aws_urls_1.getLambdaInsightsUrl)({
+                                functionName,
+                                region,
+                            }),
+                        });
+                    }
+                    if (message.type === 'still-rendered') {
+                        resolve(message.payload);
+                    }
+                },
+                timeoutInTest: 120000,
+                retriesRemaining: 0,
+            })
+                .then(() => {
+                reject(new Error('Expected response to be streamed'));
+            })
+                .catch((err) => {
+                reject(err);
+            });
         });
         return {
             estimatedPrice: res.estimatedPrice,

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

@@ -1,36 +1,11 @@
-import type { LogLevel } from '@remotion/renderer';
-import type { CleanupInfo, EncodingProgress, RenderProgress } from '../../../defaults';
-import type { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
-type LambdaInvokeProgress = {
-    totalLambdas: number | null;
-    lambdasInvoked: number;
-};
-type ChunkProgress = {
-    doneIn: number | null;
-    framesRendered: number;
-    totalFrames: number | null;
-    totalChunks: number | null;
-    chunksEncoded: number;
-};
-type MultiRenderProgress = {
-    lambdaInvokeProgress: LambdaInvokeProgress;
-    chunkProgress: ChunkProgress;
-    encodingProgress: EncodingProgress;
-    cleanupInfo: CleanupInfo | null;
-};
-export declare const makeMultiProgressFromStatus: (status: RenderProgress) => MultiRenderProgress;
+import type { RenderProgress } from '../../../defaults';
 type DownloadedInfo = {
     totalSize: number | null;
     downloaded: number;
     doneIn: number | null;
 };
-export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, logLevel, timeToEncode, totalFrames, }: {
-    progress: MultiRenderProgress;
-    steps: number;
+export declare const makeProgressString: ({ downloadInfo, overall, }: {
+    overall: RenderProgress;
     downloadInfo: DownloadedInfo | null;
-    retriesInfo: ChunkRetry[];
-    logLevel: LogLevel;
-    timeToEncode: number | null;
-    totalFrames: number | null;
 }) => string;
 export {};

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

@@ -1,89 +1,96 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
+exports.makeProgressString = void 0;
 const cli_1 = require("@remotion/cli");
 const renderer_1 = require("@remotion/renderer");
 const no_react_1 = require("remotion/no-react");
 const truthy_1 = require("../../../shared/truthy");
-const makeInvokeProgress = (invokeProgress, retriesInfo) => {
+const makeInvokeProgress = (overall) => {
+    var _a, _b;
+    const invokeProgress = {
+        lambdasInvoked: overall.lambdasInvoked,
+        totalLambdas: (_b = (_a = overall.renderMetadata) === null || _a === void 0 ? void 0 : _a.estimatedRenderLambdaInvokations) !== null && _b !== void 0 ? _b : null,
+    };
     const { lambdasInvoked, totalLambdas } = invokeProgress;
     const progress = totalLambdas === null ? 0 : lambdasInvoked / totalLambdas;
-    return [
+    const topLine = [
         `${progress === 0 ? 'Invoked' : 'Invoking'} lambdas`.padEnd(cli_1.CliInternals.LABEL_WIDTH),
         cli_1.CliInternals.makeProgressBar(progress),
         progress === 1
-            ? cli_1.CliInternals.chalk.gray('100%')
-            : `${Math.round(progress * 100)}%`,
-        retriesInfo.length > 0 ? `(+${retriesInfo.length} retries)` : [],
+            ? cli_1.CliInternals.chalk.gray(`${lambdasInvoked}/${totalLambdas}`)
+            : totalLambdas === null
+                ? null
+                : `${lambdasInvoked}/${totalLambdas}`,
     ].join(' ');
+    return [
+        topLine,
+        overall.retriesInfo.length > 0
+            ? `! Retrying chunk${overall.retriesInfo.length === 1 ? '' : 's'} ${overall.retriesInfo.map((r) => r.chunk).join(', ')}`
+            : null,
+    ].filter(no_react_1.NoReactInternals.truthy);
 };
-const makeRenderProgress = ({ chunkProgress, }) => {
-    const { chunksEncoded, totalChunks, doneIn } = chunkProgress;
-    const renderProgress = chunkProgress.totalFrames === null
-        ? 0
-        : chunkProgress.framesRendered / chunkProgress.totalFrames;
-    const encodingProgress = totalChunks === null ? 0 : chunksEncoded / totalChunks;
-    const frames = chunkProgress.totalFrames === null
-        ? null
-        : `${chunkProgress.framesRendered}/${chunkProgress.totalFrames}`;
+const makeRenderProgress = (progress) => {
+    var _a, _b;
+    const framesEncoded = (_b = (_a = progress.encodingStatus) === null || _a === void 0 ? void 0 : _a.framesEncoded) !== null && _b !== void 0 ? _b : 0;
+    const totalFrames = progress.renderMetadata && progress.renderMetadata.type === 'video'
+        ? renderer_1.RenderInternals.getFramesToRender(progress.renderMetadata.frameRange, progress.renderMetadata.everyNthFrame).length
+        : null;
+    const renderProgress = totalFrames === null ? 0 : progress.framesRendered / totalFrames;
+    const encodingProgress = totalFrames === null ? 0 : framesEncoded / totalFrames;
+    const frames = totalFrames === null ? null : `${progress.framesRendered}/${totalFrames}`;
     const first = [
-        (doneIn === null ? 'Rendering frames' : 'Rendered frames').padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
+        (progress.timeToRenderFrames === null
+            ? 'Rendering frames'
+            : 'Rendered frames').padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         cli_1.CliInternals.makeProgressBar(renderProgress),
-        doneIn === null ? frames : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        progress.timeToRenderFrames === null
+            ? frames
+            : cli_1.CliInternals.chalk.gray(`${progress.timeToRenderFrames}ms`),
     ]
         .filter(truthy_1.truthy)
         .join(' ');
     const second = [
-        `${doneIn === null ? 'Encoding' : 'Encoded'} chunks`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
+        `${progress.timeToEncode === null ? 'Encoding' : 'Encoded'} frames`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         cli_1.CliInternals.makeProgressBar(encodingProgress),
-        doneIn === null
-            ? `${Math.round(encodingProgress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
-    ].join(' ');
+        progress.timeToEncode === null
+            ? totalFrames === null
+                ? null
+                : `${framesEncoded}/${totalFrames}`
+            : cli_1.CliInternals.chalk.gray(`${progress.timeToEncode}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
     return [first, second];
 };
-const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalFrames, timeToEncode, }) => {
-    const { framesEncoded } = encodingProgress;
-    const progress = totalFrames === null ? 0 : framesEncoded / totalFrames;
-    const chunksDone = chunkProgress.doneIn !== null;
-    const shouldShow = progress > 0 || chunksDone;
-    if (!shouldShow) {
-        return '';
-    }
-    return [
-        `${timeToEncode === null ? 'Combining' : 'Combined'} videos`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
-        cli_1.CliInternals.makeProgressBar(progress),
-        timeToEncode === null
-            ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${timeToEncode}ms`),
-    ].join(' ');
-};
-const makeCleanupProgress = (cleanupInfo, skipped) => {
-    if (!cleanupInfo) {
-        return '';
-    }
-    if (skipped) {
-        return [
-            cli_1.CliInternals.chalk.blueBright(`Not cleaning up because --log=verbose was set`),
-        ].join(' ');
-    }
-    const { doneIn, filesDeleted, minFilesToDelete } = cleanupInfo;
-    const progress = filesDeleted / minFilesToDelete;
+function getTotalFrames(status) {
+    return status.renderMetadata && status.renderMetadata.type === 'video'
+        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+        : null;
+}
+const makeCombinationProgress = (prog) => {
+    var _a, _b;
+    const encodingProgress = {
+        framesEncoded: (_b = (_a = prog.encodingStatus) === null || _a === void 0 ? void 0 : _a.framesEncoded) !== null && _b !== void 0 ? _b : 0,
+        combinedFrames: prog.combinedFrames,
+        timeToCombine: prog.timeToCombine,
+    };
+    const totalFrames = getTotalFrames(prog);
+    const { combinedFrames, timeToCombine } = encodingProgress;
+    const progress = totalFrames === null ? 0 : combinedFrames / totalFrames;
     return [
+        `${timeToCombine === null ? 'Combining' : 'Combined'} chunks`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Cleaning up' : 'Cleaned up'} artifacts`,
-        doneIn === null
+        timeToCombine === null
             ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+            : cli_1.CliInternals.chalk.gray(`${timeToCombine}ms`),
     ].join(' ');
 };
-const makeDownloadProgress = (downloadInfo, totalSteps) => {
+const makeDownloadProgress = (downloadInfo) => {
     return [
-        `(6/${totalSteps})`,
+        `${downloadInfo.doneIn === null ? 'Downloading' : 'Downloaded'} video`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         downloadInfo.totalSize === null
             ? cli_1.CliInternals.getFileSizeDownloadBar(downloadInfo.downloaded)
             : cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
-        `${downloadInfo.doneIn === null ? 'Downloading' : 'Downloaded'} video`,
         downloadInfo.doneIn === null
             ? [
                 `${cli_1.CliInternals.formatBytes(downloadInfo.downloaded)}`,
@@ -96,43 +103,35 @@ const makeDownloadProgress = (downloadInfo, totalSteps) => {
             : cli_1.CliInternals.chalk.gray(`${downloadInfo.doneIn}ms`),
     ].join(' ');
 };
-const makeMultiProgressFromStatus = (status) => {
-    var _a, _b, _c, _d, _e, _f;
-    return {
-        chunkProgress: {
-            chunksEncoded: 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 && status.renderMetadata.type === 'video'
-                ? 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,
-        },
-        lambdaInvokeProgress: {
-            lambdasInvoked: status.lambdasInvoked,
-            totalLambdas: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.estimatedRenderLambdaInvokations) !== null && _f !== void 0 ? _f : null,
-        },
-        cleanupInfo: status.cleanup,
-    };
+const makeTopRow = (overall) => {
+    const timeoutInSeconds = Math.round((overall.timeoutTimestamp - Date.now()) / 1000);
+    if (!overall.renderMetadata) {
+        return null;
+    }
+    if (overall.done) {
+        return null;
+    }
+    const str = [
+        `${Math.round(overall.overallProgress * 100)}%`,
+        overall.renderMetadata
+            ? `${overall.renderMetadata.estimatedTotalLambdaInvokations} λ`
+            : null,
+        `${overall.costs.displayCost}`,
+        timeoutInSeconds < 0
+            ? 'Timeout reached - Expecting crash shortly'
+            : `Timeout ${timeoutInSeconds}s`,
+    ]
+        .filter(no_react_1.NoReactInternals.truthy)
+        .join(' • ');
+    return cli_1.CliInternals.chalk.gray(str);
 };
-exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, logLevel, timeToEncode, totalFrames, }) => {
+const makeProgressString = ({ downloadInfo, overall, }) => {
     return [
-        makeInvokeProgress(progress.lambdaInvokeProgress, retriesInfo),
-        ...makeRenderProgress({
-            chunkProgress: progress.chunkProgress,
-        }),
-        makeEncodingProgress({
-            encodingProgress: progress.encodingProgress,
-            chunkProgress: progress.chunkProgress,
-            timeToEncode,
-            totalFrames,
-        }),
-        makeCleanupProgress(progress.cleanupInfo, logLevel === 'verbose'),
-        downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,
+        makeTopRow(overall),
+        ...makeInvokeProgress(overall),
+        ...makeRenderProgress(overall),
+        makeCombinationProgress(overall),
+        downloadInfo ? makeDownloadProgress(downloadInfo) : null,
     ]
         .filter(no_react_1.NoReactInternals.truthy)
         .join('\n');

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

@@ -23,11 +23,6 @@ const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 const progress_1 = require("./progress");
 exports.RENDER_COMMAND = 'render';
-function getTotalFrames(status) {
-    return status.renderMetadata && status.renderMetadata.type === 'video'
-        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
-        : null;
-}
 const { x264Option, audioBitrateOption, offthreadVideoCacheSizeInBytesOption, scaleOption, crfOption, jpegQualityOption, videoBitrateOption, mutedOption, colorSpaceOption, deleteAfterOption, enableMultiprocessOnLinuxOption, glOption, headlessOption, numberOfGifLoopsOption, encodingMaxRateOption, encodingBufferSizeOption, delayRenderTimeoutInMillisecondsOption, overwriteOption, binariesDirectoryOption, preferLosslessOption, } = client_1.BrowserSafeApis.options;
 const renderCommand = async (args, remotionRoot, logLevel) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -236,7 +231,6 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
         preferLossless,
         indent: false,
     });
-    const totalSteps = downloadName ? 6 : 5;
     const progressBar = cli_1.CliInternals.createOverwriteableCliOutput({
         quiet: cli_1.CliInternals.quietFlagProvided(),
         cancelSignal: null,
@@ -256,19 +250,13 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
         region: (0, get_aws_region_1.getAwsRegion)(),
         logLevel,
     });
-    const multiProgress = (0, progress_1.makeMultiProgressFromStatus)(status);
     progressBar.update((0, progress_1.makeProgressString)({
-        progress: multiProgress,
-        steps: totalSteps,
         downloadInfo: null,
-        retriesInfo: status.retriesInfo,
-        logLevel,
-        totalFrames: getTotalFrames(status),
-        timeToEncode: status.timeToEncode,
+        overall: status,
     }), false);
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        await (0, sleep_1.sleep)(1000);
+        await (0, sleep_1.sleep)(500);
         const newStatus = await (0, get_render_progress_1.getRenderProgress)({
             functionName,
             bucketName: res.bucketName,
@@ -276,25 +264,14 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
             region: (0, get_aws_region_1.getAwsRegion)(),
             logLevel,
         });
-        const newProgress = (0, progress_1.makeMultiProgressFromStatus)(newStatus);
         progressBar.update((0, progress_1.makeProgressString)({
-            progress: newProgress,
-            steps: totalSteps,
-            retriesInfo: newStatus.retriesInfo,
             downloadInfo: null,
-            logLevel,
-            timeToEncode: newStatus.timeToEncode,
-            totalFrames: getTotalFrames(newStatus),
+            overall: newStatus,
         }), false);
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
-                progress: newProgress,
-                steps: totalSteps,
                 downloadInfo: null,
-                retriesInfo: newStatus.retriesInfo,
-                logLevel,
-                timeToEncode: newStatus.timeToEncode,
-                totalFrames: getTotalFrames(newStatus),
+                overall: newStatus,
             }), false);
             if (downloadName) {
                 const downloadStart = Date.now();
@@ -306,32 +283,22 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
                     logLevel,
                     onProgress: ({ downloaded, totalSize }) => {
                         progressBar.update((0, progress_1.makeProgressString)({
-                            progress: newProgress,
-                            steps: totalSteps,
-                            retriesInfo: newStatus.retriesInfo,
                             downloadInfo: {
                                 doneIn: null,
                                 downloaded,
                                 totalSize,
                             },
-                            logLevel,
-                            timeToEncode: newStatus.timeToEncode,
-                            totalFrames: getTotalFrames(newStatus),
+                            overall: newStatus,
                         }), false);
                     },
                 });
                 progressBar.update((0, progress_1.makeProgressString)({
-                    progress: newProgress,
-                    steps: totalSteps,
-                    retriesInfo: newStatus.retriesInfo,
                     downloadInfo: {
                         doneIn: Date.now() - downloadStart,
                         downloaded: sizeInBytes,
                         totalSize: sizeInBytes,
                     },
-                    logLevel,
-                    timeToEncode: newStatus.timeToEncode,
-                    totalFrames: getTotalFrames(newStatus),
+                    overall: newStatus,
                 }), false);
                 log_1.Log.info({ indent: false, logLevel });
                 log_1.Log.info({ indent: false, logLevel });
@@ -349,7 +316,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
                 newStatus.timeToFinish
                     ? `${(newStatus.timeToFinish / 1000).toFixed(2)}sec`
                     : null,
-                `Estimated cost $${newStatus.costs.displayCost}`,
+                `Estimated cost ${newStatus.costs.displayCost}`,
             ]
                 .filter(Boolean)
                 .join(', '));

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

@@ -141,14 +141,14 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
         left: 'Serve URL',
         logLevel,
         right: serveUrl,
-        color: 'blue',
+        color: 'blueBright',
     });
     cli_1.CliInternals.printFact('info')({
         indent: false,
         left: 'Site name',
         logLevel,
         right: siteName,
-        color: 'blue',
+        color: 'blueBright',
     });
     log_1.Log.info({ indent: false, logLevel });
     log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.blueBright('ℹ️   Redeploy your site everytime you make changes to it. You can overwrite the existing site by running:'));

package/dist/functions/chunk-optimization/plan-frame-ranges.d.ts

@@ -3,5 +3,8 @@ export declare const planFrameRanges: ({ framesPerLambda, frameRange, everyNthFr
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [number, number][];
+    chunks: [
+        number,
+        number
+    ][];
 };

package/dist/functions/chunk-optimization/types.d.ts

@@ -6,6 +6,3 @@ export type ObjectChunkTimingData = {
         [key: number]: number;
     };
 };
-export type ChunkTimingData = Omit<ObjectChunkTimingData, 'timings'> & {
-    timings: number[];
-};

package/dist/functions/helpers/calculate-chunk-times.d.ts

@@ -1,6 +1,5 @@
-import type { _Object } from '@aws-sdk/client-s3';
-export declare const calculateChunkTimes: ({ contents, renderId, type, }: {
-    contents: _Object[];
-    renderId: string;
+import type { ParsedTiming } from '../../shared/parse-lambda-timings-key';
+export declare const calculateChunkTimes: ({ type, timings, }: {
     type: 'combined-time-for-cost-calculation' | 'absolute-time';
+    timings: ParsedTiming[];
 }) => number;