@remotion/lambda 4.0.61 → 4.0.63

package/dist/functions/compositions.js

@@ -20,47 +20,51 @@ const compositionsHandler = async (lambdaParams, options) => {
         }
         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 browserInstancePromise = (0, get_browser_instance_1.getBrowserInstance)(lambdaParams.logLevel, false, lambdaParams.chromiumOptions);
-    const bucketNamePromise = lambdaParams.bucketName
-        ? Promise.resolve(lambdaParams.bucketName)
-        : (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
+    try {
+        const region = (0, get_current_region_1.getCurrentRegionInFunction)();
+        const browserInstancePromise = (0, get_browser_instance_1.getBrowserInstance)(lambdaParams.logLevel, false, lambdaParams.chromiumOptions);
+        const bucketNamePromise = lambdaParams.bucketName
+            ? Promise.resolve(lambdaParams.bucketName)
+            : (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
+                region,
+                enableFolderExpiry: null,
+                customCredentials: null,
+            }).then((b) => b.bucketName);
+        const bucketName = await bucketNamePromise;
+        const serializedInputPropsWithCustomSchema = await (0, compress_props_1.decompressInputProps)({
+            bucketName: await bucketNamePromise,
+            expectedBucketOwner: options.expectedBucketOwner,
+            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+            serialized: lambdaParams.inputProps,
+            propsType: 'input-props',
+        });
+        const realServeUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
+            urlOrId: lambdaParams.serveUrl,
             region,
-            enableFolderExpiry: null,
-            customCredentials: null,
-        }).then((b) => b.bucketName);
-    const bucketName = await bucketNamePromise;
-    const serializedInputPropsWithCustomSchema = await (0, compress_props_1.decompressInputProps)({
-        bucketName: await bucketNamePromise,
-        expectedBucketOwner: options.expectedBucketOwner,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        serialized: lambdaParams.inputProps,
-        propsType: 'input-props',
-    });
-    const realServeUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
-        urlOrId: lambdaParams.serveUrl,
-        region,
-        bucketName,
-    });
-    const compositions = await renderer_1.RenderInternals.internalGetCompositions({
-        serveUrlOrWebpackUrl: realServeUrl,
-        puppeteerInstance: (await browserInstancePromise).instance,
-        serializedInputPropsWithCustomSchema,
-        envVariables: (_a = lambdaParams.envVariables) !== null && _a !== void 0 ? _a : {},
-        timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
-        chromiumOptions: lambdaParams.chromiumOptions,
-        port: null,
-        server: undefined,
-        logLevel: lambdaParams.logLevel,
-        indent: false,
-        browserExecutable: null,
-        onBrowserLog: null,
-        offthreadVideoCacheSizeInBytes: lambdaParams.offthreadVideoCacheSizeInBytes,
-    });
-    (await browserInstancePromise).instance.forgetEventLoop();
-    return Promise.resolve({
-        compositions,
-        type: 'success',
-    });
+            bucketName,
+        });
+        const compositions = await renderer_1.RenderInternals.internalGetCompositions({
+            serveUrlOrWebpackUrl: realServeUrl,
+            puppeteerInstance: (await browserInstancePromise).instance,
+            serializedInputPropsWithCustomSchema,
+            envVariables: (_a = lambdaParams.envVariables) !== null && _a !== void 0 ? _a : {},
+            timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
+            chromiumOptions: lambdaParams.chromiumOptions,
+            port: null,
+            server: undefined,
+            logLevel: lambdaParams.logLevel,
+            indent: false,
+            browserExecutable: null,
+            onBrowserLog: null,
+            offthreadVideoCacheSizeInBytes: lambdaParams.offthreadVideoCacheSizeInBytes,
+        });
+        return Promise.resolve({
+            compositions,
+            type: 'success',
+        });
+    }
+    finally {
+        (0, get_browser_instance_1.forgetBrowserEventLoop)(lambdaParams.logLevel);
+    }
 };
 exports.compositionsHandler = compositionsHandler;

package/dist/functions/helpers/get-browser-instance.d.ts

@@ -4,5 +4,6 @@ type LaunchedBrowser = {
     instance: Await<ReturnType<typeof openBrowser>>;
     configurationString: string;
 };
+export declare const forgetBrowserEventLoop: (logLevel: LogLevel) => void;
 export declare const getBrowserInstance: (logLevel: LogLevel, indent: boolean, chromiumOptions: ChromiumOptions) => Promise<LaunchedBrowser>;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBrowserInstance = void 0;
+exports.getBrowserInstance = exports.forgetBrowserEventLoop = void 0;
 const renderer_1 = require("@remotion/renderer");
 const get_chromium_executable_path_1 = require("./get-chromium-executable-path");
 const makeConfigurationString = (options, logLevel) => {
@@ -31,6 +31,11 @@ const waitForLaunched = () => {
         check();
     });
 };
+const forgetBrowserEventLoop = (logLevel) => {
+    renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, 'Keeping browser open for next invocation');
+    _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.instance.forgetEventLoop();
+};
+exports.forgetBrowserEventLoop = forgetBrowserEventLoop;
 const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
     var _a;
     const actualChromiumOptions = {

package/dist/functions/helpers/get-current-region.d.ts

@@ -1 +1 @@
-export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "ap-south-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "sa-east-1" | "eu-south-1" | "af-south-1" | "ap-east-1" | "me-south-1";
+export declare const getCurrentRegionInFunction: () => "eu-central-1" | "eu-west-1" | "eu-west-2" | "eu-west-3" | "eu-south-1" | "eu-north-1" | "us-east-1" | "us-east-2" | "us-west-1" | "us-west-2" | "af-south-1" | "ap-south-1" | "ap-east-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "ap-northeast-2" | "ap-northeast-3" | "ca-central-1" | "me-south-1" | "sa-east-1";

package/dist/functions/launch.js

@@ -250,7 +250,6 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
         await callFunctionWithRetry({ payload, retries: 0, functionName });
     }));
     reqSend.end();
-    (await browserInstance).instance.forgetEventLoop();
     const fps = comp.fps / params.everyNthFrame;
     const postRenderData = await (0, merge_chunks_1.mergeChunksAndFinishRender)({
         bucketName: params.bucketName,
@@ -527,5 +526,8 @@ const launchHandler = async (params, options) => {
         }
         throw err;
     }
+    finally {
+        (0, get_browser_instance_1.forgetBrowserEventLoop)(params.logLevel);
+    }
 };
 exports.launchHandler = launchHandler;

package/dist/functions/renderer.js

@@ -209,7 +209,6 @@ const renderHandler = async (params, options, logs) => {
             customCredentials: null,
         }),
     ]);
-    browserInstance.instance.forgetEventLoop();
     renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: params.logLevel }, 'Done!');
     return {};
 };
@@ -274,5 +273,8 @@ const rendererHandler = async (params, options) => {
         }
         throw err;
     }
+    finally {
+        (0, get_browser_instance_1.forgetBrowserEventLoop)(params.logLevel);
+    }
 };
 exports.rendererHandler = rendererHandler;

package/dist/functions/start.js

@@ -11,7 +11,7 @@ const get_current_region_1 = require("./helpers/get-current-region");
 const io_1 = require("./helpers/io");
 const lifecycle_1 = require("./helpers/lifecycle");
 const startHandler = async (params, options) => {
-    var _a, _b;
+    var _a;
     if (params.type !== constants_1.LambdaRoutines.start) {
         throw new TypeError('Expected type start');
     }
@@ -62,7 +62,7 @@ const startHandler = async (params, options) => {
         jpegQuality: params.jpegQuality,
         maxRetries: params.maxRetries,
         privacy: params.privacy,
-        logLevel: (_b = params.logLevel) !== null && _b !== void 0 ? _b : 'info',
+        logLevel: params.logLevel,
         frameRange: params.frameRange,
         outName: params.outName,
         timeoutInMilliseconds: params.timeoutInMilliseconds,

package/dist/functions/still.js

@@ -191,7 +191,6 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         // overestimate the price, but will only have a miniscule effect (~0.2%)
         diskSizeInMb: constants_1.MAX_EPHEMERAL_STORAGE_IN_MB,
     });
-    browserInstance.instance.forgetEventLoop();
     return {
         type: 'success',
         output: (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(renderMetadata, bucketName, customCredentials),
@@ -259,5 +258,10 @@ const stillHandler = async (options) => {
         });
         return res;
     }
+    finally {
+        (0, get_browser_instance_1.forgetBrowserEventLoop)(options.params.type === constants_1.LambdaRoutines.still
+            ? options.params.logLevel
+            : 'error');
+    }
 };
 exports.stillHandler = stillHandler;

package/dist/internals.d.ts

@@ -1,5 +1,5 @@
 export declare const LambdaInternals: {
-    executeCommand: (args: string[], remotionRoot: string, logLevel: "error" | "verbose" | "info" | "warn") => Promise<void>;
+    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, 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;
 };

package/package.json

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