@remotion/studio-server 4.0.512 → 4.0.514

package/dist/preview-server/start-server.js

@@ -29,171 +29,219 @@ const startServer = async (options) => {
             });
             return detection.type === 'match' ? 'stop' : 'continue';
         };
-    const watchIgnorePlugin = new bundler_1.WatchIgnoreNextChangePlugin((...args) => {
-        renderer_1.RenderInternals.Log.trace({ indent: false, logLevel: options.logLevel }, ...args);
+    let portSelection = await renderer_1.RenderInternals.getDesiredPort({
+        desiredPort,
+        from: 3000,
+        to: 3100,
+        hostsToTry: portConfig.hostsToTry,
+        onPortUnavailable,
     });
-    const configArgs = {
-        entry: options.entry,
-        userDefinedComponent: options.userDefinedComponent,
-        outDir: null,
-        environment: 'development',
-        bundlerOverride: options.bundlerOverride,
-        rspackOverride: options.rspackOverride,
-        webpackOverride: options === null || options === void 0 ? void 0 : options.webpackOverride,
-        remotionRoot: options.remotionRoot,
-        poll: options.poll,
-        extraPlugins: [watchIgnorePlugin],
-    };
-    let compiler;
-    if (options.rspack) {
-        const [, rspackConf] = await bundler_1.BundlerInternals.rspackConfig(configArgs);
-        compiler = bundler_1.BundlerInternals.createRspackCompiler(rspackConf);
-    }
-    else {
-        const [, webpackConf] = await bundler_1.BundlerInternals.webpackConfig(configArgs);
-        compiler = (0, bundler_1.webpack)(webpackConf);
-    }
-    (0, watch_ignore_next_change_1.setWatchIgnoreNextChangePlugin)(watchIgnorePlugin);
-    const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler, options.logLevel);
-    const liveEventsServer = (0, live_events_1.makeLiveEventsRouter)(options.logLevel, () => {
-        const undoStack = (0, undo_stack_1.getUndoStack)();
-        const redoStack = (0, undo_stack_1.getRedoStack)();
+    if (portSelection.didUsePort) {
+        portSelection.unlockPort();
         return {
-            undoFile: undoStack.length > 0 ? undoStack[undoStack.length - 1].filePath : null,
-            redoFile: redoStack.length > 0 ? redoStack[redoStack.length - 1].filePath : null,
+            type: 'already-running',
+            port: portSelection.port,
         };
-    });
-    (0, hot_middleware_1.setupWebpackHmr)(compiler, options.logLevel, liveEventsServer);
-    compiler.hooks.done.tap('remotion-node-path-cache', () => {
-        (0, node_path_cache_1.clearNodePathCache)();
-    });
-    const server = node_http_1.default.createServer((request, response) => {
-        if (options.enableCrossSiteIsolation) {
-            response.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
-            response.setHeader('Cross-Origin-Embedder-Policy', 'credentialless');
-        }
-        new Promise((resolve) => {
-            wdmMiddleware(request, response, () => {
-                resolve();
-            });
-        })
-            .then(() => {
-            return (0, routes_1.handleRoutes)({
-                staticHash: options.staticHash,
-                staticHashPrefix: options.staticHashPrefix,
-                outputHash: options.outputHash,
-                outputHashPrefix: options.outputHashPrefix,
-                request: request,
-                response,
-                liveEventsServer,
-                getCurrentInputProps: options.getCurrentInputProps,
-                getEnvVariables: options.getEnvVariables,
-                remotionRoot: options.remotionRoot,
-                entryPoint: options.userDefinedComponent,
-                publicDir: options.publicDir,
-                logLevel: options.logLevel,
-                getRenderQueue: options.getRenderQueue,
-                getRenderDefaults: options.getRenderDefaults,
-                getNumberOfAudioTags: options.getNumberOfAudioTags,
-                queueMethods: options.queueMethods,
-                gitSource: options.gitSource,
-                binariesDirectory: options.binariesDirectory,
-                getAudioLatencyHint: options.getAudioLatencyHint,
-                getExperimentalKeepAudioContextAlive: options.getExperimentalKeepAudioContextAlive,
-                getPreviewSampleRate: options.getPreviewSampleRate,
-                enableCrossSiteIsolation: options.enableCrossSiteIsolation,
-                getStudioRuntimeConfig: options.getStudioRuntimeConfig,
-                getDefaultCodingAgent: options.getDefaultCodingAgent,
-                getDefaultEditor: options.getDefaultEditor,
-                configFile: options.configFile,
-            });
-        })
-            .catch((err) => {
-            renderer_1.RenderInternals.Log.error({ indent: false, logLevel: options.logLevel }, `Error while calling ${request.url}`, err);
-            if (!response.headersSent) {
-                response.setHeader('content-type', 'application/json');
-                response.writeHead(500);
-            }
-            if (!response.writableEnded) {
-                response.end(JSON.stringify({
-                    err: err.message,
-                }));
-            }
-        });
-    });
+    }
+    const handleRequestBeforeReady = (_request, response) => {
+        response.writeHead(503);
+        response.end('Studio is starting...');
+    };
+    const server = node_http_1.default.createServer(handleRequestBeforeReady);
     const maxTries = 5;
+    let selectedPort = null;
     for (let i = 0; i < maxTries; i++) {
         try {
-            const { port, unlockPort, didUsePort } = await renderer_1.RenderInternals.getDesiredPort({
-                desiredPort,
-                from: 3000,
-                to: 3100,
-                hostsToTry: portConfig.hostsToTry,
-                onPortUnavailable,
-            });
-            if (didUsePort) {
-                unlockPort();
-                await Promise.all([
-                    new Promise((resolve) => {
-                        server.close(() => resolve());
-                    }),
-                    new Promise((resolve) => {
-                        compiler.close(() => resolve());
-                    }),
-                ]);
-                return {
-                    type: 'already-running',
-                    port,
-                };
-            }
-            const selectedPort = await new Promise((resolve, reject) => {
+            const { port, unlockPort } = portSelection;
+            selectedPort = await new Promise((resolve, reject) => {
                 renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: options.logLevel }, `Binding server to host ${portConfig.host}, port ${port}`);
+                const onListening = () => {
+                    server.off('error', onError);
+                    unlockPort();
+                    resolve(port);
+                };
+                const onError = (error) => {
+                    server.off('listening', onListening);
+                    reject(error);
+                };
+                server.once('listening', onListening);
+                server.once('error', onError);
                 server.listen({
                     port,
                     host: portConfig.host,
                 });
-                server.on('listening', () => {
-                    resolve(port);
-                    return unlockPort();
-                });
-                server.on('error', (err) => {
-                    reject(err);
-                });
             });
-            return {
-                type: 'started',
-                port: selectedPort,
-                liveEventsServer,
-                close: async () => {
-                    server.closeAllConnections();
-                    await Promise.all([
-                        new Promise((resolve) => {
-                            server.close(() => {
-                                resolve();
-                            });
-                        }),
-                        new Promise((resolve) => {
-                            compiler.close(() => {
-                                resolve();
-                            });
-                        }),
-                    ]);
-                },
-            };
+            break;
         }
         catch (err) {
             if (!(err instanceof Error)) {
+                portSelection.unlockPort();
                 throw err;
             }
             const codedError = err;
             if (codedError.code === 'EADDRINUSE') {
+                portSelection.unlockPort();
                 renderer_1.RenderInternals.Log.error({ indent: false, logLevel: options.logLevel }, `Port ${codedError.port} is already in use. Trying another port...`);
+                if (i === maxTries - 1) {
+                    break;
+                }
+                portSelection = await renderer_1.RenderInternals.getDesiredPort({
+                    desiredPort,
+                    from: 3000,
+                    to: 3100,
+                    hostsToTry: portConfig.hostsToTry,
+                    onPortUnavailable,
+                });
+                if (portSelection.didUsePort) {
+                    portSelection.unlockPort();
+                    return {
+                        type: 'already-running',
+                        port: portSelection.port,
+                    };
+                }
             }
             else {
+                portSelection.unlockPort();
                 throw err;
             }
         }
     }
-    throw new Error(`Tried ${maxTries} times to find a free port. Giving up.`);
+    if (selectedPort === null) {
+        throw new Error(`Tried ${maxTries} times to find a free port. Giving up.`);
+    }
+    let compiler = null;
+    try {
+        const watchIgnorePlugin = new bundler_1.WatchIgnoreNextChangePlugin((...args) => {
+            renderer_1.RenderInternals.Log.trace({ indent: false, logLevel: options.logLevel }, ...args);
+        });
+        const configArgs = {
+            entry: options.entry,
+            userDefinedComponent: options.userDefinedComponent,
+            outDir: null,
+            environment: 'development',
+            bundlerOverride: options.bundlerOverride,
+            rspackOverride: options.rspackOverride,
+            webpackOverride: options === null || options === void 0 ? void 0 : options.webpackOverride,
+            remotionRoot: options.remotionRoot,
+            poll: options.poll,
+            extraPlugins: [watchIgnorePlugin],
+        };
+        if (options.rspack) {
+            const [, rspackConf] = await bundler_1.BundlerInternals.rspackConfig(configArgs);
+            compiler = bundler_1.BundlerInternals.createRspackCompiler(rspackConf);
+        }
+        else {
+            const [, webpackConf] = await bundler_1.BundlerInternals.webpackConfig(configArgs);
+            compiler = (0, bundler_1.webpack)(webpackConf);
+        }
+        (0, watch_ignore_next_change_1.setWatchIgnoreNextChangePlugin)(watchIgnorePlugin);
+        const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler, options.logLevel);
+        const liveEventsServer = (0, live_events_1.makeLiveEventsRouter)(options.logLevel, () => {
+            const undoStack = (0, undo_stack_1.getUndoStack)();
+            const redoStack = (0, undo_stack_1.getRedoStack)();
+            return {
+                undoFile: undoStack.length > 0
+                    ? undoStack[undoStack.length - 1].filePath
+                    : null,
+                redoFile: redoStack.length > 0
+                    ? redoStack[redoStack.length - 1].filePath
+                    : null,
+            };
+        });
+        (0, hot_middleware_1.setupWebpackHmr)(compiler, options.logLevel, liveEventsServer);
+        compiler.hooks.done.tap('remotion-node-path-cache', () => {
+            (0, node_path_cache_1.clearNodePathCache)();
+        });
+        server.off('request', handleRequestBeforeReady);
+        server.on('request', (request, response) => {
+            if (options.enableCrossSiteIsolation) {
+                response.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
+                response.setHeader('Cross-Origin-Embedder-Policy', 'credentialless');
+            }
+            new Promise((resolve) => {
+                wdmMiddleware(request, response, () => {
+                    resolve();
+                });
+            })
+                .then(() => {
+                return (0, routes_1.handleRoutes)({
+                    staticHash: options.staticHash,
+                    staticHashPrefix: options.staticHashPrefix,
+                    outputHash: options.outputHash,
+                    outputHashPrefix: options.outputHashPrefix,
+                    request: request,
+                    response,
+                    liveEventsServer,
+                    getCurrentInputProps: options.getCurrentInputProps,
+                    getEnvVariables: options.getEnvVariables,
+                    remotionRoot: options.remotionRoot,
+                    entryPoint: options.userDefinedComponent,
+                    publicDir: options.publicDir,
+                    logLevel: options.logLevel,
+                    getRenderQueue: options.getRenderQueue,
+                    getRenderDefaults: options.getRenderDefaults,
+                    getNumberOfAudioTags: options.getNumberOfAudioTags,
+                    queueMethods: options.queueMethods,
+                    gitSource: options.gitSource,
+                    binariesDirectory: options.binariesDirectory,
+                    getAudioLatencyHint: options.getAudioLatencyHint,
+                    getExperimentalKeepAudioContextAlive: options.getExperimentalKeepAudioContextAlive,
+                    getPreviewSampleRate: options.getPreviewSampleRate,
+                    enableCrossSiteIsolation: options.enableCrossSiteIsolation,
+                    getStudioRuntimeConfig: options.getStudioRuntimeConfig,
+                    getDefaultCodingAgent: options.getDefaultCodingAgent,
+                    getDefaultEditor: options.getDefaultEditor,
+                    configFile: options.configFile,
+                });
+            })
+                .catch((err) => {
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel: options.logLevel }, `Error while calling ${request.url}`, err);
+                if (!response.headersSent) {
+                    response.setHeader('content-type', 'application/json');
+                    response.writeHead(500);
+                }
+                if (!response.writableEnded) {
+                    response.end(JSON.stringify({
+                        err: err.message,
+                    }));
+                }
+            });
+        });
+        const initializedCompiler = compiler;
+        return {
+            type: 'started',
+            port: selectedPort,
+            liveEventsServer,
+            close: async () => {
+                server.closeAllConnections();
+                await Promise.all([
+                    new Promise((resolve) => {
+                        server.close(() => {
+                            resolve();
+                        });
+                    }),
+                    new Promise((resolve) => {
+                        initializedCompiler.close(() => {
+                            resolve();
+                        });
+                    }),
+                ]);
+            },
+        };
+    }
+    catch (error) {
+        server.closeAllConnections();
+        await Promise.all([
+            new Promise((resolve) => {
+                server.close(() => resolve());
+            }),
+            compiler
+                ? new Promise((resolve) => {
+                    compiler === null || compiler === void 0 ? void 0 : compiler.close(() => resolve());
+                })
+                : Promise.resolve(),
+        ]);
+        throw error;
+    }
 };
 exports.startServer = startServer;

package/dist/preview-server/undo-stack.d.ts

@@ -4,7 +4,7 @@ export interface UndoEntryDescription {
     undoMessage: string;
     redoMessage: string;
 }
-type UndoEntryType = 'visual-control' | 'default-props' | 'sequence-props' | 'effect-props' | 'keyframe-add' | 'keyframe-delete' | 'add-effect' | 'delete-effect' | 'duplicate-effect' | 'paste-effects' | 'reorder-effect' | 'reorder-sequence' | 'delete-jsx-node' | 'duplicate-jsx-node' | 'split-jsx-sequence' | 'insert-jsx-element' | 'delete-composition' | 'rename-composition' | 'update-composition-metadata' | 'new-composition' | 'duplicate-composition' | 'move-composition-to-folder' | 'new-folder' | 'delete-folder' | 'rename-folder';
+type UndoEntryType = 'visual-control' | 'default-props' | 'sequence-props' | 'effect-props' | 'keyframe-add' | 'keyframe-delete' | 'add-effect' | 'delete-effect' | 'duplicate-effect' | 'paste-effects' | 'reorder-effect' | 'reorder-sequence' | 'delete-jsx-node' | 'duplicate-jsx-node' | 'split-jsx-sequence' | 'split-video-from-audio' | 'insert-jsx-element' | 'delete-composition' | 'rename-composition' | 'update-composition-metadata' | 'new-composition' | 'duplicate-composition' | 'move-composition-to-folder' | 'new-folder' | 'delete-folder' | 'rename-folder';
 type UndoEntrySnapshot = {
     filePath: string;
     oldContents: string | null;
@@ -21,57 +21,8 @@ type UndoEntry = {
     description: UndoEntryDescription;
     /** When true, undo/redo file restores call `suppressBundlerUpdateForFile` (skip HMR refresh). */
     suppressHmrOnFileRestore: boolean;
-} & ({
-    entryType: 'visual-control';
-} | {
-    entryType: 'default-props';
-} | {
-    entryType: 'sequence-props';
-} | {
-    entryType: 'effect-props';
-} | {
-    entryType: 'keyframe-add';
-} | {
-    entryType: 'keyframe-delete';
-} | {
-    entryType: 'add-effect';
-} | {
-    entryType: 'delete-effect';
-} | {
-    entryType: 'duplicate-effect';
-} | {
-    entryType: 'paste-effects';
-} | {
-    entryType: 'reorder-effect';
-} | {
-    entryType: 'reorder-sequence';
-} | {
-    entryType: 'delete-jsx-node';
-} | {
-    entryType: 'duplicate-jsx-node';
-} | {
-    entryType: 'split-jsx-sequence';
-} | {
-    entryType: 'insert-jsx-element';
-} | {
-    entryType: 'delete-composition';
-} | {
-    entryType: 'rename-composition';
-} | {
-    entryType: 'update-composition-metadata';
-} | {
-    entryType: 'new-composition';
-} | {
-    entryType: 'duplicate-composition';
-} | {
-    entryType: 'move-composition-to-folder';
-} | {
-    entryType: 'new-folder';
-} | {
-    entryType: 'delete-folder';
-} | {
-    entryType: 'rename-folder';
-});
+    entryType: UndoEntryType;
+};
 export declare function pushToUndoStack({ filePath, oldContents, newContents, logLevel, remotionRoot, logLine, description, entryType, suppressHmrOnFileRestore, nodePathRemappings }: {
     filePath: string;
     oldContents: string;

package/dist/preview-server/update-available.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUpdateAvailableWithTimeout = exports.getRemotionVersion = exports.isUpdateAvailable = void 0;
-const node_fs_1 = require("node:fs");
-const node_path_1 = __importDefault(require("node:path"));
 const semver_1 = __importDefault(require("semver"));
 const detect_outdated_remotion_skills_1 = require("../detect-outdated-remotion-skills");
 const get_latest_remotion_version_1 = require("../get-latest-remotion-version");
@@ -17,12 +15,14 @@ const getSkillsUpdateInfo = ({ remotionRoot, currentVersion, }) => {
     }).project;
     return {
         skillsUpdateAvailable: projectSkills.type === 'outdated',
-        remotionUpgradeSkillAvailable: (0, node_fs_1.existsSync)(node_path_1.default.join(remotionRoot, '.agents', 'skills', 'remotion-upgrade', 'SKILL.md')),
     };
 };
 const isUpdateAvailable = async ({ remotionRoot, currentVersion, logLevel, getLatestVersion, }) => {
     const latest = await (getLatestVersion !== null && getLatestVersion !== void 0 ? getLatestVersion : get_latest_remotion_version_1.getLatestRemotionVersion)();
-    const skillsUpdateInfo = getSkillsUpdateInfo({ remotionRoot, currentVersion });
+    const skillsUpdateInfo = getSkillsUpdateInfo({
+        remotionRoot,
+        currentVersion,
+    });
     const pkgManager = (0, get_package_manager_1.getPackageManager)({
         remotionRoot,
         packageManager: undefined,

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/studio-server"
 	},
 	"name": "@remotion/studio-server",
-	"version": "4.0.512",
+	"version": "4.0.514",
 	"description": "Run a Remotion Studio with a server backend",
 	"main": "dist",
 	"scripts": {
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@remotion/studio-protocol": "4.0.512",
+		"@remotion/studio-protocol": "4.0.514",
 		"@babel/types": "7.24.0",
 		"@babel/parser": "7.24.1",
 		"@svgr/core": "8.1.0",
@@ -32,12 +32,12 @@
 		"semver": "7.5.3",
 		"zod": "4.4.3",
 		"prettier": "3.8.1",
-		"remotion": "4.0.512",
+		"remotion": "4.0.514",
 		"recast": "0.23.11",
-		"@remotion/bundler": "4.0.512",
-		"@remotion/renderer": "4.0.512",
-		"@remotion/studio-codemods": "4.0.512",
-		"@remotion/studio-shared": "4.0.512",
+		"@remotion/bundler": "4.0.514",
+		"@remotion/renderer": "4.0.514",
+		"@remotion/studio-codemods": "4.0.514",
+		"@remotion/studio-shared": "4.0.514",
 		"memfs": "3.4.3",
 		"open": "8.4.2"
 	},
@@ -45,7 +45,7 @@
 		"ast-types": "0.16.1",
 		"react": "19.2.3",
 		"@types/semver": "7.5.3",
-		"@remotion/eslint-config-internal": "4.0.512",
+		"@remotion/eslint-config-internal": "4.0.514",
 		"eslint": "9.19.0",
 		"@types/node": "20.12.14",
 		"@typescript/native-preview": "7.0.0-dev.20260217.1"