fluncle 0.65.0 → 0.66.0

package/bin/fluncle.mjs

@@ -423,7 +423,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.65.0".trim() ? "0.65.0".trim() : "0.1.0";
+  currentVersion = "0.66.0".trim() ? "0.66.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -657,7 +657,68 @@ var init_env = __esm(() => {
   envProfiles2 = ["local", "production"];
 });
 
+// src/user-token.ts
+import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname2, join as join3 } from "node:path";
+function activeProfile() {
+  const profile = process.env.FLUNCLE_ENV ?? defaultEnvProfile2;
+  return envProfiles3.includes(profile) ? profile : defaultEnvProfile2;
+}
+function userTokenPath() {
+  return join3(homedir3(), ".config", "fluncle", `user.${activeProfile()}.json`);
+}
+function isStoredUserToken(value) {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  const record = value;
+  return typeof record.token === "string" && typeof record.baseUrl === "string";
+}
+function readUserToken() {
+  try {
+    const parsed = JSON.parse(readFileSync(userTokenPath(), "utf8"));
+    return isStoredUserToken(parsed) ? parsed : undefined;
+  } catch {
+    return;
+  }
+}
+function writeUserToken(value) {
+  const path2 = userTokenPath();
+  mkdirSync(dirname2(path2), { recursive: true });
+  writeFileSync(path2, `${JSON.stringify(value, null, 2)}
+`, { mode: 384 });
+}
+function clearUserToken() {
+  const path2 = userTokenPath();
+  try {
+    readFileSync(path2);
+  } catch {
+    return false;
+  }
+  rmSync(path2, { force: true });
+  return true;
+}
+var envProfiles3, defaultEnvProfile2 = "production";
+var init_user_token = __esm(() => {
+  envProfiles3 = ["local", "production"];
+});
+
 // src/api.ts
+async function userApiGet(path2) {
+  return apiRequest(path2, {
+    headers: userHeaders()
+  });
+}
+function userHeaders() {
+  const stored = readUserToken();
+  if (!stored) {
+    throw new CliError2("not_logged_in", "You're not signed in. Run `fluncle login` to link this device to your account.");
+  }
+  return {
+    Authorization: `Bearer ${stored.token}`
+  };
+}
 async function publicApiGet(path2) {
   return apiRequest(path2);
 }
@@ -747,6 +808,7 @@ function parseJson(text) {
 var init_api = __esm(() => {
   init_env();
   init_output();
+  init_user_token();
 });
 
 // src/commands/recent.ts
@@ -1163,7 +1225,7 @@ __export(exports_mixtapes, {
   mixtapeDeleteCommand: () => mixtapeDeleteCommand,
   mixtapeCreateCommand: () => mixtapeCreateCommand
 });
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync as readFileSync2 } from "node:fs";
 async function mixtapesCommand() {
   const response = await publicApiGet("/api/mixtapes");
   return response.mixtapes;
@@ -1294,7 +1356,7 @@ function parseCueFile(filePath) {
   if (!existsSync(filePath)) {
     throw new CliError2("file_not_found", `Cue file not found: ${filePath}`);
   }
-  const text = readFileSync(filePath, "utf-8");
+  const text = readFileSync2(filePath, "utf-8");
   const trimmed = text.trim();
   if (trimmed.startsWith("[") || trimmed.startsWith("{")) {
     try {
@@ -1505,6 +1567,36 @@ var init_interactive = __esm(() => {
 // src/links.ts
 var spotifyPlaylistUrl2 = "https://open.spotify.com/playlist/1m5LADqpLjiBERdtqrIiL0", telegramUrl2 = "https://t.me/fluncle";
 
+// src/open-external.ts
+async function openExternal(target) {
+  const command = platformOpenCommand();
+  if (!command) {
+    console.log(target);
+    throw new CliError2("unsupported_platform", `Automatic opening is only supported on macOS and Linux. Open this manually: ${target}`);
+  }
+  const child = Bun.spawn([command, target], {
+    stderr: "pipe",
+    stdout: "pipe"
+  });
+  const exitCode = await child.exited;
+  if (exitCode !== 0) {
+    const stderr = await new Response(child.stderr).text();
+    throw new CliError2("open_failed", stderr.trim() || `Could not open ${target} with ${command}`);
+  }
+}
+function platformOpenCommand() {
+  if (process.platform === "darwin") {
+    return "open";
+  }
+  if (process.platform === "linux") {
+    return "xdg-open";
+  }
+  return;
+}
+var init_open_external = __esm(() => {
+  init_output();
+});
+
 // src/commands/recent.ts
 function mapTrack2(track) {
   if (track.type === "mixtape") {
@@ -1598,31 +1690,6 @@ function spotifyPlaylistUrlToAppUri(playlistUrl) {
   }
   return `spotify:playlist:${playlistId}`;
 }
-async function openExternal(target) {
-  const command = platformOpenCommand();
-  if (!command) {
-    console.log(target);
-    throw new CliError2("unsupported_platform", `Automatic opening is only supported on macOS and Linux. Open this manually: ${target}`);
-  }
-  const child = Bun.spawn([command, target], {
-    stderr: "pipe",
-    stdout: "pipe"
-  });
-  const exitCode = await child.exited;
-  if (exitCode !== 0) {
-    const stderr = await new Response(child.stderr).text();
-    throw new CliError2("open_failed", stderr.trim() || `Could not open ${target} with ${command}`);
-  }
-}
-function platformOpenCommand() {
-  if (process.platform === "darwin") {
-    return "open";
-  }
-  if (process.platform === "linux") {
-    return "xdg-open";
-  }
-  return;
-}
 async function selectRecentTrack(tracks) {
   return await selectWithKeyboard(tracks, {
     nonInteractiveMessage: SELECT_NON_INTERACTIVE_MESSAGE,
@@ -1649,6 +1716,7 @@ var TELEGRAM_APP_URI = "tg://resolve?domain=fluncle", SPOTIFY_PLAYLIST_OPEN_URL,
 var init_open = __esm(() => {
   init_format();
   init_interactive();
+  init_open_external();
   init_output();
   init_recent2();
   SPOTIFY_PLAYLIST_OPEN_URL = `${spotifyPlaylistUrl2}?si=054d3c6cbcf14a36`;
@@ -1756,6 +1824,162 @@ var init_submit = __esm(() => {
   init_output();
 });
 
+// src/commands/login.ts
+var exports_login = {};
+__export(exports_login, {
+  logoutCommand: () => logoutCommand,
+  loginCommand: () => loginCommand
+});
+async function loginCommand() {
+  const baseUrl = getApiBaseUrl();
+  const existing = readUserToken();
+  if (existing) {
+    const who2 = existing.user?.username ?? existing.user?.name ?? "your account";
+    console.log(`Already signed in as ${who2}. Run \`fluncle logout\` first to switch accounts.`);
+    return;
+  }
+  const device = await requestDeviceCode(baseUrl);
+  const verificationUrl = device.verification_uri_complete ?? device.verification_uri;
+  console.log(`Linking this device to your Fluncle account.
+`);
+  console.log(`  Code:  ${device.user_code}`);
+  console.log(`  Open:  ${verificationUrl}
+`);
+  console.log("Opening your browser to approve… (sign in if you aren't already)");
+  try {
+    await openExternal(verificationUrl);
+  } catch {
+    console.log("Couldn't open a browser automatically — visit the URL above to approve.");
+  }
+  const token = await pollForToken(baseUrl, device);
+  const user = await fetchSessionUser(baseUrl, token.access_token);
+  writeUserToken({
+    baseUrl,
+    token: token.access_token,
+    user
+  });
+  const who = user?.username ?? user?.name ?? "cosmonaut";
+  console.log(`
+Aboard, ${who}. This device is linked to your Galaxy.`);
+  console.log("Try `fluncle me` to see your progress.");
+}
+async function logoutCommand() {
+  const stored = readUserToken();
+  if (stored) {
+    await revokeSession(stored.baseUrl, stored.token).catch(() => {
+      return;
+    });
+  }
+  const cleared = clearUserToken();
+  console.log(cleared ? "Signed out. This device is no longer linked to your account." : "Not signed in — nothing to do.");
+}
+async function requestDeviceCode(baseUrl) {
+  const response = await fetch(`${baseUrl}/api/auth/device/code`, {
+    body: JSON.stringify({ client_id: CLI_CLIENT_ID, scope: DEVICE_SCOPE }),
+    headers: { "Content-Type": "application/json" },
+    method: "POST"
+  });
+  const data = await response.json().catch(() => {
+    return;
+  });
+  if (!response.ok || !data?.device_code || !data.user_code) {
+    throw new CliError2("device_code_failed", `Couldn't start the login flow (${response.status}). Try again in a moment.`);
+  }
+  return data;
+}
+async function pollForToken(baseUrl, device) {
+  let intervalMs = Math.max(device.interval, 1) * 1000;
+  const deadline = Date.now() + Math.max(device.expires_in, 1) * 1000;
+  await sleep(intervalMs);
+  while (Date.now() < deadline) {
+    const response = await fetch(`${baseUrl}/api/auth/device/token`, {
+      body: JSON.stringify({
+        client_id: CLI_CLIENT_ID,
+        device_code: device.device_code,
+        grant_type: "urn:ietf:params:oauth:grant-type:device_code"
+      }),
+      headers: { "Content-Type": "application/json" },
+      method: "POST"
+    });
+    const data = await response.json().catch(() => {
+      return;
+    });
+    if (response.ok && data && "access_token" in data && data.access_token) {
+      return data;
+    }
+    const pending = data && "error" in data ? data : undefined;
+    switch (pending?.error) {
+      case "authorization_pending":
+        break;
+      case "slow_down":
+        intervalMs += 5000;
+        break;
+      case "access_denied":
+        throw new CliError2("access_denied", "Sign-in was denied in the browser. Nothing linked.");
+      case "expired_token":
+        throw new CliError2("expired_token", "The login request timed out. Run `fluncle login` again.");
+      default:
+        throw new CliError2("device_token_failed", pending?.error_description ?? `Login failed (${response.status}).`);
+    }
+    await sleep(intervalMs);
+  }
+  throw new CliError2("expired_token", "The login request timed out. Run `fluncle login` again.");
+}
+async function fetchSessionUser(baseUrl, token) {
+  const response = await fetch(`${baseUrl}/api/me`, {
+    headers: { Authorization: `Bearer ${token}` }
+  });
+  if (!response.ok) {
+    return;
+  }
+  const data = await response.json().catch(() => {
+    return;
+  });
+  return data?.user ?? undefined;
+}
+async function revokeSession(baseUrl, token) {
+  await fetch(`${baseUrl}/api/auth/sign-out`, {
+    headers: { Authorization: `Bearer ${token}` },
+    method: "POST"
+  });
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+var CLI_CLIENT_ID = "fluncle-cli", DEVICE_SCOPE = "galaxy-sync";
+var init_login = __esm(() => {
+  init_env();
+  init_open_external();
+  init_output();
+  init_user_token();
+});
+
+// src/commands/me.ts
+var exports_me = {};
+__export(exports_me, {
+  meCommand: () => meCommand
+});
+async function meCommand() {
+  const [me, progress] = await Promise.all([
+    userApiGet("/api/me"),
+    userApiGet("/api/me/galaxy-progress")
+  ]);
+  if (!me.user) {
+    throw new Error("Your sign-in expired. Run `fluncle login` to link this device again.");
+  }
+  return {
+    collectedCount: progress.collectedLogIds.length,
+    deaths: progress.deaths,
+    joinedAt: me.user.createdAt,
+    name: me.user.displayUsername ?? me.user.username ?? "cosmonaut",
+    userId: me.user.id,
+    wins: progress.wins
+  };
+}
+var init_me = __esm(() => {
+  init_api();
+});
+
 // src/brand.ts
 var fluncleAsciiLogo2 = `███████╗██╗     ██╗   ██╗███╗   ██╗ ██████╗██╗     ███████╗
 ██╔════╝██║     ██║   ██║████╗  ██║██╔════╝██║     ██╔════╝
@@ -1914,7 +2138,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.65.0".trim() ? "0.65.0".trim() : "0.1.0";
+  currentVersion2 = "0.66.0".trim() ? "0.66.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3280,7 +3504,7 @@ __export(exports_newsletter, {
   newsletterListCommand: () => newsletterListCommand,
   newsletterDraftCommand: () => newsletterDraftCommand
 });
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
 function buildBody2(options, { requireContent }) {
   const body = {};
   if (options.contentFile !== undefined) {
@@ -3303,7 +3527,7 @@ function readContentFile(filePath) {
   if (!existsSync2(filePath)) {
     throw new CliError2("file_not_found", `Content file not found: ${filePath}`);
   }
-  const text = readFileSync2(filePath, "utf-8");
+  const text = readFileSync3(filePath, "utf-8");
   try {
     return JSON.parse(text);
   } catch (error) {
@@ -3937,7 +4161,7 @@ var COORD_FALLBACK2 = "—";
 var init_format2 = () => {};
 
 // src/cli.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
 import path2 from "path";
 
 // ../../node_modules/commander/lib/error.js
@@ -6057,6 +6281,7 @@ ${fluncleAsciiLogo}
 `).addHelpText("after", rootHelpSections);
   addListenCommands(program2);
   addShareCommands(program2);
+  addAccountCommands(program2);
   addMetaCommands(program2);
   addTrackCommands(program2);
   addAdminCommands(program2);
@@ -6120,6 +6345,20 @@ function addShareCommands(program2) {
     await submitCommand2(input.join(" ") || undefined);
   });
 }
+function addAccountCommands(program2) {
+  program2.command("login").description("Link this device to your Fluncle account (sync your Galaxy)").action(async () => {
+    const { loginCommand: loginCommand2 } = await Promise.resolve().then(() => (init_login(), exports_login));
+    await loginCommand2();
+  });
+  program2.command("logout").description("Unlink this device from your account").action(async () => {
+    const { logoutCommand: logoutCommand2 } = await Promise.resolve().then(() => (init_login(), exports_login));
+    await logoutCommand2();
+  });
+  program2.command("me").description("Your account and Galaxy progress (sign in with `fluncle login`)").option("--json", "Print JSON", false).action(async (options) => {
+    const { meCommand: meCommand2 } = await Promise.resolve().then(() => (init_me(), exports_me));
+    await runMe(options, meCommand2);
+  });
+}
 function addMetaCommands(program2) {
   program2.command("about").description("Fluncle, and where to find him").action(async () => {
     const { aboutCommand: aboutCommand2 } = await Promise.resolve().then(() => (init_about(), exports_about));
@@ -6389,7 +6628,7 @@ async function runTrackPreviewArchive(idOrLogId, options, previewArchiveUploadCo
   console.log(`  mime: ${result.mime}`);
 }
 async function runTrackObserve(idOrLogId, options, trackObserveCommand2) {
-  const script = options.scriptFile ? readFileSync3(options.scriptFile, "utf8") : options.script;
+  const script = options.scriptFile ? readFileSync4(options.scriptFile, "utf8") : options.script;
   if (!idOrLogId || !script || !script.trim()) {
     throw new Error("Usage: fluncle admin tracks observe <track_id|log_id> (--script <text> | --script-file <file>) [--voice-id <id>] [--duration-ms <ms>] [--context-note <text>] [--json]");
   }
@@ -6445,7 +6684,7 @@ async function runTrackContext(idOrLogId, options, trackContextCommand2) {
   }
 }
 async function runTrackNote(idOrLogId, options, trackNoteCommand2) {
-  const note = options.scriptFile ? readFileSync3(options.scriptFile, "utf8") : options.script;
+  const note = options.scriptFile ? readFileSync4(options.scriptFile, "utf8") : options.script;
   if (!idOrLogId || !note || !note.trim()) {
     throw new Error("Usage: fluncle admin tracks note <track_id|log_id> (--script <text> | --script-file <file>) [--json]");
   }
@@ -7200,6 +7439,20 @@ async function runStatus(options, statusCommand2) {
   console.log(statusLines2(snapshot).join(`
 `));
 }
+async function runMe(options, meCommand2) {
+  const me = await meCommand2();
+  if (options.json) {
+    printJson({ ok: true, ...me });
+    return;
+  }
+  console.log(me.name);
+  console.log([
+    `${me.collectedCount} ${me.collectedCount === 1 ? "finding" : "findings"} collected`,
+    `${me.wins} ${me.wins === 1 ? "win" : "wins"}`,
+    `${me.deaths} ${me.deaths === 1 ? "death" : "deaths"}`
+  ].join(" \xB7 "));
+  console.log(`Aboard since ${new Date(me.joinedAt).toLocaleDateString()}`);
+}
 function rejectUnexpectedPositionals(positionals) {
   if (positionals.length === 0) {
     return;

package/package.json

@@ -31,5 +31,5 @@
     "url": "git+https://github.com/mauricekleine/fluncle.git"
   },
   "type": "module",
-  "version": "0.65.0"
+  "version": "0.66.0"
 }