mrmd-server 0.1.12 → 0.1.13

package/package.json

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

package/src/api/asset.js

@@ -1,13 +1,11 @@
 /**
  * Asset API routes
  *
- * Mirrors electronAPI.asset.*
+ * Mirrors electronAPI.asset.* using AssetService from mrmd-electron
  */
 
 import { Router } from 'express';
 import path from 'path';
-import fs from 'fs/promises';
-import crypto from 'crypto';
 import multer from 'multer';
 
 // Configure multer for file uploads
@@ -22,6 +20,7 @@ const upload = multer({
  */
 export function createAssetRoutes(ctx) {
   const router = Router();
+  const { assetService } = ctx;
 
   /**
    * GET /api/asset?projectRoot=...
@@ -31,33 +30,8 @@ export function createAssetRoutes(ctx) {
   router.get('/', async (req, res) => {
     try {
       const projectRoot = req.query.projectRoot || ctx.projectDir;
-      const assetsDir = path.join(projectRoot, '_assets');
-
-      try {
-        const files = await fs.readdir(assetsDir);
-        const assets = [];
-
-        for (const file of files) {
-          if (file.startsWith('.')) continue;
-
-          const filePath = path.join(assetsDir, file);
-          const stat = await fs.stat(filePath);
-
-          assets.push({
-            name: file,
-            path: `_assets/${file}`,
-            size: stat.size,
-            modified: stat.mtime.toISOString(),
-          });
-        }
-
-        res.json(assets);
-      } catch (err) {
-        if (err.code === 'ENOENT') {
-          return res.json([]);
-        }
-        throw err;
-      }
+      const assets = await assetService.list(projectRoot);
+      res.json(assets);
     } catch (err) {
       console.error('[asset:list]', err);
       res.status(500).json({ error: err.message });
@@ -94,36 +68,9 @@ export function createAssetRoutes(ctx) {
         return res.status(400).json({ error: 'No file provided' });
       }
 
-      const assetsDir = path.join(projectRoot, '_assets');
-      await fs.mkdir(assetsDir, { recursive: true });
-
-      // Compute hash for deduplication
-      const hash = crypto.createHash('sha256').update(fileBuffer).digest('hex').slice(0, 8);
-      const ext = path.extname(filename);
-      const base = path.basename(filename, ext);
-
-      // Check if identical file already exists
-      const existingFiles = await fs.readdir(assetsDir).catch(() => []);
-      for (const existing of existingFiles) {
-        if (existing.startsWith(hash + '-')) {
-          // Found duplicate
-          return res.json({
-            path: `_assets/${existing}`,
-            deduplicated: true,
-          });
-        }
-      }
-
-      // Save with hash prefix
-      const finalName = `${hash}-${base}${ext}`;
-      const finalPath = path.join(assetsDir, finalName);
-
-      await fs.writeFile(finalPath, fileBuffer);
-
-      res.json({
-        path: `_assets/${finalName}`,
-        deduplicated: false,
-      });
+      // AssetService.save expects a file-like object
+      const result = await assetService.save(projectRoot, fileBuffer, filename);
+      res.json(result);
     } catch (err) {
       console.error('[asset:save]', err);
       res.status(500).json({ error: err.message });
@@ -162,40 +109,8 @@ export function createAssetRoutes(ctx) {
   router.get('/orphans', async (req, res) => {
     try {
       const projectRoot = req.query.projectRoot || ctx.projectDir;
-      const assetsDir = path.join(projectRoot, '_assets');
-
-      // Get all assets
-      let assetFiles;
-      try {
-        assetFiles = await fs.readdir(assetsDir);
-      } catch {
-        return res.json([]);
-      }
-
-      // Get all markdown files
-      const mdFiles = await scanMarkdownFiles(projectRoot);
-
-      // Read all markdown content and find referenced assets
-      const referencedAssets = new Set();
-      for (const mdFile of mdFiles) {
-        try {
-          const content = await fs.readFile(mdFile, 'utf-8');
-          // Find asset references (images, links)
-          const matches = content.matchAll(/!\[.*?\]\(([^)]+)\)|href="([^"]+)"/g);
-          for (const match of matches) {
-            const ref = match[1] || match[2];
-            if (ref && ref.includes('_assets/')) {
-              const assetName = path.basename(ref);
-              referencedAssets.add(assetName);
-            }
-          }
-        } catch {}
-      }
-
-      // Find orphans
-      const orphans = assetFiles.filter(f => !f.startsWith('.') && !referencedAssets.has(f));
-
-      res.json(orphans.map(f => `_assets/${f}`));
+      const orphans = await assetService.findOrphans(projectRoot);
+      res.json(orphans);
     } catch (err) {
       console.error('[asset:orphans]', err);
       res.status(500).json({ error: err.message });
@@ -216,14 +131,7 @@ export function createAssetRoutes(ctx) {
         return res.status(400).json({ error: 'assetPath required' });
       }
 
-      const fullPath = path.join(projectRoot, assetPath);
-
-      // Security check
-      if (!fullPath.startsWith(path.resolve(projectRoot))) {
-        return res.status(400).json({ error: 'Invalid path' });
-      }
-
-      await fs.unlink(fullPath);
+      await assetService.delete(projectRoot, assetPath);
       res.json({ success: true });
     } catch (err) {
       console.error('[asset:delete]', err);
@@ -254,30 +162,3 @@ export function createAssetRoutes(ctx) {
 
   return router;
 }
-
-/**
- * Recursively scan for markdown files
- */
-async function scanMarkdownFiles(dir, maxDepth = 6, currentDepth = 0) {
-  if (currentDepth > maxDepth) return [];
-
-  const files = [];
-  const entries = await fs.readdir(dir, { withFileTypes: true });
-
-  for (const entry of entries) {
-    if (entry.name.startsWith('.')) continue;
-    if (entry.name === 'node_modules') continue;
-    if (entry.name === '_assets') continue;
-
-    const fullPath = path.join(dir, entry.name);
-
-    if (entry.isDirectory()) {
-      const subFiles = await scanMarkdownFiles(fullPath, maxDepth, currentDepth + 1);
-      files.push(...subFiles);
-    } else if (entry.name.endsWith('.md')) {
-      files.push(fullPath);
-    }
-  }
-
-  return files;
-}

package/src/api/file.js

@@ -1,13 +1,11 @@
 /**
  * File API routes
  *
- * Mirrors electronAPI.file.*
+ * Mirrors electronAPI.file.* using FileService from mrmd-electron
  */
 
 import { Router } from 'express';
 import path from 'path';
-import fs from 'fs/promises';
-import { constants as fsConstants } from 'fs';
 
 /**
  * Create file routes
@@ -15,6 +13,7 @@ import { constants as fsConstants } from 'fs';
  */
 export function createFileRoutes(ctx) {
   const router = Router();
+  const { fileService } = ctx;
 
   /**
    * GET /api/file/scan?root=...&extensions=...&maxDepth=...
@@ -24,11 +23,13 @@ export function createFileRoutes(ctx) {
   router.get('/scan', async (req, res) => {
     try {
       const root = req.query.root || ctx.projectDir;
-      const extensions = req.query.extensions?.split(',') || ['.md'];
-      const maxDepth = parseInt(req.query.maxDepth) || 6;
-      const includeHidden = req.query.includeHidden === 'true';
+      const options = {
+        extensions: req.query.extensions?.split(',') || ['.md'],
+        maxDepth: parseInt(req.query.maxDepth) || 6,
+        includeHidden: req.query.includeHidden === 'true',
+      };
 
-      const files = await scanDirectory(root, extensions, maxDepth, includeHidden);
+      const files = await fileService.scan(root, options);
       res.json(files);
     } catch (err) {
       console.error('[file:scan]', err);
@@ -49,23 +50,14 @@ export function createFileRoutes(ctx) {
       }
 
       const fullPath = resolvePath(ctx.projectDir, filePath);
-
-      // Create directory if needed
-      await fs.mkdir(path.dirname(fullPath), { recursive: true });
-
-      // Check if file exists
-      try {
-        await fs.access(fullPath, fsConstants.F_OK);
-        return res.status(409).json({ error: 'File already exists' });
-      } catch {
-        // File doesn't exist, good to create
-      }
-
-      await fs.writeFile(fullPath, content, 'utf-8');
+      const result = await fileService.createFile(fullPath, content);
 
       ctx.eventBus.projectChanged(ctx.projectDir);
-      res.json({ success: true, path: fullPath });
+      res.json({ success: true, path: result });
     } catch (err) {
+      if (err.message?.includes('already exists')) {
+        return res.status(409).json({ error: 'File already exists' });
+      }
       console.error('[file:create]', err);
       res.status(500).json({ error: err.message });
     }
@@ -84,40 +76,12 @@ export function createFileRoutes(ctx) {
       }
 
       const root = projectRoot || ctx.projectDir;
-      const fullPath = resolvePath(root, relativePath);
-
-      // Create directory if needed
-      await fs.mkdir(path.dirname(fullPath), { recursive: true });
-
-      // If file exists, find next available FSML name
-      let finalPath = fullPath;
-      try {
-        await fs.access(fullPath, fsConstants.F_OK);
-        // File exists, generate unique name
-        const dir = path.dirname(fullPath);
-        const ext = path.extname(fullPath);
-        const base = path.basename(fullPath, ext);
-
-        let counter = 1;
-        while (true) {
-          finalPath = path.join(dir, `${base}-${counter}${ext}`);
-          try {
-            await fs.access(finalPath, fsConstants.F_OK);
-            counter++;
-          } catch {
-            break;
-          }
-        }
-      } catch {
-        // File doesn't exist, use original path
-      }
-
-      await fs.writeFile(finalPath, content, 'utf-8');
+      const result = await fileService.createInProject(root, relativePath, content);
 
       ctx.eventBus.projectChanged(root);
       res.json({
         success: true,
-        path: path.relative(root, finalPath),
+        path: result.relativePath,
       });
     } catch (err) {
       console.error('[file:createInProject]', err);
@@ -138,27 +102,13 @@ export function createFileRoutes(ctx) {
       }
 
       const root = projectRoot || ctx.projectDir;
-      const fullFromPath = resolvePath(root, fromPath);
-      const fullToPath = resolvePath(root, toPath);
-
-      // Create destination directory if needed
-      await fs.mkdir(path.dirname(fullToPath), { recursive: true });
-
-      // Move the file
-      await fs.rename(fullFromPath, fullToPath);
-
-      // TODO: Update internal links in other files (refactoring)
-      // This would require parsing all .md files and updating links
-      // For now, just return the moved file
+      const result = await fileService.move(root, fromPath, toPath);
 
       ctx.eventBus.projectChanged(root);
       res.json({
         success: true,
-        movedFile: {
-          from: fromPath,
-          to: toPath,
-        },
-        updatedFiles: [], // TODO: implement link refactoring
+        movedFile: result.movedFile,
+        updatedFiles: result.updatedFiles || [],
       });
     } catch (err) {
       console.error('[file:move]', err);
@@ -179,36 +129,13 @@ export function createFileRoutes(ctx) {
       }
 
       const root = projectRoot || ctx.projectDir;
-
-      // TODO: Implement FSML reordering
-      // This involves:
-      // 1. Reading the source and target directories
-      // 2. Calculating new FSML prefixes
-      // 3. Renaming files with new prefixes
-
-      // For now, just do a simple move
-      const fullSourcePath = resolvePath(root, sourcePath);
-      let fullTargetPath;
-
-      if (position === 'inside') {
-        // Move into target directory
-        fullTargetPath = resolvePath(root, path.join(targetPath, path.basename(sourcePath)));
-      } else {
-        // Move to same directory as target
-        fullTargetPath = resolvePath(root, path.join(path.dirname(targetPath), path.basename(sourcePath)));
-      }
-
-      await fs.mkdir(path.dirname(fullTargetPath), { recursive: true });
-      await fs.rename(fullSourcePath, fullTargetPath);
+      const result = await fileService.reorder(root, sourcePath, targetPath, position);
 
       ctx.eventBus.projectChanged(root);
       res.json({
         success: true,
-        movedFile: {
-          from: sourcePath,
-          to: path.relative(root, fullTargetPath),
-        },
-        updatedFiles: [],
+        movedFile: result.movedFile,
+        updatedFiles: result.updatedFiles || [],
       });
     } catch (err) {
       console.error('[file:reorder]', err);
@@ -229,13 +156,7 @@ export function createFileRoutes(ctx) {
       }
 
       const fullPath = resolvePath(ctx.projectDir, filePath);
-
-      const stat = await fs.stat(fullPath);
-      if (stat.isDirectory()) {
-        await fs.rm(fullPath, { recursive: true });
-      } else {
-        await fs.unlink(fullPath);
-      }
+      await fileService.delete(fullPath);
 
       ctx.eventBus.projectChanged(ctx.projectDir);
       res.json({ success: true });
@@ -258,7 +179,7 @@ export function createFileRoutes(ctx) {
       }
 
       const fullPath = resolvePath(ctx.projectDir, filePath);
-      const content = await fs.readFile(fullPath, 'utf-8');
+      const content = await fileService.read(fullPath);
 
       res.json({ success: true, content });
     } catch (err) {
@@ -283,11 +204,7 @@ export function createFileRoutes(ctx) {
       }
 
       const fullPath = resolvePath(ctx.projectDir, filePath);
-
-      // Create directory if needed
-      await fs.mkdir(path.dirname(fullPath), { recursive: true });
-
-      await fs.writeFile(fullPath, content ?? '', 'utf-8');
+      await fileService.write(fullPath, content ?? '');
 
       res.json({ success: true });
     } catch (err) {
@@ -311,7 +228,7 @@ export function createFileRoutes(ctx) {
       }
 
       const fullPath = resolvePath(ctx.projectDir, filePath);
-      const content = await fs.readFile(fullPath, 'utf-8');
+      const content = await fileService.read(fullPath);
       const previewLines = content.split('\n').slice(0, lines).join('\n');
 
       res.json({ success: true, content: previewLines });
@@ -337,6 +254,8 @@ export function createFileRoutes(ctx) {
       }
 
       const fullPath = resolvePath(ctx.projectDir, filePath);
+      // FileService doesn't have getInfo, use fs directly for this simple operation
+      const fs = await import('fs/promises');
       const stat = await fs.stat(fullPath);
 
       res.json({
@@ -361,53 +280,13 @@ export function createFileRoutes(ctx) {
 /**
  * Resolve path - allows full filesystem access
  *
- * Security model: The server runs on the user's machine with their permissions.
- * Access control is handled via auth token, not path restrictions.
- *
  * @param {string} basePath - Base path for relative paths (ignored for absolute)
  * @param {string} inputPath - Path to resolve (absolute or relative)
  * @returns {string} Resolved absolute path
  */
 function resolvePath(basePath, inputPath) {
-  // If it's already absolute, use it directly
   if (path.isAbsolute(inputPath)) {
     return inputPath;
   }
-
-  // Otherwise resolve relative to basePath
   return path.resolve(basePath, inputPath);
 }
-
-/**
- * Scan directory for files
- */
-async function scanDirectory(root, extensions, maxDepth, includeHidden, currentDepth = 0) {
-  if (currentDepth > maxDepth) return [];
-
-  const files = [];
-  const entries = await fs.readdir(root, { withFileTypes: true });
-
-  for (const entry of entries) {
-    // Skip hidden files unless requested
-    if (!includeHidden && entry.name.startsWith('.')) continue;
-
-    // Skip common non-content directories
-    if (entry.name === 'node_modules') continue;
-    if (entry.name === '__pycache__') continue;
-    if (entry.name === '.git') continue;
-
-    const fullPath = path.join(root, entry.name);
-
-    if (entry.isDirectory()) {
-      const subFiles = await scanDirectory(fullPath, extensions, maxDepth, includeHidden, currentDepth + 1);
-      files.push(...subFiles);
-    } else {
-      const ext = path.extname(entry.name);
-      if (extensions.includes(ext)) {
-        files.push(fullPath);
-      }
-    }
-  }
-
-  return files;
-}