mrmd-server 0.1.8 → 0.1.10

package/package.json

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

package/src/api/runtime.js

@@ -5,6 +5,7 @@
  */
 
 import { Router } from 'express';
+import path from 'path';
 
 // Global runtime registry (shared with session.js in a real impl)
 const runtimes = new Map();
@@ -100,32 +101,42 @@ export function createRuntimeRoutes(ctx) {
    */
   router.post('/start-python', async (req, res) => {
     try {
-      const { venvPath, forceNew = false } = req.body;
-
-      // Generate a runtime ID
-      const id = `python-${Date.now()}`;
-
-      // Check if we can reuse an existing runtime
-      if (!forceNew && venvPath) {
-        for (const [existingId, runtime] of runtimes) {
-          if (runtime.type === 'python' && runtime.venv === venvPath) {
-            if (runtime.process && !runtime.process.killed) {
-              return res.json({
-                id: existingId,
-                port: runtime.port,
-                url: `http://localhost:${runtime.port}/mrp/v1`,
-                reused: true,
-              });
-            }
-          }
+      const { venvPath, forceNew = false, cwd } = req.body;
+      const { sessionService } = ctx;
+
+      if (!venvPath) {
+        return res.status(400).json({ error: 'venvPath required' });
+      }
+
+      // Check if we can reuse an existing session
+      if (!forceNew) {
+        const existing = sessionService.list().find(s =>
+          s.language === 'python' && s.venv === venvPath && s.alive
+        );
+        if (existing) {
+          return res.json({
+            id: existing.name,
+            port: existing.port,
+            url: `http://localhost:${existing.port}/mrp/v1`,
+            reused: true,
+          });
         }
       }
 
-      // Start new runtime via session API (reuse that logic)
-      // For now, return a placeholder
+      // Start a new Python session
+      const sessionName = `runtime-${Date.now()}`;
+      const result = await sessionService.start({
+        name: sessionName,
+        language: 'python',
+        venv: venvPath,
+        cwd: cwd || path.dirname(venvPath),
+      });
+
       res.json({
-        id,
-        message: 'Use /api/session to start runtimes',
+        id: result.name,
+        port: result.port,
+        url: `http://localhost:${result.port}/mrp/v1`,
+        pid: result.pid,
       });
     } catch (err) {
       console.error('[runtime:start-python]', err);

package/src/server.js

@@ -188,6 +188,40 @@ export async function createServer(config) {
   app.use('/api/settings', createSettingsRoutes(context));
   app.use('/api/r', createRRoutes(context));
 
+  // Proxy for localhost services (bash, pty, etc.)
+  // Routes /proxy/:port/* to http://127.0.0.1:port/*
+  app.use('/proxy/:port', async (req, res) => {
+    const { port } = req.params;
+    const targetPath = req.url; // Includes query string
+    const targetUrl = `http://127.0.0.1:${port}${targetPath}`;
+
+    try {
+      const response = await fetch(targetUrl, {
+        method: req.method,
+        headers: {
+          'Content-Type': req.headers['content-type'] || 'application/json',
+          'Accept': req.headers['accept'] || '*/*',
+        },
+        body: ['GET', 'HEAD'].includes(req.method) ? undefined : JSON.stringify(req.body),
+      });
+
+      // Forward response headers
+      res.status(response.status);
+      response.headers.forEach((value, key) => {
+        if (!['content-encoding', 'transfer-encoding', 'content-length'].includes(key.toLowerCase())) {
+          res.setHeader(key, value);
+        }
+      });
+
+      // Forward response body
+      const data = await response.text();
+      res.send(data);
+    } catch (err) {
+      console.error(`[proxy] Failed to proxy to ${targetUrl}:`, err.message);
+      res.status(502).json({ error: `Proxy error: ${err.message}` });
+    }
+  });
+
   // Serve http-shim.js
   app.get('/http-shim.js', (req, res) => {
     res.sendFile(path.join(__dirname, '../static/http-shim.js'));

package/static/http-shim.js

@@ -44,6 +44,32 @@
   window.WebSocket.CLOSING = OriginalWebSocket.CLOSING;
   window.WebSocket.CLOSED = OriginalWebSocket.CLOSED;
 
+  // ==========================================================================
+  // Fetch Proxy Interceptor
+  // ==========================================================================
+  // Intercept fetch requests to localhost services (bash, pty) and route through proxy
+  const OriginalFetch = window.fetch;
+  window.fetch = function(input, init) {
+    let url = typeof input === 'string' ? input : input.url;
+
+    // Check if this is a request to localhost service
+    const match = url.match(/^https?:\/\/(?:127\.0\.0\.1|localhost):(\d+)\/(.*)$/);
+    if (match) {
+      const [, port, path] = match;
+      // Route through server proxy
+      const proxyUrl = new URL(`/proxy/${port}/${path}`, BASE_URL);
+      console.log(`[http-shim] Proxying fetch: ${url} -> ${proxyUrl.toString()}`);
+
+      if (typeof input === 'string') {
+        input = proxyUrl.toString();
+      } else {
+        input = new Request(proxyUrl.toString(), input);
+      }
+    }
+
+    return OriginalFetch.call(window, input, init);
+  };
+
   // ==========================================================================
   // HTTP Client
   // ==========================================================================