@remotion/cloudrun 4.0.148 → 4.0.150

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @remotion/cloudrun@4.0.147 build /Users/jonathanburger/remotion/packages/cloudrun
+> @remotion/cloudrun@4.0.149 build /Users/jonathanburger/remotion/packages/cloudrun
 > bun build.ts
 
 $ ts-node src/admin/bundle-renderLogic.ts

package/.turbo/turbo-test.log

@@ -0,0 +1,21 @@
+
+> @remotion/cloudrun@4.0.149 test /Users/jonathanburger/remotion/packages/cloudrun
+> vitest --run
+
+
+ RUN  v0.31.1 /Users/jonathanburger/remotion/packages/cloudrun
+
+[?25l ✓ src/api/test/service-names.test.ts (1)
+[?25l ✓ src/api/test/service-names.test.ts (1)
+ ✓ src/api/test/make-console.test.ts (2)
+ · src/api/test/running-in-what-server.test.ts (4)
+ ✓ src/api/test/service-names.test.ts (1)
+ ✓ src/api/test/make-console.test.ts (2)
+ ✓ src/api/test/running-in-what-server.test.ts (4)
+
+ Test Files  3 passed (3)
+      Tests  7 passed (7)
+   Start at  13:41:54
+   Duration  641ms (transform 201ms, setup 0ms, collect 399ms, tests 6ms, environment 0ms, prepare 52ms)
+
+[?25h

package/build.ts

@@ -1,6 +1,6 @@
 import {$} from 'bun';
 
-await $`bunx tsc -d`;
+await $`bun x tsc -d`;
 
 const permissions = Bun.file('src/shared/sa-permissions.json');
 await Bun.write('dist/shared/sa-permissions.json', permissions);

package/dist/api/get-or-create-bucket.d.ts

@@ -1,7 +1,7 @@
 import type { GcpRegion } from '../pricing/gcp-regions';
 export type GetOrCreateBucketInput = {
     region: GcpRegion;
-    updateBucketState?: (state: 'Checking for existing bucket' | 'Creating new bucket' | 'Created bucket' | 'Using existing bucket') => void;
+    updateBucketState?: (state: 'Checking bucket' | 'Creating bucket' | 'Created bucket' | 'Used bucket') => void;
 };
 export type GetOrCreateBucketOutput = {
     bucketName: string;

package/dist/api/get-or-create-bucket.js

@@ -21,14 +21,14 @@ const getOrCreateBucket = async (params) => {
             .join(', ')}) in your Cloud Storage region (${params.region}) starting with "${constants_1.REMOTION_BUCKET_PREFIX}". This is an error, please delete buckets so that you have one maximum.`);
     }
     if (remotionBuckets.length === 1) {
-        (_a = params === null || params === void 0 ? void 0 : params.updateBucketState) === null || _a === void 0 ? void 0 : _a.call(params, 'Using existing bucket');
+        (_a = params === null || params === void 0 ? void 0 : params.updateBucketState) === null || _a === void 0 ? void 0 : _a.call(params, 'Used bucket');
         return {
             bucketName: remotionBuckets[0].name,
             alreadyExisted: true,
         };
     }
     if (params === null || params === void 0 ? void 0 : params.region) {
-        (_b = params.updateBucketState) === null || _b === void 0 ? void 0 : _b.call(params, 'Creating new bucket');
+        (_b = params.updateBucketState) === null || _b === void 0 ? void 0 : _b.call(params, 'Creating bucket');
         const bucketName = (0, validate_bucketname_1.makeBucketName)();
         await (0, create_bucket_1.createBucket)({
             bucketName,

package/dist/cli/commands/sites/create.js

@@ -58,7 +58,7 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
         },
         bucketProgress: {
             doneIn: null,
-            creationState: 'Checking for existing bucket',
+            creationState: 'Checking bucket',
         },
         deployProgress: {
             doneIn: null,
@@ -67,12 +67,12 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
             stats: null,
         },
     };
-    const updateProgress = () => {
+    const updateProgress = (newLine) => {
         progressBar.update([
             (0, progress_bar_1.makeBundleProgress)(multiProgress.bundleProgress),
             (0, progress_bar_1.makeBucketProgress)(multiProgress.bucketProgress),
             (0, progress_bar_1.makeDeployProgressBar)(multiProgress.deployProgress),
-        ].join('\n'), false);
+        ].join('\n'), newLine);
     };
     const bucketStart = Date.now();
     const region = (0, get_gcp_region_1.getGcpRegion)();
@@ -80,11 +80,11 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
         region,
         updateBucketState: (state) => {
             multiProgress.bucketProgress.creationState = state;
-            updateProgress();
+            updateProgress(false);
         },
     });
     multiProgress.bucketProgress.doneIn = Date.now() - bucketStart;
-    updateProgress();
+    updateProgress(false);
     const bundleStart = Date.now();
     let uploadStart = Date.now();
     const { serveUrl, siteName, stats } = await (0, deploy_site_1.deploySite)({
@@ -108,14 +108,14 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
                     doneIn: null,
                     stats: null,
                 };
-                updateProgress();
+                updateProgress(false);
             },
             enableCaching: config_1.ConfigInternals.getWebpackCaching(),
             webpackOverride: (_b = config_1.ConfigInternals.getWebpackOverrideFn()) !== null && _b !== void 0 ? _b : ((f) => f),
             gitSource: null,
         },
     });
-    updateProgress();
+    updateProgress(false);
     const uploadDuration = Date.now() - uploadStart;
     multiProgress.deployProgress = {
         sizeUploaded: 1,
@@ -127,11 +127,7 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
             untouchedFiles: stats.untouchedFiles,
         },
     };
-    updateProgress();
-    log_1.Log.info({ indent: false, logLevel });
-    log_1.Log.info({ indent: false, logLevel });
-    log_1.Log.info({ indent: false, logLevel }, 'Deployed to GCP Storage!');
-    log_1.Log.info({ indent: false, logLevel });
+    updateProgress(true);
     log_1.Log.info({ indent: false, logLevel }, (0, _1.displaySiteInfo)({
         bucketName,
         id: siteName,
@@ -139,7 +135,7 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
         bucketRegion: region,
     }));
     log_1.Log.info({ indent: false, logLevel });
-    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.blueBright('ℹ️ If you make changes to your code, you need to redeploy the site. You can overwrite the existing site by running:'));
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.blueBright('ℹ️   Redeploy your site everytime you make changes to it. You can overwrite the existing site by running:'));
     log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.blueBright(['npx remotion cloudrun sites create', args[0], `--site-name=${siteName}`]
         .filter(remotion_1.Internals.truthy)
         .join(' ')));

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

@@ -11,12 +11,11 @@ const rm_1 = require("./rm");
 const rmall_1 = require("./rmall");
 exports.SITES_COMMAND = 'sites';
 const displaySiteInfo = (site) => {
-    const LEFT_COL = 16;
     return [
-        'Site: '.padEnd(LEFT_COL, ' ') + ' ' + site.id,
-        'Bucket: '.padEnd(LEFT_COL, ' ') + ' ' + site.bucketName,
-        'Region: '.padEnd(LEFT_COL, ' ') + ' ' + site.bucketRegion,
-        'Serve Url: '.padEnd(LEFT_COL, ' ') + ' ' + site.serveUrl,
+        'Site: '.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' ') + ' ' + site.id,
+        'Bucket: '.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' ') + ' ' + site.bucketName,
+        'Region: '.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' ') + ' ' + site.bucketRegion,
+        'Serve Url: '.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' ') + ' ' + site.serveUrl,
     ].join('\n');
 };
 exports.displaySiteInfo = displaySiteInfo;

package/dist/cli/helpers/progress-bar.d.ts

@@ -4,7 +4,7 @@ export type BundleProgress = {
 };
 export declare const makeBundleProgress: ({ progress, doneIn }: BundleProgress) => string;
 export type BucketCreationProgress = {
-    creationState: 'Checking for existing bucket' | 'Creating new bucket' | 'Created bucket' | 'Using existing bucket';
+    creationState: 'Checking bucket' | 'Creating bucket' | 'Created bucket' | 'Used bucket';
     doneIn: number | null;
 };
 export declare const makeBucketProgress: ({ creationState, doneIn, }: BucketCreationProgress) => string;

package/dist/cli/helpers/progress-bar.js

@@ -5,9 +5,8 @@ const cli_1 = require("@remotion/cli");
 const remotion_1 = require("remotion");
 const makeBundleProgress = ({ progress, doneIn }) => {
     return [
-        `(1/3)`,
+        `${doneIn === null ? 'Bundling' : 'Bundled'} video`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         cli_1.CliInternals.makeProgressBar(progress / 100),
-        `${doneIn === null ? 'Bundling' : 'Bundled'} video`,
         doneIn === null
             ? `${Math.round(progress)}%`
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
@@ -18,10 +17,10 @@ const makeBucketProgress = ({ creationState, doneIn, }) => {
     let progress = 0;
     let statesFinished = 0;
     switch (creationState) {
-        case 'Checking for existing bucket':
+        case 'Checking bucket':
             progress = 1;
             break;
-        case 'Creating new bucket':
+        case 'Creating bucket':
             progress = 2 / 3;
             statesFinished = 2;
             break;
@@ -29,7 +28,7 @@ const makeBucketProgress = ({ creationState, doneIn, }) => {
             progress = 3 / 3;
             statesFinished = 3;
             break;
-        case 'Using existing bucket':
+        case 'Used bucket':
             progress = 3 / 3;
             statesFinished = 3;
             break;
@@ -38,9 +37,8 @@ const makeBucketProgress = ({ creationState, doneIn, }) => {
             break;
     }
     return [
-        `(2/3)`,
+        creationState.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         cli_1.CliInternals.makeProgressBar(progress),
-        creationState,
         doneIn === null
             ? `${statesFinished} / ${3}`
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
@@ -65,9 +63,8 @@ const makeUploadDiff = ({ stats }) => {
 const makeDeployProgressBar = ({ sizeUploaded, totalSize, doneIn, stats, }) => {
     const progress = totalSize === null ? 0 : sizeUploaded / totalSize;
     return [
-        `(3/3)`,
+        `${doneIn === null ? 'Uploading' : 'Uploaded'}`.padEnd(cli_1.CliInternals.LABEL_WIDTH, ' '),
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Uploading' : 'Uploaded'} to GCP Storage Bucket`,
         doneIn === null
             ? typeof totalSize === 'number'
                 ? `${cli_1.CliInternals.formatBytes(sizeUploaded)}/${cli_1.CliInternals.formatBytes(totalSize)}`

package/dist/functions/helpers/get-composition-from-body.js

@@ -9,7 +9,7 @@ const getCompositionFromBody = async (body) => {
         browserExecutable: null,
         chromiumOptions: {
             ...((_a = body.chromiumOptions) !== null && _a !== void 0 ? _a : {}),
-            enableMultiProcessOnLinux: false,
+            enableMultiProcessOnLinux: true,
         },
         envVariables: (_b = body.envVariables) !== null && _b !== void 0 ? _b : {},
         id: body.composition,

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

@@ -93,7 +93,6 @@ const renderMediaSingleThread = async (body, res) => {
             offthreadVideoCacheSizeInBytes: body.offthreadVideoCacheSizeInBytes,
             colorSpace: body.colorSpace,
             repro: false,
-            finishRenderProgress: () => undefined,
             binariesDirectory: null,
             separateAudioTo: null,
             forSeamlessAacConcatenation: false,

package/dist/shared/base64-to-hash.d.ts

@@ -0,0 +1 @@
+export declare function base64ToHex(str: string): string;

package/dist/shared/base64-to-hash.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.base64ToHex = void 0;
+function base64ToHex(str) {
+    // Decode the base64 string to a buffer containing the binary data
+    const raw = Buffer.from(str, 'base64');
+    // Convert the buffer to a hexadecimal string
+    let hex = '';
+    for (const byte of raw) {
+        hex += byte.toString(16).padStart(2, '0'); // Ensure two digits per byte
+    }
+    return hex;
+}
+exports.base64ToHex = base64ToHex;

package/dist/shared/get-etag.js

@@ -6,19 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEtagOfFile = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const fs_1 = __importDefault(require("fs"));
-const chunk = 1024 * 1024 * 5; // 5MB
 const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
 const getEtagOfFile = async (filePath) => {
     const stream = await fs_1.default.promises.readFile(filePath);
-    if (stream.length <= chunk) {
-        return `"${md5(stream)}"`;
-    }
-    const md5Chunks = [];
-    const chunksNumber = Math.ceil(stream.length / chunk);
-    for (let i = 0; i < chunksNumber; i++) {
-        const chunkStream = stream.slice(i * chunk, (i + 1) * chunk);
-        md5Chunks.push(md5(chunkStream));
-    }
-    return `"${md5(Buffer.from(md5Chunks.join(''), 'hex'))}-${chunksNumber}"`;
+    return md5(stream);
 };
 exports.getEtagOfFile = getEtagOfFile;

package/dist/shared/get-storage-operations.js

@@ -1,30 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStorageDiffOperations = void 0;
+const base64_to_hash_1 = require("./base64-to-hash");
 const read_dir_1 = require("./read-dir");
+const stripPrefix = (file, prefix) => {
+    return file.substring(prefix.length + 1);
+};
 const getStorageDiffOperations = async ({ objects, bundle, prefix, }) => {
     const dir = await (0, read_dir_1.readDirectory)({
         dir: bundle,
         etags: {},
         originalDir: bundle,
     });
-    const filesOnStorageButNotLocal = objects.filter((fileOnStorage) => {
-        var _a;
-        const key = (_a = fileOnStorage.name) === null || _a === void 0 ? void 0 : _a.substring(prefix.length);
+    const hashMap = {};
+    for (const object of objects) {
+        hashMap[object.name] = (0, base64_to_hash_1.base64ToHex)(object.metadata.md5Hash);
+    }
+    const filesOnStorageButNotLocal = objects.filter((o) => {
+        const key = stripPrefix(o.name, prefix);
         return !dir[key];
     });
     const localFilesNotOnStorage = Object.keys(dir).filter((d) => {
         return !objects.find((o) => {
-            var _a;
-            const key = (_a = o.name) === null || _a === void 0 ? void 0 : _a.substring(prefix.length);
-            return key === d && o.metadata.etag === dir[d];
+            const key = stripPrefix(o.name, prefix);
+            return key === d && hashMap[o.name] === dir[d];
         });
     });
     const existing = Object.keys(dir).filter((d) => {
         return objects.find((o) => {
-            var _a;
-            const key = (_a = o.name) === null || _a === void 0 ? void 0 : _a.substring(prefix.length);
-            return key === d && o.metadata.etag === dir[d];
+            const key = stripPrefix(o.name, prefix);
+            return key === d && hashMap[o.name] === dir[d];
         });
     });
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cloudrun",
-  "version": "4.0.148",
+  "version": "4.0.150",
   "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.22.3",
-    "@remotion/bundler": "4.0.148",
-    "@remotion/cli": "4.0.148",
-    "@remotion/renderer": "4.0.148",
-    "remotion": "4.0.148"
+    "@remotion/bundler": "4.0.150",
+    "@remotion/renderer": "4.0.150",
+    "remotion": "4.0.150",
+    "@remotion/cli": "4.0.150"
   },
   "devDependencies": {
     "@jonny/eslint-config": "3.0.281",
@@ -26,7 +26,7 @@
     "prettier-plugin-organize-imports": "^3.2.4",
     "ts-node": "10.9.2",
     "vitest": "0.31.1",
-    "@remotion/compositor-linux-x64-gnu": "4.0.148"
+    "@remotion/compositor-linux-x64-gnu": "4.0.150"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -53,7 +53,6 @@
     "build": "bun build.ts",
     "buildContainer": "ts-node src/admin/bundle-renderLogic.ts",
     "tarInstaller": "ts-node src/admin/bundle-installer.ts",
-    "watch": "tsc -w",
     "lint": "eslint src --ext ts,tsx",
     "test": "vitest --run"
   }