@remotion/cloudrun 4.1.0-alpha2 → 4.1.0-alpha4

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/get-service-info.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceInfo = void 0;
-const constants_1 = require("../shared/constants");
 const get_cloud_run_client_1 = require("./helpers/get-cloud-run-client");
+const parse_service_name_1 = require("./helpers/parse-service-name");
 /**
  * @description Given a region and service name, returns information about the service such as version, memory limit and timeout.
  * @see [Documentation](https://remotion.dev/docs/cloudrun/getserviceinfo)
@@ -11,7 +11,7 @@ const get_cloud_run_client_1 = require("./helpers/get-cloud-run-client");
  * @returns {Promise<ServiceInfo[]>} An array with the objects containing information about the deployed services.
  */
 const getServiceInfo = async ({ region, serviceName, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const cloudRunClient = (0, get_cloud_run_client_1.getCloudRunClient)();
     const [service] = await cloudRunClient.getService({
         name: `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${region}/services/${serviceName}`,
@@ -19,15 +19,13 @@ const getServiceInfo = async ({ region, serviceName, }) => {
     if (!service) {
         throw new Error(`Service ${serviceName} not found`);
     }
-    const parent = `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${region}`;
-    const deployedRegion = (_a = service.name) === null || _a === void 0 ? void 0 : _a.split('/')[3];
-    const deployedServiceName = (_b = service.name) === null || _b === void 0 ? void 0 : _b.replace(parent + '/services/', '');
+    const { region: deployedRegion, remotionVersion, serviceName: deployedServiceName, } = (0, parse_service_name_1.parseServiceName)(service.name, region);
     return {
         serviceName: deployedServiceName,
-        timeoutInSeconds: (_d = (_c = service.template) === null || _c === void 0 ? void 0 : _c.timeout) === null || _d === void 0 ? void 0 : _d.seconds,
-        memoryLimit: (_h = (_g = (_f = (_e = service.template) === null || _e === void 0 ? void 0 : _e.containers) === null || _f === void 0 ? void 0 : _f[0].resources) === null || _g === void 0 ? void 0 : _g.limits) === null || _h === void 0 ? void 0 : _h.memory,
-        cpuLimit: (_m = (_l = (_k = (_j = service.template) === null || _j === void 0 ? void 0 : _j.containers) === null || _k === void 0 ? void 0 : _k[0].resources) === null || _l === void 0 ? void 0 : _l.limits) === null || _m === void 0 ? void 0 : _m.cpu,
-        remotionVersion: (_o = service.name) === null || _o === void 0 ? void 0 : _o.replace(parent + '/services/' + constants_1.RENDER_SERVICE_PREFIX + '--', '').split('--')[0].replace(/-/g, '.'),
+        timeoutInSeconds: (_b = (_a = service.template) === null || _a === void 0 ? void 0 : _a.timeout) === null || _b === void 0 ? void 0 : _b.seconds,
+        memoryLimit: (_f = (_e = (_d = (_c = service.template) === null || _c === void 0 ? void 0 : _c.containers) === null || _d === void 0 ? void 0 : _d[0].resources) === null || _e === void 0 ? void 0 : _e.limits) === null || _f === void 0 ? void 0 : _f.memory,
+        cpuLimit: (_k = (_j = (_h = (_g = service.template) === null || _g === void 0 ? void 0 : _g.containers) === null || _h === void 0 ? void 0 : _h[0].resources) === null || _j === void 0 ? void 0 : _j.limits) === null || _k === void 0 ? void 0 : _k.cpu,
+        remotionVersion,
         uri: service.uri,
         region: deployedRegion,
         consoleUrl: `https://console.cloud.google.com/run/detail/${deployedRegion}/${deployedServiceName}/logs`,

package/dist/api/get-services.js

@@ -4,6 +4,7 @@ exports.getServices = void 0;
 const constants_1 = require("../shared/constants");
 const service_version_string_1 = require("../shared/service-version-string");
 const get_cloud_run_client_1 = require("./helpers/get-cloud-run-client");
+const parse_service_name_1 = require("./helpers/parse-service-name");
 /**
  * @description Lists Remotion Cloud Run render services deployed to GCP Cloud Run.
  * @see [Documentation](https://remotion.dev/docs/cloudrun/getservices)
@@ -13,7 +14,7 @@ const get_cloud_run_client_1 = require("./helpers/get-cloud-run-client");
  */
 const getServices = async (params) => {
     const cloudRunClient = (0, get_cloud_run_client_1.getCloudRunClient)();
-    const parent = `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${params.region}`;
+    const parent = (0, parse_service_name_1.getGcpParent)(params.region);
     const [services] = await cloudRunClient.listServices({
         parent,
     });
@@ -21,28 +22,27 @@ const getServices = async (params) => {
     if (params.compatibleOnly) {
         remotionServices = services.filter((s) => {
             var _a;
-            return (_a = s.name) === null || _a === void 0 ? void 0 : _a.startsWith(`${parent}/services/${constants_1.RENDER_SERVICE_PREFIX}--${(0, service_version_string_1.serviceVersionString)()}--`);
+            return (_a = s.name) === null || _a === void 0 ? void 0 : _a.startsWith(`${parent}/services/${constants_1.RENDER_SERVICE_PREFIX}-${(0, service_version_string_1.serviceVersionString)()}-`);
         });
     }
     else {
         remotionServices = services.filter((s) => {
             var _a;
-            return (_a = s.name) === null || _a === void 0 ? void 0 : _a.startsWith(`${parent}/services/${constants_1.RENDER_SERVICE_PREFIX}--`);
+            return (_a = s.name) === null || _a === void 0 ? void 0 : _a.startsWith(`${parent}/services/${constants_1.RENDER_SERVICE_PREFIX}-`);
         });
     }
     return remotionServices.map((service) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        const deployedServiceName = (_a = service.name) === null || _a === void 0 ? void 0 : _a.replace(parent + '/services/', '');
-        const deployedRegion = (_b = service.name) === null || _b === void 0 ? void 0 : _b.split('/')[3];
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const { consoleUrl, region, remotionVersion, serviceName } = (0, parse_service_name_1.parseServiceName)(service.name, params.region);
         return {
-            serviceName: deployedServiceName,
-            timeoutInSeconds: (_d = (_c = service.template) === null || _c === void 0 ? void 0 : _c.timeout) === null || _d === void 0 ? void 0 : _d.seconds,
-            memoryLimit: (_h = (_g = (_f = (_e = service.template) === null || _e === void 0 ? void 0 : _e.containers) === null || _f === void 0 ? void 0 : _f[0].resources) === null || _g === void 0 ? void 0 : _g.limits) === null || _h === void 0 ? void 0 : _h.memory,
-            cpuLimit: (_m = (_l = (_k = (_j = service.template) === null || _j === void 0 ? void 0 : _j.containers) === null || _k === void 0 ? void 0 : _k[0].resources) === null || _l === void 0 ? void 0 : _l.limits) === null || _m === void 0 ? void 0 : _m.cpu,
-            remotionVersion: (_o = service.name) === null || _o === void 0 ? void 0 : _o.replace(parent + '/services/' + constants_1.RENDER_SERVICE_PREFIX + '--', '').split('--')[0].replace(/-/g, '.'),
+            consoleUrl,
+            region,
+            remotionVersion,
+            serviceName,
+            timeoutInSeconds: (_b = (_a = service.template) === null || _a === void 0 ? void 0 : _a.timeout) === null || _b === void 0 ? void 0 : _b.seconds,
+            memoryLimit: (_f = (_e = (_d = (_c = service.template) === null || _c === void 0 ? void 0 : _c.containers) === null || _d === void 0 ? void 0 : _d[0].resources) === null || _e === void 0 ? void 0 : _e.limits) === null || _f === void 0 ? void 0 : _f.memory,
+            cpuLimit: (_k = (_j = (_h = (_g = service.template) === null || _g === void 0 ? void 0 : _g.containers) === null || _h === void 0 ? void 0 : _h[0].resources) === null || _j === void 0 ? void 0 : _j.limits) === null || _k === void 0 ? void 0 : _k.cpu,
             uri: service.uri,
-            region: deployedRegion,
-            consoleUrl: `https://console.cloud.google.com/run/detail/${deployedRegion}/${deployedServiceName}/logs`,
         };
     });
 };

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

@@ -0,0 +1,8 @@
+import type { GcpRegion } from '../../pricing/gcp-regions';
+export declare const getGcpParent: (region: GcpRegion) => string;
+export declare const parseServiceName: (fullServiceName: string, region: GcpRegion) => {
+    serviceName: string;
+    remotionVersion: string;
+    region: "asia-east1" | "asia-east2" | "asia-northeast1" | "asia-northeast2" | "asia-northeast3" | "asia-south1" | "asia-south2" | "asia-southeast1" | "asia-southeast2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west2" | "europe-west3" | "europe-west4" | "europe-west6" | "europe-west8" | "europe-west9" | "me-west1" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "us-west2" | "us-west3" | "us-west4";
+    consoleUrl: string;
+};

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseServiceName = exports.getGcpParent = void 0;
+const getGcpParent = (region) => {
+    const parent = `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${region}`;
+    return parent;
+};
+exports.getGcpParent = getGcpParent;
+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])/);
+    if (!matched) {
+        throw new Error(`Could not parse service name ${shortServiceName}`);
+    }
+    return {
+        serviceName: shortServiceName,
+        remotionVersion: matched[1],
+        region: deployedRegion,
+        consoleUrl: `https://console.cloud.google.com/run/detail/${deployedRegion}/${shortServiceName}/logs`,
+    };
+};
+exports.parseServiceName = parseServiceName;

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.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const remotion_1 = require("remotion");
+const vitest_1 = require("vitest");
+const parse_service_name_1 = require("../helpers/parse-service-name");
+const speculate_service_name_1 = require("../speculate-service-name");
+const dashedVersion = remotion_1.VERSION.replace(/\./g, '-');
+const region = 'asia-east1';
+process.env.REMOTION_GCP_PROJECT_ID = 'remotion-test-project';
+(0, vitest_1.test)('Parse service names', () => {
+    const shortServiceName = (0, speculate_service_name_1.speculateServiceName)({
+        cpuLimit: '8.0',
+        memoryLimit: '100000k',
+        // max timeout
+        timeoutSeconds: 3600,
+    });
+    (0, vitest_1.expect)(shortServiceName).toBe(`remotion-${remotion_1.VERSION.replace(/\./g, '-')}-mem100000k-cpu8-0-t3600`);
+    const fullServiceName = `${(0, parse_service_name_1.getGcpParent)(region)}/services/${shortServiceName}`;
+    const parsed = (0, parse_service_name_1.parseServiceName)(fullServiceName, region);
+    (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: 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
+    (0, vitest_1.expect)(shortServiceName.length).toBeLessThanOrEqual(47);
+});

package/dist/cli/commands/render/index.d.ts

@@ -1,2 +1,2 @@
 export declare const RENDER_COMMAND = "render";
-export declare const renderCommand: (args: string[], remotionRoot: string) => Promise<void> | undefined;
+export declare const renderCommand: (args: string[], remotionRoot: string) => Promise<void>;

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

@@ -2,35 +2,161 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderCommand = exports.RENDER_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const constants_1 = require("../../../shared/constants");
-const quit_1 = require("../../helpers/quit");
+const render_media_on_cloudrun_1 = require("../../../api/render-media-on-cloudrun");
+// import {validateMaxRetries} from '../../../shared/validate-retries';
+const config_1 = require("@remotion/cli/config");
+const renderer_1 = require("@remotion/renderer");
+const download_file_1 = require("../../../api/download-file");
+const validate_serveurl_1 = require("../../../shared/validate-serveurl");
+const args_1 = require("../../args");
 const log_1 = require("../../log");
-const renderMedia_1 = require("./renderMedia");
-const renderStill_1 = require("./renderStill");
+const renderArgsCheck_1 = require("./helpers/renderArgsCheck");
 exports.RENDER_COMMAND = 'render';
-const printCloudRunHelp = () => {
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <subcommand>`);
-    log_1.Log.info();
-    log_1.Log.info('Available subcommands:');
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} ${renderMedia_1.RENDER_MEDIA_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Render Media on Cloud Run'));
-    log_1.Log.info('');
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} ${renderStill_1.RENDER_STILL_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Render Still on Cloud Run'));
-};
-const renderCommand = (args, remotionRoot) => {
-    if (args[0] === renderMedia_1.RENDER_MEDIA_SUBCOMMAND) {
-        return (0, renderMedia_1.renderMediaSubcommand)(args.slice(1), remotionRoot);
+const renderCommand = async (args, remotionRoot) => {
+    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,
+        downloadName,
+        outName: outName !== null && outName !== void 0 ? outName : null,
+        configFile: (_a = config_1.ConfigInternals.getOutputCodecOrUndefined()) !== null && _a !== void 0 ? _a : null,
+        uiCodec: null,
+    });
+    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, enforceAudioTrack, } = await cli_1.CliInternals.getCliOptions({
+        type: 'series',
+        isLambda: true,
+        remotionRoot,
+    });
+    let composition = args[1];
+    if (!composition) {
+        log_1.Log.info('No compositions passed. Fetching compositions...');
+        (0, validate_serveurl_1.validateServeUrl)(serveUrl);
+        const server = renderer_1.RenderInternals.prepareServer({
+            concurrency: 1,
+            indent: false,
+            port,
+            remotionRoot,
+            logLevel,
+            webpackConfigOrServeUrl: serveUrl,
+        });
+        const { compositionId } = await cli_1.CliInternals.getCompositionWithDimensionOverride({
+            args,
+            compositionIdFromUi: null,
+            browserExecutable,
+            chromiumOptions,
+            envVariables,
+            height,
+            indent: false,
+            inputProps,
+            port,
+            puppeteerInstance: undefined,
+            serveUrlOrWebpackUrl: serveUrl,
+            timeoutInMilliseconds: puppeteerTimeout,
+            logLevel,
+            width,
+            server: await server,
+        });
+        composition = compositionId;
     }
-    if (args[0] === renderStill_1.RENDER_STILL_SUBCOMMAND) {
-        return (0, renderStill_1.renderStillSubcommand)(args.slice(1), remotionRoot);
-    }
-    if (args[0]) {
-        log_1.Log.error(`Subcommand ${args[0]} not found.`);
-        printCloudRunHelp();
-        (0, quit_1.quit)(1);
+    // Todo: Check cloudRunUrl is valid, as the error message is obtuse
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray(`
+Cloud Run Service URL = ${cloudRunUrl}
+Region = ${region}
+Type = media
+Composition = ${composition}
+Codec = ${codec}
+Output Bucket = ${forceBucketName}
+Output File = ${outName !== null && outName !== void 0 ? outName : 'out.mp4'}
+Output File Privacy = ${privacy}
+${downloadName ? `		Downloaded File = ${downloadName}` : ''}
+			`.trim()));
+    log_1.Log.info();
+    const renderStart = Date.now();
+    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput({
+        quiet: cli_1.CliInternals.quietFlagProvided(),
+        cancelSignal: null,
+        updatesDontOverwrite: false,
+        indent: false,
+    });
+    const renderProgress = {
+        doneIn: null,
+        progress: 0,
+    };
+    const updateProgress = () => {
+        progressBar.update([
+            `Rendering on Cloud Run: `,
+            cli_1.CliInternals.makeProgressBar(renderProgress.progress),
+            `${renderProgress.doneIn === null ? 'Rendering' : 'Rendered'}`,
+            renderProgress.doneIn === null
+                ? `${Math.round(renderProgress.progress * 100)}%`
+                : cli_1.CliInternals.chalk.gray(`${renderProgress.doneIn}ms`),
+        ].join(' '), false);
+    };
+    const updateRenderProgress = (progress) => {
+        renderProgress.progress = progress;
+        updateProgress();
+    };
+    const res = await (0, render_media_on_cloudrun_1.renderMediaOnCloudrun)({
+        cloudRunUrl,
+        serveUrl,
+        region,
+        inputProps,
+        codec: codec,
+        imageFormat,
+        crf: crf !== null && crf !== void 0 ? crf : undefined,
+        envVariables,
+        pixelFormat,
+        proResProfile,
+        jpegQuality,
+        composition,
+        privacy,
+        frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : undefined,
+        outName,
+        chromiumOptions,
+        scale,
+        numberOfGifLoops,
+        everyNthFrame,
+        muted,
+        audioBitrate,
+        videoBitrate,
+        forceHeight: height,
+        forceWidth: width,
+        audioCodec,
+        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();
+    log_1.Log.info(`
+		
+		`);
+    log_1.Log.info(cli_1.CliInternals.chalk.blueBright(`
+${res.publicUrl ? `Public URL = ${decodeURIComponent(res.publicUrl)}` : ``}
+Cloud Storage Uri = ${res.cloudStorageUri}
+Size (KB) = ${Math.round(Number(res.size) / 1000)}
+Bucket Name = ${res.bucketName}
+Privacy = ${res.privacy}
+Render ID = ${res.renderId}
+Codec = ${codec} (${codecReason})
+      `.trim()));
+    if (downloadName) {
+        log_1.Log.info('');
+        log_1.Log.info('downloading file...');
+        const destination = await (0, download_file_1.downloadFile)({
+            bucketName: res.bucketName,
+            gsutilURI: res.cloudStorageUri,
+            downloadName,
+        });
+        log_1.Log.info(cli_1.CliInternals.chalk.blueBright(`Downloaded file to ${destination}!`));
     }
-    printCloudRunHelp();
 };
 exports.renderCommand = renderCommand;

package/dist/cli/commands/still.d.ts

@@ -0,0 +1,2 @@
+export declare const STILL_COMMAND = "still";
+export declare const stillCommand: (args: string[], remotionRoot: string) => Promise<void>;