@remotion/cloudrun 4.1.0-alpha3 → 4.1.0-alpha5

package/.turbo/turbo-build.log

@@ -1,13 +1,13 @@
 
-> @remotion/cloudrun@3.3.96 build /Users/jonathanburger/remotion-v4/packages/cloudrun
+> @remotion/cloudrun@3.3.101 build /Users/jonathanburger/remotion-v4/packages/cloudrun
 > tsc -d && cp src/shared/sa-permissions.json dist/shared/sa-permissions.json && pnpm run buildContainer && pnpm run tarInstaller
 
 
-> @remotion/cloudrun@3.3.96 buildContainer /Users/jonathanburger/remotion-v4/packages/cloudrun
+> @remotion/cloudrun@3.3.101 buildContainer /Users/jonathanburger/remotion-v4/packages/cloudrun
 > ts-node src/admin/bundle-renderLogic.ts
 
 distribution bundled.
 
-> @remotion/cloudrun@3.3.96 tarInstaller /Users/jonathanburger/remotion-v4/packages/cloudrun
+> @remotion/cloudrun@3.3.101 tarInstaller /Users/jonathanburger/remotion-v4/packages/cloudrun
 > ts-node src/admin/bundle-installer.ts
 

package/dist/api/check-if-service-exists.js

@@ -34,7 +34,6 @@ const checkIfServiceExists = async ({ memoryLimit, cpuLimit, timeoutSeconds, pro
                 return response;
             }
         }
-        return;
     }
     catch (e) {
         if (e.code === 7) {

package/dist/api/helpers/parse-service-name.d.ts

@@ -1,4 +1,4 @@
-import { GcpRegion } from '../../pricing/gcp-regions';
+import type { GcpRegion } from '../../pricing/gcp-regions';
 export declare const getGcpParent: (region: GcpRegion) => string;
 export declare const parseServiceName: (fullServiceName: string, region: GcpRegion) => {
     serviceName: string;

package/dist/api/helpers/parse-service-name.js

@@ -10,7 +10,7 @@ const parseServiceName = (fullServiceName, region) => {
     const parent = (0, exports.getGcpParent)(region);
     const shortServiceName = fullServiceName.replace(parent + '/services/', '');
     const deployedRegion = fullServiceName.split('/')[3];
-    const matched = shortServiceName.match(/remotion\-(.*)\-mem([0-9])/);
+    const matched = shortServiceName.match(/remotion-(.*)-mem([0-9])/);
     if (!matched) {
         throw new Error(`Could not parse service name ${shortServiceName}`);
     }

package/dist/api/render-media-on-cloudrun.d.ts

@@ -32,6 +32,10 @@ export declare type RenderMediaOnCloudrunInput = {
     forceWidth?: number | null;
     forceHeight?: number | null;
     logLevel?: LogLevel;
+    delayRenderTimeoutInMilliseconds?: number;
+    concurrency?: number | string | null;
+    enforceAudioTrack?: boolean;
+    preferLossless?: boolean;
 };
 /**
  * @description Triggers a render on a GCP Cloud Run service given a composition and a Cloud Run URL.
@@ -65,6 +69,10 @@ export declare type RenderMediaOnCloudrunInput = {
  * @param params.forceWidth Overrides default composition width.
  * @param params.forceHeight Overrides default composition height.
  * @param params.logLevel Level of logging that Cloud Run service should perform. Default "info".
+ * @param params.delayRenderTimeoutInMilliseconds A number describing how long the render may take to resolve all delayRender() calls before it times out.
+ * @param params.concurrency By default, each Cloud Run service renders with concurrency 1 (one open browser tab). You may use the option to customize this value.
+ * @param params.enforceAudioTrack Render a silent audio track if there wouldn't be any otherwise.
+ * @param params.preferLossless Uses a lossless audio codec, if one is available for the codec. If you set audioCodec, it takes priority over preferLossless.
  * @returns {Promise<RenderMediaOnCloudrunOutput>} See documentation for detailed structure
  */
-export declare const renderMediaOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, codec, forceBucketName, privacy, outName, updateRenderProgress, jpegQuality, audioCodec, audioBitrate, videoBitrate, proResProfile, crf, pixelFormat, imageFormat, scale, everyNthFrame, numberOfGifLoops, frameRange, envVariables, chromiumOptions, muted, forceWidth, forceHeight, logLevel, }: RenderMediaOnCloudrunInput) => Promise<RenderMediaOnCloudrunOutput>;
+export declare const renderMediaOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, codec, forceBucketName, privacy, outName, updateRenderProgress, jpegQuality, audioCodec, audioBitrate, videoBitrate, proResProfile, crf, pixelFormat, imageFormat, scale, everyNthFrame, numberOfGifLoops, frameRange, envVariables, chromiumOptions, muted, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, concurrency, enforceAudioTrack, preferLossless, }: RenderMediaOnCloudrunInput) => Promise<RenderMediaOnCloudrunOutput>;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderMediaOnCloudrun = void 0;
+const renderer_1 = require("@remotion/renderer");
 const validate_gcp_codec_1 = require("../shared/validate-gcp-codec");
 const validate_privacy_1 = require("../shared/validate-privacy");
 const validate_serveurl_1 = require("../shared/validate-serveurl");
@@ -39,9 +40,13 @@ const get_cloudrun_endpoint_1 = require("./helpers/get-cloudrun-endpoint");
  * @param params.forceWidth Overrides default composition width.
  * @param params.forceHeight Overrides default composition height.
  * @param params.logLevel Level of logging that Cloud Run service should perform. Default "info".
+ * @param params.delayRenderTimeoutInMilliseconds A number describing how long the render may take to resolve all delayRender() calls before it times out.
+ * @param params.concurrency By default, each Cloud Run service renders with concurrency 1 (one open browser tab). You may use the option to customize this value.
+ * @param params.enforceAudioTrack Render a silent audio track if there wouldn't be any otherwise.
+ * @param params.preferLossless Uses a lossless audio codec, if one is available for the codec. If you set audioCodec, it takes priority over preferLossless.
  * @returns {Promise<RenderMediaOnCloudrunOutput>} See documentation for detailed structure
  */
-const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, codec, forceBucketName, privacy, outName, updateRenderProgress, jpegQuality, audioCodec, audioBitrate, videoBitrate, proResProfile, crf, pixelFormat, imageFormat, scale, everyNthFrame, numberOfGifLoops, frameRange, envVariables, chromiumOptions, muted, forceWidth, forceHeight, logLevel, }) => {
+const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, codec, forceBucketName, privacy, outName, updateRenderProgress, jpegQuality, audioCodec, audioBitrate, videoBitrate, proResProfile, crf, pixelFormat, imageFormat, scale, everyNthFrame, numberOfGifLoops, frameRange, envVariables, chromiumOptions, muted, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, concurrency, enforceAudioTrack, preferLossless, }) => {
     const actualCodec = (0, validate_gcp_codec_1.validateCloudrunCodec)(codec);
     (0, validate_serveurl_1.validateServeUrl)(serveUrl);
     if (privacy)
@@ -56,22 +61,22 @@ const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
         composition,
         serveUrl,
         codec: actualCodec,
-        inputProps,
-        jpegQuality,
-        audioCodec,
-        audioBitrate,
-        videoBitrate,
-        crf,
-        pixelFormat,
-        imageFormat,
-        scale,
-        proResProfile,
-        everyNthFrame,
-        numberOfGifLoops,
-        frameRange,
-        envVariables,
+        inputProps: inputProps !== null && inputProps !== void 0 ? inputProps : {},
+        jpegQuality: jpegQuality !== null && jpegQuality !== void 0 ? jpegQuality : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
+        audioCodec: audioCodec !== null && audioCodec !== void 0 ? audioCodec : null,
+        audioBitrate: audioBitrate !== null && audioBitrate !== void 0 ? audioBitrate : null,
+        videoBitrate: videoBitrate !== null && videoBitrate !== void 0 ? videoBitrate : null,
+        crf: crf !== null && crf !== void 0 ? crf : null,
+        pixelFormat: pixelFormat !== null && pixelFormat !== void 0 ? pixelFormat : renderer_1.RenderInternals.DEFAULT_PIXEL_FORMAT,
+        imageFormat: imageFormat !== null && imageFormat !== void 0 ? imageFormat : renderer_1.RenderInternals.DEFAULT_VIDEO_IMAGE_FORMAT,
+        scale: scale !== null && scale !== void 0 ? scale : 1,
+        proResProfile: proResProfile !== null && proResProfile !== void 0 ? proResProfile : null,
+        everyNthFrame: everyNthFrame !== null && everyNthFrame !== void 0 ? everyNthFrame : 1,
+        numberOfGifLoops: numberOfGifLoops !== null && numberOfGifLoops !== void 0 ? numberOfGifLoops : null,
+        frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
+        envVariables: envVariables !== null && envVariables !== void 0 ? envVariables : {},
         chromiumOptions,
-        muted,
+        muted: muted !== null && muted !== void 0 ? muted : false,
         outputBucket,
         privacy,
         outName,
@@ -79,6 +84,10 @@ const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
         forceHeight,
         type: 'media',
         logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
+        delayRenderTimeoutInMilliseconds: delayRenderTimeoutInMilliseconds !== null && delayRenderTimeoutInMilliseconds !== void 0 ? delayRenderTimeoutInMilliseconds : renderer_1.RenderInternals.DEFAULT_TIMEOUT,
+        concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : null,
+        enforceAudioTrack: enforceAudioTrack !== null && enforceAudioTrack !== void 0 ? enforceAudioTrack : false,
+        preferLossless: preferLossless !== null && preferLossless !== void 0 ? preferLossless : false,
     };
     const client = await (0, get_auth_client_for_url_1.getAuthClientForUrl)(cloudRunEndpoint);
     const postResponse = await client.request({

package/dist/api/render-still-on-cloudrun.d.ts

@@ -20,6 +20,7 @@ export declare type RenderStillOnCloudrunInput = {
     forceWidth?: number | null;
     forceHeight?: number | null;
     logLevel?: LogLevel;
+    delayRenderTimeoutInMilliseconds?: number;
 };
 /**
  * @description Triggers a render on a GCP Cloud Run service given a composition and a Cloud Run URL.
@@ -42,6 +43,7 @@ export declare type RenderStillOnCloudrunInput = {
  * @param params.forceWidth Overrides default composition width.
  * @param params.forceHeight Overrides default composition height.
  * @param params.logLevel Level of logging that Cloud Run service should perform. Default "info".
+ * @param params.delayRenderTimeoutInMilliseconds A number describing how long the render may take to resolve all delayRender() calls before it times out.
  * @returns {Promise<RenderStillOnCloudrunOutput>} See documentation for detailed structure
  */
-export declare const renderStillOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, }: RenderStillOnCloudrunInput) => Promise<RenderStillOnCloudrunOutput>;
+export declare const renderStillOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, }: RenderStillOnCloudrunInput) => Promise<RenderStillOnCloudrunOutput>;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderStillOnCloudrun = void 0;
+const renderer_1 = require("@remotion/renderer");
 const validate_privacy_1 = require("../shared/validate-privacy");
 const validate_serveurl_1 = require("../shared/validate-serveurl");
 const get_or_create_bucket_1 = require("./get-or-create-bucket");
@@ -27,9 +28,10 @@ const get_cloudrun_endpoint_1 = require("./helpers/get-cloudrun-endpoint");
  * @param params.forceWidth Overrides default composition width.
  * @param params.forceHeight Overrides default composition height.
  * @param params.logLevel Level of logging that Cloud Run service should perform. Default "info".
+ * @param params.delayRenderTimeoutInMilliseconds A number describing how long the render may take to resolve all delayRender() calls before it times out.
  * @returns {Promise<RenderStillOnCloudrunOutput>} See documentation for detailed structure
  */
-const renderStillOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, }) => {
+const renderStillOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, }) => {
     (0, validate_serveurl_1.validateServeUrl)(serveUrl);
     if (privacy)
         (0, validate_privacy_1.validatePrivacy)(privacy);
@@ -42,20 +44,21 @@ const renderStillOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
     const data = {
         composition,
         serveUrl,
-        inputProps,
+        inputProps: inputProps !== null && inputProps !== void 0 ? inputProps : {},
         outputBucket,
         outName,
-        privacy,
+        privacy: privacy !== null && privacy !== void 0 ? privacy : 'public',
         imageFormat,
-        envVariables,
+        envVariables: envVariables !== null && envVariables !== void 0 ? envVariables : {},
         jpegQuality,
         chromiumOptions,
-        scale,
+        scale: scale !== null && scale !== void 0 ? scale : 1,
         forceWidth,
         forceHeight,
         frame: frame !== null && frame !== void 0 ? frame : 0,
         type: 'still',
         logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
+        delayRenderTimeoutInMilliseconds: delayRenderTimeoutInMilliseconds !== null && delayRenderTimeoutInMilliseconds !== void 0 ? delayRenderTimeoutInMilliseconds : renderer_1.RenderInternals.DEFAULT_TIMEOUT,
     };
     const client = await (0, get_auth_client_for_url_1.getAuthClientForUrl)(cloudRunEndpoint);
     const renderResponse = await client.request({

package/dist/api/test/service-names.test.js

@@ -20,7 +20,7 @@ process.env.REMOTION_GCP_PROJECT_ID = 'remotion-test-project';
     (0, vitest_1.expect)(parsed).toEqual({
         consoleUrl: `https://console.cloud.google.com/run/detail/asia-east1/remotion-${dashedVersion}-mem100000k-cpu8-0-t3600/logs`,
         region: 'asia-east1',
-        remotionVersion: '4-1-0-alpha2',
+        remotionVersion: remotion_1.VERSION.replace(/\./g, '-'),
         serviceName: `remotion-${dashedVersion}-mem100000k-cpu8-0-t3600`,
     });
     // Max length of service name is 49 characters, asking for less in case the version string gets longer

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

@@ -13,7 +13,7 @@ const log_1 = require("../../log");
 const renderArgsCheck_1 = require("./helpers/renderArgsCheck");
 exports.RENDER_COMMAND = 'render';
 const renderCommand = async (args, remotionRoot) => {
-    var _a;
+    var _a, _b;
     const { serveUrl, cloudRunUrl, outName, forceBucketName, downloadName, privacy, region, } = await (0, renderArgsCheck_1.renderArgsCheck)(exports.RENDER_COMMAND, args);
     const { codec, reason: codecReason } = cli_1.CliInternals.getFinalOutputCodec({
         cliFlag: cli_1.CliInternals.parsedCli.codec,
@@ -24,7 +24,7 @@ const renderCommand = async (args, remotionRoot) => {
     });
     const imageFormat = args_1.parsedCloudrunCli['image-format'];
     const audioCodec = args_1.parsedCloudrunCli['audio-codec'];
-    const { chromiumOptions, crf, envVariables, frameRange, inputProps, logLevel, puppeteerTimeout, pixelFormat, proResProfile, jpegQuality, scale, everyNthFrame, numberOfGifLoops, muted, audioBitrate, videoBitrate, height, width, browserExecutable, port, } = await cli_1.CliInternals.getCliOptions({
+    const { chromiumOptions, crf, envVariables, frameRange, inputProps, logLevel, puppeteerTimeout, pixelFormat, proResProfile, jpegQuality, scale, everyNthFrame, numberOfGifLoops, muted, audioBitrate, videoBitrate, height, width, browserExecutable, port, enforceAudioTrack, } = await cli_1.CliInternals.getCliOptions({
         type: 'series',
         isLambda: true,
         remotionRoot,
@@ -38,7 +38,7 @@ const renderCommand = async (args, remotionRoot) => {
             indent: false,
             port,
             remotionRoot,
-            verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+            logLevel,
             webpackConfigOrServeUrl: serveUrl,
         });
         const { compositionId } = await cli_1.CliInternals.getCompositionWithDimensionOverride({
@@ -54,7 +54,7 @@ const renderCommand = async (args, remotionRoot) => {
             puppeteerInstance: undefined,
             serveUrlOrWebpackUrl: serveUrl,
             timeoutInMilliseconds: puppeteerTimeout,
-            verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+            logLevel,
             width,
             server: await server,
         });
@@ -127,6 +127,12 @@ ${downloadName ? `		Downloaded File = ${downloadName}` : ''}
         forceBucketName,
         updateRenderProgress,
         logLevel: config_1.ConfigInternals.Logging.getLogLevel(),
+        // Special case: Should not use default local concurrency, or from
+        // config file, just when explicitly set
+        concurrency: (_b = cli_1.CliInternals.parsedCli.concurrency) !== null && _b !== void 0 ? _b : null,
+        delayRenderTimeoutInMilliseconds: puppeteerTimeout,
+        enforceAudioTrack,
+        preferLossless: false,
     });
     renderProgress.doneIn = Date.now() - renderStart;
     updateProgress();

package/dist/cli/commands/still.js

@@ -13,7 +13,7 @@ exports.STILL_COMMAND = 'still';
 const stillCommand = async (args, remotionRoot) => {
     var _a, _b;
     const { serveUrl, cloudRunUrl, outName, forceBucketName, privacy, downloadName, region, } = await (0, renderArgsCheck_1.renderArgsCheck)(exports.STILL_COMMAND, args);
-    const { chromiumOptions, envVariables, inputProps, logLevel, puppeteerTimeout, jpegQuality, stillFrame, scale, height, width, browserExecutable, port, } = await cli_1.CliInternals.getCliOptions({
+    const { chromiumOptions, envVariables, inputProps, puppeteerTimeout, jpegQuality, stillFrame, scale, height, width, browserExecutable, port, logLevel, } = await cli_1.CliInternals.getCliOptions({
         type: 'still',
         isLambda: true,
         remotionRoot,
@@ -27,7 +27,7 @@ const stillCommand = async (args, remotionRoot) => {
             indent: false,
             port,
             remotionRoot,
-            verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+            logLevel,
             webpackConfigOrServeUrl: serveUrl,
         });
         const { compositionId } = await cli_1.CliInternals.getCompositionWithDimensionOverride({
@@ -35,7 +35,7 @@ const stillCommand = async (args, remotionRoot) => {
             compositionIdFromUi: null,
             indent: false,
             serveUrlOrWebpackUrl: serveUrl,
-            verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+            logLevel,
             browserExecutable,
             chromiumOptions,
             envVariables,
@@ -102,6 +102,7 @@ ${downloadName ? `    Downloaded File = ${downloadName}` : ''}
         forceBucketName,
         outName,
         logLevel: config_1.ConfigInternals.Logging.getLogLevel(),
+        delayRenderTimeoutInMilliseconds: puppeteerTimeout,
     });
     doneIn = Date.now() - renderStart;
     updateProgress(true);

package/dist/cli/log.d.ts

@@ -2,20 +2,19 @@ export declare const Log: {
     verbose: (message?: any, ...optionalParams: any[]) => void;
     verboseAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     } & {
         tag?: string | undefined;
-        secondTag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;
     infoAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     }, message?: any, ...optionalParams: any[]) => void;
     warn: (message?: any, ...optionalParams: any[]) => void;
     warnAdvanced: (options: {
         indent: boolean;
-        logLevel: "verbose" | "info" | "warn" | "error";
+        logLevel: "error" | "verbose" | "info" | "warn";
     }, message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
 };

package/dist/functions/helpers/get-composition-from-body.d.ts

@@ -1 +1,2 @@
-export declare const getCompositionFromBody: (serveUrl: string, compositionName: string) => Promise<import("remotion").AnyCompMetadata>;
+import type { CloudRunPayloadType } from './payloads';
+export declare const getCompositionFromBody: (body: CloudRunPayloadType) => Promise<import("remotion").VideoConfig>;

package/dist/functions/helpers/get-composition-from-body.js

@@ -2,12 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCompositionFromBody = void 0;
 const renderer_1 = require("@remotion/renderer");
-const getCompositionFromBody = async (serveUrl, compositionName) => {
-    const comps = await (0, renderer_1.getCompositions)(serveUrl);
-    const composition = comps.find((comp) => comp.id === compositionName);
-    if (composition) {
-        return composition;
+const getCompositionFromBody = async (body) => {
+    var _a, _b, _c;
+    const { metadata, propsSize } = await renderer_1.RenderInternals.internalSelectComposition({
+        serveUrl: body.serveUrl,
+        browserExecutable: null,
+        chromiumOptions: (_a = body.chromiumOptions) !== null && _a !== void 0 ? _a : {},
+        envVariables: (_b = body.envVariables) !== null && _b !== void 0 ? _b : {},
+        id: body.composition,
+        indent: false,
+        inputProps: (_c = body.inputProps) !== null && _c !== void 0 ? _c : {},
+        logLevel: body.logLevel,
+        onBrowserLog: () => null,
+        port: null,
+        puppeteerInstance: undefined,
+        server: undefined,
+        timeoutInMilliseconds: body.delayRenderTimeoutInMilliseconds,
+    });
+    if (propsSize > 10000000) {
+        renderer_1.RenderInternals.Log.warn(`The props of your composition are large (${propsSize} bytes). This may cause slowdown.`);
     }
-    throw new Error(`Composition not found: ${compositionName}`);
+    return metadata;
 };
 exports.getCompositionFromBody = getCompositionFromBody;