@remotion/cloudrun 4.1.0-alpha3 → 4.1.0-alpha4

package/dist/functions/helpers/payloads.js

@@ -9,7 +9,7 @@ const audioCodec = zod_1.z.enum(renderer_1.RenderInternals.validAudioCodecs);
 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);
+const proResProfile = zod_1.z.enum(client_1.BrowserSafeApis.proResProfileOptions).nullable();
 const chromiumOptions = zod_1.z.object({
     ignoreCertificateErrors: zod_1.z.boolean().optional(),
     disableWebSecurity: zod_1.z.boolean().optional(),
@@ -26,26 +26,30 @@ exports.CloudRunPayload = zod_1.z.discriminatedUnion('type', [
         forceHeight: zod_1.z.number().optional().nullable(),
         forceWidth: zod_1.z.number().optional().nullable(),
         codec,
-        inputProps: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).or(zod_1.z.undefined()),
-        jpegQuality: zod_1.z.number().optional(),
-        audioCodec: audioCodec.optional().nullable(),
-        audioBitrate: zod_1.z.string().optional().nullable(),
-        videoBitrate: zod_1.z.string().optional().nullable(),
-        crf: zod_1.z.number().optional().nullable(),
-        pixelFormat: pixelFormat.optional(),
-        imageFormat: videoImageFormat.optional(),
-        scale: zod_1.z.number().optional(),
-        proResProfile: proResProfile.optional(),
-        everyNthFrame: zod_1.z.number().optional(),
-        numberOfGifLoops: zod_1.z.number().optional().nullable(),
-        frameRange: zod_1.z.tuple([zod_1.z.number(), zod_1.z.number()]).or(zod_1.z.number()).optional(),
-        envVariables: zod_1.z.record(zod_1.z.string()).optional(),
+        inputProps: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()),
+        jpegQuality: zod_1.z.number(),
+        audioCodec: audioCodec.nullable(),
+        audioBitrate: zod_1.z.string().nullable(),
+        videoBitrate: zod_1.z.string().nullable(),
+        crf: zod_1.z.number().nullable(),
+        pixelFormat,
+        imageFormat: videoImageFormat,
+        scale: zod_1.z.number(),
+        proResProfile,
+        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(),
+        envVariables: zod_1.z.record(zod_1.z.string()),
         chromiumOptions: chromiumOptions.optional(),
-        muted: zod_1.z.boolean().optional(),
+        muted: zod_1.z.boolean(),
         outputBucket: zod_1.z.string(),
         outName: zod_1.z.string().optional(),
         privacy: zod_1.z.enum(['public', 'private']).optional(),
         logLevel,
+        delayRenderTimeoutInMilliseconds: zod_1.z.number(),
+        concurrency: zod_1.z.number().or(zod_1.z.string()).nullable(),
+        enforceAudioTrack: zod_1.z.boolean(),
+        preferLossless: zod_1.z.boolean(),
     }),
     zod_1.z.object({
         type: zod_1.z.literal('still'),
@@ -53,16 +57,17 @@ exports.CloudRunPayload = zod_1.z.discriminatedUnion('type', [
         composition: zod_1.z.string(),
         forceHeight: zod_1.z.number().optional().nullable(),
         forceWidth: zod_1.z.number().optional().nullable(),
-        inputProps: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).or(zod_1.z.undefined()),
+        inputProps: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()),
         jpegQuality: zod_1.z.number().optional(),
-        imageFormat: stillImageFormat.optional(),
-        scale: zod_1.z.number().optional(),
-        privacy: zod_1.z.enum(['public', 'private']).optional(),
-        envVariables: zod_1.z.record(zod_1.z.string()).optional(),
+        imageFormat: stillImageFormat,
+        scale: zod_1.z.number(),
+        privacy: zod_1.z.enum(['public', 'private']),
+        envVariables: zod_1.z.record(zod_1.z.string()),
         chromiumOptions: chromiumOptions.optional(),
         outputBucket: zod_1.z.string(),
         outName: zod_1.z.string().optional(),
         frame: zod_1.z.number(),
+        delayRenderTimeoutInMilliseconds: zod_1.z.number(),
         logLevel,
     }),
 ]);

package/dist/functions/index.js

@@ -8,10 +8,11 @@ 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;
-    const body = payloads_1.CloudRunPayload.parse(req.body);
-    const renderType = body.type;
-    renderer_1.RenderInternals.setLogLevel(body.logLevel);
     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);
         switch (renderType) {
             case 'media':
                 await (0, render_media_single_thread_1.renderMediaSingleThread)(body, res);

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

@@ -6,7 +6,7 @@ const renderer_1 = require("@remotion/renderer");
 const random_hash_1 = require("../shared/random-hash");
 const get_composition_from_body_1 = require("./helpers/get-composition-from-body");
 const renderMediaSingleThread = async (body, res) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (body.type !== 'media') {
         throw new Error('expected type media');
     }
@@ -26,7 +26,7 @@ const renderMediaSingleThread = async (body, res) => {
         // 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 (0, renderer_1.renderMedia)({
+    await renderer_1.RenderInternals.internalRenderMedia({
         composition: {
             ...composition,
             height: (_c = body.forceHeight) !== null && _c !== void 0 ? _c : composition.height,
@@ -44,7 +44,7 @@ const renderMediaSingleThread = async (body, res) => {
         pixelFormat: body.pixelFormat,
         imageFormat: body.imageFormat,
         scale: body.scale,
-        proResProfile: body.proResProfile,
+        proResProfile: (_e = body.proResProfile) !== null && _e !== void 0 ? _e : undefined,
         everyNthFrame: body.everyNthFrame,
         numberOfGifLoops: body.numberOfGifLoops,
         onProgress,
@@ -52,14 +52,31 @@ const renderMediaSingleThread = async (body, res) => {
         envVariables: body.envVariables,
         chromiumOptions: actualChromiumOptions,
         muted: body.muted,
-        verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(body.logLevel, 'verbose'),
+        logLevel: body.logLevel,
+        browserExecutable: null,
+        timeoutInMilliseconds: body.delayRenderTimeoutInMilliseconds,
+        cancelSignal: undefined,
+        concurrency: body.concurrency,
+        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}/${(_e = body.outName) !== null && _e !== void 0 ? _e : 'out.mp4'}`,
+        destination: `renders/${renderId}/${(_f = body.outName) !== null && _f !== void 0 ? _f : 'out.mp4'}`,
         predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
     });
     const uploadedFile = uploadedResponse[0];

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

@@ -7,7 +7,7 @@ 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 renderStillSingleThread = async (body, res) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (body.type !== 'still') {
         throw new Error('expected type still');
     }
@@ -21,7 +21,7 @@ const renderStillSingleThread = async (body, res) => {
         // 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 (0, renderer_1.renderStill)({
+    await renderer_1.RenderInternals.internalRenderStill({
         composition: {
             ...composition,
             height: (_c = body.forceHeight) !== null && _c !== void 0 ? _c : composition.height,
@@ -30,13 +30,23 @@ const renderStillSingleThread = async (body, res) => {
         serveUrl: body.serveUrl,
         output: tempFilePath,
         inputProps: body.inputProps,
-        jpegQuality: body.jpegQuality,
+        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,
-        verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(body.logLevel, 'verbose'),
+        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();
@@ -44,7 +54,7 @@ const renderStillSingleThread = async (body, res) => {
     const uploadedResponse = await storage
         .bucket(body.outputBucket)
         .upload(tempFilePath, {
-        destination: `renders/${renderId}/${(_e = body.outName) !== null && _e !== void 0 ? _e : 'out.png'}`,
+        destination: `renders/${renderId}/${(_f = body.outName) !== null && _f !== void 0 ? _f : 'out.png'}`,
         predefinedAcl: publicUpload ? 'publicRead' : 'projectPrivate',
     });
     log_1.Log.info('Still uploaded');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.1.0-alpha3",
+  "version": "4.1.0-alpha4",
   "description": "GCP Cloud Run alternative to lambda rendering",
   "main": "dist/index.js",
   "dependencies": {
@@ -11,22 +11,22 @@
     "@google-cloud/resource-manager": "^4.3.0",
     "google-auth-library": "^8.7.0",
     "zod": "^3.21.4",
-    "@remotion/bundler": "4.1.0-alpha3",
-    "@remotion/renderer": "4.1.0-alpha3",
-    "@remotion/cli": "4.1.0-alpha3",
-    "remotion": "4.1.0-alpha3"
+    "@remotion/bundler": "4.1.0-alpha4",
+    "@remotion/cli": "4.1.0-alpha4",
+    "remotion": "4.1.0-alpha4",
+    "@remotion/renderer": "4.1.0-alpha4"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.266",
     "@types/node": "^18.11.2",
     "@types/minimist": "1.2.2",
-    "eslint": "8.25.0",
+    "eslint": "8.42.0",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.2.2",
     "ts-node": "^10.8.0",
     "typescript": "4.7.2",
     "vitest": "0.24.3",
-    "@remotion/compositor-linux-x64-gnu": "4.1.0-alpha3"
+    "@remotion/compositor-linux-x64-gnu": "4.1.0-alpha4"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -49,7 +49,6 @@
     "build": "tsc -d && cp src/shared/sa-permissions.json dist/shared/sa-permissions.json && pnpm run buildContainer && pnpm run tarInstaller",
     "buildContainer": "ts-node src/admin/bundle-renderLogic.ts",
     "tarInstaller": "ts-node src/admin/bundle-installer.ts",
-    "start": "functions-framework --target=TypescriptFunction",
     "watch": "tsc -w",
     "lint": "eslint src --ext ts,tsx",
     "test": "vitest --run"