discord-player 5.3.0-dev.0 → 5.3.0-dev.3

package/dist/Player.js

@@ -23,7 +23,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
     /**
      * Creates new Discord Player
      * @param {Client} client The Discord Client
-     * @param {PlayerInitOptions} [options={}] The player init options
+     * @param {PlayerInitOptions} [options] The player init options
      */
     constructor(client, options = {}) {
         super();
@@ -80,23 +80,29 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
             return void this.emit("botDisconnect", queue);
         }
         if (!oldState.channelId && newState.channelId && newState.member.id === newState.guild.members.me.id) {
-            if (newState.serverMute || !newState.serverMute) {
-                queue.setPaused(newState.serverMute);
+            if (!oldState.serverMute && newState.serverMute) {
+                // state.serverMute can be null
+                queue.setPaused(!!newState.serverMute);
             }
-            else if (newState.suppress || !newState.suppress) {
-                if (newState.suppress)
+            else if (!oldState.suppress && newState.suppress) {
+                // state.suppress can be null
+                queue.setPaused(!!newState.suppress);
+                if (newState.suppress) {
                     newState.guild.members.me.voice.setRequestToSpeak(true).catch(Util_1.Util.noop);
-                queue.setPaused(newState.suppress);
+                }
             }
         }
         if (oldState.channelId === newState.channelId && newState.member.id === newState.guild.members.me.id) {
-            if (oldState.serverMute !== newState.serverMute) {
-                queue.setPaused(newState.serverMute);
+            if (!oldState.serverMute && newState.serverMute) {
+                // state.serverMute can be null
+                queue.setPaused(!!newState.serverMute);
             }
-            else if (oldState.suppress !== newState.suppress) {
-                if (newState.suppress)
+            else if (!oldState.suppress && newState.suppress) {
+                // state.suppress can be null
+                queue.setPaused(!!newState.suppress);
+                if (newState.suppress) {
                     newState.guild.members.me.voice.setRequestToSpeak(true).catch(Util_1.Util.noop);
-                queue.setPaused(newState.suppress);
+                }
             }
         }
         if (queue.connection && !newState.channelId && oldState.channelId === queue.connection.channel.id) {
@@ -401,9 +407,9 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
                         const data = new Track_1.default(this, {
                             title: m.track.name ?? "",
                             description: m.track.description ?? "",
-                            author: m.track.artists[0]?.name ?? "Unknown Artist",
+                            author: m.track.artists?.[0]?.name ?? "Unknown Artist",
                             url: m.track.external_urls?.spotify ?? query,
-                            thumbnail: m.track.album?.images[0]?.url ?? "https://www.scdn.co/i/_global/twitter_card-default.jpg",
+                            thumbnail: m.track.album?.images?.[0]?.url ?? "https://www.scdn.co/i/_global/twitter_card-default.jpg",
                             duration: Util_1.Util.buildTimeCode(Util_1.Util.parseMS(m.track.duration_ms)),
                             views: 0,
                             requestedBy: options.requestedBy,
@@ -564,5 +570,12 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
     *[Symbol.iterator]() {
         yield* Array.from(this.queues.values());
     }
+    /**
+     * Creates `Playlist` instance
+     * @param data The data to initialize a playlist
+     */
+    createPlaylist(data) {
+        return new Playlist_1.Playlist(this, data);
+    }
 }
 exports.Player = Player;

package/dist/Structures/Queue.js

@@ -6,18 +6,19 @@ const tslib_1 = require("tslib");
 const discord_js_1 = require("discord.js");
 const Track_1 = tslib_1.__importDefault(require("./Track"));
 const types_1 = require("../types/types");
-const discord_ytdl_core_1 = tslib_1.__importDefault(require("discord-ytdl-core"));
+const ytdl_core_1 = tslib_1.__importDefault(require("ytdl-core"));
 const voice_1 = require("@discordjs/voice");
 const Util_1 = require("../utils/Util");
 const youtube_sr_1 = tslib_1.__importDefault(require("youtube-sr"));
 const AudioFilters_1 = tslib_1.__importDefault(require("../utils/AudioFilters"));
 const PlayerError_1 = require("./PlayerError");
+const FFmpegStream_1 = require("../utils/FFmpegStream");
 class Queue {
     /**
      * Queue constructor
      * @param {Player} player The player that instantiated this queue
      * @param {Guild} guild The guild that instantiated this queue
-     * @param {PlayerOptions} [options={}] Player options for the queue
+     * @param {PlayerOptions} [options] Player options for the queue
      */
     constructor(player, guild, options = {}) {
         _Queue_instances.add(this);
@@ -191,9 +192,6 @@ class Queue {
                 return;
             }
         });
-        await this.player.voiceUtils.enterReady(this.connection.voiceConnection, {
-            maxTime: this.player.options.connectionTimeout || 30000
-        });
         return this;
     }
     /**
@@ -609,7 +607,7 @@ class Queue {
     /**
      * Play stream in a voice/stage channel
      * @param {Track} [src] The track to play (if empty, uses first track from the queue)
-     * @param {PlayOptions} [options={}] The options
+     * @param {PlayOptions} [options] The options
      * @returns {Promise<void>}
      */
     async play(src, options = {}) {
@@ -628,66 +626,43 @@ class Queue {
             this.previousTracks.push(track);
         }
         let stream = null;
-        const customDownloader = typeof this.onBeforeCreateStream === "function";
+        const hasCustomDownloader = typeof this.onBeforeCreateStream === "function";
         if (["youtube", "spotify"].includes(track.raw.source)) {
             let spotifyResolved = false;
             if (this.options.spotifyBridge && track.raw.source === "spotify" && !track.raw.engine) {
                 track.raw.engine = await youtube_sr_1.default.search(`${track.author} ${track.title}`, { type: "video" })
-                    .then((x) => x[0].url)
+                    .then((res) => res[0].url)
                     .catch(() => null);
                 spotifyResolved = true;
             }
-            const link = track.raw.source === "spotify" ? track.raw.engine : track.url;
-            if (!link)
+            const url = track.raw.source === "spotify" ? track.raw.engine : track.url;
+            if (!url)
                 return void this.play(this.tracks.shift(), { immediate: true });
-            if (customDownloader) {
-                stream = (await this.onBeforeCreateStream(track, spotifyResolved ? "youtube" : track.raw.source, this)) ?? null;
-                if (stream)
-                    stream = discord_ytdl_core_1.default
-                        .arbitraryStream(stream, {
-                        opusEncoded: false,
-                        fmt: "s16le",
-                        encoderArgs: options.encoderArgs ?? this._activeFilters.length ? ["-af", AudioFilters_1.default.create(this._activeFilters)] : [],
-                        seek: options.seek ? options.seek / 1000 : 0
-                    })
-                        .on("error", (err) => {
-                        return err.message.toLowerCase().includes("premature close") ? null : this.player.emit("error", this, err);
-                    });
+            if (hasCustomDownloader) {
+                stream = (await this.onBeforeCreateStream(track, spotifyResolved ? "youtube" : track.raw.source, this)) || null;
             }
-            else {
-                stream = (0, discord_ytdl_core_1.default)(link, {
-                    ...this.options.ytdlOptions,
-                    // discord-ytdl-core
-                    opusEncoded: false,
-                    fmt: "s16le",
-                    encoderArgs: options.encoderArgs ?? this._activeFilters.length ? ["-af", AudioFilters_1.default.create(this._activeFilters)] : [],
-                    seek: options.seek ? options.seek / 1000 : 0
-                }).on("error", (err) => {
-                    return err.message.toLowerCase().includes("premature close") ? null : this.player.emit("error", this, err);
-                });
+            if (!stream) {
+                stream = (0, ytdl_core_1.default)(url, this.options.ytdlOptions);
             }
         }
         else {
-            const tryArb = (customDownloader && (await this.onBeforeCreateStream(track, track.raw.source || track.raw.engine, this))) || null;
-            const arbitrarySource = tryArb
-                ? tryArb
-                : track.raw.source === "soundcloud"
+            const arbitraryStream = (hasCustomDownloader && (await this.onBeforeCreateStream(track, track.raw.source || track.raw.engine, this))) || null;
+            stream =
+                arbitraryStream || track.raw.source === "soundcloud"
                     ? await track.raw.engine.downloadProgressive()
                     : typeof track.raw.engine === "function"
-                        ? await track.raw.engine()
+                        ? await track.raw.engine
                         : track.raw.engine;
-            stream = discord_ytdl_core_1.default
-                .arbitraryStream(arbitrarySource, {
-                opusEncoded: false,
-                fmt: "s16le",
-                encoderArgs: options.encoderArgs ?? this._activeFilters.length ? ["-af", AudioFilters_1.default.create(this._activeFilters)] : [],
-                seek: options.seek ? options.seek / 1000 : 0
-            })
-                .on("error", (err) => {
-                return err.message.toLowerCase().includes("premature close") ? null : this.player.emit("error", this, err);
-            });
         }
-        const resource = this.connection.createStream(stream, {
+        const ffmpegStream = (0, FFmpegStream_1.createFFmpegStream)(stream, {
+            encoderArgs: options.encoderArgs || this._activeFilters.length ? ["-af", AudioFilters_1.default.create(this._activeFilters)] : [],
+            seek: options.seek ? options.seek / 1000 : 0,
+            fmt: "s16le"
+        }).on("error", (err) => {
+            if (!`${err}`.toLowerCase().includes("premature close"))
+                this.player.emit("error", this, err);
+        });
+        const resource = this.connection.createStream(ffmpegStream, {
             type: voice_1.StreamType.Raw,
             data: track,
             disableVolume: Boolean(this.options.disableVolume)
@@ -697,7 +672,7 @@ class Queue {
         this._filtersUpdate = options.filtersUpdate;
         const volumeTransformer = resource.volume;
         if (volumeTransformer && typeof this.options.initialVolume === "number")
-            Reflect.set(volumeTransformer, "volume", Math.pow(this.options.initialVolume, 1.660964));
+            Reflect.set(volumeTransformer, "volume", Math.pow(this.options.initialVolume / 100, 1.660964));
         if (volumeTransformer?.hasSmoothness && typeof this.options.volumeSmoothness === "number") {
             if (typeof volumeTransformer.setSmoothness === "function")
                 volumeTransformer.setSmoothness(this.options.volumeSmoothness || 0);
@@ -720,9 +695,14 @@ class Queue {
                 this.destroy();
             return void this.player.emit("queueEnd", this);
         }
-        const info = await youtube_sr_1.default.getVideo(track.url)
+        let info = await youtube_sr_1.default.getVideo(track.url)
             .then((x) => x.videos[0])
             .catch(Util_1.Util.noop);
+        // fallback
+        if (!info)
+            info = await youtube_sr_1.default.search(track.author)
+                .then((x) => x[0])
+                .catch(Util_1.Util.noop);
         if (!info) {
             if (this.options.leaveOnEnd)
                 this.destroy();

package/dist/VoiceInterface/StreamDispatcher.js

@@ -106,7 +106,7 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
     /**
      * Creates stream
      * @param {Readable|Duplex|string} src The stream source
-     * @param {object} [ops={}] Options
+     * @param {object} [ops] Options
      * @returns {AudioResource}
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/VoiceInterface/VoiceUtils.js

@@ -19,7 +19,7 @@ class VoiceUtils {
     /**
      * Joins a voice channel, creating basic stream dispatch manager
      * @param {StageChannel|VoiceChannel} channel The voice channel
-     * @param {object} [options={}] Join options
+     * @param {object} [options] Join options
      * @returns {Promise<StreamDispatcher>}
      */
     async connect(channel, options) {
@@ -31,7 +31,7 @@ class VoiceUtils {
     /**
      * Joins a voice channel
      * @param {StageChannel|VoiceChannel} [channel] The voice/stage channel to join
-     * @param {object} [options={}] Join options
+     * @param {object} [options] Join options
      * @returns {VoiceConnection}
      */
     async join(channel, options) {
@@ -43,16 +43,6 @@ class VoiceUtils {
         });
         return conn;
     }
-    async enterReady(conn, options = {}) {
-        try {
-            conn = await (0, voice_1.entersState)(conn, voice_1.VoiceConnectionStatus.Ready, options?.maxTime ?? 20000);
-            return conn;
-        }
-        catch (err) {
-            conn.destroy();
-            throw err;
-        }
-    }
     /**
      * Disconnects voice connection
      * @param {VoiceConnection} connection The voice connection

package/dist/index.d.ts

@@ -4,7 +4,6 @@ import { Readable, Duplex } from 'stream';
 import { TypedEmitter } from 'tiny-typed-emitter';
 import { AudioPlayerError, AudioResource, VoiceConnection, AudioPlayer, StreamType, AudioPlayerStatus } from '@discordjs/voice';
 import { downloadOptions } from 'ytdl-core';
-import * as undici from 'undici';
 
 declare class Playlist {
     readonly player: Player;
@@ -107,7 +106,7 @@ declare class StreamDispatcher extends TypedEmitter<VoiceEvents> {
     /**
      * Creates stream
      * @param {Readable|Duplex|string} src The stream source
-     * @param {object} [ops={}] Options
+     * @param {object} [ops] Options
      * @returns {AudioResource}
      */
     createStream(src: Readable | Duplex | string, ops?: {
@@ -175,7 +174,7 @@ declare class VoiceUtils {
     /**
      * Joins a voice channel, creating basic stream dispatch manager
      * @param {StageChannel|VoiceChannel} channel The voice channel
-     * @param {object} [options={}] Join options
+     * @param {object} [options] Join options
      * @returns {Promise<StreamDispatcher>}
      */
     connect(channel: VoiceChannel | StageChannel, options?: {
@@ -185,16 +184,13 @@ declare class VoiceUtils {
     /**
      * Joins a voice channel
      * @param {StageChannel|VoiceChannel} [channel] The voice/stage channel to join
-     * @param {object} [options={}] Join options
+     * @param {object} [options] Join options
      * @returns {VoiceConnection}
      */
     join(channel: VoiceChannel | StageChannel, options?: {
         deaf?: boolean;
         maxTime?: number;
     }): Promise<VoiceConnection>;
-    enterReady(conn: VoiceConnection, options?: {
-        maxTime?: number;
-    }): Promise<VoiceConnection>;
     /**
      * Disconnects voice connection
      * @param {VoiceConnection} connection The voice connection
@@ -247,7 +243,7 @@ declare class Player extends TypedEmitter<PlayerEvents> {
     /**
      * Creates new Discord Player
      * @param {Client} client The Discord Client
-     * @param {PlayerInitOptions} [options={}] The player init options
+     * @param {PlayerInitOptions} [options] The player init options
      */
     constructor(client: Client, options?: PlayerInitOptions);
     /**
@@ -318,6 +314,11 @@ declare class Player extends TypedEmitter<PlayerEvents> {
      */
     resolveQueue<T>(queueLike: GuildResolvable | Queue): Queue<T>;
     [Symbol.iterator](): Generator<Queue<unknown>, void, undefined>;
+    /**
+     * Creates `Playlist` instance
+     * @param data The data to initialize a playlist
+     */
+    createPlaylist(data: PlaylistInitData): Playlist;
 }
 
 declare class Queue<T = unknown> {
@@ -341,7 +342,7 @@ declare class Queue<T = unknown> {
      * Queue constructor
      * @param {Player} player The player that instantiated this queue
      * @param {Guild} guild The guild that instantiated this queue
-     * @param {PlayerOptions} [options={}] Player options for the queue
+     * @param {PlayerOptions} [options] Player options for the queue
      */
     constructor(player: Player, guild: Guild, options?: PlayerOptions);
     /**
@@ -523,7 +524,7 @@ declare class Queue<T = unknown> {
     /**
      * Play stream in a voice/stage channel
      * @param {Track} [src] The track to play (if empty, uses first track from the queue)
-     * @param {PlayOptions} [options={}] The options
+     * @param {PlayOptions} [options] The options
      * @returns {Promise<void>}
      */
     play(src?: Track, options?: PlayOptions): Promise<void>;
@@ -671,12 +672,12 @@ interface PlayerProgressbarOptions {
  * @property {boolean} [leaveOnEmpty=true] If it should leave on empty
  * @property {number} [leaveOnEmptyCooldown=1000] The cooldown in ms
  * @property {boolean} [autoSelfDeaf=true] If it should set the bot in deaf mode
- * @property {YTDLDownloadOptions} [ytdlOptions={}] The youtube download options
+ * @property {YTDLDownloadOptions} [ytdlOptions] The youtube download options
  * @property {number} [initialVolume=100] The initial player volume
  * @property {number} [bufferingTimeout=3000] Buffering timeout for the stream
  * @property {boolean} [spotifyBridge=true] If player should bridge spotify source to youtube
  * @property {boolean} [disableVolume=false] If player should disable inline volume
- * @property {boolean} [volumeSmoothness=0] The volume transition smoothness between volume changes (lower the value to get better result)
+ * @property {number} [volumeSmoothness=0] The volume transition smoothness between volume changes (lower the value to get better result)
  * Setting this or leaving this empty will disable this effect. Example: `volumeSmoothness: 0.1`
  * @property {Function} [onBeforeCreateStream] Runs before creating stream
  */
@@ -992,7 +993,7 @@ interface PlaylistJSON {
 /**
  * @typedef {object} PlayerInitOptions
  * @property {boolean} [autoRegisterExtractor=true] If it should automatically register `@discord-player/extractor`
- * @property {YTDLDownloadOptions} [ytdlOptions={}] The options passed to `ytdl-core`
+ * @property {YTDLDownloadOptions} [ytdlOptions] The options passed to `ytdl-core`
  * @property {number} [connectionTimeout=20000] The voice connection timeout
  */
 interface PlayerInitOptions {
@@ -1001,91 +1002,39 @@ interface PlayerInitOptions {
     connectionTimeout?: number;
 }
 
-/**
- * The available audio filters
- * @typedef {object} AudioFilters
- * @property {string} bassboost_low The bassboost filter (+15dB)
- * @property {string} bassboost The bassboost filter (+20dB)
- * @property {string} bassboost_high The bassboost filter (+30dB)
- * @property {string} 8D The 8D filter
- * @property {string} vaporwave The vaporwave filter
- * @property {string} nightcore The nightcore filter
- * @property {string} phaser The phaser filter
- * @property {string} tremolo The tremolo filter
- * @property {string} vibrato The vibrato filter
- * @property {string} reverse The reverse filter
- * @property {string} treble The treble filter
- * @property {string} normalizer The normalizer filter (dynamic audio normalizer based)
- * @property {string} normalizer2 The normalizer filter (audio compressor based)
- * @property {string} surrounding The surrounding filter
- * @property {string} pulsator The pulsator filter
- * @property {string} subboost The subboost filter
- * @property {string} karaoke The kakaoke filter
- * @property {string} flanger The flanger filter
- * @property {string} gate The gate filter
- * @property {string} haas The haas filter
- * @property {string} mcompand The mcompand filter
- * @property {string} mono The mono filter
- * @property {string} mstlr The mstlr filter
- * @property {string} mstrr The mstrr filter
- * @property {string} compressor The compressor filter
- * @property {string} expander The expander filter
- * @property {string} softlimiter The softlimiter filter
- * @property {string} chorus The chorus filter
- * @property {string} chorus2d The chorus2d filter
- * @property {string} chorus3d The chorus3d filter
- * @property {string} fadein The fadein filter
- * @property {string} dim The dim filter
- * @property {string} earrape The earrape filter
- */
-declare const FilterList: {
-    bassboost_low: string;
-    bassboost: string;
-    bassboost_high: string;
-    "8D": string;
-    vaporwave: string;
-    nightcore: string;
-    phaser: string;
-    tremolo: string;
-    vibrato: string;
-    reverse: string;
-    treble: string;
-    normalizer: string;
-    normalizer2: string;
-    surrounding: string;
-    pulsator: string;
-    subboost: string;
-    karaoke: string;
-    flanger: string;
-    gate: string;
-    haas: string;
-    mcompand: string;
-    mono: string;
-    mstlr: string;
-    mstrr: string;
-    compressor: string;
-    expander: string;
-    softlimiter: string;
-    chorus: string;
-    chorus2d: string;
-    chorus3d: string;
-    fadein: string;
-    dim: string;
-    earrape: string;
-    [Symbol.iterator](): IterableIterator<{
+declare class AudioFilters {
+    constructor();
+    static get filters(): Record<FiltersName, string>;
+    static get<K extends FiltersName>(name: K): Record<keyof QueueFilters, string>[K];
+    static has<K extends FiltersName>(name: K): boolean;
+    static [Symbol.iterator](): IterableIterator<{
         name: FiltersName;
         value: string;
     }>;
-    readonly names: (keyof QueueFilters)[];
-    readonly length: number;
-    toString(): string;
-    create(filter?: FiltersName[]): string;
-    define(filterName: string, value: string): void;
-    defineBulk(filterArray: {
+    static get names(): (keyof QueueFilters)[];
+    static get length(): number;
+    static toString(): string;
+    /**
+     * Create ffmpeg args from the specified filters name
+     * @param filter The filter name
+     * @returns
+     */
+    static create(filters?: FiltersName[]): string;
+    /**
+     * Defines audio filter
+     * @param filterName The name of the filter
+     * @param value The ffmpeg args
+     */
+    static define(filterName: string, value: string): void;
+    /**
+     * Defines multiple audio filters
+     * @param filtersArray Array of filters containing the filter name and ffmpeg args
+     */
+    static defineBulk(filtersArray: {
         name: string;
         value: string;
     }[]): void;
-};
+}
 
 declare enum ErrorStatusCode {
     STREAM_ERROR = "StreamError",
@@ -1186,9 +1135,24 @@ declare class Util {
      */
     static wait(time: number): Promise<unknown>;
     static noop(): void;
-    static getFetch(): Promise<typeof fetch | typeof undici.default>;
+    static getFetch(): Promise<any>;
 }
 
+interface FFmpegStreamOptions {
+    fmt?: string;
+    encoderArgs?: string[];
+    seek?: number;
+    skip?: boolean;
+}
+declare function FFMPEG_ARGS_STRING(stream: string, fmt?: string): string[];
+declare function FFMPEG_ARGS_PIPED(fmt?: string): string[];
+/**
+ * Creates FFmpeg stream
+ * @param stream The source stream
+ * @param options FFmpeg stream options
+ */
+declare function createFFmpegStream(stream: Readable | Duplex | string, options?: FFmpegStreamOptions): Readable | Duplex;
+
 declare const version: string;
 
-export { FilterList as AudioFilters, ErrorStatusCode, ExtractorModel, ExtractorModelData, FiltersName, PlayOptions, Player, PlayerError, PlayerEvents, PlayerInitOptions, PlayerOptions, PlayerProgressbarOptions, PlayerSearchResult, Playlist, PlaylistInitData, PlaylistJSON, QueryResolver, QueryType, Queue, QueueFilters, QueueRepeatMode, RawTrackData, SearchOptions, StreamDispatcher, TimeData, Track, TrackJSON, TrackSource, Util, VoiceEvents, VoiceUtils, version };
+export { AudioFilters, ErrorStatusCode, ExtractorModel, ExtractorModelData, FFMPEG_ARGS_PIPED, FFMPEG_ARGS_STRING, FFmpegStreamOptions, FiltersName, PlayOptions, Player, PlayerError, PlayerEvents, PlayerInitOptions, PlayerOptions, PlayerProgressbarOptions, PlayerSearchResult, Playlist, PlaylistInitData, PlaylistJSON, QueryResolver, QueryType, Queue, QueueFilters, QueueRepeatMode, RawTrackData, SearchOptions, StreamDispatcher, TimeData, Track, TrackJSON, TrackSource, Util, VoiceEvents, VoiceUtils, createFFmpegStream, version };

package/dist/index.js

@@ -28,5 +28,6 @@ Object.defineProperty(exports, "StreamDispatcher", { enumerable: true, get: func
 var Util_1 = require("./utils/Util");
 Object.defineProperty(exports, "Util", { enumerable: true, get: function () { return Util_1.Util; } });
 tslib_1.__exportStar(require("./types/types"), exports);
+tslib_1.__exportStar(require("./utils/FFmpegStream"), exports);
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 exports.version = require(`${__dirname}/../package.json`).version;

package/dist/index.mjs

@@ -4,6 +4,8 @@ export default mod;
 export const AudioFilters = mod.AudioFilters;
 export const ErrorStatusCode = mod.ErrorStatusCode;
 export const ExtractorModel = mod.ExtractorModel;
+export const FFMPEG_ARGS_PIPED = mod.FFMPEG_ARGS_PIPED;
+export const FFMPEG_ARGS_STRING = mod.FFMPEG_ARGS_STRING;
 export const Player = mod.Player;
 export const PlayerError = mod.PlayerError;
 export const Playlist = mod.Playlist;
@@ -15,4 +17,5 @@ export const StreamDispatcher = mod.StreamDispatcher;
 export const Track = mod.Track;
 export const Util = mod.Util;
 export const VoiceUtils = mod.VoiceUtils;
+export const createFFmpegStream = mod.createFFmpegStream;
 export const version = mod.version;

package/dist/utils/AudioFilters.js

@@ -2,108 +2,97 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AudioFilters = void 0;
 const bass = (g) => `bass=g=${g}:f=110:w=0.3`;
-/**
- * The available audio filters
- * @typedef {object} AudioFilters
- * @property {string} bassboost_low The bassboost filter (+15dB)
- * @property {string} bassboost The bassboost filter (+20dB)
- * @property {string} bassboost_high The bassboost filter (+30dB)
- * @property {string} 8D The 8D filter
- * @property {string} vaporwave The vaporwave filter
- * @property {string} nightcore The nightcore filter
- * @property {string} phaser The phaser filter
- * @property {string} tremolo The tremolo filter
- * @property {string} vibrato The vibrato filter
- * @property {string} reverse The reverse filter
- * @property {string} treble The treble filter
- * @property {string} normalizer The normalizer filter (dynamic audio normalizer based)
- * @property {string} normalizer2 The normalizer filter (audio compressor based)
- * @property {string} surrounding The surrounding filter
- * @property {string} pulsator The pulsator filter
- * @property {string} subboost The subboost filter
- * @property {string} karaoke The kakaoke filter
- * @property {string} flanger The flanger filter
- * @property {string} gate The gate filter
- * @property {string} haas The haas filter
- * @property {string} mcompand The mcompand filter
- * @property {string} mono The mono filter
- * @property {string} mstlr The mstlr filter
- * @property {string} mstrr The mstrr filter
- * @property {string} compressor The compressor filter
- * @property {string} expander The expander filter
- * @property {string} softlimiter The softlimiter filter
- * @property {string} chorus The chorus filter
- * @property {string} chorus2d The chorus2d filter
- * @property {string} chorus3d The chorus3d filter
- * @property {string} fadein The fadein filter
- * @property {string} dim The dim filter
- * @property {string} earrape The earrape filter
- */
-const FilterList = {
-    bassboost_low: bass(15),
-    bassboost: bass(20),
-    bassboost_high: bass(30),
-    "8D": "apulsator=hz=0.09",
-    vaporwave: "aresample=48000,asetrate=48000*0.8",
-    nightcore: "aresample=48000,asetrate=48000*1.25",
-    phaser: "aphaser=in_gain=0.4",
-    tremolo: "tremolo",
-    vibrato: "vibrato=f=6.5",
-    reverse: "areverse",
-    treble: "treble=g=5",
-    normalizer: "dynaudnorm=g=101",
-    normalizer2: "acompressor",
-    surrounding: "surround",
-    pulsator: "apulsator=hz=1",
-    subboost: "asubboost",
-    karaoke: "stereotools=mlev=0.03",
-    flanger: "flanger",
-    gate: "agate",
-    haas: "haas",
-    mcompand: "mcompand",
-    mono: "pan=mono|c0=.5*c0+.5*c1",
-    mstlr: "stereotools=mode=ms>lr",
-    mstrr: "stereotools=mode=ms>rr",
-    compressor: "compand=points=-80/-105|-62/-80|-15.4/-15.4|0/-12|20/-7.6",
-    expander: "compand=attacks=0:points=-80/-169|-54/-80|-49.5/-64.6|-41.1/-41.1|-25.8/-15|-10.8/-4.5|0/0|20/8.3",
-    softlimiter: "compand=attacks=0:points=-80/-80|-12.4/-12.4|-6/-8|0/-6.8|20/-2.8",
-    chorus: "chorus=0.7:0.9:55:0.4:0.25:2",
-    chorus2d: "chorus=0.6:0.9:50|60:0.4|0.32:0.25|0.4:2|1.3",
-    chorus3d: "chorus=0.5:0.9:50|60|40:0.4|0.32|0.3:0.25|0.4|0.3:2|2.3|1.3",
-    fadein: "afade=t=in:ss=0:d=10",
-    dim: `afftfilt="'real=re * (1-clip((b/nb)*b,0,1))':imag='im * (1-clip((b/nb)*b,0,1))'"`,
-    earrape: "channelsplit,sidechaingate=level_in=64",
-    *[Symbol.iterator]() {
+class AudioFilters {
+    constructor() {
+        return AudioFilters;
+    }
+    static get filters() {
+        return {
+            bassboost_low: bass(15),
+            bassboost: bass(20),
+            bassboost_high: bass(30),
+            "8D": "apulsator=hz=0.09",
+            vaporwave: "aresample=48000,asetrate=48000*0.8",
+            nightcore: "aresample=48000,asetrate=48000*1.25",
+            phaser: "aphaser=in_gain=0.4",
+            tremolo: "tremolo",
+            vibrato: "vibrato=f=6.5",
+            reverse: "areverse",
+            treble: "treble=g=5",
+            normalizer2: "dynaudnorm=g=101",
+            normalizer: "acompressor",
+            surrounding: "surround",
+            pulsator: "apulsator=hz=1",
+            subboost: "asubboost",
+            karaoke: "stereotools=mlev=0.03",
+            flanger: "flanger",
+            gate: "agate",
+            haas: "haas",
+            mcompand: "mcompand",
+            mono: "pan=mono|c0=.5*c0+.5*c1",
+            mstlr: "stereotools=mode=ms>lr",
+            mstrr: "stereotools=mode=ms>rr",
+            compressor: "compand=points=-80/-105|-62/-80|-15.4/-15.4|0/-12|20/-7.6",
+            expander: "compand=attacks=0:points=-80/-169|-54/-80|-49.5/-64.6|-41.1/-41.1|-25.8/-15|-10.8/-4.5|0/0|20/8.3",
+            softlimiter: "compand=attacks=0:points=-80/-80|-12.4/-12.4|-6/-8|0/-6.8|20/-2.8",
+            chorus: "chorus=0.7:0.9:55:0.4:0.25:2",
+            chorus2d: "chorus=0.6:0.9:50|60:0.4|0.32:0.25|0.4:2|1.3",
+            chorus3d: "chorus=0.5:0.9:50|60|40:0.4|0.32|0.3:0.25|0.4|0.3:2|2.3|1.3",
+            fadein: "afade=t=in:ss=0:d=10",
+            dim: `afftfilt="'real=re * (1-clip((b/nb)*b,0,1))':imag='im * (1-clip((b/nb)*b,0,1))'"`,
+            earrape: "channelsplit,sidechaingate=level_in=64"
+        };
+    }
+    static get(name) {
+        return this.filters[name];
+    }
+    static has(name) {
+        return name in this.filters;
+    }
+    static *[Symbol.iterator]() {
         for (const [k, v] of Object.entries(this)) {
-            if (typeof this[k] === "string")
+            if (typeof this.filters[k] === "string")
                 yield { name: k, value: v };
         }
-    },
-    get names() {
-        return Object.keys(this).filter((p) => !["names", "length"].includes(p) && typeof this[p] !== "function");
-    },
-    get length() {
-        return Object.keys(this).filter((p) => !["names", "length"].includes(p) && typeof this[p] !== "function").length;
-    },
-    toString() {
+    }
+    static get names() {
+        return Object.keys(this).filter((p) => !["names", "length"].includes(p) && typeof this.filters[p] !== "function");
+    }
+    // @ts-expect-error AudioFilters.length
+    static get length() {
+        return Object.keys(this).filter((p) => !["names", "length"].includes(p) && typeof this.filters[p] !== "function").length;
+    }
+    static toString() {
         return this.names.map((m) => this[m]).join(","); // eslint-disable-line @typescript-eslint/no-explicit-any
-    },
-    create(filter) {
-        if (!filter || !Array.isArray(filter))
+    }
+    /**
+     * Create ffmpeg args from the specified filters name
+     * @param filter The filter name
+     * @returns
+     */
+    static create(filters) {
+        if (!filters || !Array.isArray(filters))
             return this.toString();
-        return filter
+        return filters
             .filter((predicate) => typeof predicate === "string")
-            .map((m) => this[m])
+            .map((m) => this.get(m))
             .join(",");
-    },
-    define(filterName, value) {
-        if (typeof this[filterName] && typeof this[filterName] === "function")
-            return;
-        this[filterName] = value;
-    },
-    defineBulk(filterArray) {
-        filterArray.forEach((arr) => this.define(arr.name, arr.value));
     }
-};
-exports.AudioFilters = FilterList;
-exports.default = FilterList;
+    /**
+     * Defines audio filter
+     * @param filterName The name of the filter
+     * @param value The ffmpeg args
+     */
+    static define(filterName, value) {
+        this.filters[filterName] = value;
+    }
+    /**
+     * Defines multiple audio filters
+     * @param filtersArray Array of filters containing the filter name and ffmpeg args
+     */
+    static defineBulk(filtersArray) {
+        filtersArray.forEach((arr) => this.define(arr.name, arr.value));
+    }
+}
+exports.AudioFilters = AudioFilters;
+exports.default = AudioFilters;

package/dist/utils/FFmpegStream.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFFmpegStream = exports.FFMPEG_ARGS_PIPED = exports.FFMPEG_ARGS_STRING = void 0;
+const prism_media_1 = require("prism-media");
+function FFMPEG_ARGS_STRING(stream, fmt) {
+    // prettier-ignore
+    return [
+        "-reconnect", "1",
+        "-reconnect_streamed", "1",
+        "-reconnect_delay_max", "5",
+        "-i", stream,
+        "-analyzeduration", "0",
+        "-loglevel", "0",
+        "-f", `${typeof fmt === "string" ? fmt : "s16le"}`,
+        "-ar", "48000",
+        "-ac", "2"
+    ];
+}
+exports.FFMPEG_ARGS_STRING = FFMPEG_ARGS_STRING;
+function FFMPEG_ARGS_PIPED(fmt) {
+    // prettier-ignore
+    return [
+        "-analyzeduration", "0",
+        "-loglevel", "0",
+        "-f", `${typeof fmt === "string" ? fmt : "s16le"}`,
+        "-ar", "48000",
+        "-ac", "2"
+    ];
+}
+exports.FFMPEG_ARGS_PIPED = FFMPEG_ARGS_PIPED;
+/**
+ * Creates FFmpeg stream
+ * @param stream The source stream
+ * @param options FFmpeg stream options
+ */
+function createFFmpegStream(stream, options) {
+    if (options.skip && typeof stream !== "string")
+        return stream;
+    options ?? (options = {});
+    const args = typeof stream === "string" ? FFMPEG_ARGS_STRING(stream, options.fmt) : FFMPEG_ARGS_PIPED(options.fmt);
+    if (!Number.isNaN(options.seek))
+        args.unshift("-ss", String(options.seek));
+    if (Array.isArray(options.encoderArgs))
+        args.push(...options.encoderArgs);
+    const transcoder = new prism_media_1.FFmpeg({ shell: false, args });
+    transcoder.on("close", () => transcoder.destroy());
+    if (typeof stream !== "string") {
+        stream.on("error", () => transcoder.destroy());
+        stream.pipe(transcoder);
+    }
+    return transcoder;
+}
+exports.createFFmpegStream = createFFmpegStream;

package/dist/utils/Util.js

@@ -112,11 +112,21 @@ class Util {
     static async getFetch() {
         if ("fetch" in globalThis)
             return globalThis.fetch;
-        try {
-            return await Promise.resolve().then(() => __importStar(require("undici"))).then((res) => res.default);
-        }
-        catch {
-            // uh?
+        for (const lib of ["undici", "node-fetch"]) {
+            try {
+                return await Promise.resolve().then(() => __importStar(require(lib))).then((res) => res.fetch || res.default?.fetch || res.default);
+            }
+            catch {
+                try {
+                    // eslint-disable-next-line
+                    const res = require(lib);
+                    if (res)
+                        return res.fetch || res.default?.fetch || res.default;
+                }
+                catch {
+                    // no?
+                }
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-player",
-  "version": "5.3.0-dev.0",
+  "version": "5.3.0-dev.3",
   "description": "Complete framework to facilitate music commands using discord.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -66,7 +66,6 @@
   "homepage": "https://discord-player.js.org",
   "dependencies": {
     "@discordjs/voice": "^0.11.0",
-    "discord-ytdl-core": "^5.0.4",
     "libsodium-wrappers": "^0.7.10",
     "soundcloud-scraper": "^5.0.3",
     "spotify-url-info": "^3.1.2",