nixamp 0.44.0 → 0.45.3

package/dist/station-routes.d.ts

@@ -83,6 +83,8 @@ export interface StationContext {
     };
     /** The public stations other servers list (guide peers); absent when there are none. */
     peers?: () => Promise<unknown[]>;
+    /** Live rooms members published to this guide (guide-rooms.ts); absent when this server keeps none. */
+    rooms?: () => Promise<unknown[]>;
 }
 declare function links(ctx: StationContext, station: Station, base?: string): {
     page: string;

package/dist/station-routes.js

@@ -100,7 +100,9 @@ export async function handleStations(request, response, path, url, ctx) {
         const shown = new Set(own.map((one) => one.page));
         const others = url.searchParams.has("local") || !ctx.peers ? [] : (await ctx.peers())
             .filter((one) => !shown.has(one.page));
-        ctx.json(response, 200, { stations: [...own, ...others] });
+        // Rooms are this guide's own; a peer asking for its stations does not list them twice.
+        const rooms = url.searchParams.has("local") || !ctx.rooms ? [] : await ctx.rooms();
+        ctx.json(response, 200, { stations: [...rooms, ...own, ...others] });
         return true;
     }
     const listen = LISTEN.exec(path);

package/package.json

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

package/src/guide-rooms.ts

@@ -0,0 +1,300 @@
+/**
+ * Live rooms on the station guide.
+ *
+ * A room is a channel, or the live stream, of any nixamp server: the address
+ * a Share or a "?play=" link carries, `https://host:port/api/channels/<id>?k=KEY`
+ * or `https://host:port/api/live?k=KEY`. A nixamp.com member publishes one with
+ * a rights basis, as a station is published; the guide lists it beside the
+ * stations, and its card opens /watch?play=<that address>, which plays it as
+ * a film or as radio, whichever it carries.
+ *
+ * Nothing here plays anything: the room's own server does, and this only asks
+ * it, now and then, whether the room is on the air and what is on it.
+ */
+import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { randomBytes } from "node:crypto";
+import type { IncomingMessage, ServerResponse } from "node:http";
+import { readConfig } from "./library.ts";
+import type { GuideEntry } from "./station-guide.ts";
+
+/** Why a room may be broadcast, the same five reasons a station gives. */
+export const ROOM_BASES = ["owned", "permission", "licensed", "creative-commons", "public-domain"] as const;
+export type RoomBasis = typeof ROOM_BASES[number];
+
+export interface GuideRoom {
+  id: string;
+  /** The room's stream address, with its listen key. */
+  play: string;
+  name: string;
+  kind: "audio" | "video";
+  basis: RoomBasis;
+  note: string;
+  /** The nixamp.com account that published it ("" for this server's owner). */
+  by: string;
+  publishedAt: number;
+}
+
+/** Rooms one member may have on the guide at once, and rooms on it in all. */
+export const ROOMS_PER_MEMBER = 5;
+export const ROOMS_MAX = 200;
+const STATE_TTL_MS = 15_000;
+const PROBE_TIMEOUT_MS = 4_000;
+
+/**
+ * A room's address taken apart, or null when it is not one: https (http only
+ * for a loopback address, for tests), a channel or the live stream, a key,
+ * and nothing else in the query.
+ */
+export function roomAddress(input: string): { origin: string; channel: string | null; key: string; play: string } | null {
+  let url: URL;
+  try {
+    url = new URL(input.trim());
+  } catch {
+    return null;
+  }
+  const loopback = url.hostname === "127.0.0.1" || url.hostname === "localhost";
+  if (url.protocol !== "https:" && !(url.protocol === "http:" && loopback)) return null;
+  if (url.username || url.password || url.hash) return null;
+  const channel = /^\/api\/channels\/([A-Za-z0-9._~-]{1,120})\/?$/.exec(url.pathname);
+  const live = /^\/api\/live\/?$/.test(url.pathname);
+  if (!channel && !live) return null;
+  const key = url.searchParams.get("k") ?? "";
+  if (!/^[A-Za-z0-9_-]{8,128}$/.test(key) || [...url.searchParams.keys()].some((name) => name !== "k")) return null;
+  const path = channel ? `/api/channels/${channel[1]}` : "/api/live";
+  return { origin: url.origin, channel: channel ? channel[1]! : null, key, play: `${url.origin}${path}?k=${key}` };
+}
+
+/** Where the guide links a room's page: config `watchBase`, NIXAMP_WATCH_BASE, else this server. */
+export function watchBase(fallback: string, env: Record<string, string | undefined> = process.env): string {
+  const saved = (() => { try { return readConfig().watchBase ?? ""; } catch { return ""; } })();
+  const chosen = (env["NIXAMP_WATCH_BASE"] || saved || fallback).trim().replace(/\/+$/, "");
+  return /^https?:\/\/[^\s"<>]+$/.test(chosen) ? chosen : fallback;
+}
+
+export const watchPage = (base: string, play: string): string => `${base}/watch?play=${encodeURIComponent(play)}`;
+
+export class RoomStore {
+  private rooms: GuideRoom[] = [];
+  constructor(private readonly file: string) {
+    try {
+      if (existsSync(file)) {
+        const saved = JSON.parse(readFileSync(file, "utf8")) as { rooms?: GuideRoom[] };
+        this.rooms = (saved.rooms ?? []).filter((one) => roomAddress(one.play) !== null);
+      }
+    } catch {
+      // Unreadable is empty; the next write replaces it.
+    }
+  }
+
+  static fileFor(stateDir: string, port: number): string {
+    return join(stateDir, `guide-rooms-${port}.json`);
+  }
+
+  list(): GuideRoom[] {
+    return [...this.rooms];
+  }
+
+  get(id: string): GuideRoom | undefined {
+    return this.rooms.find((one) => one.id === id);
+  }
+
+  /** Publishes a room, or refreshes the one already published at that address. */
+  put(room: Omit<GuideRoom, "id" | "publishedAt">): GuideRoom {
+    const existing = this.rooms.find((one) => one.play === room.play);
+    const saved: GuideRoom = { ...room, id: existing?.id ?? randomBytes(6).toString("base64url"), publishedAt: Date.now() };
+    this.rooms = [...this.rooms.filter((one) => one.play !== room.play), saved];
+    this.save();
+    return saved;
+  }
+
+  remove(id: string): boolean {
+    const before = this.rooms.length;
+    this.rooms = this.rooms.filter((one) => one.id !== id);
+    if (this.rooms.length === before) return false;
+    this.save();
+    return true;
+  }
+
+  private save(): void {
+    writeFileSync(`${this.file}.part`, `${JSON.stringify({ version: 1, rooms: this.rooms }, null, 2)}\n`);
+    renameSync(`${this.file}.part`, this.file);
+  }
+}
+
+export interface RoomState {
+  /** Whether the room's server says it is on the air. */
+  live: boolean;
+  name: string;
+  kind: "audio" | "video";
+  nowPlaying: { title: string; artist: string } | null;
+}
+
+interface ChannelRow {
+  id: string;
+  name?: string;
+  kind?: string;
+  live?: boolean;
+  codecs?: { tags?: { title?: string; artist?: string } };
+}
+
+/** Asks a room's own server what is on it: its channel list for a channel, the stream's headers for the live stream. */
+export class RoomProbe {
+  private cache = new Map<string, { at: number; state: RoomState | null }>();
+  /**
+   * `refuse` names why an address may not be fetched from this machine (a
+   * private or loopback network), or "": a member chooses the address, and
+   * this server must not become their way into its own network.
+   */
+  constructor(
+    private readonly fetcher: typeof fetch = fetch,
+    private readonly refuse: (link: string) => Promise<string> = async () => "",
+  ) {}
+
+  async state(play: string, fresh = false): Promise<RoomState | null> {
+    const cached = this.cache.get(play);
+    if (!fresh && cached && Date.now() - cached.at < STATE_TTL_MS) return cached.state;
+    const state = await this.ask(play).catch(() => null);
+    this.cache.set(play, { at: Date.now(), state });
+    if (this.cache.size > 500) this.cache.delete(this.cache.keys().next().value!);
+    return state;
+  }
+
+  private async ask(play: string): Promise<RoomState | null> {
+    const address = roomAddress(play);
+    if (!address || (await this.refuse(address.play)) !== "") return null;
+    if (address.channel !== null) {
+      const answer = await this.fetcher(`${address.origin}/api/channels?k=${address.key}`, { signal: AbortSignal.timeout(PROBE_TIMEOUT_MS), redirect: "error" });
+      if (!answer.ok) return null;
+      const body = (await answer.json()) as { channels?: ChannelRow[] };
+      const row = (body.channels ?? []).find((one) => one.id === address.channel);
+      if (!row) return null;
+      const tags = row.codecs?.tags;
+      return {
+        live: row.live !== false,
+        name: String(row.name ?? address.channel).replace(/\/+$/, "").slice(0, 120),
+        kind: row.kind === "video" ? "video" : "audio",
+        nowPlaying: tags && (tags.title || tags.artist) ? { title: String(tags.title ?? ""), artist: String(tags.artist ?? "") } : null,
+      };
+    }
+    // The live stream: on the air when it answers with media.
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS);
+    try {
+      const answer = await this.fetcher(address.play, { signal: controller.signal, redirect: "error" });
+      const type = answer.headers.get("content-type") ?? "";
+      controller.abort();
+      if (!answer.ok) return null;
+      return { live: true, name: "Live", kind: type.startsWith("video/") ? "video" : "audio", nowPlaying: null };
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+}
+
+/** The rooms as guide cards: the page to open, on the air or not, and what is on. */
+export async function roomEntries(store: RoomStore, probe: RoomProbe, base: string): Promise<GuideEntry[]> {
+  return Promise.all(store.list().map(async (room) => {
+    const state = await probe.state(room.play);
+    return {
+      id: room.id,
+      name: room.name,
+      kind: state?.kind ?? room.kind,
+      group: "rooms" as const,
+      state: state?.live ? "live" : "offline",
+      page: watchPage(base, room.play),
+      nowPlaying: state?.nowPlaying ?? null,
+    };
+  }));
+}
+
+export interface RoomContext {
+  store: RoomStore;
+  probe: RoomProbe;
+  /** The page base for a room's card. */
+  base: string;
+  /** Whether the request holds this server's control key (or is its signed-in owner). */
+  canControl: boolean;
+  /** The nixamp.com account behind the request's session, or "". */
+  member: () => Promise<string>;
+  json: (response: ServerResponse, status: number, body: unknown) => void;
+  /** The request body: server.ts's raw text, which handleRooms parses as JSON. */
+  readBody: (request: IncomingMessage) => Promise<unknown>;
+  /** Refused by the caller's rate limit, or null. */
+  throttle?: () => { retryAfter: number } | null;
+}
+
+/** Answers /api/v1/guide/rooms; false when the path is not one. */
+export async function handleRooms(request: IncomingMessage, response: ServerResponse, path: string, ctx: RoomContext): Promise<boolean> {
+  if (path !== "/api/v1/guide/rooms" && !path.startsWith("/api/v1/guide/rooms/")) return false;
+  const method = request.method ?? "GET";
+  if (path === "/api/v1/guide/rooms" && (method === "GET" || method === "HEAD")) {
+    ctx.json(response, 200, { rooms: await roomEntries(ctx.store, ctx.probe, ctx.base) });
+    return true;
+  }
+  const by = ctx.canControl ? "" : await ctx.member();
+  if (!ctx.canControl && by === "") {
+    ctx.json(response, 401, { error: "sign in to nixamp.com to publish a live room", code: "sign_in" });
+    return true;
+  }
+  const refused = ctx.throttle?.();
+  if (refused) {
+    response.setHeader("retry-after", String(refused.retryAfter));
+    ctx.json(response, 429, { error: "too many changes; wait a moment", code: "throttled" });
+    return true;
+  }
+  if (path === "/api/v1/guide/rooms" && method === "POST") {
+    // server.ts hands over the raw text; a body that was never parsed has no
+    // `play`, and every publish read as a bad address.
+    const raw = await ctx.readBody(request).catch(() => null);
+    const body = (typeof raw === "string" ? (() => { try { return JSON.parse(raw) as unknown; } catch { return null; } })() : raw) as { play?: unknown; basis?: unknown; note?: unknown; title?: unknown; agree?: unknown } | null;
+    const address = roomAddress(typeof body?.play === "string" ? body.play : "");
+    if (!address) {
+      ctx.json(response, 400, { error: "play must be a nixamp room's stream address: https://host/api/channels/<id>?k=KEY", code: "bad_address" });
+      return true;
+    }
+    const basis = ROOM_BASES.find((one) => one === body?.basis);
+    if (!basis || body?.agree !== true) {
+      ctx.json(response, 400, { error: "say why it may be broadcast (owned, permission, licensed, creative-commons or public-domain) and agree", code: "basis_required" });
+      return true;
+    }
+    const state = await ctx.probe.state(address.play, true);
+    if (!state) {
+      ctx.json(response, 404, { error: "that room is not on its server, or the key does not open it", code: "not_found" });
+      return true;
+    }
+    const all = ctx.store.list();
+    const mine = all.filter((one) => one.by === by && one.play !== address.play);
+    if (by !== "" && mine.length >= ROOMS_PER_MEMBER) {
+      ctx.json(response, 409, { error: `a member may have ${ROOMS_PER_MEMBER} rooms on the guide; take one off first`, code: "too_many" });
+      return true;
+    }
+    if (!all.some((one) => one.play === address.play) && all.length >= ROOMS_MAX) {
+      ctx.json(response, 409, { error: "the guide is full", code: "full" });
+      return true;
+    }
+    const taken = all.find((one) => one.play === address.play);
+    if (taken && taken.by !== by && !ctx.canControl) {
+      ctx.json(response, 409, { error: "somebody else published that room", code: "taken" });
+      return true;
+    }
+    const title = typeof body?.title === "string" ? body.title.trim().slice(0, 120) : "";
+    const note = typeof body?.note === "string" ? body.note.trim().slice(0, 300) : "";
+    const room = ctx.store.put({ play: address.play, name: title || state.name, kind: state.kind, basis, note, by: taken?.by ?? by });
+    ctx.json(response, 200, { room: { id: room.id, name: room.name, kind: room.kind, basis: room.basis }, page: watchPage(ctx.base, room.play) });
+    return true;
+  }
+  const one = /^\/api\/v1\/guide\/rooms\/([A-Za-z0-9_-]{1,32})$/.exec(path);
+  if (one && method === "DELETE") {
+    const room = ctx.store.get(one[1]!);
+    if (!room || (!ctx.canControl && room.by !== by)) {
+      ctx.json(response, 404, { error: "no such room of yours on the guide", code: "not_found" });
+      return true;
+    }
+    ctx.store.remove(room.id);
+    ctx.json(response, 200, { removed: room.id });
+    return true;
+  }
+  ctx.json(response, 405, { error: "method not allowed", code: "method_not_allowed" });
+  return true;
+}

package/src/library.ts

@@ -31,6 +31,8 @@ export interface Config {
   guideHosts?: string[];
   /** Other servers (https base addresses) whose public, listed stations this guide shows too. */
   guidePeers?: string[];
+  /** Where the guide links a published live room's page (https://live.streaming.pit.world); this server's own address when unset. */
+  watchBase?: string;
   /** crawlproof on the guide: tracker project id (site), ad slot and format (`nixamp station guide-ads`). */
   guideAds?: { site?: string; slot?: string; format?: "banner_300x250" | "text_link" };
   /** Station limits kept across restarts (station-metering.ts). */

package/src/pit-footer.ts

@@ -0,0 +1,40 @@
+/**
+ * The pit.world global footer (site name, search, ring, publish), fetched on
+ * the server and appended as the last thing in <body> of the nixamp.com pages.
+ *
+ * A module-level cache: the last good copy is served, and one older than an
+ * hour is refreshed in the background (3s timeout). A failed refresh keeps the
+ * old copy; with no copy at all the page goes out unchanged, so pit.world being
+ * down never breaks a page.
+ */
+const PIT_FOOTER_URL = "https://pit.world/snippets/footer.html?site=nixamp.com";
+const MAX_AGE_MS = 60 * 60 * 1000;
+
+let cached = "";
+let fetchedAt = 0;
+let inflight: Promise<void> | null = null;
+
+export function refreshPitFooter(): Promise<void> {
+  inflight ??= fetch(PIT_FOOTER_URL, { signal: AbortSignal.timeout(3000) })
+    .then(async (res) => {
+      const text = res.ok ? await res.text() : "";
+      if (!text.includes("data-pit-footer")) throw new Error(`pit footer: HTTP ${res.status}`);
+      cached = text;
+      fetchedAt = Date.now();
+    })
+    .catch(() => {
+      fetchedAt = Date.now() - MAX_AGE_MS + 60_000; // try again in a minute
+    })
+    .finally(() => {
+      inflight = null;
+    });
+  return inflight;
+}
+
+/** The page with the footer before its last </body>, or the page unchanged. */
+export function withPitFooter(page: string): string {
+  if (Date.now() - fetchedAt > MAX_AGE_MS) void refreshPitFooter();
+  if (!cached || page.includes("data-pit-footer")) return page;
+  const at = page.lastIndexOf("</body>");
+  return at < 0 ? page : page.slice(0, at) + cached + page.slice(at);
+}

package/src/server.ts

@@ -85,7 +85,9 @@ import { SUPPORT_CSP, SUPPORT_PAGE, Support, SupportError, SupportSubscriptions,
 import { LyricsFinder } from "./lyrics.ts";
 import { LyricsPublisher } from "./lyrics-publish.ts";
 import { aiKey } from "./ai-keys.ts";
-import { STATION_APP_CSP, STATION_PAGE, STATION_PAGE_CSP, STATION_PAGE_HTML } from "./station-page.ts";
+import { STATION_APP_CSP, STATION_PAGE, STATION_PAGE_CSP, STATION_PAGE_HTML, WATCH_APP_CSP } from "./station-page.ts";
+import { handleRooms, RoomProbe, roomEntries, RoomStore, watchBase } from "./guide-rooms.ts";
+import { withPitFooter } from "./pit-footer.ts";
 import { guideAds, guideCsp, guideHosts, guidePeers, peerBase, PeerGuides, renderGuide, type GuideEntry } from "./station-guide.ts";
 import { StationRunner } from "./station-runner.ts";
 import { StationError, StationStore, channelOf, stationOfChannel, type Station } from "./stations.ts";
@@ -1755,6 +1757,8 @@ export interface HandlerOptions {
     trustedProxies?: () => Set<string>;
     /** Other servers' public stations, for this guide to list beside its own. */
     peers?: PeerGuides;
+    /** Live rooms members published to this guide, and how to ask a room's server what is on it. */
+    rooms?: { store: RoomStore; probe: RoomProbe };
   };
   web: string | null;
   /** Branded clients on this same backend, keyed by an explicitly configured host. */
@@ -2710,6 +2714,10 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
       !/^\/support\/[a-z0-9-]{1,40}$/.test(path) && path !== "/support/cancel" && !/^\/api\/v1\/support\/[a-z0-9-]{1,40}$/.test(path) &&
       // A station's short link, which sends the browser to wherever it plays.
       !/^\/watch\/[a-z0-9]{10}$/.test(path) &&
+      // A live room's page: the room's own key travels in ?play=, checked by its server.
+      !(path === "/watch" && Boolean(options.stations?.rooms)) &&
+      // Live rooms on the guide: listed for anybody, published by a member (guide-rooms.ts).
+      !((path === "/api/v1/guide/rooms" || path.startsWith("/api/v1/guide/rooms/")) && Boolean(options.stations?.rooms)) &&
       !STATION_PAGE.test(path) &&
       !isPublicAsset &&
       !isGuidePage &&
@@ -2877,8 +2885,11 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
       });
       const own = new Set(entries.map((one) => one.page));
       const others = options.stations!.peers ? (await options.stations!.peers.entries()).filter((one) => !own.has(one.page)) : [];
+      const rooms = options.stations!.rooms
+        ? await roomEntries(options.stations!.rooms.store, options.stations!.rooms.probe, watchBase(options.stations!.publicBase?.() || `${encrypted ? "https" : "http"}://${request.headers.host ?? "localhost"}`))
+        : [];
       const ads = guideAds();
-      const page = renderGuide([...entries, ...others] as GuideEntry[], options.stations!.publicBase?.() ?? "", ads);
+      const page = renderGuide([...rooms, ...entries, ...others] as GuideEntry[], options.stations!.publicBase?.() ?? "", ads);
       response.writeHead(200, {
         "content-type": "text/html; charset=utf-8",
         "cache-control": "no-cache",
@@ -2892,6 +2903,46 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
 
     // The page a station's link opens. The same bytes for every station: it
     // reads its id and token from its own address.
+    // A live room's page: /watch?play=<a nixamp server's channel or live
+    // stream address>. The built page plays it in @profullstack/player, as a
+    // film or as radio; nothing about the room passes through here.
+    if (options.stations?.rooms && path === "/watch" && (request.method === "GET" || request.method === "HEAD")) {
+      const built = web !== null && isFile(join(web, "watch.html")) ? readFileSync(join(web, "watch.html")) : null;
+      if (!built) {
+        json(response, 404, { error: "this server was started without its web pages" });
+        return;
+      }
+      response.writeHead(200, {
+        "content-type": "text/html; charset=utf-8",
+        "cache-control": "no-cache",
+        "content-security-policy": WATCH_APP_CSP,
+        "referrer-policy": "no-referrer",
+        "x-content-type-options": "nosniff",
+      });
+      response.end(request.method === "HEAD" ? undefined : built);
+      return;
+    }
+
+    if (options.stations?.rooms && (path === "/api/v1/guide/rooms" || path.startsWith("/api/v1/guide/rooms/"))) {
+      const control = await controlOf();
+      const session = tokenFrom(request.headers) || url.searchParams.get("session") || "";
+      const rooms = options.stations.rooms;
+      await handleRooms(request, response, path, {
+        store: rooms.store,
+        probe: rooms.probe,
+        base: watchBase(options.stations.publicBase?.() || `https://${request.headers.host ?? "localhost"}`),
+        canControl: control.allowed,
+        member: async () => (session && options.owner ? (await options.owner.accountFor(session)) || "" : ""),
+        json,
+        readBody,
+        throttle: () => {
+          const verdict = guard.check(`rooms:${callerOf(request.headers, request.socket.remoteAddress, behindProxy)}`, STATION_CONTROL_LIMIT);
+          return verdict.ok ? null : { retryAfter: verdict.retryAfter };
+        },
+      });
+      return;
+    }
+
     if (options.stations && STATION_PAGE.test(path) && (request.method === "GET" || request.method === "HEAD")) {
       // The built page plays in @profullstack/player; the inline one is for a
       // server started without the web build.
@@ -3009,6 +3060,9 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
         ...(options.stations.lyrics ? { lyrics: options.stations.lyrics } : {}),
         ...(options.stations.lyricsPublisher ? { lyricsPublisher: options.stations.lyricsPublisher } : {}),
         ...(options.stations.peers ? { peers: () => options.stations!.peers!.entries() } : {}),
+        ...(options.stations.rooms ? {
+          rooms: () => roomEntries(options.stations!.rooms!.store, options.stations!.rooms!.probe, watchBase(options.stations!.publicBase?.() || `${scheme}://${request.headers.host ?? "localhost"}`)),
+        } : {}),
         throttle: () => {
           const verdict = guard.check(`stations:${control.account || callerOf(request.headers, request.socket.remoteAddress, behindProxy)}`, STATION_CONTROL_LIMIT);
           return verdict.ok ? null : { retryAfter: verdict.retryAfter };
@@ -6430,7 +6484,24 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           }
           const shell = subject ? readIfPossible(file) : null;
           if (subject && shell !== null) {
-            html(response, 200, joinDocument(shell, subject, eventSite ?? "https://nixamp.com"));
+            html(response, 200, requestHost === "nixamp.com" ? withPitFooter(joinDocument(shell, subject, eventSite ?? "https://nixamp.com")) : joinDocument(shell, subject, eventSite ?? "https://nixamp.com"));
+            return;
+          }
+        }
+        // nixamp.com's own pages (the app shell, the radio console) carry the
+        // pit.world global footer, appended on the way out. A local install
+        // serving the same files on its own host is left alone.
+        if (requestHost === "nixamp.com" && file.endsWith(".html") && (request.method === "GET" || request.method === "HEAD")) {
+          const shell = readIfPossible(file);
+          if (shell !== null) {
+            const page = withPitFooter(shell);
+            response.writeHead(200, {
+              ...CORS,
+              "content-type": "text/html; charset=utf-8",
+              "content-length": Buffer.byteLength(page),
+              "cache-control": "no-cache",
+            });
+            response.end(request.method === "HEAD" ? undefined : page);
             return;
           }
         }
@@ -7054,6 +7125,8 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
       const listed = directory ? directory.list().map((one) => peerBase(one.url)).filter(Boolean).slice(0, 100) : [];
       return [...new Set([...guidePeers(), ...listed])];
     }),
+    // Live rooms published to this guide; the probe never reaches this machine's own network.
+    rooms: { store: new RoomStore(RoomStore.fileFor(stateDir(), options.port)), probe: new RoomProbe(fetch, (link) => refusedDestination(link)) },
   };
   // Music handed over from BitTorrented, copied into a folder of our own.
   const importer = new Importer(join(stateDir(), `handoffs-${options.port}.json`), {

package/src/station-guide.ts

@@ -67,7 +67,7 @@ const SCRIPT = `
     } catch { button.textContent = "Could not report; try again"; button.disabled = false; }
   };
   const draw = (stations) => {
-    for (const group of ["ai", "shared", "radio", "tv"]) {
+    for (const group of ["rooms", "ai", "shared", "radio", "tv"]) {
       const grid = document.querySelector("#" + group);
       grid.replaceChildren();
       const list = stations.filter((s) => (s.group || (s.kind === "video" ? "tv" : "radio")) === group);
@@ -154,8 +154,8 @@ export interface GuideEntry {
   id?: string;
   name: string;
   kind: "audio" | "video";
-  /** ai, shared, radio or tv; from kind when absent. */
-  group?: "ai" | "shared" | "radio" | "tv";
+  /** rooms (live rooms, src/guide-rooms.ts), ai, shared, radio or tv; from kind when absent. */
+  group?: "rooms" | "ai" | "shared" | "radio" | "tv";
   state: string;
   page: string;
   nowPlaying: { title: string; artist: string } | null;
@@ -163,7 +163,7 @@ export interface GuideEntry {
   peer?: boolean;
 }
 
-const GROUPS = ["ai", "shared", "radio", "tv"] as const;
+const GROUPS = ["rooms", "ai", "shared", "radio", "tv"] as const;
 
 /**
  * The guide with its stations already in it, so it reads the same through a
@@ -186,7 +186,9 @@ export function renderGuide(entries: GuideEntry[], apiBase = "", ads: GuideAds =
   if (ads.site) page = page.replace("</head>", `<script data-site="${escape(ads.site)}" src="${CRAWLPROOF}/stats.js" async></script>\n</head>`);
   if (ads.slot) {
     const format = ads.format ?? "banner_300x250";
-    page = page.replace("  <footer>", `  <div class="ad-unit ad-${format}"><iframe src="${CRAWLPROOF}/api/ads/frame?slot=${encodeURIComponent(ads.slot)}&amp;format=${format}" title="Advertisement" loading="lazy" referrerpolicy="strict-origin-when-cross-origin" sandbox="allow-scripts allow-popups allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation" scrolling="no"></iframe></div>\n  <footer>`);
+    const slot = ads.slot;
+    // The one ad goes at the top of the content, never against the footer.
+    page = page.replace('<p class="lead">Radio and TV, on the air now. Pick one and press play.</p>\n', (lead) => `${lead}  <div class="ad-unit ad-${format}"><iframe src="${CRAWLPROOF}/api/ads/frame?slot=${encodeURIComponent(slot)}&amp;format=${format}" title="Advertisement" loading="lazy" referrerpolicy="strict-origin-when-cross-origin" sandbox="allow-scripts allow-popups allow-popups-to-escape-sandbox allow-top-navigation-by-user-activation" scrolling="no"></iframe></div>\n`);
   }
   const api = /^https:\/\/[^\s"<>]+$/.test(apiBase) ? apiBase.replace(/\/+$/, "") : "";
   return (page.replace('<p id="empty" class="empty">', entries.length ? '<p id="empty" class="empty" hidden>' : '<p id="empty" class="empty">')).replace("<body>", api ? `<body data-api="${escape(api)}">` : "<body>");
@@ -206,6 +208,8 @@ export const GUIDE_HTML = `<!doctype html>
 <main>
   <h1>Live</h1>
   <p class="lead">Radio and TV, on the air now. Pick one and press play.</p>
+  <h2 id="rooms-title" hidden>Live rooms</h2>
+  <div id="rooms" class="grid" aria-live="polite"></div>
   <h2 id="ai-title" hidden>AI Radio</h2>
   <div id="ai" class="grid" aria-live="polite"></div>
   <h2 id="shared-title" hidden>Shared by listeners</h2>
@@ -237,7 +241,7 @@ export const GUIDE_HTML = `<!doctype html>
     <button type="submit">Share it</button>
     <div id="status" role="status" aria-live="polite"></div>
   </form>
-  <footer>Played by <a href="https://nixamp.com">nixamp</a>, on the Moshpit.</footer>
+  <footer>Played by <a href="https://nixamp.com">nixamp</a>.</footer>
 </main>
 <script>${SCRIPT}</script>
 </body>

package/src/station-page.ts

@@ -217,6 +217,22 @@ export const STATION_PAGE_CSP = [
 ].join("; ");
 
 /** The built page: its own bundle, styles and player engines, only this server, never framed. */
+/**
+ * A live room's page (/watch): the same built page shape, but what it plays and
+ * asks about is on the room's own server, any https nixamp server.
+ */
+export const WATCH_APP_CSP = [
+  "default-src 'self'",
+  "style-src 'self' 'unsafe-inline'",
+  "media-src 'self' blob: https:",
+  "worker-src 'self' blob:",
+  "img-src 'self' data: blob: https:",
+  "connect-src 'self' https:",
+  "base-uri 'none'",
+  "form-action 'none'",
+  "frame-ancestors 'none'",
+].join("; ");
+
 export const STATION_APP_CSP = [
   "default-src 'self'",
   "style-src 'self' 'unsafe-inline'",

package/src/station-routes.ts

@@ -74,6 +74,8 @@ export interface StationContext {
   auto?: { sync: (input: Record<string, unknown>) => Promise<unknown>; setting: () => unknown };
   /** The public stations other servers list (guide peers); absent when there are none. */
   peers?: () => Promise<unknown[]>;
+  /** Live rooms members published to this guide (guide-rooms.ts); absent when this server keeps none. */
+  rooms?: () => Promise<unknown[]>;
 }
 
 function fail(ctx: StationContext, response: ServerResponse, error: unknown): void {
@@ -181,7 +183,9 @@ export async function handleStations(
     const shown = new Set(own.map((one) => one.page));
     const others = url.searchParams.has("local") || !ctx.peers ? [] : (await ctx.peers())
       .filter((one) => !shown.has((one as { page: string }).page));
-    ctx.json(response, 200, { stations: [...own, ...others] });
+    // Rooms are this guide's own; a peer asking for its stations does not list them twice.
+    const rooms = url.searchParams.has("local") || !ctx.rooms ? [] : await ctx.rooms();
+    ctx.json(response, 200, { stations: [...rooms, ...own, ...others] });
     return true;
   }