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

package/dist/index.mjs

@@ -44,7 +44,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.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",
@@ -65,7 +65,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",
@@ -108,43 +108,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": "*",
@@ -191,6 +191,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 = {
@@ -224,7 +229,8 @@ var defaultOptions = {
   nsfw: false,
   emitAddSongWhenCreatingQueue: true,
   emitAddListWhenCreatingQueue: true,
-  joinNewVoiceChannel: true
+  joinNewVoiceChannel: true,
+  streamType: 0 /* OPUS */
 };
 
 // src/struct/DisTubeError.ts
@@ -246,7 +252,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",
@@ -285,6 +292,7 @@ var DisTubeError = class extends Error {
     return this.errorCode;
   }
 };
+__name(DisTubeError, "DisTubeError");
 
 // src/struct/TaskQueue.ts
 var Task = class {
@@ -298,6 +306,7 @@ var Task = class {
     });
   }
 };
+__name(Task, "Task");
 var _tasks;
 var TaskQueue = class {
   constructor() {
@@ -318,6 +327,7 @@ var TaskQueue = class {
     return !!__privateGet(this, _tasks).find((t) => t.resolveInfo);
   }
 };
+__name(TaskQueue, "TaskQueue");
 _tasks = new WeakMap();
 
 // src/struct/Playlist.ts
@@ -380,6 +390,7 @@ var Playlist = class {
     this.songs.map((s) => s.constructor.name === "Song" && (s.metadata = metadata));
   }
 };
+__name(Playlist, "Playlist");
 _metadata = new WeakMap();
 _member = new WeakMap();
 
@@ -418,6 +429,7 @@ var SearchResult = class {
     };
   }
 };
+__name(SearchResult, "SearchResult");
 
 // src/struct/Song.ts
 var _metadata2, _member2, _playlist;
@@ -552,6 +564,7 @@ var _Song = class {
   }
 };
 var Song = _Song;
+__name(Song, "Song");
 _metadata2 = new WeakMap();
 _member2 = new WeakMap();
 _playlist = new WeakMap();
@@ -578,6 +591,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");
     }
@@ -599,10 +613,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") {
@@ -656,6 +672,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
@@ -686,10 +705,11 @@ var DisTubeBase = class {
     return this.distube.handler;
   }
 };
+__name(DisTubeBase, "DisTubeBase");
 
 // src/core/DisTubeStream.ts
 import { FFmpeg } from "prism-media";
-import { StreamType } from "@discordjs/voice";
+import { StreamType as DiscordVoiceStreamType } from "@discordjs/voice";
 var chooseBestVideoFormat = /* @__PURE__ */ __name((formats, isLive = false) => {
   let filter = /* @__PURE__ */ __name((format) => format.hasAudio, "filter");
   if (isLive)
@@ -703,7 +723,7 @@ var DisTubeStream = class {
     __publicField(this, "stream");
     __publicField(this, "url");
     this.url = url;
-    this.type = StreamType.Raw;
+    this.type = !options.type ? DiscordVoiceStreamType.Opus : DiscordVoiceStreamType.Raw;
     const args = [
       "-reconnect",
       "1",
@@ -721,9 +741,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());
     }
@@ -753,6 +777,7 @@ var DisTubeStream = class {
     return new DisTubeStream(url, options);
   }
 };
+__name(DisTubeStream, "DisTubeStream");
 
 // src/core/manager/BaseManager.ts
 import { Collection } from "discord.js";
@@ -765,6 +790,7 @@ var BaseManager = class extends DisTubeBase {
     return this.collection.size;
   }
 };
+__name(BaseManager, "BaseManager");
 
 // src/core/manager/GuildIdManager.ts
 var GuildIdManager = class extends BaseManager {
@@ -785,6 +811,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;
@@ -817,7 +844,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);
@@ -831,8 +858,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));
@@ -861,6 +888,7 @@ var QueueManager = class extends GuildIdManager {
     }
   }
 };
+__name(QueueManager, "QueueManager");
 _voiceEventHandler = new WeakSet();
 voiceEventHandler_fn = /* @__PURE__ */ __name(function(queue) {
   queue._listeners = {
@@ -1017,6 +1045,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") {
@@ -1063,9 +1092,9 @@ var DisTubeVoice = class extends 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 = createAudioPlayer().on(AudioPlayerStatus.Idle, (oldState) => {
       if (oldState.status !== AudioPlayerStatus.Idle) {
@@ -1108,6 +1137,8 @@ var DisTubeVoice = class extends 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) {
@@ -1211,9 +1242,10 @@ var DisTubeVoice = class extends 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();
@@ -1260,6 +1292,7 @@ var DisTubeVoiceManager = class extends GuildIdManager {
     }
   }
 };
+__name(DisTubeVoiceManager, "DisTubeVoiceManager");
 
 // src/core/DisTubeHandler.ts
 import ytdl from "@distube/ytdl-core";
@@ -1495,6 +1528,7 @@ var DisTubeHandler = class extends DisTubeBase {
     }
   }
 };
+__name(DisTubeHandler, "DisTubeHandler");
 
 // src/struct/Queue.ts
 var _filters;
@@ -1516,12 +1550,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;
@@ -1541,6 +1571,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);
   }
@@ -1557,7 +1590,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;
@@ -1755,6 +1788,7 @@ var Queue = class extends DisTubeBase {
     return this.autoplay;
   }
 };
+__name(Queue, "Queue");
 _filters = new WeakMap();
 
 // src/struct/Plugin.ts
@@ -1796,6 +1830,7 @@ var Plugin = class {
     return [];
   }
 };
+__name(Plugin, "Plugin");
 
 // src/struct/CustomPlugin.ts
 var CustomPlugin = class extends Plugin {
@@ -1804,6 +1839,7 @@ var CustomPlugin = class extends Plugin {
     __publicField(this, "type", "custom" /* CUSTOM */);
   }
 };
+__name(CustomPlugin, "CustomPlugin");
 
 // src/struct/ExtractorPlugin.ts
 var ExtractorPlugin = class extends Plugin {
@@ -1812,6 +1848,7 @@ var ExtractorPlugin = class extends Plugin {
     __publicField(this, "type", "extractor" /* EXTRACTOR */);
   }
 };
+__name(ExtractorPlugin, "ExtractorPlugin");
 
 // src/util.ts
 import { URL } from "url";
@@ -1829,6 +1866,7 @@ function formatDuration(sec) {
     return `${formatInt(minutes)}:${formatInt(seconds)}`;
   return `00:${formatInt(seconds)}`;
 }
+__name(formatDuration, "formatDuration");
 function toSecond(input) {
   if (!input)
     return 0;
@@ -1847,11 +1885,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;
@@ -1864,18 +1904,25 @@ function isURL(input) {
   }
   return true;
 }
+__name(isURL, "isURL");
 function checkIntents(options) {
   const intents = new IntentsBitField(options.intents);
   if (!intents.has(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 SnowflakeUtil.deconstruct(id).timestamp > SnowflakeUtil.epoch;
@@ -1883,21 +1930,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" && Constants.TextBasedChannelTypes.includes(channel.type);
+  return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && typeof channel.name === "string" && 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) && 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) && 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") {
@@ -1915,9 +1968,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);
@@ -1926,6 +1981,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");
@@ -1947,17 +2003,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
 import http from "http";
@@ -1969,6 +2039,7 @@ var HTTPPlugin = class extends ExtractorPlugin {
     return resolveHttpSong(url, { ...options, source: "http" });
   }
 };
+__name(HTTPPlugin, "HTTPPlugin");
 
 // src/plugin/https.ts
 import https from "https";
@@ -2003,6 +2074,7 @@ var HTTPSPlugin = class extends ExtractorPlugin {
     return resolveHttpSong(url, { ...options, source: "https" });
   }
 };
+__name(HTTPSPlugin, "HTTPSPlugin");
 
 // src/DisTube.ts
 import ytsr from "@distube/ytsr";
@@ -2047,7 +2119,7 @@ var DisTube = class extends TypedEmitter2 {
     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
@@ -2244,6 +2316,7 @@ ${e.message}`;
     }
   }
 };
+__name(DisTube, "DisTube");
 export {
   BaseManager,
   CustomPlugin,
@@ -2269,6 +2342,7 @@ export {
   SearchResult,
   SearchResultType,
   Song,
+  StreamType,
   TaskQueue,
   checkIntents,
   checkInvalidKey,
@@ -2278,6 +2352,7 @@ export {
   defaultOptions,
   entersState,
   formatDuration,
+  getClientMember,
   getResponseHeaders,
   isClientInstance,
   isGuildInstance,