@remotion/lambda 4.0.8 → 4.0.11

package/dist/api/get-compositions-on-lambda.js

@@ -26,7 +26,9 @@ const getCompositionsOnLambda = async ({ chromiumOptions, serveUrl, region, inpu
         region,
         userSpecifiedBucketName: bucketName !== null && bucketName !== void 0 ? bucketName : null,
         propsType: 'input-props',
-        needsToUpload: (0, compress_props_1.getNeedsToUpload)('video-or-audio', stringifiedInputProps),
+        needsToUpload: (0, compress_props_1.getNeedsToUpload)('video-or-audio', [
+            stringifiedInputProps.length,
+        ]),
     });
     try {
         const res = await (0, call_lambda_1.callLambda)({

package/dist/api/make-lambda-payload.js

@@ -23,7 +23,9 @@ const makeLambdaRenderMediaPayload = async ({ rendererFunctionName, frameRange,
     const serialized = await (0, compress_props_1.compressInputProps)({
         stringifiedInputProps,
         region,
-        needsToUpload: (0, compress_props_1.getNeedsToUpload)('video-or-audio', stringifiedInputProps),
+        needsToUpload: (0, compress_props_1.getNeedsToUpload)('video-or-audio', [
+            stringifiedInputProps.length,
+        ]),
         userSpecifiedBucketName: bucketName !== null && bucketName !== void 0 ? bucketName : null,
         propsType: 'input-props',
     });

package/dist/api/render-still-on-lambda.js

@@ -31,7 +31,7 @@ const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFo
     const serializedInputProps = await (0, compress_props_1.compressInputProps)({
         stringifiedInputProps,
         region,
-        needsToUpload: (0, compress_props_1.getNeedsToUpload)('still', stringifiedInputProps),
+        needsToUpload: (0, compress_props_1.getNeedsToUpload)('still', [stringifiedInputProps.length]),
         userSpecifiedBucketName: forceBucketName !== null && forceBucketName !== void 0 ? forceBucketName : null,
         propsType: 'input-props',
     });

package/dist/functions/launch.js

@@ -191,7 +191,12 @@ const innerLaunchHandler = async (params, options) => {
     const sortedChunks = chunks.slice().sort((a, b) => a[0] - b[0]);
     const reqSend = (0, timer_1.timer)('sending off requests');
     const serializedResolved = (0, compress_props_1.serializeOrThrow)(comp.props, 'resolved-props');
-    const needsToUpload = (0, compress_props_1.getNeedsToUpload)('video-or-audio', serializedResolved + params.inputProps);
+    const needsToUpload = (0, compress_props_1.getNeedsToUpload)('video-or-audio', [
+        serializedResolved.length,
+        params.inputProps.type === 'bucket-url'
+            ? params.inputProps.hash.length
+            : params.inputProps.payload.length,
+    ]);
     const serializedResolvedProps = await (0, compress_props_1.compressInputProps)({
         propsType: 'resolved-props',
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
@@ -368,7 +373,14 @@ const innerLaunchHandler = async (params, options) => {
         else {
             console.log('No webhook specified');
         }
-        throw new Error('Stopping Lambda function because error occurred: ' + errors[0].stack);
+        const firstError = errors[0];
+        if (firstError.chunk !== null) {
+            throw new Error(`Stopping Lambda function because error occurred while rendering chunk ${firstError.chunk}:\n${errors[0].stack
+                .split('\n')
+                .map((s) => `   ${s}`)
+                .join('\n')}`);
+        }
+        throw new Error(`Stopping Lambda function because error occurred: ${errors[0].stack}`);
     };
     const fps = comp.fps / params.everyNthFrame;
     const outdir = (0, node_path_1.join)(renderer_1.RenderInternals.tmpDir(constants_1.CONCAT_FOLDER_TOKEN), 'bucket');

package/dist/functions/renderer.js

@@ -79,9 +79,8 @@ const renderHandler = async (params, options, logs) => {
             serializedInputPropsWithCustomSchema,
             frameRange: params.frameRange,
             onProgress: ({ renderedFrames, encodedFrames, stitchStage }) => {
-                if (renderedFrames % 5 === 0 &&
-                    renderer_1.RenderInternals.isEqualOrBelowLogLevel(params.logLevel, 'verbose')) {
-                    console.log(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                if (renderedFrames % 5 === 0) {
+                    renderer_1.RenderInternals.Log.info(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
                     (0, chunk_progress_1.writeLambdaInitializedFile)({
                         attempt: params.attempt,
                         bucketName: params.bucketName,
@@ -90,10 +89,13 @@ const renderHandler = async (params, options, logs) => {
                         framesRendered: renderedFrames,
                         renderId: params.renderId,
                     }).catch((err) => {
-                        console.log(err);
+                        console.log('Could not write progress', err);
                         return reject(err);
                     });
                 }
+                else {
+                    renderer_1.RenderInternals.Log.verbose(`Rendered ${renderedFrames} frames, encoded ${encodedFrames} frames, stage = ${stitchStage}`);
+                }
                 const allFrames = renderer_1.RenderInternals.getFramesToRender(params.frameRange, params.everyNthFrame);
                 if (renderedFrames === allFrames.length) {
                     console.log('Rendered all frames!');
@@ -242,11 +244,14 @@ const rendererHandler = async (params, options) => {
         }
         // If this error is encountered, we can just retry as it
         // is a very rare error to occur
-        const isBrowserError = err.message.includes('FATAL:zygote_communication_linux.cc') ||
-            err.message.includes('error while loading shared libraries: libnss3.so');
+        const isRetryableError = err.message.includes('FATAL:zygote_communication_linux.cc') ||
+            err.message.includes('error while loading shared libraries: libnss3.so') ||
+            err.message.includes('but the server sent no data') ||
+            err.message.includes('Timed out while setting up the headless browser');
         const shouldNotRetry = err.name === 'CancelledError';
-        const willRetry = (isBrowserError || params.retriesLeft > 0) && !shouldNotRetry;
-        console.log('Error occurred');
+        const isFatal = !isRetryableError;
+        const willRetry = isRetryableError && params.retriesLeft > 0 && !shouldNotRetry;
+        console.log(`Error occurred (will retry = ${String(willRetry)})`);
         console.log(err);
         await (0, write_lambda_error_1.writeLambdaError)({
             bucketName: params.bucketName,
@@ -257,7 +262,7 @@ const rendererHandler = async (params, options) => {
                 chunk: params.chunk,
                 frame: null,
                 type: 'renderer',
-                isFatal: !isBrowserError,
+                isFatal,
                 tmpDir: (0, write_lambda_error_1.getTmpDirStateIfENoSp)(err.stack),
                 attempt: params.attempt,
                 totalAttempts: params.retriesLeft + params.attempt,

package/dist/shared/compress-props.d.ts

@@ -2,7 +2,7 @@ import type { AwsRegion } from '../client';
 import type { SerializedInputProps } from './constants';
 type PropsType = 'input-props' | 'resolved-props';
 export declare const serializeOrThrow: (inputProps: Record<string, unknown>, propsType: PropsType) => string;
-export declare const getNeedsToUpload: (type: 'still' | 'video-or-audio', stringifiedInputProps: string) => boolean;
+export declare const getNeedsToUpload: (type: 'still' | 'video-or-audio', sizes: number[]) => boolean;
 export declare const compressInputProps: ({ stringifiedInputProps, region, userSpecifiedBucketName, propsType, needsToUpload, }: {
     stringifiedInputProps: string;
     region: AwsRegion;

package/dist/shared/compress-props.js

@@ -21,10 +21,12 @@ const serializeOrThrow = (inputProps, propsType) => {
     }
 };
 exports.serializeOrThrow = serializeOrThrow;
-const getNeedsToUpload = (type, stringifiedInputProps) => {
-    const MAX_INLINE_PAYLOAD_SIZE = type === 'still' ? 5000000 : 200000;
-    if (stringifiedInputProps.length > MAX_INLINE_PAYLOAD_SIZE) {
-        console.warn(`Warning: The props are over ${Math.round(MAX_INLINE_PAYLOAD_SIZE / 1000)}KB (${Math.ceil(stringifiedInputProps.length / 1024)}KB) in size. Uploading them to S3 to circumvent AWS Lambda payload size, which may lead to slowdown.`);
+const getNeedsToUpload = (type, sizes) => {
+    const MARGIN = 5000;
+    const MAX_INLINE_PAYLOAD_SIZE = (type === 'still' ? 5000000 : 200000) - MARGIN;
+    const sizesAlreadyUsed = sizes.reduce((a, b) => a + b);
+    if (sizesAlreadyUsed > MAX_INLINE_PAYLOAD_SIZE) {
+        console.warn(`Warning: The props are over ${Math.round(MAX_INLINE_PAYLOAD_SIZE / 1000)}KB (${Math.ceil(sizesAlreadyUsed / 1024)}KB) in size. Uploading them to S3 to circumvent AWS Lambda payload size, which may lead to slowdown.`);
         return true;
     }
     return false;

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

@@ -38,9 +38,10 @@ export declare const mockableHttpClients: {
     http: typeof http.request;
     https: typeof https.request;
 };
-export declare function invokeWebhook({ payload, secret, url, }: {
+type InvokeWebhookOptions = {
     payload: WebhookPayload;
     url: string;
     secret: string | null;
-}): Promise<void>;
+};
+export declare const invokeWebhook: (options: InvokeWebhookOptions, retries?: number, errors?: number) => Promise<void>;
 export {};

package/dist/shared/invoke-webhook.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invokeWebhook = exports.mockableHttpClients = exports.calculateSignature = void 0;
+const renderer_1 = require("@remotion/renderer");
 const https_1 = __importDefault(require("https"));
 const Crypto = __importStar(require("node:crypto"));
 const node_http_1 = __importDefault(require("node:http"));
@@ -59,7 +60,7 @@ exports.mockableHttpClients = {
     http: node_http_1.default.request,
     https: https_1.default.request,
 };
-function invokeWebhook({ payload, secret, url, }) {
+function invokeWebhookRaw({ payload, secret, url, }) {
     const jsonPayload = JSON.stringify(payload);
     return new Promise((resolve, reject) => {
         const req = getWebhookClient(url)(url, {
@@ -86,4 +87,26 @@ function invokeWebhook({ payload, secret, url, }) {
         req.end();
     });
 }
+function exponentialBackoff(errorCount) {
+    return 1000 * 2 ** (errorCount - 1);
+}
+const invokeWebhook = async (options, retries = 2, errors = 0) => {
+    try {
+        await invokeWebhookRaw(options);
+    }
+    catch (err) {
+        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.`);
+        await new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, exponentialBackoff(errors));
+        });
+        return (0, exports.invokeWebhook)(options, retries - 1, errors + 1);
+    }
+};
 exports.invokeWebhook = invokeWebhook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.8",
+  "version": "4.0.11",
   "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.8",
-    "@remotion/renderer": "4.0.8",
-    "remotion": "4.0.8",
-    "@remotion/cli": "4.0.8"
+    "@remotion/cli": "4.0.11",
+    "@remotion/renderer": "4.0.11",
+    "@remotion/bundler": "4.0.11",
+    "remotion": "4.0.11"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
@@ -44,11 +44,11 @@
     "typescript": "4.9.5",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.8",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.8"
+    "@remotion/bundler": "4.0.11",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.11"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.8"
+    "@remotion/bundler": "4.0.11"
   },
   "publishConfig": {
     "access": "public"