npm - nixamp - Versions diffs - 0.35.0 → 0.36.0 - Mend

nixamp 0.35.0 → 0.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/dist/auto-stations.d.ts +66 -0
package/dist/auto-stations.js +108 -0
package/dist/channels.d.ts +1 -1
package/dist/library-index.d.ts +2 -0
package/dist/library-index.js +8 -0
package/dist/library.d.ts +2 -0
package/dist/library.js +1 -0
package/dist/playlist-input.d.ts +9 -0
package/dist/playlist-input.js +30 -8
package/dist/server.d.ts +4 -0
package/dist/server.js +89 -1
package/dist/station-breaks.d.ts +19 -0
package/dist/station-breaks.js +92 -0
package/dist/station-cli.js +22 -0
package/dist/station-guide.d.ts +4 -0
package/dist/station-guide.js +86 -0
package/dist/station-mcp.d.ts +99 -0
package/dist/station-mcp.js +16 -0
package/dist/station-page.d.ts +1 -1
package/dist/station-page.js +20 -5
package/dist/station-routes.d.ts +5 -0
package/dist/station-routes.js +30 -2
package/dist/station-runner.d.ts +2 -0
package/dist/station-runner.js +3 -0
package/dist/station-usage.d.ts +1 -1
package/dist/station-usage.js +2 -0
package/dist/stations.d.ts +14 -0
package/dist/stations.js +26 -0
package/package.json +1 -1
package/src/auto-stations.ts +171 -0
package/src/channels.ts +1 -1
package/src/library-index.ts +5 -0
package/src/library.ts +3 -0
package/src/playlist-input.ts +31 -8
package/src/server.ts +93 -2
package/src/station-breaks.ts +93 -0
package/src/station-cli.ts +21 -0
package/src/station-guide.ts +92 -0
package/src/station-mcp.ts +16 -0
package/src/station-page.ts +20 -5
package/src/station-routes.ts +34 -2
package/src/station-runner.ts +5 -0
package/src/station-usage.ts +2 -0
package/src/stations.ts +37 -0
package/web/dist/assets/{ar-Doh06ZMu.js → ar-Ck-FmDpQ.js} +1 -1
package/web/dist/assets/{cs-C_lZl4jI.js → cs-CPJY3K69.js} +1 -1
package/web/dist/assets/{da-CSBBA_ZI.js → da-BnWtLL09.js} +1 -1
package/web/dist/assets/{de-zorW0tO_.js → de-CHevIt93.js} +1 -1
package/web/dist/assets/{es-DBUl3DGo.js → es-B6wpaUMv.js} +1 -1
package/web/dist/assets/{fi-DpUx7XY-.js → fi-8fKiz2AA.js} +1 -1
package/web/dist/assets/{fr-Cg_xppCf.js → fr-0GgY52Sm.js} +1 -1
package/web/dist/assets/{hi-PD1kdcf2.js → hi-BlsrUAw-.js} +1 -1
package/web/dist/assets/{hls-3VKVEQE3-BEEk729h.js → hls-3VKVEQE3-BZd3zjlr.js} +1 -1
package/web/dist/assets/{hu-C1fGbjZO.js → hu-D3i_6i5w.js} +1 -1
package/web/dist/assets/{id-DRBhZ8KM.js → id-CLLAXbOP.js} +1 -1
package/web/dist/assets/{it-Ci3OZV2-.js → it-BU13BsSn.js} +1 -1
package/web/dist/assets/{main-CEJhJH5y.js → main-C1ggd2H7.js} +2 -2
package/web/dist/assets/{mpegts-y-HAxt1b.js → mpegts-BaoQnMCf.js} +1 -1
package/web/dist/assets/{mpegts-LO6RVLD6-DPrv1ran.js → mpegts-LO6RVLD6-YBT-W6xc.js} +1 -1
package/web/dist/assets/{nl-CwWOHKbv.js → nl-DEshyyt7.js} +1 -1
package/web/dist/assets/{ru-BWlIGsoL.js → ru-D7sPOc6m.js} +1 -1
package/web/dist/assets/{sv-Gb1cLNsc.js → sv-sdrsKAiG.js} +1 -1
package/web/dist/assets/{uk-MZUnyyuR.js → uk-_lz6hkvo.js} +1 -1
package/web/dist/assets/{vi-DNWS5fxc.js → vi-D81wl7uk.js} +1 -1
package/web/dist/assets/{zh-BcOiladF.js → zh-BqMqEom6.js} +1 -1
package/web/dist/index.html +1 -1
package/web/dist/sw.js +22 -22

package/dist/station-guide.js ADDED Viewed

@@ -0,0 +1,86 @@
+/**
+ * The station guide: every station on this server its owner made public
+ * and listed, what is on each, and a way in. What a Moshpit name like
+ * live.streaming opens.
+ *
+ * Like the station page, the same bytes for every server: it asks
+ * /api/v1/stations/guide for the list and writes it in as text.
+ */
+import { createHash } from "node:crypto";
+const STYLE = `
+:root{--bg:#f6f5f2;--fg:#17171a;--muted:#5d5d66;--card:#fff;--line:#dedcd6;--accent:#1f6feb;--live:#0b7a3b}
+@media (prefers-color-scheme:dark){:root{--bg:#121214;--fg:#ececf1;--muted:#a4a4b0;--card:#1c1c20;--line:#2c2c33;--accent:#6aa7ff;--live:#3fbf7f}}
+*{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}
+main{max-width:880px;margin:0 auto;padding:40px 16px}
+h1{margin:0 0 4px;font-size:1.8rem}p.lead{color:var(--muted);margin:0 0 24px}
+h2{font-size:1rem;letter-spacing:.06em;text-transform:uppercase;color:var(--muted);margin:28px 0 10px}
+.grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(240px,1fr));gap:12px}
+a.station{display:block;background:var(--card);border:1px solid var(--line);border-radius:14px;padding:16px;color:inherit;text-decoration:none}
+a.station:hover,a.station:focus-visible{border-color:var(--accent);outline:none}
+.name{font-weight:700;font-size:1.05rem}.now{color:var(--muted);font-size:.9rem;margin-top:6px;min-height:1.4em}
+.live{color:var(--live);font-size:.8rem;font-weight:700}.empty{color:var(--muted)}
+footer{margin-top:40px;color:var(--muted);font-size:.85rem}footer a{color:inherit}
+`;
+const SCRIPT = `
+(async () => {
+  const el = (tag, cls, text) => { const n = document.createElement(tag); if (cls) n.className = cls; if (text) n.textContent = text; return n; };
+  const draw = (stations) => {
+    for (const [kind, box] of [["audio", "#radio"], ["video", "#tv"]]) {
+      const grid = document.querySelector(box);
+      grid.replaceChildren();
+      const list = stations.filter((s) => s.kind === kind);
+      document.querySelector(box + "-title").hidden = list.length === 0;
+      for (const s of list) {
+        const a = el("a", "station");
+        a.href = s.page;
+        a.append(el("div", "live", s.state === "live" ? "● LIVE" : "off the air"), el("div", "name", s.name),
+          el("div", "now", s.nowPlaying ? [s.nowPlaying.title, s.nowPlaying.artist].filter(Boolean).join(" — ") : ""));
+        grid.append(a);
+      }
+    }
+    document.querySelector("#empty").hidden = stations.length > 0;
+  };
+  const load = async () => {
+    try {
+      const r = await fetch("/api/v1/stations/guide", { cache: "no-store" });
+      if (r.ok) draw((await r.json()).stations);
+    } catch {}
+  };
+  await load();
+  setInterval(load, 15000);
+})();
+`;
+const hash = (text) => `'sha256-${createHash("sha256").update(text).digest("base64")}'`;
+export const GUIDE_HTML = `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Live · stations</title>
+<meta name="description" content="Radio and TV stations, live now.">
+<link rel="icon" href="data:,">
+<style>${STYLE}</style>
+</head>
+<body>
+<main>
+  <h1>Live</h1>
+  <p class="lead">Radio and TV, on the air now. Pick one and press play.</p>
+  <h2 id="radio-title" hidden>Radio</h2>
+  <div id="radio" class="grid" aria-live="polite"></div>
+  <h2 id="tv-title" hidden>TV</h2>
+  <div id="tv" class="grid" aria-live="polite"></div>
+  <p id="empty" class="empty">Nothing is on the air here yet.</p>
+  <footer>Played by <a href="https://nixamp.com">nixamp</a>, on the Moshpit.</footer>
+</main>
+<script>${SCRIPT}</script>
+</body>
+</html>
+`;
+export const GUIDE_CSP = [
+    "default-src 'none'", `script-src ${hash(SCRIPT)}`, `style-src ${hash(STYLE)}`, "connect-src 'self'",
+    "img-src 'self' data:", "base-uri 'none'", "form-action 'none'", "frame-ancestors 'none'",
+].join("; ");
+/** The hosts whose front page is the guide (NIXAMP_GUIDE_HOSTS, comma-separated). */
+export function guideHosts(env = process.env) {
+    return new Set((env["NIXAMP_GUIDE_HOSTS"] ?? "").split(",").map((one) => one.trim().toLowerCase()).filter(Boolean));
+}

package/dist/station-mcp.d.ts CHANGED Viewed

@@ -22,6 +22,13 @@ export declare const STATION_TOOLS: ({
             listed?: undefined;
             basis?: undefined;
             note?: undefined;
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
             id?: undefined;
             private?: undefined;
         };
@@ -55,6 +62,13 @@ export declare const STATION_TOOLS: ({
             listed?: undefined;
             basis?: undefined;
             note?: undefined;
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
             private?: undefined;
         };
         required: string[];
@@ -110,6 +124,13 @@ export declare const STATION_TOOLS: ({
             listed?: undefined;
             basis?: undefined;
             note?: undefined;
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
             id?: undefined;
             private?: undefined;
         };
@@ -163,6 +184,13 @@ export declare const STATION_TOOLS: ({
             listed?: undefined;
             basis?: undefined;
             note?: undefined;
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
             private?: undefined;
         };
         required: string[];
@@ -198,6 +226,13 @@ export declare const STATION_TOOLS: ({
             listed?: undefined;
             basis?: undefined;
             note?: undefined;
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
             private?: undefined;
         };
         required: string[];
@@ -241,6 +276,13 @@ export declare const STATION_TOOLS: ({
             note: {
                 readonly type: "string";
             };
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
             private?: undefined;
         };
         required: string[];
@@ -269,6 +311,63 @@ export declare const STATION_TOOLS: ({
                 type: "string";
                 description: string;
             };
+            video: {
+                type: string;
+            };
+            minItems: {
+                type: string;
+            };
+            minFilms: {
+                type: string;
+            };
+            maxVideoRunning: {
+                type: string;
+            };
+            breaksEvery: {
+                type: string;
+            };
+            start: {
+                type: string;
+            };
+            off: {
+                type: string;
+            };
+            id?: undefined;
+            private?: undefined;
+        };
+        required?: undefined;
+    };
+} | {
+    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;
+            video?: undefined;
+            minItems?: undefined;
+            minFilms?: undefined;
+            maxVideoRunning?: undefined;
+            breaksEvery?: undefined;
+            start?: undefined;
+            off?: undefined;
+            server: {
+                type: "string";
+                description: string;
+            };
             id: {
                 type: "string";
                 description: string;

package/dist/station-mcp.js CHANGED Viewed

@@ -78,6 +78,18 @@ export const STATION_TOOLS = [
             required: ["id", "visibility"],
         },
     },
+    {
+        name: "station_auto",
+        description: "A station for every genre in the library (radio from music tags, TV from film genres), kept up to date after every library scan, with a short break between songs and films. Unlisted; publishing stays a separate step. off: true stops the automation.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                server: SERVER,
+                video: { type: "boolean" }, minItems: { type: "integer" }, minFilms: { type: "integer" },
+                maxVideoRunning: { type: "integer" }, breaksEvery: { type: "integer" }, start: { type: "boolean" }, off: { type: "boolean" },
+            },
+        },
+    },
     {
         name: "station_unpublish",
         description: "Take a station out of the directory, or make it private: its links stop working and listeners are disconnected.",
@@ -134,6 +146,10 @@ export async function callStationTool(name, args, options = {}) {
             const all = answer.body["stations"] ?? [];
             return say(all.length === 0 ? "No stations on this server yet." : all.map(line).join("\n"));
         }
+        if (name === "station_auto") {
+            const answer = await call("POST", "/api/v1/stations/auto", pick(["video", "minItems", "minFilms", "maxVideoRunning", "breaksEvery", "start", "off"]));
+            return answer.ok ? say(JSON.stringify(answer.body["report"], null, 2)) : refused(answer.body);
+        }
         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") {

package/dist/station-page.d.ts CHANGED Viewed

@@ -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<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, live = false;\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    if (!live) title(s);\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 title = (s) => {\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  };\n  // What is ahead of the speaker: the sound the player holds and has not\n  // played yet. A new title waits that long, so it changes with the song.\n  const ahead = () => {\n    if (!wanted || audio.paused || audio.buffered.length === 0) return 0;\n    return Math.max(0, Math.min(30, audio.buffered.end(audio.buffered.length - 1) - audio.currentTime));\n  };\n  const listen = () => {\n    if (!window.EventSource) return;\n    const events = new EventSource(api + \"/events\" + q);\n    events.addEventListener(\"hello\", (e) => { live = true; title(JSON.parse(e.data)); });\n    events.addEventListener(\"now\", (e) => {\n      const s = JSON.parse(e.data);\n      setTimeout(() => { title(s); say(s.nowPlaying ? \"Now playing \" + (s.nowPlaying.title || \"\") : \"\"); }, ahead() * 1000);\n    });\n    events.addEventListener(\"state\", () => poll());\n    events.onerror = () => { live = false; };\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  listen();\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.screen{display:block;width:100%;aspect-ratio:16/9;background:#000;border-radius:10px;margin:12px 0}\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    <video id=\"screen\" class=\"screen\" playsinline preload=\"none\" hidden></video>\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  // Sound, or a TV station's picture: the element is chosen by the first state.\n  let audio = new Audio();\n  audio.preload = \"none\";\n  let wired = false;\n  const wire = () => {\n    if (wired) return;\n    wired = true;\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  };\n  let wanted = false, retry = 0, timer = 0, last = null, live = false;\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    if (s.kind === \"video\" && audio.tagName !== \"VIDEO\") {\n      audio = $(\"#screen\");\n      audio.hidden = false;\n      wired = false;\n      wire();\n    }\n    document.title = s.name + \" \u00B7 nixamp\";\n    $(\"#name\").textContent = s.name;\n    $(\"#about\").textContent = s.description || \"\";\n    $(\"#about\").hidden = !s.description;\n    if (!live) title(s);\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 title = (s) => {\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  };\n  // What is ahead of the speaker: the sound the player holds and has not\n  // played yet. A new title waits that long, so it changes with the song.\n  const ahead = () => {\n    if (!wanted || audio.paused || audio.buffered.length === 0) return 0;\n    return Math.max(0, Math.min(30, audio.buffered.end(audio.buffered.length - 1) - audio.currentTime));\n  };\n  const listen = () => {\n    if (!window.EventSource) return;\n    const events = new EventSource(api + \"/events\" + q);\n    events.addEventListener(\"hello\", (e) => { live = true; title(JSON.parse(e.data)); });\n    events.addEventListener(\"now\", (e) => {\n      const s = JSON.parse(e.data);\n      setTimeout(() => { title(s); say(s.nowPlaying ? \"Now playing \" + (s.nowPlaying.title || \"\") : \"\"); }, ahead() * 1000);\n    });\n    events.addEventListener(\"state\", () => poll());\n    events.onerror = () => { live = false; };\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  wire();\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  listen();\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 CHANGED Viewed

@@ -29,6 +29,7 @@ button:focus-visible,input:focus-visible,a:focus-visible{outline:3px solid var(-
 label{display:flex;align-items:center;gap:8px;color:var(--muted);font-size:.9rem}
 input[type=range]{width:120px;accent-color:var(--accent)}
 .small{margin-top:20px;font-size:.85rem;color:var(--muted)}.small a{color:inherit}
+.screen{display:block;width:100%;aspect-ratio:16/9;background:#000;border-radius:10px;margin:12px 0}
 .sr{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap}
 @media (prefers-reduced-motion:no-preference){.live::before{animation:pulse 2s ease-in-out infinite}}
 @keyframes pulse{50%{opacity:.35}}
@@ -40,13 +41,29 @@ const SCRIPT = `
   const q = "?t=" + encodeURIComponent(token);
   const api = "/api/v1/stations/" + encodeURIComponent(id);
   const $ = (s) => document.querySelector(s);
-  const audio = new Audio();
+  // Sound, or a TV station's picture: the element is chosen by the first state.
+  let audio = new Audio();
   audio.preload = "none";
+  let wired = false;
+  const wire = () => {
+    if (wired) return;
+    wired = true;
+    audio.addEventListener("playing", () => { if (retry) say("Back on"); retry = 0; if (last) draw(last); });
+    audio.addEventListener("error", again);
+    audio.addEventListener("ended", again);
+    audio.addEventListener("stalled", () => { if (wanted && audio.readyState < 3) again(); });
+  };
   let wanted = false, retry = 0, timer = 0, last = null, live = false;
   const chip = (state, text) => { const c = $("#state"); c.className = "chip " + state; c.textContent = text; };
   const say = (text) => { $("#announce").textContent = text; };
   const draw = (s) => {
     last = s;
+    if (s.kind === "video" && audio.tagName !== "VIDEO") {
+      audio = $("#screen");
+      audio.hidden = false;
+      wired = false;
+      wire();
+    }
     document.title = s.name + " · nixamp";
     $("#name").textContent = s.name;
     $("#about").textContent = s.description || "";
@@ -100,10 +117,7 @@ const SCRIPT = `
     clearTimeout(timer);
     timer = setTimeout(join, Math.min(15000, 1000 * 2 ** Math.min(retry, 4)));
   };
-  audio.addEventListener("playing", () => { if (retry) say("Back on"); retry = 0; if (last) draw(last); });
-  audio.addEventListener("error", again);
-  audio.addEventListener("ended", again);
-  audio.addEventListener("stalled", () => { if (wanted && audio.readyState < 3) again(); });
+  wire();
   $("#play").addEventListener("click", () => { if (wanted) { stop(); say("Stopped"); } else { wanted = true; retry = 0; button(); join(); say("Playing"); } });
   $("#volume").addEventListener("input", (e) => { audio.volume = Number(e.target.value); });
   poll();
@@ -126,6 +140,7 @@ const PAGE = `<!doctype html>
 <main>
   <div class="card">
     <span id="state" class="chip unavailable" role="status">Loading</span>
+    <video id="screen" class="screen" playsinline preload="none" hidden></video>
     <h1 id="name">&nbsp;</h1>
     <p id="about" class="about" hidden></p>
     <div class="now" aria-live="polite"><div id="title" class="title"></div><div id="by" class="by"></div></div>

package/dist/station-routes.d.ts CHANGED Viewed

@@ -51,6 +51,11 @@ export interface StationContext {
     throttle?: () => {
         retryAfter: number;
     } | null;
+    /** Auto stations: run a sync with these settings (and keep them), or read them. */
+    auto?: {
+        sync: (input: Record<string, unknown>) => Promise<unknown>;
+        setting: () => unknown;
+    };
 }
 declare function links(ctx: StationContext, station: Station): {
     page: string;

package/dist/station-routes.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { StationError, channelOf, tokensMatch, } from "./stations.js";
 const LISTEN = /^\/api\/v1\/stations\/([a-z0-9]{10})\/(stream|state|listen\.m3u|events)$/;
 /** Whether this path is one a station's own link may open, without the server's key. */
 export function isStationListenPath(path) {
-    return LISTEN.test(path);
+    return LISTEN.test(path) || path === "/api/v1/stations/guide";
 }
 function fail(ctx, response, error) {
     if (error instanceof StationError) {
@@ -43,7 +43,10 @@ export function publicView(ctx, station) {
         state,
         // Tags, or nothing: a bare file name is the owner's, not the public's.
         nowPlaying: track && (track.title || track.artist) ? track : null,
-        format: state === "stopped" || state === "offline" ? null : { codec: "mp3", bitrateKbps: station.bitrate, sampleRate: 48_000, channels: 2 },
+        kind: station.video ? "video" : "audio",
+        format: state === "stopped" || state === "offline" ? null : station.video
+            ? { codec: "h264+aac", bitrateKbps: station.bitrate, sampleRate: 48_000, channels: 2 }
+            : { codec: "mp3", bitrateKbps: station.bitrate, sampleRate: 48_000, channels: 2 },
         listeners: ctx.runner.listeners(station.id),
     };
 }
@@ -68,6 +71,15 @@ export async function handleStations(request, response, path, url, ctx) {
     if (path !== "/api/v1/stations" && !path.startsWith("/api/v1/stations/"))
         return false;
     const method = request.method ?? "GET";
+    // The public guide: only stations their owner made public and listed, with
+    // their links, because public is what that means. Nothing else, ever.
+    if (path === "/api/v1/stations/guide" && (method === "GET" || method === "HEAD")) {
+        const listed = ctx.store.list().filter((one) => one.visibility === "public" && one.listed);
+        ctx.json(response, 200, {
+            stations: listed.map((one) => ({ ...publicView(ctx, one), page: links(ctx, one).page, m3u: links(ctx, one).m3u })),
+        });
+        return true;
+    }
     const listen = LISTEN.exec(path);
     if (listen) {
         const station = ctx.store.get(listen[1]);
@@ -261,6 +273,22 @@ export async function handleStations(request, response, path, url, ctx) {
             ctx.json(response, 405, { error: "GET or POST", code: "method_not_allowed" });
             return true;
         }
+        if (path === "/api/v1/stations/auto") {
+            if (!ctx.auto) {
+                ctx.json(response, 404, { error: "auto stations are not available here", code: "not_found" });
+                return true;
+            }
+            if (method === "GET") {
+                ctx.json(response, 200, { setting: ctx.auto.setting() });
+                return true;
+            }
+            if (method === "POST") {
+                ctx.json(response, 200, { report: await ctx.auto.sync(await body()) });
+                return true;
+            }
+            ctx.json(response, 405, { error: "GET or POST", code: "method_not_allowed" });
+            return true;
+        }
         const match = /^\/api\/v1\/stations\/([a-z0-9]{10})(?:\/([a-z-]+))?$/.exec(path);
         if (!match) {
             ctx.json(response, 404, { error: "no such station", code: "not_found" });

package/dist/station-runner.d.ts CHANGED Viewed

@@ -26,6 +26,8 @@ export interface RunnerDeps {
     /** Told when a station is restarted after an unexpected end, and when a file will not play. */
     onRestart?: (id: string) => void;
     onFailure?: (id: string) => void;
+    /** A file for a break on a radio (false) or TV (true) station, or null for none. */
+    breaks?: (video: boolean) => Promise<string | null>;
 }
 /** Something a listener is connected through, that can be ended. */
 export interface Ending {

package/dist/station-runner.js CHANGED Viewed

@@ -107,6 +107,9 @@ export class StationRunner {
                         return now ? this.playable(now) : [];
                     },
                     excluded: (file) => store.isExcluded(id, file),
+                    ...(station.breaksEvery > 0 && this.deps.breaks
+                        ? { breaks: { everySeconds: station.breaksEvery, next: () => this.deps.breaks(station.video) } }
+                        : {}),
                     onFailure: ({ file, reason }) => {
                         this.errors.set(id, reason);
                         this.deps.onFailure?.(id);

package/dist/station-usage.d.ts CHANGED Viewed

@@ -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 | --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.";
+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  nixamp station auto [--no-video] [--min 10] [--films 3] [--tv 2] [--breaks 600] [--no-start]\n                     a station per genre, kept in step with the library (--off stops it)\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 CHANGED Viewed

@@ -13,6 +13,8 @@ export const USAGE = `nixamp station — make a collection into a station
   nixamp station unpublish ID [--private]
   nixamp station link ID [--rotate]
   nixamp station delete ID
+  nixamp station auto [--no-video] [--min 10] [--films 3] [--tv 2] [--breaks 600] [--no-start]
+                     a station per genre, kept in step with the library (--off stops it)
   --json        machine-readable output
   --url, --key  another server, as with \`nixamp admin\`

package/dist/stations.d.ts CHANGED Viewed

@@ -26,6 +26,12 @@ export interface Station {
     listenToken: string;
     /** Audio bitrate of the station's rendition, in kbps. */
     bitrate: number;
+    /** A TV station: pictures as well as sound. */
+    video: boolean;
+    /** A break (advert or ident) at most this often, in seconds; 0 for none. */
+    breaksEvery: number;
+    /** Made and kept up to date by auto stations (e.g. "genre:audio:rock"); "" for one a person made. */
+    auto: string;
     rights: Rights | null;
     /** nixamp.com account that made it, "" when made with the control key. */
     owner: string;
@@ -59,6 +65,8 @@ export interface StationInput {
     shuffle?: unknown;
     repeat?: unknown;
     bitrate?: unknown;
+    video?: unknown;
+    breaksEvery?: unknown;
 }
 /** The stations of one server, kept in one file beside its keys. */
 export declare class StationStore {
@@ -77,6 +85,10 @@ export declare class StationStore {
     /** The station a create with this key already made. */
     byIdempotencyKey(key: string): Station | undefined;
     create(input: StationInput, items: string[], owner: string, now?: number, idempotencyKey?: string): Station;
+    private breaksFrom;
+    /** Mark a station as made by auto stations, so a later sync updates it rather than making another. */
+    markAuto(id: string, key: string): Station;
+    byAuto(key: string): Station | undefined;
     private bitrateFrom;
     /** Name, words, files and rotation. Who may listen is changed by publish/unpublish. */
     update(id: string, input: StationInput, items: string[] | null, now?: number): Station;
@@ -126,6 +138,8 @@ export interface PublicStation {
     description: string;
     visibility: Visibility;
     state: Observed;
+    /** Radio or TV. */
+    kind: "audio" | "video";
     nowPlaying: {
         title: string;
         artist: string;

package/dist/stations.js CHANGED Viewed

@@ -121,6 +121,9 @@ export class StationStore {
                         owner: one.owner ?? "",
                         description: one.description ?? "",
                         idempotencyKey: one.idempotencyKey ?? "",
+                        video: one.video ?? false,
+                        breaksEvery: one.breaksEvery ?? 0,
+                        auto: one.auto ?? "",
                     });
                 }
             }
@@ -169,6 +172,9 @@ export class StationStore {
             desired: "stopped",
             listenToken: newToken(),
             bitrate: this.bitrateFrom(input.bitrate),
+            video: input.video === true,
+            breaksEvery: this.breaksFrom(input.breaksEvery),
+            auto: "",
             rights: null,
             owner,
             failures: {},
@@ -180,6 +186,24 @@ export class StationStore {
         this.save();
         return station;
     }
+    breaksFrom(value) {
+        if (value === undefined || value === null || value === 0)
+            return 0;
+        if (typeof value !== "number" || !Number.isInteger(value) || value < 120 || value > 86_400) {
+            throw new StationError("invalid_breaks", "breaksEvery is seconds between breaks, from 120 to 86400, or 0 for none");
+        }
+        return value;
+    }
+    /** Mark a station as made by auto stations, so a later sync updates it rather than making another. */
+    markAuto(id, key) {
+        const station = this.require(id);
+        station.auto = key;
+        this.save();
+        return station;
+    }
+    byAuto(key) {
+        return [...this.stations.values()].find((one) => one.auto === key);
+    }
     bitrateFrom(value) {
         if (value === undefined)
             return DEFAULT_BITRATE;
@@ -205,6 +229,8 @@ export class StationStore {
             station.repeat = input.repeat !== false;
         if (input.bitrate !== undefined)
             station.bitrate = this.bitrateFrom(input.bitrate);
+        if (input.breaksEvery !== undefined)
+            station.breaksEvery = this.breaksFrom(input.breaksEvery);
         if (items !== null) {
             if (items.length === 0)
                 throw new StationError("empty_station", "a station needs at least one file that plays");

package/package.json CHANGED Viewed

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