@remotion/lambda 4.0.220 → 4.0.223

package/build.ts

@@ -0,0 +1,60 @@
+import {BundlerInternals} from '@remotion/bundler';
+import {dir} from '@remotion/compositor-linux-arm64-gnu';
+import fs, {cpSync, readdirSync} from 'node:fs';
+import path from 'node:path';
+import {FUNCTION_ZIP_ARM64} from './src/shared/function-zip-path';
+
+import zl from 'zip-lib';
+
+const outdir = path.join(__dirname, `build-render`);
+fs.mkdirSync(outdir, {
+	recursive: true,
+});
+const outfile = path.join(outdir, 'index.js');
+
+fs.rmSync(outdir, {recursive: true});
+fs.mkdirSync(outdir, {recursive: true});
+const template = require.resolve(
+	path.join(__dirname, 'src', 'functions', 'index'),
+);
+
+await BundlerInternals.esbuild.build({
+	platform: 'node',
+	target: 'node16',
+	bundle: true,
+	outfile,
+	entryPoints: [template],
+	treeShaking: true,
+	external: [],
+});
+
+const filesInCwd = readdirSync(dir);
+const filesToCopy = filesInCwd.filter(
+	(f) =>
+		f.startsWith('remotion') ||
+		f.endsWith('.so') ||
+		f.endsWith('.dll') ||
+		f.endsWith('.dylib') ||
+		f.startsWith('ffmpeg') ||
+		f.startsWith('ffprobe'),
+);
+for (const file of filesToCopy) {
+	cpSync(path.join(dir, file), path.join(outdir, file));
+}
+
+fs.cpSync(
+	path.join(
+		__dirname,
+		'..',
+		'renderer',
+		'node_modules',
+		'source-map',
+		'lib',
+		'mappings.wasm',
+	),
+	`${outdir}/mappings.wasm`,
+);
+await zl.archiveFolder(outdir, FUNCTION_ZIP_ARM64);
+
+fs.rmSync(outdir, {recursive: true});
+console.log('Bundled Lambda');

package/dist/api/get-render-progress.js

@@ -38,6 +38,7 @@ const getRenderProgress = async (input) => {
             providerSpecifics: aws_implementation_1.awsImplementation,
             memorySizeInMb: parsed.memorySizeInMb,
             timeoutInMilliseconds: parsed.timeoutInSeconds * 1000,
+            functionName: input.functionName,
         });
     }
     const result = await (0, call_lambda_1.callLambda)({

package/dist/cli/log.d.ts

@@ -1,10 +1,10 @@
 export declare const Log: {
-    verbose: (options: import("@remotion/renderer").LogOptions & {
+    verbose: (options: import("@remotion/renderer/dist/logger").LogOptions & {
         tag?: string;
     }, ...args: Parameters<typeof console.log>) => void;
     info: (options: import("@remotion/renderer").LogOptions, ...args: Parameters<typeof console.log>) => void;
-    warn: (options: import("@remotion/renderer").LogOptions, ...args: Parameters<typeof console.log>) => void;
-    error: (options: import("@remotion/renderer").LogOptions & {
+    warn: (options: import("@remotion/renderer/dist/logger").LogOptions, ...args: Parameters<typeof console.log>) => void;
+    error: (options: import("@remotion/renderer/dist/logger").LogOptions & {
         tag?: string;
     }, ...args: Parameters<typeof console.log>) => void;
 };

package/dist/functions/aws-implementation.js

@@ -2,7 +2,7 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.awsImplementation = void 0;
-const node_stream_1 = require("node:stream");
+const node_events_1 = require("node:events");
 const bucket_exists_1 = require("../api/bucket-exists");
 const create_bucket_1 = require("../api/create-bucket");
 const get_buckets_1 = require("../api/get-buckets");
@@ -23,7 +23,7 @@ if (/^AWS_Lambda_nodejs(?:18|20)[.]x$/.test((_a = process.env.AWS_EXECUTION_ENV)
     process.env.DISABLE_FROM_SURFACE = '1';
     process.env.NO_COLOR = '1';
     // @ts-expect-error
-    globalThis._dumpUnreleasedBuffers = new node_stream_1.EventEmitter();
+    globalThis._dumpUnreleasedBuffers = new node_events_1.EventEmitter();
     // @ts-expect-error
     globalThis._dumpUnreleasedBuffers.setMaxListeners(201);
 }

package/dist/functions/helpers/get-current-region.js

@@ -4,7 +4,7 @@ exports.getCurrentRegionInFunctionImplementation = void 0;
 const is_in_lambda_1 = require("../../shared/is-in-lambda");
 const getCurrentRegionInFunctionImplementation = () => {
     if (!(0, is_in_lambda_1.isInsideLambda)()) {
-        throw new Error('Should not call getCurrentRegion() if not inside a lambda function');
+        throw new Error('Should not call getCurrentRegionInFunctionImplementation() if not inside a lambda function');
     }
     if (!process.env.AWS_REGION) {
         throw new Error('Expected process.env.AWS_REGION to be defined');

package/dist/functions/helpers/get-progress.d.ts

@@ -1,7 +1,7 @@
 import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
 import { type CustomCredentials } from '@remotion/serverless/client';
 import type { GenericRenderProgress } from '../../shared/constants';
-export declare const getProgress: <Provider extends CloudProvider>({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, providerSpecifics, forcePathStyle, }: {
+export declare const getProgress: <Provider extends CloudProvider>({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, providerSpecifics, forcePathStyle, functionName, }: {
     bucketName: string;
     renderId: string;
     expectedBucketOwner: string | null;
@@ -11,4 +11,5 @@ export declare const getProgress: <Provider extends CloudProvider>({ bucketName,
     customCredentials: CustomCredentials<Provider> | null;
     providerSpecifics: ProviderSpecifics<Provider>;
     forcePathStyle: boolean;
+    functionName: string;
 }) => Promise<GenericRenderProgress<Provider>>;

package/dist/functions/helpers/get-progress.js

@@ -13,7 +13,7 @@ const get_overall_progress_s3_1 = require("./get-overall-progress-s3");
 const inspect_errors_1 = require("./inspect-errors");
 const make_timeout_error_1 = require("./make-timeout-error");
 const render_has_audio_video_1 = require("./render-has-audio-video");
-const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, providerSpecifics, forcePathStyle, }) => {
+const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region, memorySizeInMb, timeoutInMilliseconds, customCredentials, providerSpecifics, forcePathStyle, functionName, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const overallProgress = await (0, get_overall_progress_s3_1.getOverallProgressS3)({
         renderId,
@@ -184,7 +184,8 @@ const getProgress = async ({ bucketName, renderId, expectedBucketOwner, region,
                 renderMetadata,
                 renderId,
                 missingChunks: missingChunks !== null && missingChunks !== void 0 ? missingChunks : [],
-                providerSpecifics,
+                region,
+                functionName,
             })
             : null,
         ...errorExplanations,

package/dist/functions/helpers/make-timeout-error.d.ts

@@ -1,9 +1,10 @@
-import type { CloudProvider, EnhancedErrorInfo, ProviderSpecifics } from '@remotion/serverless';
+import type { CloudProvider, EnhancedErrorInfo } from '@remotion/serverless';
 import type { RenderMetadata } from '@remotion/serverless/client';
-export declare const makeTimeoutError: <Provider extends CloudProvider>({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }: {
+export declare const makeTimeoutError: <Provider extends CloudProvider>({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, functionName, region, }: {
     timeoutInMilliseconds: number;
     renderMetadata: RenderMetadata<Provider>;
     renderId: string;
     missingChunks: number[];
-    providerSpecifics: ProviderSpecifics<Provider>;
+    functionName: string;
+    region: Provider["region"];
 }) => EnhancedErrorInfo;

package/dist/functions/helpers/make-timeout-error.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTimeoutError = void 0;
 const make_timeout_message_1 = require("./make-timeout-message");
-const makeTimeoutError = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }) => {
+const makeTimeoutError = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, functionName, region, }) => {
     const message = (0, make_timeout_message_1.makeTimeoutMessage)({
         missingChunks,
         renderMetadata,
         timeoutInMilliseconds,
         renderId,
-        providerSpecifics,
+        functionName,
+        region,
     });
     const error = new Error(message);
     return {

package/dist/functions/helpers/make-timeout-message.d.ts

@@ -1,9 +1,10 @@
-import type { CloudProvider, ProviderSpecifics } from '@remotion/serverless';
+import type { CloudProvider } from '@remotion/serverless';
 import type { RenderMetadata } from '@remotion/serverless/client';
-export declare const makeTimeoutMessage: <Provider extends CloudProvider>({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }: {
+export declare const makeTimeoutMessage: <Provider extends CloudProvider>({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, functionName, region, }: {
     timeoutInMilliseconds: number;
     missingChunks: number[];
     renderMetadata: RenderMetadata<Provider>;
     renderId: string;
-    providerSpecifics: ProviderSpecifics<Provider>;
+    region: Provider["region"];
+    functionName: string;
 }) => string;

package/dist/functions/helpers/make-timeout-message.js

@@ -5,7 +5,7 @@ const client_1 = require("@remotion/serverless/client");
 const docs_url_1 = require("../../shared/docs-url");
 const get_aws_urls_1 = require("../../shared/get-aws-urls");
 const MAX_MISSING_CHUNKS = 5;
-const makeChunkMissingMessage = ({ missingChunks, renderMetadata, providerSpecifics, }) => {
+const makeChunkMissingMessage = ({ missingChunks, renderMetadata, region, }) => {
     if (missingChunks.length === 0) {
         return 'All chunks have been successfully rendered, but the main function has timed out.';
     }
@@ -25,7 +25,7 @@ const makeChunkMissingMessage = ({ missingChunks, renderMetadata, providerSpecif
                 msg,
                 `▸ Logs for chunk ${ch}: ${(0, get_aws_urls_1.getCloudwatchRendererUrl)({
                     functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
-                    region: providerSpecifics.getCurrentRegionInFunction(),
+                    region: region,
                     rendererFunctionName: null,
                     renderId: renderMetadata.renderId,
                     chunk: ch,
@@ -35,24 +35,28 @@ const makeChunkMissingMessage = ({ missingChunks, renderMetadata, providerSpecif
             .slice(0, 5),
     ].join('\n');
 };
-const makeTimeoutMessage = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, providerSpecifics, }) => {
+const makeTimeoutMessage = ({ timeoutInMilliseconds, missingChunks, renderMetadata, renderId, functionName, region, }) => {
     const cloudWatchRendererUrl = (0, get_aws_urls_1.getCloudwatchRendererUrl)({
         renderId,
-        functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
-        region: providerSpecifics.getCurrentRegionInFunction(),
-        rendererFunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+        functionName,
+        region: region,
+        rendererFunctionName: functionName,
         chunk: null,
     });
     const cloudWatchLaunchUrl = (0, get_aws_urls_1.getCloudwatchMethodUrl)({
         renderId,
-        functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+        functionName,
         method: client_1.ServerlessRoutines.launch,
-        region: providerSpecifics.getCurrentRegionInFunction(),
-        rendererFunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+        region: region,
+        rendererFunctionName: functionName,
     });
     const message = [
         `The main function timed out after ${timeoutInMilliseconds}ms.`,
-        makeChunkMissingMessage({ missingChunks, renderMetadata, providerSpecifics }),
+        makeChunkMissingMessage({
+            missingChunks,
+            renderMetadata,
+            region,
+        }),
         '',
         `Consider increasing the timeout of your function.`,
         `▸ You can use the "--timeout" parameter when deploying a function via CLI, or the "timeoutInSeconds" parameter when using the deployFunction() API.`,

package/dist/functions/launch.js

@@ -22,7 +22,7 @@ const overall_render_progress_1 = require("./helpers/overall-render-progress");
 const stream_renderer_1 = require("./helpers/stream-renderer");
 const timer_1 = require("./helpers/timer");
 const innerLaunchHandler = async ({ functionName, params, options, overallProgress, registerCleanupTask, providerSpecifics, }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (params.type !== client_1.ServerlessRoutines.launch) {
         throw new Error('Expected launch type');
     }
@@ -230,10 +230,14 @@ const innerLaunchHandler = async ({ functionName, params, options, overallProgre
         muted: params.muted,
         metadata: params.metadata,
         functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+        dimensions: {
+            width: comp.width * ((_d = params.scale) !== null && _d !== void 0 ? _d : 1),
+            height: comp.height * ((_e = params.scale) !== null && _e !== void 0 ? _e : 1),
+        },
     };
     const { key, renderBucketName, customCredentials } = (0, client_1.getExpectedOutName)(renderMetadata, params.bucketName, typeof params.outName === 'string' || typeof params.outName === 'undefined'
         ? null
-        : ((_e = (_d = params.outName) === null || _d === void 0 ? void 0 : _d.s3OutputProvider) !== null && _e !== void 0 ? _e : null));
+        : ((_g = (_f = params.outName) === null || _f === void 0 ? void 0 : _f.s3OutputProvider) !== null && _g !== void 0 ? _g : null));
     if (!params.overwrite) {
         const findOutputFile = (0, timer_1.timer)('Checking if output file already exists', params.logLevel);
         const output = await (0, find_output_file_in_bucket_1.findOutputFileInBucket)({

package/dist/functions/progress.js

@@ -26,6 +26,7 @@ const progressHandler = async (lambdaParams, options) => {
             customCredentials: (_a = lambdaParams.s3OutputProvider) !== null && _a !== void 0 ? _a : null,
             providerSpecifics: options.providerSpecifics,
             forcePathStyle: lambdaParams.forcePathStyle,
+            functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
         });
         return progress;
     }

package/dist/functions/still.js

@@ -22,7 +22,7 @@ const get_output_url_from_metadata_1 = require("./helpers/get-output-url-from-me
 const on_downloads_logger_1 = require("./helpers/on-downloads-logger");
 const overall_render_progress_1 = require("./helpers/overall-render-progress");
 const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, renderId, onStream, timeoutInMilliseconds, providerSpecifics, }, cleanup) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (lambdaParams.type !== client_1.ServerlessRoutines.still) {
         throw new TypeError('Expected still type');
     }
@@ -132,6 +132,10 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         audioBitrate: null,
         metadata: null,
         functionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
+        dimensions: {
+            height: composition.height * ((_d = lambdaParams.scale) !== null && _d !== void 0 ? _d : 1),
+            width: composition.width * ((_e = lambdaParams.scale) !== null && _e !== void 0 ? _e : 1),
+        },
     };
     const still = (0, overall_render_progress_1.makeInitialOverallRenderProgress)(timeoutInMilliseconds);
     still.renderMetadata = renderMetadata;
@@ -188,7 +192,7 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         composition,
         output: outputPath,
         serveUrl,
-        envVariables: (_d = lambdaParams.envVariables) !== null && _d !== void 0 ? _d : {},
+        envVariables: (_f = lambdaParams.envVariables) !== null && _f !== void 0 ? _f : {},
         frame: renderer_1.RenderInternals.convertToPositiveFrameIndex({
             frame: lambdaParams.frame,
             durationInFrames: composition.durationInFrames,
@@ -197,7 +201,7 @@ const innerStillHandler = async ({ params: lambdaParams, expectedBucketOwner, re
         serializedInputPropsWithCustomSchema,
         overwrite: false,
         puppeteerInstance: browserInstance.instance,
-        jpegQuality: (_e = lambdaParams.jpegQuality) !== null && _e !== void 0 ? _e : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
+        jpegQuality: (_g = lambdaParams.jpegQuality) !== null && _g !== void 0 ? _g : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
         chromiumOptions: lambdaParams.chromiumOptions,
         scale: lambdaParams.scale,
         timeoutInMilliseconds: lambdaParams.timeoutInMilliseconds,

package/dist/index.d.ts

@@ -25,7 +25,6 @@ import { getFunctions } from './api/get-functions';
 import { getOrCreateBucket } from './api/get-or-create-bucket';
 import { getRegions } from './api/get-regions';
 import type { GetRenderProgressInput } from './api/get-render-progress';
-import { getRenderProgress } from './api/get-render-progress';
 import type { GetSitesInput, GetSitesOutput } from './api/get-sites';
 import type { SimulatePermissionsInput, SimulatePermissionsOutput } from './api/iam-validation/simulate';
 import { simulatePermissions } from './api/iam-validation/simulate';
@@ -42,6 +41,10 @@ import type { WebhookPayload } from './shared/invoke-webhook';
  * @deprecated Import this from `@remotion/lambda/client` instead
  */
 declare const renderMediaOnLambda: (options: RenderMediaOnLambdaInput) => Promise<RenderMediaOnLambdaOutput>;
+/**
+ * @deprecated Import this from `@remotion/lambda/client` instead
+ */
+declare const getRenderProgress: (input: GetRenderProgressInput) => Promise<RenderProgress>;
 /**
  * @deprecated Import this from `@remotion/lambda/client` instead
  */

package/dist/index.js

@@ -28,7 +28,6 @@ Object.defineProperty(exports, "getOrCreateBucket", { enumerable: true, get: fun
 const get_regions_1 = require("./api/get-regions");
 Object.defineProperty(exports, "getRegions", { enumerable: true, get: function () { return get_regions_1.getRegions; } });
 const get_render_progress_1 = require("./api/get-render-progress");
-Object.defineProperty(exports, "getRenderProgress", { enumerable: true, get: function () { return get_render_progress_1.getRenderProgress; } });
 const get_sites_1 = require("./api/get-sites");
 const simulate_1 = require("./api/iam-validation/simulate");
 Object.defineProperty(exports, "simulatePermissions", { enumerable: true, get: function () { return simulate_1.simulatePermissions; } });
@@ -48,6 +47,11 @@ Object.defineProperty(exports, "LambdaInternals", { enumerable: true, get: funct
  */
 const renderMediaOnLambda = render_media_on_lambda_1.renderMediaOnLambda;
 exports.renderMediaOnLambda = renderMediaOnLambda;
+/**
+ * @deprecated Import this from `@remotion/lambda/client` instead
+ */
+const getRenderProgress = get_render_progress_1.getRenderProgress;
+exports.getRenderProgress = getRenderProgress;
 /**
  * @deprecated Import this from `@remotion/lambda/client` instead
  */

package/dist/shared/is-flaky-error.js

@@ -58,6 +58,7 @@ const isFlakyError = (err) => {
         message.includes('ECONNRESET') ||
         message.includes('ERR_CONNECTION_TIMED_OUT') ||
         message.includes('ERR_NETWORK_CHANGED') ||
+        message.includes('A network error occurred') ||
         message.includes('socket hang up')) {
         return true;
     }

package/package.json

@@ -3,7 +3,7 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/lambda"
   },
   "name": "@remotion/lambda",
-  "version": "4.0.220",
+  "version": "4.0.223",
   "description": "Render Remotion videos on AWS Lambda",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -22,13 +22,13 @@
     "@aws-sdk/s3-request-presigner": "3.645.0",
     "mime-types": "2.1.34",
     "zod": "3.22.3",
-    "@remotion/bundler": "4.0.220",
-    "@remotion/renderer": "4.0.220",
-    "@remotion/cli": "4.0.220",
-    "@remotion/studio-server": "4.0.220",
-    "@remotion/streaming": "4.0.220",
-    "@remotion/serverless": "4.0.220",
-    "remotion": "4.0.220"
+    "@remotion/bundler": "4.0.223",
+    "@remotion/cli": "4.0.223",
+    "@remotion/studio-server": "4.0.223",
+    "@remotion/streaming": "4.0.223",
+    "remotion": "4.0.223",
+    "@remotion/renderer": "4.0.223",
+    "@remotion/serverless": "4.0.223"
   },
   "devDependencies": {
     "@types/mime-types": "2.1.1",
@@ -37,11 +37,11 @@
     "pureimage": "0.4.13",
     "vitest": "0.31.1",
     "zip-lib": "^0.7.2",
-    "@remotion/bundler": "4.0.220",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.220"
+    "@remotion/bundler": "4.0.223",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.223"
   },
   "peerDependencies": {
-    "@remotion/bundler": "4.0.220"
+    "@remotion/bundler": "4.0.223"
   },
   "publishConfig": {
     "access": "public"
@@ -77,6 +77,6 @@
     "testintegration": "vitest src/test/integration --run",
     "lint": "eslint src --ext ts,tsx",
     "test": "vitest src/test/unit --run",
-    "make": "bun src/admin/bundle-lambda.ts"
+    "make": "bun build.ts"
   }
 }