@remotion/renderer 4.0.403 → 4.0.405

package/dist/compositor/compositor.d.ts

@@ -1,6 +1,7 @@
 import type { LogLevel } from '../log-level';
 import type { CompositorCommand } from './payloads';
 export type Compositor = {
+    shutDownOrKill: () => Promise<void>;
     finishCommands: () => Promise<void>;
     executeCommand: <T extends keyof CompositorCommand>(type: T, payload: CompositorCommand[T]) => Promise<Uint8Array>;
     waitForDone: () => Promise<void>;

package/dist/compositor/compositor.js

@@ -107,42 +107,61 @@ const startCompositor = ({ type, payload, logLevel, indent, binariesDirectory =
         clear();
         stderrChunks = [];
     });
-    return {
-        waitForDone: () => {
-            return new Promise((res, rej) => {
-                if (runningStatus.type === 'quit-without-error') {
-                    rej(new Error(`Compositor quit${runningStatus.signal
-                        ? ` with signal ${runningStatus.signal}`
-                        : ''}`));
-                    return;
-                }
-                if (runningStatus.type === 'quit-with-error') {
-                    rej(new Error(`Compositor quit${runningStatus.signal
-                        ? ` with signal ${runningStatus.signal}`
-                        : ''}: ${runningStatus.error}`));
+    const waitForDone = () => {
+        return new Promise((res, rej) => {
+            if (runningStatus.type === 'quit-without-error') {
+                rej(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}`));
+                return;
+            }
+            if (runningStatus.type === 'quit-with-error') {
+                rej(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}: ${runningStatus.error}`));
+                return;
+            }
+            resolve = res;
+            reject = rej;
+        });
+    };
+    const finishCommands = async () => {
+        // Prevent this function from throwing an error if instead a rejected promise should be returned
+        await Promise.resolve();
+        if (runningStatus.type === 'quit-with-error') {
+            return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}: ${runningStatus.error}`));
+        }
+        if (runningStatus.type === 'quit-without-error') {
+            return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}`));
+        }
+        return new Promise((res, rej) => {
+            child.stdin.write('EOF\n', (e) => {
+                if (e) {
+                    rej(e);
                     return;
                 }
-                resolve = res;
-                reject = rej;
+                res();
             });
-        },
-        finishCommands: () => {
-            if (runningStatus.type === 'quit-with-error') {
-                return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}: ${runningStatus.error}`));
-            }
-            if (runningStatus.type === 'quit-without-error') {
-                return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ''}`));
-            }
-            return new Promise((res, rej) => {
-                child.stdin.write('EOF\n', (e) => {
-                    if (e) {
-                        rej(e);
-                        return;
-                    }
-                    res();
-                });
+        });
+    };
+    const shutDownOrKill = () => {
+        const shutDownCase = async () => {
+            await finishCommands();
+            await waitForDone();
+        };
+        let timeout = null;
+        const killCase = async () => {
+            await new Promise((res) => {
+                timeout = setTimeout(res, 5000);
             });
-        },
+            child.kill('SIGKILL');
+        };
+        return Promise.race([shutDownCase(), killCase()]).finally(() => {
+            if (timeout !== null) {
+                clearTimeout(timeout);
+            }
+        });
+    };
+    return {
+        shutDownOrKill,
+        waitForDone,
+        finishCommands,
         executeCommand: (command, params) => {
             return new Promise((_resolve, _reject) => {
                 if (runningStatus.type === 'quit-without-error') {

package/dist/esm/index.mjs

@@ -14801,39 +14801,61 @@ ${parsed.backtrace}`));
     clear();
     stderrChunks = [];
   });
-  return {
-    waitForDone: () => {
-      return new Promise((res, rej) => {
-        if (runningStatus.type === "quit-without-error") {
-          rej(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}`));
-          return;
-        }
-        if (runningStatus.type === "quit-with-error") {
-          rej(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}: ${runningStatus.error}`));
-          return;
-        }
-        resolve2 = res;
-        reject = rej;
-      });
-    },
-    finishCommands: () => {
-      if (runningStatus.type === "quit-with-error") {
-        return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}: ${runningStatus.error}`));
-      }
+  const waitForDone = () => {
+    return new Promise((res, rej) => {
       if (runningStatus.type === "quit-without-error") {
-        return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}`));
+        rej(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}`));
+        return;
+      }
+      if (runningStatus.type === "quit-with-error") {
+        rej(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}: ${runningStatus.error}`));
+        return;
       }
-      return new Promise((res, rej) => {
-        child.stdin.write(`EOF
+      resolve2 = res;
+      reject = rej;
+    });
+  };
+  const finishCommands = async () => {
+    await Promise.resolve();
+    if (runningStatus.type === "quit-with-error") {
+      return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}: ${runningStatus.error}`));
+    }
+    if (runningStatus.type === "quit-without-error") {
+      return Promise.reject(new Error(`Compositor quit${runningStatus.signal ? ` with signal ${runningStatus.signal}` : ""}`));
+    }
+    return new Promise((res, rej) => {
+      child.stdin.write(`EOF
 `, (e) => {
-          if (e) {
-            rej(e);
-            return;
-          }
-          res();
-        });
+        if (e) {
+          rej(e);
+          return;
+        }
+        res();
       });
-    },
+    });
+  };
+  const shutDownOrKill = () => {
+    const shutDownCase = async () => {
+      await finishCommands();
+      await waitForDone();
+    };
+    let timeout = null;
+    const killCase = async () => {
+      await new Promise((res) => {
+        timeout = setTimeout(res, 5000);
+      });
+      child.kill("SIGKILL");
+    };
+    return Promise.race([shutDownCase(), killCase()]).finally(() => {
+      if (timeout !== null) {
+        clearTimeout(timeout);
+      }
+    });
+  };
+  return {
+    shutDownOrKill,
+    waitForDone,
+    finishCommands,
     executeCommand: (command, params) => {
       return new Promise((_resolve, _reject) => {
         if (runningStatus.type === "quit-without-error") {
@@ -14941,13 +14963,8 @@ var startOffthreadVideoServer = ({
     binariesDirectory
   });
   return {
-    close: async () => {
-      try {
-        await compositor.finishCommands();
-        return compositor.waitForDone();
-      } catch (err) {
-        return Promise.reject(err);
-      }
+    close: () => {
+      return compositor.shutDownOrKill();
     },
     listener: (req, response) => {
       if (!req.url) {

package/dist/offthread-video-server.js

@@ -50,18 +50,8 @@ const startOffthreadVideoServer = ({ downloadMap, logLevel, indent, offthreadVid
         binariesDirectory,
     });
     return {
-        close: async () => {
-            // Note: This is being used as a promise:
-            //     .close().then()
-            // but if finishCommands() fails, it acts like a sync function,
-            // therefore we have to catch an error and put a promise rejection
-            try {
-                await compositor.finishCommands();
-                return compositor.waitForDone();
-            }
-            catch (err) {
-                return Promise.reject(err);
-            }
+        close: () => {
+            return compositor.shutDownOrKill();
         },
         listener: (req, response) => {
             if (!req.url) {

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/renderer"
 	},
 	"name": "@remotion/renderer",
-	"version": "4.0.403",
+	"version": "4.0.405",
 	"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",
 		"extract-zip": "2.0.1",
-		"remotion": "4.0.403",
-		"@remotion/streaming": "4.0.403",
+		"remotion": "4.0.405",
+		"@remotion/streaming": "4.0.405",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.17.1",
-		"@remotion/licensing": "4.0.403"
+		"@remotion/licensing": "4.0.405"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -39,19 +39,19 @@
 		"react": "19.2.3",
 		"react-dom": "19.2.3",
 		"@types/ws": "8.5.10",
-		"@remotion/example-videos": "4.0.403",
-		"@remotion/eslint-config-internal": "4.0.403",
+		"@remotion/example-videos": "4.0.405",
+		"@remotion/eslint-config-internal": "4.0.405",
 		"eslint": "9.19.0",
 		"@types/node": "20.12.14"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "4.0.403",
-		"@remotion/compositor-darwin-x64": "4.0.403",
-		"@remotion/compositor-linux-arm64-gnu": "4.0.403",
-		"@remotion/compositor-linux-arm64-musl": "4.0.403",
-		"@remotion/compositor-linux-x64-gnu": "4.0.403",
-		"@remotion/compositor-linux-x64-musl": "4.0.403",
-		"@remotion/compositor-win32-x64-msvc": "4.0.403"
+		"@remotion/compositor-darwin-arm64": "4.0.405",
+		"@remotion/compositor-darwin-x64": "4.0.405",
+		"@remotion/compositor-linux-arm64-gnu": "4.0.405",
+		"@remotion/compositor-linux-arm64-musl": "4.0.405",
+		"@remotion/compositor-linux-x64-gnu": "4.0.405",
+		"@remotion/compositor-linux-x64-musl": "4.0.405",
+		"@remotion/compositor-win32-x64-msvc": "4.0.405"
 	},
 	"keywords": [
 		"remotion",