nixamp 0.3.0 → 0.4.0

package/src/paywall.ts

@@ -38,7 +38,7 @@ export const DEFAULT_PAYWALL: PaywallConfig = {
 };
 
 /** Only the audio is behind the gate. */
-export const GATED = ["/api/stream/", "/api/media/"];
+export const GATED = ["/api/stream/", "/api/media/", "/api/live"];
 
 export function isGated(path: string): boolean {
   return GATED.some((prefix) => path.startsWith(prefix));

package/src/playlist.ts

@@ -15,6 +15,11 @@ import {
 export const AUDIO_EXTENSIONS = new Set([
   ".mp3", ".flac", ".ogg", ".oga", ".opus", ".m4a", ".aac",
   ".wav", ".wma", ".aiff", ".aif", ".alac", ".mp4", ".webm",
+  // Video containers, for their audio. Everything on the way out of here is
+  // already decoded by ffmpeg and re-encoded to MP3 with -vn, so a film is a
+  // long track with a picture nobody asked for -- and a library of them was
+  // invisible to nixamp for want of the extension being on this list.
+  ".mkv", ".avi", ".mov", ".m4v", ".mpg", ".mpeg", ".wmv", ".flv",
 ]);
 
 export function isAudio(path: string): boolean {

package/src/publish.ts

@@ -13,13 +13,32 @@ export interface PublishTarget {
   name: string;
   /** The listen link: what a stranger opens. Never the control key. */
   url: string;
+  /**
+   * The same stream as bytes, for a listener that cannot hold a cookie.
+   *
+   * The phone line plays this address into a call. The listen link cannot be
+   * played: it is a redirect that sets a cookie, and Telnyx fetching it once
+   * gets a 401 in JSON, which is a caller hearing nothing.
+   */
+  audio?: string;
   tracks: number;
   nowPlaying: () => string;
+  /**
+   * The account this stream belongs to, from `nixamp login`.
+   *
+   * The directory used to take anybody's word for a listing. It cannot any
+   * more: a listing now carries a phone code people dial and minutes somebody
+   * pays for, so it has to be attributable. Reading the directory is still
+   * open to everyone -- it is announcing that needs a name behind it.
+   */
+  token?: string;
   /**
    * Called with whatever configuration the directory sent back. This is how
    * nixamp.com turns x402 on and off for a server without it restarting.
    */
   onConfig?: (config: unknown) => void;
+  /** Called when the directory refused us for want of an account. */
+  onRefused?: () => void;
 }
 
 /**
@@ -45,6 +64,8 @@ export async function confirm(question: string, tty = process.stdin.isTTY === tr
 export class Publisher {
   private id: string | null = null;
   private timer: ReturnType<typeof setInterval> | null = null;
+  /** Whether we have already said that the directory wants an account. */
+  private refused = false;
 
   constructor(
     private readonly target: PublishTarget,
@@ -62,16 +83,30 @@ export class Publisher {
     try {
       const response = await this.fetcher(`${this.target.directory}/api/directory`, {
         method: "POST",
-        headers: { "content-type": "application/json" },
+        headers: {
+          "content-type": "application/json",
+          ...(this.target.token ? { authorization: `Bearer ${this.target.token}` } : {}),
+        },
         body: JSON.stringify({
           ...(this.id ? { id: this.id } : {}),
           name: this.target.name,
           url: this.target.url,
+          ...(this.target.audio ? { audio: this.target.audio } : {}),
           tracks: this.target.tracks,
           nowPlaying: this.target.nowPlaying(),
         }),
       });
-      if (!response.ok) return null;
+      if (!response.ok) {
+        // Worth telling the operator about exactly once. A heartbeat that is
+        // refused every 90 seconds should not print every 90 seconds, and
+        // "could not reach the directory" would be the wrong thing to say
+        // about a directory that answered perfectly clearly.
+        if (response.status === 401 && !this.refused) {
+          this.refused = true;
+          this.target.onRefused?.();
+        }
+        return null;
+      }
       const listing = (await response.json()) as Listing & { config?: unknown };
       this.id = listing.id;
       if (listing.config !== undefined) this.target.onConfig?.(listing.config);
@@ -90,6 +125,7 @@ export class Publisher {
     try {
       await this.fetcher(`${this.target.directory}/api/directory?id=${encodeURIComponent(this.id)}`, {
         method: "DELETE",
+        ...(this.target.token ? { headers: { authorization: `Bearer ${this.target.token}` } } : {}),
       });
     } catch {
       // It expires on its own within the TTL, which is the point of the TTL.