@remotion/renderer 3.3.43 → 3.3.45

package/dist/determine-vcodec-ffmepg-flags.d.ts

@@ -0,0 +1,2 @@
+import type { SpecialVCodecForTransparency } from './assets/download-map';
+export declare const determineVcodecFfmepgFlags: (vcodecFlag: SpecialVCodecForTransparency) => string[];

package/dist/determine-vcodec-ffmepg-flags.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.determineVcodecFfmepgFlags = void 0;
+const truthy_1 = require("./truthy");
+const determineVcodecFfmepgFlags = (vcodecFlag) => {
+    return [
+        vcodecFlag === 'vp9' ? '-vcodec' : null,
+        vcodecFlag === 'vp9' ? 'libvpx-vp9' : null,
+        vcodecFlag === 'vp8' ? '-vcodec' : null,
+        vcodecFlag === 'vp8' ? 'libvpx' : null,
+    ].filter(truthy_1.truthy);
+};
+exports.determineVcodecFfmepgFlags = determineVcodecFfmepgFlags;

package/dist/error-handling/symbolicate-error.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.symbolicateError = void 0;
 const symbolicate_stacktrace_1 = require("../symbolicate-stacktrace");
+const truthy_1 = require("../truthy");
 const handle_javascript_exception_1 = require("./handle-javascript-exception");
 const symbolicateError = async (symbolicateableError) => {
     const { delayRenderCall, stackFrame } = symbolicateableError;
     const [mainErrorFrames, delayRenderFrames] = await Promise.all([
         stackFrame ? (0, symbolicate_stacktrace_1.symbolicateStackTrace)(stackFrame) : null,
         delayRenderCall ? (0, symbolicate_stacktrace_1.symbolicateStackTrace)(delayRenderCall) : null,
-    ]);
+    ].filter(truthy_1.truthy));
     const symbolicatedErr = new handle_javascript_exception_1.ErrorWithStackFrame({
         message: symbolicateableError.message,
         symbolicatedStackFrames: mainErrorFrames,

package/dist/get-compositions-from-markup.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
+export declare const getCompositionsFromMarkup: (Comp: ComponentType) => TCompMetadata[];

package/dist/get-compositions-from-markup.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompositionsFromMarkup = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const server_1 = require("react-dom/server");
+const getCompositionsFromMarkup = (Comp) => {
+    process.env.REMOTION_SERVER_RENDERING = 'true';
+    const str = (0, server_1.renderToString)((0, jsx_runtime_1.jsx)(Comp, {}));
+    const matches = str.matchAll(/<div>(.*?)<\/div>/g);
+    const metadata = [];
+    for (const match of matches) {
+        const json = JSON.parse(match[1]);
+        metadata.push(json);
+    }
+    return metadata;
+};
+exports.getCompositionsFromMarkup = getCompositionsFromMarkup;

package/dist/get-compositions-on-server.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
+export declare const getCompositionsFromMarkup: (Comp: ComponentType) => TCompMetadata[];

package/dist/get-compositions-on-server.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompositionsFromMarkup = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const server_1 = require("react-dom/server");
+const getCompositionsFromMarkup = (Comp) => {
+    process.env.REMOTION_SERVER_RENDERING = 'true';
+    const str = (0, server_1.renderToString)((0, jsx_runtime_1.jsx)(Comp, {}));
+    console.log({ str }, (0, jsx_runtime_1.jsx)(Comp, {}));
+    const matches = str.matchAll(/<div>(.*?)<\/div>/g);
+    const metadata = [];
+    for (const match of matches) {
+        const json = JSON.parse(match[1]);
+        metadata.push(json);
+    }
+    return metadata;
+};
+exports.getCompositionsFromMarkup = getCompositionsFromMarkup;

package/dist/index.d.ts

@@ -119,8 +119,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: import("./browser").Browser;
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
+    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
     validImageFormats: readonly ["png", "jpeg", "none"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
@@ -130,7 +130,7 @@ export declare const RenderInternals: {
     DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
     logLevels: readonly ["verbose", "info", "warn", "error"];
-    isEqualOrBelowLogLevel: (currentLevel: "error" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "error" | "info" | "warn", level: "verbose" | "error" | "info" | "warn") => boolean;
     isValidLogLevel: (level: string) => boolean;
     perf: typeof perf;
     makeDownloadMap: () => import("./assets/download-map").DownloadMap;

package/dist/lock-port-selection.d.ts

@@ -0,0 +1,2 @@
+export declare const lockPortSelection: () => void;
+export declare const unlockPortSelection: () => void;

package/dist/lock-port-selection.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unlockPortSelection = exports.lockPortSelection = void 0;
+const locks = [];
+const waitForPortSelection = () => { };
+const lockPortSelection = () => {
+    locks.push();
+};
+exports.lockPortSelection = lockPortSelection;
+const unlockPortSelection = () => { };
+exports.unlockPortSelection = unlockPortSelection;

package/dist/render-web-frame.d.ts

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

package/dist/seek-to-frame.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.seekToFrame = exports.waitForReady = void 0;
+const symbolicateable_error_1 = require("./error-handling/symbolicateable-error");
+const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const waitForReady = (page) => {
     return Promise.race([
@@ -20,6 +22,29 @@ const waitForReady = (page) => {
             .catch((err) => {
             throw err;
         }),
+        page
+            .mainFrame()
+            ._mainWorld.waitForFunction(page.browser, 'window.remotion_cancelledError !== undefined')
+            .then(() => {
+            return (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+                pageFunction: () => window.remotion_cancelledError,
+                args: [],
+                frame: null,
+                page,
+            });
+        })
+            .then((val) => {
+            if (typeof val !== 'string') {
+                throw val;
+            }
+            throw new symbolicateable_error_1.SymbolicateableError({
+                frame: null,
+                stack: val,
+                name: 'CancelledError',
+                message: val.split('\n')[0],
+                stackFrame: (0, parse_browser_error_stack_1.parseStack)(val.split('\n')),
+            });
+        }),
     ]);
 };
 exports.waitForReady = waitForReady;

package/dist/serve-static.js

@@ -9,8 +9,6 @@ const get_port_1 = require("./get-port");
 const offthread_video_server_1 = require("./offthread-video-server");
 const serve_handler_1 = require("./serve-handler");
 const serveStatic = async (path, options) => {
-    var _a;
-    const { port, didUsePort } = await (0, get_port_1.getDesiredPort)((_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : undefined, 3000, 3100);
     const offthreadRequest = (0, offthread_video_server_1.startOffthreadVideoServer)({
         ffmpegExecutable: options.ffmpegExecutable,
         ffprobeExecutable: options.ffprobeExecutable,
@@ -19,65 +17,86 @@ const serveStatic = async (path, options) => {
         downloadMap: options.downloadMap,
         remotionRoot: options.remotionRoot,
     });
-    try {
-        const connections = {};
-        const server = http_1.default
-            .createServer((request, response) => {
-            var _a;
-            if ((_a = request.url) === null || _a === void 0 ? void 0 : _a.startsWith('/proxy')) {
-                return offthreadRequest(request, response);
-            }
-            if (path === null) {
-                response.writeHead(404);
-                response.end('Server only supports /proxy');
-                return;
-            }
-            (0, serve_handler_1.serveHandler)(request, response, {
-                public: path,
-            }).catch(() => {
-                response.statusCode = 500;
-                response.end('Error serving file');
-            });
-        })
-            .listen(port);
-        server.on('connection', (conn) => {
-            const key = conn.remoteAddress + ':' + conn.remotePort;
-            connections[key] = conn;
-            conn.on('close', () => {
-                delete connections[key];
-            });
+    const connections = {};
+    const server = http_1.default.createServer((request, response) => {
+        var _a;
+        if ((_a = request.url) === null || _a === void 0 ? void 0 : _a.startsWith('/proxy')) {
+            return offthreadRequest(request, response);
+        }
+        if (path === null) {
+            response.writeHead(404);
+            response.end('Server only supports /proxy');
+            return;
+        }
+        (0, serve_handler_1.serveHandler)(request, response, {
+            public: path,
+        }).catch(() => {
+            response.statusCode = 500;
+            response.end('Error serving file');
         });
-        server.on('listening', () => {
-            didUsePort();
+    });
+    server.on('connection', (conn) => {
+        const key = conn.remoteAddress + ':' + conn.remotePort;
+        connections[key] = conn;
+        conn.on('close', () => {
+            delete connections[key];
         });
-        const destroyConnections = function () {
-            for (const key in connections)
-                connections[key].destroy();
-        };
-        const close = () => {
-            return new Promise((resolve, reject) => {
-                destroyConnections();
-                server.close((err) => {
-                    if (err) {
-                        if (err.code === 'ERR_SERVER_NOT_RUNNING') {
-                            return resolve();
-                        }
+    });
+    let selectedPort = null;
+    const maxTries = 5;
+    for (let i = 0; i < maxTries; i++) {
+        try {
+            selectedPort = await new Promise((resolve, reject) => {
+                var _a;
+                (0, get_port_1.getDesiredPort)((_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : undefined, 3000, 3100)
+                    .then(({ port, didUsePort }) => {
+                    server.listen(port);
+                    server.on('listening', () => {
+                        resolve(port);
+                        return didUsePort();
+                    });
+                    server.on('error', (err) => {
                         reject(err);
-                    }
-                    else {
-                        resolve();
-                    }
-                });
+                    });
+                })
+                    .catch((err) => reject(err));
             });
-        };
-        return { port, close };
-    }
-    catch (err) {
-        console.log({ err, msg: err.message });
-        if (err.message.includes('EADDRINUSE')) {
-            return (0, exports.serveStatic)(path, options);
+            const destroyConnections = function () {
+                for (const key in connections)
+                    connections[key].destroy();
+            };
+            const close = () => {
+                return new Promise((resolve, reject) => {
+                    destroyConnections();
+                    server.close((err) => {
+                        if (err) {
+                            if (err.code ===
+                                'ERR_SERVER_NOT_RUNNING') {
+                                return resolve();
+                            }
+                            reject(err);
+                        }
+                        else {
+                            resolve();
+                        }
+                    });
+                });
+            };
+            return { port: selectedPort, close };
+        }
+        catch (err) {
+            if (!(err instanceof Error)) {
+                throw err;
+            }
+            const codedError = err;
+            if (codedError.code === 'EADDRINUSE') {
+                // Already in use, try another port
+            }
+            else {
+                throw err;
+            }
         }
-        throw err;
     }
+    throw new Error(`Tried ${maxTries} times to find a free port. Giving up.`);
 };
 exports.serveStatic = serveStatic;

package/dist/set-props-and-env.js

@@ -16,6 +16,9 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
     await page.evaluateOnNewDocument((timeout) => {
         window.remotion_puppeteerTimeout = timeout;
     }, actualTimeout);
+    if (typeof inputProps === 'string') {
+        throw new Error('Input props should be an object, not a string.');
+    }
     if (inputProps) {
         await page.evaluateOnNewDocument((input) => {
             window.remotion_inputProps = input;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.43",
+	"version": "3.3.45",
 	"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.43",
+		"remotion": "3.3.45",
 		"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.43",
-		"@remotion/compositor-darwin-x64": "3.3.43",
-		"@remotion/compositor-linux-arm64-gnu": "3.3.43",
-		"@remotion/compositor-linux-arm64-musl": "3.3.43",
-		"@remotion/compositor-linux-x64-gnu": "3.3.43",
-		"@remotion/compositor-linux-x64-musl": "3.3.43",
-		"@remotion/compositor-win32-x64-msvc": "3.3.43"
+		"@remotion/compositor-darwin-arm64": "3.3.45",
+		"@remotion/compositor-darwin-x64": "3.3.45",
+		"@remotion/compositor-linux-arm64-gnu": "3.3.45",
+		"@remotion/compositor-linux-arm64-musl": "3.3.45",
+		"@remotion/compositor-linux-x64-gnu": "3.3.45",
+		"@remotion/compositor-linux-x64-musl": "3.3.45",
+		"@remotion/compositor-win32-x64-msvc": "3.3.45"
 	},
 	"keywords": [
 		"remotion",
@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "3585e437a30ba001e983539728eb1914172b729c"
+	"gitHead": "75c028236b43ff2fd0f3f3772f9f79cfde069e36"
 }