mrmd-server 0.2.3 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrmd-server",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "HTTP server for mrmd - run mrmd in any browser, access from anywhere",
   "type": "module",
   "main": "src/index.js",

package/src/server.js

@@ -13,6 +13,7 @@ import fs from 'fs/promises';
 import { existsSync } from 'fs';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { createRequire } from 'module';
+import { Readable } from 'stream';
 
 const require = createRequire(import.meta.url);
 
@@ -241,9 +242,30 @@ export async function createServer(config) {
         }
       });
 
-      // Forward response body as raw bytes (important for binary assets like PNGs)
-      const data = Buffer.from(await response.arrayBuffer());
-      res.send(data);
+      // Stream response body to preserve SSE/chunked behavior for execute/stream.
+      // Also works for binary assets without buffering entire payload in memory.
+      if (!response.body) {
+        res.end();
+        return;
+      }
+
+      const contentType = (response.headers.get('content-type') || '').toLowerCase();
+      if (contentType.includes('text/event-stream')) {
+        // Keep SSE connection semantics explicit on downstream response
+        res.setHeader('Cache-Control', 'no-cache');
+        res.setHeader('Connection', 'keep-alive');
+      }
+
+      const nodeStream = Readable.fromWeb(response.body);
+      nodeStream.on('error', (streamErr) => {
+        console.error(`[proxy] Stream error from ${targetUrl}:`, streamErr.message);
+        if (!res.headersSent) {
+          res.status(502).json({ error: `Proxy stream error: ${streamErr.message}` });
+        } else {
+          res.end();
+        }
+      });
+      nodeStream.pipe(res);
     } catch (err) {
       console.error(`[proxy] Failed to proxy to ${targetUrl}:`, err.message);
       res.status(502).json({ error: `Proxy error: ${err.message}` });

package/src/sync-manager.js

@@ -3,11 +3,6 @@
  *
  * Ported from mrmd-electron/main.js to provide dynamic per-project sync servers.
  * Allows mrmd-server to handle files from any project, not just a fixed projectDir.
- *
- * Supports three sync modes (via SYNC_MODE env var):
- *   - legacy: spawn local mrmd-sync per project (default)
- *   - mirror: same as legacy (mirroring handled by orchestrator WS proxy)
- *   - relay_primary: use relay-client to sync project dir with cloud relay
  */
 
 import { spawn } from 'child_process';
@@ -24,10 +19,6 @@ import { SYNC_SERVER_MEMORY_MB, DIR_HASH_LENGTH } from 'mrmd-electron/src/config
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const SYNC_MODE = process.env.SYNC_MODE || 'legacy';
-const SYNC_RELAY_URL = process.env.SYNC_RELAY_URL || 'ws://localhost:3006';
-const CLOUD_USER_ID = process.env.CLOUD_USER_ID || '';
-
 // Track active sync servers by directory hash
 const syncServers = new Map();
 
@@ -103,9 +94,6 @@ export function onSyncDeath(listener) {
  * Get or start a sync server for a project directory
  * Uses reference counting so multiple documents can share a sync server
  *
- * In relay_primary mode, creates a relay client instead of a local sync server.
- * The relay client syncs the project dir with the cloud relay bidirectionally.
- *
  * @param {string} projectDir - The project directory to sync
  * @returns {Promise<{port: number, dir: string, refCount: number}>}
  */
@@ -116,56 +104,10 @@ export async function acquireSyncServer(projectDir) {
   if (syncServers.has(dirHash)) {
     const server = syncServers.get(dirHash);
     server.refCount++;
-    console.log(`[sync] Reusing server for ${projectDir} (refCount: ${server.refCount})`);
+    console.log(`[sync] Reusing server for ${projectDir} on port ${server.port} (refCount: ${server.refCount})`);
     return server;
   }
 
-  // ── Relay-primary mode: use relay client instead of local sync server ──
-  if (SYNC_MODE === 'relay_primary' && CLOUD_USER_ID) {
-    // Derive project name from the directory name
-    const projectName = path.basename(projectDir);
-
-    console.log(`[sync] Starting relay client for ${projectDir} (project: ${projectName})`);
-
-    try {
-      // Dynamic import so this doesn't fail in environments without relay-client
-      const { createRelayClient } = await import('mrmd-sync/src/relay-client.js');
-
-      const relayClient = createRelayClient({
-        relayUrl: SYNC_RELAY_URL,
-        projectDir,
-        userId: CLOUD_USER_ID,
-        project: projectName,
-        writeDebounceMs: 1000,
-        log: (msg) => console.log(msg),
-      });
-
-      await relayClient.start();
-
-      // Return a server-like object that the rest of the code can use.
-      // port=0 signals that sync is handled by the relay (not a local WS server).
-      // The orchestrator's WS proxy routes sync traffic directly to the relay.
-      const server = {
-        proc: null,
-        port: 0,
-        dir: projectDir,
-        refCount: 1,
-        owned: true,
-        isRelay: true,
-        relayClient,
-      };
-      syncServers.set(dirHash, server);
-      console.log(`[sync] Relay client started for ${projectDir}`);
-      return server;
-    } catch (err) {
-      console.error(`[sync] Failed to start relay client for ${projectDir}: ${err.message}`);
-      console.warn(`[sync] Falling back to local sync server`);
-      // Fall through to local server below
-    }
-  }
-
-  // ── Legacy / mirror mode: spawn local mrmd-sync process ──
-
   // Check for existing server from a PID file (in case of restart)
   const syncStatePath = path.join(os.tmpdir(), `mrmd-sync-${dirHash}`, 'server.pid');
   try {