@remotion/lambda 4.0.44 → 4.0.45

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/functions/index.js

@@ -129,6 +129,7 @@ const innerHandler = async (params, responseStream, context) => {
             renderId: params.renderId,
             isWarm,
         });
+        renderer_1.RenderInternals.setLogLevel(params.logLevel);
         const response = await (0, merge_1.mergeHandler)(params, {
             expectedBucketOwner: currentUserId,
         });

package/dist/functions/launch.js

@@ -292,6 +292,7 @@ const launchHandler = async (params, options) => {
                         outName: params.outName,
                         serializedResolvedProps: allChunksAvailable.serializedResolvedProps,
                         inputProps: allChunksAvailable.inputProps,
+                        logLevel: params.logLevel,
                     },
                     retries: 2,
                 });

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/constants.d.ts

@@ -293,6 +293,7 @@ export type LambdaPayloads = {
         inputProps: SerializedInputProps;
         serializedResolvedProps: SerializedInputProps;
         verbose: boolean;
+        logLevel: LogLevel;
     };
 };
 export type LambdaPayload = LambdaPayloads[LambdaRoutines];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.44",
+  "version": "4.0.45",
   "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.21.4",
-    "@remotion/bundler": "4.0.44",
-    "@remotion/renderer": "4.0.44",
-    "remotion": "4.0.44",
-    "@remotion/cli": "4.0.44"
+    "@remotion/cli": "4.0.45",
+    "@remotion/bundler": "4.0.45",
+    "@remotion/renderer": "4.0.45",
+    "remotion": "4.0.45"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
@@ -43,11 +43,11 @@
     "ts-node": "^10.8.0",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.44",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.44"
+    "@remotion/bundler": "4.0.45",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.45"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.44"
+    "@remotion/bundler": "4.0.45"
   },
   "publishConfig": {
     "access": "public"