@remotion/renderer 3.3.39 → 3.3.40

package/dist/compositor/compositor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForCompositorWithIdToQuit = exports.releaseCompositorWithId = exports.spawnCompositorOrReuse = void 0;
 const child_process_1 = require("child_process");
-const truthy_1 = require("../truthy");
 const get_executable_path_1 = require("./get-executable-path");
 const compositorMap = {};
 const spawnCompositorOrReuse = ({ initiatePayload, renderId, }) => {
@@ -30,15 +29,28 @@ const startCompositor = (compositorInitiatePayload) => {
     const child = (0, child_process_1.spawn)(`${bin}`, [JSON.stringify(compositorInitiatePayload)]);
     const stderrChunks = [];
     let stdoutListeners = [];
-    let stderrListeners = [];
+    // TODO: Without this the render gets stuck!! :O
     child.stderr.on('data', (d) => {
-        stderrChunks.push(d);
-        const str = d.toString('utf-8');
-        stderrListeners.forEach((s) => s(str));
+        console.log('stderr', d.toString('utf-8'));
     });
     child.stdout.on('data', (d) => {
         const str = d.toString('utf-8');
-        stdoutListeners.forEach((s) => s(str));
+        try {
+            const payloads = str
+                .split('--debug-end--')
+                .map((t) => t.trim())
+                .filter(Boolean);
+            for (const payload of payloads) {
+                const p = JSON.parse(payload.replace('--debug-start--', ''));
+                if (p.msg_type === 'debug') {
+                    console.log('Rust debug', p.msg);
+                }
+                stdoutListeners.forEach((s) => s(p));
+            }
+        }
+        catch (e) {
+            console.log({ str });
+        }
     });
     let nonce = 0;
     return {
@@ -65,46 +77,19 @@ const startCompositor = (compositorInitiatePayload) => {
             nonce++;
             return new Promise((resolve, reject) => {
                 child.stdin.write(JSON.stringify(actualPayload) + '\n');
-                const onStderr = (message) => {
-                    let parsed = null;
-                    try {
-                        const content = JSON.parse(message);
-                        if (content.msg_type === 'error') {
-                            parsed = content;
-                        }
-                    }
-                    catch (error) {
-                        // TODO: Obviously bad, does not handle panics
-                        console.log('Rust debug err:', message);
+                const onStdout = (p) => {
+                    if (p.msg_type === 'finish' && p.nonce === actualPayload.nonce) {
+                        resolve();
+                        stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
                     }
-                    if (parsed) {
-                        const err = new Error(parsed.error);
-                        err.stack = parsed.error + '\n' + parsed.backtrace;
+                    if (p.msg_type === 'error') {
+                        const err = new Error(p.error);
+                        err.stack = p.error + '\n' + p.backtrace;
                         reject(err);
                         stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
-                        stderrListeners = stderrListeners.filter((s) => s !== onStderr);
-                    }
-                };
-                const onStdout = (str) => {
-                    const lineSplit = str.split('\n');
-                    for (const line of lineSplit.filter(truthy_1.truthy)) {
-                        let parsed = null;
-                        try {
-                            const p = JSON.parse(line);
-                            if (p.msg_type === 'finish') {
-                                parsed = p;
-                            }
-                        }
-                        catch (e) { }
-                        if (parsed && parsed.nonce === actualPayload.nonce) {
-                            resolve();
-                            stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
-                            stderrListeners = stderrListeners.filter((s) => s !== onStderr);
-                        }
                     }
                 };
                 stdoutListeners.push(onStdout);
-                stderrListeners.push(onStderr);
             });
         },
     };

package/dist/puppeteer-evaluate.js

@@ -99,18 +99,26 @@ async function puppeteerEvaluateWithCatch({ page, pageFunction, frame, args, })
             error.message += ' Are you passing a nested JSHandle?';
         throw error;
     }
-    const { exceptionDetails, result: remoteObject } = await callFunctionOnPromise;
-    if (exceptionDetails) {
-        const err = new symbolicateable_error_1.SymbolicateableError({
-            stack: (_c = exceptionDetails.exception) === null || _c === void 0 ? void 0 : _c.description,
-            name: (_d = exceptionDetails.exception) === null || _d === void 0 ? void 0 : _d.className,
-            message: (_f = (_e = exceptionDetails.exception) === null || _e === void 0 ? void 0 : _e.description) === null || _f === void 0 ? void 0 : _f.split('\n')[0],
-            frame,
-            stackFrame: (0, parse_browser_error_stack_1.parseStack)(((_g = exceptionDetails.exception) === null || _g === void 0 ? void 0 : _g.description).split('\n')),
-        });
-        throw err;
+    try {
+        const { exceptionDetails, result: remoteObject } = await callFunctionOnPromise;
+        if (exceptionDetails) {
+            const err = new symbolicateable_error_1.SymbolicateableError({
+                stack: (_c = exceptionDetails.exception) === null || _c === void 0 ? void 0 : _c.description,
+                name: (_d = exceptionDetails.exception) === null || _d === void 0 ? void 0 : _d.className,
+                message: (_f = (_e = exceptionDetails.exception) === null || _e === void 0 ? void 0 : _e.description) === null || _f === void 0 ? void 0 : _f.split('\n')[0],
+                frame,
+                stackFrame: (0, parse_browser_error_stack_1.parseStack)(((_g = exceptionDetails.exception) === null || _g === void 0 ? void 0 : _g.description).split('\n')),
+            });
+            throw err;
+        }
+        return valueFromRemoteObject(remoteObject);
+    }
+    catch (error) {
+        if (error === null || error === void 0 ? void 0 : error.originalMessage.startsWith("Object couldn't be returned by value")) {
+            throw new Error('Could not serialize the return value of the function. Did you pass non-serializable values to defaultProps?');
+        }
+        throw error;
     }
-    return valueFromRemoteObject(remoteObject);
 }
 exports.puppeteerEvaluateWithCatch = puppeteerEvaluateWithCatch;
 /**

package/dist/render-web-frame.js

@@ -92,6 +92,7 @@ const renderWebFrame = ({ frame, index, downloadMap, imageFormat, poolPromise, s
         });
     });
 };
+// TODO: Bring fixes for retrying here
 const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, outputDir, stopState, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, }) => {
     var _a, _b;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.39",
+	"version": "3.3.40",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.3.39",
+		"remotion": "3.3.40",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -49,13 +49,13 @@
 		"vitest": "0.24.3"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "3.3.39",
-		"@remotion/compositor-darwin-x64": "3.3.39",
-		"@remotion/compositor-linux-arm64-gnu": "3.3.39",
-		"@remotion/compositor-linux-arm64-musl": "3.3.39",
-		"@remotion/compositor-linux-x64-gnu": "3.3.39",
-		"@remotion/compositor-linux-x64-musl": "3.3.39",
-		"@remotion/compositor-win32-x64-msvc": "3.3.39"
+		"@remotion/compositor-darwin-arm64": "3.3.40",
+		"@remotion/compositor-darwin-x64": "3.3.40",
+		"@remotion/compositor-linux-arm64-gnu": "3.3.40",
+		"@remotion/compositor-linux-arm64-musl": "3.3.40",
+		"@remotion/compositor-linux-x64-gnu": "3.3.40",
+		"@remotion/compositor-linux-x64-musl": "3.3.40",
+		"@remotion/compositor-win32-x64-msvc": "3.3.40"
 	},
 	"keywords": [
 		"remotion",
@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5a07260074fe3a6db2cdba0001503c665951414d"
+	"gitHead": "be5f606a81761f7f8e1e191ebabd5f8d225d8c09"
 }