@seedvault/server 0.1.3 → 0.1.4

package/dist/index.html

@@ -404,20 +404,31 @@
 		const savedContributor = localStorage.getItem("sv-contributor") || "";
 		const savedFile = localStorage.getItem("sv-file") || "";
 
-		function buildTree(paths) {
+		function buildTree(fileEntries) {
 			const root = {};
-			for (const p of paths) {
-				const parts = p.split("/");
+			for (const f of fileEntries) {
+				const parts = f.path.split("/");
 				let node = root;
 				for (const part of parts) {
 					if (!node[part]) node[part] = {};
 					node = node[part];
 				}
-				node.__file = p;
+				node.__file = f;
 			}
 			return root;
 		}
 
+		function getNewestCtime(node) {
+			if (node.__file) return node.__file.originCtime || node.__file.serverCreatedAt || "";
+			let newest = "";
+			for (const key of Object.keys(node)) {
+				if (key === "__file") continue;
+				const t = getNewestCtime(node[key]);
+				if (t > newest) newest = t;
+			}
+			return newest;
+		}
+
 		function countFiles(node) {
 			let count = 0;
 			for (const key of Object.keys(node)) {
@@ -432,6 +443,9 @@
 				const aDir = Object.keys(node[a]).some((k) => k !== "__file");
 				const bDir = Object.keys(node[b]).some((k) => k !== "__file");
 				if (aDir !== bDir) return aDir ? -1 : 1;
+				const aTime = getNewestCtime(node[a]);
+				const bTime = getNewestCtime(node[b]);
+				if (aTime !== bTime) return bTime.localeCompare(aTime);
 				return a.localeCompare(b);
 			});
 			for (const key of keys) {
@@ -444,9 +458,9 @@
 
 				if (isFile) {
 					row.innerHTML = '<span class="arrow">&nbsp;</span><i class="ph ph-file-text"></i> ' + key;
-					row.dataset.path = child.__file;
+					row.dataset.path = child.__file.path;
 					row.dataset.contributor = username;
-					row.onclick = () => loadContent(username, child.__file, row);
+					row.onclick = () => loadContent(username, child.__file.path, row);
 				} else {
 					const sub = document.createElement("ul");
 					const fileCount = countFiles(child);
@@ -522,7 +536,10 @@
 			if (!silent) status("Loading files...");
 			const { files } = await (await api("/v1/files?prefix=" + encodeURIComponent(username + "/"))).json();
 			const prefix = username + "/";
-			const tree = buildTree(files.map((f) => f.path.startsWith(prefix) ? f.path.slice(prefix.length) : f.path));
+			const tree = buildTree(files.map((f) => ({
+				...f,
+				path: f.path.startsWith(prefix) ? f.path.slice(prefix.length) : f.path,
+			})));
 			renderTree(tree, sub, username, 1);
 			markActiveRow();
 			if (!silent) status(files.length + " file(s)");

package/dist/server.js

@@ -40,6 +40,17 @@ function initDb(dbPath) {
       used_at TEXT,
       used_by TEXT REFERENCES contributors(username)
     );
+
+    CREATE TABLE IF NOT EXISTS files (
+      contributor TEXT NOT NULL,
+      path TEXT NOT NULL,
+      origin_ctime TEXT NOT NULL,
+      origin_mtime TEXT NOT NULL,
+      server_created_at TEXT NOT NULL,
+      server_modified_at TEXT NOT NULL,
+      PRIMARY KEY (contributor, path),
+      FOREIGN KEY (contributor) REFERENCES contributors(username)
+    );
   `);
   return db;
 }
@@ -98,6 +109,34 @@ function getInvite(id) {
 function markInviteUsed(id, usedBy) {
   getDb().prepare("UPDATE invites SET used_at = ?, used_by = ? WHERE id = ?").run(new Date().toISOString(), usedBy, id);
 }
+function upsertFileMetadata(contributor, path, originCtime, originMtime) {
+  const now = new Date().toISOString();
+  getDb().prepare(`INSERT INTO files (contributor, path, origin_ctime, origin_mtime, server_created_at, server_modified_at)
+       VALUES (?, ?, ?, ?, ?, ?)
+       ON CONFLICT (contributor, path) DO UPDATE SET
+         origin_mtime = excluded.origin_mtime,
+         server_modified_at = excluded.server_modified_at`).run(contributor, path, originCtime, originMtime, now, now);
+  return getFileMetadata(contributor, path);
+}
+function getFileMetadata(contributor, path) {
+  return getDb().prepare("SELECT * FROM files WHERE contributor = ? AND path = ?").get(contributor, path);
+}
+function listFileMetadata(contributor, prefix) {
+  const map = new Map;
+  let rows;
+  if (prefix) {
+    rows = getDb().prepare("SELECT * FROM files WHERE contributor = ? AND path LIKE ?").all(contributor, prefix + "%");
+  } else {
+    rows = getDb().prepare("SELECT * FROM files WHERE contributor = ?").all(contributor);
+  }
+  for (const row of rows) {
+    map.set(row.path, row);
+  }
+  return map;
+}
+function deleteFileMetadata(contributor, path) {
+  getDb().prepare("DELETE FROM files WHERE contributor = ? AND path = ?").run(contributor, path);
+}
 
 // ../node_modules/.bun/hono@4.11.9/node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
@@ -2128,8 +2167,12 @@ function createApp(storageRoot) {
       return c.json({ error: pathError }, 400);
     }
     const content = await c.req.text();
+    const now = new Date().toISOString();
+    const originCtime = c.req.header("X-Origin-Ctime") || now;
+    const originMtime = c.req.header("X-Origin-Mtime") || now;
     try {
       const result = await writeFileAtomic(storageRoot, parsed.username, parsed.filePath, content);
+      const meta = upsertFileMetadata(parsed.username, parsed.filePath, originCtime, originMtime);
       broadcast("file_updated", {
         contributor: parsed.username,
         path: result.path,
@@ -2137,7 +2180,13 @@ function createApp(storageRoot) {
         modifiedAt: result.modifiedAt
       });
       triggerUpdate();
-      return c.json(result);
+      return c.json({
+        ...result,
+        originCtime: meta.origin_ctime,
+        originMtime: meta.origin_mtime,
+        serverCreatedAt: meta.server_created_at,
+        serverModifiedAt: meta.server_modified_at
+      });
     } catch (e) {
       if (e instanceof FileTooLargeError) {
         return c.json({ error: e.message }, 413);
@@ -2160,6 +2209,7 @@ function createApp(storageRoot) {
     }
     try {
       await deleteFile(storageRoot, parsed.username, parsed.filePath);
+      deleteFileMetadata(parsed.username, parsed.filePath);
       broadcast("file_deleted", {
         contributor: parsed.username,
         path: parsed.filePath
@@ -2185,11 +2235,19 @@ function createApp(storageRoot) {
       return c.json({ error: "Contributor not found" }, 404);
     }
     const files = await listFiles(storageRoot, username, subPrefix);
+    const metaMap = listFileMetadata(username, subPrefix);
     return c.json({
-      files: files.map((f) => ({
-        ...f,
-        path: `${username}/${f.path}`
-      }))
+      files: files.map((f) => {
+        const meta = metaMap.get(f.path);
+        return {
+          ...f,
+          path: `${username}/${f.path}`,
+          originCtime: meta?.origin_ctime,
+          originMtime: meta?.origin_mtime,
+          serverCreatedAt: meta?.server_created_at,
+          serverModifiedAt: meta?.server_modified_at
+        };
+      })
     });
   });
   authed.get("/v1/events", (c) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seedvault/server",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "bin": {
     "seedvault-server": "bin/seedvault-server.mjs"