nixamp 0.7.14 → 0.7.16

package/README.md

@@ -147,7 +147,7 @@ publish:
 
 ```
   List this stream at https://nixamp.com/directory so anyone can find it?
-  It publishes http://198.51.100.7:4321/s/Lk1EM_mP977e1VT — listen only,
+  It publishes http://198.51.100.7:4321/v/Lk1EM_mP977e1VT — listen only,
   not the controls. [Y/n]
 ```
 

package/dist/admin.js

@@ -7,7 +7,7 @@
  */
 import { createApp, themes } from "@profullstack/hqtui";
 import { daemonUrl, isLoopbackTls, readState } from "./daemon.js";
-import { KEY_HEADER } from "./share.js";
+import { KEY_HEADER, shareLink } from "./share.js";
 /** Where to point, from the flags or from the daemon that is running. */
 export function resolveTarget(argv) {
     const at = argv.findIndex((a) => a === "--url" || a === "-u");
@@ -29,7 +29,7 @@ export function resolveTarget(argv) {
             "  Or administer another machine, with its share link:\n" +
             "                    nixamp admin --url https://server1.you.nixamp.com:4321 --key KEY\n" +
             "  The URL and key are the two halves of the link that server printed:\n" +
-            "  https://host:4321/s/KEY");
+            "  https://host:4321/a/KEY");
     }
     const url_ = daemonUrl(state);
     // Talking to our own daemon, whose certificate names somewhere else. Nothing
@@ -231,7 +231,7 @@ export function draw(ui, theme, view) {
         const width = Math.max(...view.links.map((link) => link.label.length));
         ui.panel({ title: "Share links", size: view.links.length + (view.source ? 3 : 2) }, (p) => {
             for (const link of view.links) {
-                const full = view.key === null ? link.url : `${link.url}/s/${view.key}`;
+                const full = shareLink(link.url, view.key);
                 p.text(`${link.label.padEnd(width)}  ${full}`, {
                     fg: link.label === "on the internet" ? theme.accent : theme.foreground,
                 });

package/dist/audio.d.ts

@@ -17,7 +17,8 @@ export interface Tools {
 /**
  * Find the tools. A bare `ffmpeg` on PATH is tried first; mise shims are common
  * on developer machines and need `mise exec` because the shim itself fails when
- * no version is pinned.
+ * no version is pinned. Failing both, the places these are actually installed
+ * are looked in directly, because a detached daemon's PATH is not the operator's.
  */
 export declare function detectTools(): Tools;
 export declare function probe(tools: Tools, path: string): Track;

package/dist/audio.js

@@ -7,6 +7,9 @@
  * apart within seconds and the bars would stop matching what you hear.
  */
 import { spawn, spawnSync } from "node:child_process";
+import { readdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
 export const RATE = 44100;
 export const CHANNELS = 2;
 function works(argv) {
@@ -16,15 +19,55 @@ function works(argv) {
     const r = spawnSync(cmd, [...rest, "-version"], { encoding: "utf8", timeout: 10_000 });
     return !r.error && r.status === 0;
 }
+/**
+ * Everywhere a version manager or a package manager tends to leave ffmpeg.
+ *
+ * A daemon is started detached and inherits whatever environment happened to
+ * be around, which on a machine that installs ffmpeg through mise is a PATH
+ * with neither `ffmpeg` nor `mise` on it. Every probe then fails, and a
+ * failed probe means "no video stream" -- so a television channel arrived as
+ * its own soundtrack and nothing anywhere said why. Looking is cheaper than
+ * asking somebody to fix their PATH for a process they did not start.
+ *
+ * Newest first, so a machine with several installed uses the one it would
+ * have used anyway.
+ */
+function installedElsewhere(name) {
+    const home = homedir();
+    const roots = [
+        join(home, ".local", "share", "mise", "installs", "ffmpeg"),
+        join(home, ".asdf", "installs", "ffmpeg"),
+    ];
+    const found = [];
+    for (const root of roots) {
+        let versions;
+        try {
+            versions = readdirSync(root).sort().reverse();
+        }
+        catch {
+            continue;
+        }
+        for (const version of versions)
+            found.push([join(root, version, "bin", name)]);
+    }
+    // The ordinary absolute places, for a PATH that has been emptied rather than
+    // merely shortened.
+    for (const dir of ["/usr/local/bin", "/usr/bin", "/opt/homebrew/bin", "/snap/bin"]) {
+        found.push([join(dir, name)]);
+    }
+    return found;
+}
 /**
  * Find the tools. A bare `ffmpeg` on PATH is tried first; mise shims are common
  * on developer machines and need `mise exec` because the shim itself fails when
- * no version is pinned.
+ * no version is pinned. Failing both, the places these are actually installed
+ * are looked in directly, because a detached daemon's PATH is not the operator's.
  */
 export function detectTools() {
     const candidates = (name) => [
         [name],
         ["mise", "exec", `ffmpeg@latest`, "--", name],
+        ...installedElsewhere(name),
     ];
     const pick = (name) => candidates(name).find((argv) => works(argv)) ?? null;
     const ffmpeg = pick("ffmpeg");

package/dist/daemon.js

@@ -10,7 +10,7 @@ import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { portCommands } from "./share.js";
+import { portCommands, shareLink } from "./share.js";
 /** XDG, with the usual fallback. One daemon per user, which is one too few for nobody. */
 export function stateDir() {
     const base = process.env["XDG_STATE_HOME"] || join(homedir(), ".local", "state");
@@ -121,7 +121,8 @@ function spell(ms) {
  * typed the command.
  */
 export function daemonLines(state, uptimeMs) {
-    const link = (url) => (state.key ? `${url}/s/${state.key}` : url);
+    // The daemon's own key is the one that administers, so it is an /a/ link.
+    const link = (url) => shareLink(url, state.key ?? null);
     // A state file written by an older nixamp has no list, so host and port
     // still stand in rather than printing nothing at all.
     const addresses = state.urls ?? [{ label: "here", url: daemonUrl(state) }];

package/dist/main.js

@@ -15,6 +15,7 @@ import { version } from "./meta.js";
 import { displayName, loadSource, loadTagged } from "./playlist.js";
 import { isRemote } from "./sources.js";
 import { DEFAULT_PORT } from "./server.js";
+import { shareLink } from "./share.js";
 const FFT_SIZE = 2048;
 export const BAND_COUNT = 24;
 export function createState(tracks, root, silent) {
@@ -510,7 +511,7 @@ export async function main() {
     const handed = handoff.to;
     if (handed !== null) {
         console.log(`Detached. Still playing as pid ${handed.daemon.pid}.`);
-        console.log(`  ${handed.daemon.key ? `${handed.url}/s/${handed.daemon.key}` : handed.url}`);
+        console.log(`  ${shareLink(handed.url, handed.daemon.key ?? null)}`);
         console.log("  nixamp attach       come back to it");
         console.log("  nixamp daemon stop  when you are done");
     }

package/dist/server.js

@@ -42,7 +42,7 @@ import { confirm, DEFAULT_DIRECTORY, Publisher } from "./publish.js";
 import { applyRemoteConfig, createPaywall, FREE_LISTENERS, paywallFromEnv, } from "./paywall.js";
 import { isRemote, playsInBrowser, sourceLabel } from "./sources.js";
 import { codecsOf, probeAsync, videoArgs } from "./audio.js";
-import { allowedForListening, elevate, firewallInUse, certifiable, keyCookie, rememberedKeys, keyFrom, lookupPublicIp, portCommands, reachableAddresses, scopeOf, shareLink, audioLink, } from "./share.js";
+import { allowedForListening, elevate, firewallInUse, certifiable, keyCookie, keyInPath, rememberedKeys, keyFrom, lookupPublicIp, portCommands, reachableAddresses, scopeOf, shareLink, audioLink, } from "./share.js";
 import { extname, join, normalize, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { detectTools, peaks, RATE, Stream, toMono, } from "./audio.js";
@@ -775,8 +775,9 @@ export function createHandler(engine, options) {
         // cookie, so every later fetch, EventSource and <audio src> carries it
         // without the page knowing anything about keys. Either key works here, and
         // which one was used decides what the browser can then do.
-        if (key !== null && path.startsWith("/s/")) {
-            const offered = decodeURIComponent(path.slice("/s/".length));
+        const offeredInPath = key !== null ? keyInPath(path) : null;
+        if (offeredInPath !== null) {
+            const offered = offeredInPath;
             if (scopeOf(offered, key, listenKey) === null) {
                 json(response, 404, { error: "not found" });
                 return;
@@ -2644,7 +2645,7 @@ export async function serve(argv, version = "0.1.0") {
                 live: publisher !== null,
                 code: listing?.code ?? "",
                 name: listing?.name ?? (options.name || hostname()),
-                url: listing?.url ?? (publishable_ ? shareLink(publishable_.url, listenKey) : ""),
+                url: listing?.url ?? (publishable_ ? shareLink(publishable_.url, listenKey, false) : ""),
                 // Whether going live is even possible here. A laptop behind a router
                 // with no address the world can reach cannot be listed, and a button
                 // that could only fail is worse than one that is not offered.
@@ -2829,7 +2830,7 @@ export async function serve(argv, version = "0.1.0") {
             for (const { label, url } of addresses) {
                 if (label === "here")
                     continue;
-                console.log(`    ${shareLink(url, listenKey)}`);
+                console.log(`    ${shareLink(url, listenKey, false)}`);
             }
         }
     }
@@ -2926,7 +2927,7 @@ export async function serve(argv, version = "0.1.0") {
     function makePublisher() {
         if (!publishable_)
             return null;
-        const listen = shareLink(publishable_.url, listenKey);
+        const listen = shareLink(publishable_.url, listenKey, false);
         // Announced next to the listen link, not instead of it: one is for a person
         // with a browser, the other for the phone line and anything else that is
         // handed one address and expected to play it.
@@ -2964,7 +2965,7 @@ export async function serve(argv, version = "0.1.0") {
         });
     }
     if (options.publish !== "no" && publishable_) {
-        const listen = shareLink(publishable_.url, listenKey);
+        const listen = shareLink(publishable_.url, listenKey, false);
         const wanted = options.publish === "yes"
             ? true
             : await confirm(`\n  List this stream at ${DEFAULT_DIRECTORY}/directory so anyone can find it?\n  It publishes ${listen} — listen only, not the controls.`);
@@ -2981,6 +2982,33 @@ export async function serve(argv, version = "0.1.0") {
         console.log("");
         console.log("  --publish needs an address the world can reach. This machine has none.");
     }
+    // Remember this machine on the account it belongs to, without being asked.
+    //
+    // `nixamp server add --here` existed and did exactly this, which is a manual
+    // step for something the daemon already knows: it has just worked out its
+    // own address and minted its own key, and the session file says whose it is.
+    // Somebody who has signed in on this machine has said which account it is;
+    // being on their list is what they meant by that.
+    //
+    // Idempotent: adding the same URL again updates the row rather than making
+    // a second one, so this is safe on every start. Silent about failure, since
+    // nothing here is worth stopping a player for.
+    if (session?.token && publishable_) {
+        const remembered = shareLink(publishable_.url, key);
+        void fetch(`${DEFAULT_DIRECTORY}/api/v1/servers`, {
+            method: "POST",
+            headers: { "content-type": "application/json", authorization: `Bearer ${session.token}` },
+            body: JSON.stringify({ url: publishable_.url, name: options.name || hostname(), key: key ?? "" }),
+        })
+            .then((answer) => {
+            if (answer.ok)
+                console.log(`  Remembered on your account at ${DEFAULT_DIRECTORY}.`);
+        })
+            .catch(() => {
+            // The directory being unreachable is not a reason to stop serving.
+        });
+        void remembered;
+    }
     // A last resort, not a licence.
     //
     // Every throw reachable from a request should be caught where it happens,

package/dist/session.js

@@ -23,6 +23,7 @@ import { createInterface } from "node:readline/promises";
 import { dirname, join } from "node:path";
 import { stateDir } from "./daemon.js";
 import { DEFAULT_DIRECTORY } from "./directory.js";
+import { shareLink } from "./share.js";
 export function sessionPath() {
     return join(stateDir(), "session.json");
 }
@@ -514,7 +515,7 @@ export async function servers(argv, fetcher = fetch) {
                 if (state === null) {
                     console.error("nixamp: no daemon is running here.\n" +
                         "  Start one:  nixamp daemon start ~/Music\n" +
-                        "  Or give the share link of the one you mean: https://host:4321/s/KEY");
+                        "  Or give the share link of the one you mean: https://host:4321/a/KEY");
                     return 1;
                 }
                 // The address worth remembering is the one somebody else can open.
@@ -567,7 +568,7 @@ export async function servers(argv, fetcher = fetch) {
             }
             const width = Math.max(...rows.map((row) => row.name.length));
             for (const row of rows) {
-                const link = row.key ? `${row.url}/s/${row.key}` : row.url;
+                const link = shareLink(row.url, row.key ?? null);
                 console.log(`${row.id}  ${row.name.padEnd(width)}  ${link}`);
             }
             return 0;

package/dist/share.d.ts

@@ -84,8 +84,20 @@ export declare function reachableAddresses(host: string, port: number, publicUrl
     label: string;
     url: string;
 }[];
-/** The full link, key and all. */
-export declare function shareLink(base: string, key: string | null): string;
+/**
+ * The two paths a key can arrive on, and what each one says about itself.
+ *
+ * `/a/` administers and `/v/` only views. There used to be a `/s/` that meant
+ * neither -- just "here is a key" -- which is why somebody handed one of two
+ * identical-looking links had no way to tell which they were holding, and
+ * reported the controls as missing when they were never going to be there.
+ * A link should say what it is before anybody clicks it.
+ */
+export declare const KEY_PATHS: readonly ["/a/", "/v/"];
+/** The key in a share link, whichever of the three shapes it came in. */
+export declare function keyInPath(path: string): string | null;
+/** The full link, key and all. `admin` picks the shape that says which it is. */
+export declare function shareLink(base: string, key: string | null, admin?: boolean): string;
 /**
  * The same stream, as bytes rather than as a page.
  *

package/dist/share.js

@@ -241,9 +241,36 @@ export function reachableAddresses(host, port, publicUrl = "", scheme = "http")
             .map((entry) => ({ label: `${entry.label} (no certificate for an IP)`, url: entry.url })),
     ];
 }
-/** The full link, key and all. */
-export function shareLink(base, key) {
-    return key === null ? base : `${base}/s/${key}`;
+/**
+ * The two paths a key can arrive on, and what each one says about itself.
+ *
+ * `/a/` administers and `/v/` only views. There used to be a `/s/` that meant
+ * neither -- just "here is a key" -- which is why somebody handed one of two
+ * identical-looking links had no way to tell which they were holding, and
+ * reported the controls as missing when they were never going to be there.
+ * A link should say what it is before anybody clicks it.
+ */
+export const KEY_PATHS = ["/a/", "/v/"];
+/** The key in a share link, whichever of the three shapes it came in. */
+export function keyInPath(path) {
+    for (const prefix of KEY_PATHS) {
+        if (!path.startsWith(prefix))
+            continue;
+        const rest = path.slice(prefix.length).replace(/\/+$/, "");
+        if (rest === "" || rest.includes("/"))
+            return null;
+        try {
+            return decodeURIComponent(rest);
+        }
+        catch {
+            return rest;
+        }
+    }
+    return null;
+}
+/** The full link, key and all. `admin` picks the shape that says which it is. */
+export function shareLink(base, key, admin = true) {
+    return key === null ? base : `${base}${admin ? "/a/" : "/v/"}${key}`;
 }
 /**
  * The same stream, as bytes rather than as a page.

package/package.json

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

package/src/admin.ts

@@ -9,7 +9,7 @@ import { createApp, themes, type Container, type KeyEvent, type Theme } from "@p
 import type { Color } from "@profullstack/hqtui";
 import type { Connection } from "./connections.ts";
 import { daemonUrl, isLoopbackTls, readState } from "./daemon.ts";
-import { KEY_HEADER } from "./share.ts";
+import { KEY_HEADER, shareLink } from "./share.ts";
 
 interface Report {
   connections: Connection[];
@@ -66,7 +66,7 @@ export function resolveTarget(argv: string[]): AdminOptions {
         "  Or administer another machine, with its share link:\n" +
         "                    nixamp admin --url https://server1.you.nixamp.com:4321 --key KEY\n" +
         "  The URL and key are the two halves of the link that server printed:\n" +
-        "  https://host:4321/s/KEY",
+        "  https://host:4321/a/KEY",
     );
   }
   const url_ = daemonUrl(state);
@@ -278,7 +278,7 @@ export function draw(ui: Container, theme: Theme, view: View): void {
     const width = Math.max(...view.links.map((link) => link.label.length));
     ui.panel({ title: "Share links", size: view.links.length + (view.source ? 3 : 2) }, (p) => {
       for (const link of view.links) {
-        const full = view.key === null ? link.url : `${link.url}/s/${view.key}`;
+        const full = shareLink(link.url, view.key);
         p.text(`${link.label.padEnd(width)}  ${full}`, {
           fg: link.label === "on the internet" ? theme.accent : theme.foreground,
         });

package/src/audio.ts

@@ -7,6 +7,9 @@
  * apart within seconds and the bars would stop matching what you hear.
  */
 import { spawn, spawnSync, type ChildProcess } from "node:child_process";
+import { readdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
 
 export const RATE = 44100;
 export const CHANNELS = 2;
@@ -34,15 +37,54 @@ function works(argv: string[]): boolean {
   return !r.error && r.status === 0;
 }
 
+/**
+ * Everywhere a version manager or a package manager tends to leave ffmpeg.
+ *
+ * A daemon is started detached and inherits whatever environment happened to
+ * be around, which on a machine that installs ffmpeg through mise is a PATH
+ * with neither `ffmpeg` nor `mise` on it. Every probe then fails, and a
+ * failed probe means "no video stream" -- so a television channel arrived as
+ * its own soundtrack and nothing anywhere said why. Looking is cheaper than
+ * asking somebody to fix their PATH for a process they did not start.
+ *
+ * Newest first, so a machine with several installed uses the one it would
+ * have used anyway.
+ */
+function installedElsewhere(name: string): string[][] {
+  const home = homedir();
+  const roots = [
+    join(home, ".local", "share", "mise", "installs", "ffmpeg"),
+    join(home, ".asdf", "installs", "ffmpeg"),
+  ];
+  const found: string[][] = [];
+  for (const root of roots) {
+    let versions: string[];
+    try {
+      versions = readdirSync(root).sort().reverse();
+    } catch {
+      continue;
+    }
+    for (const version of versions) found.push([join(root, version, "bin", name)]);
+  }
+  // The ordinary absolute places, for a PATH that has been emptied rather than
+  // merely shortened.
+  for (const dir of ["/usr/local/bin", "/usr/bin", "/opt/homebrew/bin", "/snap/bin"]) {
+    found.push([join(dir, name)]);
+  }
+  return found;
+}
+
 /**
  * Find the tools. A bare `ffmpeg` on PATH is tried first; mise shims are common
  * on developer machines and need `mise exec` because the shim itself fails when
- * no version is pinned.
+ * no version is pinned. Failing both, the places these are actually installed
+ * are looked in directly, because a detached daemon's PATH is not the operator's.
  */
 export function detectTools(): Tools {
   const candidates = (name: string): string[][] => [
     [name],
     ["mise", "exec", `ffmpeg@latest`, "--", name],
+    ...installedElsewhere(name),
   ];
   const pick = (name: string): string[] | null =>
     candidates(name).find((argv) => works(argv)) ?? null;

package/src/daemon.ts

@@ -10,7 +10,7 @@ import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { type Firewall, portCommands } from "./share.ts";
+import { type Firewall, portCommands, shareLink } from "./share.ts";
 
 export interface DaemonState {
   pid: number;
@@ -164,7 +164,8 @@ function spell(ms: number): string {
  * typed the command.
  */
 export function daemonLines(state: DaemonState, uptimeMs?: number): string[] {
-  const link = (url: string): string => (state.key ? `${url}/s/${state.key}` : url);
+  // The daemon's own key is the one that administers, so it is an /a/ link.
+  const link = (url: string): string => shareLink(url, state.key ?? null);
   // A state file written by an older nixamp has no list, so host and port
   // still stand in rather than printing nothing at all.
   const addresses = state.urls ?? [{ label: "here", url: daemonUrl(state) }];

package/src/main.ts

@@ -19,6 +19,7 @@ import { displayName, loadSource, loadTagged } from "./playlist.ts";
 import { isRemote } from "./sources.ts";
 import { DEFAULT_PORT } from "./server.ts";
 import type { DaemonState } from "./daemon.ts";
+import { shareLink } from "./share.ts";
 
 const FFT_SIZE = 2048;
 export const BAND_COUNT = 24;
@@ -515,7 +516,7 @@ export async function main(): Promise<void> {
   const handed = handoff.to;
   if (handed !== null) {
     console.log(`Detached. Still playing as pid ${handed.daemon.pid}.`);
-    console.log(`  ${handed.daemon.key ? `${handed.url}/s/${handed.daemon.key}` : handed.url}`);
+    console.log(`  ${shareLink(handed.url, handed.daemon.key ?? null)}`);
     console.log("  nixamp attach       come back to it");
     console.log("  nixamp daemon stop  when you are done");
   }

package/src/server.ts

@@ -68,6 +68,7 @@ import {
   firewallInUse,
   certifiable,
   keyCookie,
+  keyInPath,
   rememberedKeys,
   keyFrom,
   keysMatch,
@@ -1073,8 +1074,9 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
     // cookie, so every later fetch, EventSource and <audio src> carries it
     // without the page knowing anything about keys. Either key works here, and
     // which one was used decides what the browser can then do.
-    if (key !== null && path.startsWith("/s/")) {
-      const offered = decodeURIComponent(path.slice("/s/".length));
+    const offeredInPath = key !== null ? keyInPath(path) : null;
+    if (offeredInPath !== null) {
+      const offered = offeredInPath;
       if (scopeOf(offered, key, listenKey) === null) {
         json(response, 404, { error: "not found" });
         return;
@@ -3078,7 +3080,7 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
         live: publisher !== null,
         code: listing?.code ?? "",
         name: listing?.name ?? (options.name || hostname()),
-        url: listing?.url ?? (publishable_ ? shareLink(publishable_.url, listenKey) : ""),
+        url: listing?.url ?? (publishable_ ? shareLink(publishable_.url, listenKey, false) : ""),
         // Whether going live is even possible here. A laptop behind a router
         // with no address the world can reach cannot be listed, and a button
         // that could only fail is worse than one that is not offered.
@@ -3285,7 +3287,7 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
       console.log("  A listen-only link, for someone you want to hear it but not drive it:");
       for (const { label, url } of addresses) {
         if (label === "here") continue;
-        console.log(`    ${shareLink(url, listenKey)}`);
+        console.log(`    ${shareLink(url, listenKey, false)}`);
       }
     }
   }
@@ -3382,7 +3384,7 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
    */
   function makePublisher(): Publisher | null {
     if (!publishable_) return null;
-    const listen = shareLink(publishable_.url, listenKey);
+    const listen = shareLink(publishable_.url, listenKey, false);
     // Announced next to the listen link, not instead of it: one is for a person
     // with a browser, the other for the phone line and anything else that is
     // handed one address and expected to play it.
@@ -3420,7 +3422,7 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
   }
 
   if (options.publish !== "no" && publishable_) {
-    const listen = shareLink(publishable_.url, listenKey);
+    const listen = shareLink(publishable_.url, listenKey, false);
     const wanted = options.publish === "yes"
       ? true
       : await confirm(`\n  List this stream at ${DEFAULT_DIRECTORY}/directory so anyone can find it?\n  It publishes ${listen} — listen only, not the controls.`);
@@ -3438,6 +3440,33 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
     console.log("  --publish needs an address the world can reach. This machine has none.");
   }
 
+  // Remember this machine on the account it belongs to, without being asked.
+  //
+  // `nixamp server add --here` existed and did exactly this, which is a manual
+  // step for something the daemon already knows: it has just worked out its
+  // own address and minted its own key, and the session file says whose it is.
+  // Somebody who has signed in on this machine has said which account it is;
+  // being on their list is what they meant by that.
+  //
+  // Idempotent: adding the same URL again updates the row rather than making
+  // a second one, so this is safe on every start. Silent about failure, since
+  // nothing here is worth stopping a player for.
+  if (session?.token && publishable_) {
+    const remembered = shareLink(publishable_.url, key);
+    void fetch(`${DEFAULT_DIRECTORY}/api/v1/servers`, {
+      method: "POST",
+      headers: { "content-type": "application/json", authorization: `Bearer ${session.token}` },
+      body: JSON.stringify({ url: publishable_.url, name: options.name || hostname(), key: key ?? "" }),
+    })
+      .then((answer) => {
+        if (answer.ok) console.log(`  Remembered on your account at ${DEFAULT_DIRECTORY}.`);
+      })
+      .catch(() => {
+        // The directory being unreachable is not a reason to stop serving.
+      });
+    void remembered;
+  }
+
   // A last resort, not a licence.
   //
   // Every throw reachable from a request should be caught where it happens,

package/src/session.ts

@@ -23,6 +23,7 @@ import { createInterface } from "node:readline/promises";
 import { dirname, join } from "node:path";
 import { stateDir } from "./daemon.ts";
 import { DEFAULT_DIRECTORY } from "./directory.ts";
+import { shareLink } from "./share.ts";
 
 export interface Session {
   site: string;
@@ -585,7 +586,7 @@ export async function servers(argv: string[], fetcher: typeof fetch = fetch): Pr
           console.error(
             "nixamp: no daemon is running here.\n" +
               "  Start one:  nixamp daemon start ~/Music\n" +
-              "  Or give the share link of the one you mean: https://host:4321/s/KEY",
+              "  Or give the share link of the one you mean: https://host:4321/a/KEY",
           );
           return 1;
         }
@@ -642,7 +643,7 @@ export async function servers(argv: string[], fetcher: typeof fetch = fetch): Pr
       }
       const width = Math.max(...rows.map((row) => row.name.length));
       for (const row of rows) {
-        const link = row.key ? `${row.url}/s/${row.key}` : row.url;
+        const link = shareLink(row.url, row.key ?? null);
         console.log(`${row.id}  ${row.name.padEnd(width)}  ${link}`);
       }
       return 0;

package/src/share.ts

@@ -271,9 +271,35 @@ export function reachableAddresses(
   ];
 }
 
-/** The full link, key and all. */
-export function shareLink(base: string, key: string | null): string {
-  return key === null ? base : `${base}/s/${key}`;
+/**
+ * The two paths a key can arrive on, and what each one says about itself.
+ *
+ * `/a/` administers and `/v/` only views. There used to be a `/s/` that meant
+ * neither -- just "here is a key" -- which is why somebody handed one of two
+ * identical-looking links had no way to tell which they were holding, and
+ * reported the controls as missing when they were never going to be there.
+ * A link should say what it is before anybody clicks it.
+ */
+export const KEY_PATHS = ["/a/", "/v/"] as const;
+
+/** The key in a share link, whichever of the three shapes it came in. */
+export function keyInPath(path: string): string | null {
+  for (const prefix of KEY_PATHS) {
+    if (!path.startsWith(prefix)) continue;
+    const rest = path.slice(prefix.length).replace(/\/+$/, "");
+    if (rest === "" || rest.includes("/")) return null;
+    try {
+      return decodeURIComponent(rest);
+    } catch {
+      return rest;
+    }
+  }
+  return null;
+}
+
+/** The full link, key and all. `admin` picks the shape that says which it is. */
+export function shareLink(base: string, key: string | null, admin = true): string {
+  return key === null ? base : `${base}${admin ? "/a/" : "/v/"}${key}`;
 }
 
 /**

package/web/dist/assets/{hls-3VKVEQE3-DJsrviTx.js → hls-3VKVEQE3-IlqvYfvF.js}

@@ -1 +1 @@
-import{t as e}from"./index-eSMbwh8n.js";var t=3;async function n(n){let{media:r,src:i,isTv:a}=n,{default:o}=await e(async()=>{let{default:e}=await import(`./hls-n74Cnh8A.js`);return{default:e}},[]);if(!o.isSupported())return n.onError(`This browser cannot play HLS streams.`),{destroy:()=>void 0,levels:()=>[]};let s=new o({...a?{maxBufferLength:60,maxMaxBufferLength:120,backBufferLength:30,liveSyncDurationCount:4}:{backBufferLength:90},enableWorker:!0}),c=0,l=!1;s.on(o.Events.ERROR,(e,r)=>{if(!l&&r.fatal){if(c>=t){n.onError(`This stream kept failing and has been stopped.`),s.destroy();return}switch(c+=1,r.type){case o.ErrorTypes.NETWORK_ERROR:n.onNotice(`Reconnecting…`),s.startLoad();break;case o.ErrorTypes.MEDIA_ERROR:n.onNotice(`Recovering…`),s.recoverMediaError();break;default:n.onError(`This stream could not be played.`),s.destroy()}}}),s.on(o.Events.MANIFEST_PARSED,()=>{l||(n.onNotice(null),n.onReady?.({live:s.levels.length>0&&!Number.isFinite(r.duration),levels:u()}))}),s.on(o.Events.LEVEL_LOADED,(e,t)=>{l||n.onReady?.({live:t.details.live,levels:u()})}),s.on(o.Events.FRAG_BUFFERED,()=>{l||n.onNotice(null)});function u(){return s.levels.map((e,t)=>({index:t,height:e.height||null,bitrate:e.bitrate||null,label:e.height?`${String(e.height)}p`:`${String(Math.round((e.bitrate||0)/1e3))}k`}))}return s.loadSource(i),s.attachMedia(r),{destroy(){l=!0,s.destroy()},levels:u,setLevel(e){s.currentLevel=e},currentLevel:()=>s.autoLevelEnabled?-1:s.currentLevel}}export{n as createHlsEngine};
+import{t as e}from"./index-BIeMVcOg.js";var t=3;async function n(n){let{media:r,src:i,isTv:a}=n,{default:o}=await e(async()=>{let{default:e}=await import(`./hls-n74Cnh8A.js`);return{default:e}},[]);if(!o.isSupported())return n.onError(`This browser cannot play HLS streams.`),{destroy:()=>void 0,levels:()=>[]};let s=new o({...a?{maxBufferLength:60,maxMaxBufferLength:120,backBufferLength:30,liveSyncDurationCount:4}:{backBufferLength:90},enableWorker:!0}),c=0,l=!1;s.on(o.Events.ERROR,(e,r)=>{if(!l&&r.fatal){if(c>=t){n.onError(`This stream kept failing and has been stopped.`),s.destroy();return}switch(c+=1,r.type){case o.ErrorTypes.NETWORK_ERROR:n.onNotice(`Reconnecting…`),s.startLoad();break;case o.ErrorTypes.MEDIA_ERROR:n.onNotice(`Recovering…`),s.recoverMediaError();break;default:n.onError(`This stream could not be played.`),s.destroy()}}}),s.on(o.Events.MANIFEST_PARSED,()=>{l||(n.onNotice(null),n.onReady?.({live:s.levels.length>0&&!Number.isFinite(r.duration),levels:u()}))}),s.on(o.Events.LEVEL_LOADED,(e,t)=>{l||n.onReady?.({live:t.details.live,levels:u()})}),s.on(o.Events.FRAG_BUFFERED,()=>{l||n.onNotice(null)});function u(){return s.levels.map((e,t)=>({index:t,height:e.height||null,bitrate:e.bitrate||null,label:e.height?`${String(e.height)}p`:`${String(Math.round((e.bitrate||0)/1e3))}k`}))}return s.loadSource(i),s.attachMedia(r),{destroy(){l=!0,s.destroy()},levels:u,setLevel(e){s.currentLevel=e},currentLevel:()=>s.autoLevelEnabled?-1:s.currentLevel}}export{n as createHlsEngine};