unreleased-cli 0.1.3 → 0.1.4

package/README.md

@@ -52,7 +52,7 @@ Commands (type `help <command>` in the shell for the details of each one):
 
 - **Files:** `cd`, `ls`, `pwd`, `lcd`, `get`, `cat`, `head`, `tail`, `wc`, `grep`, `locate`, `tree`, `du`
 - **Library:** `find`, `song`, `like`, `unlike`, `liked`, `playlists`, `playlist`, `stats`
-- **Player:** `play`, `pause`, `toggle`, `next`, `prev`, `seek`, `volume`, `speed`, `shuffle`, `repeat`, `queue`, `status`, `sleep`, `stop`
+- **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`
 - **Fun:** `neofetch`, `fortune`, `juicesay`, `matrix`, `visualizer`, `karaoke`, `wordle`, `heardle`
@@ -130,6 +130,7 @@ These cover the Admin page's review queues and site moderation, using the same e
 - `matrix` is digital rain. Any key leaves.
 - `visualizer` (or `viz`) is a live spectrum of the song that's playing. Any key leaves. mpv can't hand its audio over, so a second mpv decodes the same stream to a temp file and the bars come from that, which means the song is downloaded a second time while the screen is open.
 - `karaoke` (or `lyrics`) shows the lyrics of the song that's playing. Synced lyrics highlight the line being sung and scroll along; plain ones scroll with the arrow keys and Page Up/Down. Space pauses, `q` leaves. It needs a song from the library (not a file played from the tree).
+- `eq` shows the equalizer settings. `eq list` names the presets (the site's own), `eq rock` turns the equalizer on with one, and `eq off` / `eq reset` switch it off or flatten it. `eq boost 100-200`, `eq balance -100..100`, `eq speed 0.5-2` and `eq pitch [on|off]` (the same as the `speed` command and the `pitch-shift` setting), `eq mono [on|off]` and `eq reverb [on|off|0-100] [decay 1-8]` do the rest. It runs through mpv's audio filters, so the reverb is an echo approximation of the site's. Settings carry over between sessions, and changes apply to the song that's playing.
 - `wordle [daily | unlimited]` is the song-title Wordle, using the site's own puzzle logic, so the daily puzzle is the same one. Type a title and press Enter. Esc leaves, and your progress is saved.
 - `heardle` gives practice rounds: Tab plays the clip, Enter guesses (an empty Enter skips), and ↑↓ picks a suggestion. The clip plays through its own mpv. Music that was playing gets paused, and `play` resumes it.
 

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.3";
+var VERSION = "0.1.4";
 function apiBase() {
   return (process.env.UNRELEASED_API || loadConfig().api || DEFAULT_API).replace(/\/+$/, "");
 }
@@ -488,6 +488,68 @@ function installHistorySearch(rl, history, idle, closed = () => void 0, stdin =
   }
 }
 
+// src/effects.ts
+var EQ_BANDS = [32, 64, 125, 250, 500, 1e3, 2e3, 4e3, 8e3, 16e3];
+var EQ_PRESETS = [
+  { id: "flat", name: "Flat", gains: EQ_BANDS.map(() => 0) },
+  { id: "bass-boost", name: "Bass Boost", gains: [6, 5, 4, 2.5, 1, 0, 0, 0, 0, 0] },
+  { id: "bass-reducer", name: "Bass Reducer", gains: [-6, -5, -4, -2.5, -1, 0, 0, 0, 0, 0] },
+  { id: "treble-boost", name: "Treble Boost", gains: [0, 0, 0, 0, 0, 1, 2.5, 4, 5, 6] },
+  { id: "treble-reducer", name: "Treble Reducer", gains: [0, 0, 0, 0, 0, -1, -2.5, -4, -5, -6] },
+  { id: "vocal", name: "Vocal Boost", gains: [-2, -3, -3, 1, 4, 4, 3, 1.5, 0, -1.5] },
+  { id: "rock", name: "Rock", gains: [5, 4, 3, 1.5, -0.5, -1, 0.5, 2.5, 3.5, 4.5] },
+  { id: "pop", name: "Pop", gains: [-1.5, -1, 0, 2, 4, 4, 2, 0, -1, -1.5] },
+  { id: "hip-hop", name: "Hip-Hop", gains: [5, 4, 1.5, 3, -1, -1, 1.5, -0.5, 2, 3] },
+  { id: "electronic", name: "Electronic", gains: [4.5, 4, 1.5, 0, -2, 2, 1, 1.5, 4, 5] },
+  { id: "jazz", name: "Jazz", gains: [4, 3, 1.5, 2, -1.5, -1.5, 0, 1.5, 3, 4] },
+  { id: "classical", name: "Classical", gains: [4.5, 3.5, 3, 2.5, -1.5, -1.5, 0, 2, 3, 4] },
+  { id: "acoustic", name: "Acoustic", gains: [5, 5, 4, 1, 2, 1.5, 3.5, 4, 3.5, 2] },
+  { id: "small-speakers", name: "Small Speakers", gains: [5.5, 4.5, 4, 2.5, 1.5, 0, -1.5, -3, -4, -4.5] }
+];
+var effects = () => ({
+  eq: pref("eq", false),
+  preset: pref("eq-preset", "flat"),
+  boost: pref("eq-boost", 1),
+  balance: pref("eq-balance", 0),
+  mono: pref("eq-mono", false),
+  reverb: pref("reverb", false),
+  reverbMix: pref("reverb-mix", 0.3),
+  reverbDecay: pref("reverb-decay", 2)
+});
+var KEYS = {
+  eq: "eq",
+  preset: "eq-preset",
+  boost: "eq-boost",
+  balance: "eq-balance",
+  mono: "eq-mono",
+  reverb: "reverb",
+  reverbMix: "reverb-mix",
+  reverbDecay: "reverb-decay"
+};
+function saveEffect(key, value) {
+  setPref(KEYS[key], value);
+}
+var num = (n) => String(Math.round(n * 1e3) / 1e3);
+function filterChain(e = effects()) {
+  const f = [];
+  const gains = EQ_PRESETS.find((p) => p.id === e.preset)?.gains;
+  if (e.eq && gains) {
+    gains.forEach((g, i) => {
+      if (g) f.push(`equalizer=f=${EQ_BANDS[i]}:width_type=o:width=1:g=${num(g)}`);
+    });
+  }
+  if (e.mono) f.push("pan=stereo|c0=0.5*c0+0.5*c1|c1=0.5*c0+0.5*c1");
+  if (e.balance) f.push(`stereotools=balance_out=${num(e.balance)}`);
+  if (e.reverb && e.reverbMix > 0) {
+    const delays = [0.04, 0.09, 0.17, 0.3].map((t) => Math.round(Math.min(1, t * e.reverbDecay / 2) * 1e3));
+    const decays = [0.6, 0.5, 0.4, 0.3].map((d) => num(d * e.reverbMix * 2 > 0.9 ? 0.9 : d * e.reverbMix * 2));
+    f.push(`aecho=in_gain=${num(1 - e.reverbMix * 0.4)}:out_gain=${num(0.6 + e.reverbMix * 0.3)}:delays=${delays.join("|")}:decays=${decays.join("|")}`);
+  }
+  if (e.boost > 1) f.push(`volume=${num(e.boost)}`);
+  if (f.length) f.push("alimiter=limit=0.95");
+  return f.length ? `lavfi=[${f.join(",")}]` : "";
+}
+
 // src/mpv.ts
 import { spawn } from "node:child_process";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
@@ -737,6 +799,8 @@ var Player = class {
       await mpv.set("mute", this.muted);
       await mpv.set("speed", this.speed);
       await mpv.set("audio-pitch-correction", !this.pitchShift);
+      const chain = filterChain();
+      if (chain) await mpv.set("af", chain);
       await mpv.command("observe_property", 1, "time-pos");
       await mpv.command("observe_property", 2, "duration");
       this.mpv = mpv;
@@ -958,6 +1022,10 @@ var Player = class {
     setPref("speed", s);
     if (this.mpv?.alive) await this.mpv.set("speed", s);
   }
+  /** Swaps the audio-filter chain (the equalizer and effects) while playing. */
+  async setFilter(chain) {
+    if (this.mpv?.alive) await this.mpv.set("af", chain);
+  }
   async setPitchShift(on) {
     this.pitchShift = on;
     setPref("pitch-shift", on);
@@ -3810,8 +3878,8 @@ async function myPlaylists(fresh = false) {
 }
 async function playlistFromArg(arg) {
   const list = await myPlaylists();
-  const num = /^#?(\d+)$/.exec(arg.trim());
-  if (num) return list[Number(num[1]) - 1] ?? fail(`pick a playlist from 1 to ${list.length}`);
+  const num2 = /^#?(\d+)$/.exec(arg.trim());
+  if (num2) return list[Number(num2[1]) - 1] ?? fail(`pick a playlist from 1 to ${list.length}`);
   return pickByName(list, (p) => p.name, arg) ?? fail(`no single playlist matches "${arg.trim()}" (try: playlists)`);
 }
 async function playlistSongs(id) {
@@ -4492,6 +4560,96 @@ var UPDATE_COMMANDS = [
   }
 ];
 
+// 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) {
+  const e = effects();
+  const preset = EQ_PRESETS.find((p) => p.id === e.preset)?.id ?? e.preset;
+  return `equalizer ${e.eq ? "on" : "off"} \xB7 preset ${preset} \xB7 boost ${Math.round(e.boost * 100)}% \xB7 balance ${Math.round(e.balance * 100)}
+reverb ${e.reverb ? "on" : "off"} \xB7 mix ${Math.round(e.reverbMix * 100)}% \xB7 decay ${e.reverbDecay}s \xB7 speed ${speed}x \xB7 mono ${e.mono ? "on" : "off"} \xB7 pitch follows speed ${pitch ? "on" : "off"}`;
+}
+var onOff = (v, cur) => v === "on" ? true : v === "off" ? false : v === void 0 ? !cur : fail("expected on or off");
+function numIn(v, lo, hi, what) {
+  const n = Number(v);
+  if (v === void 0 || v === "" || !Number.isFinite(n) || n < lo || n > hi) fail(`${what} must be ${lo} to ${hi}`);
+  return n;
+}
+var EQ_COMMANDS = [
+  {
+    name: "eq",
+    group: "Player",
+    usage: "eq [on | off | list | reset | <preset> | reverb [on|off|<0-100>] [decay 1-8] | boost <100-200> | balance <-100..100> | speed <0.5-2> | mono [on|off] | pitch [on|off]]",
+    description: "Show or change the equalizer, reverb and sound effects; a preset name turns it on with that preset",
+    complete: async (arg) => /\s/.test(arg.trim()) ? [] : WORDS.filter((w) => w.startsWith(arg.trim().toLowerCase())),
+    run: async (args, sh) => {
+      const player = playerOf(sh);
+      const arg = args.trim().toLowerCase();
+      if (!arg) {
+        sh.print(describe(player.speed, player.pitchShift));
+        return;
+      }
+      const [sub, ...rest] = arg.split(/\s+/);
+      const apply = async (message) => {
+        await player.setFilter(filterChain());
+        sh.print(message, "ok");
+      };
+      if (arg === "list") {
+        sh.print(EQ_PRESETS.map((p) => `${p.id.padEnd(16)}${p.name}`).join("\n"));
+        return;
+      }
+      if (sub === "reverb") {
+        const [a, b, c] = rest;
+        const mix = a === void 0 ? void 0 : a === "on" || a === "off" ? void 0 : numIn(a, 0, 100, "reverb amount") / 100;
+        const decayArg = b === "decay" ? c : b;
+        const decay = decayArg === void 0 ? void 0 : numIn(decayArg, 1, 8, "reverb decay");
+        const on = a === void 0 ? !effects().reverb : a === "off" ? false : true;
+        if (mix !== void 0) saveEffect("reverbMix", mix);
+        if (decay !== void 0) saveEffect("reverbDecay", decay);
+        saveEffect("reverb", on);
+        const e = effects();
+        await apply(`reverb ${e.reverb ? "on" : "off"} \xB7 mix ${Math.round(e.reverbMix * 100)}% \xB7 decay ${e.reverbDecay}s`);
+        return;
+      }
+      if (sub === "boost") {
+        saveEffect("boost", numIn(rest[0], 100, 200, "boost") / 100);
+        await apply(describe(player.speed, player.pitchShift));
+        return;
+      }
+      if (sub === "balance") {
+        saveEffect("balance", numIn(rest[0], -100, 100, "balance") / 100);
+        await apply(describe(player.speed, player.pitchShift));
+        return;
+      }
+      if (sub === "speed") {
+        const v = rest[0] === "reset" ? 1 : numIn(rest[0]?.replace(/x$/, ""), 0.5, 2, "speed");
+        await player.setSpeed(Math.round(v * 100) / 100);
+        sh.print(`speed ${player.speed}x`, "ok");
+        return;
+      }
+      if (sub === "pitch") {
+        await player.setPitchShift(onOff(rest[0], player.pitchShift));
+        sh.print(`pitch follows speed: ${player.pitchShift ? "on" : "off"}`, "ok");
+        return;
+      }
+      if (sub === "mono") {
+        saveEffect("mono", onOff(rest[0], effects().mono));
+        await apply(`mono ${effects().mono ? "on" : "off"}`);
+        return;
+      }
+      if (arg === "on" || arg === "off") {
+        saveEffect("eq", arg === "on");
+        await apply(describe(player.speed, player.pitchShift));
+        return;
+      }
+      const preset = arg === "reset" ? EQ_PRESETS[0] : pickByName(EQ_PRESETS, (p) => p.id, arg) ?? pickByName(EQ_PRESETS, (p) => p.name, arg);
+      if (!preset) fail(`no preset "${args.trim()}" (try: eq list)`);
+      saveEffect("preset", preset.id);
+      saveEffect("eq", true);
+      await apply(describe(player.speed, player.pitchShift));
+    }
+  }
+];
+
 // src/karaoke.ts
 var TIME = /\[(\d{1,2}):(\d{2})[.:](\d{2,3})\]/g;
 function parseLrc(lrc) {
@@ -5055,6 +5213,7 @@ ${color.dim(`local  ${sh.localDir}`)}`)
   { name: "du", group: "Files", usage: "du [folder]", path: "dir", description: "How much is in each subfolder, and in total", run: fileTool(diskUsage) },
   ...LIBRARY_COMMANDS,
   ...PLAYER_COMMANDS,
+  ...EQ_COMMANDS,
   ...PEOPLE_COMMANDS,
   ...ADMIN_COMMANDS,
   ...FUN_COMMANDS,

package/package.json

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