@remotion/studio-server 4.0.439 → 4.0.440

package/dist/preview-server/hot-middleware/index.d.ts

@@ -3,8 +3,8 @@
  * https://github.com/webpack-contrib/webpack-hot-middleware#readme
  * and rewritten in TypeScript. This file is MIT licensed
  */
-import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { webpack } from '@remotion/bundler';
+import type { LiveEventsServer } from '../live-events';
 declare global {
     const __webpack_hash__: unknown;
     interface HotNotifierInfo {
@@ -99,4 +99,4 @@ declare global {
     };
     type ModuleId = string | number;
 }
-export declare const webpackHotMiddleware: (compiler: webpack.Compiler, logLevel: "error" | "info" | "trace" | "verbose" | "warn") => (req: IncomingMessage, res: ServerResponse<IncomingMessage>, next: () => void) => void;
+export declare const setupWebpackHmr: (compiler: webpack.Compiler, logLevel: "error" | "info" | "trace" | "verbose" | "warn", liveEventsServer: LiveEventsServer) => void;

package/dist/preview-server/hot-middleware/index.js

@@ -5,99 +5,35 @@
  * and rewritten in TypeScript. This file is MIT licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackHotMiddleware = void 0;
-const node_url_1 = require("node:url");
+exports.setupWebpackHmr = void 0;
 const renderer_1 = require("@remotion/renderer");
-const studio_shared_1 = require("@remotion/studio-shared");
-const pathMatch = function (url, path) {
-    try {
-        return (0, node_url_1.parse)(url).pathname === path;
-    }
-    catch (_a) {
-        return false;
-    }
-};
-const webpackHotMiddleware = (compiler, logLevel) => {
-    const eventStream = createEventStream(studio_shared_1.hotMiddlewareOptions.heartbeat);
+const setupWebpackHmr = (compiler, logLevel, liveEventsServer) => {
     let latestStats = null;
+    const publishHmr = (hmrEvent) => {
+        liveEventsServer.sendEventToClient({ type: 'hmr', hmrEvent });
+    };
     compiler.hooks.invalid.tap('remotion', onInvalid);
     compiler.hooks.done.tap('remotion', onDone);
     function onInvalid() {
         latestStats = null;
         renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, 'Building...');
-        eventStream === null || eventStream === void 0 ? void 0 : eventStream.publish({
+        publishHmr({
             action: 'building',
         });
     }
     function onDone(statsResult) {
         // Keep hold of latest stats so they can be propagated to new clients
         latestStats = statsResult;
-        publishStats('built', latestStats, eventStream);
+        publishStats('built', latestStats, publishHmr);
     }
-    const middleware = function (req, res, next) {
-        if (!pathMatch(req.url, studio_shared_1.hotMiddlewareOptions.path))
-            return next();
-        eventStream === null || eventStream === void 0 ? void 0 : eventStream.handler(req, res);
+    liveEventsServer.addNewClientListener(() => {
         if (latestStats) {
-            publishStats('sync', latestStats, eventStream);
+            publishStats('sync', latestStats, publishHmr);
         }
-    };
-    return middleware;
+    });
 };
-exports.webpackHotMiddleware = webpackHotMiddleware;
-function createEventStream(heartbeat) {
-    let clientId = 0;
-    let clients = {};
-    function everyClient(fn) {
-        Object.keys(clients).forEach((id) => {
-            fn(clients[id]);
-        });
-    }
-    const interval = setInterval(() => {
-        everyClient((client) => {
-            client.write('data: \uD83D\uDC93\n\n');
-        });
-    }, heartbeat).unref();
-    return {
-        close() {
-            clearInterval(interval);
-            everyClient((client) => {
-                if (!client.finished)
-                    client.end();
-            });
-            clients = {};
-        },
-        handler(req, res) {
-            const headers = {
-                'Access-Control-Allow-Origin': '*',
-                'Content-Type': 'text/event-stream;charset=utf-8',
-                'Cache-Control': 'no-cache, no-transform',
-            };
-            const isHttp1 = !(parseInt(req.httpVersion, 10) >= 2);
-            if (isHttp1) {
-                req.socket.setKeepAlive(true);
-                Object.assign(headers, {
-                    Connection: 'keep-alive',
-                });
-            }
-            res.writeHead(200, headers);
-            res.write('\n');
-            const id = clientId++;
-            clients[id] = res;
-            req.on('close', () => {
-                if (!res.finished)
-                    res.end();
-                delete clients[id];
-            });
-        },
-        publish(payload) {
-            everyClient((client) => {
-                client.write('data: ' + JSON.stringify(payload) + '\n\n');
-            });
-        },
-    };
-}
-function publishStats(action, statsResult, eventStream) {
+exports.setupWebpackHmr = setupWebpackHmr;
+function publishStats(action, statsResult, publishHmr) {
     const stats = statsResult.toJson({
         all: false,
         cached: true,
@@ -114,7 +50,7 @@ function publishStats(action, statsResult, eventStream) {
         if (bundles.length === 1 && !name && statsResult.compilation) {
             name = statsResult.compilation.name || '';
         }
-        eventStream === null || eventStream === void 0 ? void 0 : eventStream.publish({
+        publishHmr({
             name,
             action,
             time: _stats.time,

package/dist/preview-server/live-events.d.ts

@@ -5,6 +5,7 @@ export type LiveEventsServer = {
     sendEventToClientId: (clientId: string, event: EventSourceEvent) => void;
     router: (request: IncomingMessage, response: ServerResponse) => Promise<void>;
     closeConnections: () => Promise<void>;
+    addNewClientListener: (cb: () => void) => () => void;
 };
 export type InitialUndoRedoState = {
     undoFile: string | null;

package/dist/preview-server/live-events.js

@@ -11,6 +11,7 @@ const serializeMessage = (message) => {
 let printPortMessageTimeout = null;
 const makeLiveEventsRouter = (logLevel, getInitialUndoRedoState) => {
     let clients = [];
+    let newClientListeners = [];
     const router = (request, response) => {
         const headers = {
             'content-type': 'text/event-stream;charset=utf-8',
@@ -31,6 +32,7 @@ const makeLiveEventsRouter = (logLevel, getInitialUndoRedoState) => {
             response,
         };
         clients.push(newClient);
+        newClientListeners.forEach((cb) => cb());
         if (printPortMessageTimeout) {
             clearTimeout(printPortMessageTimeout);
         }
@@ -62,10 +64,17 @@ const makeLiveEventsRouter = (logLevel, getInitialUndoRedoState) => {
             client.response.write(serializeMessage(event));
         }
     };
+    const addNewClientListener = (cb) => {
+        newClientListeners.push(cb);
+        return () => {
+            newClientListeners = newClientListeners.filter((l) => l !== cb);
+        };
+    };
     return {
         sendEventToClient,
         sendEventToClientId,
         router,
+        addNewClientListener,
         closeConnections: () => {
             return Promise.all(clients.map((client) => {
                 return new Promise((resolve) => {

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

@@ -58,7 +58,6 @@ const startServer = async (options) => {
     }
     (0, watch_ignore_next_change_1.setWatchIgnoreNextChangePlugin)(watchIgnorePlugin);
     const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler, options.logLevel);
-    const whm = (0, hot_middleware_1.webpackHotMiddleware)(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)();
@@ -67,6 +66,7 @@ const startServer = async (options) => {
             redoFile: redoStack.length > 0 ? redoStack[redoStack.length - 1].filePath : null,
         };
     });
+    (0, hot_middleware_1.setupWebpackHmr)(compiler, options.logLevel, liveEventsServer);
     const server = node_http_1.default.createServer((request, response) => {
         if (options.enableCrossSiteIsolation) {
             response.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
@@ -76,13 +76,6 @@ const startServer = async (options) => {
             wdmMiddleware(request, response, () => {
                 resolve();
             });
-        })
-            .then(() => {
-            return new Promise((resolve) => {
-                whm(request, response, () => {
-                    resolve();
-                });
-            });
         })
             .then(() => {
             return (0, routes_1.handleRoutes)({

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.439",
+	"version": "4.0.440",
 	"description": "Run a Remotion Studio with a server backend",
 	"main": "dist",
 	"sideEffects": false,
@@ -27,11 +27,11 @@
 		"@babel/parser": "7.24.1",
 		"semver": "7.5.3",
 		"prettier": "3.8.1",
-		"remotion": "4.0.439",
+		"remotion": "4.0.440",
 		"recast": "0.23.11",
-		"@remotion/bundler": "4.0.439",
-		"@remotion/renderer": "4.0.439",
-		"@remotion/studio-shared": "4.0.439",
+		"@remotion/bundler": "4.0.440",
+		"@remotion/renderer": "4.0.440",
+		"@remotion/studio-shared": "4.0.440",
 		"memfs": "3.4.3",
 		"source-map": "0.7.3",
 		"open": "^8.4.2"
@@ -41,7 +41,7 @@
 		"react": "19.2.3",
 		"@babel/types": "7.24.0",
 		"@types/semver": "^7.3.4",
-		"@remotion/eslint-config-internal": "4.0.439",
+		"@remotion/eslint-config-internal": "4.0.440",
 		"eslint": "9.19.0",
 		"@types/node": "20.12.14",
 		"@typescript/native-preview": "7.0.0-dev.20260217.1"