@remotion/renderer 4.0.161 → 4.0.164

package/dist/compositor/compositor.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" />
 import type { LogLevel } from '../log-level';
 import type { CompositorCommand } from './payloads';
 export type Compositor = {
     finishCommands: () => Promise<void>;
-    executeCommand: <T extends keyof CompositorCommand>(type: T, payload: CompositorCommand[T]) => Promise<Buffer>;
+    executeCommand: <T extends keyof CompositorCommand>(type: T, payload: CompositorCommand[T]) => Promise<Uint8Array>;
     waitForDone: () => Promise<void>;
     pid: number | null;
 };

package/dist/compositor/compositor.js

@@ -9,6 +9,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const get_concurrency_1 = require("../get-concurrency");
 const log_level_1 = require("../log-level");
 const logger_1 = require("../logger");
+const streaming_1 = require("../streaming");
 const compose_1 = require("./compose");
 const get_executable_path_1 = require("./get-executable-path");
 const make_file_executable_1 = require("./make-file-executable");
@@ -49,21 +50,20 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
             : undefined,
     });
     let stderrChunks = [];
-    let outputBuffer = Buffer.from('');
-    const separator = Buffer.from('remotion_buffer:');
     const waiters = new Map();
     const onMessage = (statusType, nonce, data) => {
+        // Nonce '0' just means that the message should be logged
         if (nonce === '0') {
-            logger_1.Log.verbose({ indent, logLevel, tag: 'compositor' }, data.toString('utf8'));
+            logger_1.Log.verbose({ indent, logLevel, tag: 'compositor' }, new TextDecoder('utf8').decode(data));
         }
-        if (waiters.has(nonce)) {
+        else if (waiters.has(nonce)) {
             if (statusType === 'error') {
                 try {
-                    const parsed = JSON.parse(data.toString('utf8'));
+                    const parsed = JSON.parse(new TextDecoder('utf8').decode(data));
                     waiters.get(nonce).reject(new Error(`Compositor error: ${parsed.error}\n${parsed.backtrace}`));
                 }
                 catch (err) {
-                    waiters.get(nonce).reject(new Error(data.toString('utf8')));
+                    waiters.get(nonce).reject(new Error(new TextDecoder('utf8').decode(data)));
                 }
             }
             else {
@@ -72,91 +72,9 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
             waiters.delete(nonce);
         }
     };
+    const { onData, getOutputBuffer, clear } = (0, streaming_1.makeStreamer)(onMessage);
     let runningStatus = { type: 'running' };
-    let missingData = null;
-    const processInput = () => {
-        let separatorIndex = outputBuffer.indexOf(separator);
-        if (separatorIndex === -1) {
-            return;
-        }
-        separatorIndex += separator.length;
-        let nonceString = '';
-        let lengthString = '';
-        let statusString = '';
-        // Each message from Rust is prefixed with `remotion_buffer;{[nonce]}:{[length]}`
-        // Let's read the buffer to extract the nonce, and if the full length is available,
-        // we'll extract the data and pass it to the callback.
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            const nextDigit = outputBuffer[separatorIndex];
-            // 0x3a is the character ":"
-            if (nextDigit === 0x3a) {
-                separatorIndex++;
-                break;
-            }
-            separatorIndex++;
-            if (separatorIndex > outputBuffer.length) {
-                throw new Error('separatorIndex out of bounds: ' + JSON.stringify(outputBuffer));
-            }
-            nonceString += String.fromCharCode(nextDigit);
-        }
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            const nextDigit = outputBuffer[separatorIndex];
-            if (nextDigit === 0x3a) {
-                separatorIndex++;
-                break;
-            }
-            separatorIndex++;
-            if (separatorIndex > outputBuffer.length) {
-                throw new Error('separatorIndex out of bounds ' + JSON.stringify(outputBuffer));
-            }
-            lengthString += String.fromCharCode(nextDigit);
-        }
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            const nextDigit = outputBuffer[separatorIndex];
-            if (nextDigit === 0x3a) {
-                break;
-            }
-            separatorIndex++;
-            if (separatorIndex > outputBuffer.length) {
-                throw new Error('separatorIndex out of bounds ' + JSON.stringify(outputBuffer));
-            }
-            statusString += String.fromCharCode(nextDigit);
-        }
-        const length = Number(lengthString);
-        const status = Number(statusString);
-        const dataLength = outputBuffer.length - separatorIndex - 1;
-        if (dataLength < length) {
-            missingData = {
-                dataMissing: length - dataLength,
-            };
-            return;
-        }
-        const data = outputBuffer.subarray(separatorIndex + 1, separatorIndex + 1 + Number(lengthString));
-        onMessage(status === 1 ? 'error' : 'success', nonceString, data);
-        missingData = null;
-        outputBuffer = outputBuffer.subarray(separatorIndex + Number(lengthString) + 1);
-        processInput();
-    };
-    let unprocessedBuffers = [];
-    child.stdout.on('data', (data) => {
-        unprocessedBuffers.push(data);
-        const separatorIndex = data.indexOf(separator);
-        if (separatorIndex === -1) {
-            if (missingData) {
-                missingData.dataMissing -= data.length;
-            }
-            if (!missingData || missingData.dataMissing > 0) {
-                return;
-            }
-        }
-        unprocessedBuffers.unshift(outputBuffer);
-        outputBuffer = Buffer.concat(unprocessedBuffers);
-        unprocessedBuffers = [];
-        processInput();
-    });
+    child.stdout.on('data', onData);
     child.stderr.on('data', (data) => {
         stderrChunks.push(data);
     });
@@ -174,7 +92,7 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
         }
         else {
             const errorMessage = Buffer.concat(stderrChunks).toString('utf-8') +
-                outputBuffer.toString('utf-8');
+                new TextDecoder('utf-8').decode(getOutputBuffer());
             runningStatus = { type: 'quit-with-error', error: errorMessage, signal };
             const error = code === null
                 ? new Error(`Compositor exited with signal ${signal}`)
@@ -186,7 +104,7 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
             reject === null || reject === void 0 ? void 0 : reject(error);
         }
         // Need to manually free up memory
-        outputBuffer = Buffer.from('');
+        clear();
         stderrChunks = [];
     });
     return {

package/dist/get-silent-parts.js

@@ -40,7 +40,7 @@ const getSilentParts = async ({ src, noiseThresholdInDecibels: passedNoiseThresh
         minDurationInSeconds,
         noiseThresholdInDecibels,
     });
-    const response = JSON.parse(res.toString('utf-8'));
+    const response = JSON.parse(new TextDecoder('utf-8').decode(res));
     await compositor.finishCommands();
     await compositor.waitForDone();
     const { silentParts, durationInSeconds } = response;

package/dist/get-video-metadata.js

@@ -15,6 +15,6 @@ const getVideoMetadata = async (videoSource, options) => {
     });
     await compositor.finishCommands();
     await compositor.waitForDone();
-    return JSON.parse(metadataResponse.toString('utf-8'));
+    return JSON.parse(new TextDecoder('utf-8').decode(metadataResponse));
 };
 exports.getVideoMetadata = getVideoMetadata;

package/dist/open-browser.js

@@ -10,6 +10,17 @@ const get_video_threads_flag_1 = require("./get-video-threads-flag");
 const log_level_1 = require("./log-level");
 const logger_1 = require("./logger");
 const gl_1 = require("./options/gl");
+const featuresToEnable = (option) => {
+    const renderer = option !== null && option !== void 0 ? option : gl_1.DEFAULT_OPENGL_RENDERER;
+    const enableAlways = ['NetworkService', 'NetworkServiceInProcess'];
+    if (renderer === 'vulkan') {
+        return [...enableAlways, 'Vulkan', 'UseSkiaRenderer'];
+    }
+    if (renderer === 'angle-egl') {
+        return [...enableAlways, 'VaapiVideoDecoder'];
+    }
+    return enableAlways;
+};
 const getOpenGlRenderer = (option) => {
     const renderer = option !== null && option !== void 0 ? option : gl_1.DEFAULT_OPENGL_RENDERER;
     (0, gl_1.validateOpenGlRenderer)(renderer);
@@ -25,7 +36,6 @@ const getOpenGlRenderer = (option) => {
             '--use-vulkan=swiftshader',
             '--disable-vulkan-fallback-to-gl-for-testing',
             '--dignore-gpu-blocklist',
-            '--enable-features=Vulkan,UseSkiaRenderer',
         ];
     }
     if (renderer === null) {
@@ -61,7 +71,7 @@ const internalOpenBrowser = async ({ browser, browserExecutable, chromiumOptions
             'about:blank',
             '--allow-pre-commit-input',
             '--disable-background-networking',
-            '--enable-features=NetworkService,NetworkServiceInProcess',
+            `--enable-features=${featuresToEnable(chromiumOptions.gl).join(',')}`,
             '--disable-background-timer-throttling',
             '--disable-backgrounding-occluded-windows',
             '--disable-breakpad',
@@ -83,7 +93,7 @@ const internalOpenBrowser = async ({ browser, browserExecutable, chromiumOptions
             '--metrics-recording-only',
             '--mute-audio',
             '--no-first-run',
-            '--video-threads=' + (0, get_video_threads_flag_1.getIdealVideoThreadsFlag)(logLevel),
+            `--video-threads=${(0, get_video_threads_flag_1.getIdealVideoThreadsFlag)(logLevel)}`,
             '--enable-automation',
             '--password-store=basic',
             '--use-mock-keychain',

package/dist/print-useful-error-message.js

@@ -73,5 +73,9 @@ const printUsefulErrorMessage = (err, logLevel, indent) => {
         logger_1.Log.info({ indent, logLevel }, '💡 This error might be fixed by changing your Node version:');
         logger_1.Log.info({ indent, logLevel }, '   https://github.com/remotion-dev/remotion/issues/2452');
     }
+    if (err.message.includes('routines::unsupported')) {
+        logger_1.Log.info({ indent, logLevel }, '💡 This error might happen if using Cloud Run with credentials that have a newline at the end or are otherwise badly encoded.');
+        logger_1.Log.info({ indent, logLevel }, '   https://github.com/remotion-dev/remotion/issues/3864');
+    }
 };
 exports.printUsefulErrorMessage = printUsefulErrorMessage;

package/dist/streaming.d.ts

@@ -0,0 +1,5 @@
+export declare const makeStreamer: (onMessage: (statusType: 'success' | 'error', nonce: string, data: Uint8Array) => void) => {
+    onData: (data: Uint8Array) => void;
+    getOutputBuffer: () => Uint8Array;
+    clear: () => void;
+};

package/dist/streaming.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeStreamer = void 0;
+const makeStreamer = (onMessage) => {
+    const separatorStr = 'remotion_buffer:';
+    const separator = new Uint8Array(separatorStr.length);
+    for (let i = 0; i < separatorStr.length; i++) {
+        separator[i] = separatorStr.charCodeAt(i);
+    }
+    let unprocessedBuffers = [];
+    let outputBuffer = new Uint8Array(0);
+    let missingData = null;
+    const processInput = () => {
+        let separatorIndex = outputBuffer.indexOf(separator[0]); // Start checking for the first byte of the separator
+        if (separatorIndex === -1 ||
+            outputBuffer
+                .subarray(separatorIndex, separatorIndex + separator.length)
+                .toString() !== separator.toString()) {
+            return;
+        }
+        separatorIndex += separator.length;
+        let nonceString = '';
+        let lengthString = '';
+        let statusString = '';
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            if (separatorIndex > outputBuffer.length - 1) {
+                return;
+            }
+            const nextDigit = outputBuffer[separatorIndex];
+            separatorIndex++;
+            if (nextDigit === 0x3a) {
+                break;
+            }
+            nonceString += String.fromCharCode(nextDigit);
+        }
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            if (separatorIndex > outputBuffer.length - 1) {
+                return;
+            }
+            const nextDigit = outputBuffer[separatorIndex];
+            separatorIndex++;
+            if (nextDigit === 0x3a) {
+                break;
+            }
+            lengthString += String.fromCharCode(nextDigit);
+        }
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            if (separatorIndex > outputBuffer.length - 1) {
+                return;
+            }
+            const nextDigit = outputBuffer[separatorIndex];
+            if (nextDigit === 0x3a) {
+                break;
+            }
+            separatorIndex++;
+            statusString += String.fromCharCode(nextDigit);
+        }
+        const length = Number(lengthString);
+        const status = Number(statusString);
+        const dataLength = outputBuffer.length - separatorIndex - 1;
+        if (dataLength < length) {
+            missingData = {
+                dataMissing: length - dataLength,
+            };
+            return;
+        }
+        const data = outputBuffer.subarray(separatorIndex + 1, separatorIndex + 1 + Number(lengthString));
+        onMessage(status === 1 ? 'error' : 'success', nonceString, data);
+        missingData = null;
+        outputBuffer = outputBuffer.subarray(separatorIndex + Number(lengthString) + 1);
+        processInput();
+    };
+    const onData = (data) => {
+        unprocessedBuffers.push(data);
+        const separatorIndex = data.indexOf(separator[0]);
+        if (separatorIndex === -1) {
+            if (missingData) {
+                missingData.dataMissing -= data.length;
+            }
+            if (!missingData || missingData.dataMissing > 0) {
+                return;
+            }
+        }
+        unprocessedBuffers.unshift(outputBuffer);
+        outputBuffer = new Uint8Array(unprocessedBuffers.reduce((acc, val) => acc + val.length, 0));
+        let offset = 0;
+        for (const buf of unprocessedBuffers) {
+            outputBuffer.set(buf, offset);
+            offset += buf.length;
+        }
+        unprocessedBuffers = [];
+        processInput();
+    };
+    return {
+        onData,
+        getOutputBuffer: () => outputBuffer,
+        clear: () => {
+            unprocessedBuffers = [];
+            outputBuffer = new Uint8Array(0);
+        },
+    };
+};
+exports.makeStreamer = makeStreamer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.161",
+  "version": "4.0.164",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.161"
+    "remotion": "4.0.164"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -43,13 +43,13 @@
     "@types/ws": "8.5.10"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.161",
-    "@remotion/compositor-darwin-x64": "4.0.161",
-    "@remotion/compositor-linux-arm64-musl": "4.0.161",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.161",
-    "@remotion/compositor-linux-x64-gnu": "4.0.161",
-    "@remotion/compositor-linux-x64-musl": "4.0.161",
-    "@remotion/compositor-win32-x64-msvc": "4.0.161"
+    "@remotion/compositor-darwin-arm64": "4.0.164",
+    "@remotion/compositor-darwin-x64": "4.0.164",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.164",
+    "@remotion/compositor-linux-arm64-musl": "4.0.164",
+    "@remotion/compositor-linux-x64-gnu": "4.0.164",
+    "@remotion/compositor-linux-x64-musl": "4.0.164",
+    "@remotion/compositor-win32-x64-msvc": "4.0.164"
   },
   "keywords": [
     "remotion",