nixamp 0.18.1 → 0.19.1

package/src/channels.ts

@@ -56,6 +56,14 @@ export interface ChannelInfo {
   error?: string;
   /** How many times the source has been dialled again since it started. */
   redials?: number;
+  /**
+   * For a channel that plays a list: the entries, in order, and which one is
+   * on. When one ends the next is dialled at once, and the last is followed
+   * by the first: a station, not a file. A restart picks up at the entry
+   * that was on.
+   */
+  playlist?: string[];
+  playlistAt?: number;
   /**
    * For a pulled film: how far into it we are, in seconds, read off ffmpeg
    * as it goes. This is what a restart and a redial go back to. A live
@@ -95,6 +103,8 @@ export interface PullResume {
   live: boolean;
   /** Seconds into a film to start from. */
   position: number;
+  /** For a list of things rather than one: every entry, in order. */
+  playlist?: string[];
 }
 
 /**
@@ -246,6 +256,8 @@ export class Channel {
   private fragments: Fragments | null = null;
   /** For a pulled channel: what to run, and how many times it has failed. */
   private redial: (() => void) | null = null;
+  /** For a channel playing a list: move to the next entry. Null when there is no list. */
+  private advance: (() => boolean) | null = null;
   private failures = 0;
   private timer: ReturnType<typeof setTimeout> | null = null;
   /** Fires when a pulled source has said nothing for STALL. */
@@ -349,19 +361,37 @@ export class Channel {
     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);
     this.info.live = resume.live;
     if (!resume.live) this.info.position = Math.max(0, resume.position);
-    // 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)]
-      : [];
+    // A list plays entry by entry: the one that is on is what gets dialled,
+    // and an entry that ended is followed by the next, at once.
+    const list = resume.playlist && resume.playlist.length > 0 ? resume.playlist : null;
+    let at = 0;
+    if (list) {
+      this.info.playlist = list;
+      at = Math.min(Math.max(0, this.info.playlistAt ?? 0), list.length - 1);
+      this.info.playlistAt = at;
+    }
+    let current = list ? (list[at] as string) : source;
+    this.advance = list && list.length > 1
+      ? () => {
+          at = (at + 1) % list.length;
+          this.info.playlistAt = at;
+          current = list[at] as string;
+          return true;
+        }
+      : null;
 
     const dial = (): void => {
       if (this.closing) return;
       this.stderr = "";
+      const remote = /^https?:\/\//i.test(current);
+      // 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)]
+        : [];
       // Where to pick a film up from: a little before where it was, since
       // the place was written down a moment ago and a moment of it twice is
       // better than a moment of it missing. A live source is joined as is,
@@ -421,7 +451,7 @@ export class Channel {
                 // and a CDN that got them from yt-dlp and not from us answers 403.
                 ...input,
                 ...seek,
-                "-i", source,
+                "-i", current,
                 // 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, ...seek, "-i", audio] : []),
@@ -584,13 +614,20 @@ export class Channel {
       this.close();
       return;
     }
-    this.info.redials = (this.info.redials ?? 0) + 1;
+    // A list moves on. An entry that played to its end is not a source that
+    // dropped: the next is dialled now, and it is not a redial. One that
+    // gave nothing is skipped the same way, counted as the failure it was,
+    // so a list of dead links gives up rather than cycling for ever.
+    const moved = this.advance?.() ?? false;
+    const ended = moved && sent;
+    if (ended) this.info.error = undefined;
+    else this.info.redials = (this.info.redials ?? 0) + 1;
     this.startOver();
     const dial = this.redial;
     this.timer = setTimeout(() => {
       this.timer = null;
       dial();
-    }, REDIAL);
+    }, ended ? 0 : REDIAL);
     // A redial is not a reason to keep the process alive at exit.
     this.timer.unref?.();
   }
@@ -1171,6 +1208,9 @@ export interface RememberedChannel {
   live?: boolean;
   /** The member who put it on, so it is still theirs after a restart. */
   startedBy?: string;
+  /** For a list: every entry, and which was on, so it carries on from there. */
+  playlist?: string[];
+  playlistAt?: number;
 }
 
 const REMEMBERED = "channels.json";
@@ -1207,6 +1247,11 @@ export function rememberedChannels(dir: string, port: number): RememberedChannel
         if (typeof one["position"] === "number" && Number.isFinite(one["position"]) && one["position"] > 0) kept.position = one["position"];
         if (typeof one["live"] === "boolean") kept.live = one["live"];
         if (typeof one["startedBy"] === "string" && one["startedBy"] !== "") kept.startedBy = one["startedBy"];
+        if (Array.isArray(one["playlist"])) {
+          const entries = (one["playlist"] as unknown[]).filter((entry): entry is string => typeof entry === "string" && entry !== "");
+          if (entries.length > 0) kept.playlist = entries;
+          if (typeof one["playlistAt"] === "number" && Number.isInteger(one["playlistAt"]) && one["playlistAt"] >= 0) kept.playlistAt = one["playlistAt"];
+        }
         return kept;
       });
   } catch {
@@ -1230,6 +1275,10 @@ export function rememberedNow(channels: Channels): RememberedChannel[] {
       if (typeof one.live === "boolean") kept.live = one.live;
       if (!one.live && typeof one.position === "number" && one.position > 0) kept.position = Math.floor(one.position);
       if (one.startedBy) kept.startedBy = one.startedBy;
+      if (one.playlist && one.playlist.length > 0) {
+        kept.playlist = one.playlist;
+        kept.playlistAt = one.playlistAt ?? 0;
+      }
       return kept;
     });
 }

package/src/links.ts

@@ -21,6 +21,7 @@
  */
 import { createHash } from "node:crypto";
 import { spawn } from "node:child_process";
+import { parseCatalog } from "./catalogs.ts";
 
 export interface ResolvedLink {
   /** What to call it: the page's title, or the file's name for a bare file. */
@@ -50,6 +51,12 @@ export interface ResolvedLink {
   ext: string;
   /** The page it came from. */
   page: string;
+  /**
+   * For a pasted .m3u: every entry in it, in order. The channel plays them
+   * one after another and starts over at the end, a station rather than a
+   * file; `media` is the first, for the probe that decides what it holds.
+   */
+  playlist?: string[];
 }
 
 /**
@@ -71,6 +78,86 @@ export function isDirectMedia(url: string): boolean {
   }
 }
 
+/**
+ * A plain m3u: a list of things to play, one per line, which is not a thing
+ * ffmpeg reads. The .m3u8 of HLS is a list of segments of one thing, which
+ * it does, and stays in DIRECT above.
+ */
+const PLAYLIST = /\.m3u(\?.*)?$/i;
+
+export function isPlaylistLink(url: string): boolean {
+  try {
+    const parsed = new URL(url);
+    return PLAYLIST.test(parsed.pathname + parsed.search);
+  } catch {
+    return false;
+  }
+}
+
+/** How much of a playlist is worth reading: a list, not a library dump. */
+export const PLAYLIST_MAX_BYTES = 2_000_000;
+export const PLAYLIST_MAX_ENTRIES = 1000;
+export const PLAYLIST_FETCH_TIMEOUT_MS = 15_000;
+
+/**
+ * What a playlist's text holds: the entries, in order, resolved against
+ * where the list was fetched from. Some things called .m3u are HLS after
+ * all -- a segment list with #EXT-X- tags -- and those are one stream for
+ * ffmpeg to read as it is, not a list of streams.
+ */
+export function playlistFrom(text: string, base: string): { hls: boolean; sources: string[] } {
+  if (/^#EXT-X-/m.test(text)) return { hls: true, sources: [] };
+  const sources = parseCatalog(text, base)
+    .map((entry) => entry.source)
+    .filter((source) => /^(https?|rtmps?):\/\//i.test(source))
+    .slice(0, PLAYLIST_MAX_ENTRIES);
+  return { hls: false, sources };
+}
+
+/**
+ * A pasted .m3u, read and turned into a channel's worth of entries. Fetched
+ * here rather than by yt-dlp, which would take the first entry and stop, or
+ * by ffmpeg, which does not read a plain list at all.
+ */
+export async function resolvePlaylist(
+  url: string,
+  options: { timeoutMs?: number; fetcher?: typeof fetch } = {},
+): Promise<ResolvedLink | { error: string }> {
+  const get = options.fetcher ?? fetch;
+  const abort = new AbortController();
+  const timer = setTimeout(() => abort.abort(), options.timeoutMs ?? PLAYLIST_FETCH_TIMEOUT_MS);
+  let text = "";
+  try {
+    const answer = await get(url, { signal: abort.signal, headers: { "user-agent": "nixamp" }, redirect: "follow" });
+    if (!answer.ok) return { error: `that playlist could not be fetched (HTTP ${answer.status})` };
+    text = (await answer.text()).slice(0, PLAYLIST_MAX_BYTES);
+  } catch (error) {
+    const why = abort.signal.aborted ? "took too long to answer" : ((error as Error).message || "could not be fetched");
+    return { error: `that playlist ${why}` };
+  } finally {
+    clearTimeout(timer);
+  }
+  const list = playlistFrom(text, url);
+  if (list.hls) return directLink(url);
+  const [first] = list.sources;
+  if (!first) return { error: "that playlist has nothing in it this can play" };
+  return {
+    title: fileNameOf(url).replace(/\.m3u$/i, "") || "Playlist",
+    media: first,
+    audio: "",
+    // A station: joined where it is, never seeked, and with no end to save.
+    live: true,
+    duration: 0,
+    // Whether there is a picture is the first entry's to say; ffprobe settles it.
+    video: true,
+    headers: {},
+    extractor: "playlist",
+    ext: "",
+    page: url,
+    playlist: list.sources,
+  };
+}
+
 /** A link somebody pasted, or "" when it is not one this can play. */
 export function playableLink(entered: unknown): string {
   if (typeof entered !== "string") return "";
@@ -313,6 +400,7 @@ export async function resolveLink(
   options: { cookies?: string; timeoutMs?: number; format?: string } = {},
 ): Promise<ResolvedLink | { error: string }> {
   if (isDirectMedia(url)) return directLink(url);
+  if (isPlaylistLink(url)) return resolvePlaylist(url, { timeoutMs: options.timeoutMs });
   // Without yt-dlp, a link is taken as the media it may well be: an IPTV
   // feed has no extension and no page behind it, and ffprobe -- asked next,
   // before anything goes on the air -- tells a stream from a web page in a

package/src/server.ts

@@ -1052,6 +1052,9 @@ export interface KnownSource {
   codecs?: Codecs;
   position?: number;
   live?: boolean;
+  /** A list of entries to play in turn, and which one was on. */
+  playlist?: string[];
+  playlistAt?: number;
 }
 
 /** How many times a source that answers nothing is asked, and how far apart. */
@@ -1117,7 +1120,9 @@ export async function pullChannel(
   const kind = codecs.video !== "" ? "video" : codecs.audio !== "" ? "audio" : (known.kind ?? "video");
   if (assumed) console.log(`  "${id}": the source would not say what it holds; carrying it as ${kind}.`);
   // A film has a length and a place to go back to; a live source has neither.
-  const live = known.live ?? !((codecs.duration ?? 0) > 0);
+  // A list is a station: joined where it is, and never seeked.
+  const playlist = known.playlist && known.playlist.length > 0 ? known.playlist : null;
+  const live = playlist ? true : (known.live ?? !((codecs.duration ?? 0) > 0));
   const encode = kind === "video"
     ? [
         // Which streams from which input, when there are two: the picture
@@ -1135,12 +1140,13 @@ export async function pullChannel(
   const opening = [...transportInputArgs(source, codecs.container), ...input];
   const channel = channels.pull(
     id, name, source, encode, kind, true, undefined, opening, kind === "video" ? audio : "",
-    { live, position: known.position ?? 0 },
+    { live, position: known.position ?? 0, ...(playlist ? { playlist } : {}) },
     // Known before the first dial: whether the source is a transport stream
     // decides whether it can be read here for a source-boundary relay.
     assumed ? undefined : codecs,
   );
   if (channel && !assumed) channel.info.codecs = codecs;
+  if (channel && playlist && known.playlistAt !== undefined) channel.info.playlistAt = known.playlistAt;
   // What comes out, as opposed to what went in. An H.265 source copied
   // through stays H.265; one re-encoded arrives as H.264, and a packager
   // told otherwise would cut fMP4 segments for a stream that did not need
@@ -1184,11 +1190,16 @@ function shownLink(channelId: string, link: ResolvedLink, channel?: ChannelInfo)
     channel: channelId,
     name: channel?.name ?? link.title,
     live,
-    video: link.video,
+    // Whether there is a picture is the channel's answer where there is one:
+    // a list is guessed at as video until its first entry has been probed,
+    // and a station of podcasts opened a video element for nothing.
+    video: channel?.kind ? channel.kind !== "audio" : link.video,
     duration: link.duration,
     extractor: link.extractor,
     // A live has no whole to keep; a bare file can be fetched by the browser itself.
     download: !live && link.extractor !== "direct",
+    // How many things a list holds, for the page to say.
+    entries: link.playlist?.length ?? 0,
   };
 }
 
@@ -1434,6 +1445,12 @@ export interface HandlerOptions {
   ffmpeg?: string[];
   /** Where ffprobe is, for asking what is inside a file before re-encoding it. */
   ffprobe?: string[];
+  /**
+   * Whether this server can carry a channel at all: false where no ffmpeg
+   * was found, as on the hosted directory, which then says so instead of
+   * resolving a link, probing it, and blaming the site.
+   */
+  carries?: boolean;
   /** yt-dlp, which turns a pasted page into a media address. Null when there is none. */
   ytdlp?: string[] | null;
   /** Channels as HLS, for Safari on a phone, which plays a live stream no other way. */
@@ -2973,6 +2990,10 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           // one nobody can dial is not worth showing.
           code: state?.code ?? "",
           url: state?.url ?? "",
+          // Whether a link can go live here at all. The hosted directory
+          // has no ffmpeg, and a page that offered to go live on it was
+          // offering something that always failed.
+          carries: options.carries !== false && Boolean(options.channels),
         },
         channels: (options.channels?.list() ?? []).map((one) => ({
           id: one.id,
@@ -2989,6 +3010,8 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
           // How it has been going, for whoever may do something about it.
           redials: one.redials ?? 0,
           error: one.error ?? "",
+          // For a list: how long it is, and which entry is on, from 0.
+          ...(one.playlist ? { entries: one.playlist.length, entry: one.playlistAt ?? 0 } : {}),
           // The member who put it on, when one did: theirs to take off.
           startedBy: one.startedBy ?? "",
         })),
@@ -3163,7 +3186,12 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
         options.channels.keep(channelId);
         options.rememberChannels?.(rememberedNow(options.channels));
         void options.live?.announce?.();
-        json(response, 200, { channel: channelId, name: entry.title, kind: entry.live ? "live" : "vod" });
+        // Whether there is a picture, so the page can join it in the right
+        // element straight away rather than guessing.
+        json(response, 200, {
+          channel: channelId, name: entry.title, kind: entry.live ? "live" : "vod",
+          video: options.channels.kindOf(channelId) !== "audio",
+        });
         return;
       }
 
@@ -3258,6 +3286,12 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
         json(response, 503, { error: "this server cannot carry channels" });
         return;
       }
+      if (options.carries === false) {
+        json(response, 503, {
+          error: `${options.serverName ?? "this server"} has no ffmpeg, so it cannot carry a link. Pick a server to go live on.`,
+        });
+        return;
+      }
       const channelId = linkChannelId(link);
       const known = links.get(link);
       // A member's is always a live: a decoder started on somebody else's
@@ -3333,6 +3367,7 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
         const started = await pullChannel(
           options.channels, options.ffprobe ?? ["ffprobe"], channelId, resolved.title, resolved.media,
           inputArgsFor(resolved.headers), resolved.audio,
+          resolved.playlist ? { playlist: resolved.playlist } : {},
         );
         if (!started) {
           json(response, 409, { error: "that link is already starting" });
@@ -3464,7 +3499,7 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
       options.channels.keep(channelId);
       options.rememberChannels?.(rememberedNow(options.channels));
       void options.live?.announce?.();
-      json(response, 200, { channel: channelId, name });
+      json(response, 200, { channel: channelId, name, video: options.channels.kindOf(channelId) !== "audio" });
       return;
     }
 
@@ -4848,6 +4883,7 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
       ...(one.codecs ? { codecs: one.codecs } : {}),
       ...(one.position !== undefined ? { position: one.position } : {}),
       ...(one.live !== undefined ? { live: one.live } : {}),
+      ...(one.playlist ? { playlist: one.playlist, playlistAt: one.playlistAt ?? 0 } : {}),
     }).then((channel) => {
       if (!channel) console.log(`  "${one.id}" is already on.`);
     });
@@ -4859,7 +4895,8 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
   let lastRemembered = "";
   setInterval(() => {
     const now = rememberedNow(channels);
-    if (!now.some((one) => one.position !== undefined)) return;
+    // A list moves on without a position: which entry is on is the thing to keep.
+    if (!now.some((one) => one.position !== undefined || one.playlist)) return;
     const text = JSON.stringify(now);
     if (text === lastRemembered) return;
     lastRemembered = text;
@@ -5290,6 +5327,7 @@ export async function serve(argv: string[], version = "0.1.0"): Promise<void> {
     // A cookie jar beside the state, when the operator has put one there,
     // for the sites that will not talk to a datacenter without one.
     ytdlp: tools.ytdlp ?? null,
+    carries: tools.carries !== false,
     cookies: cookiesFile(),
     hls,
     compression,

package/web/dist/assets/{hls-3VKVEQE3-DLpqiiG9.js → hls-3VKVEQE3-DLsUeG9Z.js}

@@ -1 +1 @@
-import{t as e}from"./index-BafZs9FO.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-CwcjINDz.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};