@remotion/lambda 4.0.168 → 4.0.169

package/dist/api/deploy-site.d.ts

@@ -59,11 +59,11 @@ export declare const internalDeploySite: (args_0: MandatoryParameters & {
         getValue: ({ commandLine }: {
             commandLine: Record<string, unknown>;
         }) => {
-            value: "error" | "verbose" | "info" | "warn";
+            value: "verbose" | "info" | "warn" | "error";
             source: string;
         };
-        setConfig: (newLogLevel: "error" | "verbose" | "info" | "warn") => void;
-        type: "error" | "verbose" | "info" | "warn";
+        setConfig: (newLogLevel: "verbose" | "info" | "warn" | "error") => void;
+        type: "verbose" | "info" | "warn" | "error";
     };
     readonly throwIfSiteExists: {
         cliFlag: string;

package/dist/functions/helpers/cleanup-props.d.ts

@@ -0,0 +1,5 @@
+import type { SerializedInputProps } from '../../defaults';
+export declare const cleanupProps: ({ serializedResolvedProps, inputProps, }: {
+    serializedResolvedProps: SerializedInputProps;
+    inputProps: SerializedInputProps;
+}) => Promise<[number, number]>;

package/dist/functions/helpers/cleanup-props.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupProps = void 0;
+const cleanup_serialized_input_props_1 = require("../../shared/cleanup-serialized-input-props");
+const get_current_region_1 = require("./get-current-region");
+const cleanupProps = ({ serializedResolvedProps, inputProps, }) => {
+    const cleanupSerializedInputPropsProm = (0, cleanup_serialized_input_props_1.cleanupSerializedInputProps)({
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        serialized: inputProps,
+    });
+    const cleanupResolvedInputPropsProm = (0, cleanup_serialized_input_props_1.cleanupSerializedResolvedProps)({
+        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        serialized: serializedResolvedProps,
+    });
+    return Promise.all([
+        cleanupSerializedInputPropsProm,
+        cleanupResolvedInputPropsProm,
+    ]);
+};
+exports.cleanupProps = cleanupProps;

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/helpers/merge-chunks.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeChunksAndFinishRender = void 0;
 const fs_1 = __importDefault(require("fs"));
-const cleanup_serialized_input_props_1 = require("../../shared/cleanup-serialized-input-props");
+const cleanup_props_1 = require("./cleanup-props");
 const concat_videos_1 = require("./concat-videos");
 const create_post_render_data_1 = require("./create-post-render-data");
 const get_current_region_1 = require("./get-current-region");
@@ -56,15 +56,9 @@ const mergeChunksAndFinishRender = async (options) => {
     const errorExplanations = (0, inspect_errors_1.inspectErrors)({
         errors: options.overallProgress.get().errors,
     });
-    const cleanupSerializedInputPropsProm = (0, cleanup_serialized_input_props_1.cleanupSerializedInputProps)({
-        bucketName: options.bucketName,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        serialized: options.inputProps,
-    });
-    const cleanupResolvedInputPropsProm = (0, cleanup_serialized_input_props_1.cleanupSerializedResolvedProps)({
-        bucketName: options.bucketName,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
-        serialized: options.serializedResolvedProps,
+    const cleanupProm = (0, cleanup_props_1.cleanupProps)({
+        inputProps: options.inputProps,
+        serializedResolvedProps: options.serializedResolvedProps,
     });
     const { url: outputUrl } = (0, get_output_url_from_metadata_1.getOutputUrlFromMetadata)(options.renderMetadata, options.bucketName, options.customCredentials);
     const postRenderData = (0, create_post_render_data_1.createPostRenderData)({
@@ -72,10 +66,7 @@ const mergeChunksAndFinishRender = async (options) => {
         memorySizeInMb: Number(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE),
         renderMetadata: options.renderMetadata,
         errorExplanations,
-        timeToDelete: (await Promise.all([
-            cleanupSerializedInputPropsProm,
-            cleanupResolvedInputPropsProm,
-        ])).reduce((a, b) => Math.max(a, b), 0),
+        timeToDelete: (await cleanupProm).reduce((a, b) => Math.max(a, b), 0),
         outputFile: {
             url: outputUrl,
         },

package/dist/functions/launch.js

@@ -15,6 +15,7 @@ const validate_outname_1 = require("../shared/validate-outname");
 const validate_privacy_1 = require("../shared/validate-privacy");
 const plan_frame_ranges_1 = require("./chunk-optimization/plan-frame-ranges");
 const best_frames_per_lambda_param_1 = require("./helpers/best-frames-per-lambda-param");
+const cleanup_props_1 = require("./helpers/cleanup-props");
 const expected_out_name_1 = require("./helpers/expected-out-name");
 const find_output_file_in_bucket_1 = require("./helpers/find-output-file-in-bucket");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
@@ -24,7 +25,7 @@ const overall_render_progress_1 = require("./helpers/overall-render-progress");
 const stream_renderer_1 = require("./helpers/stream-renderer");
 const validate_composition_1 = require("./helpers/validate-composition");
 const write_lambda_error_1 = require("./helpers/write-lambda-error");
-const innerLaunchHandler = async ({ functionName, params, options, overallProgress, }) => {
+const innerLaunchHandler = async ({ functionName, params, options, overallProgress, registerCleanupTask, }) => {
     var _a, _b, _c, _d, _e;
     if (params.type !== constants_1.LambdaRoutines.launch) {
         throw new Error('Expected launch type');
@@ -119,6 +120,12 @@ const innerLaunchHandler = async ({ functionName, params, options, overallProgre
         userSpecifiedBucketName: params.bucketName,
         needsToUpload,
     });
+    registerCleanupTask(() => {
+        return (0, cleanup_props_1.cleanupProps)({
+            serializedResolvedProps,
+            inputProps: params.inputProps,
+        });
+    });
     const fps = comp.fps / params.everyNthFrame;
     // If for 150 functions, we stream every frame, we DDos ourselves.
     // Throttling a bit, allowing more progress if there is lower concurrency.
@@ -282,6 +289,10 @@ const launchHandler = async (params, options) => {
         indent: false,
         logLevel: params.logLevel,
     };
+    const cleanupTasks = [];
+    const registerCleanupTask = (task) => {
+        cleanupTasks.push(task);
+    };
     const onTimeout = async () => {
         var _a;
         renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Function is about to time out. Can not finish render.');
@@ -291,6 +302,13 @@ const launchHandler = async (params, options) => {
         if (webhookInvoked) {
             return;
         }
+        Promise.all(cleanupTasks)
+            .then(() => {
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel: params.logLevel }, 'Ran cleanup tasks');
+        })
+            .catch((err) => {
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel: params.logLevel }, 'Failed to run cleanup tasks:', err);
+        });
         try {
             await (0, invoke_webhook_1.invokeWebhook)({
                 url: params.webhook.url,
@@ -345,6 +363,7 @@ const launchHandler = async (params, options) => {
             params,
             options,
             overallProgress,
+            registerCleanupTask,
         });
         clearTimeout(webhookDueToTimeout);
         if (!params.webhook || webhookInvoked) {

package/dist/functions/still.js

@@ -191,7 +191,6 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
     await Promise.all([
         node_fs_1.default.promises.rm(outputPath, { recursive: true }),
         (0, cleanup_serialized_input_props_1.cleanupSerializedInputProps)({
-            bucketName,
             region: (0, get_current_region_1.getCurrentRegionInFunction)(),
             serialized: lambdaParams.inputProps,
         }),

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, encodingMaxRate, encodingBufferSize, downloadBehavior, muted, overwrite, jpegQuality, offthreadVideoCacheSizeInBytes, deleteAfter, colorSpace, preferLossless, }: import("./api/make-lambda-payload").InnerRenderMediaOnLambdaInput) => Promise<import("./defaults").LambdaStartPayload>;
     getRenderProgressPayload: ({ bucketName, renderId, s3OutputProvider, logLevel, }: import("./client").GetRenderProgressInput) => import("./defaults").LambdaStatusPayload;
     makeLambdaRenderStillPayload: ({ serveUrl, inputProps, imageFormat, envVariables, quality, jpegQuality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, downloadBehavior, forceHeight, forceWidth, forceBucketName, offthreadVideoCacheSizeInBytes, deleteAfter, }: import("./api/render-still-on-lambda").RenderStillOnLambdaNonNullInput) => Promise<{
@@ -14,7 +14,7 @@ export declare const LambdaInternals: {
         maxRetries: number;
         frame: number;
         privacy: import("./defaults").Privacy;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         outName: import("./defaults").OutNameInput | null;
         timeoutInMilliseconds: number;
         chromiumOptions: import("@remotion/renderer").ChromiumOptions;
@@ -57,11 +57,11 @@ export declare const LambdaInternals: {
             getValue: ({ commandLine }: {
                 commandLine: Record<string, unknown>;
             }) => {
-                value: "error" | "verbose" | "info" | "warn";
+                value: "verbose" | "info" | "warn" | "error";
                 source: string;
             };
-            setConfig: (newLogLevel: "error" | "verbose" | "info" | "warn") => void;
-            type: "error" | "verbose" | "info" | "warn";
+            setConfig: (newLogLevel: "verbose" | "info" | "warn" | "error") => void;
+            type: "verbose" | "info" | "warn" | "error";
         };
         readonly throwIfSiteExists: {
             cliFlag: string;

package/dist/shared/cleanup-serialized-input-props.d.ts

@@ -1,12 +1,10 @@
 import type { AwsRegion } from '../client';
 import type { SerializedInputProps } from './constants';
-export declare const cleanupSerializedInputProps: ({ serialized, region, bucketName, }: {
+export declare const cleanupSerializedInputProps: ({ serialized, region, }: {
     serialized: SerializedInputProps;
     region: AwsRegion;
-    bucketName: string;
 }) => Promise<number>;
-export declare const cleanupSerializedResolvedProps: ({ serialized, region, bucketName, }: {
+export declare const cleanupSerializedResolvedProps: ({ serialized, region, }: {
     serialized: SerializedInputProps;
     region: AwsRegion;
-    bucketName: string;
 }) => Promise<number>;

package/dist/shared/cleanup-serialized-input-props.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanupSerializedResolvedProps = exports.cleanupSerializedInputProps = void 0;
 const io_1 = require("../functions/helpers/io");
 const constants_1 = require("./constants");
-const cleanupSerializedInputProps = async ({ serialized, region, bucketName, }) => {
+const cleanupSerializedInputProps = async ({ serialized, region, }) => {
     if (serialized.type === 'payload') {
         return 0;
     }
     const time = Date.now();
     await (0, io_1.lambdaDeleteFile)({
-        bucketName,
+        bucketName: serialized.bucketName,
         key: (0, constants_1.inputPropsKey)(serialized.hash),
         region,
         customCredentials: null,
@@ -17,13 +17,13 @@ const cleanupSerializedInputProps = async ({ serialized, region, bucketName, })
     return Date.now() - time;
 };
 exports.cleanupSerializedInputProps = cleanupSerializedInputProps;
-const cleanupSerializedResolvedProps = async ({ serialized, region, bucketName, }) => {
+const cleanupSerializedResolvedProps = async ({ serialized, region, }) => {
     if (serialized.type === 'payload') {
         return 0;
     }
     const time = Date.now();
     await (0, io_1.lambdaDeleteFile)({
-        bucketName,
+        bucketName: serialized.bucketName,
         key: (0, constants_1.resolvedPropsKey)(serialized.hash),
         region,
         customCredentials: null,

package/dist/shared/compress-props.js

@@ -60,6 +60,7 @@ const compressInputProps = async ({ stringifiedInputProps, region, userSpecified
         return {
             type: 'bucket-url',
             hash,
+            bucketName,
         };
     }
     return {

package/dist/shared/constants.d.ts

@@ -52,7 +52,6 @@ export declare const getSitesKey: (siteId: string) => string;
 export declare const outName: (renderId: string, extension: string) => string;
 export declare const outStillName: (renderId: string, imageFormat: StillImageFormat) => string;
 export declare const customOutName: (renderId: string, bucketName: string, name: OutNameInput) => OutNameOutput;
-export declare const defaultPropsKey: (hash: string) => string;
 export declare const inputPropsKey: (hash: string) => string;
 export declare const resolvedPropsKey: (hash: string) => string;
 export declare const RENDERER_PATH_TOKEN = "remotion-bucket";
@@ -80,6 +79,7 @@ export type WebhookOption = Prettify<null | ({
 export type SerializedInputProps = {
     type: 'bucket-url';
     hash: string;
+    bucketName: string;
 } | {
     type: 'payload';
     payload: string;

package/dist/shared/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.resolvedPropsKey = exports.inputPropsKey = exports.defaultPropsKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.overallProgressKey = exports.rendersPrefix = exports.LAMBDA_INSIGHTS_PREFIX = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
+exports.LAMBDA_CONCURRENCY_LIMIT_QUOTA = exports.LambdaRoutines = exports.REMOTION_FILELIST_TOKEN = exports.REMOTION_CONCATED_TOKEN = exports.CONCAT_FOLDER_TOKEN = exports.RENDERER_PATH_TOKEN = exports.resolvedPropsKey = exports.inputPropsKey = exports.customOutName = exports.outStillName = exports.outName = exports.getSitesKey = exports.overallProgressKey = exports.rendersPrefix = exports.LAMBDA_INSIGHTS_PREFIX = exports.LOG_GROUP_PREFIX = exports.RENDER_FN_PREFIX = exports.REMOTION_BUCKET_PREFIX = exports.DEFAULT_CLOUDWATCH_RETENTION_PERIOD = exports.DEFAULT_OUTPUT_PRIVACY = exports.MAX_EPHEMERAL_STORAGE_IN_MB = exports.MIN_EPHEMERAL_STORAGE_IN_MB = exports.DEFAULT_EPHEMERAL_STORAGE_IN_MB = exports.MAX_FUNCTIONS_PER_RENDER = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_REGION = exports.COMMAND_NOT_FOUND = exports.BINARY_NAME = exports.DEFAULT_FRAMES_PER_LAMBDA = exports.MINIMUM_FRAMES_PER_LAMBDA = exports.MAX_TIMEOUT = exports.MIN_TIMEOUT = exports.DEFAULT_TIMEOUT = exports.DEFAULT_MEMORY_SIZE = exports.MAX_MEMORY = exports.MIN_MEMORY = void 0;
 exports.MIN_MEMORY = 512;
 exports.MAX_MEMORY = 10240;
 exports.DEFAULT_MEMORY_SIZE = 2048;
@@ -49,10 +49,6 @@ const customOutName = (renderId, bucketName, name) => {
     };
 };
 exports.customOutName = customOutName;
-const defaultPropsKey = (hash) => {
-    return `default-props/${hash}.json`;
-};
-exports.defaultPropsKey = defaultPropsKey;
 const inputPropsKey = (hash) => {
     return `input-props/${hash}.json`;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/lambda",
-  "version": "4.0.168",
+  "version": "4.0.169",
   "description": "Distributed renderer for Remotion based on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -22,11 +22,11 @@
     "@aws-sdk/s3-request-presigner": "3.583.0",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.168",
-    "@remotion/cli": "4.0.168",
-    "@remotion/streaming": "4.0.168",
-    "@remotion/renderer": "4.0.168",
-    "remotion": "4.0.168"
+    "@remotion/bundler": "4.0.169",
+    "@remotion/cli": "4.0.169",
+    "@remotion/renderer": "4.0.169",
+    "@remotion/streaming": "4.0.169",
+    "remotion": "4.0.169"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.281",
@@ -42,11 +42,11 @@
     "ts-node": "10.9.2",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.168",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.168"
+    "@remotion/bundler": "4.0.169",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.169"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.168"
+    "@remotion/bundler": "4.0.169"
   },
   "publishConfig": {
     "access": "public"