@remotion/lambda 3.3.15 → 3.3.16

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

@@ -4,7 +4,6 @@ exports.getCompositionsOnLambda = void 0;
 const version_1 = require("remotion/version");
 const defaults_1 = require("../defaults");
 const call_lambda_1 = require("../shared/call-lambda");
-const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const serialize_input_props_1 = require("../shared/serialize-input-props");
 /**
  * @description Returns the compositions from a serveUrl
@@ -21,7 +20,6 @@ const serialize_input_props_1 = require("../shared/serialize-input-props");
  */
 const getCompositionsOnLambda = async ({ chromiumOptions, serveUrl, region, inputProps, functionName, envVariables, logLevel, timeoutInMilliseconds, }) => {
     var _a;
-    const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
     const serializedInputProps = await (0, serialize_input_props_1.serializeInputProps)({
         inputProps,
         region,
@@ -33,7 +31,7 @@ const getCompositionsOnLambda = async ({ chromiumOptions, serveUrl, region, inpu
             type: defaults_1.LambdaRoutines.compositions,
             payload: {
                 chromiumOptions: chromiumOptions !== null && chromiumOptions !== void 0 ? chromiumOptions : {},
-                serveUrl: realServeUrl,
+                serveUrl,
                 envVariables,
                 inputProps: serializedInputProps,
                 logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',

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

@@ -4,7 +4,6 @@ exports.renderVideoOnLambda = exports.renderMediaOnLambda = void 0;
 const version_1 = require("remotion/version");
 const call_lambda_1 = require("../shared/call-lambda");
 const constants_1 = require("../shared/constants");
-const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const get_aws_urls_1 = require("../shared/get-aws-urls");
 const serialize_input_props_1 = require("../shared/serialize-input-props");
 const validate_download_behavior_1 = require("../shared/validate-download-behavior");
@@ -39,14 +38,11 @@ const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec,
         durationInFrames: 1,
     });
     (0, validate_download_behavior_1.validateDownloadBehavior)(downloadBehavior);
-    const [realServeUrl, serializedInputProps] = await Promise.all([
-        (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region),
-        (0, serialize_input_props_1.serializeInputProps)({
-            inputProps,
-            region,
-            type: 'video-or-audio',
-        }),
-    ]);
+    const serializedInputProps = await (0, serialize_input_props_1.serializeInputProps)({
+        inputProps,
+        region,
+        type: 'video-or-audio',
+    });
     try {
         const res = await (0, call_lambda_1.callLambda)({
             functionName,
@@ -54,7 +50,7 @@ const renderMediaOnLambda = async ({ functionName, serveUrl, inputProps, codec,
             payload: {
                 framesPerLambda: framesPerLambda !== null && framesPerLambda !== void 0 ? framesPerLambda : null,
                 composition,
-                serveUrl: realServeUrl,
+                serveUrl,
                 inputProps: serializedInputProps,
                 codec: actualCodec,
                 imageFormat: imageFormat !== null && imageFormat !== void 0 ? imageFormat : 'jpeg',

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

@@ -4,7 +4,6 @@ exports.renderStillOnLambda = void 0;
 const version_1 = require("remotion/version");
 const call_lambda_1 = require("../shared/call-lambda");
 const constants_1 = require("../shared/constants");
-const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const get_aws_urls_1 = require("../shared/get-aws-urls");
 const serialize_input_props_1 = require("../shared/serialize-input-props");
 /**
@@ -25,7 +24,6 @@ const serialize_input_props_1 = require("../shared/serialize-input-props");
  */
 const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFormat, envVariables, quality, region, maxRetries, composition, privacy, frame, logLevel, outName, timeoutInMilliseconds, chromiumOptions, scale, downloadBehavior, forceHeight, forceWidth, }) => {
     var _a;
-    const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
     const serializedInputProps = await (0, serialize_input_props_1.serializeInputProps)({
         inputProps,
         region,
@@ -37,7 +35,7 @@ const renderStillOnLambda = async ({ functionName, serveUrl, inputProps, imageFo
             type: constants_1.LambdaRoutines.still,
             payload: {
                 composition,
-                serveUrl: realServeUrl,
+                serveUrl,
                 inputProps: serializedInputProps,
                 imageFormat,
                 envVariables,

package/dist/cli/commands/compositions/index.js

@@ -4,7 +4,6 @@ exports.compositionsCommand = exports.COMPOSITIONS_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const __1 = require("../../..");
 const constants_1 = require("../../../shared/constants");
-const convert_to_serve_url_1 = require("../../../shared/convert-to-serve-url");
 const validate_serveurl_1 = require("../../../shared/validate-serveurl");
 const get_aws_region_1 = require("../../get-aws-region");
 const find_function_name_1 = require("../../helpers/find-function-name");
@@ -28,10 +27,9 @@ const compositionsCommand = async (args, remotionRoot) => {
     const region = (0, get_aws_region_1.getAwsRegion)();
     (0, validate_serveurl_1.validateServeUrl)(serveUrl);
     const functionName = await (0, find_function_name_1.findFunctionName)();
-    const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
     const comps = await (0, __1.getCompositionsOnLambda)({
         functionName,
-        serveUrl: realServeUrl,
+        serveUrl,
         inputProps,
         region,
         chromiumOptions,

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

@@ -7,7 +7,6 @@ const download_media_1 = require("../../../api/download-media");
 const get_render_progress_1 = require("../../../api/get-render-progress");
 const render_media_on_lambda_1 = require("../../../api/render-media-on-lambda");
 const constants_1 = require("../../../shared/constants");
-const convert_to_serve_url_1 = require("../../../shared/convert-to-serve-url");
 const sleep_1 = require("../../../shared/sleep");
 const validate_frames_per_lambda_1 = require("../../../shared/validate-frames-per-lambda");
 const validate_privacy_1 = require("../../../shared/validate-privacy");
@@ -35,8 +34,7 @@ const renderCommand = async (args, remotionRoot) => {
     if (!composition) {
         log_1.Log.info('No compositions passed. Fetching compositions...');
         (0, validate_serveurl_1.validateServeUrl)(serveUrl);
-        const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
-        const comps = await (0, renderer_1.getCompositions)(realServeUrl);
+        const comps = await (0, renderer_1.getCompositions)(serveUrl);
         const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
         composition = compositionId;
     }

package/dist/cli/commands/still.js

@@ -6,7 +6,6 @@ const renderer_1 = require("@remotion/renderer");
 const download_media_1 = require("../../api/download-media");
 const render_still_on_lambda_1 = require("../../api/render-still-on-lambda");
 const constants_1 = require("../../shared/constants");
-const convert_to_serve_url_1 = require("../../shared/convert-to-serve-url");
 const validate_privacy_1 = require("../../shared/validate-privacy");
 const validate_retries_1 = require("../../shared/validate-retries");
 const validate_serveurl_1 = require("../../shared/validate-serveurl");
@@ -29,14 +28,11 @@ const stillCommand = async (args, remotionRoot) => {
     const region = (0, get_aws_region_1.getAwsRegion)();
     let composition = args[1];
     if (!composition) {
-        if (!composition) {
-            log_1.Log.info('No compositions passed. Fetching compositions...');
-            (0, validate_serveurl_1.validateServeUrl)(serveUrl);
-            const realServeUrl = await (0, convert_to_serve_url_1.convertToServeUrl)(serveUrl, region);
-            const comps = await (0, renderer_1.getCompositions)(realServeUrl);
-            const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
-            composition = compositionId;
-        }
+        log_1.Log.info('No compositions passed. Fetching compositions...');
+        (0, validate_serveurl_1.validateServeUrl)(serveUrl);
+        const comps = await (0, renderer_1.getCompositions)(serveUrl);
+        const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
+        composition = compositionId;
     }
     const downloadName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
     const outName = args_1.parsedLambdaCli['out-name'];

package/dist/functions/compositions.js

@@ -5,6 +5,7 @@ const renderer_1 = require("@remotion/renderer");
 const version_1 = require("remotion/version");
 const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const defaults_1 = require("../defaults");
+const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const deserialize_input_props_1 = require("../shared/deserialize-input-props");
 const get_browser_instance_1 = require("./helpers/get-browser-instance");
 const get_current_region_1 = require("./helpers/get-current-region");
@@ -19,9 +20,10 @@ 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([
         (0, get_or_create_bucket_1.getOrCreateBucket)({
-            region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+            region,
         }),
         (0, get_browser_instance_1.getBrowserInstance)(renderer_1.RenderInternals.isEqualOrBelowLogLevel(lambdaParams.logLevel, 'verbose'), (_a = lambdaParams.chromiumOptions) !== null && _a !== void 0 ? _a : {}),
     ]);
@@ -31,10 +33,15 @@ const compositionsHandler = async (lambdaParams, options) => {
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
         serialized: lambdaParams.inputProps,
     });
+    const realServeUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
+        urlOrId: lambdaParams.serveUrl,
+        region,
+        bucketName,
+    });
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
-    const compositions = await (0, renderer_1.getCompositions)(lambdaParams.serveUrl, {
+    const compositions = await (0, renderer_1.getCompositions)(realServeUrl, {
         puppeteerInstance: browserInstance,
-        inputProps: inputProps,
+        inputProps,
         envVariables: lambdaParams.envVariables,
         ffmpegExecutable: null,
         ffprobeExecutable: null,

package/dist/functions/start.js

@@ -6,6 +6,7 @@ const version_1 = require("remotion/version");
 const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const aws_clients_1 = require("../shared/aws-clients");
 const constants_1 = require("../shared/constants");
+const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const random_hash_1 = require("../shared/random-hash");
 const get_current_region_1 = require("./helpers/get-current-region");
 const io_1 = require("./helpers/io");
@@ -20,14 +21,20 @@ const startHandler = async (params, options) => {
         }
         throw new Error(`Version mismatch: When calling renderMediaOnLambda(), 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 ${params.version}. Deploy a new function and use it to call renderMediaOnLambda(). See: https://www.remotion.dev/docs/lambda/upgrading`);
     }
+    const region = (0, get_current_region_1.getCurrentRegionInFunction)();
     const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
         region: (0, get_current_region_1.getCurrentRegionInFunction)(),
     });
+    const realServeUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
+        urlOrId: params.serveUrl,
+        region,
+        bucketName,
+    });
     const renderId = (0, random_hash_1.randomHash)({ randomInTests: true });
     const initialFile = (0, io_1.lambdaWriteFile)({
         bucketName,
         downloadBehavior: null,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        region,
         body: 'Render was initialized',
         expectedBucketOwner: options.expectedBucketOwner,
         key: (0, constants_1.initalizedMetadataKey)(renderId),
@@ -38,7 +45,7 @@ const startHandler = async (params, options) => {
         type: constants_1.LambdaRoutines.launch,
         framesPerLambda: params.framesPerLambda,
         composition: params.composition,
-        serveUrl: params.serveUrl,
+        serveUrl: realServeUrl,
         inputProps: params.inputProps,
         bucketName,
         renderId,

package/dist/functions/still.js

@@ -14,6 +14,7 @@ const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const aws_clients_1 = require("../shared/aws-clients");
 const cleanup_serialized_input_props_1 = require("../shared/cleanup-serialized-input-props");
 const constants_1 = require("../shared/constants");
+const convert_to_serve_url_1 = require("../shared/convert-to-serve-url");
 const deserialize_input_props_1 = require("../shared/deserialize-input-props");
 const make_s3_url_1 = require("../shared/make-s3-url");
 const random_hash_1 = require("../shared/random-hash");
@@ -53,14 +54,20 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
     const outputDir = renderer_1.RenderInternals.tmpDir('remotion-render-');
     const outputPath = path_1.default.join(outputDir, 'output');
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    const region = (0, get_current_region_1.getCurrentRegionInFunction)();
     const inputProps = await (0, deserialize_input_props_1.deserializeInputProps)({
         bucketName,
         expectedBucketOwner: options.expectedBucketOwner,
-        region: (0, get_current_region_1.getCurrentRegionInFunction)(),
+        region,
         serialized: lambdaParams.inputProps,
     });
+    const serveUrl = (0, convert_to_serve_url_1.convertToServeUrl)({
+        urlOrId: lambdaParams.serveUrl,
+        region,
+        bucketName,
+    });
     const composition = await (0, validate_composition_1.validateComposition)({
-        serveUrl: lambdaParams.serveUrl,
+        serveUrl,
         browserInstance,
         composition: lambdaParams.composition,
         inputProps,
@@ -81,7 +88,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
         compositionId: lambdaParams.composition,
         estimatedTotalLambdaInvokations: 1,
         estimatedRenderLambdaInvokations: 1,
-        siteId: (0, make_s3_url_1.getServeUrlHash)(lambdaParams.serveUrl),
+        siteId: (0, make_s3_url_1.getServeUrlHash)(serveUrl),
         totalChunks: 1,
         type: 'still',
         imageFormat: lambdaParams.imageFormat,
@@ -109,7 +116,7 @@ const innerStillHandler = async (lambdaParams, renderId, options) => {
     await (0, renderer_1.renderStill)({
         composition,
         output: outputPath,
-        serveUrl: lambdaParams.serveUrl,
+        serveUrl,
         dumpBrowserLogs: false,
         envVariables: lambdaParams.envVariables,
         frame: renderer_1.RenderInternals.convertToPositiveFrameIndex({

package/dist/shared/convert-to-serve-url.d.ts

@@ -1,2 +1,6 @@
 import type { AwsRegion } from '../pricing/aws-regions';
-export declare const convertToServeUrl: (urlOrId: string, region: AwsRegion) => Promise<string>;
+export declare const convertToServeUrl: ({ urlOrId, region, bucketName, }: {
+    urlOrId: string;
+    region: AwsRegion;
+    bucketName: string;
+}) => string;

package/dist/shared/convert-to-serve-url.js

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToServeUrl = void 0;
-const get_or_create_bucket_1 = require("../api/get-or-create-bucket");
 const docs_url_1 = require("./docs-url");
-const convertToServeUrl = async (urlOrId, region) => {
+const convertToServeUrl = ({ urlOrId, region, bucketName, }) => {
     if (urlOrId.startsWith('src/')) {
         throw new Error(`Remotion Lambda can only render based on a URL in the cloud. It seems like you passed a local file: ${urlOrId}. Read the setup guide for Remotion Lambda ${docs_url_1.DOCS_URL}/docs/lambda/setup`);
     }
     if (urlOrId.startsWith('http://') || urlOrId.startsWith('https://')) {
         return urlOrId;
     }
-    const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
-        region,
-    });
     return `https://${bucketName}.s3.${region}.amazonaws.com/sites/${urlOrId}/index.html`;
 };
 exports.convertToServeUrl = convertToServeUrl;

package/dist/shared/deserialize-input-props.d.ts

@@ -5,4 +5,4 @@ export declare const deserializeInputProps: ({ serialized, region, bucketName, e
     region: AwsRegion;
     bucketName: string;
     expectedBucketOwner: string;
-}) => Promise<unknown>;
+}) => Promise<object>;

package/dist/shared/deserialize-input-props.js

@@ -20,7 +20,7 @@ const deserializeInputProps = async ({ serialized, region, bucketName, expectedB
         return payload;
     }
     catch (err) {
-        throw new Error('Failed to parse input props that were');
+        throw new Error(`Failed to parse input props that were serialized: ${err.stack}`);
     }
 };
 exports.deserializeInputProps = deserializeInputProps;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/lambda",
-	"version": "3.3.15",
+	"version": "3.3.16",
 	"description": "Distributed renderer for Remotion based on AWS Lambda",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -33,12 +33,12 @@
 		"@aws-sdk/credential-providers": "3.215.0",
 		"@aws-sdk/lib-storage": "3.215.0",
 		"@aws-sdk/s3-request-presigner": "3.215.0",
-		"@remotion/bundler": "3.3.15",
-		"@remotion/cli": "3.3.15",
-		"@remotion/renderer": "3.3.15",
+		"@remotion/bundler": "3.3.16",
+		"@remotion/cli": "3.3.16",
+		"@remotion/renderer": "3.3.16",
 		"aws-policies": "^1.0.1",
 		"mime-types": "2.1.34",
-		"remotion": "3.3.15"
+		"remotion": "3.3.16"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -61,5 +61,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2fc46f12fd00b0f4eace6398e5eaa054210928ea"
+	"gitHead": "f9ad91106fe6fbcc61a25d917cc526a995d9322c"
 }