nixamp 0.13.0 → 0.13.1

package/dist/channels.d.ts

@@ -116,7 +116,7 @@ export declare class Channel {
      * because you looked away, and a room where the picture depends on who is
      * in it is not a room anybody can be invited to.
      */
-    pull(source: string, encode: string[], paced?: boolean, stall?: number, input?: string[]): void;
+    pull(source: string, encode: string[], paced?: boolean, stall?: number, input?: string[], audio?: string): void;
     /**
      * Start the source over, now.
      *
@@ -209,7 +209,7 @@ export declare class Channels {
      * about it is the same too, which is the point -- a re-stream stops being a
      * special case and becomes one more thing that is on.
      */
-    pull(id: string, name: string, source: string, encode: string[], kind: "audio" | "video", paced?: boolean, stall?: number, input?: string[]): Channel | null;
+    pull(id: string, name: string, source: string, encode: string[], kind: "audio" | "video", paced?: boolean, stall?: number, input?: string[], audio?: string): Channel | null;
     /**
      * Dial a pulled channel's source again, now. False for a channel that is
      * not there or is not ours to dial: a publisher's stream restarts at the

package/dist/channels.js

@@ -168,12 +168,18 @@ export class Channel {
      * because you looked away, and a room where the picture depends on who is
      * in it is not a room anybody can be invited to.
      */
-    pull(source, encode, paced = true, stall = STALL, input = []) {
+    pull(source, encode, paced = true, stall = STALL, input = [], audio = "") {
         this.stall = stall;
         if (this.info.kind === "video")
             this.fragments = new Fragments();
         const [command, ...prefix] = this.options.ffmpeg;
         const remote = /^https?:\/\//i.test(source);
+        // What every remote input is told: dial again when the CDN drops it, and
+        // give up on a socket that has gone quiet. Input options apply to the
+        // input that follows them, so a second input is told again.
+        const remoteArgs = remote
+            ? ["-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_delay_max", "5", "-rw_timeout", String(stall * 1000)]
+            : [];
         const dial = () => {
             if (this.closing)
                 return;
@@ -185,12 +191,11 @@ export class Channel {
                 // A dropped source is normal over hours, and a channel that dies
                 // the first time a CDN hiccups is not a channel anybody can rely
                 // on. ffmpeg redials on its own before we have to.
-                ...(remote ? ["-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_delay_max", "5"] : []),
                 // A connection that stops answering is an error after this long,
-                // and an error is a thing the reconnect above knows what to do
-                // with. Without it a silent socket is waited on for ever. In
+                // and an error is a thing the reconnect knows what to do with.
+                // Without it a silent socket is waited on for ever. In
                 // microseconds, as ffmpeg wants it.
-                ...(remote ? ["-rw_timeout", String(stall * 1000)] : []),
+                ...remoteArgs,
                 // Real time, always. A file read as fast as the disk allows is an
                 // hour of film in ninety seconds and a room that cannot be in it
                 // together; a live source is already paced and loses nothing.
@@ -200,6 +205,9 @@ export class Channel {
                 // and a CDN that got them from yt-dlp and not from us answers 403.
                 ...input,
                 "-i", source,
+                // The sound, when the site keeps it apart from the picture: a
+                // second input, dialled the same way, that the encode maps in.
+                ...(audio ? [...remoteArgs, ...(paced ? ["-re"] : []), ...input, "-i", audio] : []),
                 ...encode,
                 "pipe:1",
             ], { stdio: ["ignore", "pipe", "pipe"] });
@@ -560,7 +568,7 @@ export class Channels {
      * about it is the same too, which is the point -- a re-stream stops being a
      * special case and becomes one more thing that is on.
      */
-    pull(id, name, source, encode, kind, paced = true, stall = STALL, input = []) {
+    pull(id, name, source, encode, kind, paced = true, stall = STALL, input = [], audio = "") {
         if (this.open.has(id))
             return null;
         const channel = new Channel({
@@ -575,7 +583,7 @@ export class Channels {
             source,
         }, this.options, (gone) => this.open.delete(gone));
         this.open.set(id, channel);
-        channel.pull(source, encode, paced, stall, input);
+        channel.pull(source, encode, paced, stall, input, audio);
         return channel;
     }
     /**

package/dist/links.d.ts

@@ -3,6 +3,15 @@ export interface ResolvedLink {
     title: string;
     /** Where the bytes are: what ffmpeg is pointed at. */
     media: string;
+    /**
+     * The sound, when it comes separately. YouTube stopped offering a single
+     * stream with both picture and sound in it: every format is video alone
+     * or audio alone, and a player that insists on one file gets "Requested
+     * format is not available" for every link. So the two are asked for as a
+     * pair, and ffmpeg reads both and puts them together. "" when `media`
+     * already has the sound in it.
+     */
+    audio: string;
     /** Whether it is on now, which decides pacing and whether it can be saved. */
     live: boolean;
     /** Seconds, when known. */
@@ -41,6 +50,14 @@ export declare function directLink(url: string): ResolvedLink;
  * second ago. The user agent has its own flag; the rest go as one block.
  */
 export declare function inputArgsFor(headers: Record<string, string>): string[];
+/**
+ * How ffmpeg is asked to hand over a picture and a sound as one file, down a
+ * pipe. yt-dlp merges the two only into a file it can seek in, so a pair
+ * cannot go down its pipe; ffmpeg copies both into a fragmented MP4 -- or
+ * Matroska when the picture is not MP4, since a VP9 picture in an MP4 is a
+ * file few things open -- and writes as it goes.
+ */
+export declare function mergeDownloadArgs(link: ResolvedLink): string[];
 /** A file name for a download: the title, made safe, with the right ending. */
 export declare function fileNameFor(link: ResolvedLink, audioOnly: boolean): string;
 /** What a browser should call the bytes, from the file name's ending. */

package/dist/server.d.ts

@@ -370,7 +370,7 @@ export declare const MAX_ON_DEMAND = 4;
  * ones back, so that both agree on what a source is encoded as. Null when
  * that channel id is already on.
  */
-export declare function pullChannel(channels: Channels, ffprobe: string[], id: string, name: string, source: string, input?: string[]): Promise<Channel | null>;
+export declare function pullChannel(channels: Channels, ffprobe: string[], id: string, name: string, source: string, input?: string[], audio?: string): Promise<Channel | null>;
 /**
  * A Netscape cookies file beside the state, if the operator has put one there.
  *

package/dist/server.js

@@ -36,7 +36,7 @@ import { Directory, ENDED_TTL_MS, parseAnnouncement } from "./directory.js";
 import { PartyLine, telnyxSms } from "./partyline.js";
 import { HlsPackagers, withKey } from "./hls.js";
 import { DEFAULT_SITE as NICHEDB, Enricher, FIXTURE_TTL_MS } from "./enrich.js";
-import { contentTypeFor, downloadArgs, fileNameFor, inputArgsFor, linkChannelId, playableLink, resolveLink, saveFormat, } from "./links.js";
+import { contentTypeFor, downloadArgs, fileNameFor, inputArgsFor, linkChannelId, mergeDownloadArgs, playableLink, resolveLink, saveFormat, } from "./links.js";
 import { CALL_IN_NUMBER, OPT_IN_PATH, optInPage } from "./optin.js";
 import pg from "pg";
 import { Follows, phoneFrom } from "./follows.js";
@@ -769,15 +769,29 @@ export const MAX_ON_DEMAND = 4;
  * ones back, so that both agree on what a source is encoded as. Null when
  * that channel id is already on.
  */
-export async function pullChannel(channels, ffprobe, id, name, source, input = []) {
-    const codecs = await codecsOf({ ffmpeg: [], ffprobe, play: null }, source, input);
+export async function pullChannel(channels, ffprobe, id, name, source, input = [], audio = "") {
+    const tools = { ffmpeg: [], ffprobe, play: null };
+    // A pair is probed as a pair: the picture's file has no sound in it, and
+    // asked alone it would read as a silent film. The sound's codec comes from
+    // the sound's file; the picture's, and the container, from the picture's.
+    const [picture, sound] = await Promise.all([
+        codecsOf(tools, source, input),
+        audio ? codecsOf(tools, audio, input) : Promise.resolve(null),
+    ]);
+    const codecs = sound ? { ...picture, audio: sound.audio } : picture;
     const kind = codecs.video === "" ? "audio" : "video";
     const encode = kind === "video"
-        ? videoArgs(codecs)
+        ? [
+            // Which streams from which input, when there are two: the picture
+            // from the first, the sound from the second. With one input ffmpeg
+            // picks for itself, as it always did.
+            ...(audio ? ["-map", "0:v:0", "-map", "1:a:0"] : []),
+            ...videoArgs(codecs),
+        ]
         // No picture in it, so none is invented: MP3 is the thing every browser
         // plays and the thing a listener can join halfway through.
         : ["-vn", "-c:a", "libmp3lame", "-b:a", "192k", "-f", "mp3"];
-    return channels.pull(id, name, source, encode, kind, true, undefined, input);
+    return channels.pull(id, name, source, encode, kind, true, undefined, input, kind === "video" ? audio : "");
 }
 /** What a link resolves to, kept so a download can be named without asking twice. */
 const links = new Map();
@@ -2387,7 +2401,7 @@ export function createHandler(engine, options) {
             }
             links.set(link, resolved);
             if (!options.channels.has(channelId)) {
-                const started = await pullChannel(options.channels, options.ffprobe ?? ["ffprobe"], channelId, resolved.title, resolved.media, inputArgsFor(resolved.headers));
+                const started = await pullChannel(options.channels, options.ffprobe ?? ["ffprobe"], channelId, resolved.title, resolved.media, inputArgsFor(resolved.headers), resolved.audio);
                 if (!started) {
                     json(response, 409, { error: "that link is already starting" });
                     return;
@@ -2430,11 +2444,14 @@ export function createHandler(engine, options) {
             // as the plain MP3 the site also offers, and ".m4a" on an MP3 is a
             // file nothing will open.
             const saved = await resolveLink(options.ytdlp, link, { cookies: options.cookies ?? "", format: saveFormat(audioOnly) });
-            const fileName = fileNameFor("error" in saved ? resolved : { ...resolved, ext: saved.ext || resolved.ext }, audioOnly);
-            const [command, ...prefix] = options.ytdlp;
-            const child = spawn(command, [...prefix, ...downloadArgs(link, audioOnly, options.cookies ?? "")], {
-                stdio: ["ignore", "pipe", "pipe"],
-            });
+            const chosen = "error" in saved ? resolved : { ...resolved, ext: saved.ext || resolved.ext, media: saved.media, audio: saved.audio, headers: saved.headers };
+            const fileName = fileNameFor(chosen, audioOnly);
+            // A picture and a sound kept apart by the site are put together here
+            // by ffmpeg, as they go: yt-dlp only merges into a file it can seek
+            // in, which a pipe is not. Anything else yt-dlp hands over whole.
+            const paired = !audioOnly && chosen.audio !== "";
+            const [command, ...prefix] = (paired ? (options.ffmpeg ?? ["ffmpeg"]) : options.ytdlp);
+            const child = spawn(command, [...prefix, ...(paired ? mergeDownloadArgs(chosen) : downloadArgs(link, audioOnly, options.cookies ?? ""))], { stdio: ["ignore", "pipe", "pipe"] });
             response.writeHead(200, {
                 "content-type": contentTypeFor(fileName),
                 "content-disposition": `attachment; filename="${fileName.replace(/["\\]/g, "")}"; filename*=UTF-8''${encodeURIComponent(fileName)}`,

package/package.json

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

package/src/channels.ts

@@ -219,11 +219,17 @@ export class Channel {
    * because you looked away, and a room where the picture depends on who is
    * in it is not a room anybody can be invited to.
    */
-  pull(source: string, encode: string[], paced = true, stall = STALL, input: string[] = []): void {
+  pull(source: string, encode: string[], paced = true, stall = STALL, input: string[] = [], audio = ""): void {
     this.stall = stall;
     if (this.info.kind === "video") this.fragments = new Fragments();
     const [command, ...prefix] = this.options.ffmpeg as [string, ...string[]];
     const remote = /^https?:\/\//i.test(source);
+    // What every remote input is told: dial again when the CDN drops it, and
+    // give up on a socket that has gone quiet. Input options apply to the
+    // input that follows them, so a second input is told again.
+    const remoteArgs = remote
+      ? ["-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_delay_max", "5", "-rw_timeout", String(stall * 1000)]
+      : [];
 
     const dial = (): void => {
       if (this.closing) return;
@@ -237,12 +243,11 @@ export class Channel {
           // A dropped source is normal over hours, and a channel that dies
           // the first time a CDN hiccups is not a channel anybody can rely
           // on. ffmpeg redials on its own before we have to.
-          ...(remote ? ["-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_delay_max", "5"] : []),
           // A connection that stops answering is an error after this long,
-          // and an error is a thing the reconnect above knows what to do
-          // with. Without it a silent socket is waited on for ever. In
+          // and an error is a thing the reconnect knows what to do with.
+          // Without it a silent socket is waited on for ever. In
           // microseconds, as ffmpeg wants it.
-          ...(remote ? ["-rw_timeout", String(stall * 1000)] : []),
+          ...remoteArgs,
           // Real time, always. A file read as fast as the disk allows is an
           // hour of film in ninety seconds and a room that cannot be in it
           // together; a live source is already paced and loses nothing.
@@ -252,6 +257,9 @@ export class Channel {
           // and a CDN that got them from yt-dlp and not from us answers 403.
           ...input,
           "-i", source,
+          // The sound, when the site keeps it apart from the picture: a
+          // second input, dialled the same way, that the encode maps in.
+          ...(audio ? [...remoteArgs, ...(paced ? ["-re"] : []), ...input, "-i", audio] : []),
           ...encode,
           "pipe:1",
         ],
@@ -617,6 +625,7 @@ export class Channels {
     paced = true,
     stall = STALL,
     input: string[] = [],
+    audio = "",
   ): Channel | null {
     if (this.open.has(id)) return null;
     const channel = new Channel(
@@ -635,7 +644,7 @@ export class Channels {
       (gone) => this.open.delete(gone),
     );
     this.open.set(id, channel);
-    channel.pull(source, encode, paced, stall, input);
+    channel.pull(source, encode, paced, stall, input, audio);
     return channel;
   }
 

package/src/server.ts

@@ -54,7 +54,8 @@ import { PartyLine, telnyxSms } from "./partyline.ts";
 import { HlsPackagers, withKey } from "./hls.ts";
 import { DEFAULT_SITE as NICHEDB, Enricher, type EnrichKind, FIXTURE_TTL_MS } from "./enrich.ts";
 import {
-  contentTypeFor, downloadArgs, fileNameFor, inputArgsFor, linkChannelId, playableLink, resolveLink, saveFormat,
+  contentTypeFor, downloadArgs, fileNameFor, inputArgsFor, linkChannelId, mergeDownloadArgs, playableLink, resolveLink,
+  saveFormat,
   type ResolvedLink,
 } from "./links.ts";
 import { CALL_IN_NUMBER, OPT_IN_PATH, optInPage } from "./optin.ts";
@@ -985,15 +986,30 @@ export async function pullChannel(
   name: string,
   source: string,
   input: string[] = [],
+  audio = "",
 ): Promise<Channel | null> {
-  const codecs = await codecsOf({ ffmpeg: [], ffprobe, play: null }, source, input);
+  const tools = { ffmpeg: [], ffprobe, play: null };
+  // A pair is probed as a pair: the picture's file has no sound in it, and
+  // asked alone it would read as a silent film. The sound's codec comes from
+  // the sound's file; the picture's, and the container, from the picture's.
+  const [picture, sound] = await Promise.all([
+    codecsOf(tools, source, input),
+    audio ? codecsOf(tools, audio, input) : Promise.resolve(null),
+  ]);
+  const codecs = sound ? { ...picture, audio: sound.audio } : picture;
   const kind = codecs.video === "" ? "audio" : "video";
   const encode = kind === "video"
-    ? videoArgs(codecs)
+    ? [
+        // Which streams from which input, when there are two: the picture
+        // from the first, the sound from the second. With one input ffmpeg
+        // picks for itself, as it always did.
+        ...(audio ? ["-map", "0:v:0", "-map", "1:a:0"] : []),
+        ...videoArgs(codecs),
+      ]
     // No picture in it, so none is invented: MP3 is the thing every browser
     // plays and the thing a listener can join halfway through.
     : ["-vn", "-c:a", "libmp3lame", "-b:a", "192k", "-f", "mp3"];
-  return channels.pull(id, name, source, encode, kind, true, undefined, input);
+  return channels.pull(id, name, source, encode, kind, true, undefined, input, kind === "video" ? audio : "");
 }
 
 /** What a link resolves to, kept so a download can be named without asking twice. */
@@ -2863,7 +2879,7 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
       if (!options.channels.has(channelId)) {
         const started = await pullChannel(
           options.channels, options.ffprobe ?? ["ffprobe"], channelId, resolved.title, resolved.media,
-          inputArgsFor(resolved.headers),
+          inputArgsFor(resolved.headers), resolved.audio,
         );
         if (!started) {
           json(response, 409, { error: "that link is already starting" });
@@ -2908,11 +2924,18 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
       // as the plain MP3 the site also offers, and ".m4a" on an MP3 is a
       // file nothing will open.
       const saved = await resolveLink(options.ytdlp, link, { cookies: options.cookies ?? "", format: saveFormat(audioOnly) });
-      const fileName = fileNameFor("error" in saved ? resolved : { ...resolved, ext: saved.ext || resolved.ext }, audioOnly);
-      const [command, ...prefix] = options.ytdlp as [string, ...string[]];
-      const child = spawn(command, [...prefix, ...downloadArgs(link, audioOnly, options.cookies ?? "")], {
-        stdio: ["ignore", "pipe", "pipe"],
-      });
+      const chosen = "error" in saved ? resolved : { ...resolved, ext: saved.ext || resolved.ext, media: saved.media, audio: saved.audio, headers: saved.headers };
+      const fileName = fileNameFor(chosen, audioOnly);
+      // A picture and a sound kept apart by the site are put together here
+      // by ffmpeg, as they go: yt-dlp only merges into a file it can seek
+      // in, which a pipe is not. Anything else yt-dlp hands over whole.
+      const paired = !audioOnly && chosen.audio !== "";
+      const [command, ...prefix] = (paired ? (options.ffmpeg ?? ["ffmpeg"]) : options.ytdlp) as [string, ...string[]];
+      const child = spawn(
+        command,
+        [...prefix, ...(paired ? mergeDownloadArgs(chosen) : downloadArgs(link, audioOnly, options.cookies ?? ""))],
+        { stdio: ["ignore", "pipe", "pipe"] },
+      );
       response.writeHead(200, {
         "content-type": contentTypeFor(fileName),
         "content-disposition": `attachment; filename="${fileName.replace(/["\\]/g, "")}"; filename*=UTF-8''${encodeURIComponent(fileName)}`,

package/web/dist/sw.js

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