@shiori-sh/cli 0.3.0 → 0.5.0

package/README.md

@@ -46,8 +46,11 @@ shiori update <id> --read          # Mark as read
 shiori update <id> --unread        # Mark as unread
 shiori update <id> --title "..."   # Update title
 shiori update <id> --restore       # Restore from trash
+shiori update --ids <id1,id2,...> --read   # Bulk mark as read
+shiori update --ids <id1,id2,...> --unread # Bulk mark as unread
 
 shiori delete <id>                 # Move to trash
+shiori delete --ids <id1,id2,...>  # Bulk move to trash
 shiori trash                       # List trashed links
 shiori trash --empty               # Permanently delete all trash
 
@@ -58,7 +61,7 @@ shiori subscriptions remove <id>   # Remove a subscription
 shiori subscriptions sync <id>     # Sync a subscription now
 shiori subscriptions sync <id> --limit 5  # Sync with item limit
 
-shiori me                          # Show account info
+shiori whoami                      # Show account info
 shiori auth --status               # Check auth status
 shiori auth --logout               # Remove stored credentials
 ```

package/dist/index.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
 // src/commands/auth.ts
+import { execFile } from "child_process";
+import { hostname } from "os";
 import { createInterface } from "readline";
 
 // src/config.ts
@@ -87,16 +89,120 @@ function promptSecret(question) {
     stdin.on("data", onData);
   });
 }
+function openUrl(url) {
+  const platform = process.platform;
+  const cmd = platform === "darwin" ? "open" : platform === "win32" ? "start" : "xdg-open";
+  execFile(cmd, [url]);
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function browserAuth() {
+  const baseUrl = getBaseUrl();
+  process.stdout.write("Starting browser authentication... ");
+  const deviceName = hostname();
+  const startRes = await fetch(`${baseUrl}/api/auth/cli/start`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ device_name: deviceName })
+  });
+  if (!startRes.ok) {
+    console.error("failed.");
+    console.error("Could not start browser auth. Try `shiori auth --api-key` instead.");
+    process.exit(1);
+  }
+  const { code, auth_url } = await startRes.json();
+  console.log("done.\n");
+  console.log(`  Your code: ${code}
+`);
+  console.log(`  ${auth_url}
+`);
+  await prompt("Press Enter to open in browser (or open the URL above manually)...");
+  openUrl(auth_url);
+  console.log("\nWaiting for authorization...");
+  const POLL_INTERVAL = 2e3;
+  const MAX_POLLS = 150;
+  let polls = 0;
+  while (polls < MAX_POLLS) {
+    await sleep(POLL_INTERVAL);
+    polls++;
+    try {
+      const pollRes = await fetch(`${baseUrl}/api/auth/cli/poll?code=${code}`);
+      if (!pollRes.ok) {
+        console.error("\nAuthorization failed. The code may have expired.");
+        process.exit(1);
+      }
+      const data = await pollRes.json();
+      if (data.status === "approved" && data.api_key) {
+        const meRes = await fetch(`${baseUrl}/api/user/me`, {
+          headers: { Authorization: `Bearer ${data.api_key}` }
+        });
+        if (!meRes.ok) {
+          console.error("\nReceived API key but verification failed.");
+          process.exit(1);
+        }
+        const meData = await meRes.json();
+        writeConfig({ ...readConfig(), api_key: data.api_key });
+        console.log(`
+Authenticated as ${meData.user?.full_name || meData.user?.id}`);
+        console.log("API key saved to ~/.shiori/config.json");
+        return;
+      }
+      if (data.status === "expired") {
+        console.error("\nAuthorization code expired. Please try again.");
+        process.exit(1);
+      }
+      if (data.status === "consumed") {
+        console.error("\nAuthorization code already used. Please try again.");
+        process.exit(1);
+      }
+    } catch {
+    }
+  }
+  console.error("\nTimed out waiting for authorization. Please try again.");
+  process.exit(1);
+}
+async function apiKeyAuth() {
+  console.log("\nTo authenticate, you need an API key from Shiori.\n");
+  console.log("  1. Open https://www.shiori.sh/home -> Settings");
+  console.log("  2. Create and copy your API key");
+  console.log("  3. Paste it below\n");
+  const key = await promptSecret("API key: ");
+  const trimmed = key.trim();
+  if (!trimmed.startsWith("shk_")) {
+    console.error("\nInvalid API key format. Keys start with 'shk_'.");
+    process.exit(1);
+  }
+  process.stdout.write("\nVerifying... ");
+  const baseUrl = getBaseUrl();
+  const res = await fetch(`${baseUrl}/api/user/me`, {
+    headers: { Authorization: `Bearer ${trimmed}` }
+  });
+  if (!res.ok) {
+    console.error("failed.\nAuthentication failed. Check your API key and try again.");
+    process.exit(1);
+  }
+  const data = await res.json();
+  writeConfig({ ...readConfig(), api_key: trimmed });
+  console.log(`done.
+
+Authenticated as ${data.user?.full_name || data.user?.id}`);
+  console.log("API key saved to ~/.shiori/config.json");
+}
 async function run(args) {
   if (args.includes("--help") || args.includes("-h")) {
-    console.log(`shiori auth - Authenticate with your Shiori API key
+    console.log(`shiori auth - Authenticate with Shiori
 
 Usage: shiori auth [options]
 
 Options:
+  --api-key   Authenticate by pasting an API key manually
   --status    Show current authentication status
   --logout    Remove stored credentials
-  --help, -h  Show this help`);
+  --help, -h  Show this help
+
+By default, opens your browser for a quick sign-in.
+Use --api-key if you prefer to paste a key manually or are on a headless machine.`);
     return;
   }
   if (args.includes("--status")) {
@@ -122,31 +228,11 @@ Options:
     const answer = await prompt("You are already authenticated. Replace existing key? (y/N) ");
     if (answer.trim().toLowerCase() !== "y") return;
   }
-  console.log("\nTo authenticate, you need an API key from Shiori.\n");
-  console.log("  1. Open https://www.shiori.sh/home -> Settings");
-  console.log("  2. Create and copy your API key");
-  console.log("  3. Paste it below\n");
-  const key = await promptSecret("API key: ");
-  const trimmed = key.trim();
-  if (!trimmed.startsWith("shk_")) {
-    console.error("\nInvalid API key format. Keys start with 'shk_'.");
-    process.exit(1);
-  }
-  process.stdout.write("\nVerifying... ");
-  const baseUrl = getBaseUrl();
-  const res = await fetch(`${baseUrl}/api/user/me`, {
-    headers: { Authorization: `Bearer ${trimmed}` }
-  });
-  if (!res.ok) {
-    console.error("failed.\nAuthentication failed. Check your API key and try again.");
-    process.exit(1);
+  if (args.includes("--api-key")) {
+    await apiKeyAuth();
+  } else {
+    await browserAuth();
   }
-  const data = await res.json();
-  writeConfig({ ...readConfig(), api_key: trimmed });
-  console.log(`done.
-
-Authenticated as ${data.user?.full_name || data.user?.id}`);
-  console.log("API key saved to ~/.shiori/config.json");
 }
 
 // src/api.ts
@@ -204,7 +290,8 @@ function getPositional(args) {
         "--title",
         "--summary",
         "--since",
-        "--format"
+        "--format",
+        "--ids"
       ].includes(args[i])) {
         i++;
       }
@@ -275,18 +362,35 @@ Options:
 // src/commands/delete.ts
 async function run3(args) {
   if (hasFlag(args, "--help", "-h")) {
-    console.log(`shiori delete - Delete a link (move to trash)
+    console.log(`shiori delete - Delete links (move to trash)
 
 Usage: shiori delete <id> [options]
+       shiori delete --ids <id1,id2,...> [options]
 
 Options:
-  --json      Output raw JSON
-  --help, -h  Show this help`);
+  --ids <ids>   Comma-separated list of link IDs for bulk delete
+  --json        Output raw JSON
+  --help, -h    Show this help`);
+    return;
+  }
+  const idsFlag = getFlag(args, "--ids");
+  if (idsFlag) {
+    const ids = idsFlag.split(",").map((id2) => id2.trim()).filter(Boolean);
+    if (ids.length === 0) {
+      console.error("No valid IDs provided.");
+      process.exit(1);
+    }
+    const { data: data2 } = await api("PATCH", "/api/links", { ids, deleted: true });
+    if (hasFlag(args, "--json")) {
+      console.log(JSON.stringify(data2, null, 2));
+      return;
+    }
+    console.log(`Deleted ${data2.updated} link(s).`);
     return;
   }
   const id = getPositional(args);
   if (!id) {
-    console.error("Usage: shiori delete <id>");
+    console.error("Usage: shiori delete <id> or shiori delete --ids <id1,id2,...>");
     process.exit(1);
   }
   const { data } = await api("DELETE", `/api/links/${id}`);
@@ -389,36 +493,8 @@ Links: ${data.links.length} of ${data.total} total
   console.log();
 }
 
-// src/commands/me.ts
-async function run6(args) {
-  if (hasFlag(args, "--help", "-h")) {
-    console.log(`shiori me - Show current user info
-
-Usage: shiori me [options]
-
-Options:
-  --json      Output raw JSON
-  --help, -h  Show this help`);
-    return;
-  }
-  const { data } = await api("GET", "/api/user/me");
-  if (hasFlag(args, "--json")) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
-  const user = data.user;
-  console.log(`
-  Name:         ${user.full_name || "--"}`);
-  const plan = user.subscription?.plan === "subscription" ? "Pro" : user.subscription?.plan || "Free";
-  console.log(`  Plan:         ${plan}`);
-  console.log(
-    `  Member since: ${new Date(user.created_at).toLocaleDateString("en-US", { month: "long", year: "numeric" })}`
-  );
-  console.log();
-}
-
 // src/commands/save.ts
-async function run7(args) {
+async function run6(args) {
   if (hasFlag(args, "--help", "-h")) {
     console.log(`shiori save - Save a new link
 
@@ -453,7 +529,7 @@ Options:
 }
 
 // src/commands/search.ts
-async function run8(args) {
+async function run7(args) {
   if (hasFlag(args, "--help", "-h")) {
     console.log(`shiori search - Search saved links
 
@@ -520,7 +596,7 @@ Examples:
   shiori subscriptions add https://example.com --sync
   shiori subscriptions remove <id>
   shiori subscriptions sync <id> --limit 5`;
-async function run9(args) {
+async function run8(args) {
   if (hasFlag(args, "--help", "-h") && !args[0]) {
     console.log(HELP);
     return;
@@ -659,7 +735,7 @@ Options:
 }
 
 // src/commands/trash.ts
-async function run10(args) {
+async function run9(args) {
   if (hasFlag(args, "--help", "-h")) {
     console.log(`shiori trash - List or empty the trash
 
@@ -710,22 +786,44 @@ Trashed links: ${data.links.length} of ${data.total} total
 }
 
 // src/commands/update.ts
-async function run11(args) {
+async function run10(args) {
   if (hasFlag(args, "--help", "-h")) {
-    console.log(`shiori update - Update a link
+    console.log(`shiori update - Update links
 
 Usage: shiori update <id> [options]
+       shiori update --ids <id1,id2,...> --read|--unread [options]
 
 Options:
+  --ids <ids>        Comma-separated list of link IDs for bulk update
   --read             Mark as read
   --unread           Mark as unread
-  --title <title>    Update title
-  --summary <text>   Update summary
-  --restore          Restore from trash
+  --title <title>    Update title (single link only)
+  --summary <text>   Update summary (single link only)
+  --restore          Restore from trash (single link only)
   --json             Output raw JSON
   --help, -h         Show this help`);
     return;
   }
+  const idsFlag = getFlag(args, "--ids");
+  if (idsFlag) {
+    const ids = idsFlag.split(",").map((id2) => id2.trim()).filter(Boolean);
+    if (ids.length === 0) {
+      console.error("No valid IDs provided.");
+      process.exit(1);
+    }
+    if (!hasFlag(args, "--read") && !hasFlag(args, "--unread")) {
+      console.error("Bulk update requires --read or --unread.");
+      process.exit(1);
+    }
+    const read = hasFlag(args, "--read");
+    const { data: data2 } = await api("PATCH", "/api/links", { ids, read });
+    if (hasFlag(args, "--json")) {
+      console.log(JSON.stringify(data2, null, 2));
+      return;
+    }
+    console.log(`Updated ${data2.updated} link(s).`);
+    return;
+  }
   const id = getPositional(args);
   if (!id) {
     console.error("Usage: shiori update <id> [--read | --unread | --title <title> | --restore]");
@@ -759,6 +857,34 @@ Options:
   console.log(data.message || "Updated.");
 }
 
+// src/commands/whoami.ts
+async function run11(args) {
+  if (hasFlag(args, "--help", "-h")) {
+    console.log(`shiori whoami - Show current user info
+
+Usage: shiori whoami [options]
+
+Options:
+  --json      Output raw JSON
+  --help, -h  Show this help`);
+    return;
+  }
+  const { data } = await api("GET", "/api/user/me");
+  if (hasFlag(args, "--json")) {
+    console.log(JSON.stringify(data, null, 2));
+    return;
+  }
+  const user = data.user;
+  console.log(`
+  Name:         ${user.full_name || "--"}`);
+  const plan = user.subscription?.plan === "subscription" ? "Pro" : user.subscription?.plan || "Free";
+  console.log(`  Plan:         ${plan}`);
+  console.log(
+    `  Member since: ${new Date(user.created_at).toLocaleDateString("en-US", { month: "long", year: "numeric" })}`
+  );
+  console.log();
+}
+
 // src/error-report.ts
 function reportError(command, error) {
   const raw = error instanceof Error ? error.message : String(error);
@@ -768,7 +894,7 @@ function reportError(command, error) {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
-      version: "0.3.0",
+      version: "0.5.0",
       command,
       error: message,
       platform: process.platform
@@ -808,17 +934,17 @@ async function checkForUpdate(currentVersion, isJson) {
 
 // src/index.ts
 var COMMANDS = {
-  auth: { run, desc: "Authenticate with your Shiori API key" },
+  auth: { run, desc: "Authenticate with Shiori (browser or API key)" },
   list: { run: run5, desc: "List saved links" },
-  search: { run: run8, desc: "Search saved links" },
+  search: { run: run7, desc: "Search saved links" },
   get: { run: run4, desc: "Get a link by ID (includes content)" },
   content: { run: run2, desc: "Print link content as markdown" },
-  save: { run: run7, desc: "Save a new link" },
-  update: { run: run11, desc: "Update a link" },
+  save: { run: run6, desc: "Save a new link" },
+  update: { run: run10, desc: "Update a link" },
   delete: { run: run3, desc: "Delete a link (move to trash)" },
-  trash: { run: run10, desc: "List or empty the trash" },
-  subscriptions: { run: run9, desc: "Manage RSS subscriptions" },
-  me: { run: run6, desc: "Show current user info" }
+  trash: { run: run9, desc: "List or empty the trash" },
+  subscriptions: { run: run8, desc: "Manage RSS subscriptions" },
+  whoami: { run: run11, desc: "Show current user info" }
 };
 function printHelp() {
   console.log(`shiori - Manage your Shiori link library from the terminal
@@ -833,11 +959,12 @@ Options:
   --version, -v    Show version
 
 Get started:
-  shiori auth            Authenticate with your API key
+  shiori auth            Sign in via your browser
   shiori list            List your recent links
   shiori save <url>      Save a new link
   shiori search <query>  Search your links
-  shiori content <id>    Print markdown content (pipe to other tools)`);
+  shiori content <id>    Print markdown content (pipe to other tools)
+  shiori whoami          Show your account info`);
 }
 async function main() {
   const args = process.argv.slice(2);
@@ -847,7 +974,7 @@ async function main() {
     return;
   }
   if (command === "--version" || command === "-v") {
-    console.log("0.3.0");
+    console.log("0.5.0");
     return;
   }
   const cmd = COMMANDS[command];
@@ -860,7 +987,7 @@ async function main() {
   const cmdArgs = args.slice(1);
   const isJson = cmdArgs.includes("--json");
   await cmd.run(cmdArgs);
-  checkForUpdate("0.3.0", isJson).catch(() => {
+  checkForUpdate("0.5.0", isJson).catch(() => {
   });
 }
 main().catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shiori-sh/cli",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "CLI for managing your Shiori link library",
   "author": "Brian Lovin",
   "license": "MIT",