@remotion/lambda 3.2.32 → 3.2.33

package/dist/cli/args.d.ts

@@ -1,4 +1,4 @@
-import minimist from 'minimist';
+/// <reference types="minimist" />
 import type { AwsRegion } from '../pricing/aws-regions';
 import type { Privacy } from '../shared/constants';
 import type { LambdaArchitecture } from '../shared/validate-architecture';
@@ -27,6 +27,6 @@ declare type LambdaCommandLineOptions = {
     webhook: string | undefined;
     ['webhook-secret']: string | undefined;
 };
-export declare const parsedLambdaCli: LambdaCommandLineOptions & minimist.ParsedArgs;
+export declare const parsedLambdaCli: LambdaCommandLineOptions & import("minimist").ParsedArgs;
 export declare const forceFlagProvided: boolean;
 export {};

package/dist/cli/args.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forceFlagProvided = exports.parsedLambdaCli = void 0;
 const cli_1 = require("@remotion/cli");
-const minimist_1 = __importDefault(require("minimist"));
-exports.parsedLambdaCli = (0, minimist_1.default)(process.argv.slice(2), {
+exports.parsedLambdaCli = cli_1.CliInternals.minimist(process.argv.slice(2), {
     boolean: cli_1.CliInternals.BooleanFlags,
 });
 exports.forceFlagProvided = exports.parsedLambdaCli.f ||

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

@@ -6,6 +6,9 @@ export declare const planFrameRanges: ({ framesPerLambda, optimization, shouldUs
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [number, number][];
+    chunks: [
+        number,
+        number
+    ][];
     didUseOptimization: boolean;
 };

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,9 +1,11 @@
 import type { AwsRegion } from '../../pricing/aws-regions';
 import type { LambdaCodec } from '../../shared/validate-lambda-codec';
-export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, }: {
+import type { EnhancedErrorInfo } from './write-lambda-error';
+export declare const concatVideosS3: ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, onErrors, }: {
     bucket: string;
     expectedFiles: number;
     onProgress: (frames: number, encodingStart: number) => void;
+    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
     numberOfFrames: number;
     renderId: string;
     region: AwsRegion;

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

@@ -28,6 +28,7 @@ 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, }) => {
@@ -50,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,
@@ -63,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');
@@ -79,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;
@@ -105,14 +120,14 @@ 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, fps, numberOfGifLoops, }) => {
+const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrames, renderId, region, codec, expectedBucketOwner, fps, numberOfGifLoops, onErrors, }) => {
     var _a;
     const outdir = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');
     if ((0, fs_1.existsSync)(outdir)) {
@@ -128,6 +143,7 @@ const concatVideosS3 = async ({ bucket, expectedFiles, onProgress, numberOfFrame
         renderId,
         region,
         expectedBucketOwner,
+        onErrors,
     });
     const outfile = (0, path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.REMOTION_CONCATED_TOKEN), 'concat.' + renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'));
     const combine = (0, timer_1.timer)('Combine videos');

package/dist/functions/helpers/get-custom-out-name.js

@@ -10,7 +10,7 @@ const getCustomOutName = ({ renderMetadata, customCredentials, }) => {
         return renderMetadata.outName;
     }
     if (renderMetadata.outName.s3OutputProvider) {
-        if (!customCredentials && renderMetadata.privacy !== 'public') {
+        if (!customCredentials && renderMetadata.privacy === 'private') {
             throw new TypeError(`The file was rendered with a custom S3 implementation and is not public, but no custom credentials were passed to downloadMedia().`);
         }
         return {

package/dist/functions/launch.js

@@ -319,6 +319,32 @@ const innerLaunchHandler = async (params, options) => {
             });
         });
     };
+    const onErrors = async (errors) => {
+        var _a;
+        console.log('Found Errors', errors);
+        if (params.webhook) {
+            console.log('Sending webhook with errors');
+            await (0, invoke_webhook_1.invokeWebhook)({
+                url: params.webhook.url,
+                secret: (_a = params.webhook.secret) !== null && _a !== void 0 ? _a : null,
+                payload: {
+                    type: 'error',
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                    bucketName: params.bucketName,
+                    errors: errors.slice(0, 5).map((e) => ({
+                        message: e.message,
+                        name: e.name,
+                        stack: e.stack,
+                    })),
+                },
+            });
+        }
+        else {
+            console.log('No webhook specified');
+        }
+        throw new Error('Stopping Lambda function because error occurred: ' + errors[0].stack);
+    };
     const fps = comp.fps / params.everyNthFrame;
     const { outfile, cleanupChunksProm, encodingStart } = await (0, concat_videos_1.concatVideosS3)({
         bucket: params.bucketName,
@@ -331,6 +357,7 @@ const innerLaunchHandler = async (params, options) => {
         expectedBucketOwner: options.expectedBucketOwner,
         fps,
         numberOfGifLoops: params.numberOfGifLoops,
+        onErrors,
     });
     if (!encodingStop) {
         encodingStop = Date.now();

package/dist/functions/renderer.js

@@ -197,6 +197,7 @@ const rendererHandler = async (params, options) => {
     }
     catch (err) {
         if (process.env.NODE_ENV === 'test') {
+            console.log({ err });
             throw err;
         }
         // If this error is encountered, we can just retry as it

package/dist/index.d.ts

@@ -34,7 +34,7 @@ import type { RenderStillOnLambdaInput, RenderStillOnLambdaOutput } from './api/
 import { renderStillOnLambda } from './api/render-still-on-lambda';
 import { validateWebhookSignature } from './api/validate-webhook-signature';
 import type { LambdaLSInput, LambdaLsReturnType } from './functions/helpers/io';
-import type { LambdaErrorInfo } from './functions/helpers/write-lambda-error';
+import type { EnhancedErrorInfo, LambdaErrorInfo } from './functions/helpers/write-lambda-error';
 import { LambdaInternals } from './internals';
 import type { AwsRegion } from './pricing/aws-regions';
 import type { CustomCredentials } from './shared/aws-clients';
@@ -42,4 +42,4 @@ import type { RenderProgress } from './shared/constants';
 import type { WebhookPayload } from './shared/invoke-webhook';
 import type { LambdaArchitecture } from './shared/validate-architecture';
 export { deleteSite, deployFunction, deploySite, downloadMedia, downloadVideo, getFunctions, getUserPolicy, getRolePolicy, getSites, getOrCreateBucket, getRenderProgress, renderVideoOnLambda, renderMediaOnLambda, simulatePermissions, deleteFunction, getFunctionInfo, estimatePrice, LambdaInternals, renderStillOnLambda, getRegions, getAwsClient, presignUrl, deleteRender, validateWebhookSignature, };
-export type { AwsRegion, RenderProgress, DeploySiteInput, DeploySiteOutput, LambdaLsReturnType, LambdaLSInput, DeleteSiteInput, DeleteSiteOutput, EstimatePriceInput, DeployFunctionInput, DeployFunctionOutput, DeleteFunctionInput, GetFunctionInfoInput, FunctionInfo, GetFunctionsInput, GetSitesInput, GetSitesOutput, DownloadMediaInput, DownloadMediaOutput, GetOrCreateBucketInput, GetOrCreateBucketOutput, GetRenderInput, RenderMediaOnLambdaInput, RenderMediaOnLambdaOutput, RenderStillOnLambdaInput, RenderStillOnLambdaOutput, SimulatePermissionsInput, SimulatePermissionsOutput, GetAwsClientInput, GetAwsClientOutput, LambdaArchitecture, CustomCredentials, WebhookPayload, LambdaErrorInfo, };
+export type { AwsRegion, RenderProgress, DeploySiteInput, DeploySiteOutput, LambdaLsReturnType, LambdaLSInput, DeleteSiteInput, DeleteSiteOutput, EstimatePriceInput, DeployFunctionInput, DeployFunctionOutput, DeleteFunctionInput, GetFunctionInfoInput, FunctionInfo, GetFunctionsInput, GetSitesInput, GetSitesOutput, DownloadMediaInput, DownloadMediaOutput, GetOrCreateBucketInput, GetOrCreateBucketOutput, GetRenderInput, RenderMediaOnLambdaInput, RenderMediaOnLambdaOutput, RenderStillOnLambdaInput, RenderStillOnLambdaOutput, SimulatePermissionsInput, SimulatePermissionsOutput, GetAwsClientInput, GetAwsClientOutput, LambdaArchitecture, CustomCredentials, WebhookPayload, LambdaErrorInfo, EnhancedErrorInfo, };

package/package.json

@@ -1,17 +1,16 @@
 {
 	"name": "@remotion/lambda",
-	"version": "3.2.32",
+	"version": "3.2.33",
 	"description": "Distributed renderer for Remotion based on AWS Lambda",
 	"main": "dist/index.js",
 	"sideEffects": false,
 	"bin": {
 		"remotion-lambda": "remotion-lambda-cli.js"
 	},
-	"module": "true",
 	"scripts": {
-		"testintegration": "jest src/test/integration --runInBand --forceExit",
+		"testintegration": "vitest src/test/integration --run",
 		"lint": "eslint src --ext ts,tsx",
-		"test": "jest src/test/unit",
+		"test": "vitest src/test/unit --run",
 		"watch": "tsc -w",
 		"build": "tsc -d && pnpm run buildlambda",
 		"buildlambda": "ts-node src/admin/bundle-lambda.ts",
@@ -32,12 +31,12 @@
 		"@aws-sdk/client-service-quotas": "3.58.0",
 		"@aws-sdk/lib-storage": "3.58.0",
 		"@aws-sdk/s3-request-presigner": "3.58.0",
-		"@remotion/bundler": "3.2.32",
-		"@remotion/cli": "3.2.32",
-		"@remotion/renderer": "3.2.32",
+		"@remotion/bundler": "3.2.33",
+		"@remotion/cli": "3.2.33",
+		"@remotion/renderer": "3.2.33",
 		"aws-policies": "^1.0.1",
 		"mime-types": "2.1.34",
-		"remotion": "3.2.32"
+		"remotion": "3.2.33"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -45,22 +44,20 @@
 	},
 	"devDependencies": {
 		"@jonny/eslint-config": "3.0.266",
-		"@types/jest": "^27.0.2",
 		"@types/mime-types": "2.1.1",
 		"@types/minimist": "1.2.2",
 		"@types/node": "^14.14.14",
 		"@types/prompt": "^1.1.0",
 		"eslint": "8.13.0",
-		"jest": "^27.2.4",
 		"prettier": "^2.4.1",
 		"prettier-plugin-organize-imports": "^2.3.4",
-		"ts-jest": "^27.0.5",
 		"ts-node": "^10.8.0",
 		"typescript": "^4.7.0",
+		"vitest": "^0.24.3",
 		"zip-lib": "^0.7.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "4f7ab3637405d140041f898f95f78c99943d1b40"
+	"gitHead": "3c864e5ab73870674d028a1199005ddbabaede12"
 }