mrmd-server 0.2.1 → 0.2.3

package/package.json

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

package/src/sync-manager.js

@@ -3,6 +3,11 @@
  *
  * 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';
@@ -19,6 +24,10 @@ 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();
 
@@ -94,6 +103,9 @@ 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}>}
  */
@@ -104,10 +116,56 @@ export async function acquireSyncServer(projectDir) {
   if (syncServers.has(dirHash)) {
     const server = syncServers.get(dirHash);
     server.refCount++;
-    console.log(`[sync] Reusing server for ${projectDir} on port ${server.port} (refCount: ${server.refCount})`);
+    console.log(`[sync] Reusing server for ${projectDir} (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 {

package/static/http-shim.js

@@ -110,6 +110,39 @@
   const POST = (path, body) => apiCall('POST', path, body);
   const DELETE = (path) => apiCall('DELETE', path);
 
+  const DOC_EXTENSIONS = ['.md', '.qmd'];
+
+  function basenameFromPath(filePath = '') {
+    const normalized = String(filePath).replace(/\\/g, '/').replace(/\/+/g, '/');
+    const parts = normalized.split('/').filter(Boolean);
+    return parts.length ? parts[parts.length - 1] : '';
+  }
+
+  function dirnameFromPath(filePath = '') {
+    const normalized = String(filePath).replace(/\\/g, '/').replace(/\/+/g, '/');
+    const lastSlash = normalized.lastIndexOf('/');
+    if (lastSlash <= 0) return normalized.startsWith('/') ? '/' : '.';
+    return normalized.slice(0, lastSlash) || '/';
+  }
+
+  function stripDocExtension(fileName = '') {
+    const lower = fileName.toLowerCase();
+    for (const ext of DOC_EXTENSIONS) {
+      if (lower.endsWith(ext)) {
+        return fileName.slice(0, -ext.length);
+      }
+    }
+    return fileName;
+  }
+
+  function makeRuntimeIdFromVenv(venvPath = '', forceNew = false) {
+    const venvName = basenameFromPath(venvPath).replace(/^\.+/, '') || 'venv';
+    const projectName = basenameFromPath(dirnameFromPath(venvPath)).replace(/^\.+/, '') || 'project';
+    let name = `${projectName}:${venvName}`.replace(/[^a-zA-Z0-9-:]/g, '-');
+    if (forceNew) name += '-' + Date.now().toString(36).slice(-4);
+    return name;
+  }
+
   // ==========================================================================
   // WebSocket for Events
   // ==========================================================================
@@ -322,8 +355,20 @@
       GET(`/api/file/preview?path=${encodeURIComponent(filePath)}&lines=${lines || 40}`)
         .then(r => r.content),
 
-    getFileInfo: (filePath) =>
-      GET(`/api/file/info?path=${encodeURIComponent(filePath)}`),
+    getFileInfo: async (filePath) => {
+      try {
+        const info = await GET(`/api/file/info?path=${encodeURIComponent(filePath)}`);
+        return {
+          success: true,
+          ...info,
+        };
+      } catch (err) {
+        return {
+          success: false,
+          error: err.message,
+        };
+      }
+    },
 
     // ========================================================================
     // Venv creation (still useful for setup flows)
@@ -332,6 +377,109 @@
     createVenv: (venvPath) =>
       POST('/api/system/create-venv', { venvPath }),
 
+    installMrmdPython: (venvPath) =>
+      POST('/api/system/install-mrmd-python', { venvPath }),
+
+    startPython: async (venvPath, forceNew = false) => {
+      try {
+        const runtimeId = makeRuntimeIdFromVenv(venvPath, forceNew);
+        const cwd = dirnameFromPath(venvPath);
+        const result = await POST('/api/runtime', {
+          config: {
+            name: runtimeId,
+            language: 'python',
+            cwd,
+            venv: venvPath,
+          },
+        });
+
+        return {
+          success: true,
+          port: result.port,
+          runtimeId,
+          venv: result.venv || venvPath,
+          url: result.url,
+        };
+      } catch (err) {
+        return {
+          success: false,
+          error: err.message,
+        };
+      }
+    },
+
+    attachRuntime: async (runtimeId) => {
+      try {
+        const result = await POST(`/api/runtime/${encodeURIComponent(runtimeId)}/attach`, {});
+        return {
+          success: true,
+          port: result.port,
+          url: result.url,
+          venv: result.venv,
+        };
+      } catch (err) {
+        return {
+          success: false,
+          error: err.message,
+        };
+      }
+    },
+
+    openFile: async (filePath) => {
+      try {
+        // Ensure project is detected and sync server is available.
+        const project = await GET(`/api/project?path=${encodeURIComponent(filePath)}`);
+        const projectDir = project?.root || dirnameFromPath(filePath);
+
+        let syncPort = project?.syncPort;
+        if (!syncPort) {
+          const sync = await POST('/api/project/sync/acquire', { projectDir });
+          syncPort = sync.port;
+        }
+
+        // Mirror Electron behavior: track recent file usage.
+        try {
+          await POST('/api/system/recent', { file: filePath });
+        } catch (err) {
+          console.warn('[http-shim] Failed to update recent file:', err.message);
+        }
+
+        const fileName = basenameFromPath(filePath);
+        const docName = stripDocExtension(fileName);
+
+        return {
+          success: true,
+          syncPort,
+          docName,
+          pythonPort: null,
+          projectDir,
+        };
+      } catch (err) {
+        return {
+          success: false,
+          error: err.message,
+        };
+      }
+    },
+
+    listRuntimes: async () => {
+      try {
+        const runtimes = await GET('/api/runtime');
+        return { runtimes };
+      } catch (err) {
+        return { runtimes: [], error: err.message };
+      }
+    },
+
+    killRuntime: async (runtimeId) => {
+      try {
+        await DELETE(`/api/runtime/${encodeURIComponent(runtimeId)}`);
+        return { success: true };
+      } catch (err) {
+        return { success: false, error: err.message };
+      }
+    },
+
     // ========================================================================
     // PROJECT SERVICE
     // ========================================================================
@@ -374,7 +522,19 @@
 
       restart: (sessionName) => POST(`/api/runtime/${encodeURIComponent(sessionName)}/restart`, {}),
 
-      forDocument: (documentPath) => POST('/api/runtime/for-document', { documentPath }),
+      forDocument: async (documentPath) => {
+        const result = await POST('/api/runtime/for-document', { documentPath });
+
+        // Backwards compatibility: legacy renderer expects a single Python session object.
+        // Unified runtime API returns { python, bash, r, julia, pty }.
+        if (result && typeof result === 'object' && !Array.isArray(result)) {
+          if (result.python && typeof result.python === 'object') {
+            return result.python;
+          }
+        }
+
+        return result;
+      },
 
       forDocumentLanguage: (documentPath, language) =>
         POST(`/api/runtime/for-document/${encodeURIComponent(language)}`, { documentPath }),