@remotion/lambda 4.0.0-imgloading.2 → 4.0.0-jshmr2.1

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

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDeployProgressBar = exports.makeBucketProgress = exports.makeBundleProgress = void 0;
 const cli_1 = require("@remotion/cli");
 const remotion_1 = require("remotion");
-const format_bytes_1 = require("./format-bytes");
 const makeBundleProgress = ({ progress, doneIn }) => {
     return [
-        '📦',
         `(1/3)`,
         cli_1.CliInternals.makeProgressBar(progress / 100),
         `${doneIn === null ? 'Bundling' : 'Bundled'} video`,
@@ -16,12 +14,11 @@ 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 [
-        '🪣 ',
         `(2/3)`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Creating' : 'Created'} bucket`,
@@ -31,18 +28,33 @@ 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 [
-        '☁️ ',
         `(3/3)`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Uploading' : 'Uploaded'} to S3`,
         doneIn === null
             ? typeof totalSize === 'number'
-                ? `${(0, format_bytes_1.formatBytes)(sizeUploaded)}/${(0, format_bytes_1.formatBytes)(totalSize)}`
+                ? `${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.d.ts

@@ -1,2 +1,2 @@
-export declare const executeCommand: (args: string[]) => Promise<void>;
+export declare const executeCommand: (args: string[], remotionRoot: string) => Promise<void>;
 export declare const cli: () => Promise<void>;

package/dist/cli/index.js

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cli = exports.executeCommand = void 0;
 const cli_1 = require("@remotion/cli");
+const renderer_1 = require("@remotion/renderer");
 const suggested_policy_1 = require("../api/iam-validation/suggested-policy");
+const defaults_1 = require("../defaults");
 const check_credentials_1 = require("../shared/check-credentials");
 const docs_url_1 = require("../shared/docs-url");
 const args_1 = require("./args");
+const compositions_1 = require("./commands/compositions");
 const functions_1 = require("./commands/functions");
 const policies_1 = require("./commands/policies/policies");
 const role_1 = require("./commands/policies/role");
@@ -33,7 +36,7 @@ const requiresCredentials = (args) => {
     }
     return true;
 };
-const matchCommand = (args) => {
+const matchCommand = (args, remotionRoot) => {
     if (args_1.parsedLambdaCli.help || args.length === 0) {
         (0, help_1.printHelp)();
         (0, quit_1.quit)(0);
@@ -42,10 +45,13 @@ const matchCommand = (args) => {
         (0, check_credentials_1.checkCredentials)();
     }
     if (args[0] === render_1.RENDER_COMMAND) {
-        return (0, render_1.renderCommand)(args.slice(1));
+        return (0, render_1.renderCommand)(args.slice(1), remotionRoot);
     }
     if (args[0] === still_1.STILL_COMMAND) {
-        return (0, still_1.stillCommand)(args.slice(1));
+        return (0, still_1.stillCommand)(args.slice(1), remotionRoot);
+    }
+    if (args[0] === compositions_1.COMPOSITIONS_COMMAND) {
+        return (0, compositions_1.compositionsCommand)(args.slice(1), remotionRoot);
     }
     if (args[0] === functions_1.FUNCTIONS_COMMAND) {
         return (0, functions_1.functionsCommand)(args.slice(1));
@@ -60,7 +66,7 @@ const matchCommand = (args) => {
         return (0, regions_1.regionsCommand)();
     }
     if (args[0] === sites_1.SITES_COMMAND) {
-        return (0, sites_1.sitesCommand)(args.slice(1));
+        return (0, sites_1.sitesCommand)(args.slice(1), remotionRoot);
     }
     if (args[0] === 'upload') {
         log_1.Log.info('The command has been renamed.');
@@ -90,15 +96,24 @@ const matchCommand = (args) => {
     (0, help_1.printHelp)();
     (0, quit_1.quit)(1);
 };
-const executeCommand = async (args) => {
-    var _a, _b;
+const executeCommand = async (args, remotionRoot) => {
+    var _a, _b, _c;
     try {
         (0, is_cli_1.setIsCli)(true);
-        await matchCommand(args);
+        await matchCommand(args, remotionRoot);
     }
     catch (err) {
         const error = err;
         if (error.message.includes('The role defined for the function cannot be assumed by Lambda')) {
+            if (args_1.parsedLambdaCli['custom-role-arn']) {
+                log_1.Log.error(`
+	The role "${args_1.parsedLambdaCli['custom-role-arn']}" does not exist or has the wrong policy assigned to it. Do either:
+	- Remove the "--custom-role-arn" parameter and set up Remotion Lambda according to the setup guide
+	- Make sure the role has the same policy assigned as the one returned by "npx ${defaults_1.BINARY_NAME} ${policies_1.POLICIES_COMMAND} ${role_1.ROLE_SUBCOMMAND}"
+	
+	Revisit ${docs_url_1.DOCS_URL}/docs/lambda/setup and make sure you set up the role and role policy correctly. Also see the troubleshooting page: ${docs_url_1.DOCS_URL}/docs/lambda/troubleshooting/permissions. The original error message is:
+	`.trim());
+            }
             log_1.Log.error(`
 The role "${suggested_policy_1.ROLE_NAME}" does not exist in your AWS account or has the wrong policy assigned to it. Common reasons:
 - The name of the role is not "${suggested_policy_1.ROLE_NAME}"
@@ -116,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);
@@ -123,7 +143,8 @@ AWS returned an "TooManyRequestsException" error message which could mean you re
 };
 exports.executeCommand = executeCommand;
 const cli = async () => {
-    await cli_1.CliInternals.initializeRenderCli('lambda');
-    await (0, exports.executeCommand)(args_1.parsedLambdaCli._);
+    const remotionRoot = renderer_1.RenderInternals.findRemotionRoot();
+    await cli_1.CliInternals.initializeCli(remotionRoot);
+    await (0, exports.executeCommand)(args_1.parsedLambdaCli._, remotionRoot);
 };
 exports.cli = cli;

package/dist/client.d.ts

@@ -1,8 +1,14 @@
+import { getCompositionsOnLambda } from './api/get-compositions-on-lambda';
 import { getFunctions } from './api/get-functions';
 import { getRenderProgress } from './api/get-render-progress';
+import { getSites } from './api/get-sites';
+import type { PresignUrlInput } from './api/presign-url';
+import { presignUrl } from './api/presign-url';
 import { renderMediaOnLambda, renderVideoOnLambda } from './api/render-media-on-lambda';
 import { renderStillOnLambda } from './api/render-still-on-lambda';
+import { validateWebhookSignature } from './api/validate-webhook-signature';
 import type { AwsRegion } from './pricing/aws-regions';
 import type { RenderProgress } from './shared/constants';
-export { renderVideoOnLambda, renderMediaOnLambda, renderStillOnLambda, getRenderProgress, getFunctions, };
-export type { AwsRegion, RenderProgress };
+import type { WebhookPayload } from './shared/invoke-webhook';
+export { renderVideoOnLambda, renderMediaOnLambda, renderStillOnLambda, getRenderProgress, getFunctions, validateWebhookSignature, getCompositionsOnLambda, presignUrl, getSites, };
+export type { AwsRegion, RenderProgress, WebhookPayload, PresignUrlInput };

package/dist/client.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFunctions = exports.getRenderProgress = exports.renderStillOnLambda = exports.renderMediaOnLambda = exports.renderVideoOnLambda = void 0;
+exports.getSites = exports.presignUrl = exports.getCompositionsOnLambda = exports.validateWebhookSignature = exports.getFunctions = exports.getRenderProgress = exports.renderStillOnLambda = exports.renderMediaOnLambda = exports.renderVideoOnLambda = void 0;
+const get_compositions_on_lambda_1 = require("./api/get-compositions-on-lambda");
+Object.defineProperty(exports, "getCompositionsOnLambda", { enumerable: true, get: function () { return get_compositions_on_lambda_1.getCompositionsOnLambda; } });
 const get_functions_1 = require("./api/get-functions");
 Object.defineProperty(exports, "getFunctions", { enumerable: true, get: function () { return get_functions_1.getFunctions; } });
 const get_render_progress_1 = require("./api/get-render-progress");
 Object.defineProperty(exports, "getRenderProgress", { enumerable: true, get: function () { return get_render_progress_1.getRenderProgress; } });
+const get_sites_1 = require("./api/get-sites");
+Object.defineProperty(exports, "getSites", { enumerable: true, get: function () { return get_sites_1.getSites; } });
+const presign_url_1 = require("./api/presign-url");
+Object.defineProperty(exports, "presignUrl", { enumerable: true, get: function () { return presign_url_1.presignUrl; } });
 const render_media_on_lambda_1 = require("./api/render-media-on-lambda");
 Object.defineProperty(exports, "renderMediaOnLambda", { enumerable: true, get: function () { return render_media_on_lambda_1.renderMediaOnLambda; } });
 Object.defineProperty(exports, "renderVideoOnLambda", { enumerable: true, get: function () { return render_media_on_lambda_1.renderVideoOnLambda; } });
 const render_still_on_lambda_1 = require("./api/render-still-on-lambda");
 Object.defineProperty(exports, "renderStillOnLambda", { enumerable: true, get: function () { return render_still_on_lambda_1.renderStillOnLambda; } });
+const validate_webhook_signature_1 = require("./api/validate-webhook-signature");
+Object.defineProperty(exports, "validateWebhookSignature", { enumerable: true, get: function () { return validate_webhook_signature_1.validateWebhookSignature; } });

package/dist/defaults.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,14 +1,7 @@
-import { OptimizationProfile } from './types';
-export declare const planFrameRanges: ({ chunkCount, framesPerLambda, optimization, shouldUseOptimization, frameRange, }: {
-    chunkCount: number;
+export declare const planFrameRanges: ({ framesPerLambda, frameRange, everyNthFrame, }: {
     framesPerLambda: number;
-    optimization: OptimizationProfile | null;
-    shouldUseOptimization: boolean;
     frameRange: [number, number];
+    everyNthFrame: number;
 }) => {
-    chunks: [
-        number,
-        number
-    ][];
-    didUseOptimization: boolean;
+    chunks: [number, number][];
 };

package/dist/functions/chunk-optimization/plan-frame-ranges.js

@@ -2,28 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.planFrameRanges = void 0;
 const renderer_1 = require("@remotion/renderer");
-const can_use_optimization_1 = require("./can-use-optimization");
-const planFrameRanges = ({ chunkCount, framesPerLambda, optimization, shouldUseOptimization, frameRange, }) => {
-    if ((0, can_use_optimization_1.canUseOptimization)({
-        optimization,
-        framesPerLambda,
-        frameRange,
-    }) &&
-        shouldUseOptimization) {
-        return {
-            chunks: optimization.ranges,
-            didUseOptimization: true,
-        };
-    }
-    const frameCount = renderer_1.RenderInternals.getDurationFromFrameRange(frameRange, 0);
+const planFrameRanges = ({ framesPerLambda, frameRange, everyNthFrame, }) => {
+    const framesToRender = renderer_1.RenderInternals.getFramesToRender(frameRange, everyNthFrame);
+    const chunkCount = Math.ceil(framesToRender.length / framesPerLambda);
+    const firstFrame = frameRange[0];
     return {
         chunks: new Array(chunkCount).fill(1).map((_, i) => {
-            return [
-                i * framesPerLambda + frameRange[0],
-                Math.min(frameCount, (i + 1) * framesPerLambda) - 1 + frameRange[0],
-            ];
+            const start = i * framesPerLambda * everyNthFrame + firstFrame;
+            const end = Math.min(framesToRender[framesToRender.length - 1], (i + 1) * framesPerLambda * everyNthFrame - 1) + firstFrame;
+            return [start, end];
         }),
-        didUseOptimization: false,
     };
 };
 exports.planFrameRanges = planFrameRanges;

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

@@ -1,4 +1,3 @@
-import { LambdaVersions } from '../../shared/constants';
 export declare type ObjectChunkTimingData = {
     chunk: number;
     frameRange: [number, number];
@@ -10,13 +9,3 @@ export declare type ObjectChunkTimingData = {
 export declare type ChunkTimingData = Omit<ObjectChunkTimingData, 'timings'> & {
     timings: number[];
 };
-export declare type TimingProfile = ChunkTimingData[];
-export declare type OptimizationProfile = {
-    ranges: [number, number][];
-    frameRange: [number, number];
-    oldTiming: number;
-    newTiming: number;
-    createdFromRenderId: string;
-    framesPerLambda: number;
-    lambdaVersion: LambdaVersions;
-};

package/dist/functions/compositions.d.ts

@@ -0,0 +1,8 @@
+import type { LambdaPayload } from '../defaults';
+declare type Options = {
+    expectedBucketOwner: string;
+};
+export declare const compositionsHandler: (lambdaParams: LambdaPayload, options: Options) => Promise<{
+    compositions: import("remotion").TCompMetadata[];
+}>;
+export {};

package/dist/functions/compositions.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compositionsHandler = void 0;
+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");
+const compositionsHandler = async (lambdaParams, options) => {
+    var _a, _b;
+    if (lambdaParams.type !== defaults_1.LambdaRoutines.compositions) {
+        throw new TypeError('Expected info compositions');
+    }
+    if (lambdaParams.version !== version_1.VERSION) {
+        if (!lambdaParams.version) {
+            throw new Error(`Version mismatch: When calling getCompositionsOnLambda(), you called the function ${process.env.AWS_LAMBDA_FUNCTION_NAME} which has the version ${version_1.VERSION} but the @remotion/lambda package is an older version. Deploy a new function and use it to call getCompositionsOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
+        }
+        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([
+        (_a = lambdaParams.bucketName) !== null && _a !== void 0 ? _a : (0, get_or_create_bucket_1.getOrCreateBucket)({
+            region,
+        }).then((b) => b.bucketName),
+        (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(lambdaParams.logLevel, 'verbose'), (_b = lambdaParams.chromiumOptions) !== null && _b !== void 0 ? _b : {}),
+    ]);
+    const inputProps = await (0, deserialize_input_props_1.deserializeInputProps)({
+        bucketName,
+        expectedBucketOwner: options.expectedBucketOwner,
+        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)(realServeUrl, {
+        puppeteerInstance: browserInstance,
+        inputProps,
+        envVariables: lambdaParams.envVariables,
+        ffmpegExecutable: null,
+        ffprobeExecutable: null,
+        timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
+        chromiumOptions: lambdaParams.chromiumOptions,
+        port: null,
+        downloadMap,
+    });
+    renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
+    return Promise.resolve({
+        compositions,
+    });
+};
+exports.compositionsHandler = compositionsHandler;

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

@@ -1,4 +1,4 @@
-import { _Object } from '@aws-sdk/client-s3';
+import type { _Object } from '@aws-sdk/client-s3';
 export declare const calculateChunkTimes: ({ contents, renderId, type, }: {
     contents: _Object[];
     renderId: string;

package/dist/functions/helpers/calculate-price-from-bucket.d.ts

@@ -1,7 +1,7 @@
-import { _Object } from '@aws-sdk/client-s3';
-import { RenderMetadata } from '../../shared/constants';
-import { LambdaArchitecture } from '../../shared/validate-architecture';
-import { OutputFileMetadata } from './find-output-file-in-bucket';
+import type { _Object } from '@aws-sdk/client-s3';
+import type { RenderMetadata } from '../../shared/constants';
+import type { LambdaArchitecture } from '../../shared/validate-architecture';
+import type { OutputFileMetadata } from './find-output-file-in-bucket';
 export declare const estimatePriceFromBucket: ({ contents, renderMetadata, memorySizeInMb, outputFileMetadata, architecture, diskSizeInMb, lambdasInvoked, }: {
     contents: _Object[];
     renderMetadata: RenderMetadata | null;

package/dist/functions/helpers/check-if-render-exists.d.ts

@@ -0,0 +1,3 @@
+import type { _Object } from '@aws-sdk/client-s3';
+import type { AwsRegion } from '../../client';
+export declare const checkIfRenderExists: (contents: _Object[], renderId: string, bucketName: string, region: AwsRegion) => void;

package/dist/functions/helpers/check-if-render-exists.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkIfRenderExists = void 0;
+const constants_1 = require("../../shared/constants");
+const checkIfRenderExists = (contents, renderId, bucketName, region) => {
+    const initializedExists = Boolean(contents.find((c) => {
+        var _a;
+        return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.initalizedMetadataKey)(renderId));
+    }));
+    if (!initializedExists) {
+        throw new TypeError(`No render with ID "${renderId}" found in bucket ${bucketName} and region ${region}`);
+    }
+};
+exports.checkIfRenderExists = checkIfRenderExists;

package/dist/functions/helpers/clean-tmpdir.js

@@ -35,7 +35,7 @@ const deleteAllFilesInAFolderRecursively = (path) => {
 const deleteTmpDir = () => {
     exports.deletedFiles = [];
     exports.deletedFilesSize = 0;
-    if (typeof jest === 'undefined') {
+    if (!process.env.VITEST) {
         deleteAllFilesInAFolderRecursively('/tmp');
     }
 };

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

@@ -1,16 +1,28 @@
-import { Codec } from 'remotion';
-import { AwsRegion } from '../../pricing/aws-regions';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, }: {
+import type { AudioCodec, 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 getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }: {
     bucket: string;
     expectedFiles: number;
-    onProgress: (frames: number, encodingStart: number) => void;
-    numberOfFrames: number;
+    outdir: string;
     renderId: string;
     region: AwsRegion;
-    codec: Codec;
     expectedBucketOwner: string;
+    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
+}) => Promise<string[]>;
+export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, files, outdir, audioCodec, }: {
+    onProgress: (frames: number) => void;
+    numberOfFrames: number;
+    codec: LambdaCodec;
+    fps: number;
+    numberOfGifLoops: number | null;
+    ffmpegExecutable: FfmpegExecutable;
+    remotionRoot: string;
+    files: string[];
+    outdir: string;
+    audioCodec: AudioCodec | null;
 }) => Promise<{
     outfile: string;
     cleanupChunksProm: Promise<void>;
-    encodingStart: number;
 }>;

package/dist/functions/helpers/concat-videos.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,11 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.concatVideosS3 = void 0;
+exports.concatVideosS3 = exports.getAllFilesS3 = void 0;
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importStar(require("fs"));
 const path_1 = __importStar(require("path"));
 const constants_1 = require("../../shared/constants");
+const inspect_errors_1 = require("./inspect-errors");
 const io_1 = require("./io");
 const timer_1 = require("./timer");
 const getChunkDownloadOutputLocation = ({ outdir, file, }) => {
@@ -46,11 +51,11 @@ const downloadS3File = async ({ bucket, key, outdir, region, expectedBucketOwner
             .on('close', () => resolve());
     });
 };
-const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, }) => {
+const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expectedBucketOwner, onErrors, }) => {
     const alreadyDownloading = {};
     const downloaded = {};
     const getFiles = async () => {
-        const prefix = (0, constants_1.chunkKey)(renderId);
+        const prefix = (0, constants_1.rendersPrefix)(renderId);
         const lsTimer = (0, timer_1.timer)('Listing files');
         const contents = await (0, io_1.lambdaLs)({
             bucketName: bucket,
@@ -59,13 +64,16 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
             expectedBucketOwner,
         });
         lsTimer.end();
-        return contents
-            .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); })
-            .map((_) => _.Key);
+        return {
+            filesInBucket: contents
+                .filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.chunkKey)(renderId)); })
+                .map((_) => _.Key),
+            errorContents: contents.filter((c) => { var _a; return (_a = c.Key) === null || _a === void 0 ? void 0 : _a.startsWith((0, constants_1.getErrorKeyPrefix)(renderId)); }),
+        };
     };
     return new Promise((resolve, reject) => {
         const loop = async () => {
-            const filesInBucket = await getFiles();
+            const { filesInBucket, errorContents } = await getFiles();
             const checkFinish = () => {
                 const areAllFilesDownloaded = Object.keys(downloaded).length === expectedFiles;
                 console.log('Checking for finish... ', Object.keys(downloaded), expectedFiles + ' files expected');
@@ -75,6 +83,17 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                 }
             };
             console.log('Found ', filesInBucket);
+            const errors = (await (0, inspect_errors_1.inspectErrors)({
+                bucket,
+                contents: errorContents,
+                expectedBucketOwner,
+                region,
+                renderId,
+            })).filter((e) => e.isFatal);
+            if (errors.length > 0) {
+                await onErrors(errors);
+                // Will die here
+            }
             filesInBucket.forEach(async (key) => {
                 if (alreadyDownloading[key]) {
                     return;
@@ -101,47 +120,36 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
             const areAllFilesDownloading = Object.keys(alreadyDownloading).length === expectedFiles;
             if (!areAllFilesDownloading) {
                 setTimeout(() => {
-                    loop();
+                    loop().catch((err) => reject(err));
                 }, 100);
             }
         };
-        loop();
+        loop().catch((err) => reject(err));
     });
 };
-const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, }) => {
+exports.getAllFilesS3 = getAllFilesS3;
+const concatVideosS3 = async ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, ffmpegExecutable, remotionRoot, files, outdir, audioCodec, }) => {
     var _a;
-    const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
-    if ((0, fs_1.existsSync)(outdir)) {
-        (fs_1.rmSync !== null && fs_1.rmSync !== void 0 ? fs_1.rmSync : fs_1.rmdirSync)(outdir, {
-            recursive: true,
-        });
-    }
-    (0, fs_1.mkdirSync)(outdir);
-    const files = await getAllFilesS3({
-        bucket,
-        expectedFiles,
-        outdir,
-        renderId,
-        region,
-        expectedBucketOwner,
-    });
-    const outfile = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'));
+    const outfile = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + renderer_1.RenderInternals.getFileExtensionFromCodec(codec, audioCodec));
     const combine = (0, timer_1.timer)('Combine videos');
     const filelistDir = renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_FILELIST_TOKEN);
-    const encodingStart = Date.now();
-    const codecForCombining = codec === 'h264-mkv' ? 'h264' : codec;
-    await (0, renderer_1.combineVideos)({
+    await renderer_1.RenderInternals.combineVideos({
         files,
         filelistDir,
         output: outfile,
-        onProgress: (p) => onProgress(p, encodingStart),
+        onProgress: (p) => onProgress(p),
         numberOfFrames,
-        codec: codecForCombining,
+        codec,
+        fps,
+        numberOfGifLoops,
+        ffmpegExecutable,
+        remotionRoot,
+        audioCodec,
     });
     combine.end();
     const cleanupChunksProm = ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outdir, {
         recursive: true,
     });
-    return { outfile, cleanupChunksProm, encodingStart };
+    return { outfile, cleanupChunksProm };
 };
 exports.concatVideosS3 = concatVideosS3;