@remotion/lambda 4.0.66 → 4.0.68

package/dist/functions/helpers/get-browser-instance.js

@@ -21,10 +21,10 @@ const waitForLaunched = () => {
     return new Promise((resolve, reject) => {
         const check = () => setTimeout(() => {
             if (launching) {
-                resolve();
+                check();
             }
             else {
-                check();
+                resolve();
             }
         }, 16);
         setTimeout(() => reject(new Error('Timeout launching browser')), 5000);
@@ -32,7 +32,7 @@ const waitForLaunched = () => {
     });
 };
 const forgetBrowserEventLoop = (logLevel) => {
-    renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, 'Keeping browser open for next invocation');
+    renderer_1.RenderInternals.Log.infoAdvanced({ indent: false, logLevel }, 'Keeping browser open for next invocation');
     _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.instance.forgetEventLoop();
 };
 exports.forgetBrowserEventLoop = forgetBrowserEventLoop;
@@ -43,6 +43,7 @@ const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
         // Override the `null` value, which might come from CLI with swANGLE
         gl: (_a = chromiumOptions.gl) !== null && _a !== void 0 ? _a : 'swangle',
     };
+    const configurationString = makeConfigurationString(actualChromiumOptions, logLevel);
     if (launching) {
         renderer_1.RenderInternals.Log.info('Already waiting for browser launch...');
         await waitForLaunched();
@@ -50,9 +51,8 @@ const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
             throw new Error('expected to launch');
         }
     }
-    const configurationString = makeConfigurationString(actualChromiumOptions, logLevel);
     if (!_browserInstance) {
-        renderer_1.RenderInternals.Log.info('Cold Lambda function, launching new Lambda function');
+        renderer_1.RenderInternals.Log.info('Cold Lambda function, launching new browser instance');
         launching = true;
         const execPath = (0, get_chromium_executable_path_1.executablePath)();
         const instance = await renderer_1.RenderInternals.internalOpenBrowser({
@@ -66,8 +66,11 @@ const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
         });
         instance.on('disconnected', () => {
             var _a;
-            console.log('Browser disconnected / crashed');
-            (_a = _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.instance) === null || _a === void 0 ? void 0 : _a.close(true, logLevel, indent).catch(() => undefined);
+            renderer_1.RenderInternals.Log.info('Browser disconnected or crashed.');
+            (0, exports.forgetBrowserEventLoop)(logLevel);
+            (_a = _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.instance) === null || _a === void 0 ? void 0 : _a.close(true, logLevel, indent).catch((err) => {
+                renderer_1.RenderInternals.Log.info('Could not close browser instance', err);
+            });
             _browserInstance = null;
         });
         _browserInstance = {

package/dist/functions/helpers/leak-detection.d.ts

@@ -0,0 +1,4 @@
+import type { NodeIntrospection } from '../../shared/why-is-node-running';
+export declare const stopLeakDetection: () => void;
+export declare const setCurrentRequestId: (awsRequestId: string) => void;
+export declare const startLeakDetection: (leakDetection: NodeIntrospection, awsRequestId: string) => void;

package/dist/functions/helpers/leak-detection.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startLeakDetection = exports.setCurrentRequestId = exports.stopLeakDetection = void 0;
+const why_is_node_running_1 = require("../../shared/why-is-node-running");
+let currentRequestId = null;
+let leakDetectionTimeout = null;
+const stopLeakDetection = () => {
+    if (leakDetectionTimeout !== null) {
+        clearTimeout(leakDetectionTimeout.timeout);
+        leakDetectionTimeout = null;
+    }
+};
+exports.stopLeakDetection = stopLeakDetection;
+const setCurrentRequestId = (awsRequestId) => {
+    currentRequestId = awsRequestId;
+};
+exports.setCurrentRequestId = setCurrentRequestId;
+const startLeakDetection = (leakDetection, awsRequestId) => {
+    currentRequestId = awsRequestId;
+    leakDetectionTimeout = {
+        awsRequestId,
+        timeout: setTimeout(() => {
+            // First allow request ID to be set
+            setTimeout(() => {
+                if (currentRequestId !== awsRequestId) {
+                    // New function, all good
+                    return;
+                }
+                console.log('Leak detected: Lambda function is still running 10s after the render has finished.');
+                console.log('You may report this to the Remotion team.');
+                console.log('Include the logs below:');
+                (0, why_is_node_running_1.whyIsNodeRunning)(leakDetection);
+                console.log('Force-quitting the Lambda function now.');
+                process.exit(0);
+            }, 100);
+        }, 10000),
+    };
+    leakDetectionTimeout.timeout.unref();
+};
+exports.startLeakDetection = startLeakDetection;

package/dist/functions/helpers/request-context.d.ts

@@ -0,0 +1,5 @@
+export type RequestContext = {
+    invokedFunctionArn: string;
+    getRemainingTimeInMillis: () => number;
+    awsRequestId: string;
+};

package/dist/functions/helpers/request-context.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/functions/helpers/streaming-payloads.d.ts

@@ -4,16 +4,16 @@ declare const streamingPayloadSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     type: z.ZodLiteral<"render-id-determined">;
     renderId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    type: "render-id-determined";
     renderId: string;
-}, {
     type: "render-id-determined";
+}, {
     renderId: string;
+    type: "render-id-determined";
 }>]>;
 export type StreamingPayloads = z.infer<typeof streamingPayloadSchema>;
 export declare const isStreamingPayload: (str: string) => false | {
-    type: "render-id-determined";
     renderId: string;
+    type: "render-id-determined";
 };
 export declare const sendProgressEvent: (responseStream: ResponseStream, payload: StreamingPayloads) => void;
 export {};

package/dist/functions/index.js

@@ -6,6 +6,7 @@ const constants_1 = require("../shared/constants");
 const compositions_1 = require("./compositions");
 const clean_tmpdir_1 = require("./helpers/clean-tmpdir");
 const is_warm_1 = require("./helpers/is-warm");
+const leak_detection_1 = require("./helpers/leak-detection");
 const lifecycle_1 = require("./helpers/lifecycle");
 const print_cloudwatch_helper_1 = require("./helpers/print-cloudwatch-helper");
 const streamify_response_1 = require("./helpers/streamify-response");
@@ -18,8 +19,11 @@ const renderer_2 = require("./renderer");
 const start_1 = require("./start");
 const still_1 = require("./still");
 const innerHandler = async (params, responseStream, context) => {
+    (0, leak_detection_1.setCurrentRequestId)(context.awsRequestId);
     process.env.__RESERVED_IS_INSIDE_REMOTION_LAMBDA = 'true';
     const timeoutInMilliseconds = context.getRemainingTimeInMillis();
+    console.log('AWS Request ID:', context.awsRequestId);
+    (0, leak_detection_1.stopLeakDetection)();
     if (!(context === null || context === void 0 ? void 0 : context.invokedFunctionArn)) {
         throw new Error('Lambda function unexpectedly does not have context.invokedFunctionArn');
     }
@@ -108,7 +112,7 @@ const innerHandler = async (params, responseStream, context) => {
         const response = await (0, renderer_2.rendererHandler)(params, {
             expectedBucketOwner: currentUserId,
             isWarm,
-        });
+        }, context);
         responseStream.write(JSON.stringify(response), () => {
             responseStream.end();
         });

package/dist/functions/renderer.d.ts

@@ -1,9 +1,10 @@
 import type { LambdaPayload } from '../shared/constants';
+import type { RequestContext } from './helpers/request-context';
 type Options = {
     expectedBucketOwner: string;
     isWarm: boolean;
 };
-export declare const rendererHandler: (params: LambdaPayload, options: Options) => Promise<{
+export declare const rendererHandler: (params: LambdaPayload, options: Options, requestContext: RequestContext) => Promise<{
     type: 'success';
 }>;
 export {};

package/dist/functions/renderer.js

@@ -18,17 +18,13 @@ const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_chromium_executable_path_1 = require("./helpers/get-chromium-executable-path");
 const get_current_region_1 = require("./helpers/get-current-region");
 const io_1 = require("./helpers/io");
+const leak_detection_1 = require("./helpers/leak-detection");
 const on_downloads_logger_1 = require("./helpers/on-downloads-logger");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
-let leakDetectionTimeout = null;
 const renderHandler = async (params, options, logs) => {
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
-    if (leakDetectionTimeout !== null) {
-        clearTimeout(leakDetectionTimeout);
-        leakDetectionTimeout = null;
-    }
     if (params.launchFunctionConfig.version !== version_1.VERSION) {
         throw new Error(`The version of the function that was specified as "rendererFunctionName" is ${version_1.VERSION} but the version of the function that invoked the render is ${params.launchFunctionConfig.version}. Please make sure that the version of the function that is specified as "rendererFunctionName" is the same as the version of the function that is invoked.`);
     }
@@ -192,9 +188,7 @@ const renderHandler = async (params, options, logs) => {
         downloadBehavior: null,
         customCredentials: null,
     });
-    renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: params.logLevel }, 'Wrote chunk to S3', {
-        time: Date.now() - writeStart,
-    });
+    renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: params.logLevel }, `Wrote chunk to S3 (${Date.now() - writeStart}ms)`);
     renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: params.logLevel }, 'Cleaning up and writing timings');
     await Promise.all([
         node_fs_1.default.promises.rm(outputLocation, { recursive: true }),
@@ -218,7 +212,7 @@ const renderHandler = async (params, options, logs) => {
     renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: params.logLevel }, 'Done!');
     return {};
 };
-const rendererHandler = async (params, options) => {
+const rendererHandler = async (params, options, requestContext) => {
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
@@ -282,15 +276,7 @@ const rendererHandler = async (params, options) => {
     }
     finally {
         (0, get_browser_instance_1.forgetBrowserEventLoop)(params.logLevel);
-        leakDetectionTimeout = setTimeout(() => {
-            console.log('Leak detected: Lambda function is still running 10s after the render has finished.');
-            console.log('You may report this to the Remotion team.');
-            console.log('Include the logs below:');
-            (0, why_is_node_running_1.whyIsNodeRunning)(leakDetection);
-            console.log('Force-quitting the Lambda function now.');
-            process.exit(0);
-        }, 10000);
-        leakDetectionTimeout.unref();
+        (0, leak_detection_1.startLeakDetection)(leakDetection, requestContext.awsRequestId);
     }
 };
 exports.rendererHandler = rendererHandler;

package/dist/shared/why-is-node-running.d.ts

@@ -8,7 +8,7 @@ type Resource = {
         hasRef?: () => boolean;
     };
 };
-type NodeIntrospection = {
+export type NodeIntrospection = {
     hook: asyncHooks.AsyncHook;
     active: Map<number, Resource>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.66",
+  "version": "4.0.68",
   "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.66",
-    "@remotion/cli": "4.0.66",
-    "remotion": "4.0.66",
-    "@remotion/renderer": "4.0.66"
+    "@remotion/bundler": "4.0.68",
+    "@remotion/cli": "4.0.68",
+    "@remotion/renderer": "4.0.68",
+    "remotion": "4.0.68"
   },
   "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/bundler": "4.0.66",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.66"
+    "@remotion/bundler": "4.0.68",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.68"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.66"
+    "@remotion/bundler": "4.0.68"
   },
   "publishConfig": {
     "access": "public"