@remotion/studio-server 4.0.420 → 4.0.422

package/dist/detect-remotion-server.d.ts

@@ -0,0 +1,13 @@
+type RemotionDetectionResult = {
+    type: 'match';
+} | {
+    type: 'mismatch';
+} | {
+    type: 'not-remotion';
+};
+export declare const detectRemotionServer: ({ port, cwd, hostname, }: {
+    port: number;
+    cwd: string;
+    hostname: string;
+}) => Promise<RemotionDetectionResult>;
+export {};

package/dist/detect-remotion-server.js

@@ -0,0 +1,51 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectRemotionServer = void 0;
+const http_1 = __importDefault(require("http"));
+const detectRemotionServer = ({ port, cwd, hostname, }) => {
+    return new Promise((resolve) => {
+        const req = http_1.default.get({
+            hostname,
+            port,
+            path: '/__remotion_config',
+            timeout: 1000,
+        }, (res) => {
+            if (res.statusCode !== 200) {
+                res.resume();
+                return resolve({ type: 'not-remotion' });
+            }
+            let data = '';
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            res.on('error', () => {
+                resolve({ type: 'not-remotion' });
+            });
+            res.on('end', () => {
+                try {
+                    const json = JSON.parse(data);
+                    if (json.isRemotion !== true) {
+                        return resolve({ type: 'not-remotion' });
+                    }
+                    // Normalize paths for comparison to avoid issues with different separators or casing on Windows
+                    const normalize = (p) => p.replace(/\\/g, '/').toLowerCase();
+                    if (normalize(json.cwd) === normalize(cwd)) {
+                        return resolve({ type: 'match' });
+                    }
+                    return resolve({ type: 'mismatch' });
+                }
+                catch (_a) {
+                    resolve({ type: 'not-remotion' });
+                }
+            });
+        });
+        req.on('error', () => resolve({ type: 'not-remotion' }));
+        req.on('timeout', () => {
+            req.destroy();
+        });
+    });
+};
+exports.detectRemotionServer = detectRemotionServer;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { ApiRoutes, CopyStillToClipboardRequest, getDefaultOutLocation, OpenInFi
 export type { AggregateRenderProgress, BundlingState, CopyingState, DownloadProgress, HotMiddlewareOptions, JobProgressCallback, ModuleMap, PackageManager, ProjectInfo, RenderingProgressInput, RenderJob, RenderJobWithCleanup, RequiredChromiumOptions, StitchingProgressInput, UiOpenGlOptions, } from '@remotion/studio-shared';
 import { AnsiDiff } from './ansi-diff';
 export declare const StudioServerInternals: {
-    startStudio: ({ browserArgs, browserFlag, configValueShouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, maxTimelineTracks, remotionRoot, keyboardShortcutsEnabled, experimentalClientSideRenderingEnabled, relativePublicDir, webpackOverride, poll, getRenderDefaults, getRenderQueue, numberOfAudioTags, queueMethods, parsedCliOpen, previewEntry, gitSource, bufferStateDelayInMilliseconds, binariesDirectory, forceIPv4, audioLatencyHint, enableCrossSiteIsolation, askAIEnabled, }: {
+    startStudio: ({ browserArgs, browserFlag, configValueShouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, maxTimelineTracks, remotionRoot, keyboardShortcutsEnabled, experimentalClientSideRenderingEnabled, relativePublicDir, webpackOverride, poll, getRenderDefaults, getRenderQueue, numberOfAudioTags, queueMethods, parsedCliOpen, previewEntry, gitSource, bufferStateDelayInMilliseconds, binariesDirectory, forceIPv4, audioLatencyHint, enableCrossSiteIsolation, askAIEnabled, forceNew, }: {
         browserArgs: string;
         browserFlag: string;
         logLevel: import("@remotion/renderer").LogLevel;
@@ -31,7 +31,8 @@ export declare const StudioServerInternals: {
         binariesDirectory: string | null;
         forceIPv4: boolean;
         askAIEnabled: boolean;
-    }) => Promise<void>;
+        forceNew: boolean;
+    }) => Promise<import("./start-studio").StartStudioResult>;
     getRemotionVersion: () => any;
     waitForLiveEventsListener: () => Promise<import("./preview-server/live-events").LiveEventsServer>;
     lockFilePaths: {
@@ -40,7 +41,12 @@ export declare const StudioServerInternals: {
         installCommand: string;
         startCommand: string;
     }[];
-    getPackageManager: (remotionRoot: string, packageManager: string | undefined, dirUp: number) => {
+    getPackageManager: ({ remotionRoot, packageManager, dirUp, logLevel, }: {
+        remotionRoot: string;
+        packageManager: string | undefined;
+        dirUp: number;
+        logLevel: import("@remotion/renderer").LogLevel;
+    }) => {
         manager: import("@remotion/studio-shared").PackageManager;
         path: string;
         installCommand: string;
@@ -70,11 +76,6 @@ export declare const StudioServerInternals: {
         newContents: string;
         changesMade: import("./codemods/recast-mods").Change[];
     };
-    openBrowser: ({ url, browserFlag, browserArgs, }: {
-        url: string;
-        browserFlag: string | undefined;
-        browserArgs: string | undefined;
-    }) => Promise<boolean | import("child_process").ChildProcess>;
     getInstalledDependencies: (remotionRoot: string) => {
         dependencies: string[];
         devDependencies: string[];

package/dist/index.js

@@ -5,7 +5,6 @@ const studio_shared_1 = require("@remotion/studio-shared");
 var studio_shared_2 = require("@remotion/studio-shared");
 Object.defineProperty(exports, "getDefaultOutLocation", { enumerable: true, get: function () { return studio_shared_2.getDefaultOutLocation; } });
 const ansi_diff_1 = require("./ansi-diff");
-const better_opn_1 = require("./better-opn");
 const duplicate_composition_1 = require("./codemods/duplicate-composition");
 const file_watcher_1 = require("./file-watcher");
 const get_latest_remotion_version_1 = require("./get-latest-remotion-version");
@@ -29,7 +28,6 @@ exports.StudioServerInternals = {
     AnsiDiff: ansi_diff_1.AnsiDiff,
     formatBytes: studio_shared_1.formatBytes,
     parseAndApplyCodemod: duplicate_composition_1.parseAndApplyCodemod,
-    openBrowser: better_opn_1.openBrowser,
     getInstalledDependencies: get_installed_dependencies_1.getInstalledDependencies,
     getInstallCommand: install_command_1.getInstallCommand,
 };

package/dist/maybe-open-browser.d.ts

@@ -0,0 +1,11 @@
+import type { LogLevel } from '@remotion/renderer';
+export declare const maybeOpenBrowser: ({ browserArgs, browserFlag, configValueShouldOpenBrowser, parsedCliOpen, url, logLevel, }: {
+    browserArgs: string;
+    browserFlag: string;
+    configValueShouldOpenBrowser: boolean;
+    parsedCliOpen: boolean;
+    url: string;
+    logLevel: LogLevel;
+}) => Promise<{
+    didOpenBrowser: boolean;
+}>;

package/dist/maybe-open-browser.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maybeOpenBrowser = void 0;
+const renderer_1 = require("@remotion/renderer");
+const better_opn_1 = require("./better-opn");
+const getShouldOpenBrowser = ({ configValueShouldOpenBrowser, parsedCliOpen, }) => {
+    var _a;
+    if (parsedCliOpen === false) {
+        return {
+            shouldOpenBrowser: false,
+            reasonForBrowserDecision: '--no-open specified',
+        };
+    }
+    if (((_a = process.env.BROWSER) !== null && _a !== void 0 ? _a : '').toLowerCase() === 'none') {
+        return {
+            shouldOpenBrowser: false,
+            reasonForBrowserDecision: 'env BROWSER=none was set',
+        };
+    }
+    if (configValueShouldOpenBrowser === false) {
+        return { shouldOpenBrowser: false, reasonForBrowserDecision: 'Config file' };
+    }
+    return { shouldOpenBrowser: true, reasonForBrowserDecision: 'default' };
+};
+const maybeOpenBrowser = async ({ browserArgs, browserFlag, configValueShouldOpenBrowser, parsedCliOpen, url, logLevel, }) => {
+    const { reasonForBrowserDecision, shouldOpenBrowser } = getShouldOpenBrowser({
+        configValueShouldOpenBrowser,
+        parsedCliOpen,
+    });
+    if (shouldOpenBrowser) {
+        await (0, better_opn_1.openBrowser)({
+            url,
+            browserArgs,
+            browserFlag,
+        });
+    }
+    else {
+        renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `Not opening browser, reason: ${reasonForBrowserDecision}`);
+    }
+    return { didOpenBrowser: shouldOpenBrowser };
+};
+exports.maybeOpenBrowser = maybeOpenBrowser;

package/dist/preview-server/__tests__/multiple-lockfiles.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/preview-server/__tests__/multiple-lockfiles.test.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const bun_test_1 = require("bun:test");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
+const get_package_manager_1 = require("../get-package-manager");
+(0, bun_test_1.describe)('getPackageManager multiple lockfiles', () => {
+    let tempDir;
+    (0, bun_test_1.beforeEach)(() => {
+        tempDir = node_fs_1.default.mkdtempSync(node_path_1.default.join(node_os_1.default.tmpdir(), 'remotion-test-'));
+    });
+    (0, bun_test_1.afterEach)(() => {
+        node_fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+    });
+    (0, bun_test_1.test)('should not throw error when multiple lockfiles are detected', () => {
+        node_fs_1.default.writeFileSync(node_path_1.default.join(tempDir, 'package-lock.json'), '{}');
+        node_fs_1.default.writeFileSync(node_path_1.default.join(tempDir, 'bun.lock'), '');
+        // Should not throw
+        const manager = (0, get_package_manager_1.getPackageManager)(tempDir, undefined, 0);
+        // Should return one of them (usually the first one in the list, which is npm)
+        (0, bun_test_1.expect)(manager).not.toBe('unknown');
+        if (typeof manager !== 'string') {
+            (0, bun_test_1.expect)(['npm', 'bun']).toContain(manager.manager);
+        }
+    });
+    (0, bun_test_1.test)('should return npm if only package-lock.json exists', () => {
+        node_fs_1.default.writeFileSync(node_path_1.default.join(tempDir, 'package-lock.json'), '{}');
+        const manager = (0, get_package_manager_1.getPackageManager)(tempDir, undefined, 0);
+        if (typeof manager !== 'string') {
+            (0, bun_test_1.expect)(manager.manager).toBe('npm');
+        }
+    });
+});

package/dist/preview-server/get-package-manager.d.ts

@@ -1,3 +1,4 @@
+import type { LogLevel } from '@remotion/renderer';
 import type { PackageManager } from '@remotion/studio-shared';
 type LockfilePath = {
     manager: PackageManager;
@@ -6,5 +7,10 @@ type LockfilePath = {
     startCommand: string;
 };
 export declare const lockFilePaths: LockfilePath[];
-export declare const getPackageManager: (remotionRoot: string, packageManager: string | undefined, dirUp: number) => LockfilePath | "unknown";
+export declare const getPackageManager: ({ remotionRoot, packageManager, dirUp, logLevel, }: {
+    remotionRoot: string;
+    packageManager: string | undefined;
+    dirUp: number;
+    logLevel: LogLevel;
+}) => LockfilePath | "unknown";
 export {};

package/dist/preview-server/get-package-manager.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageManager = exports.lockFilePaths = void 0;
+const renderer_1 = require("@remotion/renderer");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 exports.lockFilePaths = [
@@ -38,7 +39,8 @@ exports.lockFilePaths = [
         startCommand: 'bunx remotion studio',
     },
 ];
-const getPackageManager = (remotionRoot, packageManager, dirUp) => {
+let warnedAboutMultipleLockfiles = false;
+const getPackageManager = ({ remotionRoot, packageManager, dirUp, logLevel, }) => {
     if (packageManager) {
         const manager = exports.lockFilePaths.find((p) => p.manager === packageManager);
         if (!manager) {
@@ -53,18 +55,21 @@ const getPackageManager = (remotionRoot, packageManager, dirUp) => {
         return 'unknown';
     }
     if (existingPkgManagers.length === 0) {
-        return (0, exports.getPackageManager)(remotionRoot, packageManager, dirUp + 1);
+        return (0, exports.getPackageManager)({
+            remotionRoot,
+            packageManager,
+            dirUp: dirUp + 1,
+            logLevel,
+        });
     }
-    if (existingPkgManagers.length > 1) {
-        const error = [
-            `Found multiple lockfiles:`,
-            ...existingPkgManagers.map((m) => {
-                return `- ${m.path}`;
-            }),
-            '',
-            'This can lead to bugs, delete all but one of these files and run this command again.',
-        ].join('\n');
-        throw new Error(error);
+    if (existingPkgManagers.length > 1 && !warnedAboutMultipleLockfiles) {
+        warnedAboutMultipleLockfiles = true;
+        renderer_1.RenderInternals.Log.warn({ indent: false, logLevel }, '⚠️  Multiple lockfiles detected:');
+        for (const pkgManager of existingPkgManagers) {
+            renderer_1.RenderInternals.Log.warn({ indent: false, logLevel }, `  - ${pkgManager.path}`);
+        }
+        renderer_1.RenderInternals.Log.warn({ indent: false, logLevel }, '');
+        renderer_1.RenderInternals.Log.warn({ indent: false, logLevel }, 'This can lead to bugs, delete all but one of these files.');
     }
     return existingPkgManagers[0];
 };

package/dist/preview-server/routes/install-dependency.js

@@ -21,7 +21,12 @@ const handleInstallPackage = async ({ logLevel, remotionRoot, input: { packageNa
             return Promise.reject(new Error(`Package ${packageName} is not allowed to be installed.`));
         }
     }
-    const manager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined, 0);
+    const manager = (0, get_package_manager_1.getPackageManager)({
+        remotionRoot,
+        packageManager: undefined,
+        dirUp: 0,
+        logLevel,
+    });
     if (manager === 'unknown') {
         throw new Error(`No lockfile was found in your project (one of ${get_package_manager_1.lockFilePaths
             .map((p) => p.path)

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleUpdate = void 0;
 const update_available_1 = require("../update-available");
-const handleUpdate = async ({ remotionRoot }) => {
-    const data = await (0, update_available_1.isUpdateAvailableWithTimeout)(remotionRoot);
+const handleUpdate = async ({ remotionRoot, logLevel }) => {
+    const data = await (0, update_available_1.isUpdateAvailableWithTimeout)(remotionRoot, logLevel);
     return data;
 };
 exports.handleUpdate = handleUpdate;

package/dist/preview-server/start-server.d.ts

@@ -3,6 +3,15 @@ import type { LogLevel } from '@remotion/renderer';
 import type { GitSource, RenderDefaults, RenderJob } from '@remotion/studio-shared';
 import type { QueueMethods } from './api-types';
 import type { LiveEventsServer } from './live-events';
+export type StartServerResult = {
+    type: 'started';
+    port: number;
+    liveEventsServer: LiveEventsServer;
+    close: () => Promise<void>;
+} | {
+    type: 'already-running';
+    port: number;
+};
 export declare const startServer: (options: {
     entry: string;
     userDefinedComponent: string;
@@ -32,8 +41,5 @@ export declare const startServer: (options: {
     audioLatencyHint: AudioContextLatencyCategory | null;
     enableCrossSiteIsolation: boolean;
     askAIEnabled: boolean;
-}) => Promise<{
-    port: number;
-    liveEventsServer: LiveEventsServer;
-    close: () => Promise<void>;
-}>;
+    forceNew: boolean;
+}) => Promise<StartServerResult>;

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

@@ -7,19 +7,32 @@ exports.startServer = void 0;
 const bundler_1 = require("@remotion/bundler");
 const renderer_1 = require("@remotion/renderer");
 const node_http_1 = __importDefault(require("node:http"));
+const detect_remotion_server_1 = require("../detect-remotion-server");
 const routes_1 = require("../routes");
 const dev_middleware_1 = require("./dev-middleware");
 const hot_middleware_1 = require("./hot-middleware");
 const live_events_1 = require("./live-events");
 const startServer = async (options) => {
     var _a, _b, _c;
+    const desiredPort = (_b = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : (process.env.PORT ? Number(process.env.PORT) : undefined)) !== null && _b !== void 0 ? _b : undefined;
+    const portConfig = renderer_1.RenderInternals.getPortConfig(options.forceIPv4);
+    const onPortUnavailable = options.forceNew
+        ? undefined
+        : async (port) => {
+            const detection = await (0, detect_remotion_server_1.detectRemotionServer)({
+                port,
+                cwd: options.remotionRoot,
+                hostname: portConfig.hostsToTry[0],
+            });
+            return detection.type === 'match' ? 'stop' : 'continue';
+        };
     const [, config] = await bundler_1.BundlerInternals.webpackConfig({
         entry: options.entry,
         userDefinedComponent: options.userDefinedComponent,
         outDir: null,
         environment: 'development',
         webpackOverride: options === null || options === void 0 ? void 0 : options.webpackOverride,
-        maxTimelineTracks: (_a = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _a !== void 0 ? _a : null,
+        maxTimelineTracks: (_c = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _c !== void 0 ? _c : null,
         remotionRoot: options.remotionRoot,
         keyboardShortcutsEnabled: options.keyboardShortcutsEnabled,
         experimentalClientSideRenderingEnabled: options.experimentalClientSideRenderingEnabled,
@@ -86,35 +99,47 @@ const startServer = async (options) => {
             }
         });
     });
-    const desiredPort = (_c = (_b = options === null || options === void 0 ? void 0 : options.port) !== null && _b !== void 0 ? _b : (process.env.PORT ? Number(process.env.PORT) : undefined)) !== null && _c !== void 0 ? _c : undefined;
     const maxTries = 5;
-    const portConfig = renderer_1.RenderInternals.getPortConfig(options.forceIPv4);
     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) => {
-                renderer_1.RenderInternals.getDesiredPort({
-                    desiredPort,
-                    from: 3000,
-                    to: 3100,
-                    hostsToTry: portConfig.hostsToTry,
-                })
-                    .then(({ port, unlockPort }) => {
-                    renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: options.logLevel }, `Binding server to host ${portConfig.host}, port ${port}`);
-                    server.listen({
-                        port,
-                        host: portConfig.host,
-                    });
-                    server.on('listening', () => {
-                        resolve(port);
-                        return unlockPort();
-                    });
-                    server.on('error', (err) => {
-                        reject(err);
-                    });
-                })
-                    .catch((err) => reject(err));
+                renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel: options.logLevel }, `Binding server to host ${portConfig.host}, port ${port}`);
+                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 () => {

package/dist/preview-server/update-available.d.ts

@@ -1,3 +1,4 @@
+import type { LogLevel } from '@remotion/renderer';
 import type { UpdateAvailableResponse } from '@remotion/studio-shared';
 export declare const getRemotionVersion: () => any;
-export declare const isUpdateAvailableWithTimeout: (remotionRoot: string) => Promise<UpdateAvailableResponse>;
+export declare const isUpdateAvailableWithTimeout: (remotionRoot: string, logLevel: LogLevel) => Promise<UpdateAvailableResponse>;

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

@@ -7,9 +7,14 @@ exports.isUpdateAvailableWithTimeout = exports.getRemotionVersion = void 0;
 const semver_1 = __importDefault(require("semver"));
 const get_latest_remotion_version_1 = require("../get-latest-remotion-version");
 const get_package_manager_1 = require("./get-package-manager");
-const isUpdateAvailable = async ({ remotionRoot, currentVersion, }) => {
+const isUpdateAvailable = async ({ remotionRoot, currentVersion, logLevel, }) => {
     const latest = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
-    const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined, 0);
+    const pkgManager = (0, get_package_manager_1.getPackageManager)({
+        remotionRoot,
+        packageManager: undefined,
+        dirUp: 0,
+        logLevel,
+    });
     return {
         updateAvailable: semver_1.default.lt(currentVersion, latest),
         currentVersion,
@@ -25,10 +30,15 @@ const getRemotionVersion = () => {
     return version;
 };
 exports.getRemotionVersion = getRemotionVersion;
-const isUpdateAvailableWithTimeout = (remotionRoot) => {
+const isUpdateAvailableWithTimeout = (remotionRoot, logLevel) => {
     const version = (0, exports.getRemotionVersion)();
     const threeSecTimeout = new Promise((resolve) => {
-        const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined, 0);
+        const pkgManager = (0, get_package_manager_1.getPackageManager)({
+            remotionRoot,
+            packageManager: undefined,
+            dirUp: 0,
+            logLevel,
+        });
         setTimeout(() => {
             resolve({
                 currentVersion: version,
@@ -41,7 +51,7 @@ const isUpdateAvailableWithTimeout = (remotionRoot) => {
     });
     return Promise.race([
         threeSecTimeout,
-        isUpdateAvailable({ remotionRoot, currentVersion: version }),
+        isUpdateAvailable({ remotionRoot, currentVersion: version, logLevel }),
     ]);
 };
 exports.isUpdateAvailableWithTimeout = isUpdateAvailableWithTimeout;

package/dist/remotion-config-response.d.ts

@@ -0,0 +1,5 @@
+export type RemotionConfigResponse = {
+    isRemotion: true;
+    cwd: string;
+    version: string | null;
+};

package/dist/remotion-config-response.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/routes.js

@@ -60,6 +60,19 @@ const output404 = (response) => {
     response.end('The outputs/ prefix has been changed, this URL is no longer valid.');
     return Promise.resolve();
 };
+const handleRemotionConfig = (response, remotionRoot) => {
+    var _a;
+    response.writeHead(200, {
+        'Content-Type': 'application/json',
+    });
+    const body = {
+        isRemotion: true,
+        cwd: remotionRoot,
+        version: (_a = process.env.REMOTION_VERSION) !== null && _a !== void 0 ? _a : null,
+    };
+    response.end(JSON.stringify(body));
+    return Promise.resolve();
+};
 const handleFallback = async ({ remotionRoot, hash, response, getCurrentInputProps, getEnvVariables, publicDir, getRenderQueue, getRenderDefaults, numberOfAudioTags, audioLatencyHint, gitSource, logLevel, enableCrossSiteIsolation, }) => {
     const [edit] = await editorGuess;
     const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit ? edit.command : null);
@@ -68,7 +81,12 @@ const handleFallback = async ({ remotionRoot, hash, response, getCurrentInputPro
         response.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
         response.setHeader('Cross-Origin-Embedder-Policy', 'require-corp');
     }
-    const packageManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined, 0);
+    const packageManager = (0, get_package_manager_1.getPackageManager)({
+        remotionRoot,
+        packageManager: undefined,
+        dirUp: 0,
+        logLevel,
+    });
     (0, public_folder_1.fetchFolder)({ publicDir, staticHash: hash });
     const installedDependencies = (0, get_installed_installable_packages_1.getInstalledInstallablePackages)(remotionRoot);
     response.end(bundler_1.BundlerInternals.indexHtml({
@@ -265,6 +283,9 @@ const handleRoutes = ({ staticHash, staticHashPrefix, outputHash, outputHashPref
     if (url.pathname === studio_shared_1.SOURCE_MAP_ENDPOINT) {
         return handleWasm(request, response);
     }
+    if (url.pathname === '/__remotion_config') {
+        return handleRemotionConfig(response, remotionRoot);
+    }
     if (url.pathname === '/events') {
         return liveEventsServer.router(request, response);
     }

package/dist/start-studio.d.ts

@@ -2,7 +2,12 @@ import type { WebpackOverrideFn } from '@remotion/bundler';
 import type { LogLevel } from '@remotion/renderer';
 import type { GitSource, RenderDefaults, RenderJob } from '@remotion/studio-shared';
 import type { QueueMethods } from './preview-server/api-types';
-export declare const startStudio: ({ browserArgs, browserFlag, configValueShouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, maxTimelineTracks, remotionRoot, keyboardShortcutsEnabled, experimentalClientSideRenderingEnabled, relativePublicDir, webpackOverride, poll, getRenderDefaults, getRenderQueue, numberOfAudioTags, queueMethods, parsedCliOpen, previewEntry, gitSource, bufferStateDelayInMilliseconds, binariesDirectory, forceIPv4, audioLatencyHint, enableCrossSiteIsolation, askAIEnabled, }: {
+export type StartStudioResult = {
+    type: 'restarted';
+} | {
+    type: 'already-running';
+};
+export declare const startStudio: ({ browserArgs, browserFlag, configValueShouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, maxTimelineTracks, remotionRoot, keyboardShortcutsEnabled, experimentalClientSideRenderingEnabled, relativePublicDir, webpackOverride, poll, getRenderDefaults, getRenderQueue, numberOfAudioTags, queueMethods, parsedCliOpen, previewEntry, gitSource, bufferStateDelayInMilliseconds, binariesDirectory, forceIPv4, audioLatencyHint, enableCrossSiteIsolation, askAIEnabled, forceNew, }: {
     browserArgs: string;
     browserFlag: string;
     logLevel: LogLevel;
@@ -31,4 +36,5 @@ export declare const startStudio: ({ browserArgs, browserFlag, configValueShould
     binariesDirectory: string | null;
     forceIPv4: boolean;
     askAIEnabled: boolean;
-}) => Promise<void>;
+    forceNew: boolean;
+}) => Promise<StartStudioResult>;

package/dist/start-studio.js

@@ -8,8 +8,8 @@ const renderer_1 = require("@remotion/renderer");
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
-const better_opn_1 = require("./better-opn");
 const get_network_address_1 = require("./get-network-address");
+const maybe_open_browser_1 = require("./maybe-open-browser");
 const close_and_restart_1 = require("./preview-server/close-and-restart");
 const get_absolute_public_dir_1 = require("./preview-server/get-absolute-public-dir");
 const live_events_1 = require("./preview-server/live-events");
@@ -17,26 +17,7 @@ const public_folder_1 = require("./preview-server/public-folder");
 const start_server_1 = require("./preview-server/start-server");
 const server_ready_1 = require("./server-ready");
 const watch_root_file_1 = require("./watch-root-file");
-const getShouldOpenBrowser = ({ configValueShouldOpenBrowser, parsedCliOpen, }) => {
-    var _a;
-    if (parsedCliOpen === false) {
-        return {
-            shouldOpenBrowser: false,
-            reasonForBrowserDecision: '--no-open specified',
-        };
-    }
-    if (((_a = process.env.BROWSER) !== null && _a !== void 0 ? _a : '').toLowerCase() === 'none') {
-        return {
-            shouldOpenBrowser: false,
-            reasonForBrowserDecision: 'env BROWSER=none was set',
-        };
-    }
-    if (configValueShouldOpenBrowser === false) {
-        return { shouldOpenBrowser: false, reasonForBrowserDecision: 'Config file' };
-    }
-    return { shouldOpenBrowser: true, reasonForBrowserDecision: 'default' };
-};
-const startStudio = async ({ browserArgs, browserFlag, configValueShouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, maxTimelineTracks, remotionRoot, keyboardShortcutsEnabled, experimentalClientSideRenderingEnabled, relativePublicDir, webpackOverride, poll, getRenderDefaults, getRenderQueue, numberOfAudioTags, queueMethods, parsedCliOpen, previewEntry, gitSource, bufferStateDelayInMilliseconds, binariesDirectory, forceIPv4, audioLatencyHint, enableCrossSiteIsolation, askAIEnabled, }) => {
+const startStudio = async ({ browserArgs, browserFlag, configValueShouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, maxTimelineTracks, remotionRoot, keyboardShortcutsEnabled, experimentalClientSideRenderingEnabled, relativePublicDir, webpackOverride, poll, getRenderDefaults, getRenderQueue, numberOfAudioTags, queueMethods, parsedCliOpen, previewEntry, gitSource, bufferStateDelayInMilliseconds, binariesDirectory, forceIPv4, audioLatencyHint, enableCrossSiteIsolation, askAIEnabled, forceNew, }) => {
     try {
         if (typeof Bun === 'undefined') {
             process.title = 'node (npx remotion studio)';
@@ -78,7 +59,7 @@ const startStudio = async ({ browserArgs, browserFlag, configValueShouldOpenBrow
         },
         staticHash,
     });
-    const { port, liveEventsServer, close } = await (0, start_server_1.startServer)({
+    const result = await (0, start_server_1.startServer)({
         entry: node_path_1.default.resolve(previewEntry),
         userDefinedComponent: fullEntryPath,
         getCurrentInputProps,
@@ -107,7 +88,24 @@ const startStudio = async ({ browserArgs, browserFlag, configValueShouldOpenBrow
         audioLatencyHint,
         enableCrossSiteIsolation,
         askAIEnabled,
+        forceNew,
     });
+    if (result.type === 'already-running') {
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `Already running on port ${result.port}.`);
+        const res = await (0, maybe_open_browser_1.maybeOpenBrowser)({
+            browserArgs,
+            browserFlag,
+            configValueShouldOpenBrowser,
+            parsedCliOpen,
+            url: `http://localhost:${result.port}`,
+            logLevel,
+        });
+        if (res.didOpenBrowser) {
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Opened browser. Pass --force-new to force a new instance.');
+        }
+        return { type: 'already-running' };
+    }
+    const { port, liveEventsServer, close } = result;
     const cleanupLiveEventsListener = (0, live_events_1.setLiveEventsListener)(liveEventsServer);
     const networkAddress = (0, get_network_address_1.getNetworkAddress)();
     if (networkAddress) {
@@ -118,25 +116,20 @@ const startStudio = async ({ browserArgs, browserFlag, configValueShouldOpenBrow
     }
     (0, server_ready_1.printServerReadyComment)('Server ready', logLevel);
     renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Building...');
-    const { reasonForBrowserDecision, shouldOpenBrowser } = getShouldOpenBrowser({
+    await (0, maybe_open_browser_1.maybeOpenBrowser)({
+        browserArgs,
+        browserFlag,
         configValueShouldOpenBrowser,
         parsedCliOpen,
+        url: `http://localhost:${port}`,
+        logLevel,
     });
-    if (shouldOpenBrowser) {
-        await (0, better_opn_1.openBrowser)({
-            url: `http://localhost:${port}`,
-            browserArgs,
-            browserFlag,
-        });
-    }
-    else {
-        renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `Not opening browser, reason: ${reasonForBrowserDecision}`);
-    }
     await (0, close_and_restart_1.noOpUntilRestart)();
     renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Closing server to restart...');
     await liveEventsServer.closeConnections();
     cleanupLiveEventsListener();
     await close();
     renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.blue('Restarting server...'));
+    return { type: 'restarted' };
 };
 exports.startStudio = startStudio;

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.420",
+	"version": "4.0.422",
 	"description": "Run a Remotion Studio with a server backend",
 	"main": "dist",
 	"sideEffects": false,
@@ -25,11 +25,11 @@
 	"dependencies": {
 		"@babel/parser": "7.24.1",
 		"semver": "7.5.3",
-		"remotion": "4.0.420",
+		"remotion": "4.0.422",
 		"recast": "0.23.11",
-		"@remotion/bundler": "4.0.420",
-		"@remotion/renderer": "4.0.420",
-		"@remotion/studio-shared": "4.0.420",
+		"@remotion/bundler": "4.0.422",
+		"@remotion/renderer": "4.0.422",
+		"@remotion/studio-shared": "4.0.422",
 		"memfs": "3.4.3",
 		"source-map": "0.7.3",
 		"open": "^8.4.2"
@@ -39,7 +39,7 @@
 		"react": "19.2.3",
 		"@babel/types": "7.24.0",
 		"@types/semver": "^7.3.4",
-		"@remotion/eslint-config-internal": "4.0.420",
+		"@remotion/eslint-config-internal": "4.0.422",
 		"eslint": "9.19.0",
 		"@types/node": "20.12.14"
 	},