@remotion/renderer 3.3.82 → 3.3.84

package/dist/assets/download-and-map-assets-to-file.js

@@ -37,6 +37,9 @@ const download_file_1 = require("./download-file");
 const sanitize_filepath_1 = require("./sanitize-filepath");
 const waitForAssetToBeDownloaded = ({ src, downloadDir, downloadMap, }) => {
     var _a, _b;
+    if (process.env.NODE_ENV === 'test') {
+        console.log('waiting for asset to be downloaded', src);
+    }
     if ((_a = downloadMap.hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
         return Promise.resolve((_b = downloadMap.hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]);
     }
@@ -139,6 +142,9 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         downloadMap.isDownloadingMap[src] = {};
     }
     downloadMap.isDownloadingMap[src][downloadDir] = true;
+    if (process.env.NODE_ENV === 'test') {
+        console.log('Actually downloading asset', src);
+    }
     const onProgress = onDownload(src);
     if (src.startsWith('data:')) {
         const [assetDetails, assetData] = src.substring('data:'.length).split(',');

package/dist/call-ffmpeg.d.ts

@@ -1,16 +1,19 @@
 import execa from 'execa';
-export declare const callFfExtraOptions: () => {
+export declare const dynamicLibraryPathOptions: () => {
     env: {
         DYLD_LIBRARY_PATH: string;
+        RUST_BACKTRACE: string;
         PATH?: undefined;
         LD_LIBRARY_PATH?: undefined;
     } | {
         PATH: string;
         DYLD_LIBRARY_PATH?: undefined;
+        RUST_BACKTRACE?: undefined;
         LD_LIBRARY_PATH?: undefined;
     } | {
         LD_LIBRARY_PATH: string;
         DYLD_LIBRARY_PATH?: undefined;
+        RUST_BACKTRACE?: undefined;
         PATH?: undefined;
     };
 };

package/dist/call-ffmpeg.js

@@ -3,17 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callFf = exports.callFfExtraOptions = void 0;
+exports.callFf = exports.dynamicLibraryPathOptions = void 0;
 const execa_1 = __importDefault(require("execa"));
 const path_1 = __importDefault(require("path"));
 const get_executable_path_1 = require("./compositor/get-executable-path");
 const truthy_1 = require("./truthy");
-const callFfExtraOptions = () => {
+const dynamicLibraryPathOptions = () => {
     const lib = path_1.default.join((0, get_executable_path_1.getExecutablePath)('ffmpeg-cwd'), 'remotion', 'lib');
     return {
         env: process.platform === 'darwin'
             ? {
                 DYLD_LIBRARY_PATH: lib,
+                RUST_BACKTRACE: '1',
             }
             : process.platform === 'win32'
                 ? {
@@ -24,10 +25,10 @@ const callFfExtraOptions = () => {
                 },
     };
 };
-exports.callFfExtraOptions = callFfExtraOptions;
+exports.dynamicLibraryPathOptions = dynamicLibraryPathOptions;
 const callFf = (bin, args, options) => {
     return (0, execa_1.default)((0, get_executable_path_1.getExecutablePath)(bin), args.filter(truthy_1.truthy), {
-        ...(0, exports.callFfExtraOptions)(),
+        ...(0, exports.dynamicLibraryPathOptions)(),
         ...options,
     });
 };

package/dist/compositor/compositor.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+import type { CompositorCommand } from './payloads';
+export declare type Compositor = {
+    finishCommands: () => void;
+    executeCommand: <T extends keyof CompositorCommand>(type: T, payload: CompositorCommand[T]) => Promise<Buffer>;
+    waitForDone: () => Promise<void>;
+};
+export declare const spawnCompositorOrReuse: <T extends keyof CompositorCommand>({ initiatePayload, renderId, type, }: {
+    type: T;
+    initiatePayload: CompositorCommand[T];
+    renderId: string;
+}) => Compositor;
+export declare const releaseCompositorWithId: (renderId: string) => void;
+export declare const waitForCompositorWithIdToQuit: (renderId: string) => Promise<void>;
+export declare const startCompositor: <T extends keyof CompositorCommand>(type: T, payload: CompositorCommand[T]) => Compositor;

package/dist/compositor/compositor.js

@@ -0,0 +1,193 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startCompositor = exports.waitForCompositorWithIdToQuit = exports.releaseCompositorWithId = exports.spawnCompositorOrReuse = void 0;
+const child_process_1 = require("child_process");
+const call_ffmpeg_1 = require("../call-ffmpeg");
+const get_executable_path_1 = require("./get-executable-path");
+const make_nonce_1 = require("./make-nonce");
+const compositorMap = {};
+const spawnCompositorOrReuse = ({ initiatePayload, renderId, type, }) => {
+    if (!compositorMap[renderId]) {
+        compositorMap[renderId] = (0, exports.startCompositor)(type, initiatePayload);
+    }
+    return compositorMap[renderId];
+};
+exports.spawnCompositorOrReuse = spawnCompositorOrReuse;
+const releaseCompositorWithId = (renderId) => {
+    if (compositorMap[renderId]) {
+        compositorMap[renderId].finishCommands();
+    }
+};
+exports.releaseCompositorWithId = releaseCompositorWithId;
+const waitForCompositorWithIdToQuit = (renderId) => {
+    if (!compositorMap[renderId]) {
+        throw new TypeError('No compositor with that id');
+    }
+    return compositorMap[renderId].waitForDone();
+};
+exports.waitForCompositorWithIdToQuit = waitForCompositorWithIdToQuit;
+const startCompositor = (type, payload) => {
+    const bin = (0, get_executable_path_1.getExecutablePath)('compositor');
+    const fullCommand = {
+        nonce: (0, make_nonce_1.makeNonce)(),
+        payload: {
+            type,
+            params: payload,
+        },
+    };
+    const child = (0, child_process_1.spawn)(bin, [JSON.stringify(fullCommand)], (0, call_ffmpeg_1.dynamicLibraryPathOptions)());
+    const stderrChunks = [];
+    let outputBuffer = Buffer.from('');
+    const separator = Buffer.from('remotion_buffer:');
+    const waiters = new Map();
+    const onMessage = (statusType, nonce, data) => {
+        if (nonce === '0') {
+            console.log(data.toString('utf8'));
+        }
+        if (waiters.has(nonce)) {
+            if (statusType === 'error') {
+                try {
+                    const parsed = JSON.parse(data.toString('utf8'));
+                    waiters.get(nonce).reject(new Error(`Compositor error: ${parsed.error}`));
+                }
+                catch (err) {
+                    waiters.get(nonce).reject(new Error(data.toString('utf8')));
+                }
+            }
+            else {
+                waiters.get(nonce).resolve(data);
+            }
+            waiters.delete(nonce);
+        }
+    };
+    let quit = false;
+    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++;
+            nonceString += String.fromCharCode(nextDigit);
+        }
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const nextDigit = outputBuffer[separatorIndex];
+            if (nextDigit === 0x3a) {
+                separatorIndex++;
+                break;
+            }
+            separatorIndex++;
+            lengthString += String.fromCharCode(nextDigit);
+        }
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            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();
+    };
+    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.stderr.on('data', (data) => {
+        if (data.toString('utf-8').includes('No accelerated colorspace conversion')) {
+            return;
+        }
+        console.log(data.toString('utf-8'));
+    });
+    return {
+        waitForDone: () => {
+            return new Promise((resolve, reject) => {
+                child.on('close', (code) => {
+                    quit = true;
+                    const waitersToKill = Array.from(waiters.values());
+                    for (const waiter of waitersToKill) {
+                        waiter.reject(new Error(`Compositor quit with code ${code}`));
+                    }
+                    waiters.clear();
+                    if (code === 0) {
+                        resolve();
+                    }
+                    else {
+                        reject(Buffer.concat(stderrChunks).toString('utf-8'));
+                    }
+                });
+            });
+        },
+        finishCommands: () => {
+            if (quit) {
+                throw new Error('Compositor already quit');
+            }
+            child.stdin.write('EOF\n');
+        },
+        executeCommand: (command, params) => {
+            if (quit) {
+                throw new Error('Compositor already quit');
+            }
+            return new Promise((resolve, reject) => {
+                const nonce = (0, make_nonce_1.makeNonce)();
+                const composed = {
+                    nonce,
+                    payload: {
+                        type: command,
+                        params,
+                    },
+                };
+                // TODO: Should have a way to error out a single task
+                child.stdin.write(JSON.stringify(composed) + '\n');
+                waiters.set(nonce, {
+                    resolve,
+                    reject,
+                });
+            });
+        },
+    };
+};
+exports.startCompositor = startCompositor;

package/dist/compositor/make-nonce.d.ts

@@ -0,0 +1 @@
+export declare const makeNonce: () => string;

package/dist/compositor/make-nonce.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeNonce = void 0;
+const makeNonce = () => {
+    return (Math.random().toString(36).substring(2, 15) +
+        Math.random().toString(36).substring(2, 15));
+};
+exports.makeNonce = makeNonce;

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -7,9 +7,6 @@ export declare const createFfmpegComplexFilter: ({ filters, downloadMap, ffmpegE
     ffmpegExecutable: FfmpegExecutable;
     remotionRoot: string;
 }) => Promise<{
-    complexFilterFlag: [
-        string,
-        string
-    ] | null;
+    complexFilterFlag: [string, string] | null;
     cleanup: () => void;
 }>;

package/dist/determine-resize-params.d.ts

@@ -1,4 +1 @@
-export declare const determineResizeParams: (needsResize: [
-    number,
-    number
-] | null) => string[];
+export declare const determineResizeParams: (needsResize: [number, number] | null) => string[];

package/dist/extract-frame-from-video.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/get-frame-of-video-slow.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';
@@ -7,10 +8,7 @@ export declare const getFrameOfVideoSlow: ({ src, duration, ffmpegExecutable, im
     duration: number;
     imageFormat: OffthreadVideoImageFormat;
     specialVCodecForTransparency: SpecialVCodecForTransparency;
-    needsResize: [
-        number,
-        number
-    ] | null;
+    needsResize: [number, number] | null;
     offset: number;
     fps: number | null;
     remotionRoot: string;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';

package/dist/last-frame-from-video-cache.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/open-browser.d.ts

@@ -8,6 +8,7 @@ export declare type ChromiumOptions = {
     disableWebSecurity?: boolean;
     gl?: OpenGlRenderer | null;
     headless?: boolean;
+    userAgent?: string | null;
 };
 export declare const killAllBrowsers: () => Promise<void>;
 /**

package/dist/open-browser.js

@@ -32,7 +32,7 @@ exports.killAllBrowsers = killAllBrowsers;
  * @see [Documentation](https://www.remotion.dev/docs/renderer/open-browser)
  */
 const openBrowser = async (browser, options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     if (browser === 'firefox') {
         throw new TypeError('Firefox supported is not yet turned on. Stay tuned for the future.');
     }
@@ -102,8 +102,11 @@ const openBrowser = async (browser, options) => {
             ...(((_j = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _j === void 0 ? void 0 : _j.disableWebSecurity)
                 ? ['--disable-web-security']
                 : []),
+            ((_k = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _k === void 0 ? void 0 : _k.userAgent)
+                ? `--user-agent="${options.chromiumOptions.userAgent}"`
+                : null,
         ].filter(Boolean),
-        defaultViewport: (_k = options === null || options === void 0 ? void 0 : options.viewport) !== null && _k !== void 0 ? _k : {
+        defaultViewport: (_l = options === null || options === void 0 ? void 0 : options.viewport) !== null && _l !== void 0 ? _l : {
             height: 720,
             width: 1280,
             deviceScaleFactor: 1,

package/dist/provide-screenshot.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';

package/dist/puppeteer-screenshot.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 export declare const screenshot: (options: {

package/dist/render-media.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';

package/dist/screenshot-dom-element.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';

package/dist/screenshot-task.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { StillImageFormat } from './image-format';

package/dist/take-frame-and-compose.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { TAsset } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { Page } from './browser/BrowserPage';

package/dist/try-to-extract-frame-of-video-fast.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { NeedsResize, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "3.3.82",
+  "version": "3.3.84",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
   "dependencies": {
     "execa": "5.1.1",
     "extract-zip": "2.0.1",
-    "remotion": "3.3.82",
+    "remotion": "3.3.84",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0"
   },
@@ -41,13 +41,13 @@
     "vitest": "0.24.3"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "3.3.82",
-    "@remotion/compositor-darwin-x64": "3.3.82",
-    "@remotion/compositor-linux-arm64-gnu": "3.3.82",
-    "@remotion/compositor-linux-arm64-musl": "3.3.82",
-    "@remotion/compositor-linux-x64-gnu": "3.3.82",
-    "@remotion/compositor-linux-x64-musl": "3.3.82",
-    "@remotion/compositor-win32-x64-msvc": "3.3.82"
+    "@remotion/compositor-darwin-arm64": "3.3.84",
+    "@remotion/compositor-darwin-x64": "3.3.84",
+    "@remotion/compositor-linux-arm64-gnu": "3.3.84",
+    "@remotion/compositor-linux-arm64-musl": "3.3.84",
+    "@remotion/compositor-linux-x64-gnu": "3.3.84",
+    "@remotion/compositor-linux-x64-musl": "3.3.84",
+    "@remotion/compositor-win32-x64-msvc": "3.3.84"
   },
   "keywords": [
     "remotion",