distube 4.0.0-dev.6 → 4.0.2

package/dist/index.d.ts

@@ -6,8 +6,6 @@ import { TypedEmitter } from 'tiny-typed-emitter';
 import { AudioPlayer, VoiceConnection, AudioResource, StreamType as StreamType$1 } from '@discordjs/voice';
 import { FFmpeg } from 'prism-media';
 import * as _discordjs_collection from '@discordjs/collection';
-import https from 'https';
-import http from 'http';
 
 declare type Awaitable<T = any> = T | PromiseLike<T>;
 declare type DisTubeVoiceEvents = {
@@ -58,6 +56,7 @@ interface DisTubeOptions {
     emitAddListWhenCreatingQueue?: boolean;
     joinNewVoiceChannel?: boolean;
     streamType?: StreamType;
+    directLink?: boolean;
 }
 declare type GuildIdResolvable = Queue | DisTubeVoice | Snowflake | Message | GuildTextBasedChannel | VoiceBasedChannel | VoiceState | Guild | GuildMember | Interaction | string;
 interface OtherSongInfo {
@@ -161,6 +160,7 @@ declare const defaultOptions: {
     emitAddListWhenCreatingQueue: boolean;
     joinNewVoiceChannel: boolean;
     streamType: StreamType;
+    directLink: boolean;
 };
 
 declare const ERROR_MESSAGES: {
@@ -269,12 +269,12 @@ declare class SearchResultVideo extends ISearchResult {
     thumbnail: string;
     constructor(info: Video);
 }
+declare type SearchResult = SearchResultVideo | SearchResultPlaylist;
 declare class SearchResultPlaylist extends ISearchResult {
     type: SearchResultType.PLAYLIST;
     length: number;
     constructor(info: Playlist$1);
 }
-declare type SearchResult = SearchResultVideo | SearchResultPlaylist;
 
 declare class Song<T = unknown> {
     #private;
@@ -433,6 +433,7 @@ declare class Options {
     emitAddListWhenCreatingQueue: boolean;
     joinNewVoiceChannel: boolean;
     streamType: StreamType;
+    directLink: boolean;
     constructor(options: DisTubeOptions);
 }
 
@@ -543,22 +544,7 @@ declare function checkInvalidKey(target: Record<string, any>, source: Record<str
 declare function isObject(obj: any): obj is object;
 declare function isRecord<T = unknown>(obj: any): obj is Record<string, T>;
 
-declare class HTTPPlugin extends ExtractorPlugin {
-    validate(url: string): Promise<boolean>;
-    resolve(url: string, options?: {
-        member?: GuildMember;
-        metadata?: any;
-    }): Promise<Song<any>>;
-}
-
-declare const getResponseHeaders: (httpModule: typeof http | typeof https, url: string) => Promise<http.IncomingHttpHeaders>;
-declare const validateAudioURL: (httpModule: typeof http | typeof https, protocol: string, url: string) => Promise<boolean>;
-declare const resolveHttpSong: (url: string, options: {
-    source: "http" | "https";
-    member?: GuildMember;
-    metadata?: any;
-}) => Promise<Song<any>>;
-declare class HTTPSPlugin extends ExtractorPlugin {
+declare class DirectLinkPlugin extends ExtractorPlugin {
     validate(url: string): Promise<boolean>;
     resolve(url: string, options?: {
         member?: GuildMember;
@@ -580,12 +566,7 @@ declare class DisTube extends TypedEmitter<DisTubeEvents> {
     static get version(): string;
     get version(): string;
     play(voiceChannel: VoiceBasedChannel, song: string | Song | SearchResult | Playlist, options?: PlayOptions): Promise<void>;
-    createCustomPlaylist(songs: (string | Song | SearchResult)[], options?: {
-        member?: GuildMember;
-        properties?: Record<string, any>;
-        parallel?: boolean;
-        metadata?: any;
-    }): Promise<Playlist>;
+    createCustomPlaylist(songs: (string | Song | SearchResult)[], options?: CustomPlaylistOptions): Promise<Playlist>;
     search(string: string, options?: {
         type?: SearchResultType;
         limit?: number;
@@ -620,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, SearchResultPlaylist, SearchResultType, SearchResultVideo, Song, StreamType, TaskQueue, checkIntents, checkInvalidKey, chooseBestVideoFormat, DisTube as default, defaultFilters, defaultOptions, 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, DirectLinkPlugin, DisTube, DisTubeBase, DisTubeError, DisTubeEvents, DisTubeHandler, DisTubeOptions, DisTubeStream, DisTubeVoice, DisTubeVoiceEvents, DisTubeVoiceManager, ExtractorPlugin, Filter, FilterManager, FilterResolvable, Filters, GuildIdManager, GuildIdResolvable, Options, OtherSongInfo, PlayHandlerOptions, PlayOptions, Playlist, PlaylistInfo, Plugin, PluginType, Queue, QueueManager, RelatedSong, RepeatMode, ResolveOptions, ResolvePlaylistOptions, SearchResult, SearchResultPlaylist, SearchResultType, SearchResultVideo, Song, StreamType, TaskQueue, checkIntents, checkInvalidKey, chooseBestVideoFormat, DisTube as default, defaultFilters, defaultOptions, formatDuration, isClientInstance, isGuildInstance, isMemberInstance, isMessageInstance, isObject, isRecord, isSnowflake, isSupportedVoiceChannel, isTextChannelInstance, isURL, isVoiceChannelEmpty, parseNumber, resolveGuildId, toSecond, version };

package/dist/index.js

@@ -1,5 +1,4 @@
 "use strict";
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -57,7 +56,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "distube",
-      version: "4.0.0-dev.6",
+      version: "4.0.2",
       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",
@@ -81,7 +80,7 @@ var require_package = __commonJS({
         prettier: 'prettier --write "**/*.{ts,json,yml,yaml,md}"',
         build: "tsup",
         "build:check": "tsc --noEmit",
-        update: "ncu -u --dep dev,prod && yarn up '**' -R",
+        update: "ncu -u && yarn up '**' -R",
         postinstall: "husky install",
         prepublishOnly: "yarn lint && yarn test",
         prepack: "yarn build && pinst --disable",
@@ -123,28 +122,29 @@ var require_package = __commonJS({
       dependencies: {
         "@distube/ytdl-core": "^4.11.3",
         "@distube/ytpl": "^1.1.1",
-        "@distube/ytsr": "^1.1.7",
+        "@distube/ytsr": "^1.1.8",
         "prism-media": "https://codeload.github.com/distubejs/prism-media/tar.gz/main#workaround.tar.gz",
         "tiny-typed-emitter": "^2.1.0",
-        tslib: "^2.4.0"
+        tslib: "^2.4.0",
+        undici: "^5.8.0"
       },
       devDependencies: {
-        "@babel/core": "^7.18.6",
+        "@babel/core": "^7.18.9",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.18.6",
-        "@babel/preset-env": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+        "@babel/preset-env": "^7.18.9",
         "@babel/preset-typescript": "^7.18.6",
         "@commitlint/cli": "^17.0.3",
         "@commitlint/config-conventional": "^17.0.3",
-        "@discordjs/voice": "dev",
+        "@discordjs/voice": "^0.11.0",
         "@distube/docgen": "distubejs/docgen",
-        "@types/jest": "^28.1.5",
-        "@types/node": "^18.0.4",
-        "@typescript-eslint/eslint-plugin": "^5.30.6",
-        "@typescript-eslint/parser": "^5.30.6",
+        "@types/jest": "^28.1.6",
+        "@types/node": "^18.0.6",
+        "@typescript-eslint/eslint-plugin": "^5.30.7",
+        "@typescript-eslint/parser": "^5.30.7",
         "babel-jest": "^28.1.3",
-        "discord.js": "dev",
-        eslint: "^8.19.0",
+        "discord.js": "^14.0.2",
+        eslint: "^8.20.0",
         "eslint-config-distube": "^1.6.4",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-deprecation": "^1.3.2",
@@ -153,7 +153,7 @@ var require_package = __commonJS({
         jest: "^28.1.3",
         "jsdoc-babel": "^0.5.0",
         "nano-staged": "^0.8.0",
-        "npm-check-updates": "^15.3.0",
+        "npm-check-updates": "^15.3.4",
         pinst: "^3.0.0",
         prettier: "^2.7.1",
         tsup: "^6.1.3",
@@ -162,7 +162,7 @@ var require_package = __commonJS({
       peerDependencies: {
         "@discordjs/opus": "*",
         "@discordjs/voice": "*",
-        "discord.js": "14||^14.0.0-dev"
+        "discord.js": "14"
       },
       peerDependenciesMeta: {
         "@discordjs/opus": {
@@ -181,8 +181,7 @@ var require_package = __commonJS({
       engines: {
         node: ">=16.9.0"
       },
-      packageManager: "yarn@3.2.0",
-      stableVersion: "4.0.0-dev"
+      packageManager: "yarn@3.2.0"
     };
   }
 });
@@ -192,6 +191,7 @@ var src_exports = {};
 __export(src_exports, {
   BaseManager: () => BaseManager,
   CustomPlugin: () => CustomPlugin,
+  DirectLinkPlugin: () => DirectLinkPlugin,
   DisTube: () => DisTube,
   DisTubeBase: () => DisTubeBase,
   DisTubeError: () => DisTubeError,
@@ -202,8 +202,6 @@ __export(src_exports, {
   ExtractorPlugin: () => ExtractorPlugin,
   FilterManager: () => FilterManager,
   GuildIdManager: () => GuildIdManager,
-  HTTPPlugin: () => HTTPPlugin,
-  HTTPSPlugin: () => HTTPSPlugin,
   Options: () => Options,
   Playlist: () => Playlist,
   Plugin: () => Plugin,
@@ -224,7 +222,6 @@ __export(src_exports, {
   defaultFilters: () => defaultFilters,
   defaultOptions: () => defaultOptions,
   formatDuration: () => formatDuration,
-  getResponseHeaders: () => getResponseHeaders,
   isClientInstance: () => isClientInstance,
   isGuildInstance: () => isGuildInstance,
   isMemberInstance: () => isMemberInstance,
@@ -238,9 +235,7 @@ __export(src_exports, {
   isVoiceChannelEmpty: () => isVoiceChannelEmpty,
   parseNumber: () => parseNumber,
   resolveGuildId: () => resolveGuildId,
-  resolveHttpSong: () => resolveHttpSong,
   toSecond: () => toSecond,
-  validateAudioURL: () => validateAudioURL,
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
@@ -301,7 +296,8 @@ var defaultOptions = {
   emitAddSongWhenCreatingQueue: true,
   emitAddListWhenCreatingQueue: true,
   joinNewVoiceChannel: true,
-  streamType: 0 /* OPUS */
+  streamType: 0 /* OPUS */,
+  directLink: true
 };
 
 // src/struct/DisTubeError.ts
@@ -426,6 +422,7 @@ var Playlist = class {
       this.songs = playlist;
       this.name = this.songs[0].name ? `${this.songs[0].name} and ${this.songs.length - 1} more songs.` : `${this.songs.length} songs playlist`;
       this.thumbnail = this.songs[0].thumbnail;
+      this.member = member || void 0;
     } else {
       this.source = (playlist.source || "youtube").toLowerCase();
       if (!Array.isArray(playlist.songs) || !playlist.songs.length)
@@ -434,12 +431,12 @@ var Playlist = class {
       this.name = playlist.name || playlist.title || (this.songs[0].name ? `${this.songs[0].name} and ${this.songs.length - 1} more songs.` : `${this.songs.length} songs playlist`);
       this.url = playlist.url || playlist.webpage_url;
       this.thumbnail = playlist.thumbnail || this.songs[0].thumbnail;
+      this.member = member || playlist.member || void 0;
     }
     this.songs.map((s) => s.constructor.name === "Song" && (s.playlist = this));
     if (properties)
       for (const [key, value] of Object.entries(properties))
         this[key] = value;
-    this.member = member;
     this.metadata = metadata;
   }
   get duration() {
@@ -1195,6 +1192,8 @@ Name: ${song.name}`;
   }
   this.emitError(error, queue.textChannel);
   if (queue.songs.length > 0) {
+    queue._next = queue._prev = false;
+    queue.beginTime = 0;
     this.playSong(queue).then((e) => {
       if (!e)
         this.emit("playSong", queue, queue.songs[0]);
@@ -1278,8 +1277,11 @@ var DisTubeHandler = class extends DisTubeBase {
       return new Song(song, options);
     if (song instanceof SearchResultPlaylist)
       return this.resolvePlaylist(song.url, options);
-    if (isObject(song))
+    if (isObject(song)) {
+      if (!("url" in song) && !("id" in song))
+        throw new DisTubeError("CANNOT_RESOLVE_SONG", song);
       return new Song(song, options);
+    }
     if (import_ytpl.default.validateID(song))
       return this.resolvePlaylist(song, options);
     if (import_ytdl_core.default.validateURL(song))
@@ -1471,6 +1473,7 @@ var Options = class {
     __publicField(this, "emitAddListWhenCreatingQueue");
     __publicField(this, "joinNewVoiceChannel");
     __publicField(this, "streamType");
+    __publicField(this, "directLink");
     if (typeof options !== "object" || Array.isArray(options)) {
       throw new DisTubeError("INVALID_TYPE", "object", options, "DisTubeOptions");
     }
@@ -1493,6 +1496,7 @@ var Options = class {
     this.emitAddListWhenCreatingQueue = opts.emitAddListWhenCreatingQueue;
     this.joinNewVoiceChannel = opts.joinNewVoiceChannel;
     this.streamType = opts.streamType;
+    this.directLink = opts.directLink;
     checkInvalidKey(opts, this, "DisTubeOptions");
     __privateMethod(this, _validateOptions, validateOptions_fn).call(this);
   }
@@ -1554,6 +1558,9 @@ validateOptions_fn = /* @__PURE__ */ __name(function(options = this) {
   if (typeof options.streamType !== "number" || isNaN(options.streamType) || !StreamType[options.streamType]) {
     throw new DisTubeError("INVALID_TYPE", "StreamType", options.streamType, "DisTubeOptions.streamType");
   }
+  if (typeof options.directLink !== "boolean") {
+    throw new DisTubeError("INVALID_TYPE", "boolean", options.directLink, "DisTubeOptions.directLink");
+  }
 }, "#validateOptions");
 
 // src/core/DisTubeStream.ts
@@ -2034,7 +2041,7 @@ function isMemberInstance(member) {
 }
 __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) && typeof channel.nsfw === "boolean" && typeof channel.messages?.cache === "object" && typeof channel.send === "function";
+  return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && typeof channel.name === "string" && import_discord2.Constants.TextBasedChannelTypes.includes(channel.type) && typeof channel.nsfw === "boolean" && "messages" in channel && typeof channel.send === "function";
 }
 __name(isTextChannelInstance, "isTextChannelInstance");
 function isMessageInstance(message) {
@@ -2089,52 +2096,28 @@ function isRecord(obj) {
 }
 __name(isRecord, "isRecord");
 
-// src/plugin/http.ts
-var import_http = __toESM(require("http"));
-var HTTPPlugin = class extends ExtractorPlugin {
+// src/plugin/DirectLink.ts
+var import_undici = require("undici");
+var DirectLinkPlugin = class extends ExtractorPlugin {
   async validate(url) {
-    return validateAudioURL(import_http.default, "http:", url);
-  }
-  async resolve(url, options = {}) {
-    return resolveHttpSong(url, { ...options, source: "http" });
-  }
-};
-__name(HTTPPlugin, "HTTPPlugin");
-
-// src/plugin/https.ts
-var import_https = __toESM(require("https"));
-var import_url2 = require("url");
-var getResponseHeaders = /* @__PURE__ */ __name(async (httpModule, url) => new Promise((resolve, reject) => {
-  httpModule.get(url).on("response", (res) => {
-    resolve(res.headers);
-  }).on("error", reject);
-}), "getResponseHeaders");
-var validateAudioURL = /* @__PURE__ */ __name(async (httpModule, protocol, url) => {
-  if (new import_url2.URL(url).protocol.toLowerCase() !== protocol) {
+    try {
+      const headers = await (0, import_undici.request)(url, { method: "HEAD" }).then((res) => res.headers);
+      const type = headers["content-type"];
+      if (type?.startsWith("audio"))
+        return true;
+    } catch {
+    }
     return false;
   }
-  const headers = await getResponseHeaders(httpModule, url), type = headers["content-type"];
-  if (type?.startsWith("audio")) {
-    return true;
-  }
-  return false;
-}, "validateAudioURL");
-var resolveHttpSong = /* @__PURE__ */ __name(async (url, options) => {
-  url = url.replace(/\/+$/, "");
-  return new Song({
-    name: url.substring(url.lastIndexOf("/") + 1).replace(/((\?|#).*)?$/, "") || url,
-    url
-  }, options);
-}, "resolveHttpSong");
-var HTTPSPlugin = class extends ExtractorPlugin {
-  async validate(url) {
-    return validateAudioURL(import_https.default, "https:", url);
-  }
   async resolve(url, options = {}) {
-    return resolveHttpSong(url, { ...options, source: "https" });
+    url = url.replace(/\/+$/, "");
+    return new Song({
+      name: url.substring(url.lastIndexOf("/") + 1).replace(/((\?|#).*)?$/, "") || url,
+      url
+    }, options);
   }
 };
-__name(HTTPSPlugin, "HTTPSPlugin");
+__name(DirectLinkPlugin, "DirectLinkPlugin");
 
 // src/DisTube.ts
 var import_ytsr = __toESM(require("@distube/ytsr"));
@@ -2161,7 +2144,8 @@ var DisTube = class extends import_tiny_typed_emitter2.TypedEmitter {
     this.handler = new DisTubeHandler(this);
     this.queues = new QueueManager(this);
     this.filters = { ...defaultFilters, ...this.options.customFilters };
-    this.options.plugins.push(new HTTPPlugin(), new HTTPSPlugin());
+    if (this.options.directLink)
+      this.options.plugins.push(new DirectLinkPlugin());
     this.options.plugins.map((p) => p.init(this));
     this.extractorPlugins = this.options.plugins.filter((p) => p.type === "extractor");
     this.customPlugins = this.options.plugins.filter((p) => p.type === "custom");
@@ -2385,6 +2369,7 @@ __name(DisTube, "DisTube");
 0 && (module.exports = {
   BaseManager,
   CustomPlugin,
+  DirectLinkPlugin,
   DisTube,
   DisTubeBase,
   DisTubeError,
@@ -2395,8 +2380,6 @@ __name(DisTube, "DisTube");
   ExtractorPlugin,
   FilterManager,
   GuildIdManager,
-  HTTPPlugin,
-  HTTPSPlugin,
   Options,
   Playlist,
   Plugin,
@@ -2416,7 +2399,6 @@ __name(DisTube, "DisTube");
   defaultFilters,
   defaultOptions,
   formatDuration,
-  getResponseHeaders,
   isClientInstance,
   isGuildInstance,
   isMemberInstance,
@@ -2430,9 +2412,7 @@ __name(DisTube, "DisTube");
   isVoiceChannelEmpty,
   parseNumber,
   resolveGuildId,
-  resolveHttpSong,
   toSecond,
-  validateAudioURL,
   version
 });
 //# sourceMappingURL=index.js.map