mrmd-server 0.2.6 → 0.2.7

package/package.json

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

package/src/services.js

@@ -1,38 +1,38 @@
 /**
- * Re-export services from mrmd-electron
+ * Re-export services (vendored from mrmd-electron)
  *
  * These services are pure Node.js (no Electron dependencies)
- * and can be used directly by mrmd-server.
+ * and are bundled directly so mrmd-server works standalone.
  */
 
 export {
   default as ProjectService,
-} from 'mrmd-electron/src/services/project-service.js';
+} from './vendor/services/project-service.js';
 
 export {
   default as RuntimeService,
-} from 'mrmd-electron/src/services/runtime-service.js';
+} from './vendor/services/runtime-service.js';
 
 export {
   default as FileService,
-} from 'mrmd-electron/src/services/file-service.js';
+} from './vendor/services/file-service.js';
 
 export {
   default as AssetService,
-} from 'mrmd-electron/src/services/asset-service.js';
+} from './vendor/services/asset-service.js';
 
 export {
   default as SettingsService,
-} from 'mrmd-electron/src/services/settings-service.js';
+} from './vendor/services/settings-service.js';
 
 export {
   default as RuntimePreferencesService,
-} from 'mrmd-electron/src/services/runtime-preferences-service.js';
+} from './vendor/services/runtime-preferences-service.js';
 
 export {
   default as LanguageToolService,
-} from 'mrmd-electron/src/services/languagetool-service.js';
+} from './vendor/services/languagetool-service.js';
 
 export {
   default as LanguageToolPreferencesService,
-} from 'mrmd-electron/src/services/languagetool-preferences-service.js';
+} from './vendor/services/languagetool-preferences-service.js';

package/src/sync-manager.js

@@ -15,9 +15,9 @@ import fs from 'fs';
 import os from 'os';
 import { fileURLToPath } from 'url';
 
-// Import utilities from mrmd-electron
-import { findFreePort, waitForPort, isProcessAlive } from 'mrmd-electron/src/utils/index.js';
-import { SYNC_SERVER_MEMORY_MB, DIR_HASH_LENGTH } from 'mrmd-electron/src/config.js';
+// Import utilities (vendored from mrmd-electron)
+import { findFreePort, waitForPort, isProcessAlive } from './vendor/utils/index.js';
+import { SYNC_SERVER_MEMORY_MB, DIR_HASH_LENGTH } from './vendor/config.js';
 
 // Relay bridge for cloud mode
 import { RelayBridge } from './relay-bridge.js';

package/src/vendor/config.js

@@ -0,0 +1,295 @@
+/**
+ * Centralized configuration for mrmd-electron
+ *
+ * All magic numbers, timeouts, paths, and other configuration values
+ * should be defined here for easy modification and documentation.
+ */
+
+import os from 'os';
+import path from 'path';
+import {
+  isWin,
+  getConfigDir,
+  getDataDir,
+  getUvInstallDir,
+  getSystemPythonPaths,
+  getUvPaths,
+  getCondaPaths,
+} from './utils/platform.js';
+
+// ============================================================================
+// PATHS
+// ============================================================================
+
+/**
+ * User configuration directory
+ * Windows: %APPDATA%/mrmd
+ * macOS: ~/Library/Application Support/mrmd
+ * Linux: ~/.config/mrmd (or XDG_CONFIG_HOME)
+ */
+export const CONFIG_DIR = getConfigDir();
+
+/**
+ * Recent files/venvs persistence file
+ */
+export const RECENT_FILE = path.join(CONFIG_DIR, 'recent.json');
+
+/**
+ * User settings file (API keys, model mappings, custom commands)
+ */
+export const SETTINGS_FILE = path.join(CONFIG_DIR, 'settings.json');
+
+/**
+ * Legacy runtimes directory (for old-style runtime registration)
+ */
+export const RUNTIMES_DIR = path.join(os.homedir(), '.mrmd', 'runtimes');
+
+/**
+ * Session registry directory (for new session service)
+ */
+export const SESSIONS_DIR = path.join(os.homedir(), '.mrmd', 'sessions');
+
+/**
+ * Asset directory name within projects
+ */
+export const ASSETS_DIR_NAME = '_assets';
+
+/**
+ * Asset manifest filename
+ */
+export const ASSET_MANIFEST_NAME = '.manifest.json';
+
+// ============================================================================
+// NETWORK
+// ============================================================================
+
+/**
+ * Default host for all network servers
+ * Using 127.0.0.1 for security (localhost only)
+ * TODO: Make configurable for remote/container setups
+ */
+export const DEFAULT_HOST = '127.0.0.1';
+
+/**
+ * Timeout for waiting for a port to become available (ms)
+ */
+export const PORT_WAIT_TIMEOUT = 10000;
+
+/**
+ * Interval between port checks (ms)
+ */
+export const PORT_CHECK_INTERVAL = 200;
+
+/**
+ * Socket connection timeout (ms)
+ */
+export const SOCKET_TIMEOUT = 500;
+
+// ============================================================================
+// SYNC SERVER
+// ============================================================================
+
+/**
+ * Memory limit for sync server (MB)
+ * Limited to 512MB to fail fast instead of consuming all system memory
+ * and crashing unpredictably after hours. Better to restart early than
+ * lose hours of work.
+ */
+export const SYNC_SERVER_MEMORY_MB = 512;
+
+/**
+ * Watchdog interval for periodic backups (ms)
+ */
+export const WATCHDOG_INTERVAL = 60000;
+
+/**
+ * WebSocket ping interval for connection health checks (ms)
+ */
+export const WEBSOCKET_PING_INTERVAL = 30000;
+
+/**
+ * WebSocket pong timeout - if no pong received in this time,
+ * consider connection dead (ms)
+ */
+export const WEBSOCKET_PONG_TIMEOUT = 5000;
+
+// ============================================================================
+// FILE SCANNING
+// ============================================================================
+
+/**
+ * Maximum directory depth for file scanning
+ */
+export const FILE_SCAN_MAX_DEPTH = 6;
+
+/**
+ * Maximum directory depth for venv discovery
+ */
+export const VENV_SCAN_MAX_DEPTH = 4;
+
+/**
+ * Maximum directory depth for project file scanning
+ */
+export const PROJECT_SCAN_MAX_DEPTH = 10;
+
+// ============================================================================
+// LIMITS
+// ============================================================================
+
+/**
+ * Maximum recent files to keep
+ */
+export const MAX_RECENT_FILES = 50;
+
+/**
+ * Maximum recent venvs to keep
+ */
+export const MAX_RECENT_VENVS = 20;
+
+/**
+ * Hash length for asset deduplication (characters)
+ */
+export const ASSET_HASH_LENGTH = 16;
+
+/**
+ * Hash length for directory hashing (characters)
+ */
+export const DIR_HASH_LENGTH = 12;
+
+// ============================================================================
+// WINDOW
+// ============================================================================
+
+/**
+ * Default window dimensions
+ */
+export const DEFAULT_WINDOW_WIDTH = 1000;
+export const DEFAULT_WINDOW_HEIGHT = 750;
+
+/**
+ * Default background color (dark theme)
+ */
+export const DEFAULT_BACKGROUND_COLOR = '#ffffff';
+
+// ============================================================================
+// PYTHON PATHS
+// ============================================================================
+
+/**
+ * Common system Python paths to check
+ * Platform-aware: includes Windows paths on Windows, Unix paths on Unix
+ */
+export const SYSTEM_PYTHON_PATHS = getSystemPythonPaths();
+
+/**
+ * Common conda installation paths (relative to home)
+ * Platform-aware: uses backslashes on Windows
+ */
+export const CONDA_PATHS = getCondaPaths();
+
+/**
+ * Common uv installation paths
+ * Platform-aware: includes Windows paths on Windows
+ */
+export const UV_PATHS = getUvPaths();
+
+// ============================================================================
+// SPECIAL FILES
+// ============================================================================
+
+/**
+ * Files that should never have FSML order prefixes
+ */
+export const UNORDERED_FILES = new Set([
+  'readme.md',
+  'readme.qmd',
+  'readme',
+  'license.md',
+  'license.qmd',
+  'license',
+  'license.txt',
+  'changelog.md',
+  'changelog.qmd',
+  'changelog',
+  'contributing.md',
+  'contributing.qmd',
+  'contributing',
+  'mrmd.md',
+  'index.md',
+  'index.qmd',
+  '.gitignore',
+  '.gitattributes',
+]);
+
+// ============================================================================
+// VERSION COMPATIBILITY MATRIX
+// ============================================================================
+// Defines which Python package versions are compatible with this electron app.
+// Updated on each release. Uses pip version specifiers.
+
+/**
+ * Current mrmd-electron version
+ */
+export const APP_VERSION = '0.3.1';
+
+/**
+ * Python package version requirements for this electron version.
+ * These are installed via uv/pip when user sets up a venv.
+ */
+export const PYTHON_DEPS = {
+  // Core runtime - required
+  'mrmd-python': '>=0.3.7,<0.5',
+
+  // AI features - required for full experience
+  'mrmd-ai': '>=0.1.0,<0.2',
+
+  // Bash runtime - for ```bash blocks
+  'mrmd-bash': '>=0.1.0,<0.2',
+
+  // PTY runtime - for ```term blocks
+  'mrmd-pty': '>=0.1.0,<0.2',
+
+  // Orchestrator (optional, for advanced multi-runtime setups)
+  // 'mrmd': '>=0.2.0,<0.3',
+};
+
+/**
+ * Get pip install args for all required Python packages
+ * @returns {string[]} Array of package specifiers
+ */
+export function getPythonInstallArgs() {
+  return Object.entries(PYTHON_DEPS).map(
+    ([pkg, version]) => `${pkg}${version}`
+  );
+}
+
+// ============================================================================
+// UV AUTO-INSTALL
+// ============================================================================
+
+/**
+ * uv download URLs by platform
+ * Updated from: https://github.com/astral-sh/uv/releases
+ */
+export const UV_DOWNLOAD_URLS = {
+  'linux-x64': 'https://github.com/astral-sh/uv/releases/latest/download/uv-x86_64-unknown-linux-gnu.tar.gz',
+  'linux-arm64': 'https://github.com/astral-sh/uv/releases/latest/download/uv-aarch64-unknown-linux-gnu.tar.gz',
+  'darwin-x64': 'https://github.com/astral-sh/uv/releases/latest/download/uv-x86_64-apple-darwin.tar.gz',
+  'darwin-arm64': 'https://github.com/astral-sh/uv/releases/latest/download/uv-aarch64-apple-darwin.tar.gz',
+  'win32-x64': 'https://github.com/astral-sh/uv/releases/latest/download/uv-x86_64-pc-windows-msvc.zip',
+};
+
+/**
+ * Default uv install location (user-local)
+ * Windows: %LOCALAPPDATA%/uv/bin
+ * Unix: ~/.local/bin
+ */
+export const UV_INSTALL_DIR = getUvInstallDir();
+
+/**
+ * Path where uv will be installed
+ */
+export const UV_INSTALL_PATH = path.join(
+  UV_INSTALL_DIR,
+  isWin ? 'uv.exe' : 'uv'
+);

package/src/vendor/services/asset-service.js

@@ -0,0 +1,332 @@
+/**
+ * AssetService - Asset management with deduplication
+ *
+ * Manages assets in the _assets/ directory.
+ * Handles saving with hash-based deduplication, orphan detection, etc.
+ *
+ * Uses mrmd-project for path computation.
+ */
+
+import { Assets } from 'mrmd-project';
+import crypto from 'crypto';
+import fs from 'fs';
+import fsPromises from 'fs/promises';
+import path from 'path';
+import { ASSETS_DIR_NAME, ASSET_MANIFEST_NAME, ASSET_HASH_LENGTH } from '../config.js';
+
+// MIME type mapping
+const MIME_TYPES = {
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.gif': 'image/gif',
+  '.webp': 'image/webp',
+  '.svg': 'image/svg+xml',
+  '.pdf': 'application/pdf',
+  '.csv': 'text/csv',
+  '.json': 'application/json',
+  '.mp4': 'video/mp4',
+  '.webm': 'video/webm',
+  '.mp3': 'audio/mpeg',
+  '.wav': 'audio/wav',
+};
+
+class AssetService {
+  /**
+   * @param {FileService} fileService - Reference to FileService for scanning
+   */
+  constructor(fileService) {
+    this.fileService = fileService;
+  }
+
+  /**
+   * List all assets in a project
+   *
+   * @param {string} projectRoot - Project root path
+   * @returns {Promise<AssetInfo[]>}
+   */
+  async list(projectRoot) {
+    const assetsDir = path.join(projectRoot, ASSETS_DIR_NAME);
+
+    if (!fs.existsSync(assetsDir)) {
+      return [];
+    }
+
+    const manifest = await this.loadManifest(projectRoot);
+    const assets = [];
+
+    const walk = async (dir) => {
+      let entries;
+      try {
+        entries = await fsPromises.readdir(dir, { withFileTypes: true });
+      } catch {
+        return;
+      }
+
+      for (const entry of entries) {
+        // Skip hidden files
+        if (entry.name.startsWith('.')) continue;
+
+        const fullPath = path.join(dir, entry.name);
+        const relativePath = path.relative(assetsDir, fullPath);
+
+        if (entry.isDirectory()) {
+          await walk(fullPath);
+        } else {
+          const stat = await fsPromises.stat(fullPath);
+
+          // Get hash from manifest or compute it
+          let hash = manifest[relativePath]?.hash;
+          if (!hash) {
+            hash = await this.computeFileHash(fullPath);
+          }
+
+          assets.push({
+            path: relativePath,
+            fullPath,
+            hash,
+            size: stat.size,
+            mimeType: this.getMimeType(entry.name),
+            usedIn: manifest[relativePath]?.usedIn || [],
+          });
+        }
+      }
+    };
+
+    await walk(assetsDir);
+    return assets;
+  }
+
+  /**
+   * Save an asset (handles deduplication)
+   *
+   * @param {string} projectRoot - Project root path
+   * @param {Buffer} file - File content
+   * @param {string} filename - Desired filename
+   * @returns {Promise<{ path: string, deduplicated: boolean }>}
+   */
+  async save(projectRoot, file, filename) {
+    const assetsDir = path.join(projectRoot, ASSETS_DIR_NAME);
+    const hash = this.computeHashFromBuffer(file);
+
+    // Load manifest to check for duplicates
+    const manifest = await this.loadManifest(projectRoot);
+
+    // Check for duplicate by hash
+    for (const [assetPath, info] of Object.entries(manifest)) {
+      if (info.hash === hash) {
+        // Found duplicate
+        return { path: assetPath, deduplicated: true };
+      }
+    }
+
+    // Also check files not in manifest
+    const existingAssets = await this.list(projectRoot);
+    for (const asset of existingAssets) {
+      if (asset.hash === hash) {
+        return { path: asset.path, deduplicated: true };
+      }
+    }
+
+    // Save new file
+    const assetPath = await this.uniquePath(assetsDir, filename);
+    const fullPath = path.join(assetsDir, assetPath);
+
+    await fsPromises.mkdir(path.dirname(fullPath), { recursive: true });
+    await fsPromises.writeFile(fullPath, file);
+
+    // Update manifest
+    manifest[assetPath] = {
+      hash,
+      addedAt: new Date().toISOString(),
+      usedIn: [],
+    };
+    await this.saveManifest(projectRoot, manifest);
+
+    return { path: assetPath, deduplicated: false };
+  }
+
+  /**
+   * Get relative path from a document to an asset
+   *
+   * @param {string} assetPath - Asset path relative to _assets/
+   * @param {string} documentPath - Document path relative to project root
+   * @returns {string}
+   */
+  getRelativePath(assetPath, documentPath) {
+    // Use mrmd-project for computation
+    return Assets.computeRelativePath(documentPath, path.join(ASSETS_DIR_NAME, assetPath));
+  }
+
+  /**
+   * Find orphaned assets (not referenced by any document)
+   *
+   * @param {string} projectRoot - Project root path
+   * @returns {Promise<string[]>} Orphaned asset paths
+   */
+  async findOrphans(projectRoot) {
+    const assets = await this.list(projectRoot);
+
+    if (assets.length === 0) return [];
+
+    // Get all markdown files
+    const files = await this.fileService.scan(projectRoot);
+
+    // Extract all asset references from all documents
+    const usedAssets = new Set();
+
+    for (const file of files) {
+      try {
+        const fullPath = path.join(projectRoot, file);
+        const content = await fsPromises.readFile(fullPath, 'utf8');
+        const refs = Assets.extractPaths(content);
+
+        for (const ref of refs) {
+          // Normalize the path to extract just the asset name
+          // Paths might be: _assets/img.png, ../_assets/img.png, etc.
+          const normalized = this.normalizeAssetRef(ref.path);
+          if (normalized) {
+            usedAssets.add(normalized);
+          }
+        }
+      } catch {
+        // Skip files that can't be read
+      }
+    }
+
+    // Find assets not in usedAssets
+    return assets
+      .filter(a => !usedAssets.has(a.path))
+      .map(a => a.path);
+  }
+
+  /**
+   * Delete an asset
+   *
+   * @param {string} projectRoot - Project root path
+   * @param {string} assetPath - Asset path relative to _assets/
+   */
+  async delete(projectRoot, assetPath) {
+    const fullPath = path.join(projectRoot, ASSETS_DIR_NAME, assetPath);
+
+    await fsPromises.unlink(fullPath);
+
+    // Update manifest
+    const manifest = await this.loadManifest(projectRoot);
+    delete manifest[assetPath];
+    await this.saveManifest(projectRoot, manifest);
+
+    // Clean up empty directories
+    await this.removeEmptyDirs(
+      path.dirname(fullPath),
+      path.join(projectRoot, ASSETS_DIR_NAME)
+    );
+  }
+
+  /**
+   * Compute hash of a file
+   */
+  async computeFileHash(filePath) {
+    const content = await fsPromises.readFile(filePath);
+    return this.computeHashFromBuffer(content);
+  }
+
+  /**
+   * Compute hash from buffer
+   */
+  computeHashFromBuffer(buffer) {
+    return crypto.createHash('sha256').update(buffer).digest('hex').slice(0, ASSET_HASH_LENGTH);
+  }
+
+  /**
+   * Get MIME type from filename
+   */
+  getMimeType(filename) {
+    const ext = path.extname(filename).toLowerCase();
+    return MIME_TYPES[ext] || 'application/octet-stream';
+  }
+
+  /**
+   * Generate a unique path for a new asset.
+   * Preserves directory structure (e.g., 'generated/plot.png' stays in 'generated/').
+   */
+  async uniquePath(assetsDir, filename) {
+    const ext = path.extname(filename);
+    const dir = path.dirname(filename);
+    const base = path.basename(filename, ext);
+
+    // Preserve directory structure
+    const prefix = dir !== '.' ? dir + '/' : '';
+
+    let candidate = filename;
+    let counter = 1;
+
+    while (fs.existsSync(path.join(assetsDir, candidate))) {
+      candidate = `${prefix}${base}-${counter}${ext}`;
+      counter++;
+    }
+
+    return candidate;
+  }
+
+  /**
+   * Normalize an asset reference path
+   */
+  normalizeAssetRef(refPath) {
+    // Handle: _assets/img.png, ../_assets/img.png, ../../_assets/img.png
+    const match = refPath.match(/(?:\.\.\/)*_assets\/(.+)/);
+    if (match) {
+      return match[1];
+    }
+    return null;
+  }
+
+  /**
+   * Load manifest file
+   */
+  async loadManifest(projectRoot) {
+    const manifestPath = path.join(projectRoot, ASSETS_DIR_NAME, ASSET_MANIFEST_NAME);
+    try {
+      const content = await fsPromises.readFile(manifestPath, 'utf8');
+      return JSON.parse(content);
+    } catch (e) {
+      console.warn(`[asset] Could not load manifest: ${e.message}`);
+      return {};
+    }
+  }
+
+  /**
+   * Save manifest file
+   */
+  async saveManifest(projectRoot, manifest) {
+    const assetsDir = path.join(projectRoot, ASSETS_DIR_NAME);
+    const manifestPath = path.join(assetsDir, ASSET_MANIFEST_NAME);
+
+    await fsPromises.mkdir(assetsDir, { recursive: true });
+    await fsPromises.writeFile(manifestPath, JSON.stringify(manifest, null, 2));
+  }
+
+  /**
+   * Remove empty directories
+   */
+  async removeEmptyDirs(dir, stopAt) {
+    while (dir !== stopAt && dir.startsWith(stopAt)) {
+      try {
+        const entries = await fsPromises.readdir(dir);
+        // Don't count manifest file as a real entry
+        const realEntries = entries.filter(e => e !== ASSET_MANIFEST_NAME);
+        if (realEntries.length === 0) {
+          await fsPromises.rmdir(dir);
+          dir = path.dirname(dir);
+        } else {
+          break;
+        }
+      } catch (e) {
+        console.warn(`[asset] Error removing empty directory ${dir}: ${e.message}`);
+        break;
+      }
+    }
+  }
+}
+
+export default AssetService;