discord-player 5.2.1 → 5.2.2

package/README.md

@@ -168,7 +168,7 @@ These bots are made by the community, they can help you build your own!
 
 ### Smooth Volume
 
-Discord Player will make volume transition smooth. To enable this, you need to add this line at the top of your main file:
+Discord Player will by default try to implement this. If smooth volume does not work, you need to add this line at the top of your main file:
 
 ```js
 // CJS

package/dist/Player.js

@@ -26,7 +26,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
      * @param {PlayerInitOptions} [options={}] The player init options
      */
     constructor(client, options = {}) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         super();
         this.options = {
             autoRegisterExtractor: true,
@@ -44,7 +44,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
          * @type {Client}
          */
         this.client = client;
-        if (!new discord_js_1.Intents(this.client.options.intents).has(discord_js_1.Intents.FLAGS.GUILD_VOICE_STATES)) {
+        if (((_b = (_a = this.client) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.intents) && !new discord_js_1.Intents((_d = (_c = this.client) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.intents).has(discord_js_1.Intents.FLAGS.GUILD_VOICE_STATES)) {
             throw new PlayerError_1.PlayerError('client is missing "GUILD_VOICE_STATES" intent');
         }
         /**
@@ -53,7 +53,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
          */
         this.options = Object.assign(this.options, options);
         this.client.on("voiceStateUpdate", this._handleVoiceState.bind(this));
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.autoRegisterExtractor) {
+        if ((_e = this.options) === null || _e === void 0 ? void 0 : _e.autoRegisterExtractor) {
             let nv; // eslint-disable-line @typescript-eslint/no-explicit-any
             if ((nv = Util_1.Util.require("@discord-player/extractor"))) {
                 ["Attachment", "Facebook", "Reverbnation", "Vimeo"].forEach((ext) => void this.use(ext, nv[ext]));
@@ -157,7 +157,7 @@ class Player extends tiny_typed_emitter_1.TypedEmitter {
             return this.queues.get(guild.id);
         const _meta = queueInitOptions.metadata;
         delete queueInitOptions["metadata"];
-        (_a = queueInitOptions.volumeSmoothness) !== null && _a !== void 0 ? _a : (queueInitOptions.volumeSmoothness = 0.1);
+        (_a = queueInitOptions.volumeSmoothness) !== null && _a !== void 0 ? _a : (queueInitOptions.volumeSmoothness = 0.08);
         (_b = queueInitOptions.ytdlOptions) !== null && _b !== void 0 ? _b : (queueInitOptions.ytdlOptions = this.options.ytdlOptions);
         const queue = new Queue_1.Queue(this, guild, queueInitOptions);
         queue.metadata = _meta;

package/dist/Structures/Queue.js

@@ -138,8 +138,7 @@ class Queue {
             if (!["GUILD_STAGE_VOICE", "GUILD_VOICE"].includes(_channel === null || _channel === void 0 ? void 0 : _channel.type))
                 throw new PlayerError_1.PlayerError(`Channel type must be GUILD_VOICE or GUILD_STAGE_VOICE, got ${_channel === null || _channel === void 0 ? void 0 : _channel.type}!`, PlayerError_1.ErrorStatusCode.INVALID_ARG_TYPE);
             const connection = yield this.player.voiceUtils.connect(_channel, {
-                deaf: this.options.autoSelfDeaf,
-                maxTime: this.player.options.connectionTimeout || 20000
+                deaf: this.options.autoSelfDeaf
             });
             this.connection = connection;
             if (_channel.type === "GUILD_STAGE_VOICE") {
@@ -195,6 +194,9 @@ class Queue {
                     return;
                 }
             }));
+            yield this.player.voiceUtils.enterReady(this.connection.voiceConnection, {
+                maxTime: this.player.options.connectionTimeout || 30000
+            });
             return this;
         });
     }
@@ -702,8 +704,10 @@ class Queue {
             if (options.seek)
                 this._streamTime = options.seek;
             this._filtersUpdate = options.filtersUpdate;
-            if (resource.volume && typeof this.options.volumeSmoothness === "number") {
-                Reflect.set(resource.volume, "_smoothing", this.options.volumeSmoothness || 0);
+            const volumeTransformer = resource.volume;
+            if ((volumeTransformer === null || volumeTransformer === void 0 ? void 0 : volumeTransformer.hasSmoothness) && typeof this.options.volumeSmoothness === "number") {
+                if (typeof volumeTransformer.setSmoothness === "function")
+                    volumeTransformer.setSmoothness(this.options.volumeSmoothness || 0);
             }
             this.setVolume(this.options.initialVolume);
             setTimeout(() => {

package/dist/VoiceInterface/VoiceUtils.js

@@ -38,14 +38,19 @@ class VoiceUtils {
      * @returns {VoiceConnection}
      */
     join(channel, options) {
-        var _a;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-            let conn = (0, voice_1.joinVoiceChannel)({
+            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 (0, 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;

package/dist/{VolumeTransformer.js → VoiceInterface/VolumeTransformer.js}

@@ -30,9 +30,12 @@ class VolumeTransformer extends stream_1.Transform {
             default:
                 throw new Error("VolumeTransformer type should be one of s16le, s16be, s32le, s32be");
         }
+        this.type = options.type;
         this._bytes = this._bits / 8;
         this._extremum = Math.pow(2, this._bits - 1);
-        this.volume = typeof options.volume === "undefined" ? 1 : options.volume;
+        this.volume = Number.isNaN(options.volume) ? 1 : Number(options.volume);
+        if (!Number.isFinite(this.volume))
+            this.volume = 1;
         this._targetVolume = this.volume;
         this._chunk = Buffer.alloc(0);
         this._smoothing = options.smoothness || 0;
@@ -43,15 +46,17 @@ class VolumeTransformer extends stream_1.Transform {
     _writeInt(buffer, int, index) {
         return index;
     }
-    _transform(chunk, encoding, done) {
-        if (this._smoothing > 0 && this.volume !== this._targetVolume) {
-            if (this.volume < this._targetVolume) {
-                this.volume = this.volume + this._smoothing >= this._targetVolume ? this._targetVolume : this.volume + this._smoothing;
-            }
-            else if (this.volume > this._targetVolume) {
-                this.volume = this.volume - this._smoothing <= this._targetVolume ? this._targetVolume : this.volume - this._smoothing;
-            }
+    _applySmoothness() {
+        if (this.volume < this._targetVolume) {
+            this.volume = this.volume + this._smoothing >= this._targetVolume ? this._targetVolume : this.volume + this._smoothing;
+        }
+        else if (this.volume > this._targetVolume) {
+            this.volume = this.volume - this._smoothing <= this._targetVolume ? this._targetVolume : this.volume - this._smoothing;
         }
+    }
+    _transform(chunk, encoding, done) {
+        if (this.smoothingEnabled() && this.volume !== this._targetVolume)
+            this._applySmoothness();
         if (this.volume === 1) {
             this.push(chunk);
             return done();
@@ -74,6 +79,12 @@ class VolumeTransformer extends stream_1.Transform {
         this._chunk = null;
     }
     setVolume(volume) {
+        if (Number.isNaN(volume))
+            volume = 1;
+        if (typeof volume !== "number")
+            volume = Number(volume);
+        if (!Number.isFinite(volume))
+            volume = volume < 0 ? 0 : 1;
         this._targetVolume = volume;
         if (this._smoothing <= 0)
             this.volume = volume;
@@ -90,5 +101,20 @@ class VolumeTransformer extends stream_1.Transform {
     get volumeLogarithmic() {
         return Math.pow(this.volume, 1 / 1.660964);
     }
+    get smoothness() {
+        return this._smoothing;
+    }
+    setSmoothness(smoothness) {
+        this._smoothing = smoothness;
+    }
+    smoothingEnabled() {
+        return Number.isFinite(this._smoothing) && this._smoothing > 0;
+    }
+    get hasSmoothness() {
+        return true;
+    }
+    static get hasSmoothing() {
+        return true;
+    }
 }
 exports.VolumeTransformer = VolumeTransformer;

package/dist/index.d.ts

@@ -191,6 +191,9 @@ declare class VoiceUtils {
         deaf?: boolean;
         maxTime?: number;
     }): Promise<VoiceConnection>;
+    enterReady(conn: VoiceConnection, options?: {
+        maxTime?: number;
+    }): Promise<VoiceConnection>;
     /**
      * Disconnects voice connection
      * @param {VoiceConnection} connection The voice connection

package/dist/index.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = exports.Util = exports.StreamDispatcher = exports.VoiceUtils = exports.Track = exports.Queue = exports.QueryResolver = exports.ErrorStatusCode = exports.PlayerError = exports.Player = exports.Playlist = exports.ExtractorModel = exports.AudioFilters = void 0;
 const tslib_1 = require("tslib");
+// try applying smooth volume patch on load
+require("./smoothVolume");
 var AudioFilters_1 = require("./utils/AudioFilters");
 Object.defineProperty(exports, "AudioFilters", { enumerable: true, get: function () { return AudioFilters_1.AudioFilters; } });
 var ExtractorModel_1 = require("./Structures/ExtractorModel");

package/dist/smoothVolume.js

@@ -1,5 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const VolumeTransformer_1 = require("./VolumeTransformer");
-// eslint-disable-next-line
-require("prism-media").VolumeTransformer = VolumeTransformer_1.VolumeTransformer;
+const VolumeTransformer_1 = require("./VoiceInterface/VolumeTransformer");
+try {
+    // eslint-disable-next-line
+    const mod = require("prism-media");
+    if (typeof mod.VolumeTransformer.hasSmoothing !== "boolean") {
+        Reflect.set(mod, "VolumeTransformer", VolumeTransformer_1.VolumeTransformer);
+    }
+}
+catch (_a) {
+    /* do nothing */
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-player",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "Complete framework to facilitate music commands using discord.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,9 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs"
     },
-    "./smoothVolume": "./dist/smoothVolume.js"
+    "./smoothVolume": "./dist/smoothVolume.js",
+    "./src/*": "./dist/*",
+    "./dist/*": "./dist/*"
   },
   "scripts": {
     "dev": "cd example/test && ts-node index.ts",
@@ -67,7 +69,7 @@
     "discord-ytdl-core": "^5.0.4",
     "libsodium-wrappers": "^0.7.9",
     "soundcloud-scraper": "^5.0.2",
-    "spotify-url-info": "^2.2.3",
+    "spotify-url-info": "^2.2.5",
     "tiny-typed-emitter": "^2.1.0",
     "youtube-sr": "^4.1.13",
     "ytdl-core": "^4.10.0"
@@ -86,7 +88,7 @@
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
     "discord-api-types": "^0.24.0",
-    "discord.js": "^13.3.1",
+    "discord.js": "^13.6.0",
     "eslint": "^8.3.0",
     "gen-esm-wrapper": "^1.1.3",
     "husky": "^7.0.4",