nixamp 0.7.25 → 0.7.26

package/dist/admin.d.ts

@@ -39,6 +39,14 @@ export interface AdminOptions {
         label: string;
         url: string;
     }[];
+    /**
+     * The key that only watches, when this server has one.
+     *
+     * The links built from it are the ones to hand other people. Absent when
+     * pointed at a server by hand, since a listening key is not something you
+     * can work out from a control one.
+     */
+    listenKey?: string | null;
     /** What it is serving, so the admin view says so without being asked. */
     source: string;
 }
@@ -76,6 +84,8 @@ export interface View {
         url: string;
     }[];
     key: string | null;
+    /** The key that only watches, for the links you hand to other people. */
+    listenKey?: string | null;
     source: string;
 }
 export declare function draw(ui: Container, theme: Theme, view: View): void;

package/dist/admin.js

@@ -39,6 +39,7 @@ export function resolveTarget(argv) {
     return {
         url: url_,
         key: key ?? state.key,
+        ...(state.listenKey ? { listenKey: state.listenKey } : {}),
         // A state file written before 0.5.3 has no list; loopback stands in.
         links: state.urls ?? [{ label: "here", url: daemonUrl(state) }],
         source: state.source,
@@ -176,7 +177,7 @@ export async function admin(argv) {
     app.on("exit", () => clearInterval(timer));
     app.render(({ ui, theme }) => draw(ui, theme, {
         url: target.url, report, snapshot, error, typing, restreaming, replacing,
-        links: target.links, key: target.key, source: target.source,
+        links: target.links, key: target.key, listenKey: target.listenKey, source: target.source,
     }));
     await app.start();
     clearInterval(timer);
@@ -229,13 +230,31 @@ export function draw(ui, theme, view) {
     // reach it. The key is on them: without it every address is a 401.
     if (view.links.length > 0) {
         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) => {
+        // Both kinds, labelled, because they are not interchangeable and the
+        // operator had only ever been shown the one that drives. Handing that to
+        // somebody who wanted to watch hands them the controls with it, and
+        // there was nothing else to hand them.
+        // Counted rather than guessed: a heading of its own, the links, the second
+        // heading and its links when there is a viewing key, the source, and the
+        // two borders. A panel one line short silently drops the last row.
+        const rows = 1 + view.links.length
+            + (view.listenKey ? 1 + view.links.length : 0)
+            + (view.source ? 1 : 0);
+        ui.panel({ title: "Your links, and the ones to share", size: rows + 2 }, (p) => {
+            p.label("Yours -- these administer this server:");
             for (const link of view.links) {
-                const full = shareLink(link.url, view.key);
-                p.text(`${link.label.padEnd(width)}  ${full}`, {
+                p.text(`${link.label.padEnd(width)}  ${shareLink(link.url, view.key)}`, {
                     fg: link.label === "on the internet" ? theme.accent : theme.foreground,
                 });
             }
+            if (view.listenKey) {
+                p.label("To share -- these watch and listen, and change nothing:");
+                for (const link of view.links) {
+                    p.text(`${link.label.padEnd(width)}  ${shareLink(link.url, view.listenKey, false)}`, {
+                        fg: link.label === "on the internet" ? theme.accent : theme.foreground,
+                    });
+                }
+            }
             if (view.source)
                 p.label(view.source);
         });

package/dist/daemon.d.ts

@@ -4,6 +4,13 @@ export interface DaemonState {
     port: number;
     /** The share key, so `nixamp admin` can talk to it without being told. */
     key: string | null;
+    /**
+     * The key that only views, for handing to somebody who should watch.
+     *
+     * Absent on a state file written by an older nixamp, and absent on a server
+     * running with no key at all.
+     */
+    listenKey?: string | null;
     source: string;
     startedAt: number;
     /** Where its output went, for when it died and you want to know why. */

package/dist/daemon.js

@@ -121,8 +121,11 @@ function spell(ms) {
  * typed the command.
  */
 export function daemonLines(state, uptimeMs) {
-    // The daemon's own key is the one that administers, so it is an /a/ link.
+    // Two links per address: the one that drives this server and the one that
+    // only watches it. Printing just the first left the operator with nothing to
+    // hand anybody -- and handing over the wrong one hands over the controls.
     const link = (url) => shareLink(url, state.key ?? null);
+    const viewLink = (url) => shareLink(url, state.listenKey ?? null, false);
     // 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) }];
@@ -131,6 +134,15 @@ export function daemonLines(state, uptimeMs) {
     for (const { label, url } of addresses)
         lines.push(`  ${label.padEnd(width)}  ${link(url)}`);
     lines.push(`  ${"source".padEnd(width)}  ${state.source}`);
+    // The viewing links, said separately and said as what they are. Somebody who
+    // should be able to watch your library should not be handed the link that
+    // re-streams it, and the operator had nothing else to give them.
+    if (state.listenKey) {
+        lines.push("", "  To share -- these watch and listen, and change nothing:");
+        for (const { label, url } of addresses) {
+            lines.push(`  ${label.padEnd(width)}  ${viewLink(url)}`);
+        }
+    }
     if (uptimeMs !== undefined)
         lines.push(`  ${"up".padEnd(width)}  ${spell(uptimeMs)}`);
     if (state.guessedPublic) {
@@ -227,6 +239,7 @@ async function waitForAnnounce(log, timeoutMs) {
                         host: String(parsed["host"]),
                         port: Number(parsed["port"]),
                         key: parsed["key"] ?? null,
+                        ...(typeof parsed["listenKey"] === "string" ? { listenKey: parsed["listenKey"] } : {}),
                         source: String(parsed["source"]),
                         ...(Array.isArray(urls) ? { urls: urls } : {}),
                         ...(typeof parsed["firewall"] === "string" ? { firewall: parsed["firewall"] } : {}),

package/dist/server.js

@@ -2962,6 +2962,10 @@ export async function serve(argv, version = "0.1.0") {
             host: options.host,
             port,
             key,
+            // The other half of the pair. Without it `nixamp admin` can only draw
+            // the links that administer, so the operator has nothing to hand
+            // somebody who should be able to watch and not to drive.
+            listenKey,
             source: root,
             urls: addresses,
             firewall,

package/package.json

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

package/src/admin.ts

@@ -38,6 +38,14 @@ export interface AdminOptions {
    * anybody. These are the ones worth reading off the screen.
    */
   links: { label: string; url: string }[];
+  /**
+   * The key that only watches, when this server has one.
+   *
+   * The links built from it are the ones to hand other people. Absent when
+   * pointed at a server by hand, since a listening key is not something you
+   * can work out from a control one.
+   */
+  listenKey?: string | null;
   /** What it is serving, so the admin view says so without being asked. */
   source: string;
 }
@@ -76,6 +84,7 @@ export function resolveTarget(argv: string[]): AdminOptions {
   return {
     url: url_,
     key: key ?? state.key,
+    ...(state.listenKey ? { listenKey: state.listenKey } : {}),
     // A state file written before 0.5.3 has no list; loopback stands in.
     links: state.urls ?? [{ label: "here", url: daemonUrl(state) }],
     source: state.source,
@@ -198,7 +207,7 @@ export async function admin(argv: string[]): Promise<void> {
   app.on("exit", () => clearInterval(timer));
   app.render(({ ui, theme }) => draw(ui, theme, {
     url: target.url, report, snapshot, error, typing, restreaming, replacing,
-    links: target.links, key: target.key, source: target.source,
+    links: target.links, key: target.key, listenKey: target.listenKey, source: target.source,
   }));
 
   await app.start();
@@ -242,6 +251,8 @@ export interface View {
   /** Labelled addresses, and the key that makes them work. */
   links: { label: string; url: string }[];
   key: string | null;
+  /** The key that only watches, for the links you hand to other people. */
+  listenKey?: string | null;
   source: string;
 }
 
@@ -276,13 +287,32 @@ export function draw(ui: Container, theme: Theme, view: View): void {
   // reach it. The key is on them: without it every address is a 401.
   if (view.links.length > 0) {
     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) => {
+    // Both kinds, labelled, because they are not interchangeable and the
+    // operator had only ever been shown the one that drives. Handing that to
+    // somebody who wanted to watch hands them the controls with it, and
+    // there was nothing else to hand them.
+    // Counted rather than guessed: a heading of its own, the links, the second
+    // heading and its links when there is a viewing key, the source, and the
+    // two borders. A panel one line short silently drops the last row.
+    const rows =
+      1 + view.links.length
+      + (view.listenKey ? 1 + view.links.length : 0)
+      + (view.source ? 1 : 0);
+    ui.panel({ title: "Your links, and the ones to share", size: rows + 2 }, (p) => {
+      p.label("Yours -- these administer this server:");
       for (const link of view.links) {
-        const full = shareLink(link.url, view.key);
-        p.text(`${link.label.padEnd(width)}  ${full}`, {
+        p.text(`${link.label.padEnd(width)}  ${shareLink(link.url, view.key)}`, {
           fg: link.label === "on the internet" ? theme.accent : theme.foreground,
         });
       }
+      if (view.listenKey) {
+        p.label("To share -- these watch and listen, and change nothing:");
+        for (const link of view.links) {
+          p.text(`${link.label.padEnd(width)}  ${shareLink(link.url, view.listenKey, false)}`, {
+            fg: link.label === "on the internet" ? theme.accent : theme.foreground,
+          });
+        }
+      }
       if (view.source) p.label(view.source);
     });
   }

package/src/daemon.ts

@@ -18,6 +18,13 @@ export interface DaemonState {
   port: number;
   /** The share key, so `nixamp admin` can talk to it without being told. */
   key: string | null;
+  /**
+   * The key that only views, for handing to somebody who should watch.
+   *
+   * Absent on a state file written by an older nixamp, and absent on a server
+   * running with no key at all.
+   */
+  listenKey?: string | null;
   source: string;
   startedAt: number;
   /** Where its output went, for when it died and you want to know why. */
@@ -164,8 +171,11 @@ function spell(ms: number): string {
  * typed the command.
  */
 export function daemonLines(state: DaemonState, uptimeMs?: number): string[] {
-  // The daemon's own key is the one that administers, so it is an /a/ link.
+  // Two links per address: the one that drives this server and the one that
+  // only watches it. Printing just the first left the operator with nothing to
+  // hand anybody -- and handing over the wrong one hands over the controls.
   const link = (url: string): string => shareLink(url, state.key ?? null);
+  const viewLink = (url: string): string => shareLink(url, state.listenKey ?? null, false);
   // 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) }];
@@ -174,6 +184,16 @@ export function daemonLines(state: DaemonState, uptimeMs?: number): string[] {
   const lines = [`nixamp daemon running (pid ${state.pid})`];
   for (const { label, url } of addresses) lines.push(`  ${label.padEnd(width)}  ${link(url)}`);
   lines.push(`  ${"source".padEnd(width)}  ${state.source}`);
+
+  // The viewing links, said separately and said as what they are. Somebody who
+  // should be able to watch your library should not be handed the link that
+  // re-streams it, and the operator had nothing else to give them.
+  if (state.listenKey) {
+    lines.push("", "  To share -- these watch and listen, and change nothing:");
+    for (const { label, url } of addresses) {
+      lines.push(`  ${label.padEnd(width)}  ${viewLink(url)}`);
+    }
+  }
   if (uptimeMs !== undefined) lines.push(`  ${"up".padEnd(width)}  ${spell(uptimeMs)}`);
 
   if (state.guessedPublic) {
@@ -300,6 +320,7 @@ async function waitForAnnounce(
             host: String(parsed["host"]),
             port: Number(parsed["port"]),
             key: (parsed["key"] as string | null) ?? null,
+            ...(typeof parsed["listenKey"] === "string" ? { listenKey: parsed["listenKey"] } : {}),
             source: String(parsed["source"]),
             ...(Array.isArray(urls) ? { urls: urls as { label: string; url: string }[] } : {}),
             ...(typeof parsed["firewall"] === "string" ? { firewall: parsed["firewall"] } : {}),

package/src/server.ts

@@ -3447,6 +3447,10 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
         host: options.host,
         port,
         key,
+        // The other half of the pair. Without it `nixamp admin` can only draw
+        // the links that administer, so the operator has nothing to hand
+        // somebody who should be able to watch and not to drive.
+        listenKey,
         source: root,
         urls: addresses,
         firewall,

package/web/dist/sw.js

@@ -1,5 +1,5 @@
 /* nixamp service worker — generated, do not edit */
-const CACHE = "nixamp-1788968794036";
+const CACHE = "nixamp-1788970585276";
 const PRECACHE = [
   "/",
   "/apple-touch-icon.png",