@remotion/lambda 4.0.17 → 4.0.19

package/dist/cli/log.d.ts

@@ -2,24 +2,24 @@ export declare const Log: {
     verbose: (message?: any, ...optionalParams: any[]) => void;
     verboseAdvanced: (options: {
         indent: boolean;
-        logLevel: "info" | "error" | "verbose" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     } & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;
     infoAdvanced: (options: {
         indent: boolean;
-        logLevel: "info" | "error" | "verbose" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     }, message?: any, ...optionalParams: any[]) => void;
     warn: (message?: any, ...optionalParams: any[]) => void;
     warnAdvanced: (options: {
         indent: boolean;
-        logLevel: "info" | "error" | "verbose" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     }, message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
     errorAdvanced: (options: {
         indent: boolean;
-        logLevel: "info" | "error" | "verbose" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     } & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;

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

@@ -9,7 +9,7 @@ export declare const getAllFilesS3: ({ bucket, expectedFiles, outdir, renderId,
     renderId: string;
     region: AwsRegion;
     expectedBucketOwner: string;
-    onErrors: (errors: EnhancedErrorInfo[]) => Promise<void>;
+    onErrors: (errors: EnhancedErrorInfo[]) => void;
 }) => Promise<string[]>;
 export declare const concatVideosS3: ({ onProgress, numberOfFrames, codec, fps, numberOfGifLoops, files, outdir, audioCodec, }: {
     onProgress: (frames: number) => void;

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

@@ -96,7 +96,7 @@ const getAllFilesS3 = ({ bucket, expectedFiles, outdir, renderId, region, expect
                 renderId,
             })).filter((e) => e.isFatal);
             if (errors.length > 0) {
-                await onErrors(errors);
+                onErrors(errors);
                 // Will die here
             }
             filesInBucket.forEach(async (key) => {

package/dist/functions/launch.js

@@ -36,7 +36,6 @@ const compress_props_1 = require("../shared/compress-props");
 const constants_1 = require("../shared/constants");
 const docs_url_1 = require("../shared/docs-url");
 const invoke_webhook_1 = require("../shared/invoke-webhook");
-const make_s3_url_1 = require("../shared/make-s3-url");
 const validate_frames_per_lambda_1 = require("../shared/validate-frames-per-lambda");
 const validate_outname_1 = require("../shared/validate-outname");
 const validate_privacy_1 = require("../shared/validate-privacy");
@@ -89,51 +88,7 @@ const innerLaunchHandler = async (params, options) => {
     }
     const functionName = (_a = params.rendererFunctionName) !== null && _a !== void 0 ? _a : process.env.AWS_LAMBDA_FUNCTION_NAME;
     const startedDate = Date.now();
-    let webhookInvoked = false;
-    console.log(`Function has ${Math.max(options.getRemainingTimeInMillis() - 1000, 1000)} before it times out`);
     const verbose = renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose');
-    const webhookDueToTimeout = setTimeout(async () => {
-        if (params.webhook && !webhookInvoked) {
-            try {
-                await (0, invoke_webhook_1.invokeWebhook)({
-                    url: params.webhook.url,
-                    secret: params.webhook.secret,
-                    payload: {
-                        type: 'timeout',
-                        renderId: params.renderId,
-                        expectedBucketOwner: options.expectedBucketOwner,
-                        bucketName: params.bucketName,
-                    },
-                });
-                webhookInvoked = true;
-            }
-            catch (err) {
-                if (process.env.NODE_ENV === 'test') {
-                    throw err;
-                }
-                await (0, write_lambda_error_1.writeLambdaError)({
-                    bucketName: params.bucketName,
-                    errorInfo: {
-                        type: 'webhook',
-                        message: err.message,
-                        name: err.name,
-                        stack: err.stack,
-                        tmpDir: null,
-                        frame: 0,
-                        chunk: 0,
-                        isFatal: false,
-                        attempt: 1,
-                        willRetry: false,
-                        totalAttempts: 1,
-                    },
-                    renderId: params.renderId,
-                    expectedBucketOwner: options.expectedBucketOwner,
-                });
-                console.log('Failed to invoke webhook:');
-                console.log(err);
-            }
-        }
-    }, Math.max(options.getRemainingTimeInMillis() - 1000, 1000));
     const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, params.chromiumOptions);
     const inputPropsPromise = (0, compress_props_1.decompressInputProps)({
         bucketName: params.bucketName,
@@ -245,7 +200,7 @@ const innerLaunchHandler = async (params, options) => {
         };
         return payload;
     });
-    console.log('Render plan: ', chunks.map((c, i) => `Chunk ${i} (Frames ${c[0]} - ${c[1]})`).join(', '));
+    renderer_1.RenderInternals.Log.info('Render plan: ', chunks.map((c, i) => `Chunk ${i} (Frames ${c[0]} - ${c[1]})`).join(', '));
     const renderMetadata = {
         startedDate,
         videoConfig: comp,
@@ -258,7 +213,7 @@ const innerLaunchHandler = async (params, options) => {
         ].reduce((a, b) => a + b, 0),
         estimatedRenderLambdaInvokations: chunks.length,
         compositionId: comp.id,
-        siteId: (0, make_s3_url_1.getServeUrlHash)(params.serveUrl),
+        siteId: params.serveUrl,
         codec: params.codec,
         type: 'video',
         imageFormat: params.imageFormat,
@@ -349,30 +304,8 @@ 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');
-        }
+    const onErrors = (errors) => {
+        renderer_1.RenderInternals.Log.error('Found Errors', errors);
         const firstError = errors[0];
         if (firstError.chunk !== null) {
             throw new Error(`Stopping Lambda function because error occurred while rendering chunk ${firstError.chunk}:\n${errors[0].stack
@@ -503,60 +436,104 @@ const innerLaunchHandler = async (params, options) => {
         customCredentials: null,
     });
     await Promise.all([cleanupChunksProm, node_fs_1.default.promises.rm(outfile)]);
-    clearTimeout(webhookDueToTimeout);
-    if (params.webhook && !webhookInvoked) {
-        try {
-            await (0, invoke_webhook_1.invokeWebhook)({
-                url: params.webhook.url,
-                secret: params.webhook.secret,
-                payload: {
-                    type: 'success',
-                    renderId: params.renderId,
-                    expectedBucketOwner: options.expectedBucketOwner,
-                    bucketName: params.bucketName,
-                    outputUrl,
-                    lambdaErrors: postRenderData.errors,
-                    outputFile: postRenderData.outputFile,
-                    timeToFinish: postRenderData.timeToFinish,
-                    costs: postRenderData.cost,
-                },
-            });
-            webhookInvoked = true;
-        }
-        catch (err) {
-            if (process.env.NODE_ENV === 'test') {
-                throw err;
-            }
-            await (0, write_lambda_error_1.writeLambdaError)({
-                bucketName: params.bucketName,
-                errorInfo: {
-                    type: 'webhook',
-                    message: err.message,
-                    name: err.name,
-                    stack: err.stack,
-                    tmpDir: null,
-                    frame: 0,
-                    chunk: 0,
-                    isFatal: false,
-                    attempt: 1,
-                    willRetry: false,
-                    totalAttempts: 1,
-                },
-                renderId: params.renderId,
-                expectedBucketOwner: options.expectedBucketOwner,
-            });
-            console.log('Failed to invoke webhook:');
-            console.log(err);
-        }
-    }
+    return postRenderData;
 };
 const launchHandler = async (params, options) => {
-    var _a, _b;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
     }
+    let webhookInvoked = false;
+    const webhookDueToTimeout = setTimeout(async () => {
+        if (params.webhook && !webhookInvoked) {
+            try {
+                await (0, invoke_webhook_1.invokeWebhook)({
+                    url: params.webhook.url,
+                    secret: params.webhook.secret,
+                    payload: {
+                        type: 'timeout',
+                        renderId: params.renderId,
+                        expectedBucketOwner: options.expectedBucketOwner,
+                        bucketName: params.bucketName,
+                    },
+                });
+                webhookInvoked = true;
+            }
+            catch (err) {
+                if (process.env.NODE_ENV === 'test') {
+                    throw err;
+                }
+                await (0, write_lambda_error_1.writeLambdaError)({
+                    bucketName: params.bucketName,
+                    errorInfo: {
+                        type: 'webhook',
+                        message: err.message,
+                        name: err.name,
+                        stack: err.stack,
+                        tmpDir: null,
+                        frame: 0,
+                        chunk: 0,
+                        isFatal: false,
+                        attempt: 1,
+                        willRetry: false,
+                        totalAttempts: 1,
+                    },
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                });
+                renderer_1.RenderInternals.Log.error('Failed to invoke webhook:');
+                renderer_1.RenderInternals.Log.error(err);
+            }
+        }
+    }, Math.max(options.getRemainingTimeInMillis() - 1000, 1000));
+    renderer_1.RenderInternals.Log.info(`Function has ${Math.max(options.getRemainingTimeInMillis() - 1000, 1000)} before it times out`);
     try {
-        await innerLaunchHandler(params, options);
+        const postRenderData = await innerLaunchHandler(params, options);
+        clearTimeout(webhookDueToTimeout);
+        if (params.webhook && !webhookInvoked) {
+            try {
+                await (0, invoke_webhook_1.invokeWebhook)({
+                    url: params.webhook.url,
+                    secret: params.webhook.secret,
+                    payload: {
+                        type: 'success',
+                        renderId: params.renderId,
+                        expectedBucketOwner: options.expectedBucketOwner,
+                        bucketName: params.bucketName,
+                        outputUrl: postRenderData.outputFile,
+                        lambdaErrors: postRenderData.errors,
+                        outputFile: postRenderData.outputFile,
+                        timeToFinish: postRenderData.timeToFinish,
+                        costs: postRenderData.cost,
+                    },
+                });
+                webhookInvoked = true;
+            }
+            catch (err) {
+                if (process.env.NODE_ENV === 'test') {
+                    throw err;
+                }
+                await (0, write_lambda_error_1.writeLambdaError)({
+                    bucketName: params.bucketName,
+                    errorInfo: {
+                        type: 'webhook',
+                        message: err.message,
+                        name: err.name,
+                        stack: err.stack,
+                        tmpDir: null,
+                        frame: 0,
+                        chunk: 0,
+                        isFatal: false,
+                        attempt: 1,
+                        willRetry: false,
+                        totalAttempts: 1,
+                    },
+                    renderId: params.renderId,
+                    expectedBucketOwner: options.expectedBucketOwner,
+                });
+                renderer_1.RenderInternals.Log.error('Failed to invoke webhook:');
+                renderer_1.RenderInternals.Log.error(err);
+            }
+        }
         return {
             type: 'success',
         };
@@ -565,7 +542,7 @@ const launchHandler = async (params, options) => {
         if (process.env.NODE_ENV === 'test') {
             throw err;
         }
-        console.log('Error occurred', err);
+        renderer_1.RenderInternals.Log.error('Error occurred', err);
         await (0, write_lambda_error_1.writeLambdaError)({
             bucketName: params.bucketName,
             errorInfo: {
@@ -584,11 +561,12 @@ const launchHandler = async (params, options) => {
             expectedBucketOwner: options.expectedBucketOwner,
             renderId: params.renderId,
         });
-        if ((_a = params.webhook) === null || _a === void 0 ? void 0 : _a.url) {
+        clearTimeout(webhookDueToTimeout);
+        if (params.webhook && !webhookInvoked) {
             try {
                 await (0, invoke_webhook_1.invokeWebhook)({
                     url: params.webhook.url,
-                    secret: (_b = params.webhook.secret) !== null && _b !== void 0 ? _b : null,
+                    secret: params.webhook.secret,
                     payload: {
                         type: 'error',
                         renderId: params.renderId,
@@ -601,6 +579,7 @@ const launchHandler = async (params, options) => {
                         })),
                     },
                 });
+                webhookInvoked = true;
             }
             catch (error) {
                 if (process.env.NODE_ENV === 'test') {
@@ -624,8 +603,8 @@ const launchHandler = async (params, options) => {
                     renderId: params.renderId,
                     expectedBucketOwner: options.expectedBucketOwner,
                 });
-                console.log('Failed to invoke webhook:');
-                console.log(error);
+                renderer_1.RenderInternals.Log.error('Failed to invoke webhook:');
+                renderer_1.RenderInternals.Log.error(error);
             }
         }
         throw err;

package/dist/functions/still.js

@@ -17,7 +17,6 @@ const compress_props_1 = require("../shared/compress-props");
 const constants_1 = require("../shared/constants");
 const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const is_flaky_error_1 = require("../shared/is-flaky-error");
-const make_s3_url_1 = require("../shared/make-s3-url");
 const validate_download_behavior_1 = require("../shared/validate-download-behavior");
 const validate_outname_1 = require("../shared/validate-outname");
 const validate_privacy_1 = require("../shared/validate-privacy");
@@ -96,7 +95,7 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         compositionId: lambdaParams.composition,
         estimatedTotalLambdaInvokations: 1,
         estimatedRenderLambdaInvokations: 1,
-        siteId: (0, make_s3_url_1.getServeUrlHash)(serveUrl),
+        siteId: serveUrl,
         totalChunks: 1,
         type: 'still',
         imageFormat: lambdaParams.imageFormat,

package/dist/shared/make-s3-url.d.ts

@@ -4,4 +4,3 @@ export declare const makeS3ServeUrl: ({ bucketName, subFolder, region, }: {
     subFolder: string;
     region: AwsRegion;
 }) => string;
-export declare const getServeUrlHash: (url: string) => string;

package/dist/shared/make-s3-url.js

@@ -1,21 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServeUrlHash = exports.makeS3ServeUrl = void 0;
-const node_crypto_1 = __importDefault(require("node:crypto"));
+exports.makeS3ServeUrl = void 0;
 const makeS3ServeUrl = ({ bucketName, subFolder, region, }) => {
     return `https://${bucketName}.s3.${region}.amazonaws.com/${subFolder}/index.html`;
 };
 exports.makeS3ServeUrl = makeS3ServeUrl;
-const hashCache = {};
-const getServeUrlHash = (url) => {
-    if (hashCache[url]) {
-        return hashCache[url];
-    }
-    const hash = node_crypto_1.default.createHash('md5').update(url).digest('hex');
-    hashCache[url] = hash;
-    return hash;
-};
-exports.getServeUrlHash = getServeUrlHash;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.17",
+  "version": "4.0.19",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -13,7 +13,7 @@
     "url": "https://github.com/JonnyBurger/remotion"
   },
   "dependencies": {
-    "@aws-sdk/abort-controller": "3.374.0",
+    "@smithy/abort-controller": "2.0.1",
     "@aws-sdk/client-cloudwatch-logs": "3.382.0",
     "@aws-sdk/client-iam": "3.382.0",
     "@aws-sdk/client-lambda": "3.382.0",
@@ -26,10 +26,10 @@
     "aws-policies": "^1.0.1",
     "mime-types": "2.1.34",
     "zod": "3.21.4",
-    "@remotion/bundler": "4.0.17",
-    "remotion": "4.0.17",
-    "@remotion/renderer": "4.0.17",
-    "@remotion/cli": "4.0.17"
+    "@remotion/bundler": "4.0.19",
+    "@remotion/cli": "4.0.19",
+    "@remotion/renderer": "4.0.19",
+    "remotion": "4.0.19"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
@@ -41,14 +41,13 @@
     "prettier": "^2.4.1",
     "prettier-plugin-organize-imports": "^3.2.2",
     "ts-node": "^10.8.0",
-    "typescript": "4.9.5",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.17",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.17"
+    "@remotion/bundler": "4.0.19",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.19"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.17"
+    "@remotion/bundler": "4.0.19"
   },
   "publishConfig": {
     "access": "public"

package/dist/shared/is-retryable-error.d.ts

@@ -1 +0,0 @@
-export declare const isFlakyError: (err: Error) => boolean;

package/dist/shared/is-retryable-error.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFlakyError = void 0;
-const isFlakyError = (err) => {
-    const { message } = err;
-    return (message.includes('FATAL:zygote_communication_linux.cc') ||
-        message.includes('error while loading shared libraries: libnss3.so') ||
-        message.includes('but the server sent no data') ||
-        message.includes('Compositor panicked') ||
-        (message.includes('Compositor exited') && !message.includes('SIGSEGV')) ||
-        message.includes('Timed out while setting up the headless browser'));
-};
-exports.isFlakyError = isFlakyError;