mrmd-server 0.1.3 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrmd-server",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "HTTP server for mrmd - run mrmd in any browser, access from anywhere",
   "type": "module",
   "main": "src/index.js",
@@ -46,7 +46,7 @@
     "chokidar": "^3.6.0",
     "fzf": "^0.5.2",
     "mrmd-project": "^0.1.1",
-    "mrmd-electron": "^0.3.2",
+    "mrmd-electron": "^0.3.3",
     "mrmd-sync": "^0.3.2"
   }
 }

package/src/server.js

@@ -7,7 +7,7 @@
 import express from 'express';
 import cors from 'cors';
 import { createServer as createHttpServer } from 'http';
-import { WebSocketServer } from 'ws';
+import { WebSocketServer, WebSocket as WsClient } from 'ws';
 import path from 'path';
 import fs from 'fs/promises';
 import { existsSync } from 'fs';
@@ -200,13 +200,32 @@ export async function createServer(config) {
     // Serve mrmd-electron assets (fonts, icons)
     app.use('/assets', express.static(path.join(electronPath, 'assets')));
 
-    // Serve mrmd-editor dist (referenced as ../mrmd-editor/dist/ in index.html)
-    const editorDistPath = path.join(electronPath, '../mrmd-editor/dist');
-    app.use('/mrmd-editor/dist', express.static(editorDistPath));
-    app.use('/dist', express.static(editorDistPath)); // Also at /dist for compatibility
+    // Serve mrmd-editor dist - check multiple locations
+    const editorDistCandidates = [
+      path.join(electronPath, 'editor'),  // Bundled in mrmd-electron (npm)
+      path.join(electronPath, '../mrmd-editor/dist'),  // Sibling (dev mode)
+    ];
+    for (const distPath of editorDistCandidates) {
+      if (existsSync(path.join(distPath, 'mrmd.iife.js'))) {
+        app.use('/mrmd-editor/dist', express.static(distPath));
+        app.use('/dist', express.static(distPath));
+        break;
+      }
+    }
 
-    // Serve node_modules from mrmd-electron (for xterm, etc.)
-    app.use('/node_modules', express.static(path.join(electronPath, 'node_modules')));
+    // Serve node_modules for xterm, etc. - check multiple locations (npm hoisting)
+    const nodeModulesCandidates = [
+      path.join(electronPath, 'node_modules'),  // Direct dependency
+      path.join(electronPath, '..'),  // Hoisted to parent (npm installed)
+      path.join(__dirname, '../node_modules'),  // mrmd-server's node_modules
+      path.join(__dirname, '../../node_modules'),  // Hoisted further up
+    ];
+    for (const nmPath of nodeModulesCandidates) {
+      if (existsSync(path.join(nmPath, 'xterm'))) {
+        app.use('/node_modules', express.static(nmPath));
+        break;
+      }
+    }
 
     // Serve transformed index.html at root
     app.get('/', async (req, res) => {
@@ -241,6 +260,51 @@ export async function createServer(config) {
   const wss = new WebSocketServer({ server, path: '/events' });
   setupWebSocket(wss, eventBus, token, noAuth);
 
+  // WebSocket proxy for sync connections (remote browsers can't reach localhost)
+  const syncWss = new WebSocketServer({ noServer: true });
+  server.on('upgrade', (request, socket, head) => {
+    const url = new URL(request.url, 'http://localhost');
+
+    // Handle /events normally
+    if (url.pathname === '/events') {
+      wss.handleUpgrade(request, socket, head, (ws) => {
+        wss.emit('connection', ws, request);
+      });
+      return;
+    }
+
+    // Handle /sync/:port/:doc - proxy to local sync server
+    const syncMatch = url.pathname.match(/^\/sync\/(\d+)\/(.+)$/);
+    if (syncMatch) {
+      const [, syncPort, docName] = syncMatch;
+      const targetUrl = `ws://127.0.0.1:${syncPort}/${docName}`;
+
+      // Create connection to local sync server
+      const upstream = new WsClient(targetUrl);
+
+      upstream.on('open', () => {
+        syncWss.handleUpgrade(request, socket, head, (clientWs) => {
+          // Bidirectional proxy
+          clientWs.on('message', (data) => upstream.send(data));
+          upstream.on('message', (data) => clientWs.send(data));
+          clientWs.on('close', () => upstream.close());
+          upstream.on('close', () => clientWs.close());
+          clientWs.on('error', () => upstream.close());
+          upstream.on('error', () => clientWs.close());
+        });
+      });
+
+      upstream.on('error', (err) => {
+        console.error(`[sync-proxy] Failed to connect to ${targetUrl}:`, err.message);
+        socket.destroy();
+      });
+      return;
+    }
+
+    // Unknown upgrade request
+    socket.destroy();
+  });
+
   return {
     app,
     server,

package/static/http-shim.js

@@ -17,6 +17,33 @@
   const TOKEN = params.get('token') || '';
   const BASE_URL = window.MRMD_SERVER_URL || window.location.origin;
 
+  // ==========================================================================
+  // WebSocket Proxy Interceptor
+  // ==========================================================================
+  // Intercept WebSocket connections to localhost sync servers and route through proxy
+  const OriginalWebSocket = window.WebSocket;
+  window.WebSocket = function(url, protocols) {
+    let targetUrl = url;
+
+    // Check if this is a sync connection to localhost
+    const match = url.match(/^wss?:\/\/127\.0\.0\.1:(\d+)\/(.+)$/);
+    if (match) {
+      const [, port, docPath] = match;
+      // Route through server proxy
+      const proxyUrl = new URL(`/sync/${port}/${docPath}`, BASE_URL);
+      proxyUrl.protocol = proxyUrl.protocol === 'https:' ? 'wss:' : 'ws:';
+      targetUrl = proxyUrl.toString();
+      console.log(`[http-shim] Proxying sync WebSocket: ${url} -> ${targetUrl}`);
+    }
+
+    return new OriginalWebSocket(targetUrl, protocols);
+  };
+  window.WebSocket.prototype = OriginalWebSocket.prototype;
+  window.WebSocket.CONNECTING = OriginalWebSocket.CONNECTING;
+  window.WebSocket.OPEN = OriginalWebSocket.OPEN;
+  window.WebSocket.CLOSING = OriginalWebSocket.CLOSING;
+  window.WebSocket.CLOSED = OriginalWebSocket.CLOSED;
+
   // ==========================================================================
   // HTTP Client
   // ==========================================================================