@remotion/renderer 4.0.540 → 4.0.541

package/dist/assets/download-file.js

@@ -139,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/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/collect-assets.js

@@ -21,7 +21,7 @@ const collectAssets = async ({ frame, freePage, timeoutInMilliseconds, }) => {
                 throw new Error(`Expected string content for artifact ${asset.id}, but got ${asset.content}`);
             }
             const stringOrUintArray = asset.contentType === 'binary'
-                ? new TextEncoder().encode(atob(asset.content))
+                ? new Uint8Array(Buffer.from(asset.content, 'base64'))
                 : asset.content;
             return {
                 ...asset,

package/dist/esm/index.mjs

@@ -1329,7 +1329,7 @@ var downloadFile = async (options2, retries = 2, attempt = 1) => {
     if (message === CANCELLED_ERROR) {
       throw err;
     }
-    if (message === "aborted" || message.includes("ECONNRESET") || message.includes(incorrectContentLengthToken) || message.includes(noDataSentToken) || message.includes("503") || message.includes("502") || message.includes("504") || message.includes("500")) {
+    if (message === "aborted" || message.includes("ECONNRESET") || message.includes(incorrectContentLengthToken) || message.includes(noDataSentToken) || /^Received a status code of (500|502|503|504) while downloading file /.test(message)) {
       if (retries === 0) {
         throw err;
       }
@@ -4040,7 +4040,7 @@ var makeBrowserRunner = async ({
   const transport = await NodeWebSocketTransport.create(browserWSEndpoint);
   const connection = new Connection(transport);
   const killProcess = () => {
-    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) => {
@@ -4066,15 +4066,41 @@ Error cause: ${isErrorLike(error) ? error.stack : error}`);
     deleteDirectory(userDataDir);
     removeEventListeners(listeners);
   };
+  let closePromise = null;
   const closeProcess = () => {
-    if (closed) {
-      return Promise.resolve();
+    if (closePromise) {
+      return closePromise;
     }
-    Log.verbose({ indent, logLevel }, "Received SIGTERM signal. Killing browser process");
-    killProcess();
-    deleteDirectory(userDataDir);
-    removeEventListeners(listeners);
-    return processClosing;
+    closePromise = (async () => {
+      let timeoutId = null;
+      try {
+        if (!closed) {
+          try {
+            connection.send("Browser.close").catch(() => {
+              return;
+            });
+          } catch {}
+          await Promise.race([
+            processClosing,
+            new Promise((resolve) => {
+              timeoutId = setTimeout(resolve, 2000);
+            })
+          ]);
+          if (!closed) {
+            Log.verbose({ indent, logLevel }, "Browser did not exit gracefully. Killing browser process");
+            killProcess();
+          }
+          await processClosing;
+        }
+      } finally {
+        if (timeoutId !== null) {
+          clearTimeout(timeoutId);
+        }
+        deleteDirectory(userDataDir);
+        removeEventListeners(listeners);
+      }
+    })();
+    return closePromise;
   };
   if (dumpio) {
     proc.stdout?.on("data", (d) => {
@@ -7384,6 +7410,7 @@ var internalOpenBrowser = async ({
       "--proxy-server='direct://'",
       "--proxy-bypass-list=*",
       "--force-gpu-mem-available-mb=4096",
+      process.platform === "win32" ? "--disable-skia-graphite" : null,
       process.env.__RESERVED_IS_INSIDE_REMOTION_LAMBDA === "true" ? "--disable-gpu-rasterization" : null,
       "--disable-hang-monitor",
       "--disable-extensions",
@@ -21896,6 +21923,9 @@ class Pool {
     });
   }
   release(resource) {
+    if (resource.closed) {
+      return;
+    }
     const waiter = this.waiters.shift();
     if (waiter === undefined) {
       this.resources.push(resource);
@@ -21960,7 +21990,7 @@ var collectAssets = async ({
       if (typeof asset.content !== "string") {
         throw new Error(`Expected string content for artifact ${asset.id}, but got ${asset.content}`);
       }
-      const stringOrUintArray = asset.contentType === "binary" ? new TextEncoder().encode(atob(asset.content)) : asset.content;
+      const stringOrUintArray = asset.contentType === "binary" ? new Uint8Array(Buffer.from(asset.content, "base64")) : asset.content;
       return {
         ...asset,
         content: stringOrUintArray
@@ -22675,16 +22705,17 @@ var renderFrameAndRetryTargetClose = async ({
       });
     }
     Log.warn({ indent, logLevel }, `The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
+    nextFrameToRender.returnFrame(frame);
     await remotionSharedMemory?.forgetAllPages();
     await browserReplacer.replaceBrowser(makeBrowser, async () => {
       const pages = new Array(concurrencyOrFramesToRender).fill(true).map((_, i) => makeNewPage(frame, i));
       const puppeteerPages = await Promise.all(pages);
       const pool = await poolPromise;
+      pool.resources = pool.resources.filter((p) => !p.closed);
       for (const newPage of puppeteerPages) {
         pool.release(newPage);
       }
     });
-    nextFrameToRender.returnFrame(frame);
     await renderFrameAndRetryTargetClose({
       retriesLeft: retriesLeft - 1,
       attempt: attempt + 1,

package/dist/open-browser.js

@@ -118,6 +118,8 @@ const internalOpenBrowser = async ({ browser, browserExecutable, chromiumOptions
             "--proxy-server='direct://'",
             '--proxy-bypass-list=*',
             '--force-gpu-mem-available-mb=4096',
+            // https://github.com/remotion-dev/remotion/issues/12929
+            process.platform === 'win32' ? '--disable-skia-graphite' : null,
             // Prevent duplicated horizontal strips in Lambda renders: https://github.com/remotion-dev/remotion/issues/11428
             process.env.__RESERVED_IS_INSIDE_REMOTION_LAMBDA === 'true'
                 ? '--disable-gpu-rasterization'

package/dist/pool.js

@@ -18,6 +18,9 @@ class Pool {
         });
     }
     release(resource) {
+        if (resource.closed) {
+            return;
+        }
         const waiter = this.waiters.shift();
         if (waiter === undefined) {
             this.resources.push(resource);

package/dist/render-frame-and-retry-target-close.js

@@ -140,6 +140,7 @@ const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, as
             });
         }
         logger_1.Log.warn({ indent, logLevel }, `The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
+        nextFrameToRender.returnFrame(frame);
         // Replace the entire browser
         await (remotionSharedMemory === null || remotionSharedMemory === void 0 ? void 0 : remotionSharedMemory.forgetAllPages());
         await browserReplacer.replaceBrowser(makeBrowser, async () => {
@@ -148,11 +149,11 @@ const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, as
                 .map((_, i) => makeNewPage(frame, i));
             const puppeteerPages = await Promise.all(pages);
             const pool = await poolPromise;
+            pool.resources = pool.resources.filter((p) => !p.closed);
             for (const newPage of puppeteerPages) {
                 pool.release(newPage);
             }
         });
-        nextFrameToRender.returnFrame(frame);
         await (0, exports.renderFrameAndRetryTargetClose)({
             retriesLeft: retriesLeft - 1,
             attempt: attempt + 1,

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/renderer"
 	},
 	"name": "@remotion/renderer",
-	"version": "4.0.540",
+	"version": "4.0.541",
 	"description": "Render Remotion videos using Node.js or Bun",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,11 +22,11 @@
 	},
 	"dependencies": {
 		"execa": "5.1.1",
-		"remotion": "4.0.540",
-		"@remotion/streaming": "4.0.540",
+		"remotion": "4.0.541",
+		"@remotion/streaming": "4.0.541",
 		"source-map": "0.8.0",
 		"ws": "8.21.0",
-		"@remotion/licensing": "4.0.540"
+		"@remotion/licensing": "4.0.541"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -40,21 +40,21 @@
 		"react-dom": "19.3.1",
 		"typescript": "7.1.0-beta",
 		"@types/ws": "8.5.10",
-		"@remotion/example-videos": "4.0.540",
-		"@remotion/eslint-config-internal": "4.0.540",
+		"@remotion/example-videos": "4.0.541",
+		"@remotion/eslint-config-internal": "4.0.541",
 		"eslint": "9.19.0",
 		"@types/node": "20.12.14",
 		"@types/pngjs": "6.0.5",
 		"pngjs": "7.0.0"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "4.0.540",
-		"@remotion/compositor-darwin-x64": "4.0.540",
-		"@remotion/compositor-linux-arm64-gnu": "4.0.540",
-		"@remotion/compositor-linux-arm64-musl": "4.0.540",
-		"@remotion/compositor-linux-x64-gnu": "4.0.540",
-		"@remotion/compositor-linux-x64-musl": "4.0.540",
-		"@remotion/compositor-win32-x64-msvc": "4.0.540"
+		"@remotion/compositor-darwin-arm64": "4.0.541",
+		"@remotion/compositor-darwin-x64": "4.0.541",
+		"@remotion/compositor-linux-arm64-gnu": "4.0.541",
+		"@remotion/compositor-linux-arm64-musl": "4.0.541",
+		"@remotion/compositor-linux-x64-gnu": "4.0.541",
+		"@remotion/compositor-linux-x64-musl": "4.0.541",
+		"@remotion/compositor-win32-x64-msvc": "4.0.541"
 	},
 	"keywords": [
 		"remotion",