@remotion/lambda 4.0.115 → 4.0.116

package/dist/functions/index.js

@@ -38,8 +38,7 @@ const innerHandler = async (params, responseStream, context) => {
             renderId,
             inputProps: JSON.stringify(params.inputProps),
             isWarm,
-        });
-        renderer_1.RenderInternals.setLogLevel(params.logLevel);
+        }, params.logLevel);
         const renderIdDetermined = {
             type: 'render-id-determined',
             renderId,
@@ -59,8 +58,7 @@ const innerHandler = async (params, responseStream, context) => {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.start, {
             inputProps: JSON.stringify(params.inputProps),
             isWarm,
-        });
-        renderer_1.RenderInternals.setLogLevel(params.logLevel);
+        }, params.logLevel);
         const response = await (0, start_1.startHandler)(params, {
             expectedBucketOwner: currentUserId,
         });
@@ -74,8 +72,7 @@ const innerHandler = async (params, responseStream, context) => {
             renderId: params.renderId,
             inputProps: JSON.stringify(params.inputProps),
             isWarm,
-        });
-        renderer_1.RenderInternals.setLogLevel(params.logLevel);
+        }, params.logLevel);
         const response = await (0, launch_1.launchHandler)(params, {
             expectedBucketOwner: currentUserId,
             getRemainingTimeInMillis: context.getRemainingTimeInMillis,
@@ -89,7 +86,7 @@ const innerHandler = async (params, responseStream, context) => {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.status, {
             renderId: params.renderId,
             isWarm,
-        });
+        }, params.logLevel);
         const response = await (0, progress_1.progressHandler)(params, {
             expectedBucketOwner: currentUserId,
             timeoutInMilliseconds,
@@ -107,8 +104,7 @@ const innerHandler = async (params, responseStream, context) => {
             dumpLogs: String(renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')),
             resolvedProps: JSON.stringify(params.resolvedProps),
             isWarm,
-        });
-        renderer_1.RenderInternals.setLogLevel(params.logLevel);
+        }, params.logLevel);
         const response = await (0, renderer_2.rendererHandler)(params, {
             expectedBucketOwner: currentUserId,
             isWarm,
@@ -121,7 +117,7 @@ const innerHandler = async (params, responseStream, context) => {
     if (params.type === constants_1.LambdaRoutines.info) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.info, {
             isWarm,
-        });
+        }, params.logLevel);
         const response = await (0, info_1.infoHandler)(params);
         responseStream.write(JSON.stringify(response), () => {
             responseStream.end();
@@ -132,8 +128,7 @@ const innerHandler = async (params, responseStream, context) => {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.merge, {
             renderId: params.renderId,
             isWarm,
-        });
-        renderer_1.RenderInternals.setLogLevel(params.logLevel);
+        }, params.logLevel);
         const response = await (0, merge_1.mergeHandler)(params, {
             expectedBucketOwner: currentUserId,
         });
@@ -144,7 +139,7 @@ const innerHandler = async (params, responseStream, context) => {
     if (params.type === constants_1.LambdaRoutines.compositions) {
         (0, print_cloudwatch_helper_1.printCloudwatchHelper)(constants_1.LambdaRoutines.compositions, {
             isWarm,
-        });
+        }, params.logLevel);
         const response = await (0, compositions_1.compositionsHandler)(params, {
             expectedBucketOwner: currentUserId,
         });

package/dist/functions/launch.js

@@ -70,9 +70,9 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
         logLevel: params.logLevel,
     };
     const serializedInputPropsWithCustomSchema = await inputPropsPromise;
-    renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'Waiting for browser to be ready:', serializedInputPropsWithCustomSchema);
+    renderer_1.RenderInternals.Log.info(logOptions, 'Waiting for browser to be ready:', serializedInputPropsWithCustomSchema);
     const { instance } = await browserInstance;
-    renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'Validating composition, input props:', serializedInputPropsWithCustomSchema);
+    renderer_1.RenderInternals.Log.info(logOptions, 'Validating composition, input props:', serializedInputPropsWithCustomSchema);
     const comp = await (0, validate_composition_1.validateComposition)({
         serveUrl: params.serveUrl,
         composition: params.composition,
@@ -88,7 +88,7 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
         server: undefined,
         offthreadVideoCacheSizeInBytes: params.offthreadVideoCacheSizeInBytes,
     });
-    renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'Composition validated, resolved props', comp.props);
+    renderer_1.RenderInternals.Log.info(logOptions, 'Composition validated, resolved props', comp.props);
     (0, validate_1.validateDurationInFrames)(comp.durationInFrames, {
         component: 'passed to a Lambda render',
         allowFloats: false,
@@ -184,7 +184,7 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
         };
         return payload;
     });
-    renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'Render plan: ', chunks.map((c, i) => `Chunk ${i} (Frames ${c[0]} - ${c[1]})`).join(', '));
+    renderer_1.RenderInternals.Log.info(logOptions, 'Render plan: ', chunks.map((c, i) => `Chunk ${i} (Frames ${c[0]} - ${c[1]})`).join(', '));
     const renderMetadata = {
         startedDate,
         videoConfig: comp,
@@ -293,8 +293,8 @@ const launchHandler = async (params, options) => {
     const onTimeout = async () => {
         var _a;
         if (allChunksAvailable) {
-            renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'All chunks are available, but the function is about to time out.');
-            renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'Spawning another function to merge chunks.');
+            renderer_1.RenderInternals.Log.info(logOptions, 'All chunks are available, but the function is about to time out.');
+            renderer_1.RenderInternals.Log.info(logOptions, 'Spawning another function to merge chunks.');
             try {
                 await callFunctionWithRetry({
                     functionName,
@@ -309,22 +309,22 @@ const launchHandler = async (params, options) => {
                     },
                     retries: 2,
                 });
-                renderer_1.RenderInternals.Log.infoAdvanced(logOptions, `New function successfully invoked. See the CloudWatch logs for it:`);
-                renderer_1.RenderInternals.Log.infoAdvanced(logOptions, (0, get_aws_urls_1.getCloudwatchMethodUrl)({
+                renderer_1.RenderInternals.Log.info(logOptions, `New function successfully invoked. See the CloudWatch logs for it:`);
+                renderer_1.RenderInternals.Log.info(logOptions, (0, get_aws_urls_1.getCloudwatchMethodUrl)({
                     functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
                     method: constants_1.LambdaRoutines.merge,
                     region: (0, get_current_region_1.getCurrentRegionInFunction)(),
                     rendererFunctionName: params.rendererFunctionName,
                     renderId: params.renderId,
                 }));
-                renderer_1.RenderInternals.Log.infoAdvanced(logOptions, 'This function will now time out.');
+                renderer_1.RenderInternals.Log.info(logOptions, 'This function will now time out.');
             }
             catch (err) {
                 if (process.env.NODE_ENV === 'test') {
                     throw err;
                 }
-                renderer_1.RenderInternals.Log.error('Failed to invoke additional function to merge videos:');
-                renderer_1.RenderInternals.Log.error(err);
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Failed to invoke additional function to merge videos:');
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, err);
                 await (0, write_lambda_error_1.writeLambdaError)({
                     bucketName: params.bucketName,
                     errorInfo: {
@@ -362,15 +362,15 @@ const launchHandler = async (params, options) => {
                     bucketName: params.bucketName,
                     customData: (_a = params.webhook.customData) !== null && _a !== void 0 ? _a : null,
                 },
-            });
+            }, params.logLevel);
             webhookInvoked = true;
         }
         catch (err) {
             if (process.env.NODE_ENV === 'test') {
                 throw err;
             }
-            renderer_1.RenderInternals.Log.error('Failed to invoke webhook:');
-            renderer_1.RenderInternals.Log.error(err);
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Failed to invoke webhook:');
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, err);
             await (0, write_lambda_error_1.writeLambdaError)({
                 bucketName: params.bucketName,
                 errorInfo: {
@@ -393,7 +393,7 @@ const launchHandler = async (params, options) => {
     };
     let webhookInvoked = false;
     const webhookDueToTimeout = setTimeout(onTimeout, Math.max(options.getRemainingTimeInMillis() - 1000, 1000));
-    renderer_1.RenderInternals.Log.infoAdvanced(logOptions, `Function has ${Math.max(options.getRemainingTimeInMillis() - 1000, 1000)} before it times out`);
+    renderer_1.RenderInternals.Log.info(logOptions, `Function has ${Math.max(options.getRemainingTimeInMillis() - 1000, 1000)} before it times out`);
     try {
         const postRenderData = await innerLaunchHandler({
             functionName,
@@ -425,7 +425,7 @@ const launchHandler = async (params, options) => {
                     timeToFinish: postRenderData.timeToFinish,
                     costs: postRenderData.cost,
                 },
-            });
+            }, params.logLevel);
             webhookInvoked = true;
         }
         catch (err) {
@@ -450,8 +450,8 @@ const launchHandler = async (params, options) => {
                 renderId: params.renderId,
                 expectedBucketOwner: options.expectedBucketOwner,
             });
-            renderer_1.RenderInternals.Log.error('Failed to invoke webhook:');
-            renderer_1.RenderInternals.Log.error(err);
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Failed to invoke webhook:');
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, err);
         }
         return {
             type: 'success',
@@ -461,7 +461,7 @@ const launchHandler = async (params, options) => {
         if (process.env.NODE_ENV === 'test') {
             throw err;
         }
-        renderer_1.RenderInternals.Log.error('Error occurred', err);
+        renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Error occurred', err);
         await (0, write_lambda_error_1.writeLambdaError)({
             bucketName: params.bucketName,
             errorInfo: {
@@ -480,7 +480,7 @@ const launchHandler = async (params, options) => {
             expectedBucketOwner: options.expectedBucketOwner,
             renderId: params.renderId,
         });
-        renderer_1.RenderInternals.Log.error('Wrote error to S3');
+        renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Wrote error to S3');
         clearTimeout(webhookDueToTimeout);
         if (params.webhook && !webhookInvoked) {
             try {
@@ -499,7 +499,7 @@ const launchHandler = async (params, options) => {
                             stack: e.stack,
                         })),
                     },
-                });
+                }, params.logLevel);
                 webhookInvoked = true;
             }
             catch (error) {
@@ -524,8 +524,8 @@ const launchHandler = async (params, options) => {
                     renderId: params.renderId,
                     expectedBucketOwner: options.expectedBucketOwner,
                 });
-                renderer_1.RenderInternals.Log.error('Failed to invoke webhook:');
-                renderer_1.RenderInternals.Log.error(error);
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Failed to invoke webhook:');
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, error);
             }
         }
         throw err;

package/dist/functions/merge.js

@@ -12,8 +12,8 @@ const mergeHandler = async (params, options) => {
     if (params.type !== defaults_1.LambdaRoutines.merge) {
         throw new Error('Expected launch type');
     }
-    renderer_1.RenderInternals.Log.info('This function has been started because the previous main function has timed out while merging together the chunks.');
-    renderer_1.RenderInternals.Log.info('The merging of chunks will now restart.');
+    renderer_1.RenderInternals.Log.info({ indent: false, logLevel: params.logLevel }, 'This function has been started because the previous main function has timed out while merging together the chunks.');
+    renderer_1.RenderInternals.Log.info({ indent: false, logLevel: params.logLevel }, 'The merging of chunks will now restart.');
     const renderMetadata = await (0, get_render_metadata_1.getRenderMetadata)({
         bucketName: params.bucketName,
         expectedBucketOwner: options.expectedBucketOwner,
@@ -47,7 +47,7 @@ const mergeHandler = async (params, options) => {
         renderMetadata,
         serializedResolvedProps: params.serializedResolvedProps,
         onAllChunks: () => {
-            renderer_1.RenderInternals.Log.info('All chunks have been downloaded now.');
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel: params.logLevel }, 'All chunks have been downloaded now.');
         },
         audioBitrate: renderMetadata.audioBitrate,
         logLevel: params.logLevel,

package/dist/functions/renderer.js

@@ -85,7 +85,7 @@ const renderHandler = async (params, options, logs) => {
             frameRange: params.frameRange,
             onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
                 if (renderedFrames % 5 === 0) {
-                    renderer_1.RenderInternals.Log.info(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                    renderer_1.RenderInternals.Log.info({ indent: false, logLevel: params.logLevel }, `Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
                     (0, chunk_progress_1.writeLambdaInitializedFile)({
                         attempt: params.attempt,
                         bucketName: params.bucketName,

package/dist/internals.d.ts

@@ -1,7 +1,7 @@
 export declare const LambdaInternals: {
     executeCommand: (args: string[], remotionRoot: string, logLevel: "verbose" | "info" | "warn" | "error") => Promise<void>;
     makeLambdaRenderMediaPayload: ({ rendererFunctionName, frameRange, framesPerLambda, forceBucketName: bucketName, codec, composition, serveUrl, imageFormat, inputProps, region, crf, envVariables, pixelFormat, proResProfile, x264Preset, maxRetries, privacy, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, everyNthFrame, numberOfGifLoops, audioBitrate, concurrencyPerLambda, audioCodec, forceHeight, forceWidth, webhook, videoBitrate, encodingMaxRate, encodingBufferSize, downloadBehavior, muted, overwrite, jpegQuality, offthreadVideoCacheSizeInBytes, deleteAfter, colorSpace, }: import("./api/make-lambda-payload").InnerRenderMediaOnLambdaInput) => Promise<import("./defaults").LambdaStartPayload>;
-    getRenderProgressPayload: ({ bucketName, renderId, s3OutputProvider, }: import(".").GetRenderProgressInput) => import("./defaults").LambdaStatusPayload;
+    getRenderProgressPayload: ({ bucketName, renderId, s3OutputProvider, logLevel, }: import(".").GetRenderProgressInput) => import("./defaults").LambdaStatusPayload;
     makeLambdaRenderStillPayload: ({ serveUrl, inputProps, imageFormat, envVariables, quality, jpegQuality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, downloadBehavior, forceHeight, forceWidth, forceBucketName, dumpBrowserLogs, offthreadVideoCacheSizeInBytes, deleteAfter, }: import(".").RenderStillOnLambdaInput) => Promise<{
         type: import("./defaults").LambdaRoutines.still;
         serveUrl: string;

package/dist/shared/constants.d.ts

@@ -163,11 +163,13 @@ export type LambdaStatusPayload = {
     bucketName: string;
     renderId: string;
     version: string;
+    logLevel: LogLevel;
     s3OutputProvider?: CustomCredentials;
 };
 export type LambdaPayloads = {
     info: {
         type: LambdaRoutines.info;
+        logLevel: LogLevel;
     };
     start: LambdaStartPayload;
     launch: {

package/dist/shared/get-function-version.d.ts

@@ -1,5 +1,7 @@
+import type { LogLevel } from '@remotion/renderer';
 import type { AwsRegion } from '../pricing/aws-regions';
-export declare const getFunctionVersion: ({ functionName, region, }: {
+export declare const getFunctionVersion: ({ functionName, region, logLevel, }: {
     functionName: string;
     region: AwsRegion;
+    logLevel: LogLevel;
 }) => Promise<string>;

package/dist/shared/get-function-version.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionVersion = void 0;
 const call_lambda_1 = require("./call-lambda");
 const constants_1 = require("./constants");
-const getFunctionVersion = async ({ functionName, region, }) => {
+const getFunctionVersion = async ({ functionName, region, logLevel, }) => {
     try {
         const result = await (0, call_lambda_1.callLambda)({
             functionName,
             payload: {
-                type: constants_1.LambdaRoutines.info,
+                logLevel,
             },
             region,
             type: constants_1.LambdaRoutines.info,

package/dist/shared/invoke-webhook.d.ts

@@ -1,3 +1,6 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { LogLevel } from '@remotion/renderer';
 import https from 'https';
 import http from 'node:http';
 import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';
@@ -42,5 +45,5 @@ type InvokeWebhookOptions = {
     url: string;
     secret: string | null;
 };
-export declare const invokeWebhook: (options: InvokeWebhookOptions, retries?: number, errors?: number) => Promise<void>;
+export declare const invokeWebhook: (options: InvokeWebhookOptions, logLevel: LogLevel, retries?: number, errors?: number) => Promise<void>;
 export {};

package/dist/shared/invoke-webhook.js

@@ -96,7 +96,7 @@ function invokeWebhookRaw({ payload, secret, url, }) {
 function exponentialBackoff(errorCount) {
     return 1000 * 2 ** (errorCount - 1);
 }
-const invokeWebhook = async (options, retries = 2, errors = 0) => {
+const invokeWebhook = async (options, logLevel, retries = 2, errors = 0) => {
     try {
         await invokeWebhookRaw(options);
     }
@@ -104,15 +104,15 @@ const invokeWebhook = async (options, retries = 2, errors = 0) => {
         if (retries === 0) {
             throw err;
         }
-        renderer_1.RenderInternals.Log.error('Could not send webhook due to error:');
-        renderer_1.RenderInternals.Log.error(err.stack);
-        renderer_1.RenderInternals.Log.error(`Retrying in ${exponentialBackoff(errors)}ms.`);
+        renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, 'Could not send webhook due to error:');
+        renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, err.stack);
+        renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, `Retrying in ${exponentialBackoff(errors)}ms.`);
         await new Promise((resolve) => {
             setTimeout(() => {
                 resolve();
             }, exponentialBackoff(errors));
         });
-        return (0, exports.invokeWebhook)(options, retries - 1, errors + 1);
+        return (0, exports.invokeWebhook)(options, logLevel, retries - 1, errors + 1);
     }
 };
 exports.invokeWebhook = invokeWebhook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.115",
+  "version": "4.0.116",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -26,10 +26,10 @@
     "aws-policies": "^1.0.1",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.115",
-    "@remotion/renderer": "4.0.115",
-    "@remotion/cli": "4.0.115",
-    "remotion": "4.0.115"
+    "@remotion/bundler": "4.0.116",
+    "@remotion/cli": "4.0.116",
+    "remotion": "4.0.116",
+    "@remotion/renderer": "4.0.116"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.276",
@@ -43,11 +43,11 @@
     "ts-node": "^10.8.0",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.115",
-    "@remotion/bundler": "4.0.115"
+    "@remotion/compositor-linux-arm64-gnu": "4.0.116",
+    "@remotion/bundler": "4.0.116"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.115"
+    "@remotion/bundler": "4.0.116"
   },
   "publishConfig": {
     "access": "public"