vault management

server/config.js

@@ -1,8 +1,48 @@
 const path = require("path");
+const fs = require("fs");
+
+// VAULT_ROOT: a directory that contains vault folders.
+// Each subdirectory is a vault. New vaults are created as new subdirs.
+// Falls back to parent of VAULT_PATH (single-vault compat) or ./vaults.
+const vaultRoot =
+  process.env.VAULT_ROOT ||
+  (process.env.VAULT_PATH
+    ? path.dirname(process.env.VAULT_PATH)
+    : path.join(__dirname, "..", "vaults"));
+
+function discoverVaults() {
+  const vaults = {};
+  try {
+    const entries = fs.readdirSync(vaultRoot, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        vaults[entry.name] = path.join(vaultRoot, entry.name);
+      }
+    }
+  } catch (e) {
+    console.error("[config] Failed to read VAULT_ROOT:", vaultRoot, e.message);
+  }
+  return vaults;
+}
+
+let vaults = discoverVaults();
 
 module.exports = {
   port: process.env.PORT || 8080,
-  vaultPath: process.env.VAULT_PATH || path.join(__dirname, "..", "test-vault"),
+  vaultRoot,
+  get vaults() {
+    return vaults;
+  },
+  get defaultVaultId() {
+    return Object.keys(vaults)[0] || null;
+  },
+  getVaultPath(id) {
+    return vaults[id] || null;
+  },
+  refreshVaults() {
+    vaults = discoverVaults();
+    return vaults;
+  },
   obsidianAssetsPath:
     process.env.OBSIDIAN_ASSETS_PATH ||
     path.join(__dirname, "..", "investigation", "obsidian.asar.unpacked"),

server/index.js

@@ -37,7 +37,19 @@ app.use("/api/fs", fsRoutes);
 app.use("/api/vault", vaultRoutes);
 
 // Serve vault files for resource URLs (images, attachments, etc.)
-app.use("/vault-files", express.static(config.vaultPath));
+// Vault ID is the first path segment: /vault-files/<vault-id>/path/to/file
+app.use("/vault-files", (req, res, next) => {
+  // Extract vault ID from the first path segment
+  const parts = req.path.split("/").filter(Boolean);
+  if (parts.length === 0)
+    return res.status(400).json({ error: "Missing vault ID" });
+  const vaultId = decodeURIComponent(parts[0]);
+  const vaultPath = config.getVaultPath(vaultId);
+  if (!vaultPath) return res.status(404).json({ error: "Vault not found" });
+  // Rewrite req.url to strip the vault ID prefix, then serve statically
+  req.url = "/" + parts.slice(1).join("/");
+  express.static(vaultPath)(req, res, next);
+});
 
 // --- Static serving ---
 // dist/ has shim-loader.js + patched index.html (dev mode).
@@ -52,7 +64,10 @@ const server = app.listen(config.port, () => {
   console.log(
     `[obsidian-bridge] Server running on http://localhost:${config.port}`,
   );
-  console.log(`[obsidian-bridge] Vault path: ${config.vaultPath}`);
+  console.log(`[obsidian-bridge] Vault root: ${config.vaultRoot}`);
+  console.log(
+    `[obsidian-bridge] Vaults: ${Object.keys(config.vaults).join(", ")}`,
+  );
 });
 
 setupWebSocket(server);

server/routes/fs.js

@@ -5,32 +5,44 @@ const config = require("../config");
 
 const router = express.Router();
 
-// Resolve a client-provided path to an absolute path within the vault.
+// Resolve the vault root for a request. Reads vault ID from query or body.
+function getVaultRoot(req, res) {
+  const vaultId = req.query.vault || req.body?.vault || config.defaultVaultId;
+  const vaultPath = config.getVaultPath(vaultId);
+  if (!vaultPath) {
+    res.status(404).json({ error: "Vault not found", id: vaultId });
+    return null;
+  }
+  return vaultPath;
+}
+
+// Resolve a client-provided path to an absolute path within a vault.
 // Strips leading slashes so paths from the client are always treated as
 // relative to the vault root. Rejects path traversal attempts.
-function resolveVaultPath(relativePath) {
-  // Strip leading slashes  -  client paths like "/.obsidian" should resolve
-  // relative to the vault, not as absolute filesystem paths.
+function resolveVaultPath(vaultRoot, relativePath) {
   const cleaned = (relativePath || "").replace(/^\/+/, "");
-  const resolved = path.resolve(config.vaultPath, cleaned);
-  if (!resolved.startsWith(path.resolve(config.vaultPath))) {
+  const resolved = path.resolve(vaultRoot, cleaned);
+  if (!resolved.startsWith(path.resolve(vaultRoot))) {
     return null;
   }
   return resolved;
 }
 
 function guardPath(req, res) {
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return null;
   const p = req.query.path ?? req.body?.path;
   if (p === undefined || p === null) {
     res.status(400).json({ error: "Missing path parameter" });
     return null;
   }
   // Empty string = vault root, which is valid
-  const resolved = resolveVaultPath(p);
+  const resolved = resolveVaultPath(vaultRoot, p);
   if (!resolved) {
     res.status(403).json({ error: "Path traversal rejected" });
     return null;
   }
+  req._vaultRoot = vaultRoot;
   return resolved;
 }
 
@@ -89,12 +101,10 @@ router.get("/readFile", async (req, res) => {
     // Check if path is a directory
     const stat = await fs.promises.stat(resolved);
     if (stat.isDirectory()) {
-      return res
-        .status(400)
-        .json({
-          error: "EISDIR: illegal operation on a directory",
-          code: "EISDIR",
-        });
+      return res.status(400).json({
+        error: "EISDIR: illegal operation on a directory",
+        code: "EISDIR",
+      });
     }
     const encoding = req.query.encoding;
     if (encoding === "utf8" || encoding === "utf-8") {
@@ -111,9 +121,11 @@ router.get("/readFile", async (req, res) => {
   }
 });
 
-// POST /api/fs/writeFile { path, content, encoding? }
+// POST /api/fs/writeFile { path, content, encoding?, vault? }
 router.post("/writeFile", async (req, res) => {
-  const resolved = resolveVaultPath(req.body?.path);
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
+  const resolved = resolveVaultPath(vaultRoot, req.body?.path);
   if (!resolved) return res.status(403).json({ error: "Invalid path" });
   try {
     // Ensure parent directory exists
@@ -137,9 +149,11 @@ router.post("/writeFile", async (req, res) => {
   }
 });
 
-// POST /api/fs/appendFile { path, content }
+// POST /api/fs/appendFile { path, content, vault? }
 router.post("/appendFile", async (req, res) => {
-  const resolved = resolveVaultPath(req.body?.path);
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
+  const resolved = resolveVaultPath(vaultRoot, req.body?.path);
   if (!resolved) return res.status(403).json({ error: "Invalid path" });
   try {
     await fs.promises.appendFile(resolved, req.body.content, "utf-8");
@@ -149,9 +163,11 @@ router.post("/appendFile", async (req, res) => {
   }
 });
 
-// POST /api/fs/mkdir { path, recursive? }
+// POST /api/fs/mkdir { path, recursive?, vault? }
 router.post("/mkdir", async (req, res) => {
-  const resolved = resolveVaultPath(req.body?.path);
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
+  const resolved = resolveVaultPath(vaultRoot, req.body?.path);
   if (!resolved) return res.status(403).json({ error: "Invalid path" });
   try {
     await fs.promises.mkdir(resolved, { recursive: !!req.body.recursive });
@@ -161,10 +177,12 @@ router.post("/mkdir", async (req, res) => {
   }
 });
 
-// POST /api/fs/rename { oldPath, newPath }
+// POST /api/fs/rename { oldPath, newPath, vault? }
 router.post("/rename", async (req, res) => {
-  const oldResolved = resolveVaultPath(req.body?.oldPath);
-  const newResolved = resolveVaultPath(req.body?.newPath);
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
+  const oldResolved = resolveVaultPath(vaultRoot, req.body?.oldPath);
+  const newResolved = resolveVaultPath(vaultRoot, req.body?.newPath);
   if (!oldResolved || !newResolved)
     return res.status(403).json({ error: "Invalid path" });
   try {
@@ -175,10 +193,12 @@ router.post("/rename", async (req, res) => {
   }
 });
 
-// POST /api/fs/copyFile { src, dest }
+// POST /api/fs/copyFile { src, dest, vault? }
 router.post("/copyFile", async (req, res) => {
-  const srcResolved = resolveVaultPath(req.body?.src);
-  const destResolved = resolveVaultPath(req.body?.dest);
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
+  const srcResolved = resolveVaultPath(vaultRoot, req.body?.src);
+  const destResolved = resolveVaultPath(vaultRoot, req.body?.dest);
   if (!srcResolved || !destResolved)
     return res.status(403).json({ error: "Invalid path" });
   try {
@@ -249,15 +269,17 @@ router.get("/realpath", async (req, res) => {
   try {
     const real = await fs.promises.realpath(resolved);
     // Return path relative to vault root
-    res.json({ path: path.relative(config.vaultPath, real) });
+    res.json({ path: path.relative(req._vaultRoot, real) });
   } catch (e) {
     res.status(500).json({ error: e.message, code: e.code });
   }
 });
 
-// POST /api/fs/utimes { path, atime, mtime }
+// POST /api/fs/utimes { path, atime, mtime, vault? }
 router.post("/utimes", async (req, res) => {
-  const resolved = resolveVaultPath(req.body?.path);
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
+  const resolved = resolveVaultPath(vaultRoot, req.body?.path);
   if (!resolved) return res.status(403).json({ error: "Invalid path" });
   try {
     await fs.promises.utimes(
@@ -271,11 +293,13 @@ router.post("/utimes", async (req, res) => {
   }
 });
 
-// GET /api/fs/tree?path=...  -  returns full recursive file tree with metadata
+// GET /api/fs/tree?path=...&vault=...  -  returns full recursive file tree with metadata
 router.get("/tree", async (req, res) => {
+  const vaultRoot = getVaultRoot(req, res);
+  if (!vaultRoot) return;
   const rootPath = req.query.path
-    ? resolveVaultPath(req.query.path)
-    : config.vaultPath;
+    ? resolveVaultPath(vaultRoot, req.query.path)
+    : vaultRoot;
   if (!rootPath) return res.status(403).json({ error: "Invalid path" });
   try {
     const tree = {};

server/routes/vault.js

@@ -1,16 +1,73 @@
-const express = require('express');
-const config = require('../config');
-const path = require('path');
+const express = require("express");
+const fs = require("fs");
+const config = require("../config");
+const path = require("path");
 
 const router = express.Router();
 
-// GET /api/vault/info
-router.get('/info', (req, res) => {
+// GET /api/vault/list  -  returns all discovered vaults (re-scans on each call)
+router.get("/list", (req, res) => {
+  config.refreshVaults();
+  const list = Object.entries(config.vaults).map(([id, vaultPath]) => ({
+    id,
+    name: id,
+    path: vaultPath,
+  }));
+  res.json(list);
+});
+
+// GET /api/vault/info?vault=<id>  -  returns info for a specific vault
+router.get("/info", (req, res) => {
+  const vaultId = req.query.vault || config.defaultVaultId;
+  const vaultPath = config.getVaultPath(vaultId);
+  if (!vaultPath) {
+    return res.status(404).json({ error: "Vault not found", id: vaultId });
+  }
   res.json({
-    name: path.basename(config.vaultPath),
+    id: vaultId,
+    name: vaultId,
+    path: vaultPath,
     platform: process.platform,
-    version: '0.1.0',
+    version: "0.1.0",
   });
 });
 
+// POST /api/vault/create { name }  -  create a new vault in VAULT_ROOT
+router.post("/create", async (req, res) => {
+  const name = req.body?.name;
+  if (!name || /[\/\\:*?"<>|]/.test(name)) {
+    return res.status(400).json({ error: "Invalid vault name" });
+  }
+  const vaultPath = path.join(config.vaultRoot, name);
+  try {
+    await fs.promises.mkdir(vaultPath, { recursive: false });
+    await fs.promises.mkdir(path.join(vaultPath, ".obsidian"), {
+      recursive: false,
+    });
+    config.refreshVaults();
+    res.json({ ok: true, id: name, path: vaultPath });
+  } catch (e) {
+    if (e.code === "EEXIST") {
+      return res.status(409).json({ error: "Vault already exists" });
+    }
+    res.status(500).json({ error: e.message, code: e.code });
+  }
+});
+
+// DELETE /api/vault/remove?vault=<id>  -  remove a vault from disk
+router.delete("/remove", async (req, res) => {
+  const vaultId = req.query.vault;
+  const vaultPath = config.getVaultPath(vaultId);
+  if (!vaultPath) {
+    return res.status(404).json({ error: "Vault not found" });
+  }
+  try {
+    await fs.promises.rm(vaultPath, { recursive: true });
+    config.refreshVaults();
+    res.json({ ok: true });
+  } catch (e) {
+    res.status(500).json({ error: e.message, code: e.code });
+  }
+});
+
 module.exports = router;