nixamp 0.46.0 → 0.47.0

package/dist/break-silence.d.ts

@@ -1,10 +1,10 @@
 /**
- * Silence in place of a break, for one listener of a station.
+ * Silence in place of a break, for one listener of a station: the last resort.
  *
- * A station's breaks are in its one stream (playlist-input.ts), so a listener
- * with a listen pass (listen-pass.ts) cannot be spared the time a spot takes,
- * only the spot: while the channel says a break is on, what goes to them is
- * MP3 silence lasting as long as the bytes it stands in for. Audio only; a
+ * A listener with a listen pass (listen-pass.ts) skips breaks out of a head
+ * start of music (Channel.listenWithoutBreaks). Only when that is spent is a
+ * break replaced, by MP3 silence lasting as long as the bytes it stands in
+ * for, rather than a gap that stalls the player. Audio only; a
  * fragmented MP4 cannot have fragments swapped, so a TV station's breaks are
  * everybody's.
  *

package/dist/break-silence.js

@@ -1,10 +1,10 @@
 /**
- * Silence in place of a break, for one listener of a station.
+ * Silence in place of a break, for one listener of a station: the last resort.
  *
- * A station's breaks are in its one stream (playlist-input.ts), so a listener
- * with a listen pass (listen-pass.ts) cannot be spared the time a spot takes,
- * only the spot: while the channel says a break is on, what goes to them is
- * MP3 silence lasting as long as the bytes it stands in for. Audio only; a
+ * A listener with a listen pass (listen-pass.ts) skips breaks out of a head
+ * start of music (Channel.listenWithoutBreaks). Only when that is spent is a
+ * break replaced, by MP3 silence lasting as long as the bytes it stands in
+ * for, rather than a gap that stalls the player. Audio only; a
  * fragmented MP4 cannot have fragments swapped, so a TV station's breaks are
  * everybody's.
  *

package/dist/channels.d.ts

@@ -168,6 +168,12 @@ export declare const BACKLOG_AUDIO: number;
  * until the channel ended, however long that was.
  */
 export declare const LISTENER_QUEUE: number;
+/**
+ * How much break-free radio a listener who skips breaks is handed on arrival:
+ * two minutes at 192k. Their player holds it, and each break they skip spends
+ * the length of the spot from it, so they never hear a gap.
+ */
+export declare const MUSIC_BACKLOG: number;
 /** Media-time window for complete MP4 fragments. Byte limits are a separate
  * memory ceiling; the measured byte rate is only a fallback for inputs with
  * no usable fragment timestamps. It must never make low-bitrate video old. */
@@ -270,6 +276,11 @@ export declare class Channel {
      * can begin at; for MP3 any point will do, a frame announces itself.
      */
     private recent;
+    /** Whether what the encoder is writing now is a break (a radio list's spot). */
+    private breakOn;
+    /** The last couple of minutes of a radio list without its breaks, for listenWithoutBreaks. */
+    private music;
+    private musicBytes;
     private fragmentClock;
     private fragmentTimes;
     private recentBytes;
@@ -420,6 +431,14 @@ export declare class Channel {
      */
     private feedThrough;
     listen(listener: Listener): () => void;
+    /**
+     * A radio list's listener who hears no breaks: handed the last couple of
+     * minutes of music at once, which their player holds, then everything but
+     * the breaks. Each skipped break spends its length of that head start, so
+     * there is no gap; only once it is all spent does a break become silence of
+     * the same length (`silence`), never the spot. Joining again refills it.
+     */
+    listenWithoutBreaks(listener: Listener, kbps: number, silence: (out: Listener) => Listener): () => void;
     /** Stay up with nobody watching: no longer on demand. */
     keep(): void;
     /** Nobody is watching an on-demand channel: give it a minute, then stop. */
@@ -485,6 +504,8 @@ export declare class Channels {
     contentType(id: string): string;
     /** Attach a listener, or null when nothing is playing on that channel. */
     listen(id: string, listener: Listener): (() => void) | null;
+    /** Attach a listener who skips a radio list's breaks (Channel.listenWithoutBreaks). */
+    listenWithoutBreaks(id: string, listener: Listener, kbps: number, silence: (out: Listener) => Listener): (() => void) | null;
     /** Feed a channel that already exists, for a publisher sending chunks. */
     writeTo(id: string, chunk: Buffer): boolean;
     /**

package/dist/channels.js

@@ -66,6 +66,12 @@ export const BACKLOG_AUDIO = 64 * 1024;
  * until the channel ended, however long that was.
  */
 export const LISTENER_QUEUE = 16 * 1024 * 1024;
+/**
+ * How much break-free radio a listener who skips breaks is handed on arrival:
+ * two minutes at 192k. Their player holds it, and each break they skip spends
+ * the length of the spot from it, so they never hear a gap.
+ */
+export const MUSIC_BACKLOG = 3 * 1024 * 1024;
 /** Media-time window for complete MP4 fragments. Byte limits are a separate
  * memory ceiling; the measured byte rate is only a fallback for inputs with
  * no usable fragment timestamps. It must never make low-bitrate video old. */
@@ -190,6 +196,11 @@ export class Channel {
      * can begin at; for MP3 any point will do, a frame announces itself.
      */
     recent = [];
+    /** Whether what the encoder is writing now is a break (a radio list's spot). */
+    breakOn = false;
+    /** The last couple of minutes of a radio list without its breaks, for listenWithoutBreaks. */
+    music = [];
+    musicBytes = 0;
     fragmentClock = new FragmentClock();
     fragmentTimes = new WeakMap();
     recentBytes = 0;
@@ -412,6 +423,13 @@ export class Channel {
                 }
             });
             child.stdio[3]?.on("error", () => undefined);
+            // A radio list's output is constant-bitrate MP3, so how many bytes it
+            // has written is exactly how far it has played: whether this chunk is
+            // a break, to the frame, rather than to progress's once a second.
+            const kbps = playlistInput && this.info.kind !== "video"
+                ? Number(/^(\d+)k$/.exec((playlistEncode ?? [])[playlistEncode.indexOf("-b:a") + 1] ?? "")?.[1] ?? 0)
+                : 0;
+            let written = 0;
             child.stdout?.on("data", (chunk) => {
                 // An ffmpeg that was replaced can still have a chunk in the pipe.
                 if (this.child !== child)
@@ -421,6 +439,12 @@ export class Channel {
                 sent = true;
                 this.info.bytes += chunk.byteLength;
                 this.rearm(child);
+                if (kbps > 0 && playlistInput) {
+                    this.breakOn = playlistInput.place((written * 8) / (kbps * 1000)).at === -1;
+                    written += chunk.byteLength;
+                }
+                else
+                    this.breakOn = this.info.playlistAt === -1;
                 this.emit(chunk);
             });
             child.stdout?.on("error", () => undefined);
@@ -669,6 +693,13 @@ export class Channel {
         this.measure(chunk.byteLength);
         if (!this.fragments) {
             this.remember(chunk, BACKLOG_AUDIO, false);
+            if (this.info.playlist && !this.breakOn) {
+                this.music.push(chunk);
+                this.musicBytes += chunk.byteLength;
+                while (this.music.length > 1 && this.musicBytes - this.music[0].byteLength > MUSIC_BACKLOG) {
+                    this.musicBytes -= this.music.shift().byteLength;
+                }
+            }
             this.send(chunk);
             return;
         }
@@ -934,6 +965,52 @@ export class Channel {
                 this.idleOut();
         };
     }
+    /**
+     * A radio list's listener who hears no breaks: handed the last couple of
+     * minutes of music at once, which their player holds, then everything but
+     * the breaks. Each skipped break spends its length of that head start, so
+     * there is no gap; only once it is all spent does a break become silence of
+     * the same length (`silence`), never the spot. Joining again refills it.
+     */
+    listenWithoutBreaks(listener, kbps, silence) {
+        const bytesPerSecond = (kbps * 1000) / 8;
+        let ahead = 0;
+        for (const piece of this.music) {
+            try {
+                listener.write(piece);
+            }
+            catch {
+                break;
+            }
+            ahead += piece.byteLength / bytesPerSecond;
+        }
+        const quiet = silence(listener);
+        const skipping = {
+            write: (chunk) => {
+                if (!this.breakOn)
+                    return listener.write(chunk);
+                const seconds = chunk.byteLength / bytesPerSecond;
+                if (ahead >= seconds) {
+                    ahead -= seconds;
+                    return true;
+                }
+                return quiet.write(chunk);
+            },
+            end: () => listener.end(),
+            ...(listener.pending ? { pending: () => listener.pending() } : {}),
+        };
+        this.listeners.add(skipping);
+        this.info.listeners = this.listeners.size;
+        if (this.idle)
+            clearTimeout(this.idle);
+        this.idle = null;
+        return () => {
+            this.listeners.delete(skipping);
+            this.info.listeners = this.listeners.size;
+            if (this.ephemeral && this.listeners.size === 0)
+                this.idleOut();
+        };
+    }
     /** Stay up with nobody watching: no longer on demand. */
     keep() {
         this.ephemeral = false;
@@ -1140,6 +1217,11 @@ export class Channels {
         const channel = this.open.get(id);
         return channel ? channel.listen(listener) : null;
     }
+    /** Attach a listener who skips a radio list's breaks (Channel.listenWithoutBreaks). */
+    listenWithoutBreaks(id, listener, kbps, silence) {
+        const channel = this.open.get(id);
+        return channel ? channel.listenWithoutBreaks(listener, kbps, silence) : null;
+    }
     /** Feed a channel that already exists, for a publisher sending chunks. */
     writeTo(id, chunk) {
         return this.open.get(id)?.write(chunk) ?? false;

package/dist/playlist-input.js

@@ -64,6 +64,8 @@ export class PlaylistInputStream {
             let played = 0;
             let last = "";
             let lastBreak = 0;
+            // A film cut for a break, to be picked up where it stopped.
+            let resume = null;
             for (;;) {
                 if (signal.aborted)
                     break;
@@ -81,7 +83,8 @@ export class PlaylistInputStream {
                         step = o.order ? 0 : where >= 0 ? where + 1 : Math.min(step, files.length);
                     }
                 }
-                if (step >= order.length) {
+                // A film cut for a break is not the end of the list: it has more to play.
+                if (step >= order.length && !resume) {
                     if (!o.repeat)
                         break;
                     // A pass where everything was passed over is a list with nothing
@@ -95,7 +98,8 @@ export class PlaylistInputStream {
                 }
                 {
                     // A break, when one is due: in place of the next entry, which stays
-                    // next. Not at the very start, and never inside an entry.
+                    // next. Not at the very start. Never inside a song; a film is cut
+                    // for one on the clock (below), since waiting out a film is an hour.
                     let breakFile = null;
                     const every = typeof o.breaks?.everySeconds === "function" ? o.breaks.everySeconds() : (o.breaks?.everySeconds ?? 0);
                     if (o.breaks && every > 0 && !first && offset - lastBreak >= every) {
@@ -105,15 +109,18 @@ export class PlaylistInputStream {
                             return;
                     }
                     const isBreak = breakFile !== null;
-                    const at = isBreak ? -1 : order[step];
-                    if (!isBreak)
+                    const resuming = isBreak ? null : resume;
+                    if (resuming)
+                        resume = null;
+                    const at = isBreak ? -1 : resuming ? resuming.at : order[step];
+                    if (!isBreak && !resuming)
                         step += 1;
-                    const file = isBreak ? breakFile : files[at];
-                    if (!isBreak)
+                    const file = isBreak ? breakFile : resuming ? resuming.file : files[at];
+                    if (!isBreak && !resuming)
                         last = file;
-                    if (!isBreak && o.excluded?.(file))
+                    if (!isBreak && !resuming && o.excluded?.(file))
                         continue;
-                    const position = first && step - 1 === o.at ? o.position : 0;
+                    const position = resuming ? resuming.position : first && step - 1 === o.at ? o.position : 0;
                     first = false;
                     let reached = 0;
                     try {
@@ -125,9 +132,14 @@ export class PlaylistInputStream {
                         if (codecs.tags && (codecs.tags.title || codecs.tags.artist)) {
                             this.tags.set(file, { title: codecs.tags.title ?? "", artist: codecs.tags.artist ?? "", album: codecs.tags.album ?? "" });
                         }
-                        const duration = (codecs.duration ?? 0) - position;
-                        if (duration <= 0)
+                        const full = (codecs.duration ?? 0) - position;
+                        if (full <= 0)
                             throw new Error(`No playable duration for playlist entry ${at + 1}`);
+                        // A film plays up to the next break and is picked up after it;
+                        // a tail of a few seconds is not worth a cut.
+                        const room = o.video && !isBreak && o.breaks && every > 0 ? every - (offset - lastBreak) : Infinity;
+                        const cut = room >= 1 && full - room > 5;
+                        const duration = cut ? room : full;
                         this.entries.push({ at, file, start: offset, position });
                         const hasVideo = Boolean(codecs.video);
                         const extra = o.video && !hasVideo
@@ -200,6 +212,10 @@ export class PlaylistInputStream {
                         // longer than the gap cannot follow itself.
                         if (isBreak)
                             lastBreak = offset;
+                        // Cut for a break, not skipped: the break is due now, and the
+                        // film carries on from here after it.
+                        if (cut && !skipped)
+                            resume = { at, file, position: position + duration };
                     }
                     catch (error) {
                         // A break that would not play is simply no break.

package/dist/station-routes.js

@@ -246,7 +246,8 @@ export async function handleStations(request, response, path, url, ctx) {
             response.end(JSON.stringify({ error: refused.error, code: refused.code, retryAfter: refused.retryAfter }));
             return true;
         }
-        // Signed in at nixamp.com: the breaks go quiet. Radio only (break-silence.ts).
+        // Signed in at nixamp.com: no breaks, starting a little behind live so
+        // they can be left out without a gap. Radio only (Channel.listenWithoutBreaks).
         const pass = url.searchParams.get(PASS_PARAM) ?? "";
         const spared = method === "GET" && !station.video && pass !== "" && ctx.passes ? await ctx.passes.good(pass).catch(() => false) : false;
         response.writeHead(200, { ...ctx.headers, "content-type": ctx.channels.contentType(channelId), "cache-control": "no-store" });
@@ -266,10 +267,9 @@ export async function handleStations(request, response, path, url, ctx) {
                 pending: () => response.writableLength,
             }
             : response;
-        const counted = spared
-            ? quietDuringBreaks(metered, station.bitrate, () => ctx.channels.info(channelId)?.playlistAt === -1)
-            : metered;
-        const detach = ctx.channels.listen(channelId, counted);
+        const detach = spared
+            ? ctx.channels.listenWithoutBreaks(channelId, metered, station.bitrate, (out) => quietDuringBreaks(out, station.bitrate, () => true))
+            : ctx.channels.listen(channelId, metered);
         if (detach === null) {
             response.end();
             return true;

package/package.json

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

package/src/break-silence.ts

@@ -1,10 +1,10 @@
 /**
- * Silence in place of a break, for one listener of a station.
+ * Silence in place of a break, for one listener of a station: the last resort.
  *
- * A station's breaks are in its one stream (playlist-input.ts), so a listener
- * with a listen pass (listen-pass.ts) cannot be spared the time a spot takes,
- * only the spot: while the channel says a break is on, what goes to them is
- * MP3 silence lasting as long as the bytes it stands in for. Audio only; a
+ * A listener with a listen pass (listen-pass.ts) skips breaks out of a head
+ * start of music (Channel.listenWithoutBreaks). Only when that is spent is a
+ * break replaced, by MP3 silence lasting as long as the bytes it stands in
+ * for, rather than a gap that stalls the player. Audio only; a
  * fragmented MP4 cannot have fragments swapped, so a TV station's breaks are
  * everybody's.
  *

package/src/channels.ts

@@ -196,6 +196,12 @@ export const BACKLOG_AUDIO = 64 * 1024;
  * until the channel ended, however long that was.
  */
 export const LISTENER_QUEUE = 16 * 1024 * 1024;
+/**
+ * How much break-free radio a listener who skips breaks is handed on arrival:
+ * two minutes at 192k. Their player holds it, and each break they skip spends
+ * the length of the spot from it, so they never hear a gap.
+ */
+export const MUSIC_BACKLOG = 3 * 1024 * 1024;
 
 /** Media-time window for complete MP4 fragments. Byte limits are a separate
  * memory ceiling; the measured byte rate is only a fallback for inputs with
@@ -346,6 +352,11 @@ export class Channel {
    * can begin at; for MP3 any point will do, a frame announces itself.
    */
   private recent: Buffer[] = [];
+  /** Whether what the encoder is writing now is a break (a radio list's spot). */
+  private breakOn = false;
+  /** The last couple of minutes of a radio list without its breaks, for listenWithoutBreaks. */
+  private music: Buffer[] = [];
+  private musicBytes = 0;
   private fragmentClock = new FragmentClock();
   private fragmentTimes = new WeakMap<Buffer, number>();
   private recentBytes = 0;
@@ -582,6 +593,13 @@ export class Channel {
         }
       });
       (child.stdio[3] as Readable | null)?.on("error", () => undefined);
+      // A radio list's output is constant-bitrate MP3, so how many bytes it
+      // has written is exactly how far it has played: whether this chunk is
+      // a break, to the frame, rather than to progress's once a second.
+      const kbps = playlistInput && this.info.kind !== "video"
+        ? Number(/^(\d+)k$/.exec((playlistEncode ?? [])[playlistEncode!.indexOf("-b:a") + 1] ?? "")?.[1] ?? 0)
+        : 0;
+      let written = 0;
       child.stdout?.on("data", (chunk: Buffer) => {
         // An ffmpeg that was replaced can still have a chunk in the pipe.
         if (this.child !== child) return;
@@ -589,6 +607,10 @@ export class Channel {
         sent = true;
         this.info.bytes += chunk.byteLength;
         this.rearm(child);
+        if (kbps > 0 && playlistInput) {
+          this.breakOn = playlistInput.place((written * 8) / (kbps * 1000)).at === -1;
+          written += chunk.byteLength;
+        } else this.breakOn = this.info.playlistAt === -1;
         this.emit(chunk);
       });
       child.stdout?.on("error", () => undefined);
@@ -823,6 +845,13 @@ export class Channel {
     this.measure(chunk.byteLength);
     if (!this.fragments) {
       this.remember(chunk, BACKLOG_AUDIO, false);
+      if (this.info.playlist && !this.breakOn) {
+        this.music.push(chunk);
+        this.musicBytes += chunk.byteLength;
+        while (this.music.length > 1 && this.musicBytes - this.music[0]!.byteLength > MUSIC_BACKLOG) {
+          this.musicBytes -= this.music.shift()!.byteLength;
+        }
+      }
       this.send(chunk);
       return;
     }
@@ -1075,6 +1104,49 @@ export class Channel {
     };
   }
 
+  /**
+   * A radio list's listener who hears no breaks: handed the last couple of
+   * minutes of music at once, which their player holds, then everything but
+   * the breaks. Each skipped break spends its length of that head start, so
+   * there is no gap; only once it is all spent does a break become silence of
+   * the same length (`silence`), never the spot. Joining again refills it.
+   */
+  listenWithoutBreaks(listener: Listener, kbps: number, silence: (out: Listener) => Listener): () => void {
+    const bytesPerSecond = (kbps * 1000) / 8;
+    let ahead = 0;
+    for (const piece of this.music) {
+      try {
+        listener.write(piece);
+      } catch {
+        break;
+      }
+      ahead += piece.byteLength / bytesPerSecond;
+    }
+    const quiet = silence(listener);
+    const skipping: Listener = {
+      write: (chunk) => {
+        if (!this.breakOn) return listener.write(chunk);
+        const seconds = chunk.byteLength / bytesPerSecond;
+        if (ahead >= seconds) {
+          ahead -= seconds;
+          return true;
+        }
+        return quiet.write(chunk);
+      },
+      end: () => listener.end(),
+      ...(listener.pending ? { pending: () => listener.pending!() } : {}),
+    };
+    this.listeners.add(skipping);
+    this.info.listeners = this.listeners.size;
+    if (this.idle) clearTimeout(this.idle);
+    this.idle = null;
+    return () => {
+      this.listeners.delete(skipping);
+      this.info.listeners = this.listeners.size;
+      if (this.ephemeral && this.listeners.size === 0) this.idleOut();
+    };
+  }
+
   /** Stay up with nobody watching: no longer on demand. */
   keep(): void {
     this.ephemeral = false;
@@ -1300,6 +1372,12 @@ export class Channels {
     return channel ? channel.listen(listener) : null;
   }
 
+  /** Attach a listener who skips a radio list's breaks (Channel.listenWithoutBreaks). */
+  listenWithoutBreaks(id: string, listener: Listener, kbps: number, silence: (out: Listener) => Listener): (() => void) | null {
+    const channel = this.open.get(id);
+    return channel ? channel.listenWithoutBreaks(listener, kbps, silence) : null;
+  }
+
   /** Feed a channel that already exists, for a publisher sending chunks. */
   writeTo(id: string, chunk: Buffer): boolean {
     return this.open.get(id)?.write(chunk) ?? false;

package/src/playlist-input.ts

@@ -109,6 +109,8 @@ export class PlaylistInputStream {
       let played = 0;
       let last = "";
       let lastBreak = 0;
+      // A film cut for a break, to be picked up where it stopped.
+      let resume: { at: number; file: string; position: number } | null = null;
       for (;;) {
         if (signal.aborted) break;
         // Asked at every boundary, so an edit lands on the next track. The
@@ -124,7 +126,8 @@ export class PlaylistInputStream {
             step = o.order ? 0 : where >= 0 ? where + 1 : Math.min(step, files.length);
           }
         }
-        if (step >= order.length) {
+        // A film cut for a break is not the end of the list: it has more to play.
+        if (step >= order.length && !resume) {
           if (!o.repeat) break;
           // A pass where everything was passed over is a list with nothing
           // to play, and repeating it would be the loop this exists to avoid.
@@ -136,7 +139,8 @@ export class PlaylistInputStream {
         }
         {
           // A break, when one is due: in place of the next entry, which stays
-          // next. Not at the very start, and never inside an entry.
+          // next. Not at the very start. Never inside a song; a film is cut
+          // for one on the clock (below), since waiting out a film is an hour.
           let breakFile: string | null = null;
           const every = typeof o.breaks?.everySeconds === "function" ? o.breaks.everySeconds() : (o.breaks?.everySeconds ?? 0);
           if (o.breaks && every > 0 && !first && offset - lastBreak >= every) {
@@ -145,12 +149,14 @@ export class PlaylistInputStream {
             if (signal.aborted) return;
           }
           const isBreak = breakFile !== null;
-          const at = isBreak ? -1 : order[step]!;
-          if (!isBreak) step += 1;
-          const file = isBreak ? breakFile! : files[at]!;
-          if (!isBreak) last = file;
-          if (!isBreak && o.excluded?.(file)) continue;
-          const position = first && step - 1 === o.at ? o.position : 0;
+          const resuming: { at: number; file: string; position: number } | null = isBreak ? null : resume;
+          if (resuming) resume = null;
+          const at: number = isBreak ? -1 : resuming ? resuming.at : order[step]!;
+          if (!isBreak && !resuming) step += 1;
+          const file: string = isBreak ? breakFile! : resuming ? resuming.file : files[at]!;
+          if (!isBreak && !resuming) last = file;
+          if (!isBreak && !resuming && o.excluded?.(file)) continue;
+          const position: number = resuming ? resuming.position : first && step - 1 === o.at ? o.position : 0;
           first = false;
           let reached = 0;
           try {
@@ -160,8 +166,13 @@ export class PlaylistInputStream {
             if (codecs.tags && (codecs.tags.title || codecs.tags.artist)) {
               this.tags.set(file, { title: codecs.tags.title ?? "", artist: codecs.tags.artist ?? "", album: codecs.tags.album ?? "" });
             }
-            const duration = (codecs.duration ?? 0) - position;
-            if (duration <= 0) throw new Error(`No playable duration for playlist entry ${at + 1}`);
+            const full = (codecs.duration ?? 0) - position;
+            if (full <= 0) throw new Error(`No playable duration for playlist entry ${at + 1}`);
+            // A film plays up to the next break and is picked up after it;
+            // a tail of a few seconds is not worth a cut.
+            const room = o.video && !isBreak && o.breaks && every > 0 ? every - (offset - lastBreak) : Infinity;
+            const cut = room >= 1 && full - room > 5;
+            const duration = cut ? room : full;
             this.entries.push({ at, file, start: offset, position });
             const hasVideo = Boolean(codecs.video);
             const extra = o.video && !hasVideo
@@ -228,6 +239,9 @@ export class PlaylistInputStream {
             // The next break is counted from the end of this one, so a spot
             // longer than the gap cannot follow itself.
             if (isBreak) lastBreak = offset;
+            // Cut for a break, not skipped: the break is due now, and the
+            // film carries on from here after it.
+            if (cut && !skipped) resume = { at, file, position: position + duration };
           } catch (error) {
             // A break that would not play is simply no break.
             if (isBreak && !signal.aborted) continue;

package/src/station-routes.ts

@@ -329,7 +329,8 @@ export async function handleStations(
       response.end(JSON.stringify({ error: refused.error, code: refused.code, retryAfter: refused.retryAfter }));
       return true;
     }
-    // Signed in at nixamp.com: the breaks go quiet. Radio only (break-silence.ts).
+    // Signed in at nixamp.com: no breaks, starting a little behind live so
+    // they can be left out without a gap. Radio only (Channel.listenWithoutBreaks).
     const pass = url.searchParams.get(PASS_PARAM) ?? "";
     const spared = method === "GET" && !station.video && pass !== "" && ctx.passes ? await ctx.passes.good(pass).catch(() => false) : false;
     response.writeHead(200, { ...ctx.headers, "content-type": ctx.channels.contentType(channelId), "cache-control": "no-store" });
@@ -349,10 +350,9 @@ export async function handleStations(
           pending: (): number => response.writableLength,
         }
       : response;
-    const counted = spared
-      ? quietDuringBreaks(metered, station.bitrate, () => ctx.channels.info(channelId)?.playlistAt === -1)
-      : metered;
-    const detach = ctx.channels.listen(channelId, counted);
+    const detach = spared
+      ? ctx.channels.listenWithoutBreaks(channelId, metered, station.bitrate, (out) => quietDuringBreaks(out, station.bitrate, () => true))
+      : ctx.channels.listen(channelId, metered);
     if (detach === null) {
       response.end();
       return true;

package/web/dist/assets/{ar-BlY2yL5Y.js → ar-BOy98BLI.js}

@@ -1 +1 @@
-import{t as e}from"./main-BXsE3ZHI.js";var t={...e,"No parties live right now.":`لا توجد جلسات مباشرة الآن.`,"Could not refresh parties.":`تعذر تحديث الجلسات.`,"Pick a server in the directory, or paste its link here.":`اختر خادمًا من الدليل أو الصق رابطه هنا.`,"Interface language":`لغة الواجهة`,Language:`اللغة`,"Translation language":`لغة الترجمة`,"Original (auto-detect)":`الأصل (اكتشاف تلقائي)`,Play:`تشغيل`,Pause:`إيقاف مؤقت`,Stop:`إيقاف`,Next:`التالي`,Previous:`السابق`,Select:`اختيار`,"Next/Prev":`التالي/السابق`,Quit:`خروج`,"Now Playing":`قيد التشغيل`,"Spectrum Analyser":`محلل الطيف`,Playlist:`قائمة التشغيل`,Files:`الملفات`,"Open files":`فتح ملفات`,"Open folder":`فتح مجلد`,"Add to library":`إضافة إلى المكتبة`,"Replace playlist":`استبدال قائمة التشغيل`,Filter:`تصفية`,Search:`بحث`,"Nothing loaded.":`لم يُحمّل أي محتوى.`,"Empty.":`فارغ.`,"Loading…":`جارٍ التحميل…`,"Connecting…":`جارٍ الاتصال…`,Connected:`متصل`,"Not connected":`غير متصل`,"No source":`لا يوجد مصدر`,Playing:`يعمل`,Stopped:`متوقف`,Volume:`مستوى الصوت`,Seek:`موضع التشغيل`,"Full screen":`ملء الشاشة`,Download:`تنزيل`,Share:`مشاركة`,Copy:`نسخ`,"Copy link":`نسخ الرابط`,Copied:`تم النسخ`,Save:`حفظ`,Cancel:`إلغاء`,Close:`إغلاق`,Remove:`إزالة`,Delete:`حذف`,Edit:`تعديل`,Add:`إضافة`,Send:`إرسال`,Retry:`إعادة المحاولة`,Back:`رجوع`,"Next page":`الصفحة التالية`,"Previous page":`الصفحة السابقة`,"Show more":`عرض المزيد`,Panels:`اللوحات`,"Reset layout":`إعادة ضبط التخطيط`,Show:`إظهار`,Hide:`إخفاء`,Collapse:`طي`,Expand:`توسيع`,"Move up":`نقل لأعلى`,"Move down":`نقل لأسفل`,Install:`تثبيت`,"TV mode":`وضع التلفاز`,On:`مفعّل`,Off:`معطّل`,Account:`الحساب`,"Sign in":`تسجيل الدخول`,"Sign out":`تسجيل الخروج`,"Create account":`إنشاء حساب`,Email:`البريد الإلكتروني`,Password:`كلمة المرور`,"Forgot password?":`نسيت كلمة المرور؟`,"Welcome back":`مرحبًا بعودتك`,Profile:`الملف الشخصي`,Handle:`اسم المستخدم`,"Your servers":`خوادمك`,Server:`الخادم`,Connect:`اتصال`,Disconnect:`قطع الاتصال`,Directory:`الدليل`,Favourites:`المفضلة`,Follow:`متابعة`,Unfollow:`إلغاء المتابعة`,Notifications:`الإشعارات`,"Phone number":`رقم الهاتف`,"Save number":`حفظ الرقم`,Transcript:`النص المفرغ`,Captions:`الترجمة النصية`,"Translate audio":`ترجمة الصوت`,"Audio language":`لغة الصوت`,"Audio options":`خيارات الصوت`,"Keep background sound":`الاحتفاظ بأصوات الخلفية`,"Background level":`مستوى صوت الخلفية`,"Speaker voices":`أصوات المتحدثين`,"Any voice":`أي صوت`,"Male voice":`صوت رجالي`,"Female voice":`صوت نسائي`,"Original audio.":`الصوت الأصلي.`,"Buy translated audio":`شراء الصوت المترجم`,"Audio credit":`رصيد الصوت`,"Buy pass":`شراء تصريح`,Pass:`تصريح`,"Pay with":`الدفع باستخدام`,"Check payment":`التحقق من الدفع`,"Open checkout":`الانتقال للدفع`,"Free sessions":`جلسات مجانية`,"Usage rates and expiry":`الأسعار ومدة الصلاحية`,Catalogs:`الكتالوجات`,"Add catalog":`إضافة كتالوج`,"Catalog name":`اسم الكتالوج`,Link:`الرابط`,"Play link":`تشغيل الرابط`,"Go live":`بدء بث مباشر`,Publish:`نشر`,Listen:`استماع`,"Live now":`مباشر الآن`,Upcoming:`قريبًا`,Parties:`حفلات المشاهدة`,"Join party":`الانضمام للحفلة`,"Invite code":`رمز الدعوة`,Invite:`دعوة`,Chat:`الدردشة`,"Chat message":`رسالة دردشة`,People:`الأشخاص`,Speaker:`متحدث`,Speakers:`المتحدثون`,Listener:`مستمع`,Moderator:`مشرف`,"Raise hand":`رفع اليد`,"Hand raises":`الأيدي المرفوعة`,Questions:`الأسئلة`,Resources:`الموارد`,Replay:`إعادة العرض`,Schedule:`الجدول`,Event:`الفعالية`,Host:`المضيف`,About:`حول`,Stage:`المنصة`,Title:`العنوان`,Description:`الوصف`,Topic:`الموضوع`,Public:`عام`,"Anyone with the link":`أي شخص لديه الرابط`,"Invited people":`الأشخاص المدعوون`,"Who can join":`من يمكنه الانضمام`,"Date and time":`التاريخ والوقت`,"Expected length":`المدة المتوقعة`,Repeat:`تكرار`,"Does not repeat":`لا يتكرر`,"Every day":`كل يوم`,"Every week":`كل أسبوع`,Homepage:`الموقع الإلكتروني`,"Host name":`اسم المضيف`,"Profile photo URL":`رابط صورة الملف الشخصي`,"Broadcast link":`رابط البث`,"Edit event":`تعديل الفعالية`,"Save changes":`حفظ التغييرات`,"Create live":`إنشاء بث مباشر`,"Schedule class":`جدولة درس`,"Start class":`بدء الدرس`,"End event":`إنهاء الفعالية`,"End session":`إنهاء الجلسة`,"Session ended":`انتهت الجلسة`,"Event ended":`انتهت الفعالية`,Cancelled:`ملغاة`,"Replay available":`إعادة العرض متاحة`,Join:`انضمام`,"Create invite":`إنشاء دعوة`,"Invite as":`الدعوة بصفة`,"Watch now":`شاهد الآن`,"Start a room":`إنشاء غرفة`,"Recent replays":`إعادات العرض الأخيرة`,"Your account":`حسابك`,"Write with AI":`الكتابة بالذكاء الاصطناعي`,"Suggested title":`العنوان المقترح`,"Suggested description":`الوصف المقترح`,"Suggested topic":`الموضوع المقترح`,"Use these details":`استخدام هذه التفاصيل`,"Learn something live.":`تعلّم شيئًا مباشرة.`,"Screen share":`مشاركة الشاشة`,"Upload and broadcast":`رفع وبث`,Help:`مساعدة`,"Reload Player":`إعادة تحميل المشغل`,"Copy Bundled CLI Path":`نسخ مسار أداة سطر الأوامر المضمنة`,"Developer tools":`أدوات المطور`,Undo:`تراجع`,Redo:`إعادة`,Cut:`قص`,Paste:`لصق`,"Select all":`تحديد الكل`,Status:`الحالة`,"Activity log":`سجل النشاط`,Admin:`الإدارة`,"Playback controls":`عناصر التحكم بالتشغيل`,"Tracks and folders":`المقاطع والمجلدات`,"Original-language captions.":`ترجمة نصية باللغة الأصلية.`,"Skip to playback controls":`الانتقال إلى عناصر التحكم بالتشغيل`,"Skip to playlist":`الانتقال إلى قائمة التشغيل`,"Skip to transcript and translated audio":`الانتقال إلى النص المفرغ والصوت المترجم`};export{t as default};
+import{t as e}from"./main-DYATKV1O.js";var t={...e,"No parties live right now.":`لا توجد جلسات مباشرة الآن.`,"Could not refresh parties.":`تعذر تحديث الجلسات.`,"Pick a server in the directory, or paste its link here.":`اختر خادمًا من الدليل أو الصق رابطه هنا.`,"Interface language":`لغة الواجهة`,Language:`اللغة`,"Translation language":`لغة الترجمة`,"Original (auto-detect)":`الأصل (اكتشاف تلقائي)`,Play:`تشغيل`,Pause:`إيقاف مؤقت`,Stop:`إيقاف`,Next:`التالي`,Previous:`السابق`,Select:`اختيار`,"Next/Prev":`التالي/السابق`,Quit:`خروج`,"Now Playing":`قيد التشغيل`,"Spectrum Analyser":`محلل الطيف`,Playlist:`قائمة التشغيل`,Files:`الملفات`,"Open files":`فتح ملفات`,"Open folder":`فتح مجلد`,"Add to library":`إضافة إلى المكتبة`,"Replace playlist":`استبدال قائمة التشغيل`,Filter:`تصفية`,Search:`بحث`,"Nothing loaded.":`لم يُحمّل أي محتوى.`,"Empty.":`فارغ.`,"Loading…":`جارٍ التحميل…`,"Connecting…":`جارٍ الاتصال…`,Connected:`متصل`,"Not connected":`غير متصل`,"No source":`لا يوجد مصدر`,Playing:`يعمل`,Stopped:`متوقف`,Volume:`مستوى الصوت`,Seek:`موضع التشغيل`,"Full screen":`ملء الشاشة`,Download:`تنزيل`,Share:`مشاركة`,Copy:`نسخ`,"Copy link":`نسخ الرابط`,Copied:`تم النسخ`,Save:`حفظ`,Cancel:`إلغاء`,Close:`إغلاق`,Remove:`إزالة`,Delete:`حذف`,Edit:`تعديل`,Add:`إضافة`,Send:`إرسال`,Retry:`إعادة المحاولة`,Back:`رجوع`,"Next page":`الصفحة التالية`,"Previous page":`الصفحة السابقة`,"Show more":`عرض المزيد`,Panels:`اللوحات`,"Reset layout":`إعادة ضبط التخطيط`,Show:`إظهار`,Hide:`إخفاء`,Collapse:`طي`,Expand:`توسيع`,"Move up":`نقل لأعلى`,"Move down":`نقل لأسفل`,Install:`تثبيت`,"TV mode":`وضع التلفاز`,On:`مفعّل`,Off:`معطّل`,Account:`الحساب`,"Sign in":`تسجيل الدخول`,"Sign out":`تسجيل الخروج`,"Create account":`إنشاء حساب`,Email:`البريد الإلكتروني`,Password:`كلمة المرور`,"Forgot password?":`نسيت كلمة المرور؟`,"Welcome back":`مرحبًا بعودتك`,Profile:`الملف الشخصي`,Handle:`اسم المستخدم`,"Your servers":`خوادمك`,Server:`الخادم`,Connect:`اتصال`,Disconnect:`قطع الاتصال`,Directory:`الدليل`,Favourites:`المفضلة`,Follow:`متابعة`,Unfollow:`إلغاء المتابعة`,Notifications:`الإشعارات`,"Phone number":`رقم الهاتف`,"Save number":`حفظ الرقم`,Transcript:`النص المفرغ`,Captions:`الترجمة النصية`,"Translate audio":`ترجمة الصوت`,"Audio language":`لغة الصوت`,"Audio options":`خيارات الصوت`,"Keep background sound":`الاحتفاظ بأصوات الخلفية`,"Background level":`مستوى صوت الخلفية`,"Speaker voices":`أصوات المتحدثين`,"Any voice":`أي صوت`,"Male voice":`صوت رجالي`,"Female voice":`صوت نسائي`,"Original audio.":`الصوت الأصلي.`,"Buy translated audio":`شراء الصوت المترجم`,"Audio credit":`رصيد الصوت`,"Buy pass":`شراء تصريح`,Pass:`تصريح`,"Pay with":`الدفع باستخدام`,"Check payment":`التحقق من الدفع`,"Open checkout":`الانتقال للدفع`,"Free sessions":`جلسات مجانية`,"Usage rates and expiry":`الأسعار ومدة الصلاحية`,Catalogs:`الكتالوجات`,"Add catalog":`إضافة كتالوج`,"Catalog name":`اسم الكتالوج`,Link:`الرابط`,"Play link":`تشغيل الرابط`,"Go live":`بدء بث مباشر`,Publish:`نشر`,Listen:`استماع`,"Live now":`مباشر الآن`,Upcoming:`قريبًا`,Parties:`حفلات المشاهدة`,"Join party":`الانضمام للحفلة`,"Invite code":`رمز الدعوة`,Invite:`دعوة`,Chat:`الدردشة`,"Chat message":`رسالة دردشة`,People:`الأشخاص`,Speaker:`متحدث`,Speakers:`المتحدثون`,Listener:`مستمع`,Moderator:`مشرف`,"Raise hand":`رفع اليد`,"Hand raises":`الأيدي المرفوعة`,Questions:`الأسئلة`,Resources:`الموارد`,Replay:`إعادة العرض`,Schedule:`الجدول`,Event:`الفعالية`,Host:`المضيف`,About:`حول`,Stage:`المنصة`,Title:`العنوان`,Description:`الوصف`,Topic:`الموضوع`,Public:`عام`,"Anyone with the link":`أي شخص لديه الرابط`,"Invited people":`الأشخاص المدعوون`,"Who can join":`من يمكنه الانضمام`,"Date and time":`التاريخ والوقت`,"Expected length":`المدة المتوقعة`,Repeat:`تكرار`,"Does not repeat":`لا يتكرر`,"Every day":`كل يوم`,"Every week":`كل أسبوع`,Homepage:`الموقع الإلكتروني`,"Host name":`اسم المضيف`,"Profile photo URL":`رابط صورة الملف الشخصي`,"Broadcast link":`رابط البث`,"Edit event":`تعديل الفعالية`,"Save changes":`حفظ التغييرات`,"Create live":`إنشاء بث مباشر`,"Schedule class":`جدولة درس`,"Start class":`بدء الدرس`,"End event":`إنهاء الفعالية`,"End session":`إنهاء الجلسة`,"Session ended":`انتهت الجلسة`,"Event ended":`انتهت الفعالية`,Cancelled:`ملغاة`,"Replay available":`إعادة العرض متاحة`,Join:`انضمام`,"Create invite":`إنشاء دعوة`,"Invite as":`الدعوة بصفة`,"Watch now":`شاهد الآن`,"Start a room":`إنشاء غرفة`,"Recent replays":`إعادات العرض الأخيرة`,"Your account":`حسابك`,"Write with AI":`الكتابة بالذكاء الاصطناعي`,"Suggested title":`العنوان المقترح`,"Suggested description":`الوصف المقترح`,"Suggested topic":`الموضوع المقترح`,"Use these details":`استخدام هذه التفاصيل`,"Learn something live.":`تعلّم شيئًا مباشرة.`,"Screen share":`مشاركة الشاشة`,"Upload and broadcast":`رفع وبث`,Help:`مساعدة`,"Reload Player":`إعادة تحميل المشغل`,"Copy Bundled CLI Path":`نسخ مسار أداة سطر الأوامر المضمنة`,"Developer tools":`أدوات المطور`,Undo:`تراجع`,Redo:`إعادة`,Cut:`قص`,Paste:`لصق`,"Select all":`تحديد الكل`,Status:`الحالة`,"Activity log":`سجل النشاط`,Admin:`الإدارة`,"Playback controls":`عناصر التحكم بالتشغيل`,"Tracks and folders":`المقاطع والمجلدات`,"Original-language captions.":`ترجمة نصية باللغة الأصلية.`,"Skip to playback controls":`الانتقال إلى عناصر التحكم بالتشغيل`,"Skip to playlist":`الانتقال إلى قائمة التشغيل`,"Skip to transcript and translated audio":`الانتقال إلى النص المفرغ والصوت المترجم`};export{t as default};