@remotion/cloudrun 4.0.44 → 4.0.46

package/.turbo/turbo-build.log

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

package/.turbo/turbo-lint.log

@@ -0,0 +1,27 @@
+
+> @remotion/cloudrun@4.0.45 lint /Users/jonathanburger/remotion/packages/cloudrun
+> eslint src --ext ts,tsx
+
+Warning: React version was set to "detect" in eslint-plugin-react settings, but the "react" package is not installed. Assuming latest React version for linting.
+
+/Users/jonathanburger/remotion/packages/cloudrun/src/api/check-if-service-exists.ts
+  56:14  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+
+/Users/jonathanburger/remotion/packages/cloudrun/src/api/render-media-on-cloudrun.ts
+  217:3   warning  Unexpected 'todo' comment: 'TODO: Add any sort of type safety'  no-warning-comments
+  226:17  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
+
+/Users/jonathanburger/remotion/packages/cloudrun/src/api/render-still-on-cloudrun.ts
+  153:17  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+
+/Users/jonathanburger/remotion/packages/cloudrun/src/cli/commands/render/helpers/renderArgsCheck.ts
+  68:4  warning  Unexpected 'todo' comment: 'TODO: Log if there is an incompatible...'  no-warning-comments
+
+/Users/jonathanburger/remotion/packages/cloudrun/src/cli/commands/render/index.ts
+  118:2  warning  Unexpected 'todo' comment: 'Todo: Check cloudRunUrl is valid, as the...'  no-warning-comments
+
+/Users/jonathanburger/remotion/packages/cloudrun/src/cli/commands/still.ts
+  104:2  warning  Unexpected 'todo' comment: 'Todo: Check cloudRunUrl is valid, as the...'  no-warning-comments
+
+✖ 7 problems (0 errors, 7 warnings)
+

package/dist/admin/bundle-installer.js

@@ -45,8 +45,8 @@ const bundleInstaller = async () => {
 bundleInstaller();
 const hasGTar = () => {
     try {
-        const output = (0, child_process_1.execSync)('gtar --usage');
-        return output.includes('Usage: --sort');
+        const output = (0, child_process_1.execSync)('gtar --usage', {});
+        return output.includes('--sort');
     }
     catch (_a) {
         return false;

package/dist/api/delete-service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteService = void 0;
+const is_in_cloud_task_1 = require("../functions/helpers/is-in-cloud-task");
 const get_cloud_run_client_1 = require("./helpers/get-cloud-run-client");
 /**
  * @description Deletes a service from GCP Cloud Run
@@ -13,7 +14,7 @@ const deleteService = async (params) => {
     const cloudRunClient = (0, get_cloud_run_client_1.getCloudRunClient)();
     // Run request
     await cloudRunClient.deleteService({
-        name: `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${params.region}/services/${params.serviceName}`,
+        name: `projects/${(0, is_in_cloud_task_1.getProjectId)()}/locations/${params.region}/services/${params.serviceName}`,
     });
 };
 exports.deleteService = deleteService;

package/dist/api/get-service-info.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceInfo = void 0;
 const make_console_url_1 = require("../cli/helpers/make-console-url");
+const is_in_cloud_task_1 = require("../functions/helpers/is-in-cloud-task");
 const get_cloud_run_client_1 = require("./helpers/get-cloud-run-client");
 const parse_service_name_1 = require("./helpers/parse-service-name");
 /**
@@ -15,7 +16,7 @@ const getServiceInfo = async ({ region, serviceName, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const cloudRunClient = (0, get_cloud_run_client_1.getCloudRunClient)();
     const [service] = await cloudRunClient.getService({
-        name: `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${region}/services/${serviceName}`,
+        name: `projects/${(0, is_in_cloud_task_1.getProjectId)()}/locations/${region}/services/${serviceName}`,
     });
     if (!service) {
         throw new Error(`Service ${serviceName} not found`);

package/dist/api/helpers/get-auth-client-for-url.js

@@ -2,13 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAuthClientForUrl = void 0;
 const google_auth_library_1 = require("google-auth-library");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const getAuthClientForUrl = async (url) => {
-    const auth = new google_auth_library_1.GoogleAuth({
-        credentials: {
-            client_email: process.env.REMOTION_GCP_CLIENT_EMAIL,
-            private_key: process.env.REMOTION_GCP_PRIVATE_KEY,
-        },
-    });
+    let auth = new google_auth_library_1.GoogleAuth();
+    if ((0, is_in_cloud_task_1.isInCloudTask)()) {
+        auth = new google_auth_library_1.GoogleAuth({
+            projectId: (0, is_in_cloud_task_1.getProjectId)(),
+        });
+    }
+    else {
+        auth = new google_auth_library_1.GoogleAuth({
+            projectId: process.env.REMOTION_GCP_PROJECT_ID,
+            credentials: {
+                client_email: process.env.REMOTION_GCP_CLIENT_EMAIL,
+                private_key: process.env.REMOTION_GCP_PRIVATE_KEY,
+            },
+        });
+    }
     const client = await auth.getIdTokenClient(url);
     return client;
 };

package/dist/api/helpers/get-cloud-logging-client.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudLoggingClient = void 0;
 const logging_1 = require("@google-cloud/logging");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const { LoggingServiceV2Client } = logging_1.v2;
 const getCloudLoggingClient = () => {
+    if ((0, is_in_cloud_task_1.isInCloudTask)()) {
+        return new LoggingServiceV2Client({
+            projectId: (0, is_in_cloud_task_1.getProjectId)(),
+        });
+    }
     return new LoggingServiceV2Client({
         projectId: process.env.REMOTION_GCP_PROJECT_ID,
         credentials: {

package/dist/api/helpers/get-cloud-run-client.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudRunClient = void 0;
 const run_1 = require("@google-cloud/run");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const { ServicesClient } = run_1.v2;
 const getCloudRunClient = () => {
+    if ((0, is_in_cloud_task_1.isInCloudTask)()) {
+        return new ServicesClient({
+            projectId: (0, is_in_cloud_task_1.getProjectId)(),
+        });
+    }
     return new ServicesClient({
         projectId: process.env.REMOTION_GCP_PROJECT_ID,
         credentials: {

package/dist/api/helpers/get-cloud-storage-client.js

@@ -2,7 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudStorageClient = void 0;
 const storage_1 = require("@google-cloud/storage");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const getCloudStorageClient = () => {
+    if ((0, is_in_cloud_task_1.isInCloudTask)()) {
+        return new storage_1.Storage({
+            projectId: (0, is_in_cloud_task_1.getProjectId)(),
+        });
+    }
     return new storage_1.Storage({
         projectId: process.env.REMOTION_GCP_PROJECT_ID,
         credentials: {

package/dist/api/helpers/get-resource-manager-client.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResourceManagerClient = void 0;
 const resource_manager_1 = require("@google-cloud/resource-manager");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const { ProjectsClient } = resource_manager_1.v3;
 const getResourceManagerClient = () => {
+    if ((0, is_in_cloud_task_1.isInCloudTask)()) {
+        return new ProjectsClient({
+            projectId: (0, is_in_cloud_task_1.getProjectId)(),
+        });
+    }
     return new ProjectsClient({
         projectId: process.env.REMOTION_GCP_PROJECT_ID,
         credentials: {

package/dist/api/helpers/parse-service-name.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseServiceName = exports.getGcpParent = void 0;
 const make_console_url_1 = require("../../cli/helpers/make-console-url");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const getGcpParent = (region) => {
-    const parent = `projects/${process.env.REMOTION_GCP_PROJECT_ID}/locations/${region}`;
+    const parent = `projects/${(0, is_in_cloud_task_1.getProjectId)()}/locations/${region}`;
     return parent;
 };
 exports.getGcpParent = getGcpParent;

package/dist/api/iam-validation/testPermissions.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.testPermissions = exports.logPermissionOutput = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const get_resource_manager_client_1 = require("../helpers/get-resource-manager-client");
 const logPermissionOutput = (output) => {
     return [output.decision ? '✅' : '❌', output.permissionName].join(' ');
@@ -23,7 +24,7 @@ const testPermissions = async (params) => {
     const saPermissions = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../shared/sa-permissions.json'), 'utf-8'));
     const permissionList = saPermissions.list.map((permission) => permission.name);
     const response = await resourceManagerClient.testIamPermissions({
-        resource: `projects/${process.env.REMOTION_GCP_PROJECT_ID}`,
+        resource: `projects/${(0, is_in_cloud_task_1.getProjectId)()}`,
         permissions: permissionList,
     });
     const returnedPermissions = response[0].permissions;

package/dist/api/test/running-in-what-server.test.d.ts

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

package/dist/api/test/running-in-what-server.test.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+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)('is running in cloud tasks = true', () => {
+    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);
+});
+(0, vitest_1.test)('is running in cloud tasks = false', () => {
+    process.env.REMOTION_GCP_PROJECT_ID = 'remotion-test-cloudtask';
+    const isInCloud = (0, is_in_cloud_task_1.isInCloudTask)();
+    (0, vitest_1.expect)(isInCloud).toBe(false);
+});
+(0, vitest_1.test)('which project Id = remotion-test', () => {
+    process.env.REMOTION_GCP_PROJECT_ID = 'remotion-test';
+    const projectId = (0, is_in_cloud_task_1.getProjectId)();
+    (0, vitest_1.expect)(projectId).toBe('remotion-test');
+});
+(0, vitest_1.test)('which project Id = remotion-test-cloudtask', () => {
+    process.env.GCLOUD_PROJECT = 'remotion-test-cloudtask';
+    process.env.K_CONFIGURATION = 'config';
+    const projectId = (0, is_in_cloud_task_1.getProjectId)();
+    (0, vitest_1.expect)(projectId).toBe('remotion-test-cloudtask');
+});

package/dist/api/test/service-names.test.js

@@ -6,8 +6,8 @@ const parse_service_name_1 = require("../helpers/parse-service-name");
 const speculate_service_name_1 = require("../speculate-service-name");
 const dashedVersion = remotion_1.VERSION.replace(/\./g, '-');
 const region = 'asia-east1';
-process.env.REMOTION_GCP_PROJECT_ID = 'remotion-test-project';
 (0, vitest_1.test)('Parse service names', () => {
+    process.env.REMOTION_GCP_PROJECT_ID = 'remotion-test-project';
     const shortServiceName = (0, speculate_service_name_1.speculateServiceName)({
         cpuLimit: '8.0',
         memoryLimit: '100000k',

package/dist/cli/commands/permissions.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.permissionsCommand = exports.PERMISSIONS_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const testPermissions_1 = require("../../api/iam-validation/testPermissions");
+const is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const log_1 = require("../log");
 exports.PERMISSIONS_COMMAND = 'permissions';
 const permissionsCommand = async () => {
     try {
-        log_1.Log.info(cli_1.CliInternals.chalk.blueBright(`Checking permissions for ${process.env.REMOTION_GCP_CLIENT_EMAIL} in project ${process.env.REMOTION_GCP_PROJECT_ID}.`));
+        log_1.Log.info(cli_1.CliInternals.chalk.blueBright(`Checking permissions for ${process.env.REMOTION_GCP_CLIENT_EMAIL} in project ${(0, is_in_cloud_task_1.getProjectId)()}.`));
         log_1.Log.info();
         await (0, testPermissions_1.testPermissions)({
             onTest: (res) => {

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

@@ -5,6 +5,7 @@ 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 is_in_cloud_task_1 = require("../../functions/helpers/is-in-cloud-task");
 const log_1 = require("../log");
 const displayCrashLogs = async (res) => {
     let timeoutPreMsg = '';
@@ -18,11 +19,11 @@ const displayCrashLogs = async (res) => {
     }
     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`);
+Full logs are available at https://console.cloud.google.com/run?project=${(0, is_in_cloud_task_1.getProjectId)()}\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}"`,
+        resourceNames: [`projects/${(0, is_in_cloud_task_1.getProjectId)()}`],
+        filter: `logName=projects/${(0, is_in_cloud_task_1.getProjectId)()}/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(),

package/dist/functions/helpers/is-in-cloud-task.d.ts

@@ -0,0 +1,2 @@
+export declare const isInCloudTask: () => boolean;
+export declare const getProjectId: () => string | undefined;

package/dist/functions/helpers/is-in-cloud-task.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectId = exports.isInCloudTask = void 0;
+const isInCloudTask = () => {
+    if (process.env.REMOTION_GCP_PROJECT_ID)
+        return false;
+    if (process.env.K_CONFIGURATION && process.env.GCLOUD_PROJECT) {
+        return true;
+    }
+    return false;
+};
+exports.isInCloudTask = isInCloudTask;
+const getProjectId = () => {
+    return (0, exports.isInCloudTask)()
+        ? process.env.GCLOUD_PROJECT
+        : process.env.REMOTION_GCP_PROJECT_ID;
+};
+exports.getProjectId = getProjectId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.0.44",
+  "version": "4.0.46",
   "description": "GCP Cloud Run alternative to lambda rendering",
   "main": "dist/index.js",
   "dependencies": {
@@ -11,11 +11,11 @@
     "@google-cloud/resource-manager": "^4.3.0",
     "@google-cloud/logging": "^10.5.0",
     "google-auth-library": "^8.7.0",
-    "zod": "^3.21.4",
-    "@remotion/bundler": "4.0.44",
-    "@remotion/renderer": "4.0.44",
-    "@remotion/cli": "4.0.44",
-    "remotion": "4.0.44"
+    "zod": "^3.22.3",
+    "@remotion/bundler": "4.0.46",
+    "@remotion/cli": "4.0.46",
+    "remotion": "4.0.46",
+    "@remotion/renderer": "4.0.46"
   },
   "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.44"
+    "@remotion/compositor-linux-x64-gnu": "4.0.46"
   },
   "exports": {
     "./package.json": "./package.json",