unreleased-cli 0.1.4 → 0.1.6

package/README.md

@@ -54,7 +54,7 @@ Commands (type `help <command>` in the shell for the details of each one):
 - **Library:** `find`, `song`, `like`, `unlike`, `liked`, `playlists`, `playlist`, `stats`
 - **Player:** `play`, `pause`, `toggle`, `next`, `prev`, `seek`, `volume`, `speed`, `eq`, `shuffle`, `repeat`, `queue`, `status`, `sleep`, `stop`
 - **People:** `user`, `lookup`
-- **Admin** (administrators only): `pending`, `proposals`, `comps`, `applications`, `inspect`, `approve`, `reject`, `reverse`, `users`, `sitebans`, `siteunban`
+- **Admin** (administrators only): `pending`, `proposals`, `comps`, `applications`, `cdn`, `inspect`, `approve`, `reject`, `reverse`, `users`, `sitebans`, `siteunban`
 - **Fun:** `neofetch`, `fortune`, `juicesay`, `matrix`, `visualizer`, `karaoke`, `wordle`, `heardle`
 - **Settings:** `set`, `settings`, `termtheme`
 - **Shell:** `source`, `alias`, `unalias`, `history`, `echo`, `watch`, `full`, `date`, `clear`, `exit`, `help`
@@ -97,7 +97,7 @@ Music plays through a hidden mpv that the interactive shell starts the first tim
 - `playlist play <name>`, `playlist shuffle <name>`, `liked play` and `shuffle <era> [count]` replace the queue.
 - `queue add` and `queue next` add to it. `queue` lists it, and `remove N` / `jump N` change it.
 - Shuffle, repeat, previous and the end of the queue behave as they do on the site.
-- `status` (or `now`) shows the song, a progress bar, the settings and the queue.
+- `status` (or `now`) shows the song, a progress bar, the settings and the queue, and follows along live on a terminal (`q` leaves). `status -1` prints it once, and it does too when piped or run in a script.
 - `like` and `unlike` with no song act on the one playing.
 
 The music stops when you leave the shell, so `unreleased play …` on its own says to open the shell instead. If the shell is killed without a chance to stop mpv (for example the terminal window is closed), mpv quits by itself within about 10 seconds.
@@ -119,6 +119,7 @@ These cover the Admin page's review queues and site moderation, using the same e
 - `reverse [song|comp] <id>` undoes an approved proposal.
 - `users [role] [filter]` lists accounts. `user <name>` shows one person.
 - `sitebans` lists active site-wide bans, mutes and timeouts. `siteunban <user | #id>` lifts them.
+- `cdn` shows the CDN stats and every node, pending ones first. `cdn <node>` shows one in full, where a node is its id, the start of the id, or its name. `cdn approve|revoke|enable|disable|reset|restore|delete <node>` does what the Admin page's CDN nodes tab does. `restore` is for a node the server pulled for hash violations: it switches it back on and resets its trust and violations. `delete` asks first unless you pass `-y`.
 
 `reverse` and `siteunban` ask before they act. Outside the interactive shell, such as in one-shot use or a script, they need `-y` instead.
 

package/dist/unreleased.mjs

@@ -82,7 +82,7 @@ function saveSettings(settings) {
 
 // src/api.ts
 var DEFAULT_API = "https://juicewrldapi.com/juicewrld";
-var VERSION = "0.1.4";
+var VERSION = "0.1.6";
 function apiBase() {
   return (process.env.UNRELEASED_API || loadConfig().api || DEFAULT_API).replace(/\/+$/, "");
 }
@@ -253,12 +253,12 @@ var color = {
   errRed: paint("red", process.stderr),
   errDim: paint("dim", process.stderr)
 };
-function writeTone(text, tone) {
-  if (tone === "error") {
+function writeTone(text, tone2) {
+  if (tone2 === "error") {
     process.stderr.write(color.errRed(text) + "\n");
     return;
   }
-  const painted = tone === "ok" ? color.green(text) : tone === "dim" ? color.dim(text) : text;
+  const painted = tone2 === "ok" ? color.green(text) : tone2 === "dim" ? color.dim(text) : text;
   process.stdout.write(painted + "\n");
 }
 function progressLine() {
@@ -1671,7 +1671,7 @@ var ADMIN_COMMANDS = [
         listSiteModeration()
       ]);
       for (const r of [song, comp, apps, mods]) if (r.status === "rejected" && r.reason?.name === "AbortError") throw r.reason;
-      const n = (r, pick) => r.status === "fulfilled" ? String(pick(r.value)) : "?";
+      const n = (r, pick2) => r.status === "fulfilled" ? String(pick2(r.value)) : "?";
       sh.print([
         `song proposals    ${n(song, (v) => v.pending)} pending`,
         `comp proposals    ${n(comp, (v) => v.pending)} pending`,
@@ -2476,8 +2476,8 @@ async function randomLyricLine() {
   const pool = await loadPools(["released", "unreleased"]);
   if (pool.length === 0) fail("fortune: no songs to pick from");
   for (let attempt = 0; attempt < 10; attempt++) {
-    const pick = pool[Math.floor(Math.random() * pool.length)];
-    const song = await getSong(pick.id);
+    const pick2 = pool[Math.floor(Math.random() * pool.length)];
+    const song = await getSong(pick2.id);
     const lines = (song.lyrics ?? "").split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length >= 8 && l.length <= 120 && !/^[[(].*[\])]$/.test(l));
     if (lines.length) return `${lines[Math.floor(Math.random() * lines.length)]}
 - ${song.name}`;
@@ -2528,13 +2528,13 @@ function matrixScreen() {
   let heads = [];
   let age = new Uint16Array(0);
   let glyph = [];
-  const pick = () => RAIN[Math.floor(Math.random() * RAIN.length)];
+  const pick2 = () => RAIN[Math.floor(Math.random() * RAIN.length)];
   const fit = (s) => {
     cols = s.cols;
     rows = s.rows;
     heads = Array.from({ length: cols }, () => -Math.floor(Math.random() * rows));
     age = new Uint16Array(cols * rows).fill(999);
-    glyph = Array.from({ length: cols * rows }, pick);
+    glyph = Array.from({ length: cols * rows }, pick2);
   };
   const frame = (s) => {
     if (s.cols !== cols || s.rows !== rows) fit(s);
@@ -2545,12 +2545,12 @@ function matrixScreen() {
       const r = heads[c];
       if (r >= 0 && r < rows) {
         age[r * cols + c] = 0;
-        glyph[r * cols + c] = pick();
+        glyph[r * cols + c] = pick2();
       }
     }
     for (let k = 0; k < cols / 4; k++) {
       const i = Math.floor(Math.random() * glyph.length);
-      if (age[i] < TRAIL) glyph[i] = pick();
+      if (age[i] < TRAIL) glyph[i] = pick2();
     }
     const [dark, mid, bright, hot] = accentRamp().map((p) => `\x1B[0;${p}m`);
     const lines = [];
@@ -2772,9 +2772,9 @@ function letterHints(rows) {
   for (const row of rows) {
     for (let i = 0; i < row.key.length; i++) {
       const letter = row.key[i];
-      const state = row.states[i];
+      const state2 = row.states[i];
       const known = out.get(letter);
-      if (!known || RANK[state] > RANK[known]) out.set(letter, state);
+      if (!known || RANK[state2] > RANK[known]) out.set(letter, state2);
     }
   }
   return out;
@@ -2839,14 +2839,14 @@ function loadRound(dayKey, answerId) {
   if (!saved || saved.day !== dayKey || saved.answerId !== answerId) return null;
   return saved;
 }
-function saveRound(state) {
-  lsSet2("round", state);
+function saveRound(state2) {
+  lsSet2("round", state2);
 }
 function loadPracticeRound2() {
   return lsGet2("round:unlimited");
 }
-function savePracticeRound2(state) {
-  lsSet2("round:unlimited", state);
+function savePracticeRound2(state2) {
+  lsSet2("round:unlimited", state2);
 }
 function loadStats() {
   const saved = lsGet2("stats");
@@ -3170,7 +3170,7 @@ function heardleScreen(sh, pausedMusic) {
   let status = "playing";
   let startAt = 0;
   let input = "";
-  let pick = 0;
+  let pick2 = 0;
   let failure = "";
   const render = () => {
     if (screen && !screen.closed) draw(screen);
@@ -3193,7 +3193,7 @@ function heardleScreen(sh, pausedMusic) {
     guesses = [];
     status = "playing";
     input = "";
-    pick = 0;
+    pick2 = 0;
     startAt = clipStart(next, ladder[ladder.length - 1], settings.startPoint, null);
     save();
   };
@@ -3201,7 +3201,7 @@ function heardleScreen(sh, pausedMusic) {
     guesses = [...guesses, guess];
     status = correct ? "won" : guesses.length >= ladder.length ? "lost" : "playing";
     input = "";
-    pick = 0;
+    pick2 = 0;
     if (status !== "playing") clip2.stop();
     save();
   };
@@ -3212,7 +3212,7 @@ function heardleScreen(sh, pausedMusic) {
       return;
     }
     const list = suggestions();
-    const song = list[Math.min(pick, list.length - 1)];
+    const song = list[Math.min(pick2, list.length - 1)];
     if (!song) return;
     const correct = isCorrectGuess(song, answer, versions);
     record({
@@ -3254,7 +3254,7 @@ function heardleScreen(sh, pausedMusic) {
       suggestions().forEach((song, i) => {
         const alias = normalizeTitle(song.name).includes(normalizeTitle(input)) ? "" : "  \xB7 alias";
         const text = `${song.name}${song.era ? `  (${song.era})` : ""}${alias}`;
-        lines.push(i === pick ? color.cyan(`\u203A ${text}`) : color.dim(`  ${text}`));
+        lines.push(i === pick2 ? color.cyan(`\u203A ${text}`) : color.dim(`  ${text}`));
       });
     }
     s.draw(lines);
@@ -3296,23 +3296,23 @@ function heardleScreen(sh, pausedMusic) {
         } else if (answer) void clip2.play(streamUrl(answer.path), startAt, unlocked());
         return;
       }
-      if (key.name === "down") pick = Math.min(Math.max(0, suggestions().length - 1), pick + 1);
-      else if (key.name === "up") pick = Math.max(0, pick - 1);
+      if (key.name === "down") pick2 = Math.min(Math.max(0, suggestions().length - 1), pick2 + 1);
+      else if (key.name === "up") pick2 = Math.max(0, pick2 - 1);
       else if (key.name === "return") {
         if (finished()) {
           if (pool) deal(pool);
         } else submit();
       } else if (key.name === "backspace") {
         input = input.slice(0, -1);
-        pick = 0;
+        pick2 = 0;
       } else if (key.ctrl && key.name === "u") {
         input = "";
-        pick = 0;
+        pick2 = 0;
       } else {
         const ch = typed(str, key);
         if (ch && !finished() && input.length < 80) {
           input += ch;
-          pick = 0;
+          pick2 = 0;
         }
       }
       render();
@@ -3813,10 +3813,14 @@ var PLAYER_COMMANDS = [
     name: "status",
     aliases: ["now", "np"],
     group: "Player",
-    usage: "status",
-    description: "What is playing, plus volume, speed, shuffle, repeat and the queue",
-    run: async (_a, sh) => {
+    usage: "status [-1]",
+    description: "What is playing, plus volume, speed, shuffle, repeat and the queue. Live on a terminal (q leaves); -1 prints it once",
+    run: async (args, sh) => {
       const p = playerOf(sh);
+      if (!sh.scripted && canOpenScreen() && args.trim() !== "-1") {
+        await sh.execLine("watch -n 1 status -1");
+        return;
+      }
       const t = p.current;
       const [paused, pos, dur] = await Promise.all([p.paused(), p.position(), p.duration()]);
       sh.print([
@@ -4560,6 +4564,131 @@ var UPDATE_COMMANDS = [
   }
 ];
 
+// src/cdn.ts
+var DEFAULT_TRUST = 100;
+var VIOLATION_LIMIT = 5;
+var ACTIONS = ["approve", "revoke", "enable", "disable", "reset", "restore", "delete"];
+var BASE2 = "/cdn/admin";
+var listNodes = async () => (await apiFetch(`${BASE2}/nodes/`))?.nodes ?? [];
+var nodePath = (n) => `${BASE2}/nodes/${encodeURIComponent(n.node_id)}/`;
+var patch = (n, body) => apiFetch(nodePath(n), {}, { method: "PATCH", body });
+var autoDisabled = (n) => n.trust_score <= 0 || n.hash_violations >= VIOLATION_LIMIT;
+var mbps = (v) => v ? `${Math.round(v * 10) / 10} Mbps` : "\u2014";
+function state(n) {
+  if (!n.is_approved) return autoDisabled(n) ? "auto-disabled" : "pending";
+  if (!n.is_active) return "disabled";
+  return n.online ? "online" : "offline";
+}
+var tone = (s) => s === "online" ? color.green(s) : s === "offline" ? color.dim(s) : color.red(s);
+function pick(nodes, arg) {
+  const q = arg.trim().replace(/^#/, "").toLowerCase();
+  if (!q) fail("say which node (see: cdn)");
+  const exact = nodes.filter((n) => n.node_id.toLowerCase() === q || n.name.toLowerCase() === q);
+  const hits = exact.length ? exact : nodes.filter((n) => n.node_id.toLowerCase().startsWith(q) || n.name.toLowerCase().includes(q));
+  if (hits.length === 0) fail(`no node matches "${arg.trim()}" (see: cdn)`);
+  if (hits.length > 1) fail(`"${arg.trim()}" matches ${hits.length} nodes: ${hits.slice(0, 5).map((n) => n.name || n.node_id.slice(0, 8)).join(", ")}`);
+  return hits[0];
+}
+function describeNode(n, latest) {
+  const pct = n.max_storage_bytes > 0 ? ` of ${formatBytes(n.max_storage_bytes)} (${Math.min(100, Math.round(n.current_storage_bytes / n.max_storage_bytes * 100))}%)` : "";
+  const newest = n.manifest_version ?? latest;
+  const synced = n.synced_manifest_version === void 0 ? "" : `
+synced manifest  ${n.synced_manifest_version == null ? "never" : `v${n.synced_manifest_version}`}${newest != null ? ` (latest v${newest})` : ""}`;
+  const notes = [];
+  if (!n.is_approved && autoDisabled(n)) notes.push("pulled for hash violations - restore it to reset trust and violations too");
+  else if (!n.is_approved) notes.push("waiting for approval - it serves nothing until approved");
+  else if (!n.is_active) notes.push("switched off by an admin");
+  return [
+    `${color.bold(n.name || n.node_id)}  ${tone(state(n))}`,
+    `node id          ${n.node_id}`,
+    `owner            ${n.owner_username || "unclaimed"}`,
+    `region           ${n.region || "\u2014"} \xB7 ${n.is_public ? "public" : "private"}`,
+    `address          ${n.ip_address ? n.port ? `${n.ip_address}:${n.port}` : n.ip_address : "\u2014"}${n.public_base_url ? `  ${n.public_base_url}` : ""}`,
+    `storage          ${formatBytes(n.current_storage_bytes)}${pct} \xB7 ${n.file_count.toLocaleString()} files`,
+    `speed            up ${mbps(n.upload_speed_mbps)} \xB7 down ${mbps(n.download_speed_mbps)} \xB7 to listeners ${mbps(n.observed_download_speed_mbps)}`,
+    `served           ${formatBytes(n.total_bytes_served)} in ${n.total_requests.toLocaleString()} requests`,
+    `trust            ${Math.round(n.trust_score)} \xB7 ${plural(n.hash_violations, "violation")}`,
+    `heartbeat        ${relativeTime(n.last_heartbeat)} \xB7 registered ${new Date(n.created_at).toLocaleDateString()}${synced}`,
+    ...notes.map((t) => color.yellow(`! ${t}`))
+  ].join("\n");
+}
+async function act(action, n, sh, yes) {
+  const name = n.name || n.node_id;
+  switch (action) {
+    case "approve":
+      if (n.is_approved) fail(`${name} is already approved`);
+      if (autoDisabled(n)) fail(`${name} was pulled for hash violations - use: cdn restore ${name}`);
+      await patch(n, { is_approved: true });
+      break;
+    case "revoke":
+      if (!n.is_approved) fail(`${name} isn't approved`);
+      await patch(n, { is_approved: false });
+      break;
+    case "enable":
+      if (n.is_active) fail(`${name} is already enabled`);
+      if (autoDisabled(n)) fail(`${name} was pulled for hash violations - use: cdn restore ${name}`);
+      await patch(n, { is_active: true });
+      break;
+    case "disable":
+      if (!n.is_active) fail(`${name} is already disabled`);
+      await patch(n, { is_active: false });
+      break;
+    case "reset":
+      if (n.hash_violations === 0 && n.trust_score >= DEFAULT_TRUST) fail(`${name} has nothing to reset`);
+      await patch(n, { trust_score: DEFAULT_TRUST, hash_violations: 0 });
+      break;
+    case "restore":
+      await patch(n, { is_approved: true, is_active: true, trust_score: DEFAULT_TRUST, hash_violations: 0 });
+      break;
+    case "delete":
+      if (!await confirm(sh, `Permanently delete ${name}? Its file list, history and API key go with it.`, yes, "cdn")) return;
+      await apiFetch(nodePath(n), {}, { method: "DELETE" });
+      sh.print(`deleted ${name}`, "ok");
+      return;
+  }
+  sh.print(`${action} ${name}: done`, "ok");
+}
+var CDN_COMMANDS = [
+  {
+    name: "cdn",
+    group: "Admin",
+    usage: "cdn [<node>]  \xB7  cdn approve|revoke|enable|disable|reset|restore|delete [-y] <node>",
+    description: "The CDN node roster and stats; one node in full; or approve, revoke, enable, disable, reset trust, restore or delete a node (a node is its id, the start of it, or its name)",
+    complete: kindComplete(ACTIONS),
+    run: admin(async (args, sh) => {
+      const words = args.trim().split(/\s+/).filter(Boolean);
+      const first = words[0]?.toLowerCase();
+      if (first && ACTIONS.includes(first)) {
+        words.shift();
+        const yes = words[0] === "-y" ? (words.shift(), true) : false;
+        const nodes2 = await listNodes();
+        await act(first, pick(nodes2, words.join(" ")), sh, yes);
+        return;
+      }
+      const [stats, nodes] = await Promise.all([apiFetch(`${BASE2}/stats/`), listNodes()]);
+      if (words.length) {
+        sh.print(describeNode(pick(nodes, words.join(" ")), stats.manifest_version));
+        return;
+      }
+      const lines = [
+        `${plural(stats.total_nodes, "node")} \xB7 ${stats.online_nodes} online \xB7 ${stats.pending_nodes} awaiting approval \xB7 ${formatBytes(stats.total_bytes_served)} served in ${stats.total_requests.toLocaleString()} requests`,
+        `master copy: ${stats.master_files.toLocaleString()} files, ${formatBytes(stats.master_bytes)} \xB7 manifest v${stats.manifest_version}`
+      ];
+      if (nodes.length === 0) {
+        sh.print([...lines, "", color.dim("no nodes registered")].join("\n"));
+        return;
+      }
+      const order = ["pending", "auto-disabled", "online", "offline", "disabled"];
+      const sorted = [...nodes].sort((a, b) => order.indexOf(state(a)) - order.indexOf(state(b)) || (a.name || a.node_id).localeCompare(b.name || b.node_id));
+      const rows = sorted.map((n) => {
+        const s = state(n);
+        return `${(n.name || n.node_id.slice(0, 8)).slice(0, 24).padEnd(26)}${tone(s)}${" ".repeat(Math.max(1, 15 - s.length))}${(n.owner_username || "unclaimed").slice(0, 16).padEnd(18)}${formatBytes(n.current_storage_bytes).padEnd(11)}${formatBytes(n.total_bytes_served).padEnd(11)}trust ${String(Math.round(n.trust_score)).padEnd(5)}${relativeTime(n.last_heartbeat)}`;
+      });
+      sh.print([...lines, "", ...rows].join("\n"));
+    })
+  }
+];
+
 // src/eq.ts
 var WORDS = ["on", "off", "list", "reset", "reverb", "boost", "balance", "speed", "mono", "pitch", ...EQ_PRESETS.map((p) => p.id)];
 function describe(speed, pitch) {
@@ -4967,12 +5096,12 @@ function visualizerScreen(sh, binary) {
     const time = track ? `${clock(now)}${track.duration ? ` / ${clock(track.duration)}` : ""}` : "";
     lines.push(`${color.bold(title)}  ${color.dim(time)}${status ? `  ${color.dim(status)}` : ""}`, "");
     for (let row = height - 1; row >= 0; row--) {
-      const tone = row >= height * 0.85 ? hot : row >= height * 0.55 ? bright : row >= height * 0.25 ? mid : dark;
+      const tone2 = row >= height * 0.85 ? hot : row >= height * 0.55 ? bright : row >= height * 0.25 ? mid : dark;
       let line = " ";
       for (let i = 0; i < bars; i++) {
         const filled = levels[i] * height;
         const cell = Math.max(0, Math.min(8, Math.round((filled - row) * 8)));
-        line += cell === 0 ? "  " : `${tone}${BLOCKS[cell].repeat(2)}\x1B[0m`;
+        line += cell === 0 ? "  " : `${tone2}${BLOCKS[cell].repeat(2)}\x1B[0m`;
       }
       lines.push(line);
     }
@@ -5216,6 +5345,7 @@ ${color.dim(`local  ${sh.localDir}`)}`)
   ...EQ_COMMANDS,
   ...PEOPLE_COMMANDS,
   ...ADMIN_COMMANDS,
+  ...CDN_COMMANDS,
   ...FUN_COMMANDS,
   ...VISUALIZER_COMMANDS,
   ...KARAOKE_COMMANDS,
@@ -5502,11 +5632,11 @@ var Shell = class {
     const user2 = getToken() ? loadConfig().user?.name ?? "user" : "guest";
     return `${color.user(`${user2}@unreleased`)}:${color.blue(filesPathString(this.cwd))}$ `;
   }
-  print(text, tone = "plain") {
-    if (tone === "error") this.errors++;
+  print(text, tone2 = "plain") {
+    if (tone2 === "error") this.errors++;
     const sink = this.sinks[this.sinks.length - 1];
-    if (sink && (tone !== "error" || sink.keepErrors)) sink.lines.push(...text.split("\n"));
-    else writeTone(text, tone);
+    if (sink && (tone2 !== "error" || sink.keepErrors)) sink.lines.push(...text.split("\n"));
+    else writeTone(text, tone2);
   }
   /** A progress note ("loading…"): straight to stderr, never into a pipe or
    *  a one-shot command's stdout - and not at all over a full screen. */
@@ -5729,17 +5859,17 @@ async function startRepl() {
   const flushHeld = () => {
     for (const n of held.splice(0)) writeTone(n.text, n.tone);
   };
-  const notify = (text, tone = "dim") => {
+  const notify = (text, tone2 = "dim") => {
     if (screenActive() || historySearchActive()) {
-      held.push({ text, tone });
+      held.push({ text, tone: tone2 });
       return;
     }
     if (running) {
-      writeTone(text, tone);
+      writeTone(text, tone2);
       return;
     }
     process.stdout.write("\r\x1B[2K");
-    writeTone(text, tone);
+    writeTone(text, tone2);
     rl.prompt(true);
   };
   shell.player = new Player(notify);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unreleased-cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "The Unreleased site terminal as a command-line shell",
   "keywords": [
     "juice-wrld",