magmastream 2.4.0 → 2.5.0

package/dist/index.d.ts

@@ -833,6 +833,8 @@ declare class Manager extends EventEmitter {
     /** The options that were set. */
     readonly options: ManagerOptions;
     private initiated;
+    /** Returns the nodes that has the least load. */
+    private get leastLoadNode();
     /** Returns the nodes that has the least amount of players. */
     private get leastPlayersNode();
     /** Returns a node based on priority. */
@@ -908,8 +910,10 @@ interface Payload {
     };
 }
 interface ManagerOptions {
-    /** Use priority mode over least amount of player? */
+    /** Use priority mode over least amount of player or load? */
     usePriority?: boolean;
+    /** Use the least amount of players or least load? */
+    useNode?: "leastLoad" | "leastPlayers";
     /** The array of nodes to connect to. */
     nodes?: NodeOptions[];
     /** The client ID to use. */

package/dist/structures/Manager.js

@@ -7,7 +7,6 @@ const Utils_1 = require("./Utils");
 const collection_1 = require("@discordjs/collection");
 const events_1 = require("events");
 const managerCheck_1 = tslib_1.__importDefault(require("../utils/managerCheck"));
-const REQUIRED_KEYS = ["event", "guild_id", "op", "sessionId"];
 /**
  * The main hub for interacting with Lavalink and using Magmastream,
  */
@@ -28,6 +27,20 @@ class Manager extends events_1.EventEmitter {
     /** The options that were set. */
     options;
     initiated = false;
+    /** Returns the nodes that has the least load. */
+    get leastLoadNode() {
+        return this.nodes
+            .filter((node) => node.connected)
+            .sort((a, b) => {
+            const aload = a.stats.cpu
+                ? (a.stats.cpu.lavalinkLoad / a.stats.cpu.cores) * 100
+                : 0;
+            const bload = b.stats.cpu
+                ? (b.stats.cpu.lavalinkLoad / b.stats.cpu.cores) * 100
+                : 0;
+            return aload - bload;
+        });
+    }
     /** Returns the nodes that has the least amount of players. */
     get leastPlayersNode() {
         return this.nodes
@@ -50,13 +63,17 @@ class Manager extends events_1.EventEmitter {
                 return node;
             }
         }
-        return this.leastPlayersNode.first();
+        return this.options.useNode === "leastLoad"
+            ? this.leastLoadNode.first()
+            : this.leastPlayersNode.first();
     }
     /** Returns the node to use. */
     get useableNodes() {
         return this.options.usePriority
             ? this.priorityNode
-            : this.leastPlayersNode.first();
+            : this.options.useNode === "leastLoad"
+                ? this.leastLoadNode.first()
+                : this.leastPlayersNode.first();
     }
     /**
      * Initiates the Manager class.
@@ -87,6 +104,7 @@ class Manager extends events_1.EventEmitter {
             usePriority: false,
             clientName: "Magmastream",
             defaultSearchPlatform: "youtube",
+            useNode: "leastPlayers",
             ...options,
         };
         if (this.options.plugins) {
@@ -256,49 +274,38 @@ class Manager extends events_1.EventEmitter {
      */
     async updateVoiceState(data) {
         if ("t" in data &&
-            !["VOICE_STATE_UPDATE", "VOICE_SERVER_UPDATE"].includes(data.t)) {
+            !["VOICE_STATE_UPDATE", "VOICE_SERVER_UPDATE"].includes(data.t))
             return;
-        }
         const update = "d" in data ? data.d : data;
-        if (!update || (!("token" in update) && !("session_id" in update))) {
+        if (!update || (!("token" in update) && !("session_id" in update)))
             return;
-        }
         const player = this.players.get(update.guild_id);
-        if (!player) {
+        if (!player)
             return;
-        }
         if ("token" in update) {
-            /* voice server update */
             player.voiceState.event = update;
-        }
-        else {
-            /* voice state update */
-            if (update.user_id !== this.options.clientId) {
-                return;
-            }
-            if (update.channel_id) {
-                if (player.voiceChannel !== update.channel_id) {
-                    /* we moved voice channels. */
-                    this.emit("playerMove", player, player.voiceChannel, update.channel_id);
-                }
-                player.voiceState.sessionId = update.session_id;
-                player.voiceChannel = update.channel_id;
-            }
-            else {
-                /* player got disconnected. */
-                this.emit("playerDisconnect", player, player.voiceChannel);
-                player.voiceChannel = null;
-                player.voiceState = Object.assign({});
-                player.pause(true);
-            }
-        }
-        if (REQUIRED_KEYS.every((key) => key in player.voiceState)) {
             const { sessionId, event: { token, endpoint }, } = player.voiceState;
             await player.node.rest.updatePlayer({
                 guildId: player.guild,
                 data: { voice: { token, endpoint, sessionId } },
             });
+            return;
+        }
+        if (update.user_id !== this.options.clientId)
+            return;
+        if (update.channel_id) {
+            if (player.voiceChannel !== update.channel_id) {
+                this.emit("playerMove", player, player.voiceChannel, update.channel_id);
+            }
+            player.voiceState.sessionId = update.session_id;
+            player.voiceChannel = update.channel_id;
+            return;
         }
+        this.emit("playerDisconnect", player, player.voiceChannel);
+        player.voiceChannel = null;
+        player.voiceState = Object.assign({});
+        player.destroy();
+        return;
     }
 }
 exports.Manager = Manager;

package/dist/utils/managerCheck.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function managerCheck(options) {
     if (!options)
         throw new TypeError("ManagerOptions must not be empty.");
-    const { autoPlay, clientId, clientName, defaultSearchPlatform, nodes, plugins, send, shards, trackPartial, usePriority, } = options;
+    const { autoPlay, clientId, clientName, defaultSearchPlatform, nodes, plugins, send, shards, trackPartial, usePriority, useNode, } = options;
     if (typeof autoPlay !== "undefined" && typeof autoPlay !== "boolean") {
         throw new TypeError('Manager option "autoPlay" must be a boolean.');
     }
@@ -42,5 +42,13 @@ function managerCheck(options) {
             }
         }
     }
+    if (typeof useNode !== "undefined") {
+        if (typeof useNode !== "string") {
+            throw new TypeError('Manager option "useNode" must be a string "leastLoad" or "leastPlayers".');
+        }
+        if (useNode !== "leastLoad" || useNode !== "leastLoad") {
+            throw new TypeError('Manager option must be either "leastLoad" or "leastPlayers".');
+        }
+    }
 }
 exports.default = managerCheck;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magmastream",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "A user-friendly Lavalink client designed for NodeJS.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,15 +16,15 @@
   "devDependencies": {
     "@favware/rollup-type-bundler": "^3.3.0",
     "@types/lodash": "^4.17.0",
-    "@types/node": "^20.12.4",
+    "@types/node": "^20.12.7",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
     "eslint": "^8.57.0",
     "npm-run-all": "^4.1.5",
-    "typedoc": "^0.25.12",
+    "typedoc": "^0.25.13",
     "typedoc-plugin-no-inherit": "^1.4.0",
-    "typescript": "^5.4.4"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "@discordjs/collection": "^2.0.0",
@@ -32,7 +32,7 @@
     "events": "^3.3.0",
     "lodash": "^4.17.21",
     "tslib": "^2.6.2",
-    "ws": "^8.16.0"
+    "ws": "^8.17.0"
   },
   "peerDependencies": {
     "discord.js": ">=13.0.0 <15.0.0"
@@ -87,4 +87,4 @@
   "homepage": "https://docs.blackforthosting.com",
   "author": "Abel Purnwasy",
   "license": "Apache-2.0"
-}
+}