@kattowo/distube 6.2.0 → 6.2.2

package/dist/index.mjs

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/constant.ts
-var version = "6.2.0";
+var version = "6.2.2";
 var AUDIO_SAMPLE_RATE = 48e3;
 var AUDIO_CHANNELS = 2;
 var DEFAULT_VOLUME = 50;
@@ -2548,8 +2548,8 @@ var Options = class {
     if (typeof value !== "object" || Array.isArray(value)) {
       throw new DisTubeError("INVALID_TYPE", "object", value, "DisTubeOptions.crossfade");
     }
-    checkInvalidKey(value, ["duration", "curve", "warmup"], "DisTubeOptions.crossfade");
-    const { duration, curve, warmup } = value;
+    checkInvalidKey(value, ["duration", "curve", "warmup", "preparePrimaryInput"], "DisTubeOptions.crossfade");
+    const { duration, curve, warmup, preparePrimaryInput } = value;
     if (duration !== void 0 && (typeof duration !== "number" || Number.isNaN(duration) || duration < 0)) {
       throw new DisTubeError(
         "INVALID_TYPE",
@@ -2572,10 +2572,19 @@ var Options = class {
     if (warmup !== void 0 && (typeof warmup !== "number" || Number.isNaN(warmup) || warmup < 0)) {
       throw new DisTubeError("INVALID_TYPE", "number >= 0", warmup, "DisTubeOptions.crossfade.warmup");
     }
+    if (preparePrimaryInput !== void 0 && typeof preparePrimaryInput !== "function") {
+      throw new DisTubeError(
+        "INVALID_TYPE",
+        "function",
+        preparePrimaryInput,
+        "DisTubeOptions.crossfade.preparePrimaryInput"
+      );
+    }
     return {
       duration: duration ?? DEFAULT_CROSSFADE_DURATION_SECS,
       curve: curve ?? DEFAULT_CROSSFADE_CURVE,
-      warmup: warmup ?? DEFAULT_CROSSFADE_WARMUP_SECS
+      warmup: warmup ?? DEFAULT_CROSSFADE_WARMUP_SECS,
+      preparePrimaryInput
     };
   }
   #validateOptions(options = this) {
@@ -2700,6 +2709,17 @@ var DisTubeStream = class extends TypedEmitter2 {
    * The seek time in seconds that this stream started from
    */
   seekTime;
+  /**
+   * Whether FFmpeg has already produced audio that is waiting to be read.
+   *
+   * The stream is spawned ahead of the playback (crossfade warmup) and the
+   * pipe backs up once its buffers are full, so this is `true` as soon as the
+   * first frame exists. A stream that is still `false` at playback time would
+   * leave the audio player buffering until FFmpeg catches up.
+   */
+  get hasBufferedAudio() {
+    return this.stream.readableLength > 0;
+  }
   /**
    * Create a DisTubeStream to play with {@link DisTubeVoice}
    * @param url     - Stream URL
@@ -2787,13 +2807,15 @@ var DisTubeStream = class extends TypedEmitter2 {
     const extraFilters = typeof outputArgs.af === "string" ? outputArgs.af : Array.isArray(outputArgs.af) ? outputArgs.af.filter(Boolean).join(",") : void 0;
     delete outputArgs.af;
     const primaryOpts = {
-      reconnect: 1,
-      reconnect_streamed: 1,
-      reconnect_delay_max: 5,
-      analyzeduration: 0,
       hide_banner: true,
       ...ffmpeg.args.global,
-      ...ffmpeg.args.input,
+      ...crossfade.primaryInputArgs ?? {
+        reconnect: 1,
+        reconnect_streamed: 1,
+        reconnect_delay_max: 5,
+        analyzeduration: 0,
+        ...ffmpeg.args.input
+      },
       ss: typeof primarySeek === "number" && primarySeek > 0 ? primarySeek.toString() : null,
       i: url
     };
@@ -3372,7 +3394,28 @@ var QueueManager = class extends GuildIdManager {
       if (!primary?.stream.playFromSource || !primary.stream.url) return;
       if (!secondary?.stream.playFromSource || !secondary.stream.url) return;
       this.debug(`[${queue.id}] Warming up crossfade stream: ${song} -> ${nextSong}`);
-      transitionStream = new DisTubeStream(primary.stream.url, {
+      const boundarySeek = Math.max(0, songDuration - fade);
+      let primaryUrl = primary.stream.url;
+      let primarySeek = boundarySeek;
+      let primaryInputArgs;
+      const prepare = this.options.crossfade.preparePrimaryInput;
+      if (prepare) {
+        try {
+          const prepared = await prepare(primary.stream.url, { seek: boundarySeek, song });
+          if (prepared?.url) {
+            primaryUrl = prepared.url;
+            if (typeof prepared.seek === "number" && Number.isFinite(prepared.seek) && prepared.seek >= 0) {
+              primarySeek = prepared.seek;
+            }
+            primaryInputArgs = prepared.inputArgs;
+            this.debug(`[${queue.id}] Crossfade primary input prepared by the adapter`);
+          }
+        } catch (e) {
+          const errorMessage = e instanceof Error ? e.message : String(e);
+          this.debug(`[${queue.id}] Crossfade primary input preparation failed: ${errorMessage}`);
+        }
+      }
+      transitionStream = new DisTubeStream(primaryUrl, {
         ffmpeg: {
           path: this.options.ffmpeg.path,
           args: {
@@ -3383,10 +3426,11 @@ var QueueManager = class extends GuildIdManager {
         },
         crossfade: {
           duration: fade,
-          primarySeek: Math.max(0, songDuration - fade),
+          primarySeek,
           secondaryUrl: secondary.stream.url,
           inCurve: this.options.crossfade.curve,
-          outCurve: this.options.crossfade.curve
+          outCurve: this.options.crossfade.curve,
+          primaryInputArgs
         }
       });
       transitionStream.on("debug", (data) => this.emit("ffmpegDebug" /* FFMPEG_DEBUG */, `[${queue.id}] [crossfade] ${data}`));
@@ -3396,7 +3440,7 @@ var QueueManager = class extends GuildIdManager {
       }
       queue._crossfadeWarmup = transitionStream;
       transitionStream.spawn();
-      const boundaryMs = Math.max(0, (remaining - fade) * 1e3);
+      const boundaryMs = Math.max(0, (songDuration - queue.currentTime - fade) * 1e3);
       queue._crossfadeTimeout = setTimeout(() => {
         queue._crossfadeTimeout = void 0;
         void this.#crossfadeSwapTask(queue, transitionStream);
@@ -3434,6 +3478,10 @@ var QueueManager = class extends GuildIdManager {
         if (queue.stopped || queue.paused || queue.songs[0] !== song || queue._crossfadeWarmup !== transitionStream) {
           return abort();
         }
+        if (!transitionStream.hasBufferedAudio) {
+          this.debug(`[${queue.id}] Crossfade aborted: the transition stream is not ready`);
+          return abort();
+        }
         this.debug(`[${queue.id}] Starting crossfade: ${song} -> ${queue.songs.length > 1 ? queue.songs[1] : song}`);
         await queue.voice.play(transitionStream);
         queue._crossfadeWarmup = void 0;