distube 4.0.0-dev.3 → 4.0.0-dev.4

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import ytpl from '@distube/ytpl';
 import { Video, Playlist as Playlist$1 } from '@distube/ytsr';
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { FFmpeg } from 'prism-media';
-import { StreamType, AudioPlayer, VoiceConnection, AudioResource, VoiceConnectionStatus, AudioPlayerStatus } from '@discordjs/voice';
+import { StreamType as StreamType$1, AudioPlayer, VoiceConnection, AudioResource, VoiceConnectionStatus, AudioPlayerStatus } from '@discordjs/voice';
 import * as _discordjs_collection from '@discordjs/collection';
 import { EventEmitter } from 'node:events';
 import https from 'https';
@@ -58,6 +58,8 @@ interface DisTubeOptions {
     nsfw?: boolean;
     emitAddSongWhenCreatingQueue?: boolean;
     emitAddListWhenCreatingQueue?: boolean;
+    joinNewVoiceChannel?: boolean;
+    streamType?: StreamType;
 }
 declare type GuildIdResolvable = Queue | DisTubeVoice | Snowflake | Message | GuildTextBasedChannel | VoiceBasedChannel | VoiceState | Guild | GuildMember | Interaction | string;
 interface OtherSongInfo {
@@ -138,6 +140,10 @@ declare enum SearchResultType {
     VIDEO = "video",
     PLAYLIST = "playlist"
 }
+declare enum StreamType {
+    OPUS = 0,
+    RAW = 1
+}
 
 declare const defaultFilters: Filters;
 declare const defaultOptions: {
@@ -155,6 +161,7 @@ declare const defaultOptions: {
     emitAddSongWhenCreatingQueue: boolean;
     emitAddListWhenCreatingQueue: boolean;
     joinNewVoiceChannel: boolean;
+    streamType: StreamType;
 };
 
 declare const ERROR_MESSAGES: {
@@ -175,6 +182,7 @@ declare const ERROR_MESSAGES: {
     VOICE_MISSING_PERMS: string;
     VOICE_RECONNECT_FAILED: string;
     VOICE_DIFFERENT_GUILD: string;
+    VOICE_DIFFERENT_CLIENT: string;
     NO_QUEUE: string;
     QUEUE_EXIST: string;
     PAUSED: string;
@@ -317,6 +325,7 @@ declare class Options {
     emitAddSongWhenCreatingQueue: boolean;
     emitAddListWhenCreatingQueue: boolean;
     joinNewVoiceChannel: boolean;
+    streamType: StreamType;
     constructor(options: DisTubeOptions);
 }
 
@@ -336,12 +345,13 @@ interface StreamOptions {
     seek?: number;
     ffmpegArgs?: string[];
     isLive?: boolean;
+    type?: StreamType;
 }
 declare const chooseBestVideoFormat: (formats: ytdl.videoFormat[], isLive?: boolean) => ytdl.videoFormat;
 declare class DisTubeStream {
     static YouTube(formats: ytdl.videoFormat[] | undefined, options?: StreamOptions): DisTubeStream;
     static DirectLink(url: string, options?: StreamOptions): DisTubeStream;
-    type: StreamType.Raw;
+    type: StreamType$1;
     stream: FFmpeg;
     url: string;
     constructor(url: string, options: StreamOptions);
@@ -449,10 +459,10 @@ declare class Queue extends DisTubeBase {
     beginTime: number;
     textChannel?: GuildTextBasedChannel;
     _emptyTimeout?: NodeJS.Timeout;
-    clientMember: GuildMember;
     _taskQueue: TaskQueue;
     _listeners?: DisTubeVoiceEvents;
     constructor(distube: DisTube, voice: DisTubeVoice, song: Song | Song[], textChannel?: GuildTextBasedChannel);
+    get clientMember(): discord_js.GuildMember | undefined;
     get filters(): FilterManager;
     get formattedDuration(): string;
     get duration(): number;
@@ -524,6 +534,7 @@ declare function checkInvalidKey(target: Record<string, any>, source: Record<str
 declare function entersState<T extends VoiceConnection | AudioPlayer>(target: T, status: T extends VoiceConnection ? VoiceConnectionStatus : AudioPlayerStatus, maxTime: number): Promise<EventEmitter | T>;
 declare function isObject(obj: any): obj is object;
 declare function isRecord(obj: any): obj is Record<string, unknown>;
+declare function getClientMember(guild: Guild): GuildMember | undefined;
 
 declare class HTTPPlugin extends ExtractorPlugin {
     validate(url: string): Promise<boolean>;
@@ -590,4 +601,4 @@ declare class DisTube extends TypedEmitter<DisTubeEvents> {
     emitError(error: Error, channel?: GuildTextBasedChannel): void;
 }
 
-export { Awaitable, BaseManager, Chapter, CustomPlaylistOptions, CustomPlugin, DisTube, DisTubeBase, DisTubeError, DisTubeEvents, DisTubeHandler, DisTubeOptions, DisTubeStream, DisTubeVoice, DisTubeVoiceEvents, DisTubeVoiceManager, ExtractorPlugin, Filter, FilterManager, FilterResolvable, Filters, GuildIdManager, GuildIdResolvable, HTTPPlugin, HTTPSPlugin, Options, OtherSongInfo, PlayHandlerOptions, PlayOptions, Playlist, PlaylistInfo, Plugin, PluginType, Queue, QueueManager, RelatedSong, RepeatMode, ResolveOptions, ResolvePlaylistOptions, SearchResult, SearchResultType, Song, TaskQueue, checkIntents, checkInvalidKey, chooseBestVideoFormat, DisTube as default, defaultFilters, defaultOptions, entersState, formatDuration, getResponseHeaders, isClientInstance, isGuildInstance, isMemberInstance, isMessageInstance, isObject, isRecord, isSnowflake, isSupportedVoiceChannel, isTextChannelInstance, isURL, isVoiceChannelEmpty, parseNumber, resolveGuildId, resolveHttpSong, toSecond, validateAudioURL, version };
+export { Awaitable, BaseManager, Chapter, CustomPlaylistOptions, CustomPlugin, DisTube, DisTubeBase, DisTubeError, DisTubeEvents, DisTubeHandler, DisTubeOptions, DisTubeStream, DisTubeVoice, DisTubeVoiceEvents, DisTubeVoiceManager, ExtractorPlugin, Filter, FilterManager, FilterResolvable, Filters, GuildIdManager, GuildIdResolvable, HTTPPlugin, HTTPSPlugin, Options, OtherSongInfo, PlayHandlerOptions, PlayOptions, Playlist, PlaylistInfo, Plugin, PluginType, Queue, QueueManager, RelatedSong, RepeatMode, ResolveOptions, ResolvePlaylistOptions, SearchResult, SearchResultType, Song, StreamType, TaskQueue, checkIntents, checkInvalidKey, chooseBestVideoFormat, DisTube as default, defaultFilters, defaultOptions, entersState, formatDuration, getClientMember, getResponseHeaders, isClientInstance, isGuildInstance, isMemberInstance, isMessageInstance, isObject, isRecord, isSnowflake, isSupportedVoiceChannel, isTextChannelInstance, isURL, isVoiceChannelEmpty, parseNumber, resolveGuildId, resolveHttpSong, toSecond, validateAudioURL, version };

package/dist/index.js

@@ -56,7 +56,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "distube",
-      version: "4.0.0-dev.3",
+      version: "4.0.0-dev.4",
       description: "A Discord.js module to simplify your music commands and play songs with audio filters on Discord without any API key.",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
@@ -77,7 +77,7 @@ var require_package = __commonJS({
         docs: "docgen -s src/*.ts src/**/*.ts -o docs.json -c pages/index.yml -g -j jsdoc.config.json",
         lint: "prettier --check . && eslint .",
         "lint:fix": "eslint . --fix",
-        prettier: "prettier --write **/*.{ts,json,yml,yaml,md}",
+        prettier: 'prettier --write "**/*.{ts,json,yml,yaml,md}"',
         build: "tsup",
         "build:check": "tsc --noEmit",
         update: "ncu -u --dep dev,prod && yarn up '**' -R",
@@ -120,43 +120,43 @@ var require_package = __commonJS({
       ],
       homepage: "https://distube.js.org/",
       dependencies: {
-        "@distube/ytdl-core": "^4.11.1",
+        "@distube/ytdl-core": "^4.11.3",
         "@distube/ytpl": "^1.1.1",
         "@distube/ytsr": "^1.1.5",
         "prism-media": "https://codeload.github.com/distubejs/prism-media/tar.gz/main#workaround.tar.gz",
         "tiny-typed-emitter": "^2.1.0",
-        tslib: "^2.3.1"
+        tslib: "^2.4.0"
       },
       devDependencies: {
-        "@babel/core": "^7.17.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.17.3",
-        "@babel/preset-env": "^7.16.11",
-        "@babel/preset-typescript": "^7.16.7",
-        "@commitlint/cli": "^16.2.3",
-        "@commitlint/config-conventional": "^16.2.1",
+        "@babel/core": "^7.18.0",
+        "@babel/plugin-proposal-class-properties": "^7.17.12",
+        "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
+        "@babel/preset-env": "^7.18.0",
+        "@babel/preset-typescript": "^7.17.12",
+        "@commitlint/cli": "^17.0.0",
+        "@commitlint/config-conventional": "^17.0.0",
         "@discordjs/voice": "dev",
         "@distube/docgen": "distubejs/docgen",
-        "@types/jest": "^27.4.1",
-        "@types/node": "^17.0.23",
-        "@typescript-eslint/eslint-plugin": "^5.17.0",
-        "@typescript-eslint/parser": "^5.17.0",
-        "babel-jest": "^27.5.1",
+        "@types/jest": "^27.5.1",
+        "@types/node": "^17.0.35",
+        "@typescript-eslint/eslint-plugin": "^5.25.0",
+        "@typescript-eslint/parser": "^5.25.0",
+        "babel-jest": "^28.1.0",
         "discord.js": "dev",
-        eslint: "^8.12.0",
+        eslint: "^8.15.0",
         "eslint-config-distube": "^1.6.4",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-deprecation": "^1.3.2",
-        "eslint-plugin-jsdoc": "^38.1.4",
-        husky: "^7.0.4",
-        jest: "^27.5.1",
+        "eslint-plugin-jsdoc": "^39.3.0",
+        husky: "^8.0.1",
+        jest: "^28.1.0",
         "jsdoc-babel": "^0.5.0",
-        "nano-staged": "^0.6.0",
-        "npm-check-updates": "^12.5.4",
+        "nano-staged": "^0.8.0",
+        "npm-check-updates": "^13.0.1",
         pinst: "^3.0.0",
-        prettier: "^2.6.1",
-        tsup: "^5.12.1",
-        typescript: "^4.6.3"
+        prettier: "^2.6.2",
+        tsup: "^5.12.8",
+        typescript: "^4.6.4"
       },
       peerDependencies: {
         "@discordjs/opus": "*",
@@ -213,6 +213,7 @@ __export(src_exports, {
   SearchResult: () => SearchResult,
   SearchResultType: () => SearchResultType,
   Song: () => Song,
+  StreamType: () => StreamType,
   TaskQueue: () => TaskQueue,
   checkIntents: () => checkIntents,
   checkInvalidKey: () => checkInvalidKey,
@@ -222,6 +223,7 @@ __export(src_exports, {
   defaultOptions: () => defaultOptions,
   entersState: () => entersState,
   formatDuration: () => formatDuration,
+  getClientMember: () => getClientMember,
   getResponseHeaders: () => getResponseHeaders,
   isClientInstance: () => isClientInstance,
   isGuildInstance: () => isGuildInstance,
@@ -260,6 +262,11 @@ var SearchResultType = /* @__PURE__ */ ((SearchResultType2) => {
   SearchResultType2["PLAYLIST"] = "playlist";
   return SearchResultType2;
 })(SearchResultType || {});
+var StreamType = /* @__PURE__ */ ((StreamType2) => {
+  StreamType2[StreamType2["OPUS"] = 0] = "OPUS";
+  StreamType2[StreamType2["RAW"] = 1] = "RAW";
+  return StreamType2;
+})(StreamType || {});
 
 // src/constant.ts
 var defaultFilters = {
@@ -293,7 +300,8 @@ var defaultOptions = {
   nsfw: false,
   emitAddSongWhenCreatingQueue: true,
   emitAddListWhenCreatingQueue: true,
-  joinNewVoiceChannel: true
+  joinNewVoiceChannel: true,
+  streamType: 0 /* OPUS */
 };
 
 // src/struct/DisTubeError.ts
@@ -315,7 +323,8 @@ var ERROR_MESSAGES = {
   VOICE_CONNECT_FAILED: (s) => `Cannot connect to the voice channel after ${s} seconds`,
   VOICE_MISSING_PERMS: "I do not have permission to join this voice channel",
   VOICE_RECONNECT_FAILED: "Cannot reconnect to the voice channel",
-  VOICE_DIFFERENT_GUILD: "Cannot join a channel in a different guild",
+  VOICE_DIFFERENT_GUILD: "Cannot join a voice channel in a different guild",
+  VOICE_DIFFERENT_CLIENT: "Cannot join a voice channel created by a different client",
   NO_QUEUE: "There is no playing queue in this guild",
   QUEUE_EXIST: "This guild has a Queue already",
   PAUSED: "The queue has been paused already",
@@ -354,6 +363,7 @@ var DisTubeError = class extends Error {
     return this.errorCode;
   }
 };
+__name(DisTubeError, "DisTubeError");
 
 // src/struct/TaskQueue.ts
 var Task = class {
@@ -367,6 +377,7 @@ var Task = class {
     });
   }
 };
+__name(Task, "Task");
 var _tasks;
 var TaskQueue = class {
   constructor() {
@@ -387,6 +398,7 @@ var TaskQueue = class {
     return !!__privateGet(this, _tasks).find((t) => t.resolveInfo);
   }
 };
+__name(TaskQueue, "TaskQueue");
 _tasks = new WeakMap();
 
 // src/struct/Playlist.ts
@@ -449,6 +461,7 @@ var Playlist = class {
     this.songs.map((s) => s.constructor.name === "Song" && (s.metadata = metadata));
   }
 };
+__name(Playlist, "Playlist");
 _metadata = new WeakMap();
 _member = new WeakMap();
 
@@ -487,6 +500,7 @@ var SearchResult = class {
     };
   }
 };
+__name(SearchResult, "SearchResult");
 
 // src/struct/Song.ts
 var _metadata2, _member2, _playlist;
@@ -621,6 +635,7 @@ var _Song = class {
   }
 };
 var Song = _Song;
+__name(Song, "Song");
 _metadata2 = new WeakMap();
 _member2 = new WeakMap();
 _playlist = new WeakMap();
@@ -647,6 +662,7 @@ var Options = class {
     __publicField(this, "emitAddSongWhenCreatingQueue");
     __publicField(this, "emitAddListWhenCreatingQueue");
     __publicField(this, "joinNewVoiceChannel");
+    __publicField(this, "streamType");
     if (typeof options !== "object" || Array.isArray(options)) {
       throw new DisTubeError("INVALID_TYPE", "object", options, "DisTubeOptions");
     }
@@ -668,10 +684,12 @@ var Options = class {
     this.emitAddSongWhenCreatingQueue = opts.emitAddSongWhenCreatingQueue;
     this.emitAddListWhenCreatingQueue = opts.emitAddListWhenCreatingQueue;
     this.joinNewVoiceChannel = opts.joinNewVoiceChannel;
+    this.streamType = opts.streamType;
     checkInvalidKey(opts, this, "DisTubeOptions");
     __privateMethod(this, _validateOptions, validateOptions_fn).call(this);
   }
 };
+__name(Options, "Options");
 _validateOptions = new WeakSet();
 validateOptions_fn = /* @__PURE__ */ __name(function(options = this) {
   if (typeof options.emitNewSongOnly !== "boolean") {
@@ -725,6 +743,9 @@ validateOptions_fn = /* @__PURE__ */ __name(function(options = this) {
   if (typeof options.emitAddListWhenCreatingQueue !== "boolean") {
     throw new DisTubeError("INVALID_TYPE", "boolean", options.emitAddListWhenCreatingQueue, "DisTubeOptions.emitAddListWhenCreatingQueue");
   }
+  if (typeof options.streamType !== "number" || isNaN(options.streamType) || !StreamType[options.streamType]) {
+    throw new DisTubeError("INVALID_TYPE", "StreamType", options.streamType, "DisTubeOptions.streamType");
+  }
 }, "#validateOptions");
 
 // src/core/DisTubeBase.ts
@@ -755,6 +776,7 @@ var DisTubeBase = class {
     return this.distube.handler;
   }
 };
+__name(DisTubeBase, "DisTubeBase");
 
 // src/core/DisTubeStream.ts
 var import_prism_media = require("prism-media");
@@ -772,7 +794,7 @@ var DisTubeStream = class {
     __publicField(this, "stream");
     __publicField(this, "url");
     this.url = url;
-    this.type = import_voice.StreamType.Raw;
+    this.type = !options.type ? import_voice.StreamType.Opus : import_voice.StreamType.Raw;
     const args = [
       "-reconnect",
       "1",
@@ -790,9 +812,13 @@ var DisTubeStream = class {
       "48000",
       "-ac",
       "2",
-      "-f",
-      "s16le"
+      "-f"
     ];
+    if (!options.type) {
+      args.push("opus", "-acodec", "libopus");
+    } else {
+      args.push("s16le");
+    }
     if (typeof options.seek === "number" && options.seek > 0) {
       args.unshift("-ss", options.seek.toString());
     }
@@ -822,6 +848,7 @@ var DisTubeStream = class {
     return new DisTubeStream(url, options);
   }
 };
+__name(DisTubeStream, "DisTubeStream");
 
 // src/core/manager/BaseManager.ts
 var import_discord = require("discord.js");
@@ -834,6 +861,7 @@ var BaseManager = class extends DisTubeBase {
     return this.collection.size;
   }
 };
+__name(BaseManager, "BaseManager");
 
 // src/core/manager/GuildIdManager.ts
 var GuildIdManager = class extends BaseManager {
@@ -854,6 +882,7 @@ var GuildIdManager = class extends BaseManager {
     return this.collection.has(resolveGuildId(idOrInstance));
   }
 };
+__name(GuildIdManager, "GuildIdManager");
 
 // src/core/manager/QueueManager.ts
 var _voiceEventHandler, voiceEventHandler_fn, _handleSongFinish, handleSongFinish_fn, _handlePlayingError, handlePlayingError_fn, _emitPlaySong, emitPlaySong_fn;
@@ -886,7 +915,7 @@ var QueueManager = class extends GuildIdManager {
     const { duration, formats, isLive, source, streamURL } = queue.songs[0];
     const ffmpegArgs = queue.filters.size ? ["-af", queue.filters.values.join(",")] : void 0;
     const seek = duration ? queue.beginTime : void 0;
-    const streamOptions = { ffmpegArgs, seek, isLive };
+    const streamOptions = { ffmpegArgs, seek, isLive, type: this.options.streamType };
     if (source === "youtube")
       return DisTubeStream.YouTube(formats, streamOptions);
     return DisTubeStream.DirectLink(streamURL, streamOptions);
@@ -900,8 +929,8 @@ var QueueManager = class extends GuildIdManager {
     }
     if (queue.stopped)
       return false;
-    const song = queue.songs[0];
     try {
+      const song = queue.songs[0];
       const { url, source, formats, streamURL } = song;
       if (source === "youtube" && !formats)
         song._patchYouTube(await this.handler.getYouTubeInfo(url));
@@ -930,6 +959,7 @@ var QueueManager = class extends GuildIdManager {
     }
   }
 };
+__name(QueueManager, "QueueManager");
 _voiceEventHandler = new WeakSet();
 voiceEventHandler_fn = /* @__PURE__ */ __name(function(queue) {
   queue._listeners = {
@@ -1086,6 +1116,7 @@ var FilterManager = class extends BaseManager {
     return this.names.toString();
   }
 };
+__name(FilterManager, "FilterManager");
 _validate = new WeakSet();
 validate_fn = /* @__PURE__ */ __name(function(filter) {
   if (typeof filter === "string" && Object.prototype.hasOwnProperty.call(this.distube.filters, filter) || typeof filter === "object" && typeof filter.name === "string" && typeof filter.value === "string") {
@@ -1125,9 +1156,9 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
     __publicField(this, "isDisconnected", false);
     __privateAdd(this, _channel, void 0);
     __privateAdd(this, _volume, 100);
+    this.voices = voiceManager;
     this.id = channel.guildId;
     this.channel = channel;
-    this.voices = voiceManager;
     this.voices.add(this.id, this);
     this.audioPlayer = (0, import_voice2.createAudioPlayer)().on(import_voice2.AudioPlayerStatus.Idle, (oldState) => {
       if (oldState.status !== import_voice2.AudioPlayerStatus.Idle) {
@@ -1170,6 +1201,8 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
     }
     if (channel.guildId !== this.id)
       throw new DisTubeError("VOICE_DIFFERENT_GUILD");
+    if (channel.client.user?.id !== this.voices.client.user?.id)
+      throw new DisTubeError("VOICE_DIFFERENT_CLIENT");
     if (channel.id === __privateGet(this, _channel)?.id)
       return;
     if (!channel.joinable) {
@@ -1273,9 +1306,10 @@ var DisTubeVoice = class extends import_tiny_typed_emitter.TypedEmitter {
     });
   }
   get voiceState() {
-    return this.channel?.guild?.me?.voice;
+    return getClientMember(this.channel?.guild)?.voice;
   }
 };
+__name(DisTubeVoice, "DisTubeVoice");
 _channel = new WeakMap();
 _volume = new WeakMap();
 _br = new WeakSet();
@@ -1322,6 +1356,7 @@ var DisTubeVoiceManager = class extends GuildIdManager {
     }
   }
 };
+__name(DisTubeVoiceManager, "DisTubeVoiceManager");
 
 // src/core/DisTubeHandler.ts
 var import_ytdl_core = __toESM(require("@distube/ytdl-core"));
@@ -1557,6 +1592,7 @@ var DisTubeHandler = class extends DisTubeBase {
     }
   }
 };
+__name(DisTubeHandler, "DisTubeHandler");
 
 // src/struct/Queue.ts
 var _filters;
@@ -1578,12 +1614,8 @@ var Queue = class extends DisTubeBase {
     __publicField(this, "beginTime");
     __publicField(this, "textChannel");
     __publicField(this, "_emptyTimeout");
-    __publicField(this, "clientMember");
     __publicField(this, "_taskQueue");
     __publicField(this, "_listeners");
-    this.clientMember = voice.channel.guild?.me ?? (() => {
-      throw new DisTubeError("INVALID_TYPE", "GuildMember", null, "<VoiceChannel>.guild.me");
-    })();
     this.voice = voice;
     this.id = voice.id;
     this.volume = 50;
@@ -1603,6 +1635,9 @@ var Queue = class extends DisTubeBase {
     this._taskQueue = new TaskQueue();
     this._listeners = void 0;
   }
+  get clientMember() {
+    return getClientMember(this.voice.channel.guild);
+  }
   get filters() {
     return __privateGet(this, _filters);
   }
@@ -1619,7 +1654,7 @@ var Queue = class extends DisTubeBase {
     return formatDuration(this.currentTime);
   }
   get voiceChannel() {
-    return this.clientMember.voice.channel;
+    return this.clientMember?.voice?.channel ?? null;
   }
   get volume() {
     return this.voice.volume;
@@ -1817,6 +1852,7 @@ var Queue = class extends DisTubeBase {
     return this.autoplay;
   }
 };
+__name(Queue, "Queue");
 _filters = new WeakMap();
 
 // src/struct/Plugin.ts
@@ -1858,6 +1894,7 @@ var Plugin = class {
     return [];
   }
 };
+__name(Plugin, "Plugin");
 
 // src/struct/CustomPlugin.ts
 var CustomPlugin = class extends Plugin {
@@ -1866,6 +1903,7 @@ var CustomPlugin = class extends Plugin {
     __publicField(this, "type", "custom" /* CUSTOM */);
   }
 };
+__name(CustomPlugin, "CustomPlugin");
 
 // src/struct/ExtractorPlugin.ts
 var ExtractorPlugin = class extends Plugin {
@@ -1874,6 +1912,7 @@ var ExtractorPlugin = class extends Plugin {
     __publicField(this, "type", "extractor" /* EXTRACTOR */);
   }
 };
+__name(ExtractorPlugin, "ExtractorPlugin");
 
 // src/util.ts
 var import_url = require("url");
@@ -1891,6 +1930,7 @@ function formatDuration(sec) {
     return `${formatInt(minutes)}:${formatInt(seconds)}`;
   return `00:${formatInt(seconds)}`;
 }
+__name(formatDuration, "formatDuration");
 function toSecond(input) {
   if (!input)
     return 0;
@@ -1909,11 +1949,13 @@ function toSecond(input) {
     return Number(input.replace(/[^\d.]+/g, "")) || 0;
   }
 }
+__name(toSecond, "toSecond");
 function parseNumber(input) {
   if (typeof input === "string")
     return Number(input.replace(/[^\d.]+/g, "")) || 0;
   return Number(input) || 0;
 }
+__name(parseNumber, "parseNumber");
 function isURL(input) {
   if (typeof input !== "string" || input.includes(" "))
     return false;
@@ -1926,18 +1968,25 @@ function isURL(input) {
   }
   return true;
 }
+__name(isURL, "isURL");
 function checkIntents(options) {
   const intents = new import_discord2.IntentsBitField(options.intents);
   if (!intents.has(import_discord2.GatewayIntentBits.GuildVoiceStates))
     throw new DisTubeError("MISSING_INTENTS", "GuildVoiceStates");
 }
+__name(checkIntents, "checkIntents");
 function isVoiceChannelEmpty(voiceState) {
-  const voiceChannel = voiceState.guild?.me?.voice?.channel;
+  const guild = voiceState.guild;
+  const clientId = voiceState.client.user?.id;
+  if (!guild || !clientId)
+    return false;
+  const voiceChannel = guild.members.resolve(clientId)?.voice?.channel;
   if (!voiceChannel)
     return false;
   const members = voiceChannel.members.filter((m) => !m.user.bot);
   return !members.size;
 }
+__name(isVoiceChannelEmpty, "isVoiceChannelEmpty");
 function isSnowflake(id) {
   try {
     return import_discord2.SnowflakeUtil.deconstruct(id).timestamp > import_discord2.SnowflakeUtil.epoch;
@@ -1945,21 +1994,27 @@ function isSnowflake(id) {
     return false;
   }
 }
+__name(isSnowflake, "isSnowflake");
 function isMemberInstance(member) {
   return !!member && isSnowflake(member.id) && isSnowflake(member.guild?.id) && isSnowflake(member.user?.id) && member.id === member.user.id;
 }
+__name(isMemberInstance, "isMemberInstance");
 function isTextChannelInstance(channel) {
-  return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && typeof channel.name === "string" && import_discord2.Constants.TextBasedChannelTypes.includes(channel.type);
+  return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && typeof channel.name === "string" && import_discord2.Constants.TextBasedChannelTypes.includes(channel.type) && typeof channel.nsfw === "boolean";
 }
+__name(isTextChannelInstance, "isTextChannelInstance");
 function isMessageInstance(message) {
   return !!message && isSnowflake(message.id) && isSnowflake(message.guildId) && isMemberInstance(message.member) && isTextChannelInstance(message.channel) && import_discord2.Constants.NonSystemMessageTypes.includes(message.type) && message.member.id === message.author?.id;
 }
+__name(isMessageInstance, "isMessageInstance");
 function isSupportedVoiceChannel(channel) {
   return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && import_discord2.Constants.VoiceBasedChannelTypes.includes(channel.type);
 }
+__name(isSupportedVoiceChannel, "isSupportedVoiceChannel");
 function isGuildInstance(guild) {
   return !!guild && isSnowflake(guild.id) && isSnowflake(guild.ownerId) && typeof guild.name === "string";
 }
+__name(isGuildInstance, "isGuildInstance");
 function resolveGuildId(resolvable) {
   let guildId;
   if (typeof resolvable === "string") {
@@ -1977,9 +2032,11 @@ function resolveGuildId(resolvable) {
     throw new DisTubeError("INVALID_TYPE", "GuildIdResolvable", resolvable);
   return guildId;
 }
+__name(resolveGuildId, "resolveGuildId");
 function isClientInstance(client) {
   return !!client && typeof client.login === "function";
 }
+__name(isClientInstance, "isClientInstance");
 function checkInvalidKey(target, source, sourceName) {
   if (!isObject(target))
     throw new DisTubeError("INVALID_TYPE", "object", target, sourceName);
@@ -1988,6 +2045,7 @@ function checkInvalidKey(target, source, sourceName) {
   if (invalidKey)
     throw new DisTubeError("INVALID_KEY", sourceName, invalidKey);
 }
+__name(checkInvalidKey, "checkInvalidKey");
 async function waitEvent(target, status, maxTime) {
   let cleanup = /* @__PURE__ */ __name(() => {
   }, "cleanup");
@@ -2009,17 +2067,31 @@ async function waitEvent(target, status, maxTime) {
     cleanup();
   }
 }
+__name(waitEvent, "waitEvent");
 async function entersState(target, status, maxTime) {
   if (target.state.status === status)
     return target;
   return waitEvent(target, status, maxTime);
 }
+__name(entersState, "entersState");
 function isObject(obj) {
   return typeof obj === "object" && obj !== null && !Array.isArray(obj);
 }
+__name(isObject, "isObject");
 function isRecord(obj) {
   return isObject(obj);
 }
+__name(isRecord, "isRecord");
+function getClientMember(guild) {
+  const clientUser = guild.client.user;
+  if (!clientUser)
+    return void 0;
+  const clientMember = guild.members.resolve(clientUser);
+  if (!clientMember)
+    return void 0;
+  return clientMember;
+}
+__name(getClientMember, "getClientMember");
 
 // src/plugin/http.ts
 var import_http = __toESM(require("http"));
@@ -2031,6 +2103,7 @@ var HTTPPlugin = class extends ExtractorPlugin {
     return resolveHttpSong(url, { ...options, source: "http" });
   }
 };
+__name(HTTPPlugin, "HTTPPlugin");
 
 // src/plugin/https.ts
 var import_https = __toESM(require("https"));
@@ -2065,6 +2138,7 @@ var HTTPSPlugin = class extends ExtractorPlugin {
     return resolveHttpSong(url, { ...options, source: "https" });
   }
 };
+__name(HTTPSPlugin, "HTTPSPlugin");
 
 // src/DisTube.ts
 var import_ytsr = __toESM(require("@distube/ytsr"));
@@ -2109,7 +2183,7 @@ var DisTube = class extends import_tiny_typed_emitter2.TypedEmitter {
     if (!isObject(options))
       throw new DisTubeError("INVALID_TYPE", "object", options, "options");
     const { textChannel, member, skip, message, metadata } = {
-      member: voiceChannel.guild.me ?? void 0,
+      member: getClientMember(voiceChannel.guild),
       textChannel: options?.message?.channel,
       skip: false,
       ...options
@@ -2306,6 +2380,7 @@ ${e.message}`;
     }
   }
 };
+__name(DisTube, "DisTube");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseManager,
@@ -2332,6 +2407,7 @@ ${e.message}`;
   SearchResult,
   SearchResultType,
   Song,
+  StreamType,
   TaskQueue,
   checkIntents,
   checkInvalidKey,
@@ -2340,6 +2416,7 @@ ${e.message}`;
   defaultOptions,
   entersState,
   formatDuration,
+  getClientMember,
   getResponseHeaders,
   isClientInstance,
   isGuildInstance,