@seedvault/cli 0.2.1 → 0.4.0

package/dist/sv.js

@@ -1,6 +1,10 @@
 #!/usr/bin/env bun
 // @bun
 
+// src/index.ts
+import { readFileSync as readFileSync2 } from "fs";
+import { resolve as resolve6 } from "path";
+
 // src/commands/init.ts
 import * as readline from "readline/promises";
 import { stdout } from "process";
@@ -172,6 +176,10 @@ function createClient(serverUrl, token) {
     return res;
   }
   return {
+    async me() {
+      const res = await request("GET", "/v1/me");
+      return res.json();
+    },
     async signup(name, invite) {
       const body = { name };
       if (invite)
@@ -191,23 +199,23 @@ function createClient(serverUrl, token) {
       const res = await request("GET", "/v1/contributors");
       return res.json();
     },
-    async putFile(contributorId, path, content) {
-      const res = await request("PUT", `/v1/contributors/${contributorId}/files/${encodePath(path)}`, {
+    async putFile(username, path, content) {
+      const res = await request("PUT", `/v1/contributors/${username}/files/${encodePath(path)}`, {
         body: content,
         contentType: "text/markdown"
       });
       return res.json();
     },
-    async deleteFile(contributorId, path) {
-      await request("DELETE", `/v1/contributors/${contributorId}/files/${encodePath(path)}`);
+    async deleteFile(username, path) {
+      await request("DELETE", `/v1/contributors/${username}/files/${encodePath(path)}`);
     },
-    async listFiles(contributorId, prefix) {
+    async listFiles(username, prefix) {
       const qs = prefix ? `?prefix=${encodeURIComponent(prefix)}` : "";
-      const res = await request("GET", `/v1/contributors/${contributorId}/files${qs}`);
+      const res = await request("GET", `/v1/contributors/${username}/files${qs}`);
       return res.json();
     },
-    async getFile(contributorId, path) {
-      const res = await request("GET", `/v1/contributors/${contributorId}/files/${encodePath(path)}`);
+    async getFile(username, path) {
+      const res = await request("GET", `/v1/contributors/${username}/files/${encodePath(path)}`);
       return res.text();
     },
     async health() {
@@ -227,27 +235,24 @@ async function init(args) {
   }
   if (flags.server && flags.token) {
     const client = createClient(flags.server, flags.token);
+    let username;
     try {
-      await client.health();
+      const me = await client.me();
+      username = me.username;
     } catch {
-      console.error(`Could not reach server at ${flags.server}`);
-      process.exit(1);
-    }
-    const contributorId = flags["contributor-id"] || "";
-    if (!contributorId) {
-      console.error("When using --token, also pass --contributor-id");
+      console.error(`Could not authenticate with server at ${flags.server}`);
       process.exit(1);
     }
     const config = {
       server: flags.server,
       token: flags.token,
-      contributorId,
+      username,
       collections: []
     };
     saveConfig(config);
     console.log("Seedvault configured.");
     console.log(`  Server:  ${config.server}`);
-    console.log(`  Contributor ID: ${config.contributorId}`);
+    console.log(`  Username: ${config.username}`);
     return;
   }
   if (flags.server && flags.name) {
@@ -262,13 +267,13 @@ async function init(args) {
     const config = {
       server: flags.server,
       token: result.token,
-      contributorId: result.contributor.id,
+      username: result.contributor.username,
       collections: []
     };
     saveConfig(config);
     console.log("Signed up and configured.");
     console.log(`  Server:  ${config.server}`);
-    console.log(`  Contributor: ${result.contributor.name} (${result.contributor.id})`);
+    console.log(`  Username: ${result.contributor.username}`);
     console.log(`  Token:   ${result.token}`);
     return;
   }
@@ -299,26 +304,33 @@ async function init(args) {
     }
     const hasToken = await rl.question("Do you already have a token? (y/N): ");
     if (hasToken.toLowerCase() === "y") {
-      const token = await rl.question("Token: ");
-      const contributorId = await rl.question("Contributor ID: ");
-      const config = { server, token: token.trim(), contributorId: contributorId.trim(), collections: [] };
+      const token = (await rl.question("Token: ")).trim();
+      const authedClient = createClient(server, token);
+      let username;
+      try {
+        const me = await authedClient.me();
+        username = me.username;
+      } catch {
+        console.error("  Token is invalid or server rejected it.");
+        process.exit(1);
+      }
+      const config = { server, token, username, collections: [] };
       saveConfig(config);
       console.log(`
-Seedvault configured.`);
+Seedvault configured as '${username}'`);
     } else {
-      const name = await rl.question("Contributor name (e.g. your-name-notes): ");
+      const name = await rl.question("Username (e.g. your-name-notes): ");
       const invite = await rl.question("Invite code (leave blank if first user): ");
       const result = await client.signup(name.trim(), invite.trim() || undefined);
       const config = {
         server,
         token: result.token,
-        contributorId: result.contributor.id,
+        username: result.contributor.username,
         collections: []
       };
       saveConfig(config);
       console.log(`
-Signed up as '${result.contributor.name}'.`);
-      console.log(`  Contributor ID: ${result.contributor.id}`);
+Signed up as '${result.contributor.username}'.`);
       console.log(`  Token:   ${result.token}`);
       console.log(`
 Save your token \u2014 it won't be shown again.`);
@@ -330,6 +342,7 @@ Next steps:`);
   } finally {
     rl.close();
   }
+  process.exit(0);
 }
 function parseFlags(args) {
   const flags = {};
@@ -2095,9 +2108,9 @@ class RetryQueue {
       const op = this.items[0];
       try {
         if (op.type === "put" && op.content !== null) {
-          await this.client.putFile(op.contributorId, op.serverPath, op.content);
+          await this.client.putFile(op.username, op.serverPath, op.content);
         } else if (op.type === "delete") {
-          await this.client.deleteFile(op.contributorId, op.serverPath);
+          await this.client.deleteFile(op.username, op.serverPath);
         }
         this.items.shift();
         this.backoff = MIN_BACKOFF;
@@ -2123,15 +2136,17 @@ class RetryQueue {
 }
 
 // src/daemon/syncer.ts
+var SYNC_CONCURRENCY = 10;
+
 class Syncer {
   client;
-  contributorId;
+  username;
   collections;
   queue;
   log;
   constructor(opts) {
     this.client = opts.client;
-    this.contributorId = opts.contributorId;
+    this.username = opts.username;
     this.collections = opts.collections;
     this.log = opts.onLog;
     this.queue = new RetryQueue(opts.client, opts.onLog);
@@ -2157,13 +2172,14 @@ class Syncer {
     let deleted = 0;
     this.log(`Syncing '${collection.name}' (${collection.path})...`);
     try {
-      const { files: serverFiles } = await this.client.listFiles(this.contributorId, collection.name + "/");
+      const { files: serverFiles } = await this.client.listFiles(this.username, collection.name + "/");
       const serverMap = new Map;
       for (const f of serverFiles) {
         serverMap.set(f.path, f.modifiedAt);
       }
       const localFiles = await walkMd(collection.path);
       const localServerPaths = new Set;
+      const toUpload = [];
       for (const localFile of localFiles) {
         const relPath = toPosixPath(relative5(collection.path, localFile.path));
         const serverPath = `${collection.name}/${relPath}`;
@@ -2178,35 +2194,37 @@ class Syncer {
           }
         }
         const content = await readFile(localFile.path, "utf-8");
+        toUpload.push({ serverPath, content });
+      }
+      await pooled(toUpload, SYNC_CONCURRENCY, async (item) => {
         try {
-          await this.client.putFile(this.contributorId, serverPath, content);
+          await this.client.putFile(this.username, item.serverPath, item.content);
           uploaded++;
         } catch {
           this.queue.enqueue({
             type: "put",
-            contributorId: this.contributorId,
-            serverPath,
-            content,
+            username: this.username,
+            serverPath: item.serverPath,
+            content: item.content,
             queuedAt: new Date().toISOString()
           });
         }
-      }
-      for (const f of serverFiles) {
-        if (localServerPaths.has(f.path))
-          continue;
+      });
+      const toDelete = serverFiles.filter((f) => !localServerPaths.has(f.path));
+      await pooled(toDelete, SYNC_CONCURRENCY, async (f) => {
         try {
-          await this.client.deleteFile(this.contributorId, f.path);
+          await this.client.deleteFile(this.username, f.path);
           deleted++;
         } catch {
           this.queue.enqueue({
             type: "delete",
-            contributorId: this.contributorId,
+            username: this.username,
             serverPath: f.path,
             content: null,
             queuedAt: new Date().toISOString()
           });
         }
-      }
+      });
       this.log(`  '${collection.name}': ${uploaded} uploaded, ${skipped} up-to-date, ${deleted} deleted`);
     } catch (e) {
       this.log(`  '${collection.name}': sync failed (${e.message})`);
@@ -2218,22 +2236,22 @@ class Syncer {
     let queued = 0;
     this.log(`Removing '${collection.name}' files from server...`);
     try {
-      const { files: serverFiles } = await this.client.listFiles(this.contributorId, collection.name + "/");
-      for (const f of serverFiles) {
+      const { files: serverFiles } = await this.client.listFiles(this.username, collection.name + "/");
+      await pooled(serverFiles, SYNC_CONCURRENCY, async (f) => {
         try {
-          await this.client.deleteFile(this.contributorId, f.path);
+          await this.client.deleteFile(this.username, f.path);
           deleted++;
         } catch {
           this.queue.enqueue({
             type: "delete",
-            contributorId: this.contributorId,
+            username: this.username,
             serverPath: f.path,
             content: null,
             queuedAt: new Date().toISOString()
           });
           queued++;
         }
-      }
+      });
       this.log(`  '${collection.name}': ${deleted} deleted, ${queued} queued`);
     } catch (e) {
       this.log(`  '${collection.name}': remove failed (${e.message})`);
@@ -2246,7 +2264,7 @@ class Syncer {
       this.log(`PUT ${event.serverPath} (${content.length} bytes)`);
       this.queue.enqueue({
         type: "put",
-        contributorId: this.contributorId,
+        username: this.username,
         serverPath: event.serverPath,
         content,
         queuedAt: new Date().toISOString()
@@ -2255,7 +2273,7 @@ class Syncer {
       this.log(`DELETE ${event.serverPath}`);
       this.queue.enqueue({
         type: "delete",
-        contributorId: this.contributorId,
+        username: this.username,
         serverPath: event.serverPath,
         content: null,
         queuedAt: new Date().toISOString()
@@ -2277,6 +2295,16 @@ async function walkMd(dir) {
   await walkDirRecursive(dir, results);
   return results;
 }
+async function pooled(items, concurrency, fn) {
+  let i = 0;
+  async function worker() {
+    while (i < items.length) {
+      const idx = i++;
+      await fn(items[idx]);
+    }
+  }
+  await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => worker()));
+}
 async function walkDirRecursive(dir, results) {
   const entries = await readdir3(dir, { withFileTypes: true });
   for (const entry of entries) {
@@ -2643,7 +2671,7 @@ async function startForeground() {
   if (removedOverlappingCollections.length > 0) {
     config = normalizedConfig;
   }
-  const client = createClient(config.server, config.token);
+  let client = createClient(config.server, config.token);
   try {
     await client.health();
   } catch {
@@ -2669,7 +2697,7 @@ async function startForeground() {
   maybeLogOverlapWarning(removedOverlappingCollections);
   log("Seedvault daemon starting...");
   log(`  Server:  ${config.server}`);
-  log(`  Contributor: ${config.contributorId}`);
+  log(`  Contributor: ${config.username}`);
   if (config.collections.length === 0) {
     log("  Collections: none");
     log("  Waiting for collections to be added...");
@@ -2677,9 +2705,9 @@ async function startForeground() {
     log(`  Collections: ${config.collections.map((f) => f.name).join(", ")}`);
   }
   writeFileSync2(getPidPath(), String(process.pid));
-  const syncer = new Syncer({
+  let syncer = new Syncer({
     client,
-    contributorId: config.contributorId,
+    username: config.username,
     collections: config.collections,
     onLog: log
   });
@@ -2693,11 +2721,6 @@ async function startForeground() {
       log("Will continue watching for changes...");
     }
   }
-  const onWatcherEvent = (event) => {
-    syncer.handleEvent(event).catch((e) => {
-      log(`Error handling ${event.type} for ${event.serverPath}: ${e.message}`);
-    });
-  };
   let watcher = null;
   const rebuildWatcher = async (collections2) => {
     if (watcher) {
@@ -2708,13 +2731,17 @@ async function startForeground() {
       log("No collections configured. Daemon idle.");
       return;
     }
-    watcher = createWatcher(collections2, onWatcherEvent);
+    watcher = createWatcher(collections2, (event) => {
+      syncer.handleEvent(event).catch((e) => {
+        log(`Error handling ${event.type} for ${event.serverPath}: ${e.message}`);
+      });
+    });
     log(`Watching ${collections2.length} collection(s): ${collections2.map((f) => f.name).join(", ")}`);
   };
   await rebuildWatcher(config.collections);
-  let reloadingCollections = false;
+  let reloading = false;
   const pollTimer = setInterval(() => {
-    if (reloadingCollections)
+    if (reloading)
       return;
     let nextConfig;
     try {
@@ -2725,26 +2752,61 @@ async function startForeground() {
     }
     ({ config: normalizedConfig, removedOverlappingCollections } = normalizeConfigCollections(nextConfig));
     maybeLogOverlapWarning(removedOverlappingCollections);
-    reloadingCollections = true;
+    const coreChanged = normalizedConfig.server !== config.server || normalizedConfig.token !== config.token || normalizedConfig.username !== config.username;
+    if (!coreChanged) {
+      const { nextConfig: reconciledConfig, added, removed } = reconcileCollections(config, normalizedConfig);
+      if (added.length === 0 && removed.length === 0)
+        return;
+      reloading = true;
+      (async () => {
+        try {
+          log(`Collections changed: +${added.map((c) => c.name).join(", ") || "none"}, -${removed.map((c) => c.name).join(", ") || "none"}`);
+          config = reconciledConfig;
+          syncer.setCollections(reconciledConfig.collections);
+          await rebuildWatcher(reconciledConfig.collections);
+          for (const collection of removed) {
+            await syncer.purgeCollection(collection);
+          }
+          for (const collection of added) {
+            await syncer.syncCollection(collection);
+          }
+        } catch (e) {
+          log(`Failed to reload collections: ${e.message}`);
+        } finally {
+          reloading = false;
+        }
+      })();
+      return;
+    }
+    reloading = true;
     (async () => {
       try {
-        const { nextConfig: reconciledConfig, added, removed } = reconcileCollections(config, normalizedConfig);
-        if (added.length === 0 && removed.length === 0)
-          return;
-        log(`Collections changed: +${added.map((c) => c.name).join(", ") || "none"}, -${removed.map((c) => c.name).join(", ") || "none"}`);
-        config = reconciledConfig;
-        syncer.setCollections(reconciledConfig.collections);
-        await rebuildWatcher(reconciledConfig.collections);
-        for (const collection of removed) {
-          await syncer.purgeCollection(collection);
-        }
-        for (const collection of added) {
-          await syncer.syncCollection(collection);
+        log("Config changed, reinitializing...");
+        if (config.server !== normalizedConfig.server)
+          log(`  Server: ${config.server} -> ${normalizedConfig.server}`);
+        if (config.username !== normalizedConfig.username)
+          log(`  Username: ${config.username} -> ${normalizedConfig.username}`);
+        if (config.token !== normalizedConfig.token)
+          log(`  Token: updated`);
+        syncer.stop();
+        client = createClient(normalizedConfig.server, normalizedConfig.token);
+        config = normalizedConfig;
+        syncer = new Syncer({
+          client,
+          username: config.username,
+          collections: config.collections,
+          onLog: log
+        });
+        await rebuildWatcher(config.collections);
+        if (config.collections.length > 0) {
+          log("Running sync after reinitialize...");
+          const { uploaded, skipped, deleted } = await syncer.initialSync();
+          log(`Sync complete: ${uploaded} uploaded, ${skipped} skipped, ${deleted} deleted`);
         }
       } catch (e) {
-        log(`Failed to reload collections from config: ${e.message}`);
+        log(`Failed to reinitialize: ${e.message}`);
       } finally {
-        reloadingCollections = false;
+        reloading = false;
       }
     })();
   }, 1500);
@@ -2809,7 +2871,7 @@ async function status() {
   console.log(`Seedvault Status
 `);
   console.log(`  Server:  ${config.server}`);
-  console.log(`  Contributor: ${config.contributorId}`);
+  console.log(`  Contributor: ${config.username}`);
   try {
     const platform = detectPlatform();
     const serviceName = platform === "macos" ? "launchd" : platform === "linux" ? "systemd" : "Task Scheduler";
@@ -2847,7 +2909,7 @@ async function ls(args) {
   const config = loadConfig();
   const client = createClient(config.server, config.token);
   const prefix = args[0] || undefined;
-  const { files } = await client.listFiles(config.contributorId, prefix);
+  const { files } = await client.listFiles(config.username, prefix);
   if (files.length === 0) {
     console.log(prefix ? `No files matching '${prefix}'.` : "No files in your contributor.");
     return;
@@ -2879,7 +2941,7 @@ async function cat(args) {
   const config = loadConfig();
   const client = createClient(config.server, config.token);
   try {
-    const content = await client.getFile(config.contributorId, filePath);
+    const content = await client.getFile(config.username, filePath);
     process.stdout.write(content);
   } catch (e) {
     if (e instanceof ApiError && e.status === 404) {
@@ -2902,9 +2964,8 @@ async function contributors() {
   console.log(`Contributors:
 `);
   for (const contributor of contributors2) {
-    const you = contributor.id === config.contributorId ? " (you)" : "";
-    console.log(`  ${contributor.name}${you}`);
-    console.log(`    ID:      ${contributor.id}`);
+    const you = contributor.username === config.username ? " (you)" : "";
+    console.log(`  ${contributor.username}${you}`);
     console.log(`    Created: ${new Date(contributor.createdAt).toLocaleString()}`);
     console.log();
   }
@@ -2938,8 +2999,8 @@ Usage: sv <command> [options]
 
 Setup:
   init                          Interactive first-time setup
-  init --server URL --token T   Non-interactive (existing token)
-  init --server URL --name N    Non-interactive (signup)
+  init --server URL --token T --username U  Non-interactive (existing token)
+  init --server URL --name N               Non-interactive (signup)
 
 Collections:
   add <path> [--name N]         Add a collection path
@@ -2967,7 +3028,9 @@ async function main() {
     return;
   }
   if (cmd === "--version" || cmd === "-v") {
-    console.log("0.2.1");
+    const pkgPath = resolve6(import.meta.dirname, "..", "package.json");
+    const pkg = JSON.parse(readFileSync2(pkgPath, "utf-8"));
+    console.log(pkg.version);
     return;
   }
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seedvault/cli",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "type": "module",
   "bin": {
     "sv": "bin/sv.mjs"