muthera 1.0.2 → 1.0.5

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "muthera",
-  "version": "1.0.2",
-  "description": "A simple Lavalink wrapper for Discord music bot. Forked from Niizuki.",
-  "main": "src/index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "urfavteddybear",
-  "license": "ISC",
-  "dependencies": {
-    "@discordjs/collection": "^2.1.1",
-    "jsdom": "^26.1.0",
-    "ws": "^8.18.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/urfavteddybear/muthera.git"
-  },
-  "bugs": {
-    "url": "https://github.com/urfavteddybear/muthera/issues"
-  },
-  "homepage": "https://github.com/urfavteddybear/muthera#readme",
-  "keywords": [
-    "wrapper",
-    "discord",
-    "lavalink-v4",
-    "lavalink",
-    "music-bot"
-  ]
-}
+{
+  "name": "muthera",
+  "version": "1.0.5",
+  "description": "A simple Lavalink wrapper for Discord music bot. Forked from Niizuki.",
+  "main": "src/index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "urfavteddybear",
+  "license": "ISC",
+  "dependencies": {
+    "@discordjs/collection": "^2.1.1",
+    "jsdom": "^26.1.0",
+    "ws": "^8.18.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/urfavteddybear/muthera.git"
+  },
+  "bugs": {
+    "url": "https://github.com/urfavteddybear/muthera/issues"
+  },
+  "homepage": "https://github.com/urfavteddybear/muthera#readme",
+  "keywords": [
+    "wrapper",
+    "discord",
+    "lavalink-v4",
+    "lavalink",
+    "music-bot"
+  ]
+}

package/src/index.d.ts

@@ -381,7 +381,11 @@ export type Voice = {
     /**
      * The voice endpoint
      */
-    endpoint: String
+    endpoint: String,
+    /**
+     * The voice channel id
+     */
+    channelId: String
 }
 
 export declare class Connection {

package/src/structures/Muthera.js

@@ -1,191 +1,191 @@
-const { EventEmitter } = require("events");
-const { Node } = require("./mutheraNode");
-const { Player } = require("./mutheraPlayer");
-const { Track } = require("./mutheraTrack");
-const { Collection } = require("@discordjs/collection");
-
-class Muthera extends EventEmitter {
-  constructor(client, nodes, options) {
-    super();
-    if (!client)
-      throw new Error("Client option must be present to initialize muthera.");
-    if (!nodes)
-      throw new Error("Node option must be present to initialize muthera.");
-    if (!options.send)
-      throw new Error("Send function must be present to initialize muthera.");
-
-    this.client = client;
-    this.nodes = nodes;
-    this.nodeMap = new Collection();
-    this.players = new Collection();
-    this.options = options;
-    this.clientId = null;
-    this.initiated = false;
-    this.send = options.send || null;
-    this.defaultSearchPlatform = options.defaultSearchPlatform || "ytsearch";
-    this.tracks = [];
-    this.loadType = null;
-    this.playlistInfo = null;
-  }
-
-  get leastUsedNodes() {
-    return [...this.nodeMap.values()]
-      .filter((node) => node.connected)
-      .sort((a, b) => b.rest.calls - a.rest.calls);
-  }
-
-  init(clientId) {
-    if (this.initiated) return this;
-    this.clientId = clientId;
-    this.nodes.forEach((node) => this.createNode(node));
-    this.initiated = true;
-  }
-
-  createNode(options) {
-    const node = new Node(this, options, this.options);
-    this.nodeMap.set(options.name || options.host, node);
-    node.connect();
-
-    this.emit("nodeCreate", node);
-    return node;
-  }
-
-  destroyNode(identifier) {
-    const node = this.nodeMap.get(identifier);
-    if (!node) return;
-    node.disconnect();
-    this.nodeMap.delete(identifier);
-    this.emit("nodeDestroy", node);
-  }
-
-  updateVoiceState(packet) {
-    if (!["VOICE_STATE_UPDATE", "VOICE_SERVER_UPDATE"].includes(packet.t))
-      return;
-    const player = this.players.get(packet.d.guild_id);
-    if (!player) return;
-
-    if (packet.t === "VOICE_SERVER_UPDATE") {
-      player.connection.setServerUpdate(packet.d);
-    } else if (packet.t === "VOICE_STATE_UPDATE") {
-      if (packet.d.user_id !== this.clientId) return;
-      player.connection.setStateUpdate(packet.d);
-    }
-  }
-
-  fetchRegion(region) {
-    const nodesByRegion = [...this.nodeMap.values()]
-      .filter(
-        (node) =>
-          node.connected && node.regions?.includes(region?.toLowerCase())
-      )
-      .sort((a, b) => {
-        const aLoad = a.stats.cpu
-          ? (a.stats.cpu.systemLoad / a.stats.cpu.cores) * 100
-          : 0;
-        const bLoad = b.stats.cpu
-          ? (b.stats.cpu.systemLoad / b.stats.cpu.cores) * 100
-          : 0;
-        return aLoad - bLoad;
-      });
-
-    return nodesByRegion;
-  }
-
-  createConnection(options) {
-    if (!this.initiated)
-      throw new Error("You have to initialize muthera in your event.");
-
-    const player = this.players.get(options.guildId);
-    if (player) return player;
-
-    if (this.leastUsedNodes.length === 0)
-      throw new Error("No nodes are available.");
-
-    let node;
-    if (options.node) {
-      node = this.nodeMap.get(options.node);
-    } else {
-      node = this.nodeMap.get(this.leastUsedNodes[0].name);
-    }
-
-    if (!node) throw new Error("No nodes are available.");
-
-    return this.createPlayer(node, options);
-  }
-
-  createPlayer(node, options) {
-    const player = new Player(this, node, options);
-    this.players.set(options.guildId, player);
-
-    player.connect(options);
-
-    this.emit("playerCreate", player);
-    return player;
-  }
-
-  destroyPlayer(guildId) {
-    const player = this.players.get(guildId);
-    if (!player) return;
-    player.destroy();
-    this.players.delete(guildId);
-
-    this.emit("playerDestroy", player);
-  }
-
-  removeConnection(guildId) {
-    this.players.get(guildId)?.destroy();
-    this.players.delete(guildId);
-  }
-
-  async resolve({ query, source, requester }) {
-    try {
-      if (!this.initiated)
-        throw new Error("You have to initialize muthera in your event.");
-
-      const sources = source || this.defaultSearchPlatform;
-
-      const node = this.leastUsedNodes[0];
-      if (!node) throw new Error("No nodes are available.");
-
-      const regex = /^https?:\/\//;
-      const identifier = regex.test(query) ? query : `${sources}:${query}`;
-
-      let response = await node.rest.makeRequest(
-        `GET`,
-        `/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`
-      );
-
-      if (response.loadType === "track") {
-        this.tracks = [new Track(response.data, requester, node)];
-      } else if (response.loadType === "playlist") {
-        this.tracks = response.data.tracks.map(
-          (track) => new Track(track, requester, node)
-        );
-      } else if (
-        response.loadType === "error" ||
-        response.loadType === "empty"
-      ) {
-        this.tracks = null;
-      } else {
-        this.tracks = response.data.map(
-          (track) => new Track(track, requester, node)
-        );
-      }
-
-      this.playlistInfo = response.data.info ?? null;
-      this.loadType = response.loadType ?? null;
-      return this;
-    } catch (error) {
-      throw new Error(error);
-    }
-  }
-
-  get(guildId) {
-    const player = this.players.get(guildId);
-    if (!player)
-      throw new Error(`No player were found for guildId: ${guildId}.`);
-    return player;
-  }
-}
-
-module.exports = { Muthera };
+const { EventEmitter } = require("events");
+const { Node } = require("./mutheraNode");
+const { Player } = require("./mutheraPlayer");
+const { Track } = require("./mutheraTrack");
+const { Collection } = require("@discordjs/collection");
+
+class Muthera extends EventEmitter {
+  constructor(client, nodes, options) {
+    super();
+    if (!client)
+      throw new Error("Client option must be present to initialize muthera.");
+    if (!nodes)
+      throw new Error("Node option must be present to initialize muthera.");
+    if (!options.send)
+      throw new Error("Send function must be present to initialize muthera.");
+
+    this.client = client;
+    this.nodes = nodes;
+    this.nodeMap = new Collection();
+    this.players = new Collection();
+    this.options = options;
+    this.clientId = null;
+    this.initiated = false;
+    this.send = options.send || null;
+    this.defaultSearchPlatform = options.defaultSearchPlatform || "ytsearch";
+    this.tracks = [];
+    this.loadType = null;
+    this.playlistInfo = null;
+  }
+
+  get leastUsedNodes() {
+    return [...this.nodeMap.values()]
+      .filter((node) => node.connected)
+      .sort((a, b) => b.rest.calls - a.rest.calls);
+  }
+
+  init(clientId) {
+    if (this.initiated) return this;
+    this.clientId = clientId;
+    this.nodes.forEach((node) => this.createNode(node));
+    this.initiated = true;
+  }
+
+  createNode(options) {
+    const node = new Node(this, options, this.options);
+    this.nodeMap.set(options.name || options.host, node);
+    node.connect();
+
+    this.emit("nodeCreate", node);
+    return node;
+  }
+
+  destroyNode(identifier) {
+    const node = this.nodeMap.get(identifier);
+    if (!node) return;
+    node.disconnect();
+    this.nodeMap.delete(identifier);
+    this.emit("nodeDestroy", node);
+  }
+
+  updateVoiceState(packet) {
+    if (!["VOICE_STATE_UPDATE", "VOICE_SERVER_UPDATE"].includes(packet.t))
+      return;
+    const player = this.players.get(packet.d.guild_id);
+    if (!player) return;
+
+    if (packet.t === "VOICE_SERVER_UPDATE") {
+      player.connection.setServerUpdate(packet.d);
+    } else if (packet.t === "VOICE_STATE_UPDATE") {
+      if (packet.d.user_id !== this.clientId) return;
+      player.connection.setStateUpdate(packet.d);
+    }
+  }
+
+  fetchRegion(region) {
+    const nodesByRegion = [...this.nodeMap.values()]
+      .filter(
+        (node) =>
+          node.connected && node.regions?.includes(region?.toLowerCase())
+      )
+      .sort((a, b) => {
+        const aLoad = a.stats.cpu
+          ? (a.stats.cpu.systemLoad / a.stats.cpu.cores) * 100
+          : 0;
+        const bLoad = b.stats.cpu
+          ? (b.stats.cpu.systemLoad / b.stats.cpu.cores) * 100
+          : 0;
+        return aLoad - bLoad;
+      });
+
+    return nodesByRegion;
+  }
+
+  createConnection(options) {
+    if (!this.initiated)
+      throw new Error("You have to initialize muthera in your event.");
+
+    const player = this.players.get(options.guildId);
+    if (player) return player;
+
+    if (this.leastUsedNodes.length === 0)
+      throw new Error("No nodes are available.");
+
+    let node;
+    if (options.node) {
+      node = this.nodeMap.get(options.node);
+    } else {
+      node = this.nodeMap.get(this.leastUsedNodes[0].name);
+    }
+
+    if (!node) throw new Error("No nodes are available.");
+
+    return this.createPlayer(node, options);
+  }
+
+  createPlayer(node, options) {
+    const player = new Player(this, node, options);
+    this.players.set(options.guildId, player);
+
+    player.connect(options);
+
+    this.emit("playerCreate", player);
+    return player;
+  }
+
+  destroyPlayer(guildId) {
+    const player = this.players.get(guildId);
+    if (!player) return;
+    player.destroy();
+    this.players.delete(guildId);
+
+    this.emit("playerDestroy", player);
+  }
+
+  removeConnection(guildId) {
+    this.players.get(guildId)?.destroy();
+    this.players.delete(guildId);
+  }
+
+  async resolve({ query, source, requester }) {
+    try {
+      if (!this.initiated)
+        throw new Error("You have to initialize muthera in your event.");
+
+      const sources = source || this.defaultSearchPlatform;
+
+      const node = this.leastUsedNodes[0];
+      if (!node) throw new Error("No nodes are available.");
+
+      const regex = /^https?:\/\//;
+      const identifier = regex.test(query) ? query : `${sources}:${query}`;
+
+      let response = await node.rest.makeRequest(
+        `GET`,
+        `/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`
+      );
+
+      if (response.loadType === "track") {
+        this.tracks = [new Track(response.data, requester, node)];
+      } else if (response.loadType === "playlist") {
+        this.tracks = response.data.tracks.map(
+          (track) => new Track(track, requester, node)
+        );
+      } else if (
+        response.loadType === "error" ||
+        response.loadType === "empty"
+      ) {
+        this.tracks = null;
+      } else {
+        this.tracks = response.data.map(
+          (track) => new Track(track, requester, node)
+        );
+      }
+
+      this.playlistInfo = response.data.info ?? null;
+      this.loadType = response.loadType ?? null;
+      return this;
+    } catch (error) {
+      throw new Error(error);
+    }
+  }
+
+  get(guildId) {
+    const player = this.players.get(guildId);
+    if (!player)
+      throw new Error(`No player were found for guildId: ${guildId}.`);
+    return player;
+  }
+}
+
+module.exports = { Muthera };

package/src/structures/mutheraConnection.js

@@ -9,6 +9,7 @@ class Connection {
       event: null,
       endpoint: null,
       sessionId: null,
+      channelId: null,
     };
     this.self_deaf = false;
     this.self_mute = false;
@@ -48,6 +49,7 @@ class Connection {
     this.self_deaf = self_deaf;
     this.self_mute = self_mute;
     this.voice.sessionId = session_id || null;
+    this.voice.channelId = channel_id || null;
   }
 
   updatePlayerVoiceData() {

package/src/structures/mutheraNode.js

@@ -66,10 +66,11 @@ class Node {
   }
 
   open() {
-    if (this.reconnectTimeout) clearTimeout(this.reconnectTimeout);
+    if (this.reconnectAttempt) clearTimeout(this.reconnectAttempt);
 
     this.muthera.emit("nodeConnect", this);
     this.connected = true;
+    this.reconnectAttempted = 1; // Reset reconnection attempts on successful connection
     this.muthera.emit(
       "debug",
       this.name,
@@ -138,7 +139,7 @@ class Node {
 
   reconnect() {
     this.reconnectAttempt = setTimeout(() => {
-      if (this.reconnectAttempted >= this.reconnectTries) {
+      if (this.reconnectAttempted > this.reconnectTries) {
         const error = new Error(
           `Unable to connect node: ${this.name} after ${this.reconnectTries} attempts.`
         );
@@ -147,9 +148,10 @@ class Node {
         return this.destroy();
       }
 
-      this.ws.removeAllListeners();
+      this.ws?.removeAllListeners();
       this.ws = null;
       this.muthera.emit("nodeReconnect", this);
+      this.muthera.emit("debug", this.name, `Reconnection attempt ${this.reconnectAttempted}/${this.reconnectTries}`);
       this.connect();
       this.reconnectAttempted++;
     }, this.reconnectTimeout);