@remotion/cloudrun 4.0.21 → 4.0.23

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

@@ -6,98 +6,117 @@ 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,
+            offthreadVideoCacheSizeInBytes: body.offthreadVideoCacheSizeInBytes,
+        });
+        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,93 @@ 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,
+            offthreadVideoCacheSizeInBytes: body.offthreadVideoCacheSizeInBytes,
+        });
+        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/dist/shared/read-dir.js

@@ -45,10 +45,12 @@ async function readDirectory({ dir, etags, originalDir, }) {
         // eslint-disable-next-line no-lonely-if
         if (fs.lstatSync(filePath).isSymbolicLink()) {
             const realPath = fs.realpathSync(filePath);
-            etags[path.relative(originalDir, filePath)] = await (0, get_etag_1.getEtagOfFile)(realPath);
+            etags[path.relative(originalDir, filePath)] =
+                await (0, get_etag_1.getEtagOfFile)(realPath);
         }
         else {
-            etags[path.relative(originalDir, filePath)] = await (0, get_etag_1.getEtagOfFile)(filePath);
+            etags[path.relative(originalDir, filePath)] =
+                await (0, get_etag_1.getEtagOfFile)(filePath);
         }
     }
     // Return the list of files with their etags and file names

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.0.21",
+  "version": "4.0.23",
   "description": "GCP Cloud Run alternative to lambda rendering",
   "main": "dist/index.js",
   "dependencies": {
@@ -12,21 +12,21 @@
     "@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.23",
+    "@remotion/renderer": "4.0.23",
+    "@remotion/cli": "4.0.23",
+    "remotion": "4.0.23"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
     "@types/node": "^18.11.2",
     "@types/minimist": "1.2.2",
     "eslint": "8.42.0",
-    "prettier": "^2.7.1",
+    "prettier": "3.0.2",
     "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.23"
   },
   "exports": {
     "./package.json": "./package.json",