@remotion/cloudrun 4.0.21 → 4.0.22

package/.turbo/turbo-build.log

@@ -1,13 +1,13 @@
 
-> @remotion/cloudrun@4.0.20 build /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.21 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.20 buildContainer /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.21 buildContainer /Users/jonathanburger/remotion/packages/cloudrun
 > ts-node src/admin/bundle-renderLogic.ts
 
 distribution bundled.
 
-> @remotion/cloudrun@4.0.20 tarInstaller /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.21 tarInstaller /Users/jonathanburger/remotion/packages/cloudrun
 > ts-node src/admin/bundle-installer.ts
 

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

@@ -1,4 +1,4 @@
-import type { AudioCodec, ChromiumOptions, FrameRange, LogLevel, PixelFormat, ProResProfile, VideoImageFormat } from '@remotion/renderer';
+import type { AudioCodec, ChromiumOptions, FrameRange, LogLevel, PixelFormat, ProResProfile, VideoImageFormat, X264Preset } from '@remotion/renderer';
 import type { CloudRunCrashResponse, RenderMediaOnCloudrunOutput } from '../functions/helpers/payloads';
 import type { GcpRegion } from '../pricing/gcp-regions';
 import type { CloudrunCodec } from '../shared/validate-gcp-codec';
@@ -19,6 +19,7 @@ export type RenderMediaOnCloudrunInput = {
     audioBitrate?: string | null;
     videoBitrate?: string | null;
     proResProfile?: ProResProfile;
+    x264Preset?: X264Preset;
     crf?: number | undefined;
     pixelFormat?: PixelFormat;
     imageFormat?: VideoImageFormat;
@@ -56,6 +57,7 @@ export type RenderMediaOnCloudrunInput = {
  * @param params.audioBitrate The target bitrate for the audio of the generated video.
  * @param params.videoBitrate The target bitrate of the generated video.
  * @param params.proResProfile Sets a ProRes profile. Only applies to videos rendered with prores codec.
+ * @param params.x264Preset Sets a Preset profile. Only applies to videos rendered with h.264 codec.
  * @param params.crf Constant Rate Factor, controlling the quality.
  * @param params.pixelFormat Custom pixel format to use. Usually used for special use cases like transparent videos.
  * @param params.imageFormat Which image format the frames should be rendered in.
@@ -75,4 +77,4 @@ export type RenderMediaOnCloudrunInput = {
  * @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, delayRenderTimeoutInMilliseconds, concurrency, enforceAudioTrack, preferLossless, }: RenderMediaOnCloudrunInput) => Promise<RenderMediaOnCloudrunOutput | CloudRunCrashResponse>;
+export declare const renderMediaOnCloudrun: ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, codec, forceBucketName, privacy, outName, updateRenderProgress, jpegQuality, audioCodec, audioBitrate, videoBitrate, proResProfile, x264Preset, crf, pixelFormat, imageFormat, scale, everyNthFrame, numberOfGifLoops, frameRange, envVariables, chromiumOptions, muted, forceWidth, forceHeight, logLevel, delayRenderTimeoutInMilliseconds, concurrency, enforceAudioTrack, preferLossless, }: RenderMediaOnCloudrunInput) => Promise<RenderMediaOnCloudrunOutput | CloudRunCrashResponse>;

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

@@ -28,6 +28,7 @@ const get_cloudrun_endpoint_1 = require("./helpers/get-cloudrun-endpoint");
  * @param params.audioBitrate The target bitrate for the audio of the generated video.
  * @param params.videoBitrate The target bitrate of the generated video.
  * @param params.proResProfile Sets a ProRes profile. Only applies to videos rendered with prores codec.
+ * @param params.x264Preset Sets a Preset profile. Only applies to videos rendered with h.264 codec.
  * @param params.crf Constant Rate Factor, controlling the quality.
  * @param params.pixelFormat Custom pixel format to use. Usually used for special use cases like transparent videos.
  * @param params.imageFormat Which image format the frames should be rendered in.
@@ -47,7 +48,7 @@ const get_cloudrun_endpoint_1 = require("./helpers/get-cloudrun-endpoint");
  * @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, delayRenderTimeoutInMilliseconds, concurrency, enforceAudioTrack, preferLossless, }) => {
+const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUrl, composition, inputProps, codec, forceBucketName, privacy, outName, updateRenderProgress, jpegQuality, audioCodec, audioBitrate, videoBitrate, proResProfile, x264Preset, 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)
@@ -76,6 +77,7 @@ const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
         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,
+        x264Preset: x264Preset !== null && x264Preset !== void 0 ? x264Preset : 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,
@@ -107,13 +109,27 @@ const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
         const startTime = Date.now();
         const formattedStartTime = new Date().toISOString();
         const stream = postResponse.data;
+        let accumulatedChunks = ''; // A buffer to accumulate chunks.
         stream.on('data', (chunk) => {
-            const chunkResponse = JSON.parse(chunk.toString().trim());
-            if (chunkResponse.response) {
-                response = chunkResponse.response;
+            accumulatedChunks += chunk.toString(); // Add the new chunk to the buffer.
+            let parsedData;
+            try {
+                parsedData = JSON.parse(accumulatedChunks.trim());
+                accumulatedChunks = ''; // Clear the buffer after successful parsing.
             }
-            else if (chunkResponse.onProgress) {
-                updateRenderProgress === null || updateRenderProgress === void 0 ? void 0 : updateRenderProgress(chunkResponse.onProgress);
+            catch (e) {
+                // If parsing fails, it means we don't have a complete JSON string yet.
+                // We'll wait for more chunks.
+                return;
+            }
+            if (parsedData.response) {
+                response = parsedData.response;
+            }
+            else if (parsedData.onProgress) {
+                updateRenderProgress === null || updateRenderProgress === void 0 ? void 0 : updateRenderProgress(parsedData.onProgress);
+            }
+            if (parsedData.type === 'error') {
+                reject(parsedData);
             }
         });
         stream.on('end', () => {
@@ -122,7 +138,7 @@ const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
                 const formattedCrashTime = new Date().toISOString();
                 updateRenderProgress === null || updateRenderProgress === void 0 ? void 0 : updateRenderProgress(0, true);
                 resolve({
-                    status: 'crash',
+                    type: 'crash',
                     cloudRunEndpoint,
                     message: 'Service crashed without sending a response. Check the logs in GCP console.',
                     requestStartTime: formattedStartTime,
@@ -130,8 +146,8 @@ const renderMediaOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
                     requestElapsedTimeInSeconds: (crashTime - startTime) / 1000,
                 });
             }
-            else if (response.status !== 'success' && response.status !== 'crash') {
-                throw new Error(response.stack);
+            else if (response.type !== 'success' && response.type !== 'crash') {
+                throw response;
             }
             resolve(response);
         });

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

@@ -1,5 +1,5 @@
 import type { ChromiumOptions, LogLevel, StillImageFormat } from '@remotion/renderer';
-import type { RenderStillOnCloudrunOutput } from '../functions/helpers/payloads';
+import type { CloudRunCrashResponse, ErrorResponsePayload, RenderStillOnCloudrunOutput } from '../functions/helpers/payloads';
 import type { GcpRegion } from '../pricing/gcp-regions';
 export type RenderStillOnCloudrunInput = {
     cloudRunUrl?: string;
@@ -46,4 +46,4 @@ export type RenderStillOnCloudrunInput = {
  * @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, delayRenderTimeoutInMilliseconds, }: 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 | ErrorResponsePayload | CloudRunCrashResponse>;

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

@@ -66,11 +66,59 @@ const renderStillOnCloudrun = async ({ cloudRunUrl, serviceName, region, serveUr
         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({
+    const postResponse = await client.request({
         url: cloudRunUrl,
         method: 'POST',
         data,
+        responseType: 'stream',
     });
-    return renderResponse.data;
+    const renderResponse = await new Promise((resolve, reject) => {
+        let response;
+        const startTime = Date.now();
+        const formattedStartTime = new Date().toISOString();
+        const stream = postResponse.data;
+        let accumulatedChunks = ''; // A buffer to accumulate chunks.
+        stream.on('data', (chunk) => {
+            accumulatedChunks += chunk.toString(); // Add the new chunk to the buffer.
+            let parsedData;
+            try {
+                parsedData = JSON.parse(accumulatedChunks.trim());
+                accumulatedChunks = ''; // Clear the buffer after successful parsing.
+            }
+            catch (e) {
+                // If parsing fails, it means we don't have a complete JSON string yet.
+                // We'll wait for more chunks.
+                return;
+            }
+            if (parsedData.response) {
+                response = parsedData.response;
+            }
+            if (parsedData.type === 'error') {
+                reject(parsedData);
+            }
+        });
+        stream.on('end', () => {
+            if (!response) {
+                const crashTime = Date.now();
+                const formattedCrashTime = new Date().toISOString();
+                resolve({
+                    type: 'crash',
+                    cloudRunEndpoint,
+                    message: 'Service crashed without sending a response. Check the logs in GCP console.',
+                    requestStartTime: formattedStartTime,
+                    requestCrashTime: formattedCrashTime,
+                    requestElapsedTimeInSeconds: (crashTime - startTime) / 1000,
+                });
+            }
+            else if (response.type !== 'success' && response.type !== 'crash') {
+                throw response;
+            }
+            resolve(response);
+        });
+        stream.on('error', (error) => {
+            reject(error);
+        });
+    });
+    return renderResponse;
 };
 exports.renderStillOnCloudrun = renderStillOnCloudrun;

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

@@ -6,12 +6,10 @@ const config_1 = require("@remotion/cli/config");
 const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
 const download_file_1 = require("../../../api/download-file");
-const extract_mem_from_url_1 = require("../../../api/helpers/extract-mem-from-url");
-const extract_time_from_url_1 = require("../../../api/helpers/extract-time-from-url");
-const get_cloud_logging_client_1 = require("../../../api/helpers/get-cloud-logging-client");
 const render_media_on_cloudrun_1 = require("../../../api/render-media-on-cloudrun");
 const validate_serveurl_1 = require("../../../shared/validate-serveurl");
 const args_1 = require("../../args");
+const cloudrun_crash_logs_1 = require("../../helpers/cloudrun-crash-logs");
 const log_1 = require("../../log");
 const renderArgsCheck_1 = require("./helpers/renderArgsCheck");
 exports.RENDER_COMMAND = 'render';
@@ -152,55 +150,10 @@ ${downloadName ? `		Downloaded File = ${downloadName}` : ''}
         enforceAudioTrack,
         preferLossless: false,
     });
-    if (res.status === 'crash') {
-        let timeoutPreMsg = '';
-        const timeout = (0, extract_time_from_url_1.extractTimeoutFromURL)(res.cloudRunEndpoint);
-        const memoryLimit = (0, extract_mem_from_url_1.extractMemoryFromURL)(res.cloudRunEndpoint);
-        if (timeout && res.requestElapsedTimeInSeconds + 10 > timeout) {
-            timeoutPreMsg = `Render call likely timed out. Service timeout is ${timeout} seconds, and render took at least ${res.requestElapsedTimeInSeconds.toFixed(1)} seconds.\n`;
-        }
-        else {
-            timeoutPreMsg = `Crash unlikely due to timeout. Render took ${res.requestElapsedTimeInSeconds.toFixed(1)} seconds, below the timeout of ${timeout} seconds.\n`;
-        }
-        log_1.Log.error(`Error rendering on Cloud Run. The Cloud Run service did not return a response.\n
-${timeoutPreMsg}The crash may be due to the service exceeding its memory limit of ${memoryLimit}.
-Full logs are available at https://console.cloud.google.com/run?project=${process.env.REMOTION_GCP_PROJECT_ID}\n`);
-        const cloudLoggingClient = (0, get_cloud_logging_client_1.getCloudLoggingClient)();
-        const listLogEntriesRequest = {
-            resourceNames: [`projects/${process.env.REMOTION_GCP_PROJECT_ID}`],
-            filter: `logName=projects/${process.env.REMOTION_GCP_PROJECT_ID}/logs/run.googleapis.com%2Fvarlog%2Fsystem AND (severity=WARNING OR severity=ERROR) AND timestamp >= "${res.requestStartTime}"`,
-        };
-        const logCheckCountdown = cli_1.CliInternals.createOverwriteableCliOutput({
-            quiet: cli_1.CliInternals.quietFlagProvided(),
-            cancelSignal: null,
-            updatesDontOverwrite: false,
-            indent: false,
-        });
-        await (() => {
-            return new Promise((resolve) => {
-                let timeLeft = 30;
-                const intervalId = setInterval(() => {
-                    logCheckCountdown.update(`GCP Cloud Logging takes time to ingest and index logs.\nFetching recent error/warning logs in ${timeLeft} seconds`, false);
-                    timeLeft--;
-                    if (timeLeft < 0) {
-                        logCheckCountdown.update('Fetching logs...\n\n', false);
-                        clearInterval(intervalId);
-                        resolve();
-                    }
-                }, 1000);
-            });
-        })();
-        const iterableLogListEntries = await cloudLoggingClient.listLogEntriesAsync(listLogEntriesRequest);
-        for await (const logResponse of iterableLogListEntries) {
-            const responseDate = new Date(Number(logResponse.timestamp.seconds) * 1000 +
-                Number(logResponse.timestamp.nanos) / 1000000);
-            const convertedDate = responseDate.toLocaleString();
-            log_1.Log.info(convertedDate);
-            log_1.Log.info(logResponse.textPayload);
-            log_1.Log.info();
-        }
+    if (res.type === 'crash') {
+        (0, cloudrun_crash_logs_1.displayCrashLogs)(res);
     }
-    else if (res.status === 'success') {
+    else if (res.type === 'success') {
         renderProgress.doneIn = Date.now() - renderStart;
         updateProgress();
         log_1.Log.info(`

package/dist/cli/commands/still.js

@@ -8,6 +8,7 @@ const remotion_1 = require("remotion");
 const download_file_1 = require("../../api/download-file");
 const render_still_on_cloudrun_1 = require("../../api/render-still-on-cloudrun");
 const validate_serveurl_1 = require("../../shared/validate-serveurl");
+const cloudrun_crash_logs_1 = require("../helpers/cloudrun-crash-logs");
 const log_1 = require("../log");
 const renderArgsCheck_1 = require("./render/helpers/renderArgsCheck");
 exports.STILL_COMMAND = 'still';
@@ -112,21 +113,26 @@ ${downloadName ? `    Downloaded File = ${downloadName}` : ''}
         logLevel: config_1.ConfigInternals.Logging.getLogLevel(),
         delayRenderTimeoutInMilliseconds: puppeteerTimeout,
     });
-    doneIn = Date.now() - renderStart;
-    updateProgress(true);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`Cloud Storage Uri = ${res.cloudStorageUri}`));
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`Render ID = ${res.renderId}`));
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`${Math.round(Number(res.size) / 1000)} KB, Privacy: ${res.privacy}, Bucket: ${res.bucketName}`));
-    log_1.Log.info(cli_1.CliInternals.chalk.blue(`○ ${res.publicUrl}`));
-    if (downloadName) {
-        log_1.Log.info('');
-        log_1.Log.info('downloading file...');
-        const { outputPath: 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}!`));
+    if (res.type === 'crash') {
+        (0, cloudrun_crash_logs_1.displayCrashLogs)(res);
+    }
+    else if (res.type === 'success') {
+        doneIn = Date.now() - renderStart;
+        updateProgress(true);
+        log_1.Log.info(cli_1.CliInternals.chalk.gray(`Cloud Storage Uri = ${res.cloudStorageUri}`));
+        log_1.Log.info(cli_1.CliInternals.chalk.gray(`Render ID = ${res.renderId}`));
+        log_1.Log.info(cli_1.CliInternals.chalk.gray(`${Math.round(Number(res.size) / 1000)} KB, Privacy: ${res.privacy}, Bucket: ${res.bucketName}`));
+        log_1.Log.info(cli_1.CliInternals.chalk.blue(`○ ${res.publicUrl}`));
+        if (downloadName) {
+            log_1.Log.info('');
+            log_1.Log.info('downloading file...');
+            const { outputPath: 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}!`));
+        }
     }
 };
 exports.stillCommand = stillCommand;

package/dist/cli/helpers/cloudrun-crash-logs.d.ts

@@ -0,0 +1,2 @@
+import type { CloudRunCrashResponse } from '../../functions/helpers/payloads';
+export declare const displayCrashLogs: (res: CloudRunCrashResponse) => Promise<void>;

package/dist/cli/helpers/cloudrun-crash-logs.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.displayCrashLogs = void 0;
+const cli_1 = require("@remotion/cli");
+const extract_mem_from_url_1 = require("../../api/helpers/extract-mem-from-url");
+const extract_time_from_url_1 = require("../../api/helpers/extract-time-from-url");
+const get_cloud_logging_client_1 = require("../../api/helpers/get-cloud-logging-client");
+const log_1 = require("../log");
+const displayCrashLogs = async (res) => {
+    let timeoutPreMsg = '';
+    const timeout = (0, extract_time_from_url_1.extractTimeoutFromURL)(res.cloudRunEndpoint);
+    const memoryLimit = (0, extract_mem_from_url_1.extractMemoryFromURL)(res.cloudRunEndpoint);
+    if (timeout && res.requestElapsedTimeInSeconds + 10 > timeout) {
+        timeoutPreMsg = `Render call likely timed out. Service timeout is ${timeout} seconds, and render took at least ${res.requestElapsedTimeInSeconds.toFixed(1)} seconds.\n`;
+    }
+    else {
+        timeoutPreMsg = `Crash unlikely due to timeout. Render took ${res.requestElapsedTimeInSeconds.toFixed(1)} seconds, below the timeout of ${timeout} seconds.\n`;
+    }
+    log_1.Log.error(`Error rendering on Cloud Run. The Cloud Run service did not return a response.\n
+${timeoutPreMsg}The crash may be due to the service exceeding its memory limit of ${memoryLimit}.
+Full logs are available at https://console.cloud.google.com/run?project=${process.env.REMOTION_GCP_PROJECT_ID}\n`);
+    const cloudLoggingClient = (0, get_cloud_logging_client_1.getCloudLoggingClient)();
+    const listLogEntriesRequest = {
+        resourceNames: [`projects/${process.env.REMOTION_GCP_PROJECT_ID}`],
+        filter: `logName=projects/${process.env.REMOTION_GCP_PROJECT_ID}/logs/run.googleapis.com%2Fvarlog%2Fsystem AND (severity=WARNING OR severity=ERROR) AND timestamp >= "${res.requestStartTime}"`,
+    };
+    const logCheckCountdown = cli_1.CliInternals.createOverwriteableCliOutput({
+        quiet: cli_1.CliInternals.quietFlagProvided(),
+        cancelSignal: null,
+        updatesDontOverwrite: false,
+        indent: false,
+    });
+    await (() => {
+        return new Promise((resolve) => {
+            let timeLeft = 30;
+            const intervalId = setInterval(() => {
+                logCheckCountdown.update(`GCP Cloud Logging takes time to ingest and index logs.\nFetching recent error/warning logs in ${timeLeft} seconds`, false);
+                timeLeft--;
+                if (timeLeft < 0) {
+                    logCheckCountdown.update('Fetching logs...\n\n', false);
+                    clearInterval(intervalId);
+                    resolve();
+                }
+            }, 1000);
+        });
+    })();
+    const iterableLogListEntries = await cloudLoggingClient.listLogEntriesAsync(listLogEntriesRequest);
+    for await (const logResponse of iterableLogListEntries) {
+        const responseDate = new Date(Number(logResponse.timestamp.seconds) * 1000 +
+            Number(logResponse.timestamp.nanos) / 1000000);
+        const convertedDate = responseDate.toLocaleString();
+        log_1.Log.info(convertedDate);
+        log_1.Log.info(logResponse.textPayload);
+        log_1.Log.info();
+    }
+};
+exports.displayCrashLogs = displayCrashLogs;

package/dist/cli/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = void 0;
+const cli_1 = require("@remotion/cli");
+const config_1 = require("@remotion/cli/config");
+const renderer_1 = require("@remotion/renderer");
 const args_1 = require("./args");
 const permissions_1 = require("./commands/permissions");
 const regions_1 = require("./commands/regions");
@@ -43,13 +46,26 @@ const matchCommand = (args, remotionRoot) => {
     (0, quit_1.quit)(1);
 };
 const executeCommand = async (args, remotionRoot) => {
+    var _a, _b;
     try {
         await matchCommand(args, remotionRoot);
     }
     catch (err) {
         const error = err;
-        // todo: catch errors and print a message. Check lambda cli for example
-        log_1.Log.error(error.stack);
+        if (error instanceof renderer_1.RenderInternals.SymbolicateableError) {
+            await cli_1.CliInternals.handleCommonError(error, config_1.ConfigInternals.Logging.getLogLevel());
+        }
+        else {
+            const frames = renderer_1.RenderInternals.parseStack((_b = (_a = error.stack) === null || _a === void 0 ? void 0 : _a.split('\n')) !== null && _b !== void 0 ? _b : []);
+            const errorWithStackFrame = new renderer_1.RenderInternals.SymbolicateableError({
+                message: error.message,
+                frame: null,
+                name: error.name,
+                stack: error.stack,
+                stackFrame: frames,
+            });
+            await cli_1.CliInternals.handleCommonError(errorWithStackFrame, config_1.ConfigInternals.Logging.getLogLevel());
+        }
         (0, quit_1.quit)(1);
     }
 };

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

@@ -16,6 +16,7 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     imageFormat: z.ZodEnum<["png", "jpeg", "none"]>;
     scale: z.ZodNumber;
     proResProfile: z.ZodNullable<z.ZodEnum<["4444-xq", "4444", "hq", "standard", "light", "proxy"]>>;
+    x264Preset: z.ZodNullable<z.ZodEnum<["ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo"]>>;
     everyNthFrame: z.ZodNumber;
     numberOfGifLoops: z.ZodNullable<z.ZodNumber>;
     frameRange: z.ZodNullable<z.ZodUnion<[z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, z.ZodNumber]>>;
@@ -49,8 +50,8 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     enforceAudioTrack: z.ZodBoolean;
     preferLossless: z.ZodBoolean;
 }, "strip", z.ZodTypeAny, {
-    serveUrl: string;
     type: "media";
+    serveUrl: string;
     composition: string;
     codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     serializedInputPropsWithCustomSchema: string;
@@ -63,6 +64,7 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     imageFormat: "png" | "jpeg" | "none";
     scale: number;
     proResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | null;
+    x264Preset: "ultrafast" | "superfast" | "veryfast" | "faster" | "fast" | "medium" | "slow" | "slower" | "veryslow" | "placebo" | null;
     everyNthFrame: number;
     numberOfGifLoops: number | null;
     frameRange: ((number | [number, number]) & (number | [number, number] | undefined)) | null;
@@ -86,8 +88,8 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     outName?: string | undefined;
     privacy?: "public" | "private" | undefined;
 }, {
-    serveUrl: string;
     type: "media";
+    serveUrl: string;
     composition: string;
     codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     serializedInputPropsWithCustomSchema: string;
@@ -100,6 +102,7 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     imageFormat: "png" | "jpeg" | "none";
     scale: number;
     proResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | null;
+    x264Preset: "ultrafast" | "superfast" | "veryfast" | "faster" | "fast" | "medium" | "slow" | "slower" | "veryslow" | "placebo" | null;
     everyNthFrame: number;
     numberOfGifLoops: number | null;
     frameRange: ((number | [number, number]) & (number | [number, number] | undefined)) | null;
@@ -159,8 +162,8 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     delayRenderTimeoutInMilliseconds: z.ZodNumber;
     logLevel: z.ZodEnum<["verbose", "info", "warn", "error"]>;
 }, "strip", z.ZodTypeAny, {
-    serveUrl: string;
     type: "still";
+    serveUrl: string;
     composition: string;
     serializedInputPropsWithCustomSchema: string;
     imageFormat: "png" | "jpeg" | "pdf" | "webp";
@@ -183,8 +186,8 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     } | undefined;
     outName?: string | undefined;
 }, {
-    serveUrl: string;
     type: "still";
+    serveUrl: string;
     composition: string;
     serializedInputPropsWithCustomSchema: string;
     imageFormat: "png" | "jpeg" | "pdf" | "webp";
@@ -208,20 +211,23 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     outName?: string | undefined;
 }>]>;
 declare const renderFailResponsePayload: z.ZodObject<{
-    status: z.ZodLiteral<"error">;
-    error: z.ZodString;
+    type: z.ZodLiteral<"error">;
+    message: z.ZodString;
+    name: z.ZodString;
     stack: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    error: string;
-    status: "error";
+    type: "error";
+    message: string;
+    name: string;
     stack: string;
 }, {
-    error: string;
-    status: "error";
+    type: "error";
+    message: string;
+    name: string;
     stack: string;
 }>;
 declare const renderStillOnCloudrunResponsePayload: z.ZodObject<{
-    status: z.ZodLiteral<"success">;
+    type: z.ZodLiteral<"success">;
     publicUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     cloudStorageUri: z.ZodString;
     size: z.ZodNumber;
@@ -229,24 +235,24 @@ declare const renderStillOnCloudrunResponsePayload: z.ZodObject<{
     renderId: z.ZodString;
     privacy: z.ZodEnum<["public-read", "project-private"]>;
 }, "strip", z.ZodTypeAny, {
-    bucketName: string;
-    size: number;
-    status: "success";
+    type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }, {
-    bucketName: string;
-    size: number;
-    status: "success";
+    type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }>;
 declare const renderMediaOnCloudrunResponsePayload: z.ZodObject<{
-    status: z.ZodLiteral<"success">;
+    type: z.ZodLiteral<"success">;
     publicUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     cloudStorageUri: z.ZodString;
     size: z.ZodNumber;
@@ -254,39 +260,39 @@ declare const renderMediaOnCloudrunResponsePayload: z.ZodObject<{
     renderId: z.ZodString;
     privacy: z.ZodEnum<["public-read", "project-private"]>;
 }, "strip", z.ZodTypeAny, {
-    bucketName: string;
-    size: number;
-    status: "success";
+    type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }, {
-    bucketName: string;
-    size: number;
-    status: "success";
+    type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }>;
 declare const cloudRunCrashResponse: z.ZodObject<{
-    status: z.ZodLiteral<"crash">;
+    type: z.ZodLiteral<"crash">;
     cloudRunEndpoint: z.ZodString;
     message: z.ZodLiteral<"Service crashed without sending a response. Check the logs in GCP console.">;
     requestStartTime: z.ZodString;
     requestCrashTime: z.ZodString;
     requestElapsedTimeInSeconds: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
+    type: "crash";
     message: "Service crashed without sending a response. Check the logs in GCP console.";
-    status: "crash";
     cloudRunEndpoint: string;
     requestStartTime: string;
     requestCrashTime: string;
     requestElapsedTimeInSeconds: number;
 }, {
+    type: "crash";
     message: "Service crashed without sending a response. Check the logs in GCP console.";
-    status: "crash";
     cloudRunEndpoint: string;
     requestStartTime: string;
     requestCrashTime: string;

package/dist/functions/helpers/payloads.js

@@ -10,6 +10,7 @@ const pixelFormat = zod_1.z.enum(renderer_1.RenderInternals.validPixelFormats);
 const videoImageFormat = zod_1.z.enum(renderer_1.RenderInternals.validVideoImageFormats);
 const stillImageFormat = zod_1.z.enum(renderer_1.RenderInternals.validStillImageFormats);
 const proResProfile = zod_1.z.enum(client_1.BrowserSafeApis.proResProfileOptions).nullable();
+const x264Preset = zod_1.z.enum(client_1.BrowserSafeApis.x264PresetOptions).nullable();
 const chromiumOptions = zod_1.z.object({
     ignoreCertificateErrors: zod_1.z.boolean().optional(),
     disableWebSecurity: zod_1.z.boolean().optional(),
@@ -36,6 +37,7 @@ exports.CloudRunPayload = zod_1.z.discriminatedUnion('type', [
         imageFormat: videoImageFormat,
         scale: zod_1.z.number(),
         proResProfile,
+        x264Preset,
         everyNthFrame: zod_1.z.number(),
         numberOfGifLoops: zod_1.z.number().nullable(),
         frameRange: zod_1.z.tuple([zod_1.z.number(), zod_1.z.number()]).or(zod_1.z.number()).nullable(),
@@ -72,12 +74,13 @@ exports.CloudRunPayload = zod_1.z.discriminatedUnion('type', [
     }),
 ]);
 const renderFailResponsePayload = zod_1.z.object({
-    status: zod_1.z.literal('error'),
-    error: zod_1.z.string(),
+    type: zod_1.z.literal('error'),
+    message: zod_1.z.string(),
+    name: zod_1.z.string(),
     stack: zod_1.z.string(),
 });
 const renderStillOnCloudrunResponsePayload = zod_1.z.object({
-    status: zod_1.z.literal('success'),
+    type: zod_1.z.literal('success'),
     publicUrl: zod_1.z.string().optional().nullable(),
     cloudStorageUri: zod_1.z.string(),
     size: zod_1.z.number(),
@@ -86,7 +89,7 @@ const renderStillOnCloudrunResponsePayload = zod_1.z.object({
     privacy: zod_1.z.enum(['public-read', 'project-private']),
 });
 const renderMediaOnCloudrunResponsePayload = zod_1.z.object({
-    status: zod_1.z.literal('success'),
+    type: zod_1.z.literal('success'),
     publicUrl: zod_1.z.string().optional().nullable(),
     cloudStorageUri: zod_1.z.string(),
     size: zod_1.z.number(),
@@ -95,7 +98,7 @@ const renderMediaOnCloudrunResponsePayload = zod_1.z.object({
     privacy: zod_1.z.enum(['public-read', 'project-private']),
 });
 const cloudRunCrashResponse = zod_1.z.object({
-    status: zod_1.z.literal('crash'),
+    type: zod_1.z.literal('crash'),
     cloudRunEndpoint: zod_1.z.string(),
     message: zod_1.z.literal('Service crashed without sending a response. Check the logs in GCP console.'),
     requestStartTime: zod_1.z.string().datetime(),

package/dist/functions/helpers/write-cloudrun-error.d.ts

@@ -0,0 +1,12 @@
+export type CloudrunErrorInfo = {
+    type: 'renderer' | 'browser' | 'stitcher' | 'webhook';
+    message: string;
+    name: string;
+    stack: string;
+};
+export declare const writeCloudrunError: ({ bucketName, renderId, errorInfo, publicUpload, }: {
+    bucketName: string;
+    renderId: string;
+    errorInfo: CloudrunErrorInfo;
+    publicUpload: boolean;
+}) => Promise<void>;

package/dist/functions/helpers/write-cloudrun-error.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeCloudrunError = void 0;
+const storage_1 = require("@google-cloud/storage");
+const node_fs_1 = __importDefault(require("node:fs"));
+const writeCloudrunError = async ({ bucketName, renderId, errorInfo, publicUpload, }) => {
+    const storage = new storage_1.Storage();
+    const tempFilePath = '/tmp/errorInfo.txt';
+    node_fs_1.default.writeFileSync(tempFilePath, JSON.stringify(errorInfo));
+    await storage.bucket(bucketName).upload(tempFilePath, {
+        destination: `renders/${renderId}/error.txt`,
+        predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
+    });
+};
+exports.writeCloudrunError = writeCloudrunError;

package/dist/functions/index.js

@@ -2,14 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderOnCloudRun = void 0;
 const renderer_1 = require("@remotion/renderer");
-const log_1 = require("../cli/log");
 const payloads_1 = require("./helpers/payloads");
 const render_media_single_thread_1 = require("./render-media-single-thread");
 const render_still_single_thread_1 = require("./render-still-single-thread");
 const renderOnCloudRun = async (req, res) => {
-    var _a;
     try {
-        log_1.Log.info('renderOnCloudRun', req.body);
         const body = payloads_1.CloudRunPayload.parse(req.body);
         const renderType = body.type;
         renderer_1.RenderInternals.setLogLevel(body.logLevel);
@@ -27,13 +24,14 @@ const renderOnCloudRun = async (req, res) => {
         }
     }
     catch (err) {
-        log_1.Log.error('Error while rendering', err);
         const response = {
-            error: err.message,
-            status: 'error',
-            stack: (_a = err.stack) !== null && _a !== void 0 ? _a : '',
+            type: 'error',
+            message: err.message,
+            name: err.name,
+            stack: err.stack,
         };
-        res.status(500).send(JSON.stringify(response));
+        res.write(JSON.stringify(response));
+        res.end();
     }
 };
 exports.renderOnCloudRun = renderOnCloudRun;

package/dist/functions/render-media-single-thread.js

@@ -6,98 +6,116 @@ const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
 const random_hash_1 = require("../shared/random-hash");
 const get_composition_from_body_1 = require("./helpers/get-composition-from-body");
+const write_cloudrun_error_1 = require("./helpers/write-cloudrun-error");
 const renderMediaSingleThread = async (body, res) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (body.type !== 'media') {
         throw new Error('expected type media');
     }
-    const composition = await (0, get_composition_from_body_1.getCompositionFromBody)(body);
-    const defaultOutName = `out.${renderer_1.RenderInternals.getFileExtensionFromCodec(body.codec, body.audioCodec)}`;
-    const tempFilePath = `/tmp/${defaultOutName}`;
     const renderId = (0, random_hash_1.randomHash)({ randomInTests: true });
-    let previousProgress = 2;
-    const onProgress = ({ progress }) => {
-        if (previousProgress !== progress) {
-            res.write(JSON.stringify({ onProgress: progress }) + '\n');
-            previousProgress = progress;
-        }
-    };
-    res.writeHead(200, { 'Content-Type': 'text/html' });
-    const actualChromiumOptions = {
-        ...body.chromiumOptions,
-        // Override the `null` value, which might come from CLI with swANGLE
-        gl: (_b = (_a = body.chromiumOptions) === null || _a === void 0 ? void 0 : _a.gl) !== null && _b !== void 0 ? _b : 'swangle',
-    };
-    await renderer_1.RenderInternals.internalRenderMedia({
-        composition: {
-            ...composition,
-            height: (_c = body.forceHeight) !== null && _c !== void 0 ? _c : composition.height,
-            width: (_d = body.forceWidth) !== null && _d !== void 0 ? _d : composition.width,
-        },
-        serveUrl: body.serveUrl,
-        codec: body.codec,
-        outputLocation: tempFilePath,
-        serializedInputPropsWithCustomSchema: body.serializedInputPropsWithCustomSchema,
-        serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
-            data: composition.props,
-            indent: undefined,
-            staticBase: null,
-        }).serializedString,
-        jpegQuality: body.jpegQuality,
-        audioCodec: body.audioCodec,
-        audioBitrate: body.audioBitrate,
-        videoBitrate: body.videoBitrate,
-        crf: body.crf,
-        pixelFormat: body.pixelFormat,
-        imageFormat: body.imageFormat,
-        scale: body.scale,
-        proResProfile: (_e = body.proResProfile) !== null && _e !== void 0 ? _e : undefined,
-        everyNthFrame: body.everyNthFrame,
-        numberOfGifLoops: body.numberOfGifLoops,
-        onProgress,
-        frameRange: body.frameRange,
-        envVariables: body.envVariables,
-        chromiumOptions: actualChromiumOptions,
-        muted: body.muted,
-        logLevel: body.logLevel,
-        browserExecutable: null,
-        timeoutInMilliseconds: body.delayRenderTimeoutInMilliseconds,
-        cancelSignal: undefined,
-        concurrency: (_f = body.concurrency) !== null && _f !== void 0 ? _f : '100%',
-        disallowParallelEncoding: false,
-        enforceAudioTrack: body.enforceAudioTrack,
-        ffmpegOverride: undefined,
-        indent: false,
-        onBrowserLog: null,
-        onCtrlCExit: () => undefined,
-        onDownload: () => undefined,
-        onStart: () => undefined,
-        overwrite: true,
-        port: null,
-        preferLossless: body.preferLossless,
-        puppeteerInstance: undefined,
-        server: undefined,
-    });
-    const storage = new storage_1.Storage();
-    const publicUpload = body.privacy === 'public' || !body.privacy;
-    const uploadedResponse = await storage
-        .bucket(body.outputBucket)
-        .upload(tempFilePath, {
-        destination: `renders/${renderId}/${(_g = body.outName) !== null && _g !== void 0 ? _g : defaultOutName}`,
-        predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
-    });
-    const uploadedFile = uploadedResponse[0];
-    const renderMetadata = await uploadedFile.getMetadata();
-    const responseData = {
-        status: 'success',
-        publicUrl: publicUpload ? uploadedFile.publicUrl() : null,
-        cloudStorageUri: uploadedFile.cloudStorageURI.href,
-        size: renderMetadata[0].size,
-        bucketName: body.outputBucket,
-        renderId,
-        privacy: publicUpload ? 'public-read' : 'project-private',
-    };
-    renderer_1.RenderInternals.Log.info('Render Completed:', responseData);
-    res.end(JSON.stringify({ response: responseData }));
+    try {
+        const composition = await (0, get_composition_from_body_1.getCompositionFromBody)(body);
+        const defaultOutName = `out.${renderer_1.RenderInternals.getFileExtensionFromCodec(body.codec, body.audioCodec)}`;
+        const tempFilePath = `/tmp/${defaultOutName}`;
+        let previousProgress = 2;
+        const onProgress = ({ progress }) => {
+            if (previousProgress !== progress) {
+                res.write(JSON.stringify({ onProgress: progress }) + '\n');
+                previousProgress = progress;
+            }
+        };
+        res.writeHead(200, { 'Content-Type': 'text/html' });
+        const actualChromiumOptions = {
+            ...body.chromiumOptions,
+            // Override the `null` value, which might come from CLI with swANGLE
+            gl: (_b = (_a = body.chromiumOptions) === null || _a === void 0 ? void 0 : _a.gl) !== null && _b !== void 0 ? _b : 'swangle',
+        };
+        await renderer_1.RenderInternals.internalRenderMedia({
+            composition: {
+                ...composition,
+                height: (_c = body.forceHeight) !== null && _c !== void 0 ? _c : composition.height,
+                width: (_d = body.forceWidth) !== null && _d !== void 0 ? _d : composition.width,
+            },
+            serveUrl: body.serveUrl,
+            codec: body.codec,
+            outputLocation: tempFilePath,
+            serializedInputPropsWithCustomSchema: body.serializedInputPropsWithCustomSchema,
+            serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
+                data: composition.props,
+                indent: undefined,
+                staticBase: null,
+            }).serializedString,
+            jpegQuality: body.jpegQuality,
+            audioCodec: body.audioCodec,
+            audioBitrate: body.audioBitrate,
+            videoBitrate: body.videoBitrate,
+            crf: body.crf,
+            pixelFormat: body.pixelFormat,
+            imageFormat: body.imageFormat,
+            scale: body.scale,
+            proResProfile: (_e = body.proResProfile) !== null && _e !== void 0 ? _e : undefined,
+            x264Preset: (_f = body.x264Preset) !== null && _f !== void 0 ? _f : undefined,
+            everyNthFrame: body.everyNthFrame,
+            numberOfGifLoops: body.numberOfGifLoops,
+            onProgress,
+            frameRange: body.frameRange,
+            envVariables: body.envVariables,
+            chromiumOptions: actualChromiumOptions,
+            muted: body.muted,
+            logLevel: body.logLevel,
+            browserExecutable: null,
+            timeoutInMilliseconds: body.delayRenderTimeoutInMilliseconds,
+            cancelSignal: undefined,
+            concurrency: (_g = body.concurrency) !== null && _g !== void 0 ? _g : '100%',
+            disallowParallelEncoding: false,
+            enforceAudioTrack: body.enforceAudioTrack,
+            ffmpegOverride: undefined,
+            indent: false,
+            onBrowserLog: null,
+            onCtrlCExit: () => undefined,
+            onDownload: () => undefined,
+            onStart: () => undefined,
+            overwrite: true,
+            port: null,
+            preferLossless: body.preferLossless,
+            puppeteerInstance: undefined,
+            server: undefined,
+        });
+        const storage = new storage_1.Storage();
+        const publicUpload = body.privacy === 'public' || !body.privacy;
+        const uploadedResponse = await storage
+            .bucket(body.outputBucket)
+            .upload(tempFilePath, {
+            destination: `renders/${renderId}/${(_h = body.outName) !== null && _h !== void 0 ? _h : defaultOutName}`,
+            predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
+        });
+        const uploadedFile = uploadedResponse[0];
+        const renderMetadata = await uploadedFile.getMetadata();
+        const responseData = {
+            type: 'success',
+            publicUrl: publicUpload ? uploadedFile.publicUrl() : null,
+            cloudStorageUri: uploadedFile.cloudStorageURI.href,
+            size: renderMetadata[0].size,
+            bucketName: body.outputBucket,
+            renderId,
+            privacy: publicUpload ? 'public-read' : 'project-private',
+        };
+        renderer_1.RenderInternals.Log.info('Render Completed:', responseData);
+        res.end(JSON.stringify({ response: responseData }));
+    }
+    catch (err) {
+        await (0, write_cloudrun_error_1.writeCloudrunError)({
+            bucketName: body.outputBucket,
+            renderId,
+            errorInfo: {
+                name: err.name,
+                message: err.message,
+                stack: err.stack,
+                type: 'renderer',
+            },
+            publicUpload: body.privacy === 'public' || !body.privacy,
+        });
+        throw err;
+    }
 };
 exports.renderMediaSingleThread = renderMediaSingleThread;

package/dist/functions/render-still-single-thread.js

@@ -7,76 +7,92 @@ const remotion_1 = require("remotion");
 const log_1 = require("../cli/log");
 const random_hash_1 = require("../shared/random-hash");
 const get_composition_from_body_1 = require("./helpers/get-composition-from-body");
+const write_cloudrun_error_1 = require("./helpers/write-cloudrun-error");
 const renderStillSingleThread = async (body, res) => {
     var _a, _b, _c, _d, _e, _f;
     if (body.type !== 'still') {
         throw new Error('expected type still');
     }
-    log_1.Log.verbose('Rendering still frame', body);
-    const composition = await (0, get_composition_from_body_1.getCompositionFromBody)(body);
-    log_1.Log.verbose('Composition loaded', composition);
-    const tempFilePath = '/tmp/still.png';
     const renderId = (0, random_hash_1.randomHash)({ randomInTests: true });
-    const actualChromiumOptions = {
-        ...body.chromiumOptions,
-        // Override the `null` value, which might come from CLI with swANGLE
-        gl: (_b = (_a = body.chromiumOptions) === null || _a === void 0 ? void 0 : _a.gl) !== null && _b !== void 0 ? _b : 'swangle',
-    };
-    await renderer_1.RenderInternals.internalRenderStill({
-        composition: {
-            ...composition,
-            height: (_c = body.forceHeight) !== null && _c !== void 0 ? _c : composition.height,
-            width: (_d = body.forceWidth) !== null && _d !== void 0 ? _d : composition.width,
-        },
-        serveUrl: body.serveUrl,
-        output: tempFilePath,
-        serializedInputPropsWithCustomSchema: body.serializedInputPropsWithCustomSchema,
-        serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
-            data: composition.props,
-            indent: undefined,
-            staticBase: null,
-        }).serializedString,
-        jpegQuality: (_e = body.jpegQuality) !== null && _e !== void 0 ? _e : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
-        imageFormat: body.imageFormat,
-        scale: body.scale,
-        envVariables: body.envVariables,
-        chromiumOptions: actualChromiumOptions,
-        frame: body.frame,
-        logLevel: body.logLevel,
-        browserExecutable: null,
-        cancelSignal: null,
-        indent: false,
-        timeoutInMilliseconds: body.delayRenderTimeoutInMilliseconds,
-        onBrowserLog: null,
-        onDownload: null,
-        overwrite: true,
-        port: null,
-        puppeteerInstance: null,
-        server: undefined,
-    });
-    log_1.Log.info('Still rendered');
-    const storage = new storage_1.Storage();
-    const publicUpload = body.privacy === 'public' || !body.privacy;
-    const uploadedResponse = await storage
-        .bucket(body.outputBucket)
-        .upload(tempFilePath, {
-        destination: `renders/${renderId}/${(_f = body.outName) !== null && _f !== void 0 ? _f : 'out.png'}`,
-        predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
-    });
-    log_1.Log.info('Still uploaded');
-    const uploadedFile = uploadedResponse[0];
-    const renderMetadata = await uploadedFile.getMetadata();
-    const responseData = {
-        publicUrl: uploadedFile.publicUrl(),
-        cloudStorageUri: uploadedFile.cloudStorageURI.href,
-        size: renderMetadata[0].size,
-        bucketName: body.outputBucket,
-        renderId,
-        status: 'success',
-        privacy: publicUpload ? 'public-read' : 'project-private',
-    };
-    renderer_1.RenderInternals.Log.info('Render Completed:', responseData);
-    const jsonContent = JSON.stringify(responseData);
-    res.end(jsonContent);
+    try {
+        log_1.Log.verbose('Rendering still frame', body);
+        const composition = await (0, get_composition_from_body_1.getCompositionFromBody)(body);
+        log_1.Log.verbose('Composition loaded', composition);
+        const tempFilePath = '/tmp/still.png';
+        const actualChromiumOptions = {
+            ...body.chromiumOptions,
+            // Override the `null` value, which might come from CLI with swANGLE
+            gl: (_b = (_a = body.chromiumOptions) === null || _a === void 0 ? void 0 : _a.gl) !== null && _b !== void 0 ? _b : 'swangle',
+        };
+        await renderer_1.RenderInternals.internalRenderStill({
+            composition: {
+                ...composition,
+                height: (_c = body.forceHeight) !== null && _c !== void 0 ? _c : composition.height,
+                width: (_d = body.forceWidth) !== null && _d !== void 0 ? _d : composition.width,
+            },
+            serveUrl: body.serveUrl,
+            output: tempFilePath,
+            serializedInputPropsWithCustomSchema: body.serializedInputPropsWithCustomSchema,
+            serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
+                data: composition.props,
+                indent: undefined,
+                staticBase: null,
+            }).serializedString,
+            jpegQuality: (_e = body.jpegQuality) !== null && _e !== void 0 ? _e : renderer_1.RenderInternals.DEFAULT_JPEG_QUALITY,
+            imageFormat: body.imageFormat,
+            scale: body.scale,
+            envVariables: body.envVariables,
+            chromiumOptions: actualChromiumOptions,
+            frame: body.frame,
+            logLevel: body.logLevel,
+            browserExecutable: null,
+            cancelSignal: null,
+            indent: false,
+            timeoutInMilliseconds: body.delayRenderTimeoutInMilliseconds,
+            onBrowserLog: null,
+            onDownload: null,
+            overwrite: true,
+            port: null,
+            puppeteerInstance: null,
+            server: undefined,
+        });
+        log_1.Log.info('Still rendered');
+        const storage = new storage_1.Storage();
+        const publicUpload = body.privacy === 'public' || !body.privacy;
+        const uploadedResponse = await storage
+            .bucket(body.outputBucket)
+            .upload(tempFilePath, {
+            destination: `renders/${renderId}/${(_f = body.outName) !== null && _f !== void 0 ? _f : 'out.png'}`,
+            predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
+        });
+        log_1.Log.info('Still uploaded');
+        const uploadedFile = uploadedResponse[0];
+        const renderMetadata = await uploadedFile.getMetadata();
+        const responseData = {
+            publicUrl: uploadedFile.publicUrl(),
+            cloudStorageUri: uploadedFile.cloudStorageURI.href,
+            size: renderMetadata[0].size,
+            bucketName: body.outputBucket,
+            renderId,
+            type: 'success',
+            privacy: publicUpload ? 'public-read' : 'project-private',
+        };
+        renderer_1.RenderInternals.Log.info('Render Completed:', responseData);
+        res.end(JSON.stringify({ response: responseData }));
+    }
+    catch (err) {
+        await (0, write_cloudrun_error_1.writeCloudrunError)({
+            bucketName: body.outputBucket,
+            renderId,
+            errorInfo: {
+                name: err.name,
+                message: err.message,
+                stack: err.stack,
+                type: 'renderer',
+            },
+            publicUpload: body.privacy === 'public' || !body.privacy,
+        });
+        throw err;
+    }
 };
 exports.renderStillSingleThread = renderStillSingleThread;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.0.21",
+  "version": "4.0.22",
   "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.21.4",
-    "@remotion/bundler": "4.0.21",
-    "@remotion/cli": "4.0.21",
-    "@remotion/renderer": "4.0.21",
-    "remotion": "4.0.21"
+    "@remotion/bundler": "4.0.22",
+    "@remotion/cli": "4.0.22",
+    "remotion": "4.0.22",
+    "@remotion/renderer": "4.0.22"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
@@ -26,7 +26,7 @@
     "prettier-plugin-organize-imports": "^3.2.2",
     "ts-node": "^10.8.0",
     "vitest": "0.24.3",
-    "@remotion/compositor-linux-x64-gnu": "4.0.21"
+    "@remotion/compositor-linux-x64-gnu": "4.0.22"
   },
   "exports": {
     "./package.json": "./package.json",