@shiori-sh/cli 0.3.0 → 0.4.0

package/dist/index.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
 // src/commands/auth.ts
+import { exec } 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";
+  exec(`${cmd} ${JSON.stringify(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
@@ -768,7 +854,7 @@ function reportError(command, error) {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
-      version: "0.3.0",
+      version: "0.4.0",
       command,
       error: message,
       platform: process.platform
@@ -808,7 +894,7 @@ 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" },
   get: { run: run4, desc: "Get a link by ID (includes content)" },
@@ -833,7 +919,7 @@ 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
@@ -847,7 +933,7 @@ async function main() {
     return;
   }
   if (command === "--version" || command === "-v") {
-    console.log("0.3.0");
+    console.log("0.4.0");
     return;
   }
   const cmd = COMMANDS[command];
@@ -860,7 +946,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.4.0", isJson).catch(() => {
   });
 }
 main().catch((err) => {

package/package.json

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