@remotion/cloudrun 4.0.46 → 4.0.47

package/.turbo/turbo-build.log

@@ -1,14 +1,14 @@
 
-> @remotion/cloudrun@4.0.45 build /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.46 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.45 buildContainer /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.46 buildContainer /Users/jonathanburger/remotion/packages/cloudrun
 > ts-node src/admin/bundle-renderLogic.ts
 
 distribution bundled.
 
-> @remotion/cloudrun@4.0.45 tarInstaller /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.46 tarInstaller /Users/jonathanburger/remotion/packages/cloudrun
 > ts-node src/admin/bundle-installer.ts
 
 Making reproducible build with gtar

package/LICENSE.md

@@ -38,4 +38,4 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord.
 
 You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)).
 
-Visit [companies.remotion.dev](https://companies.remotion.dev) for pricing and to buy a license.
+Visit [remotion.pro](https://www.remotion.pro) for pricing and to buy a license.

package/dist/admin/bundle-installer.js

@@ -8,6 +8,16 @@ const bundler_1 = require("@remotion/bundler");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
+const hasGTar = () => {
+    try {
+        const output = (0, child_process_1.execSync)('gtar --usage', {});
+        return output.includes('--sort');
+    }
+    catch (_a) {
+        return false;
+    }
+};
+exports.hasGTar = hasGTar;
 const bundleInstaller = async () => {
     const outdir = path_1.default.join(__dirname, '..', `build-installer`);
     (0, fs_1.mkdirSync)(outdir, { recursive: true });
@@ -43,13 +53,3 @@ const bundleInstaller = async () => {
     (0, fs_1.rmSync)(outdir, { recursive: true });
 };
 bundleInstaller();
-const hasGTar = () => {
-    try {
-        const output = (0, child_process_1.execSync)('gtar --usage', {});
-        return output.includes('--sort');
-    }
-    catch (_a) {
-        return false;
-    }
-};
-exports.hasGTar = hasGTar;

package/dist/api/helpers/lifecycle-rules.js

@@ -0,0 +1 @@
+"use strict";

package/dist/api/test/make-console.test.d.ts

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

package/dist/api/test/make-console.test.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const make_console_url_1 = require("../../cli/helpers/make-console-url");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
+(0, vitest_1.beforeEach)(() => {
+    delete process.env.GCLOUD_PROJECT;
+    delete process.env.REMOTION_GCP_PROJECT_ID;
+    delete process.env.K_CONFIGURATION;
+});
+(0, vitest_1.test)('app is in cloud tasks', () => {
+    process.env.GCLOUD_PROJECT = 'remotion-test-cloudtask';
+    process.env.K_CONFIGURATION = 'config';
+    const isInCloud = (0, is_in_cloud_task_1.isInCloudTask)();
+    (0, vitest_1.expect)(isInCloud).toBe(true);
+    const consoleUrl = (0, make_console_url_1.makeConsoleUrl)('asia-east1', 'test-name');
+    (0, vitest_1.expect)(consoleUrl).toBe('https://console.cloud.google.com/run/detail/asia-east1/test-name/logs?project=remotion-test-cloudtask');
+});
+(0, vitest_1.test)('app is not in cloud tasks', () => {
+    process.env.GCLOUD_PROJECT = 'remotion-test';
+    process.env.K_CONFIGURATION = 'config';
+    const isInCloud = (0, is_in_cloud_task_1.isInCloudTask)();
+    (0, vitest_1.expect)(isInCloud).toBe(true);
+    const consoleUrl = (0, make_console_url_1.makeConsoleUrl)('asia-east1', 'test-name');
+    (0, vitest_1.expect)(consoleUrl).toBe('https://console.cloud.google.com/run/detail/asia-east1/test-name/logs?project=remotion-test');
+});

package/dist/api/upload-dir.js

@@ -13,11 +13,6 @@ const getDirFiles = (entry) => {
 };
 exports.getDirFiles = getDirFiles;
 const uploadDir = async ({ bucket, localDir, onProgress, keyPrefix, toUpload, }) => {
-    const files = await getFiles(localDir, localDir, toUpload);
-    const progresses = {};
-    for (const file of files) {
-        progresses[file.name] = 0;
-    }
     async function getFiles(directory, originalDirectory, filesToUpload) {
         const dirents = await fs_1.promises.readdir(directory, { withFileTypes: true });
         const _files = await Promise.all(dirents
@@ -48,6 +43,11 @@ const uploadDir = async ({ bucket, localDir, onProgress, keyPrefix, toUpload, })
         }));
         return _files.flat(1);
     }
+    const files = await getFiles(localDir, localDir, toUpload);
+    const progresses = {};
+    for (const file of files) {
+        progresses[file.name] = 0;
+    }
     const cloudStorageClient = (0, get_cloud_storage_client_1.getCloudStorageClient)();
     const uploads = files.map((file) => {
         const filePath = file.name;

package/dist/cli/helpers/make-console-url.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeConsoleUrl = void 0;
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const makeConsoleUrl = (region, shortName) => {
-    return `https://console.cloud.google.com/run/detail/${region}/${shortName}/logs?project=${process.env.REMOTION_GCP_PROJECT_ID}`;
+    return `https://console.cloud.google.com/run/detail/${region}/${shortName}/logs?project=${(0, is_in_cloud_task_1.getProjectId)()}`;
 };
 exports.makeConsoleUrl = makeConsoleUrl;

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

@@ -52,8 +52,8 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     offthreadVideoCacheSizeInBytes: z.ZodNullable<z.ZodNumber>;
     colorSpace: z.ZodEnum<["default", "bt709"]>;
 }, "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;
@@ -92,8 +92,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;
@@ -169,8 +169,8 @@ export declare const CloudRunPayload: z.ZodDiscriminatedUnion<"type", [z.ZodObje
     logLevel: z.ZodEnum<["verbose", "info", "warn", "error"]>;
     offthreadVideoCacheSizeInBytes: z.ZodNullable<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
-    serveUrl: string;
     type: "still";
+    serveUrl: string;
     composition: string;
     serializedInputPropsWithCustomSchema: string;
     imageFormat: "png" | "jpeg" | "pdf" | "webp";
@@ -194,8 +194,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";
@@ -225,13 +225,13 @@ declare const renderFailResponsePayload: z.ZodObject<{
     name: z.ZodString;
     stack: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    message: string;
     type: "error";
+    message: string;
     name: string;
     stack: string;
 }, {
-    message: string;
     type: "error";
+    message: string;
     name: string;
     stack: string;
 }>;
@@ -244,19 +244,19 @@ declare const renderStillOnCloudrunResponsePayload: z.ZodObject<{
     renderId: z.ZodString;
     privacy: z.ZodEnum<["public-read", "project-private"]>;
 }, "strip", z.ZodTypeAny, {
-    bucketName: string;
-    size: number;
     type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }, {
-    bucketName: string;
-    size: number;
     type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }>;
@@ -269,19 +269,19 @@ declare const renderMediaOnCloudrunResponsePayload: z.ZodObject<{
     renderId: z.ZodString;
     privacy: z.ZodEnum<["public-read", "project-private"]>;
 }, "strip", z.ZodTypeAny, {
-    bucketName: string;
-    size: number;
     type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }, {
-    bucketName: string;
-    size: number;
     type: "success";
     privacy: "public-read" | "project-private";
     cloudStorageUri: string;
+    size: number;
+    bucketName: string;
     renderId: string;
     publicUrl?: string | null | undefined;
 }>;
@@ -293,15 +293,15 @@ declare const cloudRunCrashResponse: z.ZodObject<{
     requestCrashTime: z.ZodString;
     requestElapsedTimeInSeconds: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
-    message: "Service crashed without sending a response. Check the logs in GCP console.";
     type: "crash";
+    message: "Service crashed without sending a response. Check the logs in GCP console.";
     cloudRunEndpoint: string;
     requestStartTime: string;
     requestCrashTime: string;
     requestElapsedTimeInSeconds: number;
 }, {
-    message: "Service crashed without sending a response. Check the logs in GCP console.";
     type: "crash";
+    message: "Service crashed without sending a response. Check the logs in GCP console.";
     cloudRunEndpoint: string;
     requestStartTime: string;
     requestCrashTime: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.0.46",
+  "version": "4.0.47",
   "description": "GCP Cloud Run alternative to lambda rendering",
   "main": "dist/index.js",
   "dependencies": {
@@ -12,13 +12,13 @@
     "@google-cloud/logging": "^10.5.0",
     "google-auth-library": "^8.7.0",
     "zod": "^3.22.3",
-    "@remotion/bundler": "4.0.46",
-    "@remotion/cli": "4.0.46",
-    "remotion": "4.0.46",
-    "@remotion/renderer": "4.0.46"
+    "@remotion/bundler": "4.0.47",
+    "@remotion/cli": "4.0.47",
+    "remotion": "4.0.47",
+    "@remotion/renderer": "4.0.47"
   },
   "devDependencies": {
-    "@jonny/eslint-config": "3.0.266",
+    "@jonny/eslint-config": "3.0.276",
     "@types/node": "^18.11.2",
     "@types/minimist": "1.2.2",
     "eslint": "8.42.0",
@@ -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.46"
+    "@remotion/compositor-linux-x64-gnu": "4.0.47"
   },
   "exports": {
     "./package.json": "./package.json",