@remotion/studio-server 4.0.533 → 4.0.535

package/dist/start-studio.js

@@ -11,13 +11,13 @@ const renderer_1 = require("@remotion/renderer");
 const file_watcher_1 = require("./file-watcher");
 const get_network_address_1 = require("./get-network-address");
 const maybe_open_browser_1 = require("./maybe-open-browser");
-const open_browser_shortcut_1 = require("./open-browser-shortcut");
 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");
 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 studio_shortcuts_1 = require("./studio-shortcuts");
 const watch_root_file_1 = require("./watch-root-file");
 const startStudio = async ({ browserArgs, browserFlag, shouldOpenBrowser, fullEntryPath, logLevel, getCurrentInputProps, getEnvVariables, desiredPort, remotionRoot, relativePublicDir, bundlerOverride, rspackOverride, webpackOverride, poll, getRenderDefaults, getRenderQueue, getNumberOfAudioTags, queueMethods, previewEntry, gitSource, binariesDirectory, forceIPv4, getAudioLatencyHint, getExperimentalKeepAudioContextAlive, getPreviewSampleRate, enableCrossSiteIsolation, forceNew, rspack, getStudioRuntimeConfig, getDefaultCodingAgent, getDefaultEditor, configFile, }) => {
     try {
@@ -39,11 +39,15 @@ const startStudio = async ({ browserArgs, browserFlag, shouldOpenBrowser, fullEn
         relativePublicDir,
         remotionRoot,
     });
-    const hash = node_crypto_1.default.randomBytes(6).toString('hex');
     const outputHashPrefix = '/outputs-';
-    const outputHash = `${outputHashPrefix}${hash}`;
+    const outputHash = `${outputHashPrefix}${node_crypto_1.default.randomBytes(6).toString('hex')}`;
+    // Asset URLs must survive restarts, but remain scoped to this project and folder.
     const staticHashPrefix = '/static-';
-    const staticHash = `${staticHashPrefix}${hash}`;
+    const staticHash = `${staticHashPrefix}${node_crypto_1.default
+        .createHash('sha256')
+        .update(JSON.stringify([remotionRoot, publicDir]))
+        .digest('hex')
+        .slice(0, 12)}`;
     (0, public_folder_1.initPublicFolderWatch)({
         publicDir,
         remotionRoot,
@@ -124,11 +128,14 @@ const startStudio = async ({ browserArgs, browserFlag, shouldOpenBrowser, fullEn
     (0, server_ready_1.printServerReadyComment)('Server ready', logLevel);
     renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Building...');
     const studioUrl = `http://localhost:${port}`;
-    const openBrowserShortcut = (0, open_browser_shortcut_1.registerOpenBrowserShortcut)({
+    const studioShortcuts = (0, studio_shortcuts_1.registerStudioShortcuts)({
         browserArgs,
         browserFlag,
         url: studioUrl,
         logLevel,
+        remotionRoot,
+        getDefaultEditor,
+        getDefaultCodingAgent,
     });
     let action;
     try {
@@ -142,7 +149,7 @@ const startStudio = async ({ browserArgs, browserFlag, shouldOpenBrowser, fullEn
         action = await (0, close_and_restart_1.noOpUntilRestart)();
     }
     finally {
-        openBrowserShortcut.cleanup();
+        studioShortcuts.cleanup();
     }
     renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, action === 'shutdown'
         ? 'Shutting down Studio...'

package/dist/studio-shortcuts.d.ts

@@ -0,0 +1,13 @@
+import type { DefaultEditor } from '@remotion/renderer';
+export declare const registerStudioShortcuts: ({ browserArgs, browserFlag, url, logLevel, remotionRoot, getDefaultEditor, getDefaultCodingAgent, }: {
+    browserArgs: string;
+    browserFlag: string;
+    url: string;
+    logLevel: "error" | "info" | "trace" | "verbose" | "warn";
+    remotionRoot: string;
+    getDefaultEditor: () => DefaultEditor | null;
+    getDefaultCodingAgent: () => "claude-code" | "codex" | "copilot" | "cursor" | null;
+}) => {
+    registered: boolean;
+    cleanup: () => void;
+};

package/dist/studio-shortcuts.js

@@ -0,0 +1,257 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerStudioShortcuts = void 0;
+const readline = __importStar(require("node:readline"));
+const renderer_1 = require("@remotion/renderer");
+const studio_shared_1 = require("@remotion/studio-shared");
+const better_opn_1 = require("./better-opn");
+const app_discovery_1 = require("./helpers/app-discovery");
+const open_in_app_1 = require("./helpers/open-in-app");
+const recently_used_apps_1 = require("./helpers/recently-used-apps");
+const maybe_open_browser_1 = require("./maybe-open-browser");
+const live_events_1 = require("./preview-server/live-events");
+const registerStudioShortcuts = ({ browserArgs, browserFlag, url, logLevel, remotionRoot, getDefaultEditor, getDefaultCodingAgent, }) => {
+    if (!process.stdin.isTTY) {
+        return { registered: false, cleanup: () => undefined };
+    }
+    if (typeof process.stdin.setRawMode !== 'function') {
+        return { registered: false, cleanup: () => undefined };
+    }
+    const wasRaw = process.stdin.isRaw;
+    const shouldPauseAfterCleanup = process.stdin.isPaused();
+    let cleanedUp = false;
+    let isOpeningBrowser = false;
+    let editor = null;
+    let codingAgent = null;
+    const openingApps = new Set();
+    let refreshRevision = 0;
+    let lastPrintedAssignment = null;
+    const refreshShortcuts = async () => {
+        var _a;
+        const revision = ++refreshRevision;
+        const configuredEditor = getDefaultEditor();
+        const configuredCodingAgent = getDefaultCodingAgent();
+        const [discovery, editorInfo, recentEditors, recentCodingAgents] = await Promise.all([
+            (0, app_discovery_1.getAppDiscovery)(),
+            (0, app_discovery_1.getEditorInfo)(configuredEditor),
+            (0, recently_used_apps_1.getRecentlyUsedApps)({
+                remotionRoot,
+                type: 'editor',
+                recentlyUsedIds: null,
+            }),
+            (0, recently_used_apps_1.getRecentlyUsedApps)({
+                remotionRoot,
+                type: 'coding-agent',
+                recentlyUsedIds: null,
+            }),
+        ]);
+        if (cleanedUp || revision !== refreshRevision) {
+            return;
+        }
+        editor = (0, studio_shared_1.getPreferredApp)({
+            installedApps: editorInfo.installedEditors,
+            configuredId: editorInfo.defaultEditor,
+            runningIds: (_a = editorInfo.runningEditors) !== null && _a !== void 0 ? _a : [],
+            recentlyUsedIds: recentEditors,
+            fallbackIds: studio_shared_1.preferredFallbackEditorIds,
+        });
+        codingAgent = (0, studio_shared_1.getPreferredApp)({
+            installedApps: discovery.installedCodingAgents,
+            configuredId: configuredCodingAgent,
+            runningIds: discovery.runningCodingAgents,
+            recentlyUsedIds: recentCodingAgents,
+            fallbackIds: discovery.installedCodingAgents.map(({ id }) => id),
+        });
+        printShortcuts();
+    };
+    const printShortcuts = () => {
+        var _a, _b;
+        if (cleanedUp) {
+            return;
+        }
+        const shortcuts = [
+            '[s] Open Studio',
+            ...(codingAgent ? [`[a] Open agent (${codingAgent.name})`] : []),
+            ...(editor
+                ? [
+                    `[e] Open editor (${editor.name === 'Code' ? 'VS Code' : editor.name})`,
+                ]
+                : []),
+        ];
+        const assignment = JSON.stringify([
+            (_a = editor === null || editor === void 0 ? void 0 : editor.id) !== null && _a !== void 0 ? _a : null,
+            (_b = codingAgent === null || codingAgent === void 0 ? void 0 : codingAgent.id) !== null && _b !== void 0 ? _b : null,
+            shortcuts,
+            (editor === null || editor === void 0 ? void 0 : editor.id) === 'custom' ? getDefaultEditor() : null,
+        ]);
+        if (assignment === lastPrintedAssignment) {
+            return;
+        }
+        lastPrintedAssignment = assignment;
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.gray(shortcuts.join('  ')));
+    };
+    const onPreferencesChange = () => {
+        if (cleanedUp) {
+            return;
+        }
+        refreshShortcuts().catch((err) => {
+            renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, 'Could not refresh Studio shortcuts:', err);
+            printShortcuts();
+        });
+    };
+    const unsubscribeHistory = (0, recently_used_apps_1.subscribeToRecentlyUsedApps)({
+        remotionRoot,
+        onChange: onPreferencesChange,
+    });
+    const unsubscribeConfig = (0, live_events_1.subscribeToConfigChanges)(onPreferencesChange);
+    const openApp = async (key) => {
+        if (openingApps.has(key) || cleanedUp) {
+            return;
+        }
+        openingApps.add(key);
+        try {
+            const response = key === 'a' && codingAgent
+                ? await (0, open_in_app_1.openInCodingAgent)({
+                    input: { codingAgentId: codingAgent.id, prompt: null },
+                    remotionRoot,
+                    logLevel,
+                })
+                : key === 'e' && editor
+                    ? await (0, open_in_app_1.openInEditor)({
+                        input: {
+                            editorId: editor.id,
+                            stack: {
+                                originalFileName: remotionRoot,
+                                originalLineNumber: 1,
+                                originalColumnNumber: 1,
+                                originalFunctionName: null,
+                                originalScriptCode: null,
+                            },
+                        },
+                        remotionRoot,
+                        logLevel,
+                        getDefaultEditor,
+                    })
+                    : null;
+            if (response && !response.success) {
+                renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, `Could not open ${key === 'a' ? codingAgent === null || codingAgent === void 0 ? void 0 : codingAgent.name : editor === null || editor === void 0 ? void 0 : editor.name}`);
+            }
+        }
+        catch (err) {
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, key === 'a' ? 'Could not open coding agent:' : 'Could not open editor:', err);
+        }
+        finally {
+            openingApps.delete(key);
+        }
+    };
+    const cleanup = () => {
+        if (cleanedUp) {
+            return;
+        }
+        cleanedUp = true;
+        unsubscribeHistory();
+        unsubscribeConfig();
+        process.stdin.removeListener('keypress', onKeypress);
+        process.removeListener('SIGINT', cleanup);
+        process.removeListener('exit', cleanup);
+        if (!wasRaw && process.stdin.isTTY) {
+            process.stdin.setRawMode(false);
+        }
+        if (shouldPauseAfterCleanup) {
+            process.stdin.pause();
+        }
+    };
+    const openStudio = async () => {
+        if (isOpeningBrowser) {
+            return;
+        }
+        isOpeningBrowser = true;
+        (0, live_events_1.clearPrintPortMessageTimeout)();
+        try {
+            const didFocus = await (0, better_opn_1.focusBrowserTabByOrigin)({
+                url,
+                browserArgs,
+                browserFlag,
+            });
+            if (didFocus) {
+                renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.blue(`Opened ${url} in browser`));
+                return;
+            }
+            const result = await (0, maybe_open_browser_1.maybeOpenBrowser)({
+                browserArgs,
+                browserFlag,
+                shouldOpenBrowser: true,
+                url,
+                logLevel,
+            });
+            if (result.didOpenBrowser) {
+                renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.blue(`Opened ${url} in browser`));
+            }
+        }
+        catch (err) {
+            renderer_1.RenderInternals.Log.error({ indent: false, logLevel }, 'Could not open browser:', err);
+        }
+        finally {
+            isOpeningBrowser = false;
+        }
+    };
+    function onKeypress(_str, key) {
+        if ((key === null || key === void 0 ? void 0 : key.ctrl) && key.name === 'c') {
+            cleanup();
+            process.kill(process.pid, 'SIGINT');
+            return;
+        }
+        if ((key === null || key === void 0 ? void 0 : key.meta) || (key === null || key === void 0 ? void 0 : key.ctrl)) {
+            return;
+        }
+        if ((key === null || key === void 0 ? void 0 : key.name) === 's') {
+            openStudio().catch(() => undefined);
+        }
+        else if ((key === null || key === void 0 ? void 0 : key.name) === 'a' || (key === null || key === void 0 ? void 0 : key.name) === 'e') {
+            openApp(key.name).catch(() => undefined);
+        }
+    }
+    readline.emitKeypressEvents(process.stdin);
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on('keypress', onKeypress);
+    process.once('SIGINT', cleanup);
+    process.once('exit', cleanup);
+    // Discovery may finish after other startup logs; never await it here.
+    onPreferencesChange();
+    return { registered: true, cleanup };
+};
+exports.registerStudioShortcuts = registerStudioShortcuts;

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.533",
+	"version": "4.0.535",
 	"description": "Run a Remotion Studio with a server backend",
 	"main": "dist",
 	"scripts": {
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@remotion/studio-protocol": "4.0.533",
+		"@remotion/studio-protocol": "4.0.535",
 		"@babel/types": "7.24.0",
 		"@babel/parser": "7.24.1",
 		"@svgr/core": "8.1.0",
@@ -31,12 +31,12 @@
 		"kiwi-schema": "0.5.0",
 		"semver": "7.5.3",
 		"zod": "4.5.4",
-		"remotion": "4.0.533",
+		"remotion": "4.0.535",
 		"recast": "0.23.21",
-		"@remotion/bundler": "4.0.533",
-		"@remotion/renderer": "4.0.533",
-		"@remotion/codemods": "4.0.533",
-		"@remotion/studio-shared": "4.0.533",
+		"@remotion/bundler": "4.0.535",
+		"@remotion/renderer": "4.0.535",
+		"@remotion/codemods": "4.0.535",
+		"@remotion/studio-shared": "4.0.535",
 		"memfs": "3.4.3",
 		"open": "8.4.2"
 	},
@@ -44,7 +44,7 @@
 		"ast-types": "0.16.1",
 		"react": "19.2.3",
 		"@types/semver": "7.5.3",
-		"@remotion/eslint-config-internal": "4.0.533",
+		"@remotion/eslint-config-internal": "4.0.535",
 		"eslint": "9.19.0",
 		"prettier": "3.8.1",
 		"@types/node": "20.12.14",