nixamp 0.30.1 → 0.32.0

package/dist/station-mcp.d.ts

@@ -0,0 +1,311 @@
+export declare const STATION_TOOLS: ({
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            server: {
+                type: "string";
+                description: string;
+            };
+            playlist?: undefined;
+            idempotencyKey?: undefined;
+            name?: undefined;
+            description?: undefined;
+            folder?: undefined;
+            items?: undefined;
+            shuffle?: undefined;
+            repeat?: undefined;
+            bitrate?: undefined;
+            action?: undefined;
+            visibility?: undefined;
+            listed?: undefined;
+            basis?: undefined;
+            note?: undefined;
+            id?: undefined;
+            private?: undefined;
+        };
+        required?: undefined;
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            server: {
+                type: "string";
+                description: string;
+            };
+            id: {
+                type: "string";
+                description: string;
+            };
+            playlist?: undefined;
+            idempotencyKey?: undefined;
+            name?: undefined;
+            description?: undefined;
+            folder?: undefined;
+            items?: undefined;
+            shuffle?: undefined;
+            repeat?: undefined;
+            bitrate?: undefined;
+            action?: undefined;
+            visibility?: undefined;
+            listed?: undefined;
+            basis?: undefined;
+            note?: undefined;
+            private?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            server: {
+                type: "string";
+                description: string;
+            };
+            name: {
+                readonly type: "string";
+            };
+            folder: {
+                type: "string";
+                description: string;
+            };
+            items: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                description: string;
+            };
+            playlist: {
+                type: "string";
+                description: string;
+            };
+            description: {
+                readonly type: "string";
+            };
+            shuffle: {
+                type: string;
+            };
+            repeat: {
+                type: string;
+                description: string;
+            };
+            bitrate: {
+                type: string;
+                description: string;
+            };
+            idempotencyKey: {
+                type: "string";
+                description: string;
+            };
+            action?: undefined;
+            visibility?: undefined;
+            listed?: undefined;
+            basis?: undefined;
+            note?: undefined;
+            id?: undefined;
+            private?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            playlist?: undefined;
+            idempotencyKey?: undefined;
+            server: {
+                type: "string";
+                description: string;
+            };
+            id: {
+                type: "string";
+                description: string;
+            };
+            name: {
+                readonly type: "string";
+            };
+            description: {
+                readonly type: "string";
+            };
+            folder: {
+                readonly type: "string";
+            };
+            items: {
+                description?: undefined;
+                type: string;
+                items: {
+                    type: string;
+                };
+            };
+            shuffle: {
+                type: string;
+            };
+            repeat: {
+                description?: undefined;
+                type: string;
+            };
+            bitrate: {
+                description?: undefined;
+                type: string;
+            };
+            action?: undefined;
+            visibility?: undefined;
+            listed?: undefined;
+            basis?: undefined;
+            note?: undefined;
+            private?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            playlist?: undefined;
+            idempotencyKey?: undefined;
+            name?: undefined;
+            description?: undefined;
+            folder?: undefined;
+            items?: undefined;
+            shuffle?: undefined;
+            repeat?: undefined;
+            bitrate?: undefined;
+            server: {
+                type: "string";
+                description: string;
+            };
+            id: {
+                type: "string";
+                description: string;
+            };
+            action: {
+                type: string;
+                enum: string[];
+            };
+            visibility?: undefined;
+            listed?: undefined;
+            basis?: undefined;
+            note?: undefined;
+            private?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            playlist?: undefined;
+            idempotencyKey?: undefined;
+            name?: undefined;
+            description?: undefined;
+            folder?: undefined;
+            items?: undefined;
+            shuffle?: undefined;
+            repeat?: undefined;
+            bitrate?: undefined;
+            action?: undefined;
+            server: {
+                type: "string";
+                description: string;
+            };
+            id: {
+                type: "string";
+                description: string;
+            };
+            visibility: {
+                type: string;
+                enum: string[];
+            };
+            listed: {
+                type: string;
+                description: string;
+            };
+            basis: {
+                type: string;
+                enum: string[];
+            };
+            note: {
+                readonly type: "string";
+            };
+            private?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: {
+            playlist?: undefined;
+            idempotencyKey?: undefined;
+            name?: undefined;
+            description?: undefined;
+            folder?: undefined;
+            items?: undefined;
+            shuffle?: undefined;
+            repeat?: undefined;
+            bitrate?: undefined;
+            action?: undefined;
+            visibility?: undefined;
+            listed?: undefined;
+            basis?: undefined;
+            note?: undefined;
+            server: {
+                type: "string";
+                description: string;
+            };
+            id: {
+                type: "string";
+                description: string;
+            };
+            private: {
+                type: string;
+            };
+        };
+        required: string[];
+    };
+})[];
+interface Result {
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError?: boolean;
+}
+export interface StationToolOptions {
+    fetcher?: typeof fetch;
+    /** Where the local daemon is and its key; the tests hand these in. */
+    local?: {
+        url: string;
+        key: string | null;
+    } | null;
+    session?: {
+        site: string;
+        token: string;
+    } | null;
+}
+/** Where to send a tool's request, and with which credential. */
+export declare function connect(args: Record<string, unknown>, options: StationToolOptions): {
+    base: string;
+    headers: Record<string, string>;
+} | {
+    error: string;
+};
+export declare function isStationTool(name: string): boolean;
+export declare function callStationTool(name: string, args: Record<string, unknown>, options?: StationToolOptions): Promise<Result>;
+export {};

package/dist/station-mcp.js

@@ -0,0 +1,179 @@
+/**
+ * Stations as MCP tools: what `nixamp station` does, for an agent.
+ *
+ * The same API and the same rules as the CLI and the page. On this machine
+ * the tools use the daemon's control key, which is what being on the machine
+ * means; for another server they send this machine's nixamp.com session,
+ * which the server accepts only if that account owns it. Publishing is its
+ * own tool and asks for the basis, exactly as for a person.
+ */
+import { daemonUrl, readState } from "./daemon.js";
+import { readSession } from "./session.js";
+import { KEY_HEADER } from "./share.js";
+const STRING = { type: "string" };
+const ID = { ...STRING, description: "The station's id (10 characters), from station_list." };
+const SERVER = { ...STRING, description: "A nixamp server's address; this machine's daemon when omitted." };
+export const STATION_TOOLS = [
+    {
+        name: "station_list",
+        description: "List this server's stations: id, name, state (live, stopped, offline...), visibility and listening link.",
+        inputSchema: { type: "object", properties: { server: SERVER } },
+    },
+    {
+        name: "station_get",
+        description: "One station in full: files, rotation, state, any problem, and its links.",
+        inputSchema: { type: "object", properties: { server: SERVER, id: ID }, required: ["id"] },
+    },
+    {
+        name: "station_create",
+        description: "Make a station from a folder in the library (path relative to it, \"\" for all of it), a playlist, or track indexes. It starts private and stopped; nothing is published.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                server: SERVER,
+                name: STRING,
+                folder: { ...STRING, description: "A folder under the library, e.g. \"Albums/Late Night\"." },
+                items: { type: "array", items: { type: "integer" }, description: "Track indexes, as /api/state lists them." },
+                playlist: { ...STRING, description: "A playlist id (playlist_list): the station plays its ready items in order." },
+                description: STRING,
+                shuffle: { type: "boolean" },
+                repeat: { type: "boolean", description: "Round and round (default) or once." },
+                bitrate: { type: "integer", description: "kbps: 64, 96, 128 (default), 160, 192, 256 or 320." },
+                idempotencyKey: { ...STRING, description: "Asking again with the same key returns the same station." },
+            },
+            required: ["name"],
+        },
+    },
+    {
+        name: "station_update",
+        description: "Rename, describe, change files or rotation. Edits to the files land on the next track.",
+        inputSchema: {
+            type: "object",
+            properties: { server: SERVER, id: ID, name: STRING, description: STRING, folder: STRING, items: { type: "array", items: { type: "integer" } }, shuffle: { type: "boolean" }, repeat: { type: "boolean" }, bitrate: { type: "integer" } },
+            required: ["id"],
+        },
+    },
+    {
+        name: "station_control",
+        description: "start, stop or skip a station, or retry the files it left out. Starting does not publish.",
+        inputSchema: {
+            type: "object",
+            properties: { server: SERVER, id: ID, action: { type: "string", enum: ["start", "stop", "skip", "retry"] } },
+            required: ["id", "action"],
+        },
+    },
+    {
+        name: "station_publish",
+        description: "Make a station unlisted (a link) or public (and listed in the nixamp.com directory). Public needs the basis on which it may be broadcast: owned, permission, licensed or public-domain. A declaration, not legal clearance.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                server: SERVER,
+                id: ID,
+                visibility: { type: "string", enum: ["unlisted", "public"] },
+                listed: { type: "boolean", description: "In the directory (public only). Default true for public." },
+                basis: { type: "string", enum: ["owned", "permission", "licensed", "public-domain"] },
+                note: STRING,
+            },
+            required: ["id", "visibility"],
+        },
+    },
+    {
+        name: "station_unpublish",
+        description: "Take a station out of the directory, or make it private: its links stop working and listeners are disconnected.",
+        inputSchema: { type: "object", properties: { server: SERVER, id: ID, private: { type: "boolean" } }, required: ["id"] },
+    },
+];
+const say = (value, isError = false) => ({ content: [{ type: "text", text: value }], ...(isError ? { isError: true } : {}) });
+/** Where to send a tool's request, and with which credential. */
+export function connect(args, options) {
+    const server = typeof args["server"] === "string" ? args["server"].replace(/\/+$/, "") : "";
+    const headers = { "content-type": "application/json" };
+    if (server === "") {
+        const local = options.local === undefined ? (() => { const state = readState(); return state ? { url: daemonUrl(state), key: state.key } : null; })() : options.local;
+        if (!local)
+            return { error: "No nixamp daemon runs on this machine. Start one (nixamp daemon start ~/Music) or pass `server`." };
+        if (local.key)
+            headers[KEY_HEADER] = local.key;
+        return { base: local.url, headers };
+    }
+    const session = options.session === undefined ? readSession() : options.session;
+    if (!session)
+        return { error: "Another server needs this machine signed in as its owner: nixamp login." };
+    headers["authorization"] = `Bearer ${session.token}`;
+    return { base: server, headers };
+}
+export function isStationTool(name) {
+    return STATION_TOOLS.some((tool) => tool.name === name);
+}
+function line(station) {
+    const links = (station["links"] ?? {});
+    const problem = station["error"] ? `; problem: ${String(station["error"])}` : "";
+    const link = station["visibility"] !== "private" && links["page"] ? `\n  listen: ${links["page"]}` : "";
+    return `${String(station["name"])} [${String(station["id"])}] ${String(station["state"])}, ${String(station["visibility"])}${station["listed"] ? " and listed" : ""}${problem}${link}`;
+}
+export async function callStationTool(name, args, options = {}) {
+    const send = options.fetcher ?? fetch;
+    const target = connect(args, options);
+    if ("error" in target)
+        return say(target.error, true);
+    const { base, headers } = target;
+    const id = typeof args["id"] === "string" ? args["id"] : "";
+    const call = async (method, path, body) => {
+        const response = await send(`${base}${path}`, { method, headers, ...(body === undefined ? {} : { body: JSON.stringify(body) }) });
+        const parsed = (await response.json().catch(() => ({})));
+        return { ok: response.ok, body: parsed };
+    };
+    const refused = (body) => say(`${String(body["error"] ?? "refused")} (${String(body["code"] ?? "error")})`, true);
+    const pick = (keys) => Object.fromEntries(keys.filter((key) => args[key] !== undefined).map((key) => [key, args[key]]));
+    try {
+        if (name === "station_list") {
+            const answer = await call("GET", "/api/v1/stations?limit=200");
+            if (!answer.ok)
+                return refused(answer.body);
+            const all = answer.body["stations"] ?? [];
+            return say(all.length === 0 ? "No stations on this server yet." : all.map(line).join("\n"));
+        }
+        if (!/^[a-z0-9]{10}$/.test(id) && name !== "station_create")
+            return say("Which station? Pass its id from station_list.", true);
+        if (name === "station_get") {
+            const answer = await call("GET", `/api/v1/stations/${id}`);
+            return answer.ok ? say(JSON.stringify(answer.body["station"], null, 2)) : refused(answer.body);
+        }
+        if (name === "station_create") {
+            const answer = await call("POST", "/api/v1/stations", pick(["name", "folder", "items", "playlist", "description", "shuffle", "repeat", "bitrate", "idempotencyKey"]));
+            return answer.ok ? say(`Made, private and stopped: ${line(answer.body["station"])}`) : refused(answer.body);
+        }
+        if (name === "station_update") {
+            const answer = await call("PATCH", `/api/v1/stations/${id}`, pick(["name", "description", "folder", "items", "shuffle", "repeat", "bitrate"]));
+            return answer.ok ? say(line(answer.body["station"])) : refused(answer.body);
+        }
+        if (name === "station_control") {
+            const action = String(args["action"] ?? "");
+            if (!["start", "stop", "skip", "retry"].includes(action))
+                return say("action is start, stop, skip or retry", true);
+            const answer = await call("POST", `/api/v1/stations/${id}/${action}`, {});
+            return answer.ok ? say(line(answer.body["station"])) : refused(answer.body);
+        }
+        if (name === "station_publish") {
+            const visibility = args["visibility"] === "public" ? "public" : "unlisted";
+            const answer = await call("POST", `/api/v1/stations/${id}/access`, {
+                visibility,
+                listed: visibility === "public" && args["listed"] !== false,
+                ...(typeof args["basis"] === "string" ? { rights: { basis: args["basis"], note: typeof args["note"] === "string" ? args["note"] : "" } } : {}),
+            });
+            return answer.ok ? say(line(answer.body["station"])) : refused(answer.body);
+        }
+        if (name === "station_unpublish") {
+            const answer = await call("POST", `/api/v1/stations/${id}/access`, args["private"] === true ? { visibility: "private" } : { listed: false });
+            if (!answer.ok)
+                return refused(answer.body);
+            const dropped = Number(answer.body["dropped"] ?? 0);
+            return say(`${line(answer.body["station"])}${dropped ? `\n${dropped} listener(s) disconnected.` : ""}`);
+        }
+    }
+    catch (error) {
+        return say(`Could not reach ${base}: ${error.message}`, true);
+    }
+    return say(`No such tool: ${name}`, true);
+}

package/dist/station-page.d.ts

@@ -1,5 +1,5 @@
 /** A station page's path: /station/<id>. */
 export declare const STATION_PAGE: RegExp;
-export declare const STATION_PAGE_HTML = "<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<meta name=\"robots\" content=\"noindex\">\n<title>Station \u00B7 nixamp</title>\n<style>\n:root{--bg:#f6f5f2;--fg:#17171a;--muted:#5d5d66;--card:#fff;--line:#dedcd6;--accent:#1f6feb;--live:#0b7a3b;--warn:#9a6700;--off:#8c2f39}\n@media (prefers-color-scheme:dark){:root{--bg:#121214;--fg:#ececf1;--muted:#a4a4b0;--card:#1c1c20;--line:#2c2c33;--accent:#6aa7ff;--live:#3fbf7f;--warn:#e3b341;--off:#f0838f}}\n*{box-sizing:border-box}html,body{margin:0;background:var(--bg);color:var(--fg);font:16px/1.5 system-ui,-apple-system,\"Segoe UI\",sans-serif}\nmain{max-width:560px;margin:0 auto;padding:48px 16px}\n.card{background:var(--card);border:1px solid var(--line);border-radius:16px;padding:24px}\nh1{font-size:1.6rem;line-height:1.2;margin:0 0 4px}\n.about{color:var(--muted);margin:0 0 20px}\n.chip{display:inline-flex;align-items:center;gap:8px;font-size:.85rem;font-weight:600;padding:4px 10px;border-radius:999px;border:1px solid var(--line)}\n.chip::before{content:\"\";width:8px;height:8px;border-radius:50%;background:currentColor}\n.live{color:var(--live)}.reconnecting{color:var(--warn)}.unavailable,.stopped{color:var(--off)}\n.now{margin:20px 0;min-height:3em}.now .title{font-weight:600}.now .by{color:var(--muted)}\n.controls{display:flex;align-items:center;gap:16px;flex-wrap:wrap}\nbutton{font:inherit;font-weight:600;border:0;border-radius:999px;padding:12px 28px;background:var(--accent);color:#fff;cursor:pointer;min-width:120px}\nbutton:disabled{opacity:.5;cursor:not-allowed}\nbutton:focus-visible,input:focus-visible,a:focus-visible{outline:3px solid var(--accent);outline-offset:3px}\nlabel{display:flex;align-items:center;gap:8px;color:var(--muted);font-size:.9rem}\ninput[type=range]{width:120px;accent-color:var(--accent)}\n.small{margin-top:20px;font-size:.85rem;color:var(--muted)}.small a{color:inherit}\n.sr{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap}\n@media (prefers-reduced-motion:no-preference){.live::before{animation:pulse 2s ease-in-out infinite}}\n@keyframes pulse{50%{opacity:.35}}\n</style>\n</head>\n<body>\n<main>\n  <div class=\"card\">\n    <span id=\"state\" class=\"chip unavailable\" role=\"status\">Loading</span>\n    <h1 id=\"name\">&nbsp;</h1>\n    <p id=\"about\" class=\"about\" hidden></p>\n    <div class=\"now\" aria-live=\"polite\"><div id=\"title\" class=\"title\"></div><div id=\"by\" class=\"by\"></div></div>\n    <div class=\"controls\">\n      <button id=\"play\" type=\"button\" aria-pressed=\"false\" disabled>Play</button>\n      <label>Volume <input id=\"volume\" type=\"range\" min=\"0\" max=\"1\" step=\"0.05\" value=\"1\"></label>\n    </div>\n    <p class=\"small\"><a id=\"m3u\" href=\"#\">Open in another player (.m3u)</a> \u00B7 Pausing here does not pause the station.</p>\n  </div>\n  <p class=\"small\">Played by <a href=\"https://nixamp.com\">nixamp</a>.</p>\n  <div id=\"announce\" class=\"sr\" aria-live=\"assertive\"></div>\n</main>\n<script>\n(() => {\n  const id = location.pathname.split(\"/\").filter(Boolean)[1] || \"\";\n  const token = new URLSearchParams(location.search).get(\"t\") || \"\";\n  const q = \"?t=\" + encodeURIComponent(token);\n  const api = \"/api/v1/stations/\" + encodeURIComponent(id);\n  const $ = (s) => document.querySelector(s);\n  const audio = new Audio();\n  audio.preload = \"none\";\n  let wanted = false, retry = 0, timer = 0, last = null;\n  const chip = (state, text) => { const c = $(\"#state\"); c.className = \"chip \" + state; c.textContent = text; };\n  const say = (text) => { $(\"#announce\").textContent = text; };\n  const draw = (s) => {\n    last = s;\n    document.title = s.name + \" \u00B7 nixamp\";\n    $(\"#name\").textContent = s.name;\n    $(\"#about\").textContent = s.description || \"\";\n    $(\"#about\").hidden = !s.description;\n    const playing = s.nowPlaying;\n    $(\"#title\").textContent = playing ? (playing.title || \"Untitled\") : (s.state === \"live\" ? \"On the air\" : \"\");\n    $(\"#by\").textContent = playing ? [playing.artist, playing.album].filter(Boolean).join(\" \u00B7 \") : \"\";\n    if (wanted && retry > 0) chip(\"reconnecting\", \"Reconnecting\");\n    else if (s.state === \"live\") chip(\"live\", \"Live\");\n    else if (s.state === \"starting\" || s.state === \"recovering\") chip(\"reconnecting\", \"Coming back\");\n    else if (s.state === \"stopped\") chip(\"stopped\", \"Off the air\");\n    else chip(\"unavailable\", \"Unavailable\");\n    $(\"#play\").disabled = !(s.state === \"live\" || s.state === \"recovering\" || s.state === \"starting\");\n    $(\"#m3u\").href = api + \"/listen.m3u\" + q;\n  };\n  const poll = async () => {\n    try {\n      const r = await fetch(api + \"/state\" + q, { cache: \"no-store\" });\n      if (r.status === 404) { $(\"#name\").textContent = \"This station is not available\"; chip(\"unavailable\", \"Unavailable\"); $(\"#play\").disabled = true; stop(); return; }\n      if (r.ok) draw(await r.json());\n    } catch {}\n  };\n  // Always the live edge: a fresh request, never a cached or paused one.\n  const join = () => { audio.src = api + \"/stream\" + q + \"&n=\" + Date.now(); audio.play().catch(() => { wanted = false; button(); }); };\n  const stop = () => { wanted = false; clearTimeout(timer); audio.pause(); audio.removeAttribute(\"src\"); audio.load(); button(); };\n  const button = () => { const b = $(\"#play\"); b.textContent = wanted ? \"Stop\" : \"Play\"; b.setAttribute(\"aria-pressed\", String(wanted)); };\n  const again = () => {\n    if (!wanted) return;\n    retry += 1;\n    if (last) draw(last);\n    clearTimeout(timer);\n    timer = setTimeout(join, Math.min(15000, 1000 * 2 ** Math.min(retry, 4)));\n  };\n  audio.addEventListener(\"playing\", () => { if (retry) say(\"Back on\"); retry = 0; if (last) draw(last); });\n  audio.addEventListener(\"error\", again);\n  audio.addEventListener(\"ended\", again);\n  audio.addEventListener(\"stalled\", () => { if (wanted && audio.readyState < 3) again(); });\n  $(\"#play\").addEventListener(\"click\", () => { if (wanted) { stop(); say(\"Stopped\"); } else { wanted = true; retry = 0; button(); join(); say(\"Playing\"); } });\n  $(\"#volume\").addEventListener(\"input\", (e) => { audio.volume = Number(e.target.value); });\n  poll();\n  setInterval(poll, 5000);\n})();\n</script>\n</body>\n</html>\n";
+export declare const STATION_PAGE_HTML = "<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<meta name=\"robots\" content=\"noindex\">\n<link rel=\"icon\" href=\"data:,\">\n<title>Station \u00B7 nixamp</title>\n<style>\n:root{--bg:#f6f5f2;--fg:#17171a;--muted:#5d5d66;--card:#fff;--line:#dedcd6;--accent:#1f6feb;--live:#0b7a3b;--warn:#9a6700;--off:#8c2f39}\n@media (prefers-color-scheme:dark){:root{--bg:#121214;--fg:#ececf1;--muted:#a4a4b0;--card:#1c1c20;--line:#2c2c33;--accent:#6aa7ff;--live:#3fbf7f;--warn:#e3b341;--off:#f0838f}}\n*{box-sizing:border-box}html,body{margin:0;background:var(--bg);color:var(--fg);font:16px/1.5 system-ui,-apple-system,\"Segoe UI\",sans-serif}\nmain{max-width:560px;margin:0 auto;padding:48px 16px}\n.card{background:var(--card);border:1px solid var(--line);border-radius:16px;padding:24px}\nh1{font-size:1.6rem;line-height:1.2;margin:0 0 4px}\n.about{color:var(--muted);margin:0 0 20px}\n.chip{display:inline-flex;align-items:center;gap:8px;font-size:.85rem;font-weight:600;padding:4px 10px;border-radius:999px;border:1px solid var(--line)}\n.chip::before{content:\"\";width:8px;height:8px;border-radius:50%;background:currentColor}\n.live{color:var(--live)}.reconnecting{color:var(--warn)}.unavailable,.stopped{color:var(--off)}\n.now{margin:20px 0;min-height:3em}.now .title{font-weight:600}.now .by{color:var(--muted)}\n.controls{display:flex;align-items:center;gap:16px;flex-wrap:wrap}\nbutton{font:inherit;font-weight:600;border:0;border-radius:999px;padding:12px 28px;background:var(--accent);color:#fff;cursor:pointer;min-width:120px}\nbutton:disabled{opacity:.5;cursor:not-allowed}\nbutton:focus-visible,input:focus-visible,a:focus-visible{outline:3px solid var(--accent);outline-offset:3px}\nlabel{display:flex;align-items:center;gap:8px;color:var(--muted);font-size:.9rem}\ninput[type=range]{width:120px;accent-color:var(--accent)}\n.small{margin-top:20px;font-size:.85rem;color:var(--muted)}.small a{color:inherit}\n.sr{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap}\n@media (prefers-reduced-motion:no-preference){.live::before{animation:pulse 2s ease-in-out infinite}}\n@keyframes pulse{50%{opacity:.35}}\n</style>\n</head>\n<body>\n<main>\n  <div class=\"card\">\n    <span id=\"state\" class=\"chip unavailable\" role=\"status\">Loading</span>\n    <h1 id=\"name\">&nbsp;</h1>\n    <p id=\"about\" class=\"about\" hidden></p>\n    <div class=\"now\" aria-live=\"polite\"><div id=\"title\" class=\"title\"></div><div id=\"by\" class=\"by\"></div></div>\n    <div class=\"controls\">\n      <button id=\"play\" type=\"button\" aria-pressed=\"false\" disabled>Play</button>\n      <label>Volume <input id=\"volume\" type=\"range\" min=\"0\" max=\"1\" step=\"0.05\" value=\"1\"></label>\n    </div>\n    <p class=\"small\"><a id=\"m3u\" href=\"#\">Open in another player (.m3u)</a> \u00B7 Pausing here does not pause the station.</p>\n  </div>\n  <p class=\"small\">Played by <a href=\"https://nixamp.com\">nixamp</a>.</p>\n  <div id=\"announce\" class=\"sr\" aria-live=\"assertive\"></div>\n</main>\n<script>\n(() => {\n  const id = location.pathname.split(\"/\").filter(Boolean)[1] || \"\";\n  const token = new URLSearchParams(location.search).get(\"t\") || \"\";\n  const q = \"?t=\" + encodeURIComponent(token);\n  const api = \"/api/v1/stations/\" + encodeURIComponent(id);\n  const $ = (s) => document.querySelector(s);\n  const audio = new Audio();\n  audio.preload = \"none\";\n  let wanted = false, retry = 0, timer = 0, last = null;\n  const chip = (state, text) => { const c = $(\"#state\"); c.className = \"chip \" + state; c.textContent = text; };\n  const say = (text) => { $(\"#announce\").textContent = text; };\n  const draw = (s) => {\n    last = s;\n    document.title = s.name + \" \u00B7 nixamp\";\n    $(\"#name\").textContent = s.name;\n    $(\"#about\").textContent = s.description || \"\";\n    $(\"#about\").hidden = !s.description;\n    const playing = s.nowPlaying;\n    $(\"#title\").textContent = playing ? (playing.title || \"Untitled\") : (s.state === \"live\" ? \"On the air\" : \"\");\n    $(\"#by\").textContent = playing ? [playing.artist, playing.album].filter(Boolean).join(\" \u00B7 \") : \"\";\n    if (wanted && retry > 0) chip(\"reconnecting\", \"Reconnecting\");\n    else if (s.state === \"live\") chip(\"live\", \"Live\");\n    else if (s.state === \"starting\" || s.state === \"recovering\") chip(\"reconnecting\", \"Coming back\");\n    else if (s.state === \"stopped\") chip(\"stopped\", \"Off the air\");\n    else chip(\"unavailable\", \"Unavailable\");\n    $(\"#play\").disabled = !(s.state === \"live\" || s.state === \"recovering\" || s.state === \"starting\");\n    $(\"#m3u\").href = api + \"/listen.m3u\" + q;\n  };\n  const poll = async () => {\n    try {\n      const r = await fetch(api + \"/state\" + q, { cache: \"no-store\" });\n      if (r.status === 404) { $(\"#name\").textContent = \"This station is not available\"; chip(\"unavailable\", \"Unavailable\"); $(\"#play\").disabled = true; stop(); return; }\n      if (r.ok) draw(await r.json());\n    } catch {}\n  };\n  // Always the live edge: a fresh request, never a cached or paused one.\n  const join = () => { audio.src = api + \"/stream\" + q + \"&n=\" + Date.now(); audio.play().catch(() => { wanted = false; button(); }); };\n  const stop = () => { wanted = false; clearTimeout(timer); audio.pause(); audio.removeAttribute(\"src\"); audio.load(); button(); };\n  const button = () => { const b = $(\"#play\"); b.textContent = wanted ? \"Stop\" : \"Play\"; b.setAttribute(\"aria-pressed\", String(wanted)); };\n  const again = () => {\n    if (!wanted) return;\n    retry += 1;\n    if (last) draw(last);\n    clearTimeout(timer);\n    timer = setTimeout(join, Math.min(15000, 1000 * 2 ** Math.min(retry, 4)));\n  };\n  audio.addEventListener(\"playing\", () => { if (retry) say(\"Back on\"); retry = 0; if (last) draw(last); });\n  audio.addEventListener(\"error\", again);\n  audio.addEventListener(\"ended\", again);\n  audio.addEventListener(\"stalled\", () => { if (wanted && audio.readyState < 3) again(); });\n  $(\"#play\").addEventListener(\"click\", () => { if (wanted) { stop(); say(\"Stopped\"); } else { wanted = true; retry = 0; button(); join(); say(\"Playing\"); } });\n  $(\"#volume\").addEventListener(\"input\", (e) => { audio.volume = Number(e.target.value); });\n  poll();\n  setInterval(poll, 5000);\n})();\n</script>\n</body>\n</html>\n";
 /** Only its own script and style, only its own server, never framed. */
 export declare const STATION_PAGE_CSP: string;

package/dist/station-page.js

@@ -97,6 +97,7 @@ const PAGE = `<!doctype html>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="robots" content="noindex">
+<link rel="icon" href="data:,">
 <title>Station · nixamp</title>
 <style>${STYLE}</style>
 </head>
@@ -130,7 +131,7 @@ export const STATION_PAGE_CSP = [
     `style-src ${hash(STYLE)}`,
     "connect-src 'self'",
     "media-src 'self'",
-    "img-src 'self'",
+    "img-src 'self' data:",
     "base-uri 'none'",
     "form-action 'none'",
     "frame-ancestors 'none'",

package/dist/station-routes.js

@@ -32,7 +32,8 @@ function nowPlayingFile(ctx, station) {
 export function publicView(ctx, station) {
     const state = ctx.runner.observed(station.id);
     const file = state === "live" || state === "recovering" ? nowPlayingFile(ctx, station) : "";
-    const track = file ? ctx.trackFor(file) : null;
+    // The tags the player read when it put this file on, else the library's.
+    const track = file ? (ctx.channels.tagsOf(channelOf(station.id), file) ?? ctx.trackFor(file)) : null;
     return {
         id: station.id,
         name: station.name,

package/dist/station-usage.d.ts

@@ -1,2 +1,2 @@
 /** `nixamp station` usage, apart so `nixamp help station` does not load the client. */
-export declare const USAGE = "nixamp station \u2014 make a collection into a station\n\n  nixamp station list\n  nixamp station create --name NAME (--folder PATH | --items 0,1,2) [--shuffle] [--no-repeat] [--bitrate 128]\n  nixamp station show ID\n  nixamp station status ID\n  nixamp station start ID\n  nixamp station stop ID\n  nixamp station skip ID\n  nixamp station retry ID          try every left-out file again\n  nixamp station publish ID --basis owned|permission|licensed|public-domain [--note TEXT] [--unlisted] [--no-list]\n  nixamp station unpublish ID [--private]\n  nixamp station link ID [--rotate]\n  nixamp station delete ID\n\n  --json        machine-readable output\n  --url, --key  another server, as with `nixamp admin`\n\nA new station is private and stopped. Starting it does not publish it.";
+export declare const USAGE = "nixamp station \u2014 make a collection into a station\n\n  nixamp station list\n  nixamp station create --name NAME (--folder PATH | --playlist ID | --items 0,1,2) [--shuffle] [--no-repeat] [--bitrate 128]\n  nixamp station show ID\n  nixamp station status ID\n  nixamp station start ID\n  nixamp station stop ID\n  nixamp station skip ID\n  nixamp station retry ID          try every left-out file again\n  nixamp station publish ID --basis owned|permission|licensed|public-domain [--note TEXT] [--unlisted] [--no-list]\n  nixamp station unpublish ID [--private]\n  nixamp station link ID [--rotate]\n  nixamp station delete ID\n\n  --json        machine-readable output\n  --url, --key  another server, as with `nixamp admin`\n\nA new station is private and stopped. Starting it does not publish it.";

package/dist/station-usage.js

@@ -2,7 +2,7 @@
 export const USAGE = `nixamp station — make a collection into a station
 
   nixamp station list
-  nixamp station create --name NAME (--folder PATH | --items 0,1,2) [--shuffle] [--no-repeat] [--bitrate 128]
+  nixamp station create --name NAME (--folder PATH | --playlist ID | --items 0,1,2) [--shuffle] [--no-repeat] [--bitrate 128]
   nixamp station show ID
   nixamp station status ID
   nixamp station start ID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nixamp",
-  "version": "0.30.1",
+  "version": "0.32.0",
   "description": "It really whips the terminal's ass. A Winamp-shaped audio player for your terminal.",
   "license": "MIT",
   "type": "module",

package/src/channels.ts

@@ -299,6 +299,11 @@ export class Channel {
   skip(): boolean {
     return this.playlistInput?.skip() ?? false;
   }
+
+  /** An entry's tags, as read when it was put on. */
+  tagsOf(file: string): { title: string; artist: string; album: string } | undefined {
+    return this.playlistInput?.tags.get(file);
+  }
   private failures = 0;
   private timer: ReturnType<typeof setTimeout> | null = null;
   /** Fires when a pulled source has said nothing for STALL. */
@@ -1341,6 +1346,11 @@ export class Channels {
     return this.open.get(id)?.info.kind;
   }
 
+  /** An entry's tags on a channel playing a list of files. */
+  tagsOf(id: string, file: string): { title: string; artist: string; album: string } | undefined {
+    return this.open.get(id)?.tagsOf(file);
+  }
+
   /** The next entry, now, on a channel playing a list of files. */
   skip(id: string): boolean {
     return this.open.get(id)?.skip() ?? false;