@remotion/cloudrun 4.0.139 → 4.0.140

package/.turbo/turbo-build.log

@@ -1,14 +1,14 @@
 
-> @remotion/cloudrun@4.0.138 build /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.139 build /Users/jonathanburger/remotion/packages/cloudrun
 > tsc -d && cp src/shared/sa-permissions.json dist/shared/sa-permissions.json && pnpm run buildContainer && pnpm run tarInstaller
 
 
-> @remotion/cloudrun@4.0.138 buildContainer /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.139 buildContainer /Users/jonathanburger/remotion/packages/cloudrun
 > ts-node src/admin/bundle-renderLogic.ts
 
 distribution bundled.
 
-> @remotion/cloudrun@4.0.138 tarInstaller /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.139 tarInstaller /Users/jonathanburger/remotion/packages/cloudrun
 > ts-node src/admin/bundle-installer.ts
 
 Making reproducible build with gtar

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

@@ -9,6 +9,7 @@ type InternalDeployServiceInput = {
     projectID: string;
     region: string;
     logLevel: LogLevel;
+    indent: boolean;
 };
 export type DeployServiceInput = {
     performImageVersionValidation?: boolean;

package/dist/api/deploy-service.js

@@ -86,6 +86,7 @@ const deployService = ({ performImageVersionValidation = true, memoryLimit, cpuL
         projectID,
         region,
         logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
+        indent: false,
     });
 };
 exports.deployService = deployService;

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

@@ -1,20 +1,30 @@
 import type { GitSource, WebpackOverrideFn } from '@remotion/bundler';
+import type { LogLevel } from '@remotion/renderer';
 import type { UploadDirProgress } from './upload-dir';
+type Options = {
+    onBundleProgress?: (progress: number) => void;
+    onUploadProgress?: (upload: UploadDirProgress) => void;
+    webpackOverride?: WebpackOverrideFn;
+    ignoreRegisterRootWarning?: boolean;
+    enableCaching?: boolean;
+    publicDir?: string | null;
+    rootDir?: string;
+    bypassBucketNameValidation?: boolean;
+    gitSource?: GitSource | null;
+};
+export type RawDeploySiteInput = {
+    entryPoint: string;
+    bucketName: string;
+    siteName: string;
+    options: Options;
+    logLevel: LogLevel;
+    indent: boolean;
+};
 export type DeploySiteInput = {
     entryPoint: string;
     bucketName: string;
     siteName?: string;
-    options?: {
-        onBundleProgress?: (progress: number) => void;
-        onUploadProgress?: (upload: UploadDirProgress) => void;
-        webpackOverride?: WebpackOverrideFn;
-        ignoreRegisterRootWarning?: boolean;
-        enableCaching?: boolean;
-        publicDir?: string | null;
-        rootDir?: string;
-        bypassBucketNameValidation?: boolean;
-        gitSource?: GitSource | null;
-    };
+    options?: Options;
 };
 export type DeploySiteOutput = Promise<{
     serveUrl: string;
@@ -33,12 +43,5 @@ export type DeploySiteOutput = Promise<{
  * @param {string} params.siteName The name of the folder in which the project gets deployed to.
  * @param {object} params.options Further options, see documentation page for this function.
  */
-export declare const deploySite: (args_0: DeploySiteInput) => Promise<{
-    serveUrl: string;
-    siteName: string;
-    stats: {
-        uploadedFiles: number;
-        deletedFiles: number;
-        untouchedFiles: number;
-    };
-}>;
+export declare const deploySite: (input: DeploySiteInput) => DeploySiteOutput;
+export {};

package/dist/api/deploy-site.js

@@ -12,15 +12,14 @@ const validate_bucketname_1 = require("../shared/validate-bucketname");
 const validate_site_name_1 = require("../shared/validate-site-name");
 const get_cloud_storage_client_1 = require("./helpers/get-cloud-storage-client");
 const upload_dir_1 = require("./upload-dir");
-const deploySiteRaw = async ({ entryPoint, bucketName, siteName, options, }) => {
+const internalDeploySiteRaw = async ({ entryPoint, bucketName, siteName, options, }) => {
     var _a, _b, _c, _d;
     (0, validate_bucketname_1.validateBucketName)(bucketName, { mustStartWithRemotion: true });
-    const siteId = siteName !== null && siteName !== void 0 ? siteName : (0, random_hash_1.randomHash)();
-    (0, validate_site_name_1.validateSiteName)(siteId);
+    (0, validate_site_name_1.validateSiteName)(siteName);
     const cloudStorageClient = (0, get_cloud_storage_client_1.getCloudStorageClient)();
     // check if bucket exists
     await cloudStorageClient.bucket(bucketName).get();
-    const subFolder = (0, constants_1.getSitesKey)(siteId);
+    const subFolder = (0, constants_1.getSitesKey)(siteName);
     // gcpLs is a function that lists all files in a bucket
     const [files, bundled] = await Promise.all([
         (0, io_1.cloudrunLs)({
@@ -61,7 +60,7 @@ const deploySiteRaw = async ({ entryPoint, bucketName, siteName, options, }) =>
     ]);
     return {
         serveUrl: (0, make_storage_url_1.makeStorageServeUrl)({ bucketName, subFolder }),
-        siteName: siteId,
+        siteName,
         stats: {
             uploadedFiles: toUpload.length,
             deletedFiles: toDelete.length,
@@ -69,6 +68,7 @@ const deploySiteRaw = async ({ entryPoint, bucketName, siteName, options, }) =>
         },
     };
 };
+const errorHandled = pure_1.NoReactAPIs.wrapWithErrorHandling(internalDeploySiteRaw);
 /**
  * @description Deploys a Remotion project to a GCP storage bucket to prepare it for rendering on Cloud Run.
  * @link https://remotion.dev/docs/cloudrun/deploysite
@@ -77,4 +77,15 @@ const deploySiteRaw = async ({ entryPoint, bucketName, siteName, options, }) =>
  * @param {string} params.siteName The name of the folder in which the project gets deployed to.
  * @param {object} params.options Further options, see documentation page for this function.
  */
-exports.deploySite = pure_1.NoReactAPIs.wrapWithErrorHandling(deploySiteRaw);
+const deploySite = (input) => {
+    var _a, _b;
+    return errorHandled({
+        bucketName: input.bucketName,
+        entryPoint: input.entryPoint,
+        indent: false,
+        logLevel: 'info',
+        options: (_a = input.options) !== null && _a !== void 0 ? _a : {},
+        siteName: (_b = input.siteName) !== null && _b !== void 0 ? _b : (0, random_hash_1.randomHash)(),
+    });
+};
+exports.deploySite = deploySite;

package/dist/api/helpers/get-cloudrun-endpoint.d.ts

@@ -1,6 +1,6 @@
 export type getCloudrunEndpointInput = {
-    cloudRunUrl?: string;
-    serviceName?: string;
+    cloudRunUrl?: string | null;
+    serviceName?: string | null;
     region?: string;
 };
 export declare const getCloudrunEndpoint: ({ cloudRunUrl, serviceName, region, }: getCloudrunEndpointInput) => Promise<string>;

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

@@ -1,4 +1,4 @@
-import type { AudioCodec, ChromiumOptions, FrameRange, PixelFormat, ProResProfile, ToOptions, VideoImageFormat } from '@remotion/renderer';
+import type { AudioCodec, ChromiumOptions, FrameRange, LogLevel, PixelFormat, ProResProfile, ToOptions, VideoImageFormat } from '@remotion/renderer';
 import type { BrowserSafeApis } from '@remotion/renderer/client';
 import type { CloudRunCrashResponse, RenderMediaOnCloudrunOutput } from '../functions/helpers/payloads';
 import type { GcpRegion } from '../pricing/gcp-regions';
@@ -28,6 +28,8 @@ type InternalRenderMediaOnCloudrun = {
     forceHeight?: number | null;
     concurrency: number | string | null;
     preferLossless: boolean | undefined;
+    indent: boolean;
+    logLevel: LogLevel;
 } & Partial<ToOptions<typeof BrowserSafeApis.optionsMap.renderMediaOnCloudRun>>;
 export type RenderMediaOnCloudrunInput = {
     cloudRunUrl?: string;

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

@@ -199,13 +199,14 @@ const renderMediaOnCloudrun = ({ cloudRunUrl, serviceName, region, serveUrl, com
         muted: muted !== null && muted !== void 0 ? muted : undefined,
         forceWidth: forceWidth !== null && forceWidth !== void 0 ? forceWidth : null,
         forceHeight: forceHeight !== null && forceHeight !== void 0 ? forceHeight : null,
-        logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : undefined,
+        logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
         delayRenderTimeoutInMilliseconds: delayRenderTimeoutInMilliseconds !== null && delayRenderTimeoutInMilliseconds !== void 0 ? delayRenderTimeoutInMilliseconds : undefined,
         concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : null,
         enforceAudioTrack: enforceAudioTrack !== null && enforceAudioTrack !== void 0 ? enforceAudioTrack : undefined,
         preferLossless: preferLossless !== null && preferLossless !== void 0 ? preferLossless : undefined,
         offthreadVideoCacheSizeInBytes: offthreadVideoCacheSizeInBytes !== null && offthreadVideoCacheSizeInBytes !== void 0 ? offthreadVideoCacheSizeInBytes : undefined,
         colorSpace: colorSpace !== null && colorSpace !== void 0 ? colorSpace : undefined,
+        indent: false,
     });
 };
 exports.renderMediaOnCloudrun = renderMediaOnCloudrun;

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

@@ -1,22 +1,46 @@
 import type { ChromiumOptions, StillImageFormat, ToOptions } from '@remotion/renderer';
 import { BrowserSafeApis } from '@remotion/renderer/client';
-import type { CloudRunCrashResponse, ErrorResponsePayload, RenderStillOnCloudrunOutput } from '../functions/helpers/payloads';
 import type { GcpRegion } from '../pricing/gcp-regions';
-export type RenderStillOnCloudrunInput = {
-    cloudRunUrl?: string;
-    serviceName?: string;
+type MandatoryParameters = {
     region: GcpRegion;
     serveUrl: string;
     composition: string;
-    inputProps?: Record<string, unknown>;
-    privacy?: 'public' | 'private';
-    forceBucketName?: string;
-    outName?: string;
     imageFormat: StillImageFormat;
-    envVariables?: Record<string, string>;
-    frame?: number;
-    chromiumOptions?: ChromiumOptions;
-    forceWidth?: number | null;
-    forceHeight?: number | null;
-} & Partial<ToOptions<typeof BrowserSafeApis.optionsMap.renderStillOnCloudRun>>;
-export declare const renderStillOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, offthreadVideoCacheSizeInBytes, }: RenderStillOnCloudrunInput) => Promise<RenderStillOnCloudrunOutput | ErrorResponsePayload | CloudRunCrashResponse>;
+};
+type OptionalParameters = {
+    cloudRunUrl: string | null;
+    serviceName: string | null;
+    inputProps: Record<string, unknown>;
+    privacy: 'public' | 'private';
+    forceBucketName: string | null;
+    outName: string | null;
+    envVariables: Record<string, string>;
+    frame: number;
+    chromiumOptions: ChromiumOptions;
+    forceWidth: number | null;
+    forceHeight: number | null;
+    indent: boolean;
+} & ToOptions<typeof BrowserSafeApis.optionsMap.renderStillOnCloudRun>;
+export type RenderStillOnCloudrunInput = Partial<OptionalParameters> & MandatoryParameters;
+export declare const renderStillOnCloudrun: (options: RenderStillOnCloudrunInput) => Promise<{
+    type: "success";
+    privacy: "public-read" | "project-private";
+    cloudStorageUri: string;
+    size: number;
+    bucketName: string;
+    renderId: string;
+    publicUrl?: string | null | undefined;
+} | {
+    type: "error";
+    message: string;
+    name: string;
+    stack: string;
+} | {
+    type: "crash";
+    message: "Service crashed without sending a response. Check the logs in GCP console.";
+    cloudRunEndpoint: string;
+    requestStartTime: string;
+    requestCrashTime: string;
+    requestElapsedTimeInSeconds: number;
+}>;
+export {};

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

@@ -5,6 +5,7 @@ const client_1 = require("@remotion/renderer/client");
 const pure_1 = require("@remotion/renderer/pure");
 const no_react_1 = require("remotion/no-react");
 const version_1 = require("remotion/version");
+const defaults_1 = require("../defaults");
 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");
@@ -34,7 +35,7 @@ const get_cloudrun_endpoint_1 = require("./helpers/get-cloudrun-endpoint");
  * @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 renderStillOnCloudrunRaw = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, offthreadVideoCacheSizeInBytes, }) => {
+const internalRenderStillOnCloudRun = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, offthreadVideoCacheSizeInBytes, }) => {
     (0, validate_serveurl_1.validateServeUrl)(serveUrl);
     if (privacy)
         (0, validate_privacy_1.validatePrivacy)(privacy);
@@ -54,24 +55,24 @@ const renderStillOnCloudrunRaw = async ({ cloudRunUrl, serviceName, region, serv
         }).serializedString,
         outputBucket,
         outName,
-        privacy: privacy !== null && privacy !== void 0 ? privacy : 'public',
+        privacy,
         imageFormat,
-        envVariables: envVariables !== null && envVariables !== void 0 ? envVariables : {},
+        envVariables,
         jpegQuality,
         chromiumOptions,
-        scale: scale !== null && scale !== void 0 ? scale : 1,
+        scale,
         forceWidth,
         forceHeight,
-        frame: frame !== null && frame !== void 0 ? frame : 0,
+        frame,
         type: 'still',
-        logLevel: logLevel !== null && logLevel !== void 0 ? logLevel : 'info',
-        delayRenderTimeoutInMilliseconds: delayRenderTimeoutInMilliseconds !== null && delayRenderTimeoutInMilliseconds !== void 0 ? delayRenderTimeoutInMilliseconds : client_1.BrowserSafeApis.DEFAULT_TIMEOUT,
-        offthreadVideoCacheSizeInBytes: offthreadVideoCacheSizeInBytes !== null && offthreadVideoCacheSizeInBytes !== void 0 ? offthreadVideoCacheSizeInBytes : null,
+        logLevel,
+        delayRenderTimeoutInMilliseconds,
+        offthreadVideoCacheSizeInBytes,
         clientVersion: version_1.VERSION,
     };
     const client = await (0, get_auth_client_for_url_1.getAuthClientForUrl)(cloudRunEndpoint);
     const postResponse = await client.request({
-        url: cloudRunUrl,
+        url: cloudRunEndpoint,
         method: 'POST',
         data,
         responseType: 'stream',
@@ -125,4 +126,31 @@ const renderStillOnCloudrunRaw = async ({ cloudRunUrl, serviceName, region, serv
     });
     return renderResponse;
 };
-exports.renderStillOnCloudrun = pure_1.NoReactAPIs.wrapWithErrorHandling(renderStillOnCloudrunRaw);
+const errorHandled = pure_1.NoReactAPIs.wrapWithErrorHandling(internalRenderStillOnCloudRun);
+const renderStillOnCloudrun = (options) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    return errorHandled({
+        chromiumOptions: (_a = options.chromiumOptions) !== null && _a !== void 0 ? _a : {},
+        cloudRunUrl: (_b = options.cloudRunUrl) !== null && _b !== void 0 ? _b : null,
+        composition: options.composition,
+        delayRenderTimeoutInMilliseconds: (_c = options.delayRenderTimeoutInMilliseconds) !== null && _c !== void 0 ? _c : defaults_1.DEFAULT_TIMEOUT,
+        envVariables: (_d = options.envVariables) !== null && _d !== void 0 ? _d : {},
+        forceBucketName: (_e = options.forceBucketName) !== null && _e !== void 0 ? _e : null,
+        forceHeight: (_f = options.forceHeight) !== null && _f !== void 0 ? _f : null,
+        forceWidth: (_g = options.forceWidth) !== null && _g !== void 0 ? _g : null,
+        frame: (_h = options.frame) !== null && _h !== void 0 ? _h : 0,
+        imageFormat: options.imageFormat,
+        indent: (_j = options.indent) !== null && _j !== void 0 ? _j : false,
+        inputProps: (_k = options.inputProps) !== null && _k !== void 0 ? _k : {},
+        jpegQuality: (_l = options.jpegQuality) !== null && _l !== void 0 ? _l : client_1.BrowserSafeApis.DEFAULT_JPEG_QUALITY,
+        logLevel: (_m = options.logLevel) !== null && _m !== void 0 ? _m : 'info',
+        offthreadVideoCacheSizeInBytes: (_o = options.offthreadVideoCacheSizeInBytes) !== null && _o !== void 0 ? _o : null,
+        outName: (_p = options.outName) !== null && _p !== void 0 ? _p : null,
+        privacy: (_q = options.privacy) !== null && _q !== void 0 ? _q : 'public',
+        region: options.region,
+        scale: (_r = options.scale) !== null && _r !== void 0 ? _r : 1,
+        serveUrl: options.serveUrl,
+        serviceName: (_s = options.serviceName) !== null && _s !== void 0 ? _s : null,
+    });
+};
+exports.renderStillOnCloudrun = renderStillOnCloudrun;

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

@@ -229,6 +229,7 @@ ${downloadName ? `		Downloaded File = ${downloadName}` : ''}
         preferLossless: false,
         offthreadVideoCacheSizeInBytes,
         colorSpace,
+        indent: false,
     });
     if (res.type === 'crash') {
         (0, cloudrun_crash_logs_1.displayCrashLogs)(res, logLevel);

package/dist/cli/commands/services/deploy.js

@@ -63,6 +63,7 @@ ${[
             projectID,
             region,
             logLevel,
+            indent: false,
         });
         if (!deployResult.fullName) {
             log_1.Log.error({ indent: false, logLevel }, 'full service name not returned from Cloud Run API.');

package/dist/functions/helpers/payloads.d.ts

@@ -172,7 +172,7 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
         userAgent?: string | null | undefined;
     }>>;
     outputBucket: z.ZodString;
-    outName: z.ZodOptional<z.ZodString>;
+    outName: z.ZodNullable<z.ZodString>;
     frame: z.ZodNumber;
     delayRenderTimeoutInMilliseconds: z.ZodNumber;
     logLevel: z.ZodEnum<["verbose", "info", "warn", "error"]>;
@@ -187,6 +187,7 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     scale: number;
     envVariables: Record<string, string>;
     outputBucket: string;
+    outName: string | null;
     privacy: "public" | "private";
     logLevel: "error" | "verbose" | "info" | "warn";
     delayRenderTimeoutInMilliseconds: number;
@@ -203,7 +204,6 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
         headless?: boolean | undefined;
         userAgent?: string | null | undefined;
     } | undefined;
-    outName?: string | undefined;
 }, {
     type: "still";
     serveUrl: string;
@@ -213,6 +213,7 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     scale: number;
     envVariables: Record<string, string>;
     outputBucket: string;
+    outName: string | null;
     privacy: "public" | "private";
     logLevel: "error" | "verbose" | "info" | "warn";
     delayRenderTimeoutInMilliseconds: number;
@@ -229,7 +230,6 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
         headless?: boolean | undefined;
         userAgent?: string | null | undefined;
     } | undefined;
-    outName?: string | undefined;
 }>]>;
 declare const renderFailResponsePayload: z.ZodObject<{
     type: z.ZodLiteral<"error">;

package/dist/functions/helpers/payloads.js

@@ -71,7 +71,7 @@ exports.CloudRunPayload = zod_1.z.discriminatedUnion('type', [
         envVariables: zod_1.z.record(zod_1.z.string()),
         chromiumOptions: chromiumOptions.optional(),
         outputBucket: zod_1.z.string(),
-        outName: zod_1.z.string().optional(),
+        outName: zod_1.z.string().nullable(),
         frame: zod_1.z.number(),
         delayRenderTimeoutInMilliseconds: zod_1.z.number(),
         logLevel,

package/dist/index.d.ts

@@ -35,7 +35,7 @@ declare const renderMediaOnCloudrun: ({ cloudRunUrl, serviceName, region, serveU
 /**
  * @deprecated  Import this from `@remotion/cloudrun/client` instead
  */
-declare const renderStillOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, forceBucketName, privacy, outName, imageFormat, envVariables, frame, jpegQuality, chromiumOptions, scale, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, offthreadVideoCacheSizeInBytes, }: import("./api/render-still-on-cloudrun").RenderStillOnCloudrunInput) => Promise<{
+declare const renderStillOnCloudrun: (options: import("./api/render-still-on-cloudrun").RenderStillOnCloudrunInput) => Promise<{
     type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.0.139",
+  "version": "4.0.140",
   "description": "GCP Cloud Run alternative to lambda rendering",
   "main": "dist/index.js",
   "dependencies": {
@@ -12,10 +12,10 @@
     "@google-cloud/logging": "^10.5.0",
     "google-auth-library": "^8.7.0",
     "zod": "^3.22.3",
-    "@remotion/bundler": "4.0.139",
-    "@remotion/cli": "4.0.139",
-    "@remotion/renderer": "4.0.139",
-    "remotion": "4.0.139"
+    "@remotion/bundler": "4.0.140",
+    "@remotion/cli": "4.0.140",
+    "remotion": "4.0.140",
+    "@remotion/renderer": "4.0.140"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.281",
@@ -26,7 +26,7 @@
     "prettier-plugin-organize-imports": "^3.2.4",
     "ts-node": "10.9.2",
     "vitest": "0.31.1",
-    "@remotion/compositor-linux-x64-gnu": "4.0.139"
+    "@remotion/compositor-linux-x64-gnu": "4.0.140"
   },
   "exports": {
     "./package.json": "./package.json",