nixamp 0.71.0 → 0.72.0

package/dist/guide-vods.d.ts

@@ -14,7 +14,13 @@ export interface GuideVod {
     /** The nixamp.com account that published it ("" for this server's owner). */
     by: string;
     publishedAt: number;
+    /** What its download costs on nixamp.com, in cents; absent or 0 when it is not sold. */
+    priceCents?: number;
 }
+/** The bases a price may be put on: what the owner may sell, not just share. */
+export declare const SELLABLE_BASES: readonly RoomBasis[];
+/** $100: a price above that is a typo. */
+export declare const VOD_PRICE_MAX_CENTS = 10000;
 /** Files one member may have on the guide at once, and files on it in all. */
 export declare const VODS_PER_MEMBER = 25;
 export declare const VODS_MAX = 1000;
@@ -84,6 +90,14 @@ export interface VodContext {
     throttle?: () => {
         retryAfter: number;
     } | null;
+    /** nixamp.com's store grants (music-store.ts GrantVerifier), for a bought download. */
+    grants?: {
+        check: (grant: string) => Promise<{
+            kind: string;
+            artist: string;
+            server: string;
+        } | null>;
+    };
 }
 /** Answers /api/v1/guide/vods; false when the path is not one. */
 export declare function handleVods(request: IncomingMessage, response: ServerResponse, path: string, ctx: VodContext): Promise<boolean>;

package/dist/guide-vods.js

@@ -11,11 +11,21 @@
  *
  * Nothing here plays anything: the file's own server does, and this only asks
  * it, now and then, whether the file is still there and what it is.
+ *
+ * The guide's owner may put a price on one of its own (owned or public
+ * domain): watching stays free, and the page offers the file as a download,
+ * bought on nixamp.com (music-store.ts, kind "vod"). The grant nixamp.com
+ * signs opens /api/v1/guide/vods/<id>/download, which sends the buyer on to
+ * the file's server with `download=1`.
  */
 import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { randomBytes } from "node:crypto";
 import { ROOM_BASES } from "./guide-rooms.js";
+/** The bases a price may be put on: what the owner may sell, not just share. */
+export const SELLABLE_BASES = ["owned", "public-domain"];
+/** $100: a price above that is a typo. */
+export const VOD_PRICE_MAX_CENTS = 10_000;
 /** Files one member may have on the guide at once, and files on it in all. */
 export const VODS_PER_MEMBER = 25;
 export const VODS_MAX = 1000;
@@ -167,6 +177,7 @@ export function vodView(vod, base, state) {
         note: vod.note,
         basis: vod.basis,
         publishedAt: vod.publishedAt,
+        ...(vod.priceCents ? { priceCents: vod.priceCents } : {}),
         available: state !== null,
         play: vod.play,
         page: vodPage(base, vod.id),
@@ -178,6 +189,24 @@ export async function handleVods(request, response, path, ctx) {
         return false;
     const method = request.method ?? "GET";
     const one = /^\/api\/v1\/guide\/vods\/([A-Za-z0-9_-]{1,32})$/.exec(path);
+    const download = /^\/api\/v1\/guide\/vods\/([A-Za-z0-9_-]{1,32})\/download$/.exec(path);
+    if (download && (method === "GET" || method === "HEAD")) {
+        const grant = new URL(request.url ?? "/", "http://x").searchParams.get("grant") ?? "";
+        const scope = ctx.grants ? await ctx.grants.check(grant) : null;
+        const vod = ctx.store.get(download[1]);
+        if (!scope || scope.kind !== "vod" || scope.artist !== download[1] || scope.server !== new URL(ctx.base).origin) {
+            ctx.json(response, 403, { error: "that download link has expired or is not one of ours: open your purchase again for a fresh one", code: "bad_grant" });
+            return true;
+        }
+        if (!vod) {
+            ctx.json(response, 404, { error: "that video has been taken off this guide", code: "not_found" });
+            return true;
+        }
+        // The file's own server sends it, as an attachment.
+        response.writeHead(302, { location: `${vod.play}&download=1`, "cache-control": "private, no-store", "referrer-policy": "no-referrer" });
+        response.end();
+        return true;
+    }
     if (method === "GET" || method === "HEAD") {
         if (path === "/api/v1/guide/vods") {
             ctx.json(response, 200, { vods: await vodEntries(ctx.store, ctx.probe, ctx.base) });
@@ -243,7 +272,29 @@ export async function handleVods(request, response, path, ctx) {
         }
         const title = typeof body?.title === "string" ? body.title.trim().slice(0, 160) : "";
         const note = typeof body?.note === "string" ? body.note.trim().slice(0, 300) : "";
-        const vod = ctx.store.put({ play: address.play, name: title || state.name, kind: state.kind, duration: state.duration, basis, note, by: taken?.by ?? by });
+        const owner = taken?.by ?? by;
+        // A price, in dollars: only the owner, only on its own, only what it may sell. Left out, the old one stays.
+        let priceCents = taken?.priceCents ?? 0;
+        if (body?.price !== undefined && body.price !== null) {
+            const cents = Math.round(Number(body.price) * 100);
+            if (!ctx.canControl || owner !== "") {
+                ctx.json(response, 403, { error: "only the guide's owner sells downloads, of what it published itself", code: "not_owner" });
+                return true;
+            }
+            if (!Number.isFinite(cents) || cents < 0 || cents > VOD_PRICE_MAX_CENTS) {
+                ctx.json(response, 400, { error: `price is in dollars, 0 (not sold) to ${VOD_PRICE_MAX_CENTS / 100}`, code: "bad_price" });
+                return true;
+            }
+            if (cents > 0 && !SELLABLE_BASES.includes(basis)) {
+                ctx.json(response, 400, { error: `a download may be sold only of what you own or what is in the public domain, not ${basis}`, code: "not_sellable" });
+                return true;
+            }
+            priceCents = cents;
+        }
+        if (priceCents > 0 && !SELLABLE_BASES.includes(basis))
+            priceCents = 0;
+        // Published again without a title or a note keeps the ones it had (a price added later changes nothing else).
+        const vod = ctx.store.put({ play: address.play, name: title || taken?.name || state.name, kind: state.kind, duration: state.duration, basis, note: note || taken?.note || "", by: owner, ...(priceCents > 0 ? { priceCents } : {}) });
         ctx.json(response, 200, { vod: vodView(vod, ctx.base, state), page: vodPage(ctx.base, vod.id) });
         return true;
     }

package/dist/label-routes.js

@@ -107,11 +107,11 @@ export async function handleLabelRoutes(request, response, path, ctx) {
             const grant = url.searchParams.get("grant") ?? "";
             if (path === "/api/v1/label/zip") {
                 const scope = ctx.grants ? await ctx.grants.check(grant) : null;
-                if (!scope) {
+                if (!scope || scope.kind === "vod") {
                     ctx.json(response, 403, { error: "that download link has expired or is not one of ours: open your purchase again for a fresh one", code: "bad_grant" });
                     return true;
                 }
-                const zip = label.zipFor(scope);
+                const zip = label.zipFor({ ...scope, kind: scope.kind });
                 if (!zip) {
                     ctx.json(response, 404, { error: "nothing to download yet", code: "not_found" });
                     return true;

package/dist/library-cli.js

@@ -235,6 +235,13 @@ export async function libraryTool(argv) {
                 }
                 const title = items.length === 1 ? flag(argv, "--title") ?? "" : "";
                 const note = flag(argv, "--note") ?? "";
+                // Sold as a download on nixamp.com (the guide's owner only, owned or public domain); 0 stops selling it.
+                const priceFlag = flag(argv, "--price");
+                const price = priceFlag === undefined ? {} : { price: Number(priceFlag.replace(/^\$/, "")) };
+                if ("price" in price && !Number.isFinite(price.price)) {
+                    console.error("nixamp: --price is in dollars, like 1 or 2.50");
+                    return 2;
+                }
                 if (argv.includes("--dry-run")) {
                     console.log(`${items.map(itemLine).join("\n")}\n${items.length} to publish (--dry-run: nothing sent)`);
                     return 0;
@@ -252,7 +259,7 @@ export async function libraryTool(argv) {
                     const id = String(item["id"]);
                     let answer;
                     if (here)
-                        answer = await call("POST", "/api/v1/guide/vods", { item: id, basis, agree: true, title, note });
+                        answer = await call("POST", "/api/v1/guide/vods", { item: id, basis, agree: true, title, note, ...price });
                     else {
                         const play = String(((await call("GET", `/api/v1/library/items/${id}`)).body["item"] ?? {})["playAddress"] ?? "");
                         if (!play)
@@ -262,7 +269,7 @@ export async function libraryTool(argv) {
                                 const response = await fetch(`${guide}/api/v1/guide/vods`, {
                                     method: "POST",
                                     headers: { "content-type": "application/json", authorization: `Bearer ${session.token}` },
-                                    body: JSON.stringify({ play, basis, agree: true, title, note }),
+                                    body: JSON.stringify({ play, basis, agree: true, title, note, ...price }),
                                 });
                                 answer = { status: response.status, body: (await response.json().catch(() => ({}))) };
                             }

package/dist/library-routes.d.ts

@@ -27,7 +27,7 @@ export interface LibraryContext {
     retag: (tracks: Track[]) => void;
     sendFile: (request: IncomingMessage, response: ServerResponse, file: string, cache: string) => void;
     /** The file as a browser plays it (server.ts playFile): the bytes when it can, MP4 or MP3 when not. */
-    play?: (request: IncomingMessage, response: ServerResponse, file: string) => Promise<void>;
+    play?: (request: IncomingMessage, response: ServerResponse, file: string, download?: string) => Promise<void>;
     /** The item's public play address with the listen key, what a guide publishes on demand; "" when this server has none. */
     playAddress?: (id: string) => string;
     json: (response: ServerResponse, status: number, body: unknown) => void;

package/dist/library-routes.js

@@ -229,7 +229,11 @@ export async function handleLibrary(request, response, path, url, ctx) {
                     return fail(409, "source_disabled", "that item's source is turned off");
                 // On demand: what a VOD link plays, from the start and seekable when the browser takes the file as it is.
                 if (itemMatch[2] === "play" && ctx.play) {
-                    await ctx.play(request, response, item.path);
+                    // `download=1`: the same file as an attachment, named for what it is (a bought VOD download).
+                    const named = url.searchParams.get("download") === "1"
+                        ? (item.override.title || item.title || item.path.split("/").pop().replace(/\.[^.]+$/, "")).replace(/[\\/:*?"<>|\x00-\x1f]/g, "").slice(0, 160) || item.id
+                        : "";
+                    await ctx.play(request, response, item.path, named || undefined);
                     return true;
                 }
                 // Private: a browser may keep it, a shared cache may not.

package/dist/library-usage.d.ts

@@ -1,3 +1,3 @@
 /** `nixamp library` subcommands and usage, apart so help does not load the client. */
 export declare const LIBRARY_COMMANDS: Set<string>;
-export declare const LIBRARY_USAGE = "nixamp library \u2014 what this server has, indexed\n\n  nixamp library PATH                 the folder the daemon serves (set once)\n  nixamp library status               items by state, sources, last scans\n  nixamp library sources\n  nixamp library add PATH             index another folder (inside your home, not hidden)\n  nixamp library scan [SOURCE] [--force] [--wait]\n  nixamp library search WORDS [--artist A] [--album A] [--state failed] [--limit 20]\n  nixamp library show ITEM\n  nixamp library fix ITEM --title T [--artist A] [--album A] [--genre G] [--track N] [--year N]\n  nixamp library remove SOURCE        forget a folder; its files are not touched\n  nixamp library playlists\n  nixamp library playlist new NAME [ITEM...]\n  nixamp library playlist show|delete PLAYLIST\n  nixamp library playlist add PLAYLIST ITEM...\n  nixamp library publish ITEM... | FOLDER | WORDS --basis B [--title T] [--note N] [--dry-run]\n                                      on demand on live.streaming: a link that plays each from the start,\n                                      from any of your servers (needs nixamp login); --here for this server's own guide\n                                      (B: owned, permission, licensed, creative-commons, public-domain)\n  nixamp library vods                 what is published on demand, with each link\n  nixamp library unpublish VOD        take one off\n\n  --json        machine-readable output\n  --url, --key  another server, as with `nixamp admin`";
+export declare const LIBRARY_USAGE = "nixamp library \u2014 what this server has, indexed\n\n  nixamp library PATH                 the folder the daemon serves (set once)\n  nixamp library status               items by state, sources, last scans\n  nixamp library sources\n  nixamp library add PATH             index another folder (inside your home, not hidden)\n  nixamp library scan [SOURCE] [--force] [--wait]\n  nixamp library search WORDS [--artist A] [--album A] [--state failed] [--limit 20]\n  nixamp library show ITEM\n  nixamp library fix ITEM --title T [--artist A] [--album A] [--genre G] [--track N] [--year N]\n  nixamp library remove SOURCE        forget a folder; its files are not touched\n  nixamp library playlists\n  nixamp library playlist new NAME [ITEM...]\n  nixamp library playlist show|delete PLAYLIST\n  nixamp library playlist add PLAYLIST ITEM...\n  nixamp library publish ITEM... | FOLDER | WORDS --basis B [--title T] [--note N] [--dry-run]\n                                      on demand on live.streaming: a link that plays each from the start,\n                                      from any of your servers (needs nixamp login); --here for this server's own guide\n                                      (B: owned, permission, licensed, creative-commons, public-domain)\n                                      --price USD: sell it as a download on nixamp.com (guide owner, owned or\n                                      public-domain only; publish again with --price 0 to stop)\n  nixamp library vods                 what is published on demand, with each link\n  nixamp library unpublish VOD        take one off\n\n  --json        machine-readable output\n  --url, --key  another server, as with `nixamp admin`";

package/dist/library-usage.js

@@ -19,6 +19,8 @@ export const LIBRARY_USAGE = `nixamp library — what this server has, indexed
                                       on demand on live.streaming: a link that plays each from the start,
                                       from any of your servers (needs nixamp login); --here for this server's own guide
                                       (B: owned, permission, licensed, creative-commons, public-domain)
+                                      --price USD: sell it as a download on nixamp.com (guide owner, owned or
+                                      public-domain only; publish again with --price 0 to stop)
   nixamp library vods                 what is published on demand, with each link
   nixamp library unpublish VOD        take one off
 

package/dist/music-client.d.ts

@@ -32,7 +32,7 @@ export interface Catalogue {
 }
 export interface Bought {
     id: string;
-    kind: "song" | "album" | "artist";
+    kind: "song" | "album" | "artist" | "vod";
     title: string;
     artistName: string;
     server: string;

package/dist/music-store.d.ts

@@ -1,7 +1,9 @@
 import type { Db, Support } from "./support.ts";
-export type Kind = "song" | "album" | "artist";
-/** In cents. */
-export declare const PRICES: Record<Kind, number>;
+export type Kind = "song" | "album" | "artist" | "vod";
+/** In cents. A video on demand carries its own price, set where it is published. */
+export declare const PRICES: Record<Exclude<Kind, "vod">, number>;
+/** The guides whose videos may be sold here besides the known servers: live.streaming and NIXAMP_VOD_GUIDES. */
+export declare function vodGuides(env?: Record<string, string | undefined>): string[];
 export interface Scope {
     server: string;
     kind: Kind;
@@ -77,6 +79,8 @@ export declare class MusicStore {
     private ready;
     /** A server's catalogue, as it publishes it at /api/v1/label. */
     private catalogue;
+    /** A video on demand of a guide, at the price its owner set; refused when it is not for sale. */
+    private describeVod;
     /** What is for sale at this address, with its name and price; refused when there is no such thing. */
     describe(input: Record<string, unknown>): Promise<Scope & {
         title: string;
@@ -115,7 +119,7 @@ export declare class MusicStore {
     check(grant: string): (Scope & {
         exp: number;
     }) | null;
-    /** Where the zip of a purchase is made: on the server that holds the music. */
+    /** Where the zip of a purchase is made: on the server that holds the music (a video: its guide hands over the file). */
     zipUrl(purchase: Purchase): string;
     /** What anybody with the purchase's link (or the account) is shown. */
     view(purchase: Purchase): Record<string, unknown>;

package/dist/music-store.js

@@ -14,11 +14,21 @@
  * nixamp.com never holds the music. It signs a grant -- what was bought, from
  * which server, until when -- and the server asks nixamp.com whether a grant
  * is good before it plays or zips anything (/api/v1/store/grant).
+ *
+ * The same checkout sells a film or a recording on demand (kind "vod"): one
+ * published file of a station guide, at the price the guide's owner set on
+ * it. Its grant names the guide and the video's short id, and the guide's
+ * /api/v1/guide/vods/<id>/download hands over the file once it checks it.
  */
 import { createHmac, randomUUID, timingSafeEqual } from "node:crypto";
 import { SupportError, coinOf } from "./support.js";
-/** In cents. */
+/** In cents. A video on demand carries its own price, set where it is published. */
 export const PRICES = { song: 10, album: 100, artist: 200 };
+const VOD_ID = /^[A-Za-z0-9_-]{1,32}$/;
+/** The guides whose videos may be sold here besides the known servers: live.streaming and NIXAMP_VOD_GUIDES. */
+export function vodGuides(env = process.env) {
+    return ["https://live.streaming.pit.world", ...(env["NIXAMP_VOD_GUIDES"] ?? "").split(",")].map(serverBase).filter(Boolean);
+}
 const EMAIL = /^[^\s@<>"]{1,64}@[^\s@<>"]{1,190}\.[a-z]{2,24}$/i;
 const KEY = /^[a-f0-9]{10}$/;
 const ALBUM = /^[a-f0-9]{8}$/;
@@ -59,13 +69,13 @@ export function readGrant(secret, grant, now = Date.now()) {
     if (!Number.isFinite(exp) || exp < now)
         return null;
     const kind = parts[2];
-    if (!(kind in PRICES))
+    if (!(kind in PRICES) && kind !== "vod")
         return null;
     return { kind, artist: parts[3], album: parts[4] === "-" ? "" : parts[4], n: Number(parts[5]), server: Buffer.from(parts[6], "base64url").toString("utf8"), exp };
 }
 /** Whether a grant for `scope` covers this file of the catalogue. */
 export function covers(scope, artist, album, n) {
-    if (scope.artist !== artist)
+    if (scope.kind === "vod" || scope.artist !== artist)
         return false;
     if (scope.kind === "artist")
         return true;
@@ -149,8 +159,30 @@ export class MusicStore {
             throw new SupportError("That server's catalogue could not be read. Try again.", 502, "catalogue");
         return await response.json();
     }
+    /** A video on demand of a guide, at the price its owner set; refused when it is not for sale. */
+    async describeVod(input) {
+        const server = serverBase(input["server"]);
+        const known = server !== "" && (new URL(server).hostname.endsWith(".nixamp.com") || vodGuides().includes(server) || this.options.servers().includes(server));
+        if (!known)
+            throw new SupportError("That guide does not sell videos here.", 404, "not_found");
+        const id = String(input["vod"] ?? input["artist"] ?? "");
+        if (!VOD_ID.test(id))
+            throw new SupportError("No such video.", 404, "not_found");
+        const response = await (this.options.fetcher ?? fetch)(`${server}/api/v1/guide/vods/${id}`, { signal: AbortSignal.timeout(10_000), headers: { accept: "application/json" } });
+        if (response.status === 404)
+            throw new SupportError("No such video.", 404, "not_found");
+        if (!response.ok)
+            throw new SupportError("That guide could not be read. Try again.", 502, "catalogue");
+        const vod = (await response.json()).vod;
+        const cents = Number(vod?.priceCents ?? 0);
+        if (!vod || !Number.isInteger(cents) || cents <= 0)
+            throw new SupportError("That video is free to watch and not sold as a download.", 404, "not_for_sale");
+        return { server, kind: "vod", artist: id, album: "", n: 0, title: String(vod.name ?? id).slice(0, 160), artistName: String(vod.artist || "On demand").slice(0, 160), amountCents: cents, songs: 1 };
+    }
     /** What is for sale at this address, with its name and price; refused when there is no such thing. */
     async describe(input) {
+        if (input["kind"] === "vod")
+            return this.describeVod(input);
         // An opaque server id (music-hub.ts), or an https origin.
         const asked = String(input["server"] ?? "");
         const server = /^[a-f0-9]{10}$/.test(asked) ? (this.options.resolveServer?.(asked) ?? "") : serverBase(asked);
@@ -191,7 +223,7 @@ export class MusicStore {
             email,
             accountId: account?.id || email,
             order: `music-${id}`,
-            description: `${item.title} by ${item.artistName} (${item.kind === "song" ? "song" : item.kind === "album" ? "album" : "every album"}, MP3)`,
+            description: item.kind === "vod" ? `${item.title} (download)` : `${item.title} by ${item.artistName} (${item.kind === "song" ? "song" : item.kind === "album" ? "album" : "every album"}, MP3)`,
             metadata: { product: "music", purchase: id, kind: item.kind },
             redirect: this.link(id, token),
         });
@@ -240,6 +272,14 @@ export class MusicStore {
             return again ? row(again) : null;
         }
         const purchase = row(updated);
+        if (purchase.kind === "vod") {
+            await this.mail(purchase.email, `Your download: ${purchase.title}`, [
+                `Thank you. "${purchase.title}" is yours to download and keep.`,
+                `Download it, now or any time: ${this.link(purchase.id, purchase.token)}`,
+                `Sign in to nixamp.com with ${purchase.email} and everything you have bought is under My music on ${this.options.site}/music/me.`,
+            ]);
+            return purchase;
+        }
         await this.mail(purchase.email, `Your music: ${purchase.title}`, [
             `Thank you. "${purchase.title}" by ${purchase.artistName} is yours: MP3s with the cover art and the lyrics, in one zip.`,
             `Download it, now or any time: ${this.link(purchase.id, purchase.token)}`,
@@ -259,8 +299,10 @@ export class MusicStore {
     check(grant) {
         return readGrant(this.options.secret, grant, this.now());
     }
-    /** Where the zip of a purchase is made: on the server that holds the music. */
+    /** Where the zip of a purchase is made: on the server that holds the music (a video: its guide hands over the file). */
     zipUrl(purchase) {
+        if (purchase.kind === "vod")
+            return `${purchase.server}/api/v1/guide/vods/${purchase.artist}/download?grant=${encodeURIComponent(this.grant(purchase))}`;
         return `${purchase.server}/api/v1/label/zip?grant=${encodeURIComponent(this.grant(purchase))}`;
     }
     /** What anybody with the purchase's link (or the account) is shown. */

package/dist/server.js

@@ -2895,6 +2895,7 @@ export function createHandler(engine, options) {
                 },
                 json,
                 readBody,
+                grants: storeGrants,
                 throttle: () => {
                     const verdict = guard.check(`vods:${callerOf(request.headers, request.socket.remoteAddress, behindProxy)}`, STATION_CONTROL_LIMIT);
                     return verdict.ok ? null : { retryAfter: verdict.retryAfter };
@@ -2954,7 +2955,7 @@ export function createHandler(engine, options) {
                 probe: options.library.probe,
                 retag: options.library.retag,
                 sendFile,
-                play: (req, res, file) => playFile(req, res, file, url, options),
+                play: (req, res, file, download) => playFile(req, res, file, url, options, undefined, download),
                 playAddress: (id) => {
                     const publicBase = (options.stations?.publicBase?.() ?? "").replace(/\/+$/, "");
                     return publicBase && listenKey ? `${publicBase}/api/v1/library/items/${id}/play?k=${listenKey}` : "";
@@ -6876,7 +6877,13 @@ async function liveAudio(request, response, engine, ffmpeg, ffprobe) {
  * browser can; otherwise an MP4 or MP3 made on the way. `onPicture` hears
  * that ffprobe found a picture in it.
  */
-async function playFile(request, response, file, url, options, onPicture = () => undefined) {
+async function playFile(request, response, file, url, options, onPicture = () => undefined, 
+/** Sent as an attachment under this name (no extension: it depends on what is sent), for a bought download. */
+download = "") {
+    const attach = (ext) => {
+        if (download)
+            response.setHeader("content-disposition", `attachment; filename*=UTF-8''${encodeURIComponent(`${download}${ext}`)}`);
+    };
     // A browser asks for every track here, and a matroska or an avi handed
     // to it raw is bytes it cannot play. Seeking is what this route is for
     // and transcoding gives it up, but an unseekable film beats a silent
@@ -6892,6 +6899,7 @@ async function playFile(request, response, file, url, options, onPicture = () =>
     // keep up with playing it, so the answer is worth carrying in the URL.
     const allowHevc = url.searchParams.get("hevc") === "1";
     if (playsInBrowser(file) && capKbps === 0) {
+        attach(extname(file));
         sendFile(request, response, file);
         return;
     }
@@ -6908,10 +6916,12 @@ async function playFile(request, response, file, url, options, onPicture = () =>
             // added by an older nixamp goes to an audio element for ever, and
             // the only cure is noticing and adding it again.
             onPicture();
+            attach(".mp4");
             pipeFfmpeg(request, response, file, options.ffmpeg ?? ["ffmpeg"], videoArgs(codecs, capKbps, { allowHevc }), "video/mp4", transportInputArgs(file, codecs.container));
             return;
         }
     }
+    attach(".mp3");
     transcode(request, response, file, options.ffmpeg ?? ["ffmpeg"]);
 }
 function transcode(request, response, source, ffmpeg) {

package/dist/store-routes.js

@@ -2,6 +2,7 @@
  * The music store's pages and API on nixamp.com (music-store.ts).
  *
  *   GET  /buy?server=&kind=&artist=&album=&n=     what it is, the price, email + coin, Pay
+ *   GET  /buy?server=<guide>&kind=vod&vod=<id>     the same for a video on demand of a station guide
  *   GET  /purchases/:id?t=                        the receipt: waiting, or Download the zip
  *   GET  /api/v1/store/coins                      the coins nixamp's CoinPay business takes
  *   POST /api/v1/store/checkout                   {server, kind, artist, album?, n?, email, coin} -> {url}
@@ -94,6 +95,21 @@ export async function handleStoreRoutes(request, response, path, url, ctx) {
                 return true;
             }
             const me = await ctx.account().catch(() => null);
+            if (item.kind === "vod") {
+                html(response, 200, page(`Download ${item.title}`, `<div class="card">
+<h1>${escape(item.title)}</h1><p class="by">${escape(item.artistName)}</p>
+<div class="price">${price(item.amountCents)}</div>
+<ul><li>The whole file, to keep and play offline</li><li>Download again any time from your receipt or My music</li></ul>
+<form id="buy">
+<label for="email">Email (your download link goes here)</label>
+<input id="email" name="email" type="email" required autocomplete="email" value="${escape(me?.email ?? "")}">
+<button id="pay" type="submit">Pay ${price(item.amountCents)}</button>
+</form>
+<p id="status" role="status" aria-live="polite"></p>
+<small>Payments go through <a href="https://coinpayportal.com">CoinPay</a> to nixamp.com: pick any coin, or PayPal, on CoinPay's page. Watching it on demand stays free: <a href="${escape(`${item.server}/vod/${item.artist}`)}">back to the video</a>.${me ? "" : ` <a href="/?redirect=${encodeURIComponent("/music/me")}#account-panel">Sign in</a> with the same email to keep everything under My music.`}</small>
+</div>`, JSON.stringify({ server: item.server, kind: "vod", vod: item.artist })), method);
+                return true;
+            }
             const what = item.kind === "song" ? "One song" : item.kind === "album" ? `The album, ${item.songs} songs` : `Everything by ${escape(item.artistName)}, ${item.songs} songs so far`;
             const cover = item.kind === "artist" ? "" : `<img src="${escape(`/api/v1/music/file/${serverId(item.server)}/${item.artist}/${item.album}/cover.jpg`)}" alt="" width="160" height="160" style="border-radius:10px;float:right;margin:0 0 8px 12px;max-width:40%;height:auto">`;
             html(response, 200, page(`Download ${item.title}`, `<div class="card">${cover}
@@ -117,11 +133,15 @@ export async function handleStoreRoutes(request, response, path, url, ctx) {
                 html(response, 404, page("No such purchase", `<div class="card"><h1>No such purchase</h1><p class="by">That link is not one of ours.</p></div>`), method);
                 return true;
             }
-            const body = purchase.status === "paid"
+            const body = purchase.status === "paid" && purchase.kind === "vod"
                 ? `<div class="card"><h1>${escape(purchase.title)}</h1><p class="by">${escape(purchase.artistName)} · paid ${price(purchase.amountCents)}</p>
+<a class="go" href="${escape(store.zipUrl(purchase))}" download>Download the video</a>
+<small>Keep this page's address (it is in your email too) to download again. Signed in to nixamp.com as ${escape(purchase.email)}, everything you bought is under <a href="/music/me">My music</a>.</small></div>`
+                : purchase.status === "paid"
+                    ? `<div class="card"><h1>${escape(purchase.title)}</h1><p class="by">${escape(purchase.artistName)} · paid ${price(purchase.amountCents)}</p>
 <a class="go" href="${escape(store.zipUrl(purchase))}" download>Download the zip</a>
 <small>MP3s with the cover art and lyrics, plus each song's .lyrics.txt, cover.jpg and album.json. Keep this page's address (it is in your email too) to download again. Signed in to nixamp.com as ${escape(purchase.email)}, everything you bought is under <a href="/music/me">My music</a>, to play or download.</small></div>`
-                : `<div class="card"><h1>${escape(purchase.title)}</h1><p class="by">${escape(purchase.artistName)} · ${price(purchase.amountCents)}${escape(paidIn(purchase.coin))}</p>
+                    : `<div class="card"><h1>${escape(purchase.title)}</h1><p class="by">${escape(purchase.artistName)} · ${price(purchase.amountCents)}${escape(paidIn(purchase.coin))}</p>
 <p>Waiting for your payment. Once CoinPay confirms it, your download is here and in your email (${escape(purchase.email)}). This page checks again when you reload it.</p>
 <a class="go" href="${escape(payUrl(purchase.paymentId))}">Open the payment</a></div>`;
             html(response, 200, page(purchase.title, body), method);

package/package.json

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

package/src/guide-vods.ts

@@ -11,6 +11,12 @@
  *
  * Nothing here plays anything: the file's own server does, and this only asks
  * it, now and then, whether the file is still there and what it is.
+ *
+ * The guide's owner may put a price on one of its own (owned or public
+ * domain): watching stays free, and the page offers the file as a download,
+ * bought on nixamp.com (music-store.ts, kind "vod"). The grant nixamp.com
+ * signs opens /api/v1/guide/vods/<id>/download, which sends the buyer on to
+ * the file's server with `download=1`.
  */
 import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
@@ -32,8 +38,15 @@ export interface GuideVod {
   /** The nixamp.com account that published it ("" for this server's owner). */
   by: string;
   publishedAt: number;
+  /** What its download costs on nixamp.com, in cents; absent or 0 when it is not sold. */
+  priceCents?: number;
 }
 
+/** The bases a price may be put on: what the owner may sell, not just share. */
+export const SELLABLE_BASES: readonly RoomBasis[] = ["owned", "public-domain"];
+/** $100: a price above that is a typo. */
+export const VOD_PRICE_MAX_CENTS = 10_000;
+
 /** Files one member may have on the guide at once, and files on it in all. */
 export const VODS_PER_MEMBER = 25;
 export const VODS_MAX = 1000;
@@ -191,6 +204,7 @@ export function vodView(vod: GuideVod, base: string, state: VodState | null): Re
     note: vod.note,
     basis: vod.basis,
     publishedAt: vod.publishedAt,
+    ...(vod.priceCents ? { priceCents: vod.priceCents } : {}),
     available: state !== null,
     play: vod.play,
     page: vodPage(base, vod.id),
@@ -215,6 +229,8 @@ export interface VodContext {
   readBody: (request: IncomingMessage) => Promise<unknown>;
   /** Refused by the caller's rate limit, or null. */
   throttle?: () => { retryAfter: number } | null;
+  /** nixamp.com's store grants (music-store.ts GrantVerifier), for a bought download. */
+  grants?: { check: (grant: string) => Promise<{ kind: string; artist: string; server: string } | null> };
 }
 
 /** Answers /api/v1/guide/vods; false when the path is not one. */
@@ -222,6 +238,24 @@ export async function handleVods(request: IncomingMessage, response: ServerRespo
   if (path !== "/api/v1/guide/vods" && !path.startsWith("/api/v1/guide/vods/")) return false;
   const method = request.method ?? "GET";
   const one = /^\/api\/v1\/guide\/vods\/([A-Za-z0-9_-]{1,32})$/.exec(path);
+  const download = /^\/api\/v1\/guide\/vods\/([A-Za-z0-9_-]{1,32})\/download$/.exec(path);
+  if (download && (method === "GET" || method === "HEAD")) {
+    const grant = new URL(request.url ?? "/", "http://x").searchParams.get("grant") ?? "";
+    const scope = ctx.grants ? await ctx.grants.check(grant) : null;
+    const vod = ctx.store.get(download[1]!);
+    if (!scope || scope.kind !== "vod" || scope.artist !== download[1] || scope.server !== new URL(ctx.base).origin) {
+      ctx.json(response, 403, { error: "that download link has expired or is not one of ours: open your purchase again for a fresh one", code: "bad_grant" });
+      return true;
+    }
+    if (!vod) {
+      ctx.json(response, 404, { error: "that video has been taken off this guide", code: "not_found" });
+      return true;
+    }
+    // The file's own server sends it, as an attachment.
+    response.writeHead(302, { location: `${vod.play}&download=1`, "cache-control": "private, no-store", "referrer-policy": "no-referrer" });
+    response.end();
+    return true;
+  }
   if (method === "GET" || method === "HEAD") {
     if (path === "/api/v1/guide/vods") {
       ctx.json(response, 200, { vods: await vodEntries(ctx.store, ctx.probe, ctx.base) });
@@ -249,7 +283,7 @@ export async function handleVods(request: IncomingMessage, response: ServerRespo
   if (path === "/api/v1/guide/vods" && method === "POST") {
     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; item?: unknown; basis?: unknown; note?: unknown; title?: unknown; agree?: unknown } | null;
+      { play?: unknown; item?: unknown; basis?: unknown; note?: unknown; title?: unknown; agree?: unknown; price?: unknown } | null;
     // The owner may name one of this server's own items; everybody else hands over the address.
     const own = ctx.canControl && typeof body?.item === "string" && /^[0-9a-f]{16}$/.test(body.item) && ctx.ownPlay ? ctx.ownPlay(body.item) : "";
     const address = vodAddress(own || (typeof body?.play === "string" ? body.play : ""));
@@ -283,7 +317,28 @@ export async function handleVods(request: IncomingMessage, response: ServerRespo
     }
     const title = typeof body?.title === "string" ? body.title.trim().slice(0, 160) : "";
     const note = typeof body?.note === "string" ? body.note.trim().slice(0, 300) : "";
-    const vod = ctx.store.put({ play: address.play, name: title || state.name, kind: state.kind, duration: state.duration, basis, note, by: taken?.by ?? by });
+    const owner = taken?.by ?? by;
+    // A price, in dollars: only the owner, only on its own, only what it may sell. Left out, the old one stays.
+    let priceCents = taken?.priceCents ?? 0;
+    if (body?.price !== undefined && body.price !== null) {
+      const cents = Math.round(Number(body.price) * 100);
+      if (!ctx.canControl || owner !== "") {
+        ctx.json(response, 403, { error: "only the guide's owner sells downloads, of what it published itself", code: "not_owner" });
+        return true;
+      }
+      if (!Number.isFinite(cents) || cents < 0 || cents > VOD_PRICE_MAX_CENTS) {
+        ctx.json(response, 400, { error: `price is in dollars, 0 (not sold) to ${VOD_PRICE_MAX_CENTS / 100}`, code: "bad_price" });
+        return true;
+      }
+      if (cents > 0 && !SELLABLE_BASES.includes(basis)) {
+        ctx.json(response, 400, { error: `a download may be sold only of what you own or what is in the public domain, not ${basis}`, code: "not_sellable" });
+        return true;
+      }
+      priceCents = cents;
+    }
+    if (priceCents > 0 && !SELLABLE_BASES.includes(basis)) priceCents = 0;
+    // Published again without a title or a note keeps the ones it had (a price added later changes nothing else).
+    const vod = ctx.store.put({ play: address.play, name: title || taken?.name || state.name, kind: state.kind, duration: state.duration, basis, note: note || taken?.note || "", by: owner, ...(priceCents > 0 ? { priceCents } : {}) });
     ctx.json(response, 200, { vod: vodView(vod, ctx.base, state), page: vodPage(ctx.base, vod.id) });
     return true;
   }

package/src/label-routes.ts

@@ -128,11 +128,11 @@ export async function handleLabelRoutes(
       const grant = url.searchParams.get("grant") ?? "";
       if (path === "/api/v1/label/zip") {
         const scope = ctx.grants ? await ctx.grants.check(grant) : null;
-        if (!scope) {
+        if (!scope || scope.kind === "vod") {
           ctx.json(response, 403, { error: "that download link has expired or is not one of ours: open your purchase again for a fresh one", code: "bad_grant" });
           return true;
         }
-        const zip = label.zipFor(scope);
+        const zip = label.zipFor({ ...scope, kind: scope.kind as Exclude<typeof scope.kind, "vod"> });
         if (!zip) {
           ctx.json(response, 404, { error: "nothing to download yet", code: "not_found" });
           return true;

package/src/library-cli.ts

@@ -207,6 +207,10 @@ export async function libraryTool(argv: string[]): Promise<number> {
         if (typeof items === "string") { console.error(`nixamp: ${items}`); return 1; }
         const title = items.length === 1 ? flag(argv, "--title") ?? "" : "";
         const note = flag(argv, "--note") ?? "";
+        // Sold as a download on nixamp.com (the guide's owner only, owned or public domain); 0 stops selling it.
+        const priceFlag = flag(argv, "--price");
+        const price = priceFlag === undefined ? {} : { price: Number(priceFlag.replace(/^\$/, "")) };
+        if ("price" in price && !Number.isFinite(price.price)) { console.error("nixamp: --price is in dollars, like 1 or 2.50"); return 2; }
         if (argv.includes("--dry-run")) {
           console.log(`${items.map(itemLine).join("\n")}\n${items.length} to publish (--dry-run: nothing sent)`);
           return 0;
@@ -220,7 +224,7 @@ export async function libraryTool(argv: string[]): Promise<number> {
         for (const item of items) {
           const id = String(item["id"]);
           let answer: { status: number; body: Record<string, unknown> };
-          if (here) answer = await call("POST", "/api/v1/guide/vods", { item: id, basis, agree: true, title, note });
+          if (here) answer = await call("POST", "/api/v1/guide/vods", { item: id, basis, agree: true, title, note, ...price });
           else {
             const play = String((((await call("GET", `/api/v1/library/items/${id}`)).body["item"] ?? {}) as Record<string, unknown>)["playAddress"] ?? "");
             if (!play) answer = { status: 409, body: { error: "this server has no public address and listen key to play it from (set one with --public-url)", code: "no_address" } };
@@ -229,7 +233,7 @@ export async function libraryTool(argv: string[]): Promise<number> {
                 const response = await fetch(`${guide}/api/v1/guide/vods`, {
                   method: "POST",
                   headers: { "content-type": "application/json", authorization: `Bearer ${session!.token}` },
-                  body: JSON.stringify({ play, basis, agree: true, title, note }),
+                  body: JSON.stringify({ play, basis, agree: true, title, note, ...price }),
                 });
                 answer = { status: response.status, body: (await response.json().catch(() => ({}))) as Record<string, unknown> };
               } catch (error) {