distube 4.1.0 → 4.1.1

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import ytdl, { Cookie } from '@distube/ytdl-core';
+import * as ytdl from '@distube/ytdl-core';
+import ytdl__default, { Cookie } from '@distube/ytdl-core';
 import * as discord_js from 'discord.js';
 import { GuildTextBasedChannel, Message, Snowflake, VoiceBasedChannel, VoiceState, Guild, GuildMember, Interaction, Client, Collection, ClientOptions } from 'discord.js';
 import ytpl from '@distube/ytpl';
@@ -113,7 +114,7 @@ type DisTubeOptions = {
     searchCooldown?: number;
     youtubeCookie?: Cookie[] | string;
     customFilters?: Filters;
-    ytdlOptions?: ytdl.downloadOptions;
+    ytdlOptions?: ytdl__default.downloadOptions;
     nsfw?: boolean;
     emitAddSongWhenCreatingQueue?: boolean;
     emitAddListWhenCreatingQueue?: boolean;
@@ -569,7 +570,7 @@ declare class SearchResultPlaylist extends ISearchResult {
 declare class Song<T = unknown> {
     #private;
     source: string;
-    formats?: ytdl.videoFormat[];
+    formats?: ytdl__default.videoFormat[];
     id?: string;
     name?: string;
     isLive: boolean;
@@ -597,12 +598,12 @@ declare class Song<T = unknown> {
      * @param {string} [options.source="youtube"] Song source
      * @param {T} [options.metadata] Song metadata
      */
-    constructor(info: ytdl.videoInfo | SearchResult | OtherSongInfo | ytdl.relatedVideo | RelatedSong | ytpl.result["items"][number], options?: {
+    constructor(info: ytdl__default.videoInfo | SearchResult | OtherSongInfo | ytdl__default.relatedVideo | RelatedSong | ytpl.result["items"][number], options?: {
         member?: GuildMember;
         source?: string;
         metadata?: T;
     });
-    _patchYouTube(i: ytdl.videoInfo | SearchResult): void;
+    _patchYouTube(i: ytdl__default.videoInfo | SearchResult): void;
     /**
      * Patch data from other source
      * @param {OtherSongInfo} info Video info
@@ -767,10 +768,9 @@ declare class DisTubeVoice extends TypedEmitter<DisTubeVoiceEvents> {
 interface StreamOptions {
     seek?: number;
     ffmpegArgs?: string[];
-    isLive?: boolean;
     type?: StreamType;
 }
-declare const chooseBestVideoFormat: (formats: ytdl.videoFormat[], isLive?: boolean) => ytdl.videoFormat;
+declare const chooseBestVideoFormat: ({ duration, formats, isLive }: Song) => ytdl.videoFormat | undefined;
 /**
  * Create a stream to play with {@link DisTubeVoice}
  * @private
@@ -778,12 +778,12 @@ declare const chooseBestVideoFormat: (formats: ytdl.videoFormat[], isLive?: bool
 declare class DisTubeStream {
     /**
      * Create a stream from ytdl video formats
-     * @param {ytdl.videoFormat[]} formats ytdl video formats
+     * @param {Song} song A YouTube Song
      * @param {StreamOptions} options options
      * @returns {DisTubeStream}
      * @private
      */
-    static YouTube(formats: ytdl.videoFormat[] | undefined, options?: StreamOptions): DisTubeStream;
+    static YouTube(song: Song, options?: StreamOptions): DisTubeStream;
     /**
      * Create a stream from a stream url
      * @param {string} url stream url
@@ -812,20 +812,20 @@ declare class DisTubeStream {
 declare class DisTubeHandler extends DisTubeBase {
     #private;
     constructor(distube: DisTube);
-    get ytdlOptions(): ytdl.getInfoOptions;
+    get ytdlOptions(): ytdl__default.getInfoOptions;
     get ytCookie(): string;
     /**
      * @param {string} url url
      * @param {boolean} [basic=false] getBasicInfo?
      * @returns {Promise<ytdl.videoInfo>}
      */
-    getYouTubeInfo(url: string, basic?: boolean): Promise<ytdl.videoInfo>;
+    getYouTubeInfo(url: string, basic?: boolean): Promise<ytdl__default.videoInfo>;
     resolve<T = unknown>(song: Song<T>, options?: Omit<ResolveOptions, "metadata">): Promise<Song<T>>;
     resolve<T = unknown>(song: Playlist<T>, options?: Omit<ResolveOptions, "metadata">): Promise<Playlist<T>>;
     resolve<T = unknown>(song: string | SearchResult, options?: ResolveOptions<T>): Promise<Song<T> | Playlist<T>>;
-    resolve<T = unknown>(song: ytdl.videoInfo | OtherSongInfo | ytdl.relatedVideo, options?: ResolveOptions<T>): Promise<Song<T>>;
+    resolve<T = unknown>(song: ytdl__default.videoInfo | OtherSongInfo | ytdl__default.relatedVideo, options?: ResolveOptions<T>): Promise<Song<T>>;
     resolve<T = unknown>(song: Playlist, options: ResolveOptions<T>): Promise<Playlist<T>>;
-    resolve(song: string | ytdl.videoInfo | Song | Playlist | SearchResult | OtherSongInfo | ytdl.relatedVideo, options?: ResolveOptions): Promise<Song | Playlist>;
+    resolve(song: string | ytdl__default.videoInfo | Song | Playlist | SearchResult | OtherSongInfo | ytdl__default.relatedVideo, options?: ResolveOptions): Promise<Song | Playlist>;
     resolvePlaylist<T = unknown>(playlist: Playlist<T> | Song<T>[] | string, options?: Omit<ResolvePlaylistOptions, "metadata">): Promise<Playlist<T>>;
     resolvePlaylist<T = undefined>(playlist: Playlist | Song[] | string, options: ResolvePlaylistOptions<T>): Promise<Playlist<T>>;
     resolvePlaylist(playlist: Playlist | Song[] | string, options?: ResolvePlaylistOptions): Promise<Playlist>;
@@ -887,7 +887,7 @@ declare class Options {
     searchCooldown: number;
     youtubeCookie?: Cookie[] | string;
     customFilters?: Filters;
-    ytdlOptions: ytdl.getInfoOptions;
+    ytdlOptions: ytdl__default.getInfoOptions;
     nsfw: boolean;
     emitAddSongWhenCreatingQueue: boolean;
     emitAddListWhenCreatingQueue: boolean;

package/dist/index.js

@@ -63,7 +63,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "distube",
-      version: "4.1.0",
+      version: "4.1.1",
       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",
       types: "./dist/index.d.ts",
@@ -124,43 +124,43 @@ var require_package = __commonJS({
       ],
       homepage: "https://distube.js.org/",
       dependencies: {
-        "@distube/ytdl-core": "^4.12.1",
-        "@distube/ytpl": "^1.1.4",
-        "@distube/ytsr": "^1.1.10",
+        "@distube/ytdl-core": "^4.13.2",
+        "@distube/ytpl": "^1.2.1",
+        "@distube/ytsr": "^1.2.0",
         "prism-media": "npm:@distube/prism-media@latest",
         "tiny-typed-emitter": "^2.1.0",
         "tough-cookie": "^4.1.3",
         tslib: "^2.6.2",
-        undici: "^5.23.0"
+        undici: "^5.27.2"
       },
       devDependencies: {
-        "@babel/core": "^7.22.11",
+        "@babel/core": "^7.23.2",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/preset-env": "^7.22.10",
-        "@babel/preset-typescript": "^7.22.11",
-        "@commitlint/cli": "^17.7.1",
-        "@commitlint/config-conventional": "^17.7.0",
+        "@babel/preset-env": "^7.23.2",
+        "@babel/preset-typescript": "^7.23.2",
+        "@commitlint/cli": "^18.2.0",
+        "@commitlint/config-conventional": "^18.1.0",
         "@discordjs/voice": "^0.16.0",
         "@distubejs/docgen": "distubejs/docgen",
-        "@types/jest": "^29.5.4",
-        "@types/node": "^20.5.7",
-        "@types/tough-cookie": "^4.0.2",
-        "@typescript-eslint/eslint-plugin": "^6.5.0",
-        "@typescript-eslint/parser": "^6.5.0",
-        "babel-jest": "^29.6.4",
+        "@types/jest": "^29.5.8",
+        "@types/node": "^20.9.0",
+        "@types/tough-cookie": "^4.0.5",
+        "@typescript-eslint/eslint-plugin": "^6.10.0",
+        "@typescript-eslint/parser": "^6.10.0",
+        "babel-jest": "^29.7.0",
         "discord.js": "^14.13.0",
-        eslint: "^8.48.0",
+        eslint: "^8.53.0",
         "eslint-config-distube": "^1.6.4",
         "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-deprecation": "^1.5.0",
-        "eslint-plugin-jsdoc": "^46.5.1",
+        "eslint-plugin-deprecation": "^2.0.0",
+        "eslint-plugin-jsdoc": "^46.8.2",
         husky: "^8.0.3",
-        jest: "^29.6.4",
+        jest: "^29.7.0",
         "jsdoc-babel": "^0.5.0",
         "nano-staged": "^0.8.0",
-        "npm-check-updates": "^16.13.2",
+        "npm-check-updates": "^16.14.6",
         pinst: "^3.0.0",
         prettier: "^3.0.3",
         tsup: "^7.2.0",
@@ -1116,13 +1116,7 @@ var DisTubeVoice = _DisTubeVoice;
 // src/core/DisTubeStream.ts
 var import_prism_media = require("prism-media");
 var import_voice2 = require("@discordjs/voice");
-var chooseBestVideoFormat = /* @__PURE__ */ __name((formats, isLive = false) => {
-  let filter = /* @__PURE__ */ __name((format) => format.hasAudio, "filter");
-  if (isLive)
-    filter = /* @__PURE__ */ __name((format) => format.hasAudio && format.isHLS, "filter");
-  formats = formats.filter(filter).sort((a, b) => Number(b.audioBitrate) - Number(a.audioBitrate) || Number(a.bitrate) - Number(b.bitrate));
-  return formats.find((format) => !format.hasVideo) || formats.sort((a, b) => Number(a.bitrate) - Number(b.bitrate))[0];
-}, "chooseBestVideoFormat");
+var chooseBestVideoFormat = /* @__PURE__ */ __name(({ duration, formats, isLive }) => formats && formats.filter((f) => f.hasAudio && (duration < 10 * 60 || f.hasVideo) && (!isLive || f.isHLS)).sort((a, b) => Number(b.audioBitrate) - Number(a.audioBitrate) || Number(a.bitrate) - Number(b.bitrate))[0], "chooseBestVideoFormat");
 var _DisTubeStream = class _DisTubeStream {
   /**
    * Create a DisTubeStream to play with {@link DisTubeVoice}
@@ -1168,18 +1162,20 @@ var _DisTubeStream = class _DisTubeStream {
   }
   /**
    * Create a stream from ytdl video formats
-   * @param {ytdl.videoFormat[]} formats ytdl video formats
+   * @param {Song} song A YouTube Song
    * @param {StreamOptions} options options
    * @returns {DisTubeStream}
    * @private
    */
-  static YouTube(formats, options = {}) {
-    if (!formats || !formats.length)
+  static YouTube(song, options = {}) {
+    if (song.source !== "youtube")
+      throw new DisTubeError("INVALID_TYPE", "youtube", song.source, "Song#source");
+    if (!song.formats?.length)
       throw new DisTubeError("UNAVAILABLE_VIDEO");
     if (!options || typeof options !== "object" || Array.isArray(options)) {
       throw new DisTubeError("INVALID_TYPE", "object", options, "options");
     }
-    const bestFormat = chooseBestVideoFormat(formats, options.isLive);
+    const bestFormat = chooseBestVideoFormat(song);
     if (!bestFormat)
       throw new DisTubeError("UNPLAYABLE_FORMATS");
     return new _DisTubeStream(bestFormat.url, options);
@@ -1517,9 +1513,9 @@ var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
    * @param {Song} song A Song
    */
   async attachStreamInfo(song) {
-    const { url, source, formats, streamURL, isLive } = song;
+    const { url, source, formats, streamURL } = song;
     if (source === "youtube") {
-      if (!formats || !chooseBestVideoFormat(formats, isLive)) {
+      if (!formats || !chooseBestVideoFormat(song)) {
         song._patchYouTube(await this.handler.getYouTubeInfo(url));
       }
     } else if (!streamURL) {
@@ -1946,15 +1942,15 @@ var _QueueManager = class _QueueManager extends GuildIdManager {
    * @returns {DisTubeStream}
    */
   createStream(queue) {
-    const { duration, formats, isLive, source, streamURL } = queue.songs[0];
+    const song = queue.songs[0];
+    const { duration, source, streamURL } = song;
     const streamOptions = {
       ffmpegArgs: queue.filters.ffmpegArgs,
       seek: duration ? queue.beginTime : void 0,
-      isLive,
       type: this.options.streamType
     };
     if (source === "youtube")
-      return DisTubeStream.YouTube(formats, streamOptions);
+      return DisTubeStream.YouTube(song, streamOptions);
     return DisTubeStream.DirectLink(streamURL, streamOptions);
   }
   /**