magmastream 2.0.3 → 2.0.5

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import { Pool } from 'undici';
 import WebSocket from 'ws';
 import { Collection } from '@discordjs/collection';
 import { EventEmitter } from 'events';
@@ -380,10 +379,10 @@ declare class Rest {
     /** Sends a DELETE request to the server to destroy the player. */
     destroyPlayer(guildId: string): Promise<unknown>;
     private request;
-    get(endpoint: RouteLike): Promise<unknown>;
-    patch(endpoint: RouteLike, body: unknown): Promise<unknown>;
-    post(endpoint: RouteLike, body: unknown): Promise<unknown>;
-    delete(endpoint: RouteLike): Promise<unknown>;
+    get(endpoint: string): Promise<unknown>;
+    patch(endpoint: string, body: unknown): Promise<unknown>;
+    post(endpoint: string, body: unknown): Promise<unknown>;
+    delete(endpoint: string): Promise<unknown>;
 }
 interface playOptions {
     guildId: string;
@@ -405,19 +404,20 @@ interface playOptions {
         /** The audio effects. */
         filters?: object;
         /** voice payload. */
-        voice?: unknown;
+        voice?: {
+            token: string;
+            sessionId: string;
+            endpoint: string;
+        };
         /** Whether to not replace the track if a play payload is sent. */
         noReplace?: boolean;
     };
 }
-type RouteLike = `/${string}`;
 
 declare class Node {
     options: NodeOptions;
     /** The socket for the node. */
     socket: WebSocket | null;
-    /** The HTTP pool used for rest calls. */
-    http: Pool;
     /** The amount of rest calls the node has made. */
     calls: number;
     /** The stats for the node. */
@@ -479,8 +479,6 @@ interface NodeOptions {
     resumeTimeout?: number;
     /** The timeout used for api calls */
     requestTimeout?: number;
-    /** Options for the undici http pool used for http requests */
-    poolOptions?: Pool.Options;
 }
 interface NodeStats {
     /** The amount of players on the node. */
@@ -593,7 +591,7 @@ type TrackEndReason = "finished" | "loadFailed" | "stopped" | "replaced" | "clea
 type Severity = "common" | "suspicious" | "fault";
 interface TrackData {
     /** The track information. */
-    encoded?: string;
+    encoded: string;
     /** The detailed information of the track. */
     info: TrackDataInfo;
     /** Addition track info provided by plugins. */
@@ -853,7 +851,7 @@ declare class Manager extends EventEmitter {
      * Sends voice data to the Lavalink server.
      * @param data
      */
-    updateVoiceState(data: VoicePacket | VoiceServer | VoiceState): void;
+    updateVoiceState(data: VoicePacket | VoiceServer | VoiceState): Promise<void>;
 }
 interface Payload {
     /** The OP code */

package/dist/structures/Manager.js

@@ -117,22 +117,21 @@ class Manager extends events_1.EventEmitter {
      * @param requester
      * @returns The search result.
      */
-    search(query, requester) {
-        return new Promise(async (resolve, reject) => {
-            const node = this.leastUsedNodes.first();
-            if (!node)
-                throw new Error("No available nodes.");
-            const _query = typeof query === "string" ? { query } : query;
-            const _source = Manager.DEFAULT_SOURCES[_query.source ?? this.options.defaultSearchPlatform] ?? _query.source;
-            let search = _query.query;
-            if (!/^https?:\/\//.test(search)) {
-                search = `${_source}:${search}`;
-            }
-            const res = (await node.rest
-                .get(`/v4/loadtracks?identifier=${encodeURIComponent(search)}`)
-                .catch((err) => reject(err)));
+    async search(query, requester) {
+        const node = this.leastUsedNodes.first();
+        if (!node) {
+            throw new Error("No available nodes.");
+        }
+        const _query = typeof query === "string" ? { query } : query;
+        const _source = Manager.DEFAULT_SOURCES[_query.source ?? this.options.defaultSearchPlatform] ?? _query.source;
+        let search = _query.query;
+        if (!/^https?:\/\//.test(search)) {
+            search = `${_source}:${search}`;
+        }
+        try {
+            const res = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(search)}`));
             if (!res) {
-                return reject(new Error("Query not found."));
+                throw new Error("Query not found.");
             }
             let searchData = [];
             let playlistData;
@@ -145,20 +144,26 @@ class Manager extends events_1.EventEmitter {
                     break;
                 case "playlist":
                     playlistData = res.data;
+                    break;
             }
+            const tracks = searchData.map((track) => Utils_1.TrackUtils.build(track, requester));
+            const playlist = res.loadType === "playlist"
+                ? {
+                    name: playlistData.info.name,
+                    tracks: playlistData.tracks.map((track) => Utils_1.TrackUtils.build(track, requester)),
+                    duration: playlistData.tracks.reduce((acc, cur) => acc + (cur.info.length || 0), 0),
+                }
+                : null;
             const result = {
                 loadType: res.loadType,
-                tracks: searchData.map((track) => Utils_1.TrackUtils.build(track, requester)) ?? [],
-                playlist: res.loadType === "playlist"
-                    ? {
-                        name: playlistData.info.name,
-                        tracks: playlistData.tracks.map((track) => Utils_1.TrackUtils.build(track, requester)) ?? [],
-                        duration: playlistData.tracks.reduce((acc, cur) => acc + (cur.info.length || 0), 0),
-                    }
-                    : null,
+                tracks,
+                playlist,
             };
-            return resolve(result);
-        });
+            return result;
+        }
+        catch (err) {
+            throw new Error(err);
+        }
     }
     /**
      * Decodes the base64 encoded tracks and returns a TrackData array.
@@ -235,16 +240,19 @@ class Manager extends events_1.EventEmitter {
      * Sends voice data to the Lavalink server.
      * @param data
      */
-    updateVoiceState(data) {
+    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;
@@ -272,7 +280,7 @@ class Manager extends events_1.EventEmitter {
         }
         if (REQUIRED_KEYS.every((key) => key in player.voiceState)) {
             const { sessionId, event: { token, endpoint }, } = player.voiceState;
-            player.node.rest.updatePlayer({
+            await player.node.rest.updatePlayer({
                 guildId: player.guild,
                 data: { voice: { token, endpoint, sessionId } },
             });

package/dist/structures/Node.js

@@ -4,7 +4,6 @@ exports.Node = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable no-case-declarations */
 const Utils_1 = require("./Utils");
-const undici_1 = require("undici");
 const Rest_1 = require("./Rest");
 const nodeCheck_1 = tslib_1.__importDefault(require("../utils/nodeCheck"));
 const ws_1 = tslib_1.__importDefault(require("ws"));
@@ -12,8 +11,6 @@ class Node {
     options;
     /** The socket for the node. */
     socket = null;
-    /** The HTTP pool used for rest calls. */
-    http;
     /** The amount of rest calls the node has made. */
     calls = 0;
     /** The stats for the node. */
@@ -65,7 +62,6 @@ class Node {
         if (this.options.secure) {
             this.options.port = 443;
         }
-        this.http = new undici_1.Pool(`http${this.options.secure ? "s" : ""}://${this.address}`, this.options.poolOptions);
         this.options.identifier = options.identifier || options.host;
         this.stats = {
             players: 0,

package/dist/structures/Rest.js

@@ -25,16 +25,16 @@ class Rest {
         return this.sessionId;
     }
     /** Retrieves all the players that are currently running on the node. */
-    getAllPlayers() {
-        return this.get(`/v4/sessions/${this.sessionId}/players`);
+    async getAllPlayers() {
+        return await this.get(`/v4/sessions/${this.sessionId}/players`);
     }
     /** Sends a PATCH request to update player related data. */
-    updatePlayer(options) {
-        return this.patch(`/v4/sessions/${this.sessionId}/players/${options.guildId}?noReplace=false`, options.data);
+    async updatePlayer(options) {
+        return await this.patch(`/v4/sessions/${this.sessionId}/players/${options.guildId}?noReplace=false`, options.data);
     }
     /** Sends a DELETE request to the server to destroy the player. */
-    destroyPlayer(guildId) {
-        return this.delete(`/v4/sessions/${this.sessionId}/players/${guildId}`);
+    async destroyPlayer(guildId) {
+        return await this.delete(`/v4/sessions/${this.sessionId}/players/${guildId}`);
     }
     /* Sends a GET request to the specified endpoint and returns the response data. */
     async request(method, endpoint, body) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magmastream",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "A user-friendly Lavalink client designed for NodeJS.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,10 +16,10 @@
   "devDependencies": {
     "@favware/rollup-type-bundler": "^2.0.0",
     "@types/lodash": "^4.14.195",
-    "@types/node": "^20.4.1",
+    "@types/node": "^20.4.2",
     "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.37.0",
-    "@typescript-eslint/parser": "^5.37.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.23.1",
     "npm-run-all": "^1.7.0",
     "typedoc": "^0.24.8",
@@ -32,7 +32,6 @@
     "events": "^3.3.0",
     "lodash": "^4.17.21",
     "tslib": "^2.4.0",
-    "undici": "^5.10.0",
     "ws": "^8.8.1"
   },
   "engines": {