@seedvault/cli 0.2.0 → 0.3.0

package/dist/sv.js

@@ -1,9 +1,14 @@
 #!/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 { stdin, stdout } from "process";
+import { stdout } from "process";
+import * as fs from "fs";
 
 // src/config.ts
 import { join, resolve, relative, isAbsolute } from "path";
@@ -190,23 +195,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() {
@@ -232,21 +237,21 @@ async function init(args) {
       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");
+    const username = flags["username"] || "";
+    if (!username) {
+      console.error("When using --token, also pass --username");
       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) {
@@ -261,17 +266,24 @@ 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;
   }
-  const rl = readline.createInterface({ input: stdin, output: stdout });
+  let input;
+  try {
+    const fd = fs.openSync("/dev/tty", "r");
+    input = fs.createReadStream("", { fd });
+  } catch {
+    input = process.stdin;
+  }
+  const rl = readline.createInterface({ input, output: stdout });
   try {
     console.log(`Seedvault Setup
 `);
@@ -292,25 +304,24 @@ 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 username = await rl.question("Username: ");
+      const config = { server, token: token.trim(), username: username.trim(), collections: [] };
       saveConfig(config);
       console.log(`
 Seedvault configured.`);
     } 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.`);
@@ -2087,9 +2098,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;
@@ -2117,13 +2128,13 @@ class RetryQueue {
 // src/daemon/syncer.ts
 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);
@@ -2149,7 +2160,7 @@ 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);
@@ -2171,12 +2182,12 @@ class Syncer {
         }
         const content = await readFile(localFile.path, "utf-8");
         try {
-          await this.client.putFile(this.contributorId, serverPath, content);
+          await this.client.putFile(this.username, serverPath, content);
           uploaded++;
         } catch {
           this.queue.enqueue({
             type: "put",
-            contributorId: this.contributorId,
+            username: this.username,
             serverPath,
             content,
             queuedAt: new Date().toISOString()
@@ -2187,12 +2198,12 @@ class Syncer {
         if (localServerPaths.has(f.path))
           continue;
         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()
@@ -2210,15 +2221,15 @@ 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 + "/");
+      const { files: serverFiles } = await this.client.listFiles(this.username, collection.name + "/");
       for (const f of serverFiles) {
         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()
@@ -2238,7 +2249,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()
@@ -2247,7 +2258,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()
@@ -2661,7 +2672,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...");
@@ -2671,7 +2682,7 @@ async function startForeground() {
   writeFileSync2(getPidPath(), String(process.pid));
   const syncer = new Syncer({
     client,
-    contributorId: config.contributorId,
+    username: config.username,
     collections: config.collections,
     onLog: log
   });
@@ -2801,7 +2812,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";
@@ -2839,7 +2850,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;
@@ -2871,7 +2882,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) {
@@ -2894,9 +2905,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();
   }
@@ -2930,8 +2940,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
@@ -2959,7 +2969,9 @@ async function main() {
     return;
   }
   if (cmd === "--version" || cmd === "-v") {
-    console.log("0.2.0");
+    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.0",
+  "version": "0.3.0",
   "type": "module",
   "bin": {
     "sv": "bin/sv.mjs"