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

package/dist/Structures/Track.js

@@ -10,7 +10,7 @@ class Track {
      */
     constructor(player, data) {
         this.raw = {};
-        this.id = discord_js_1.SnowflakeUtil.generate();
+        this.id = discord_js_1.SnowflakeUtil.generate().toString();
         /**
          * The player that instantiated this Track
          * @name Track#player
@@ -82,17 +82,16 @@ class Track {
         void this._patch(data);
     }
     _patch(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        this.title = discord_js_1.Util.escapeMarkdown((_a = data.title) !== null && _a !== void 0 ? _a : "");
-        this.author = (_b = data.author) !== null && _b !== void 0 ? _b : "";
-        this.url = (_c = data.url) !== null && _c !== void 0 ? _c : "";
-        this.thumbnail = (_d = data.thumbnail) !== null && _d !== void 0 ? _d : "";
-        this.duration = (_e = data.duration) !== null && _e !== void 0 ? _e : "";
-        this.views = (_f = data.views) !== null && _f !== void 0 ? _f : 0;
+        this.title = (0, discord_js_1.escapeMarkdown)(data.title ?? "");
+        this.author = data.author ?? "";
+        this.url = data.url ?? "";
+        this.thumbnail = data.thumbnail ?? "";
+        this.duration = data.duration ?? "";
+        this.views = data.views ?? 0;
         this.requestedBy = data.requestedBy;
         this.playlist = data.playlist;
         // raw
-        Object.defineProperty(this, "raw", { value: Object.assign({}, { source: (_h = (_g = data.raw) === null || _g === void 0 ? void 0 : _g.source) !== null && _h !== void 0 ? _h : data.source }, (_j = data.raw) !== null && _j !== void 0 ? _j : data), enumerable: false });
+        Object.defineProperty(this, "raw", { value: Object.assign({}, { source: data.raw?.source ?? data.source }, data.raw ?? data), enumerable: false });
     }
     /**
      * The queue in which this track is located
@@ -123,8 +122,7 @@ class Track {
      * @type {TrackSource}
      */
     get source() {
-        var _a;
-        return (_a = this.raw.source) !== null && _a !== void 0 ? _a : "arbitrary";
+        return this.raw.source ?? "arbitrary";
     }
     /**
      * String representation of this track
@@ -138,7 +136,6 @@ class Track {
      * @returns {TrackJSON}
      */
     toJSON(hidePlaylist) {
-        var _a, _b, _c;
         return {
             id: this.id,
             title: this.title,
@@ -149,8 +146,8 @@ class Track {
             duration: this.duration,
             durationMS: this.durationMS,
             views: this.views,
-            requestedBy: (_a = this.requestedBy) === null || _a === void 0 ? void 0 : _a.id,
-            playlist: hidePlaylist ? null : (_c = (_b = this.playlist) === null || _b === void 0 ? void 0 : _b.toJSON()) !== null && _c !== void 0 ? _c : null
+            requestedBy: this.requestedBy?.id,
+            playlist: hidePlaylist ? null : this.playlist?.toJSON() ?? null
         };
     }
 }

package/dist/VoiceInterface/StreamDispatcher.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StreamDispatcher = void 0;
-const tslib_1 = require("tslib");
 const voice_1 = require("@discordjs/voice");
 const tiny_typed_emitter_1 = require("tiny-typed-emitter");
 const Util_1 = require("../utils/Util");
@@ -37,14 +36,13 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
          * @type {boolean}
          */
         this.paused = false;
-        // @ts-expect-error ???
-        this.voiceConnection.on("stateChange", (_, newState) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        this.voiceConnection.on("stateChange", async (_, newState) => {
             if (newState.status === voice_1.VoiceConnectionStatus.Disconnected) {
                 if (newState.reason === voice_1.VoiceConnectionDisconnectReason.WebSocketClose && newState.closeCode === 4014) {
                     try {
-                        yield (0, voice_1.entersState)(this.voiceConnection, voice_1.VoiceConnectionStatus.Connecting, this.connectionTimeout);
+                        await (0, voice_1.entersState)(this.voiceConnection, voice_1.VoiceConnectionStatus.Connecting, this.connectionTimeout);
                     }
-                    catch (_a) {
+                    catch {
                         try {
                             this.voiceConnection.destroy();
                         }
@@ -54,7 +52,7 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
                     }
                 }
                 else if (this.voiceConnection.rejoinAttempts < 5) {
-                    yield Util_1.Util.wait((this.voiceConnection.rejoinAttempts + 1) * 5000);
+                    await Util_1.Util.wait((this.voiceConnection.rejoinAttempts + 1) * 5000);
                     this.voiceConnection.rejoin();
                 }
                 else {
@@ -72,9 +70,9 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
             else if (!this.readyLock && (newState.status === voice_1.VoiceConnectionStatus.Connecting || newState.status === voice_1.VoiceConnectionStatus.Signalling)) {
                 this.readyLock = true;
                 try {
-                    yield (0, voice_1.entersState)(this.voiceConnection, voice_1.VoiceConnectionStatus.Ready, this.connectionTimeout);
+                    await (0, voice_1.entersState)(this.voiceConnection, voice_1.VoiceConnectionStatus.Ready, this.connectionTimeout);
                 }
-                catch (_b) {
+                catch {
                     if (this.voiceConnection.state.status !== voice_1.VoiceConnectionStatus.Destroyed) {
                         try {
                             this.voiceConnection.destroy();
@@ -88,8 +86,7 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
                     this.readyLock = false;
                 }
             }
-        }));
-        // @ts-expect-error ???
+        });
         this.audioPlayer.on("stateChange", (oldState, newState) => {
             if (newState.status === voice_1.AudioPlayerStatus.Playing) {
                 if (!this.paused)
@@ -114,12 +111,11 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     createStream(src, ops) {
-        var _a;
         this.audioResource = (0, voice_1.createAudioResource)(src, {
-            inputType: (_a = ops === null || ops === void 0 ? void 0 : ops.type) !== null && _a !== void 0 ? _a : voice_1.StreamType.Arbitrary,
-            metadata: ops === null || ops === void 0 ? void 0 : ops.data,
+            inputType: ops?.type ?? voice_1.StreamType.Arbitrary,
+            metadata: ops?.data,
             // eslint-disable-next-line no-extra-boolean-cast
-            inlineVolume: !Boolean(ops === null || ops === void 0 ? void 0 : ops.disableVolume)
+            inlineVolume: !Boolean(ops?.disableVolume)
         });
         return this.audioResource;
     }
@@ -139,7 +135,7 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
             this.audioPlayer.stop(true);
             this.voiceConnection.destroy();
         }
-        catch (_a) { } // eslint-disable-line no-empty
+        catch { } // eslint-disable-line no-empty
     }
     /**
      * Stops the player
@@ -172,30 +168,28 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
      * @param {AudioResource<Track>} [resource=this.audioResource] The audio resource to play
      * @returns {Promise<StreamDispatcher>}
      */
-    playStream(resource = this.audioResource) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!resource)
-                throw new PlayerError_1.PlayerError("Audio resource is not available!", PlayerError_1.ErrorStatusCode.NO_AUDIO_RESOURCE);
-            if (resource.ended)
-                return void this.emit("error", new PlayerError_1.PlayerError("Cannot play a resource that has already ended."));
-            if (!this.audioResource)
-                this.audioResource = resource;
-            if (this.voiceConnection.state.status !== voice_1.VoiceConnectionStatus.Ready) {
-                try {
-                    yield (0, voice_1.entersState)(this.voiceConnection, voice_1.VoiceConnectionStatus.Ready, this.connectionTimeout);
-                }
-                catch (err) {
-                    return void this.emit("error", err);
-                }
-            }
+    async playStream(resource = this.audioResource) {
+        if (!resource)
+            throw new PlayerError_1.PlayerError("Audio resource is not available!", PlayerError_1.ErrorStatusCode.NO_AUDIO_RESOURCE);
+        if (resource.ended)
+            return void this.emit("error", new PlayerError_1.PlayerError("Cannot play a resource that has already ended."));
+        if (!this.audioResource)
+            this.audioResource = resource;
+        if (this.voiceConnection.state.status !== voice_1.VoiceConnectionStatus.Ready) {
             try {
-                this.audioPlayer.play(resource);
+                await (0, voice_1.entersState)(this.voiceConnection, voice_1.VoiceConnectionStatus.Ready, this.connectionTimeout);
             }
-            catch (e) {
-                this.emit("error", e);
+            catch (err) {
+                return void this.emit("error", err);
             }
-            return this;
-        });
+        }
+        try {
+            this.audioPlayer.play(resource);
+        }
+        catch (e) {
+            this.emit("error", e);
+        }
+        return this;
     }
     /**
      * Sets playback volume
@@ -203,8 +197,7 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
      * @returns {boolean}
      */
     setVolume(value) {
-        var _a;
-        if (!((_a = this.audioResource) === null || _a === void 0 ? void 0 : _a.volume) || isNaN(value) || value < 0 || value > Infinity)
+        if (!this.audioResource?.volume || isNaN(value) || value < 0 || value > Infinity)
             return false;
         this.audioResource.volume.setVolumeLogarithmic(value / 100);
         return true;
@@ -214,8 +207,7 @@ class StreamDispatcher extends tiny_typed_emitter_1.TypedEmitter {
      * @type {number}
      */
     get volume() {
-        var _a;
-        if (!((_a = this.audioResource) === null || _a === void 0 ? void 0 : _a.volume))
+        if (!this.audioResource?.volume)
             return 100;
         const currentVol = this.audioResource.volume.volume;
         return Math.round(Math.pow(currentVol, 1 / 1.660964) * 100);

package/dist/VoiceInterface/VoiceUtils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoiceUtils = void 0;
-const tslib_1 = require("tslib");
 const discord_js_1 = require("discord.js");
 const voice_1 = require("@discordjs/voice");
 const StreamDispatcher_1 = require("./StreamDispatcher");
@@ -23,13 +22,11 @@ class VoiceUtils {
      * @param {object} [options={}] Join options
      * @returns {Promise<StreamDispatcher>}
      */
-    connect(channel, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const conn = yield this.join(channel, options);
-            const sub = new StreamDispatcher_1.StreamDispatcher(conn, channel, options.maxTime);
-            this.cache.set(channel.guild.id, sub);
-            return sub;
-        });
+    async connect(channel, options) {
+        const conn = await this.join(channel, options);
+        const sub = new StreamDispatcher_1.StreamDispatcher(conn, channel, options.maxTime);
+        this.cache.set(channel.guild.id, sub);
+        return sub;
     }
     /**
      * Joins a voice channel
@@ -37,29 +34,24 @@ class VoiceUtils {
      * @param {object} [options={}] Join options
      * @returns {VoiceConnection}
      */
-    join(channel, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const conn = (0, voice_1.joinVoiceChannel)({
-                guildId: channel.guild.id,
-                channelId: channel.id,
-                adapterCreator: channel.guild.voiceAdapterCreator,
-                selfDeaf: Boolean(options.deaf)
-            });
-            return conn;
+    async join(channel, options) {
+        const conn = (0, voice_1.joinVoiceChannel)({
+            guildId: channel.guild.id,
+            channelId: channel.id,
+            adapterCreator: channel.guild.voiceAdapterCreator,
+            selfDeaf: Boolean(options.deaf)
         });
+        return conn;
     }
-    enterReady(conn, options = {}) {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                conn = yield (0, voice_1.entersState)(conn, voice_1.VoiceConnectionStatus.Ready, (_a = options === null || options === void 0 ? void 0 : options.maxTime) !== null && _a !== void 0 ? _a : 20000);
-                return conn;
-            }
-            catch (err) {
-                conn.destroy();
-                throw err;
-            }
-        });
+    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

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
-import { User, Snowflake, VoiceChannel, StageChannel, Collection, Client, GuildResolvable, Guild, GuildChannelResolvable, UserResolvable } from 'discord.js';
+import { User, VoiceChannel, StageChannel, Collection, Snowflake, Client, GuildResolvable, Guild, GuildChannelResolvable, UserResolvable } from 'discord.js';
 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;
@@ -47,7 +48,7 @@ declare class Track {
     requestedBy: User;
     playlist?: Playlist;
     readonly raw: RawTrackData;
-    readonly id: Snowflake;
+    readonly id: string;
     /**
      * Track constructor
      * @param {Player} player The player that instantiated this Track
@@ -330,7 +331,7 @@ declare class Queue<T = unknown> {
     playing: boolean;
     metadata?: T;
     repeatMode: QueueRepeatMode;
-    readonly id: Snowflake;
+    readonly id: string;
     private _streamTime;
     _cooldownsTimeout: Collection<string, NodeJS.Timeout>;
     private _activeFilters;
@@ -465,16 +466,16 @@ declare class Queue<T = unknown> {
     shuffle(): boolean;
     /**
      * Removes a track from the queue
-     * @param {Track|Snowflake|number} track The track to remove
+     * @param {Track|string|number} track The track to remove
      * @returns {Track}
      */
-    remove(track: Track | Snowflake | number): Track;
+    remove(track: Track | string | number): Track;
     /**
      * Returns the index of the specified track. If found, returns the track index else returns -1.
-     * @param {number|Track|Snowflake} track The track
+     * @param {number|Track|string} track The track
      * @returns {number}
      */
-    getTrackPosition(track: number | Track | Snowflake): number;
+    getTrackPosition(track: number | Track | string): number;
     /**
      * Jumps to particular track
      * @param {Track|number} track The track
@@ -661,6 +662,7 @@ interface PlayerProgressbarOptions {
     length?: number;
     line?: string;
     indicator?: string;
+    queue?: boolean;
 }
 /**
  * @typedef {object} PlayerOptions
@@ -1184,6 +1186,7 @@ declare class Util {
      */
     static wait(time: number): Promise<unknown>;
     static noop(): void;
+    static getFetch(): Promise<typeof fetch | typeof undici.default>;
 }
 
 declare const version: string;

package/dist/smoothVolume.js

@@ -8,6 +8,6 @@ try {
         Reflect.set(mod, "VolumeTransformer", VolumeTransformer_1.VolumeTransformer);
     }
 }
-catch (_a) {
+catch {
     /* do nothing */
 }

package/dist/utils/Util.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Util = void 0;
 class Util {
@@ -73,7 +96,7 @@ class Util {
         try {
             return require(id);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -86,5 +109,15 @@ class Util {
         return new Promise((r) => setTimeout(r, time).unref());
     }
     static noop() { } // eslint-disable-line @typescript-eslint/no-empty-function
+    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?
+        }
+    }
 }
 exports.Util = Util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-player",
-  "version": "5.2.3-dev",
+  "version": "5.3.0-dev.0",
   "description": "Complete framework to facilitate music commands using discord.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,9 +23,9 @@
     "build:check": "tsc --noEmit --incremental false",
     "prepublishOnly": "rollup-type-bundler -e stream",
     "build:esm": "gen-esm-wrapper ./dist/index.js ./dist/index.mjs",
-    "format": "prettier --write \"src/**/*.ts\" \"example/**/*.ts\"",
-    "docs": "docgen --jsdoc jsdoc.json --source src/*.ts src/**/*.ts --custom docs/index.yml --output docs/docs.json",
-    "docs:test": "docgen --jsdoc jsdoc.json --source src/*.ts src/**/*.ts --custom docs/index.yml",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "docs": "typedoc --json docs/typedoc.json src/index.ts",
+    "postdocs": "node scripts/docgen.js",
     "lint": "eslint src --ext .ts",
     "prepare": "husky install",
     "lint:fix": "eslint src --ext .ts --fix"
@@ -65,37 +65,33 @@
   },
   "homepage": "https://discord-player.js.org",
   "dependencies": {
-    "@discordjs/voice": "^0.8.0",
+    "@discordjs/voice": "^0.11.0",
     "discord-ytdl-core": "^5.0.4",
     "libsodium-wrappers": "^0.7.10",
-    "soundcloud-scraper": "^5.0.2",
-    "spotify-url-info": "^3.0.0",
+    "soundcloud-scraper": "^5.0.3",
+    "spotify-url-info": "^3.1.2",
     "tiny-typed-emitter": "^2.1.0",
-    "youtube-sr": "^4.1.15",
+    "tslib": "^2.4.0",
+    "youtube-sr": "^4.2.0",
     "ytdl-core": "^4.11.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
-    "@babel/preset-typescript": "^7.16.0",
-    "@devsnowflake/docgen": "devsnowflake/docgen#ts-patch",
-    "@discord-player/extractor": "^3.0.2",
-    "@discordjs/opus": "github:discordjs/opus",
-    "@favware/rollup-type-bundler": "^1.0.6",
-    "@types/node": "^16.11.10",
-    "@types/ws": "^8.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "discord-api-types": "^0.24.0",
-    "discord.js": "^13.6.0",
-    "eslint": "^8.3.0",
+    "@discordjs/ts-docgen": "^0.4.1",
+    "@favware/rollup-type-bundler": "^1.0.9",
+    "@types/node": "^18.0.6",
+    "@types/ws": "^8.5.3",
+    "@typescript-eslint/eslint-plugin": "^5.30.7",
+    "@typescript-eslint/parser": "^5.30.7",
+    "discord-api-types": "^0.36.2",
+    "discord.js": "^14.0.2",
+    "eslint": "^8.20.0",
     "gen-esm-wrapper": "^1.1.3",
-    "husky": "^7.0.4",
-    "jsdoc-babel": "^0.5.0",
-    "prettier": "^2.5.0",
+    "husky": "^8.0.1",
+    "opusscript": "^0.0.8",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.2"
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.8",
+    "typescript": "^4.7.4"
   }
 }