distube 5.0.3 → 5.0.5

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { Snowflake, Message, GuildTextBasedChannel, VoiceBasedChannel, VoiceState, Guild, GuildMember, Interaction, Client, Collection, ClientOptions } from 'discord.js';
+import { GuildMember, Snowflake, Message, GuildTextBasedChannel, VoiceBasedChannel, VoiceState, Guild, Interaction, Client, Collection, ClientOptions } from 'discord.js';
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { AudioPlayer, VoiceConnection, AudioResource } from '@discordjs/voice';
 import { Transform, TransformCallback } from 'stream';
@@ -637,6 +637,7 @@ declare class DisTubeVoice extends TypedEmitter<DisTubeVoiceEvents> {
     emittedError: boolean;
     isDisconnected: boolean;
     stream?: DisTubeStream;
+    pausingStream?: DisTubeStream;
     constructor(voiceManager: DisTubeVoiceManager, channel: VoiceBasedChannel);
     /**
      * The voice channel id the bot is in
@@ -664,7 +665,7 @@ declare class DisTubeVoice extends TypedEmitter<DisTubeVoiceEvents> {
      * Play a {@link DisTubeStream}
      * @param dtStream - DisTubeStream
      */
-    play(dtStream: DisTubeStream): void;
+    play(dtStream: DisTubeStream): Promise<void>;
     set volume(volume: number);
     /**
      * Get or set the volume percentage
@@ -1026,12 +1027,12 @@ declare class Queue extends DisTubeBase {
      * Pause the guild stream
      * @returns The guild queue
      */
-    pause(): Queue;
+    pause(): Promise<Queue>;
     /**
      * Resume the guild stream
      * @returns The guild queue
      */
-    resume(): Queue;
+    resume(): Promise<Queue>;
     /**
      * Set the guild stream's volume
      * @param percent - The percentage of volume you want to set
@@ -1234,7 +1235,7 @@ declare function objectKeys<T>(obj: T): KeyOf<T>;
 declare function isNsfwChannel(channel?: GuildTextBasedChannel): boolean;
 type Falsy = undefined | null | false | 0 | "";
 declare const isTruthy: <T>(x: T | Falsy) => x is T;
-declare const checkEncryptionLibraries: () => boolean;
+declare const checkEncryptionLibraries: () => Promise<boolean>;
 
 /**
  * DisTube class
@@ -1390,13 +1391,13 @@ declare class DisTube extends TypedEmitter<TypedDisTubeEvents> {
      * @param guild - The type can be resolved to give a {@link Queue}
      * @returns The guild queue
      */
-    pause(guild: GuildIdResolvable): Queue;
+    pause(guild: GuildIdResolvable): Promise<Queue>;
     /**
      * Resume the guild stream
      * @param guild - The type can be resolved to give a {@link Queue}
      * @returns The guild queue
      */
-    resume(guild: GuildIdResolvable): Queue;
+    resume(guild: GuildIdResolvable): Promise<Queue>;
     /**
      * Stop the guild stream
      * @param guild - The type can be resolved to give a {@link Queue}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { Snowflake, Message, GuildTextBasedChannel, VoiceBasedChannel, VoiceState, Guild, GuildMember, Interaction, Client, Collection, ClientOptions } from 'discord.js';
+import { GuildMember, Snowflake, Message, GuildTextBasedChannel, VoiceBasedChannel, VoiceState, Guild, Interaction, Client, Collection, ClientOptions } from 'discord.js';
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { AudioPlayer, VoiceConnection, AudioResource } from '@discordjs/voice';
 import { Transform, TransformCallback } from 'stream';
@@ -637,6 +637,7 @@ declare class DisTubeVoice extends TypedEmitter<DisTubeVoiceEvents> {
     emittedError: boolean;
     isDisconnected: boolean;
     stream?: DisTubeStream;
+    pausingStream?: DisTubeStream;
     constructor(voiceManager: DisTubeVoiceManager, channel: VoiceBasedChannel);
     /**
      * The voice channel id the bot is in
@@ -664,7 +665,7 @@ declare class DisTubeVoice extends TypedEmitter<DisTubeVoiceEvents> {
      * Play a {@link DisTubeStream}
      * @param dtStream - DisTubeStream
      */
-    play(dtStream: DisTubeStream): void;
+    play(dtStream: DisTubeStream): Promise<void>;
     set volume(volume: number);
     /**
      * Get or set the volume percentage
@@ -1026,12 +1027,12 @@ declare class Queue extends DisTubeBase {
      * Pause the guild stream
      * @returns The guild queue
      */
-    pause(): Queue;
+    pause(): Promise<Queue>;
     /**
      * Resume the guild stream
      * @returns The guild queue
      */
-    resume(): Queue;
+    resume(): Promise<Queue>;
     /**
      * Set the guild stream's volume
      * @param percent - The percentage of volume you want to set
@@ -1234,7 +1235,7 @@ declare function objectKeys<T>(obj: T): KeyOf<T>;
 declare function isNsfwChannel(channel?: GuildTextBasedChannel): boolean;
 type Falsy = undefined | null | false | 0 | "";
 declare const isTruthy: <T>(x: T | Falsy) => x is T;
-declare const checkEncryptionLibraries: () => boolean;
+declare const checkEncryptionLibraries: () => Promise<boolean>;
 
 /**
  * DisTube class
@@ -1390,13 +1391,13 @@ declare class DisTube extends TypedEmitter<TypedDisTubeEvents> {
      * @param guild - The type can be resolved to give a {@link Queue}
      * @returns The guild queue
      */
-    pause(guild: GuildIdResolvable): Queue;
+    pause(guild: GuildIdResolvable): Promise<Queue>;
     /**
      * Resume the guild stream
      * @param guild - The type can be resolved to give a {@link Queue}
      * @returns The guild queue
      */
-    resume(guild: GuildIdResolvable): Queue;
+    resume(guild: GuildIdResolvable): Promise<Queue>;
     /**
      * Stop the guild stream
      * @param guild - The type can be resolved to give a {@link Queue}

package/dist/index.js

@@ -19,8 +19,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   BaseManager: () => BaseManager,
   DisTube: () => DisTube,
   DisTubeBase: () => DisTubeBase,
@@ -68,7 +68,7 @@ __export(src_exports, {
   resolveGuildId: () => resolveGuildId,
   version: () => version
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/type.ts
 var Events = /* @__PURE__ */ ((Events2) => {
@@ -563,6 +563,7 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
   emittedError;
   isDisconnected = false;
   stream;
+  pausingStream;
   #channel;
   #volume = 100;
   constructor(voiceManager, channel) {
@@ -685,8 +686,8 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
    * Play a {@link DisTubeStream}
    * @param dtStream - DisTubeStream
    */
-  play(dtStream) {
-    if (!checkEncryptionLibraries()) {
+  async play(dtStream) {
+    if (!await checkEncryptionLibraries()) {
       dtStream.kill();
       throw new DisTubeError("ENCRYPTION_LIBRARIES_MISSING");
     }
@@ -696,11 +697,15 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
       this.emittedError = true;
       this.emit("error", error);
     });
-    if (this.audioPlayer.state.status !== import_voice.AudioPlayerStatus.Paused) this.audioPlayer.play(dtStream.audioResource);
-    this.stream?.kill();
+    if (this.audioPlayer.state.status !== import_voice.AudioPlayerStatus.Paused) {
+      this.audioPlayer.play(dtStream.audioResource);
+      this.stream?.kill();
+      dtStream.spawn();
+    } else if (!this.pausingStream) {
+      this.pausingStream = this.stream;
+    }
     this.stream = dtStream;
     this.volume = this.#volume;
-    dtStream.spawn();
   }
   set volume(volume) {
     if (typeof volume !== "number" || isNaN(volume)) {
@@ -732,6 +737,9 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
     if (state.status !== import_voice.AudioPlayerStatus.Paused) return;
     if (this.stream?.audioResource && state.resource !== this.stream.audioResource) {
       this.audioPlayer.play(this.stream.audioResource);
+      this.stream.spawn();
+      this.pausingStream?.kill();
+      delete this.pausingStream;
     } else {
       this.audioPlayer.unpause();
     }
@@ -1489,7 +1497,7 @@ var QueueManager = class extends GuildIdManager {
       const dtStream = new DisTubeStream(stream.url, streamOptions);
       dtStream.on("debug", (data) => this.emit("ffmpegDebug" /* FFMPEG_DEBUG */, `[${queue.id}] ${data}`));
       this.debug(`[${queue.id}] Started playing: ${willPlaySong}`);
-      queue.voice.play(dtStream);
+      await queue.voice.play(dtStream);
       if (emitPlaySong) this.emit("playSong" /* PLAY_SONG */, queue, song);
     } catch (e) {
       this.#handlePlayingError(queue, e);
@@ -1691,21 +1699,31 @@ var Queue = class extends DisTubeBase {
    * Pause the guild stream
    * @returns The guild queue
    */
-  pause() {
-    if (this.paused) throw new DisTubeError("PAUSED");
-    this.paused = true;
-    this.voice.pause();
-    return this;
+  async pause() {
+    await this._taskQueue.queuing();
+    try {
+      if (this.paused) throw new DisTubeError("PAUSED");
+      this.paused = true;
+      this.voice.pause();
+      return this;
+    } finally {
+      this._taskQueue.resolve();
+    }
   }
   /**
    * Resume the guild stream
    * @returns The guild queue
    */
-  resume() {
-    if (!this.paused) throw new DisTubeError("RESUMED");
-    this.paused = false;
-    this.voice.unpause();
-    return this;
+  async resume() {
+    await this._taskQueue.queuing();
+    try {
+      if (!this.paused) throw new DisTubeError("RESUMED");
+      this.paused = false;
+      this.voice.unpause();
+      return this;
+    } finally {
+      this._taskQueue.resolve();
+    }
   }
   /**
    * Set the guild stream's volume
@@ -2067,10 +2085,10 @@ function isNsfwChannel(channel) {
 }
 __name(isNsfwChannel, "isNsfwChannel");
 var isTruthy = /* @__PURE__ */ __name((x) => Boolean(x), "isTruthy");
-var checkEncryptionLibraries = /* @__PURE__ */ __name(() => {
+var checkEncryptionLibraries = /* @__PURE__ */ __name(async () => {
   for (const lib of ["sodium-native", "sodium", "libsodium-wrappers", "tweetnacl"]) {
     try {
-      require(lib);
+      await import(lib);
       return true;
     } catch {
     }
@@ -2467,7 +2485,7 @@ ${e.message}`;
 };
 
 // src/index.ts
-var version = "5.0.3";
+var version = "5.0.5";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseManager,