@remotion/renderer 4.0.539 → 4.0.541

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

@@ -57,8 +57,12 @@ const waitForAssetToBeDownloaded = ({ src, downloadDir, downloadMap, }) => {
     if (!downloadMap.listeners[src][downloadDir]) {
         downloadMap.listeners[src][downloadDir] = [];
     }
-    return new Promise((resolve) => {
-        downloadMap.listeners[src][downloadDir].push(() => {
+    return new Promise((resolve, reject) => {
+        downloadMap.listeners[src][downloadDir].push((err) => {
+            if (err) {
+                reject(err);
+                return;
+            }
             const srcMap = downloadMap.hasBeenDownloadedMap[src];
             if (!(srcMap === null || srcMap === void 0 ? void 0 : srcMap[downloadDir])) {
                 throw new Error('Expected file for ' + src + 'to be available in ' + downloadDir);
@@ -82,7 +86,7 @@ const notifyAssetIsDownloaded = ({ src, downloadDir, to, downloadMap, }) => {
         downloadMap.hasBeenDownloadedMap[src] = {};
     }
     downloadMap.hasBeenDownloadedMap[src][downloadDir] = to;
-    downloadMap.listeners[src][downloadDir].forEach((fn) => fn());
+    downloadMap.listeners[src][downloadDir].forEach((fn) => fn(null));
 };
 const validateMimeType = (mimeType, src) => {
     if (!mimeType.includes('/')) {
@@ -189,6 +193,15 @@ const downloadAsset = async ({ src, downloadMap, indent, logLevel, shouldAnalyze
         indent,
         logLevel,
         abortSignal: downloadMap.cleanupController.signal,
+    }).catch((err) => {
+        var _a, _b, _c;
+        var _d;
+        // https://github.com/remotion-dev/remotion/issues/12817
+        (_a = downloadMap.isDownloadingMap[src]) === null || _a === void 0 ? true : delete _a[downloadDir];
+        const listeners = (_d = (_b = downloadMap.listeners[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]) !== null && _d !== void 0 ? _d : [];
+        (_c = downloadMap.listeners[src]) === null || _c === void 0 ? true : delete _c[downloadDir];
+        listeners.forEach((fn) => fn(err));
+        throw err;
     });
     notifyAssetIsDownloaded({ src, downloadMap, downloadDir, to });
     if (shouldAnalyzeAudioImmediately) {

package/dist/assets/download-file.js

@@ -38,23 +38,30 @@ const downloadFileWithoutRetries = ({ onProgress, url, to: toFn, abortSignal, })
                     return;
                 }
                 rejectAndFlag(new Error(`Tried to download file ${url}, ${noDataSentToken} 20 seconds`));
+                closeConnection();
             }, 20000);
         };
         refreshTimeout();
         let finishEventSent = false;
-        let closeConnection = () => undefined;
+        // Until a response arrives, closing the connection aborts the pending request
+        const requestController = new AbortController();
+        let closeConnection = () => requestController.abort();
         const onAbort = () => {
             rejectAndFlag(new Error(CANCELLED_ERROR));
             closeConnection();
         };
         abortSignal.addEventListener('abort', onAbort);
-        (0, read_file_1.readFile)(url)
+        (0, read_file_1.readFile)(url, requestController.signal)
             .then(({ response, request }) => {
             var _a, _b;
             closeConnection = () => {
                 request.destroy();
                 response.destroy();
             };
+            if (rejected) {
+                closeConnection();
+                return;
+            }
             if (abortSignal.aborted) {
                 onAbort();
                 return;
@@ -132,10 +139,7 @@ const downloadFile = async (options, retries = 2, attempt = 1) => {
             message.includes(incorrectContentLengthToken) ||
             message.includes(noDataSentToken) ||
             // Try again if hitting internal errors
-            message.includes('503') ||
-            message.includes('502') ||
-            message.includes('504') ||
-            message.includes('500')) {
+            /^Received a status code of (500|502|503|504) while downloading file /.test(message)) {
             if (retries === 0) {
                 throw err;
             }

package/dist/assets/download-map.d.ts

@@ -23,7 +23,7 @@ export type DownloadMap = {
     };
     listeners: {
         [key: string]: {
-            [downloadDir: string]: (() => void)[];
+            [downloadDir: string]: ((err: Error | null) => void)[];
         };
     };
     durationOfAssetCache: Record<string, AudioChannelsAndDurationResultCache>;

package/dist/assets/read-file.d.ts

@@ -3,5 +3,5 @@ type NodeRequestAndResponse = {
     request: http.ClientRequest;
     response: http.IncomingMessage;
 };
-export declare const readFile: (url: string, redirectsSoFar?: number) => Promise<NodeRequestAndResponse>;
+export declare const readFile: (url: string, signal: AbortSignal | null, redirectsSoFar?: number) => Promise<NodeRequestAndResponse>;
 export {};

package/dist/assets/read-file.js

@@ -17,7 +17,7 @@ const getClient = (url) => {
     }
     throw new Error(`Can only download URLs starting with http:// or https://, got "${url}"`);
 };
-const readFileWithoutRedirect = (url) => {
+const readFileWithoutRedirect = (url, signal) => {
     return new Promise((resolve, reject) => {
         const client = getClient(url);
         const req = client(url, 
@@ -27,8 +27,9 @@ const readFileWithoutRedirect = (url) => {
                 headers: {
                     'user-agent': 'Mozilla/5.0 (@remotion/renderer - https://remotion.dev)',
                 },
+                signal: signal !== null && signal !== void 0 ? signal : undefined,
             }
-            : {}, (res) => {
+            : { signal: signal !== null && signal !== void 0 ? signal : undefined }, (res) => {
             resolve({ request: req, response: res });
         });
         req.on('error', (err) => {
@@ -37,11 +38,11 @@ const readFileWithoutRedirect = (url) => {
         });
     });
 };
-const readFile = async (url, redirectsSoFar = 0) => {
+const readFile = async (url, signal, redirectsSoFar = 0) => {
     if (redirectsSoFar > 10) {
         throw new Error(`Too many redirects while downloading ${url}`);
     }
-    const { request, response } = await readFileWithoutRedirect(url);
+    const { request, response } = await readFileWithoutRedirect(url, signal);
     if (redirect_status_codes_1.redirectStatusCodes.includes(response.statusCode)) {
         if (!response.headers.location) {
             throw new Error(`Received a status code ${response.statusCode} but no "Location" header while calling ${response.headers.location}`);
@@ -49,7 +50,7 @@ const readFile = async (url, redirectsSoFar = 0) => {
         const redirectUrl = new URL(response.headers.location, url).toString();
         request.destroy();
         response.destroy();
-        return (0, exports.readFile)(redirectUrl, redirectsSoFar + 1);
+        return (0, exports.readFile)(redirectUrl, signal, redirectsSoFar + 1);
     }
     if (response.statusCode >= 400) {
         const body = await tryToObtainBody(response);

package/dist/browser/BrowserFetcher.js

@@ -128,9 +128,12 @@ const writeVersionFile = (chromeMode, version) => {
     fs.writeFileSync(versionFilePath, version);
 };
 const downloadBrowser = async ({ logLevel, indent, onProgress, version, chromeMode, }) => {
+    var _a;
     const platform = (0, exports.getPlatform)();
     const downloadURL = (0, get_chrome_download_url_1.getChromeDownloadUrl)({ platform, version, chromeMode });
-    const fileName = downloadURL.split('/').pop();
+    // remotion.media URLs carry a ?clear query string, and "?" is not a valid
+    // file name character on Windows.
+    const fileName = (_a = downloadURL.split('/').pop()) === null || _a === void 0 ? void 0 : _a.split('?')[0];
     if (!fileName) {
         throw new Error(`A malformed download URL was found: ${downloadURL}.`);
     }

package/dist/browser/BrowserPage.js

@@ -198,6 +198,25 @@ class Page extends EventEmitter_1.EventEmitter {
         client.on('Runtime.consoleAPICalled', (event) => {
             return __classPrivateFieldGet(this, _Page_instances, "m", _Page_onConsoleAPI).call(this, event);
         });
+        client.on('Runtime.exceptionThrown', (event) => {
+            var _a;
+            var _b, _c;
+            const { exception, text, stackTrace, url, lineNumber, columnNumber } = event.exceptionDetails;
+            const description = exception
+                ? ((_b = exception.description) !== null && _b !== void 0 ? _b : String((_c = exception.unserializableValue) !== null && _c !== void 0 ? _c : exception.value))
+                : null;
+            (_a = this.onBrowserLog) === null || _a === void 0 ? void 0 : _a.call(this, {
+                type: 'error',
+                text: description === null ? text : `${text} ${description}`,
+                stackTrace: (stackTrace === null || stackTrace === void 0 ? void 0 : stackTrace.callFrames.length)
+                    ? stackTrace.callFrames.map((frame) => ({
+                        url: frame.url,
+                        lineNumber: frame.lineNumber,
+                        columnNumber: frame.columnNumber,
+                    }))
+                    : [{ url, lineNumber, columnNumber }],
+            });
+        });
         client.on('Runtime.bindingCalled', (event) => {
             return __classPrivateFieldGet(this, _Page_instances, "m", _Page_onBindingCalled).call(this, event);
         });
@@ -350,8 +369,7 @@ _Page_client = new WeakMap(), _Page_target = new WeakMap(), _Page_timeoutSetting
     // This error message is being checked against in is-flaky-error.ts
     this.emit('error', new Error('Page crashed!'));
 }, _Page_onLogEntryAdded = function _Page_onLogEntryAdded(event) {
-    var _a;
-    const { level, text, args, source, url, lineNumber } = event.entry;
+    const { level, text, args, source, url, lineNumber, stackTrace } = event.entry;
     if (args) {
         args.map((arg) => {
             return (0, util_1.releaseObject)(__classPrivateFieldGet(this, _Page_client, "f"), arg);
@@ -363,16 +381,17 @@ _Page_client = new WeakMap(), _Page_target = new WeakMap(), _Page_timeoutSetting
             type: level,
             text,
             args: [],
-            stackTraceLocations: [{ url, lineNumber }],
+            stackTraceLocations: (stackTrace === null || stackTrace === void 0 ? void 0 : stackTrace.callFrames.length)
+                ? stackTrace.callFrames.map((frame) => ({
+                    url: frame.url,
+                    lineNumber: frame.lineNumber,
+                    columnNumber: frame.columnNumber,
+                }))
+                : [{ url, lineNumber }],
             previewString,
             logLevel: logLevelFromRemotionLog !== null && logLevelFromRemotionLog !== void 0 ? logLevelFromRemotionLog : logLevelFromEvent,
             tag,
         });
-        (_a = this.onBrowserLog) === null || _a === void 0 ? void 0 : _a.call(this, {
-            stackTrace: message.stackTrace(),
-            text: message.text,
-            type: message.type,
-        });
         __classPrivateFieldGet(this, _Page_onConsole, "f").call(this, message);
     }
 }, _Page_onConsoleAPI = function _Page_onConsoleAPI(event) {

package/dist/browser/BrowserRunner.js

@@ -100,7 +100,7 @@ const makeBrowserRunner = async ({ executablePath, processArguments, userDataDir
         // If the process failed to launch (for example if the browser executable path
         // is invalid), then the process does not get a pid assigned. A call to
         // `proc.kill` would error, as the `pid` to-be-killed can not be found.
-        if (proc.pid && pidExists(proc.pid)) {
+        if (!closed && proc.pid && pidExists(proc.pid)) {
             try {
                 if (process.platform === 'win32') {
                     childProcess.exec(`taskkill /pid ${proc.pid} /T /F`, (error) => {
@@ -138,17 +138,43 @@ const makeBrowserRunner = async ({ executablePath, processArguments, userDataDir
         // perform this earlier, then the previous function calls would not happen.
         (0, util_1.removeEventListeners)(listeners);
     };
+    let closePromise = null;
     const closeProcess = () => {
-        if (closed) {
-            return Promise.resolve();
+        if (closePromise) {
+            return closePromise;
         }
-        logger_1.Log.verbose({ indent, logLevel }, 'Received SIGTERM signal. Killing browser process');
-        killProcess();
-        (0, delete_directory_1.deleteDirectory)(userDataDir);
-        // Cleanup this listener last, as that makes sure the full callback runs. If we
-        // perform this earlier, then the previous function calls would not happen.
-        (0, util_1.removeEventListeners)(listeners);
-        return processClosing;
+        closePromise = (async () => {
+            let timeoutId = null;
+            try {
+                if (!closed) {
+                    // Let Chrome run its shutdown cleanup, including macOS code-sign
+                    // clone removal. The CDP response can be lost as Chrome exits.
+                    try {
+                        void connection.send('Browser.close').catch(() => undefined);
+                    }
+                    catch (_a) { }
+                    await Promise.race([
+                        processClosing,
+                        new Promise((resolve) => {
+                            timeoutId = setTimeout(resolve, 2000);
+                        }),
+                    ]);
+                    if (!closed) {
+                        logger_1.Log.verbose({ indent, logLevel }, 'Browser did not exit gracefully. Killing browser process');
+                        killProcess();
+                    }
+                    await processClosing;
+                }
+            }
+            finally {
+                if (timeoutId !== null) {
+                    clearTimeout(timeoutId);
+                }
+                (0, delete_directory_1.deleteDirectory)(userDataDir);
+                (0, util_1.removeEventListeners)(listeners);
+            }
+        })();
+        return closePromise;
     };
     if (dumpio) {
         (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (d) => {

package/dist/browser/NetworkManager.js

@@ -58,7 +58,12 @@ class NetworkManager extends EventEmitter_1.EventEmitter {
         __classPrivateFieldGet(this, _NetworkManager_client, "f").on('Network.responseReceivedExtraInfo', __classPrivateFieldGet(this, _NetworkManager_instances, "m", _NetworkManager_onResponseReceivedExtraInfo).bind(this));
     }
     async initialize() {
-        await __classPrivateFieldGet(this, _NetworkManager_client, "f").send('Network.enable');
+        // We consume request events, but never read response bodies from DevTools.
+        // Avoid retaining frame and media responses in its per-tab body cache.
+        await __classPrivateFieldGet(this, _NetworkManager_client, "f").send('Network.enable', {
+            maxTotalBufferSize: 0,
+            maxResourceBufferSize: 0,
+        });
     }
 }
 exports.NetworkManager = NetworkManager;

package/dist/browser/devtools-commands.d.ts

@@ -241,7 +241,12 @@ export interface Commands {
         returnType: void;
     };
     'Network.enable': {
-        paramsType: [EnableRequest?];
+        paramsType: [
+            {
+                maxTotalBufferSize: number;
+                maxResourceBufferSize: number;
+            }?
+        ];
         returnType: void;
     };
     'Target.detachFromTarget': {

package/dist/browser/get-chrome-download-url.d.ts

@@ -1,6 +1,6 @@
 import type { LogLevel } from '../log-level';
 import type { ChromeMode } from '../options/chrome-mode';
-export declare const TESTED_VERSION = "157.0.8080.0";
+export declare const TESTED_VERSION = "158.0.8127.2";
 export type Platform = 'linux64' | 'linux-arm64' | 'mac-x64' | 'mac-arm64' | 'win64';
 export declare const isAmazonLinux2023: () => boolean;
 export declare const canUseRemotionMediaBinaries: () => boolean;

package/dist/browser/get-chrome-download-url.js

@@ -38,7 +38,7 @@ exports.getChromeDownloadUrl = getChromeDownloadUrl;
 const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
 const logger_1 = require("../logger");
-exports.TESTED_VERSION = '157.0.8080.0';
+exports.TESTED_VERSION = '158.0.8127.2';
 const isAmazonLinux2023 = () => {
     if (os.platform() !== 'linux') {
         return false;
@@ -114,6 +114,9 @@ function getChromeDownloadUrl({ platform, version, chromeMode, }) {
         if (platform === 'mac-arm64') {
             return `https://remotion.media/chromium-headless-shell-mac-arm64-${exports.TESTED_VERSION}.zip?clear`;
         }
+        if (platform === 'win64') {
+            return `https://remotion.media/chromium-headless-shell-win-x64-${exports.TESTED_VERSION}.zip?clear`;
+        }
         if (platform === 'linux64' || platform === 'linux-arm64') {
             const architecture = platform === 'linux64' ? 'x64' : 'arm64';
             if ((0, exports.isAmazonLinux2023)()) {

package/dist/check-version-requirements.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkRuntimeVersion = exports.gLibCErrorMessage = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const no_react_1 = require("remotion/no-react");
+const get_chrome_download_url_1 = require("./browser/get-chrome-download-url");
 const get_executable_path_1 = require("./compositor/get-executable-path");
 const logger_1 = require("./logger");
 const getRequiredLibCVersion = () => {
@@ -15,12 +16,11 @@ const getRequiredLibCVersion = () => {
     if ((0, get_executable_path_1.isMusl)({ indent: false, logLevel: 'warn' })) {
         return null;
     }
-    // Uses Amazon Linux 2 to compile
-    if (process.arch === 'arm64') {
-        return [2, 26];
+    // Amazon Linux 2023 on ARM64 is supported with its system glibc.
+    if (process.arch === 'arm64' && (0, get_chrome_download_url_1.isAmazonLinux2023)()) {
+        return [2, 34];
     }
-    // Uses Ubuntu 20.04 to compile
-    return [2, 31];
+    return [2, 35];
 };
 const required = getRequiredLibCVersion();
 const gLibCErrorMessage = (libCString) => {
@@ -37,7 +37,7 @@ const gLibCErrorMessage = (libCString) => {
     if (Number(split[0]) > required[0]) {
         return null;
     }
-    return `Rendering videos requires glibc ${required.join('.')} on your or higher on your OS. Your system has glibc ${libCString}.`;
+    return `Rendering videos requires glibc ${required.join('.')} or higher on your OS. Your system has glibc ${libCString}.`;
 };
 exports.gLibCErrorMessage = gLibCErrorMessage;
 const checkLibCRequirement = (logLevel, indent) => {