@remotion/lambda 4.0.46 → 4.0.47

package/LICENSE.md

@@ -38,4 +38,4 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord.
 
 You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)).
 
-Visit [companies.remotion.dev](https://companies.remotion.dev) for pricing and to buy a license.
+Visit [remotion.pro](https://www.remotion.pro) for pricing and to buy a license.

package/dist/cli/commands/render/render.js

@@ -22,6 +22,11 @@ const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 const progress_1 = require("./progress");
 exports.RENDER_COMMAND = 'render';
+function getTotalFrames(status) {
+    return status.renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+        : null;
+}
 const renderCommand = async (args, remotionRoot) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const serveUrl = args[0];
@@ -299,8 +304,3 @@ const renderCommand = async (args, remotionRoot) => {
     }
 };
 exports.renderCommand = renderCommand;
-function getTotalFrames(status) {
-    return status.renderMetadata
-        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
-        : null;
-}

package/dist/cli/helpers/validate.d.ts

@@ -0,0 +1,4 @@
+import { Internals } from 'remotion';
+export declare const validateFps: typeof Internals.validateFps;
+export declare const validateDimension: typeof Internals.validateDimension;
+export declare const validateDurationInFrames: typeof Internals.validateDurationInFrames;

package/dist/cli/helpers/validate.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateDurationInFrames = exports.validateDimension = exports.validateFps = void 0;
+/* eslint-disable prefer-destructuring */
+const remotion_1 = require("remotion");
+exports.validateFps = remotion_1.Internals.validateFps;
+exports.validateDimension = remotion_1.Internals.validateDimension;
+exports.validateDurationInFrames = remotion_1.Internals.validateDurationInFrames;

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: "error" | "verbose" | "info" | "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: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     }, message?: any, ...optionalParams: any[]) => void;
     warn: (message?: any, ...optionalParams: any[]) => void;
     warnAdvanced: (options: {
         indent: boolean;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     }, message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
     errorAdvanced: (options: {
         indent: boolean;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
     } & {
         tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;

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

@@ -3,8 +3,5 @@ export declare const planFrameRanges: ({ framesPerLambda, frameRange, everyNthFr
     frameRange: [number, number];
     everyNthFrame: number;
 }) => {
-    chunks: [
-        number,
-        number
-    ][];
+    chunks: [number, number][];
 };

package/dist/functions/compositions.js

@@ -10,7 +10,7 @@ const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
 const compositionsHandler = async (lambdaParams, options) => {
-    var _a, _b, _c;
+    var _a;
     if (lambdaParams.type !== defaults_1.LambdaRoutines.compositions) {
         throw new TypeError('Expected info compositions');
     }
@@ -21,16 +21,17 @@ 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 [bucketName, browserInstance] = await Promise.all([
-        (_a = lambdaParams.bucketName) !== null && _a !== void 0 ? _a : (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
+    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),
-        (0, get_browser_instance_1.getBrowserInstance)(lambdaParams.logLevel, false, (_b = lambdaParams.chromiumOptions) !== null && _b !== void 0 ? _b : {}),
-    ]);
+        }).then((b) => b.bucketName);
+    const bucketName = await bucketNamePromise;
     const serializedInputPropsWithCustomSchema = await (0, compress_props_1.decompressInputProps)({
-        bucketName,
+        bucketName: await bucketNamePromise,
         expectedBucketOwner: options.expectedBucketOwner,
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         serialized: lambdaParams.inputProps,
@@ -43,9 +44,9 @@ const compositionsHandler = async (lambdaParams, options) => {
     });
     const compositions = await renderer_1.RenderInternals.internalGetCompositions({
         serveUrlOrWebpackUrl: realServeUrl,
-        puppeteerInstance: browserInstance,
+        puppeteerInstance: (await browserInstancePromise).instance,
         serializedInputPropsWithCustomSchema,
-        envVariables: (_c = lambdaParams.envVariables) !== null && _c !== void 0 ? _c : {},
+        envVariables: (_a = lambdaParams.envVariables) !== null && _a !== void 0 ? _a : {},
         timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
         chromiumOptions: lambdaParams.chromiumOptions,
         port: null,
@@ -56,6 +57,7 @@ const compositionsHandler = async (lambdaParams, options) => {
         onBrowserLog: null,
         offthreadVideoCacheSizeInBytes: lambdaParams.offthreadVideoCacheSizeInBytes,
     });
+    (await browserInstancePromise).instance.forgetEventLoop();
     return Promise.resolve({
         compositions,
         type: 'success',

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

@@ -1,2 +1,8 @@
 import type { ChromiumOptions, LogLevel, openBrowser } from '@remotion/renderer';
-export declare const getBrowserInstance: (logLevel: LogLevel, indent: boolean, chromiumOptions: ChromiumOptions) => ReturnType<typeof openBrowser>;
+import type { Await } from '../../shared/await';
+type LaunchedBrowser = {
+    instance: Await<ReturnType<typeof openBrowser>>;
+    configurationString: string;
+};
+export declare const getBrowserInstance: (logLevel: LogLevel, indent: boolean, chromiumOptions: ChromiumOptions) => Promise<LaunchedBrowser>;
+export {};

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

@@ -3,6 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBrowserInstance = void 0;
 const renderer_1 = require("@remotion/renderer");
 const get_chromium_executable_path_1 = require("./get-chromium-executable-path");
+const makeConfigurationString = (options, logLevel) => {
+    var _a, _b, _c;
+    return [
+        `web-security-${Boolean(options.disableWebSecurity)}`,
+        `multi-process-${Boolean(options.enableMultiProcessOnLinux)}`,
+        `ignore-certificate-errors-${Boolean(options.ignoreCertificateErrors)}`,
+        `log-level-${logLevel}`,
+        `gl-${(_a = options.gl) !== null && _a !== void 0 ? _a : null}`,
+        `userAgent-${(_b = options.userAgent) !== null && _b !== void 0 ? _b : null}`,
+        `headless-${(_c = options.headless) !== null && _c !== void 0 ? _c : false}`,
+    ].join('/');
+};
 let _browserInstance;
 let launching = false;
 const waitForLaunched = () => {
@@ -21,38 +33,54 @@ const waitForLaunched = () => {
 };
 const getBrowserInstance = async (logLevel, indent, chromiumOptions) => {
     var _a;
+    const actualChromiumOptions = {
+        ...chromiumOptions,
+        // Override the `null` value, which might come from CLI with swANGLE
+        gl: (_a = chromiumOptions.gl) !== null && _a !== void 0 ? _a : 'swangle',
+    };
     if (launching) {
+        renderer_1.RenderInternals.Log.info('Already waiting for browser launch...');
         await waitForLaunched();
         if (!_browserInstance) {
             throw new Error('expected to launch');
         }
-        return _browserInstance;
     }
-    if (_browserInstance) {
+    const configurationString = makeConfigurationString(actualChromiumOptions, logLevel);
+    if (!_browserInstance) {
+        renderer_1.RenderInternals.Log.info('Cold Lambda function, launching new Lambda function');
+        launching = true;
+        const execPath = (0, get_chromium_executable_path_1.executablePath)();
+        const instance = await renderer_1.RenderInternals.internalOpenBrowser({
+            browser: 'chrome',
+            browserExecutable: execPath,
+            chromiumOptions: actualChromiumOptions,
+            forceDeviceScaleFactor: undefined,
+            indent: false,
+            viewport: null,
+            logLevel,
+        });
+        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);
+            _browserInstance = null;
+        });
+        _browserInstance = {
+            instance,
+            configurationString,
+        };
+        launching = false;
         return _browserInstance;
     }
-    launching = true;
-    const execPath = (0, get_chromium_executable_path_1.executablePath)();
-    const actualChromiumOptions = {
-        ...chromiumOptions,
-        // Override the `null` value, which might come from CLI with swANGLE
-        gl: (_a = chromiumOptions.gl) !== null && _a !== void 0 ? _a : 'swangle',
-    };
-    _browserInstance = await renderer_1.RenderInternals.internalOpenBrowser({
-        browser: 'chrome',
-        browserExecutable: execPath,
-        chromiumOptions: actualChromiumOptions,
-        forceDeviceScaleFactor: undefined,
-        indent: false,
-        viewport: null,
-        logLevel,
-    });
-    _browserInstance.on('disconnected', () => {
-        console.log('Browser disconnected / crashed');
-        _browserInstance === null || _browserInstance === void 0 ? void 0 : _browserInstance.close(true, logLevel, indent).catch(() => undefined);
+    if (_browserInstance.configurationString !== configurationString) {
+        renderer_1.RenderInternals.Log.info('Warm Lambda function, but Browser configuration changed. Killing old browser instance.');
+        _browserInstance.instance.rememberEventLoop();
+        await _browserInstance.instance.close(true, logLevel, indent);
         _browserInstance = null;
-    });
-    launching = false;
+        return (0, exports.getBrowserInstance)(logLevel, indent, chromiumOptions);
+    }
+    renderer_1.RenderInternals.Log.info('Warm Lambda function, reusing browser instance');
+    _browserInstance.instance.rememberEventLoop();
     return _browserInstance;
 };
 exports.getBrowserInstance = getBrowserInstance;

package/dist/functions/helpers/streamify-response.js

@@ -22,6 +22,13 @@ class ResponseStream extends stream_1.Stream.Writable {
     }
 }
 exports.ResponseStream = ResponseStream;
+function patchArgs(argList) {
+    if (!(argList[1] instanceof ResponseStream)) {
+        const responseStream = new ResponseStream();
+        argList.splice(1, 0, responseStream);
+    }
+    return argList[1];
+}
 exports.HANDLER_STREAMING = Symbol.for('aws.lambda.runtime.handler.streaming');
 exports.STREAM_RESPONSE = 'response';
 function isInAWS(handler) {
@@ -61,10 +68,3 @@ function streamifyResponse(handler) {
     });
 }
 exports.streamifyResponse = streamifyResponse;
-function patchArgs(argList) {
-    if (!(argList[1] instanceof ResponseStream)) {
-        const responseStream = new ResponseStream();
-        argList.splice(1, 0, responseStream);
-    }
-    return argList[1];
-}

package/dist/functions/index.js

@@ -164,12 +164,5 @@ const routine = async (params, responseStream, context) => {
         responseStream.write(JSON.stringify(res));
         responseStream.end();
     }
-    finally {
-        responseStream.on('close', () => {
-            if (!process.env.VITEST) {
-                process.exit(0);
-            }
-        });
-    }
 };
 exports.handler = (0, streamify_response_1.streamifyResponse)(routine);

package/dist/functions/launch.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.launchHandler = void 0;
+/* eslint-disable @typescript-eslint/no-use-before-define */
 const client_lambda_1 = require("@aws-sdk/client-lambda");
 const renderer_1 = require("@remotion/renderer");
 const version_1 = require("remotion/version");
@@ -56,7 +57,7 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
         throw new Error('Expected launch type');
     }
     const startedDate = Date.now();
-    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, params.chromiumOptions);
+    const browserInstance = (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, params.chromiumOptions);
     const inputPropsPromise = (0, compress_props_1.decompressInputProps)({
         bucketName: params.bucketName,
         expectedBucketOwner: options.expectedBucketOwner,
@@ -69,7 +70,7 @@ const innerLaunchHandler = async ({ functionName, params, options, onAllChunksAv
     const comp = await (0, validate_composition_1.validateComposition)({
         serveUrl: params.serveUrl,
         composition: params.composition,
-        browserInstance,
+        browserInstance: (await browserInstance).instance,
         serializedInputPropsWithCustomSchema,
         envVariables: (_a = params.envVariables) !== null && _a !== void 0 ? _a : {},
         timeoutInMilliseconds: params.timeoutInMilliseconds,
@@ -245,6 +246,7 @@ 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,

package/dist/functions/renderer.js

@@ -20,7 +20,6 @@ const io_1 = require("./helpers/io");
 const on_downloads_logger_1 = require("./helpers/on-downloads-logger");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
 const renderHandler = async (params, options, logs) => {
-    var _a;
     if (params.type !== constants_1.LambdaRoutines.renderer) {
         throw new Error('Params must be renderer');
     }
@@ -41,7 +40,7 @@ const renderHandler = async (params, options, logs) => {
         serialized: params.resolvedProps,
         propsType: 'resolved-props',
     });
-    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, (_a = params.chromiumOptions) !== null && _a !== void 0 ? _a : {});
+    const browserInstance = await (0, get_browser_instance_1.getBrowserInstance)(params.logLevel, false, params.chromiumOptions);
     const outputPath = renderer_1.RenderInternals.tmpDir('remotion-render-');
     if (typeof params.chunk !== 'number') {
         throw new Error('must pass chunk');
@@ -115,7 +114,7 @@ const renderHandler = async (params, options, logs) => {
                     renderId: params.renderId,
                 }).catch((err) => reject(err));
             },
-            puppeteerInstance: browserInstance,
+            puppeteerInstance: browserInstance.instance,
             serveUrl: params.serveUrl,
             jpegQuality: (_a = params.jpegQuality) !== null && _a !== void 0 ? _a : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
             envVariables: (_b = params.envVariables) !== null && _b !== void 0 ? _b : {},
@@ -209,6 +208,8 @@ const renderHandler = async (params, options, logs) => {
             customCredentials: null,
         }),
     ]);
+    browserInstance.instance.forgetEventLoop();
+    renderer_1.RenderInternals.Log.verbose('Done!');
     return {};
 };
 const rendererHandler = async (params, options) => {

package/dist/functions/still.js

@@ -31,7 +31,7 @@ const on_downloads_logger_1 = require("./helpers/on-downloads-logger");
 const validate_composition_1 = require("./helpers/validate-composition");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
 const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, renderId, }) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     if (lambdaParams.type !== constants_1.LambdaRoutines.still) {
         throw new TypeError('Expected still type');
     }
@@ -45,17 +45,16 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
     (0, validate_privacy_1.validatePrivacy)(lambdaParams.privacy, true);
     (0, validate_outname_1.validateOutname)(lambdaParams.outName, null, null);
     const start = Date.now();
-    const [bucketName, browserInstance] = await Promise.all([
-        (_a = lambdaParams.bucketName) !== null && _a !== void 0 ? _a : (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-            enableFolderExpiry: null,
-            customCredentials: null,
-        }).then((b) => b.bucketName),
-        (0, get_browser_instance_1.getBrowserInstance)(lambdaParams.logLevel, false, (_b = lambdaParams.chromiumOptions) !== null && _b !== void 0 ? _b : {}),
-    ]);
+    const browserInstancePromise = (0, get_browser_instance_1.getBrowserInstance)(lambdaParams.logLevel, false, lambdaParams.chromiumOptions);
+    const bucketNamePromise = (_a = lambdaParams.bucketName) !== null && _a !== void 0 ? _a : (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        enableFolderExpiry: null,
+        customCredentials: null,
+    }).then((b) => b.bucketName);
     const outputDir = renderer_1.RenderInternals.tmpDir('remotion-render-');
     const outputPath = node_path_1.default.join(outputDir, 'output');
     const region = (0, get_current_region_1.getCurrentRegionInFunction)();
+    const bucketName = await bucketNamePromise;
     const serializedInputPropsWithCustomSchema = await (0, compress_props_1.decompressInputProps)({
         bucketName,
         expectedBucketOwner,
@@ -77,12 +76,13 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         webpackConfigOrServeUrl: serveUrl,
         offthreadVideoCacheSizeInBytes: lambdaParams.offthreadVideoCacheSizeInBytes,
     });
+    const browserInstance = await browserInstancePromise;
     const composition = await (0, validate_composition_1.validateComposition)({
         serveUrl,
-        browserInstance,
+        browserInstance: browserInstance.instance,
         composition: lambdaParams.composition,
         serializedInputPropsWithCustomSchema,
-        envVariables: (_c = lambdaParams.envVariables) !== null && _c !== void 0 ? _c : {},
+        envVariables: (_b = lambdaParams.envVariables) !== null && _b !== void 0 ? _b : {},
         chromiumOptions: lambdaParams.chromiumOptions,
         timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
         port: null,
@@ -109,7 +109,7 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         renderId,
-        outName: (_d = lambdaParams.outName) !== null && _d !== void 0 ? _d : undefined,
+        outName: (_c = lambdaParams.outName) !== null && _c !== void 0 ? _c : undefined,
         privacy: lambdaParams.privacy,
         everyNthFrame: 1,
         frameRange: [lambdaParams.frame, lambdaParams.frame],
@@ -133,7 +133,7 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         composition,
         output: outputPath,
         serveUrl,
-        envVariables: (_e = lambdaParams.envVariables) !== null && _e !== void 0 ? _e : {},
+        envVariables: (_d = lambdaParams.envVariables) !== null && _d !== void 0 ? _d : {},
         frame: renderer_1.RenderInternals.convertToPositiveFrameIndex({
             frame: lambdaParams.frame,
             durationInFrames: composition.durationInFrames,
@@ -141,8 +141,8 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         imageFormat: lambdaParams.imageFormat,
         serializedInputPropsWithCustomSchema,
         overwrite: false,
-        puppeteerInstance: browserInstance,
-        jpegQuality: (_f = lambdaParams.jpegQuality) !== null && _f !== void 0 ? _f : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
+        puppeteerInstance: browserInstance.instance,
+        jpegQuality: (_e = lambdaParams.jpegQuality) !== null && _e !== void 0 ? _e : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
         chromiumOptions: lambdaParams.chromiumOptions,
         scale: lambdaParams.scale,
         timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,
@@ -191,6 +191,7 @@ 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),

package/dist/functions/streaming/streaming.d.ts

@@ -1,60 +1,12 @@
 /// <reference types="node" />
-declare const framesRendered: "frames-rendered";
-declare const errorOccurred: "error-occurred";
-declare const renderIdDetermined: "render-id-determined";
-declare const chunkRendered: "chunk-rendered";
-declare const messageTypes: {
-    readonly '1': {
-        readonly type: "frames-rendered";
-    };
-    readonly '2': {
-        readonly type: "error-occurred";
-    };
-    readonly '3': {
-        readonly type: "render-id-determined";
-    };
-    readonly '4': {
-        readonly type: "chunk-rendered";
-    };
-};
-type MessageTypeId = keyof typeof messageTypes;
-type MessageType = (typeof messageTypes)[MessageTypeId]['type'];
-export declare const formatMap: {
-    [key in MessageType]: 'json' | 'binary';
+type OnMessage = (type: 'error' | 'success', nonce: string, data: Buffer) => void;
+export declare const makeStreaming: (onMessage: OnMessage) => {
+    addData: (data: Buffer) => void;
 };
+export declare const makePayloadMessage: (nonce: number, data: Buffer, status: 0 | 1) => Buffer;
 export type StreamingPayload = {
-    type: typeof framesRendered;
-    payload: {
-        frames: number;
-    };
-} | {
-    type: typeof chunkRendered;
-    payload: Buffer;
-} | {
-    type: typeof errorOccurred;
-    payload: {
-        error: string;
-    };
-} | {
-    type: typeof renderIdDetermined;
-    payload: {
-        renderId: string;
-    };
-};
-export declare const messageTypeIdToMessage: (messageTypeId: MessageTypeId) => MessageType;
-export declare const messageTypeToMessageId: (messageType: MessageType) => MessageTypeId;
-export type OnMessage = (options: {
-    successType: 'error' | 'success';
-    message: StreamingPayload;
-}) => void;
-export declare const makeStreaming: (options: {
-    onMessage: OnMessage;
-}) => {
-    addData: (data: Buffer) => void;
+    type: 'frames-rendered';
+    frames: number;
 };
-export declare const makePayloadMessage: ({ message, status, }: {
-    message: StreamingPayload;
-    status: 0 | 1;
-}) => Buffer;
 export type OnStream = (payload: StreamingPayload) => void;
 export {};

package/dist/functions/streaming/streaming.js

@@ -1,53 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makePayloadMessage = exports.makeStreaming = exports.messageTypeToMessageId = exports.messageTypeIdToMessage = exports.formatMap = void 0;
-const framesRendered = 'frames-rendered';
-const errorOccurred = 'error-occurred';
-const renderIdDetermined = 'render-id-determined';
-const chunkRendered = 'chunk-rendered';
-const messageTypes = {
-    '1': { type: framesRendered },
-    '2': { type: errorOccurred },
-    '3': { type: renderIdDetermined },
-    '4': { type: chunkRendered },
-};
-exports.formatMap = {
-    [framesRendered]: 'json',
-    [errorOccurred]: 'json',
-    [renderIdDetermined]: 'json',
-    [chunkRendered]: 'binary',
-};
-const messageTypeIdToMessage = (messageTypeId) => {
-    const types = messageTypes[messageTypeId];
-    if (!types) {
-        throw new Error(`Unknown message type id ${messageTypeId}`);
-    }
-    return types.type;
-};
-exports.messageTypeIdToMessage = messageTypeIdToMessage;
-const messageTypeToMessageId = (messageType) => {
-    const id = Object.keys(messageTypes).find((key) => messageTypes[key].type === messageType);
-    if (!id) {
-        throw new Error(`Unknown message type ${messageType}`);
-    }
-    return id;
-};
-exports.messageTypeToMessageId = messageTypeToMessageId;
-const magicSeparator = Buffer.from('remotion_buffer:');
-const makeStreaming = (options) => {
+exports.makePayloadMessage = exports.makeStreaming = void 0;
+const makeStreaming = (onMessage) => {
     let outputBuffer = Buffer.from('');
+    const separator = Buffer.from('remotion_buffer:');
     let unprocessedBuffers = [];
     let missingData = null;
     const processInput = () => {
-        let separatorIndex = outputBuffer.indexOf(magicSeparator);
+        let separatorIndex = outputBuffer.indexOf(separator);
         if (separatorIndex === -1) {
             return;
         }
-        separatorIndex += magicSeparator.length;
-        let messageTypeString = '';
+        separatorIndex += separator.length;
+        let nonceString = '';
         let lengthString = '';
         let statusString = '';
-        // Each message has the structure with `remotion_buffer:{[message_type_id]}:{[length]}`
+        // Each message from Rust is prefixed with `remotion_buffer;{[nonce]}:{[length]}`
         // Let's read the buffer to extract the nonce, and if the full length is available,
         // we'll extract the data and pass it to the callback.
         // eslint-disable-next-line no-constant-condition
@@ -59,7 +27,7 @@ const makeStreaming = (options) => {
                 break;
             }
             separatorIndex++;
-            messageTypeString += String.fromCharCode(nextDigit);
+            nonceString += String.fromCharCode(nextDigit);
         }
         // eslint-disable-next-line no-constant-condition
         while (true) {
@@ -90,17 +58,7 @@ const makeStreaming = (options) => {
             return;
         }
         const data = outputBuffer.subarray(separatorIndex + 1, separatorIndex + 1 + Number(lengthString));
-        const messageType = (0, exports.messageTypeIdToMessage)(messageTypeString);
-        const payload = {
-            type: messageType,
-            payload: exports.formatMap[messageType] === 'json'
-                ? JSON.parse(data.toString('utf-8'))
-                : data,
-        };
-        options.onMessage({
-            successType: status === 1 ? 'error' : 'success',
-            message: payload,
-        });
+        onMessage(status === 1 ? 'error' : 'success', nonceString, data);
         missingData = null;
         outputBuffer = outputBuffer.subarray(separatorIndex + Number(lengthString) + 1);
         processInput();
@@ -108,7 +66,7 @@ const makeStreaming = (options) => {
     return {
         addData: (data) => {
             unprocessedBuffers.push(data);
-            const separatorIndex = data.indexOf(magicSeparator);
+            const separatorIndex = data.indexOf(separator);
             if (separatorIndex === -1) {
                 if (missingData) {
                     missingData.dataMissing -= data.length;
@@ -120,24 +78,22 @@ const makeStreaming = (options) => {
             unprocessedBuffers.unshift(outputBuffer);
             outputBuffer = Buffer.concat(unprocessedBuffers);
             unprocessedBuffers = [];
+            console.log('the unprocessed input is now', new TextDecoder('utf-8').decode(outputBuffer));
             processInput();
         },
     };
 };
 exports.makeStreaming = makeStreaming;
-const makePayloadMessage = ({ message, status, }) => {
-    const body = exports.formatMap[message.type] === 'json'
-        ? Buffer.from(JSON.stringify(message.payload))
-        : message.payload;
+const makePayloadMessage = (nonce, data, status) => {
     const concat = Buffer.concat([
-        magicSeparator,
-        Buffer.from((0, exports.messageTypeToMessageId)(message.type).toString()),
+        Buffer.from('remotion_buffer:'),
+        Buffer.from(nonce.toString()),
         Buffer.from(':'),
-        Buffer.from(body.length.toString()),
+        Buffer.from(data.length.toString()),
         Buffer.from(':'),
         Buffer.from(String(status)),
         Buffer.from(':'),
-        body,
+        data,
     ]);
     return concat;
 };

package/dist/shared/call-lambda.js

@@ -5,6 +5,37 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
 const streaming_payloads_1 = require("../functions/helpers/streaming-payloads");
 const aws_clients_1 = require("./aws-clients");
 const INVALID_JSON_MESSAGE = 'Cannot parse Lambda response as JSON';
+const parseJsonWithErrorSurfacing = (input) => {
+    try {
+        return JSON.parse(input);
+    }
+    catch (_a) {
+        throw new Error(`${INVALID_JSON_MESSAGE}. Response: ${input}`);
+    }
+};
+const parseJson = (input) => {
+    var _a;
+    let json = parseJsonWithErrorSurfacing(input);
+    if ('statusCode' in json) {
+        json = parseJsonWithErrorSurfacing(json.body);
+    }
+    if ('errorMessage' in json) {
+        const err = new Error(json.errorMessage);
+        err.name = json.errorType;
+        err.stack = ((_a = json.trace) !== null && _a !== void 0 ? _a : []).join('\n');
+        throw err;
+    }
+    // This will not happen, it is for narrowing purposes
+    if ('statusCode' in json) {
+        throw new Error(`Lambda function failed with status code ${json.statusCode}`);
+    }
+    if (json.type === 'error') {
+        const err = new Error(json.message);
+        err.stack = json.stack;
+        throw err;
+    }
+    return json;
+};
 const callLambda = async (options) => {
     // As of August 2023, Lambda streaming sometimes misses parts of the JSON response.
     // Handling this for now by applying a retry mechanism.
@@ -61,34 +92,3 @@ const callLambdaWithoutRetry = async ({ functionName, type, payload, region, rec
     const json = parseJson(responsePayload.trim());
     return json;
 };
-const parseJsonWithErrorSurfacing = (input) => {
-    try {
-        return JSON.parse(input);
-    }
-    catch (_a) {
-        throw new Error(`${INVALID_JSON_MESSAGE}. Response: ${input}`);
-    }
-};
-const parseJson = (input) => {
-    var _a;
-    let json = parseJsonWithErrorSurfacing(input);
-    if ('statusCode' in json) {
-        json = parseJsonWithErrorSurfacing(json.body);
-    }
-    if ('errorMessage' in json) {
-        const err = new Error(json.errorMessage);
-        err.name = json.errorType;
-        err.stack = ((_a = json.trace) !== null && _a !== void 0 ? _a : []).join('\n');
-        throw err;
-    }
-    // This will not happen, it is for narrowing purposes
-    if ('statusCode' in json) {
-        throw new Error(`Lambda function failed with status code ${json.statusCode}`);
-    }
-    if (json.type === 'error') {
-        const err = new Error(json.message);
-        err.stack = json.stack;
-        throw err;
-    }
-    return json;
-};

package/dist/shared/compress-props.js

@@ -8,6 +8,12 @@ const random_hash_1 = require("./random-hash");
 const serialize_props_1 = require("./serialize-props");
 const stream_to_string_1 = require("./stream-to-string");
 const validate_webhook_1 = require("./validate-webhook");
+const makeKey = (type, hash) => {
+    if (type === 'input-props') {
+        return (0, constants_1.inputPropsKey)(hash);
+    }
+    return (0, constants_1.resolvedPropsKey)(hash);
+};
 const serializeOrThrow = (inputProps, propsType) => {
     try {
         const payload = (0, serialize_props_1.serializeJSONWithDate)({
@@ -82,9 +88,3 @@ const decompressInputProps = async ({ serialized, region, bucketName, expectedBu
     }
 };
 exports.decompressInputProps = decompressInputProps;
-const makeKey = (type, hash) => {
-    if (type === 'input-props') {
-        return (0, constants_1.inputPropsKey)(hash);
-    }
-    return (0, constants_1.resolvedPropsKey)(hash);
-};

package/dist/shared/get-aws-urls.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getS3RenderUrl = exports.getCloudwatchRendererUrl = exports.getCloudwatchMethodUrl = void 0;
 const encode_aws_url_params_1 = require("./encode-aws-url-params");
+const cloudWatchUrlWithQuery = ({ region, functionNameToUse, query, }) => {
+    return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionNameToUse}/log-events$3FfilterPattern$3D${(0, encode_aws_url_params_1.encodeAwsUrlParams)(query)}`;
+};
 const getCloudwatchMethodUrl = ({ region, functionName, renderId, rendererFunctionName, method, }) => {
     const functionNameToUse = rendererFunctionName !== null && rendererFunctionName !== void 0 ? rendererFunctionName : functionName;
     const query = `"method=${method},renderId=${renderId}"`;
@@ -14,9 +17,6 @@ const getCloudwatchRendererUrl = ({ region, functionName, renderId, rendererFunc
     return cloudWatchUrlWithQuery({ region, functionNameToUse, query });
 };
 exports.getCloudwatchRendererUrl = getCloudwatchRendererUrl;
-const cloudWatchUrlWithQuery = ({ region, functionNameToUse, query, }) => {
-    return `https://${region}.console.aws.amazon.com/cloudwatch/home?region=${region}#logsV2:log-groups/log-group/$252Faws$252Flambda$252F${functionNameToUse}/log-events$3FfilterPattern$3D${(0, encode_aws_url_params_1.encodeAwsUrlParams)(query)}`;
-};
 const getS3RenderUrl = ({ renderId, region, bucketName, }) => {
     return `https://s3.console.aws.amazon.com/s3/buckets/${bucketName}?region=${region}&prefix=renders/${renderId}/`;
 };

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

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import https from 'https';
 import http from 'node:http';
 import type { EnhancedErrorInfo } from '../functions/helpers/write-lambda-error';

package/dist/shared/invoke-webhook.js

@@ -47,6 +47,10 @@ function calculateSignature(payload, secret) {
     return signature;
 }
 exports.calculateSignature = calculateSignature;
+exports.mockableHttpClients = {
+    http: node_http_1.default.request,
+    https: https_1.default.request,
+};
 const getWebhookClient = (url) => {
     if (url.startsWith('https://')) {
         return exports.mockableHttpClients.https;
@@ -56,10 +60,6 @@ const getWebhookClient = (url) => {
     }
     throw new Error('Can only request URLs starting with http:// or https://');
 };
-exports.mockableHttpClients = {
-    http: node_http_1.default.request,
-    https: https_1.default.request,
-};
 function invokeWebhookRaw({ payload, secret, url, }) {
     const jsonPayload = JSON.stringify(payload);
     return new Promise((resolve, reject) => {

package/package.json

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