magmastream 2.9.3-dev.5 → 2.9.3-dev.7

package/dist/index.d.ts

@@ -3466,11 +3466,22 @@ declare abstract class TrackUtils {
     static setTrackPartial(partial: TrackPartial[]): void;
     /**
      * Checks if the provided argument is a valid Track.
-     * If provided an array then every element will be checked.
-     * @param trackOrTracks The Track or array of Tracks to check.
+     * @param value The value to check.
      * @returns {boolean} Whether the provided argument is a valid Track.
      */
-    static validate(trackOrTracks: unknown): boolean;
+    static isTrack(track: unknown): track is Track;
+    /**
+     * Checks if the provided argument is a valid Track array.
+     * @param value The value to check.
+     * @returns {boolean} Whether the provided argument is a valid Track array.
+     */
+    static isTrackArray(value: unknown): value is Track[];
+    /**
+     * Checks if the provided argument is a valid Track or Track array.
+     * @param value The value to check.
+     * @returns {boolean} Whether the provided argument is a valid Track or Track array.
+     */
+    static validate(value: unknown): value is Track | Track[];
     /**
      * Builds a Track from the raw data from Lavalink and a optional requester.
      * @param data The raw data from Lavalink to build the Track from.

package/dist/structures/Player.js

@@ -806,11 +806,8 @@ class Player {
             if (currentPlayingTrack) {
                 await this.queue.add(currentPlayingTrack, 0);
             }
-            await this.play(lastTrack);
-        }
-        else {
-            await this.play(lastTrack);
         }
+        await this.play(lastTrack);
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {

package/dist/structures/Rest.js

@@ -104,35 +104,55 @@ class Rest {
             },
             data: body,
             timeout: this.node.options.apiRequestTimeoutMs,
+            validateStatus: () => true,
         };
+        let response;
         try {
-            const response = await (0, axios_1.default)(config);
-            return response.data;
+            response = await (0, axios_1.default)(config);
         }
         catch (err) {
-            const error = err;
-            if (!error.response) {
-                throw new MagmastreamError_1.MagmaStreamError({
-                    code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
-                    message: `No response from node ${this.node.options.identifier}: ${error.message}`,
-                });
-            }
-            const data = error.response.data;
-            if (data?.message === "Guild not found") {
-                return [];
-            }
-            if (error.response.status === 401) {
-                throw new MagmastreamError_1.MagmaStreamError({
-                    code: Enums_1.MagmaStreamErrorCode.REST_UNAUTHORIZED,
-                    message: `Unauthorized access to node ${this.node.options.identifier}`,
-                });
-            }
-            const dataMessage = typeof data === "string" ? data : data?.message ? data.message : Utils_1.JSONUtils.safe(data, 2);
+            const message = err instanceof Error ? err.message : "Unknown error";
             throw new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
-                message: `Request to node ${this.node.options.identifier} failed with status ${error.response.status}: ${dataMessage}`,
+                message: `No response from node ${this.node.options.identifier}: ${message}`,
             });
         }
+        const { status, data } = response;
+        if (status >= 200 && status < 300) {
+            return data;
+        }
+        // Lavalink sometimes returns "Guild not found" for inactive players
+        if (status === 404 && data?.message === "Guild not found") {
+            return [];
+        }
+        if (status === 401) {
+            throw new MagmastreamError_1.MagmaStreamError({
+                code: Enums_1.MagmaStreamErrorCode.REST_UNAUTHORIZED,
+                message: `Unauthorized access to node ${this.node.options.identifier}`,
+            });
+        }
+        if (status >= 400 && status < 500) {
+            const message = typeof data === "string"
+                ? data
+                : typeof data === "object" && data !== null && "message" in data && typeof data.message === "string"
+                    ? data.message
+                    : "Unknown client error";
+            return {
+                status,
+                error: true,
+                message,
+                data,
+            };
+        }
+        const safeMessage = typeof data === "string"
+            ? data
+            : typeof data === "object" && data !== null && "message" in data && typeof data.message === "string"
+                ? data.message
+                : Utils_1.JSONUtils.safe(data, 2);
+        throw new MagmastreamError_1.MagmaStreamError({
+            code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
+            message: `Request to node ${this.node.options.identifier} failed (${status}): ${safeMessage}`,
+        });
     }
     /**
      * Sends a GET request to the specified endpoint and returns the response data.

package/dist/structures/Utils.js

@@ -9,9 +9,11 @@ const Enums_1 = require("./Enums");
 const path_1 = tslib_1.__importDefault(require("path"));
 const safe_stable_stringify_1 = tslib_1.__importDefault(require("safe-stable-stringify"));
 const MagmastreamError_1 = require("./MagmastreamError");
+const lodash_1 = require("lodash");
 // import playwright from "playwright";
 /** @hidden */
 const SIZES = ["0", "1", "2", "3", "default", "mqdefault", "hqdefault", "maxresdefault"];
+const REQUIRED_TRACK_KEYS = ["track", "title", "uri"];
 class TrackUtils {
     static trackPartial = null;
     static manager;
@@ -54,25 +56,30 @@ class TrackUtils {
     }
     /**
      * Checks if the provided argument is a valid Track.
-     * If provided an array then every element will be checked.
-     * @param trackOrTracks The Track or array of Tracks to check.
+     * @param value The value to check.
      * @returns {boolean} Whether the provided argument is a valid Track.
      */
-    static validate(trackOrTracks) {
-        if (typeof trackOrTracks !== "object" || trackOrTracks === null) {
+    static isTrack(track) {
+        if (typeof track !== "object" || track === null)
             return false;
-        }
-        const isValidTrack = (track) => {
-            if (typeof track !== "object" || track === null) {
-                return false;
-            }
-            const t = track;
-            return (typeof t.track === "string" && typeof t.title === "string" && typeof t.identifier === "string" && typeof t.isrc === "string" && typeof t.uri === "string");
-        };
-        if (Array.isArray(trackOrTracks)) {
-            return trackOrTracks.every(isValidTrack);
-        }
-        return isValidTrack(trackOrTracks);
+        const t = track;
+        return REQUIRED_TRACK_KEYS.every((key) => typeof t[key] === "string");
+    }
+    /**
+     * Checks if the provided argument is a valid Track array.
+     * @param value The value to check.
+     * @returns {boolean} Whether the provided argument is a valid Track array.
+     */
+    static isTrackArray(value) {
+        return Array.isArray(value) && value.every(this.isTrack);
+    }
+    /**
+     * Checks if the provided argument is a valid Track or Track array.
+     * @param value The value to check.
+     * @returns {boolean} Whether the provided argument is a valid Track or Track array.
+     */
+    static validate(value) {
+        return this.isTrack(value) || this.isTrackArray(value);
     }
     /**
      * Builds a Track from the raw data from Lavalink and a optional requester.
@@ -617,65 +624,87 @@ class PlayerUtils {
      * @returns The serialized Player instance
      */
     static async serializePlayer(player) {
-        try {
-            const current = await player.queue.getCurrent();
-            const tracks = await player.queue.getTracks();
-            const previous = await player.queue.getPrevious();
-            const serializeTrack = (track) => ({
-                ...track,
-                requester: track.requester ? { id: track.requester.id, username: track.requester.username } : null,
-            });
-            const safeNode = player.node
-                ? JSON.parse(JSON.stringify(player.node, (key, value) => {
-                    if (key === "rest" || key === "players" || key === "shards" || key === "manager")
-                        return undefined;
-                    return value;
-                }))
-                : null;
-            return JSON.parse(JSON.stringify(player, (key, value) => {
-                if (key === "manager")
-                    return null;
-                if (key === "node")
-                    return safeNode;
-                if (key === "filters") {
-                    return {
-                        distortion: value?.distortion ?? null,
-                        equalizer: value?.equalizer ?? [],
-                        karaoke: value?.karaoke ?? null,
-                        rotation: value?.rotation ?? null,
-                        timescale: value?.timescale ?? null,
-                        vibrato: value?.vibrato ?? null,
-                        reverb: value?.reverb ?? null,
-                        volume: value?.volume ?? 1.0,
-                        bassBoostlevel: value?.bassBoostlevel ?? null,
-                        filterStatus: value?.filtersStatus ? { ...value.filtersStatus } : {},
-                    };
-                }
-                if (key === "queue") {
-                    return {
-                        current: current ? serializeTrack(current) : null,
-                        tracks: tracks.map(serializeTrack),
-                        previous: previous.map(serializeTrack),
-                    };
-                }
-                if (key === "data") {
-                    return {
-                        clientUser: value?.Internal_AutoplayUser ?? null,
-                        nowPlayingMessage: value?.nowPlayingMessage ?? null,
-                    };
-                }
+        const current = await player.queue.getCurrent();
+        const tracks = await player.queue.getTracks();
+        const previous = await player.queue.getPrevious();
+        const serializeTrack = (track) => ({
+            ...track,
+            requester: track.requester ? { id: track.requester.id, username: track.requester.username } : null,
+        });
+        const safeNode = player.node
+            ? JSON.parse(JSON.stringify(player.node, (key, value) => {
+                if (key === "rest" || key === "players" || key === "shards" || key === "manager")
+                    return undefined;
                 return value;
-            }));
+            }))
+            : null;
+        const isNonSerializable = (value) => {
+            if (typeof value === "function" || typeof value === "symbol")
+                return true;
+            if (typeof value === "object" && value !== null) {
+                const ctorName = value.constructor?.name ?? "";
+                return (value instanceof Map ||
+                    value instanceof Set ||
+                    value instanceof WeakMap ||
+                    value instanceof WeakSet ||
+                    ctorName === "Timeout" ||
+                    ctorName === "Socket" ||
+                    ctorName === "TLSSocket" ||
+                    ctorName === "EventEmitter");
+            }
+            return false;
+        };
+        const safeReplacer = (key, value) => {
+            if (isNonSerializable(value))
+                return undefined;
+            if (key === "manager")
+                return null;
+            if (key === "node")
+                return safeNode;
+            if (key === "filters" && (0, lodash_1.isPlainObject)(value)) {
+                return {
+                    distortion: value["distortion"] ?? null,
+                    equalizer: value["equalizer"] ?? [],
+                    karaoke: value["karaoke"] ?? null,
+                    rotation: value["rotation"] ?? null,
+                    timescale: value["timescale"] ?? null,
+                    vibrato: value["vibrato"] ?? null,
+                    reverb: value["reverb"] ?? null,
+                    volume: value["volume"] ?? 1.0,
+                    bassBoostlevel: value["bassBoostlevel"] ?? null,
+                    filterStatus: (0, lodash_1.isPlainObject)(value["filtersStatus"]) ? { ...value["filtersStatus"] } : {},
+                };
+            }
+            if (key === "queue") {
+                return {
+                    current: current ? serializeTrack(current) : null,
+                    tracks: tracks.map(serializeTrack),
+                    previous: previous.map(serializeTrack),
+                };
+            }
+            if (key === "data" && (0, lodash_1.isPlainObject)(value)) {
+                return {
+                    clientUser: value["Internal_AutoplayUser"] ?? null,
+                    nowPlayingMessage: value["nowPlayingMessage"] ?? null,
+                };
+            }
+            return value;
+        };
+        let serialized;
+        try {
+            serialized = JSON.stringify(player, safeReplacer);
         }
         catch (err) {
-            throw err instanceof MagmastreamError_1.MagmaStreamError
+            const error = err instanceof MagmastreamError_1.MagmaStreamError
                 ? err
                 : new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.MANAGER_SEARCH_FAILED,
                     message: `An error occurred while searching: ${err instanceof Error ? err.message : String(err)}`,
                     cause: err instanceof Error ? err : undefined,
                 });
+            console.error(error);
         }
+        return JSON.parse(serialized);
     }
     /**
      * Gets the base directory for player data.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.3-dev.5",
+	"version": "2.9.3-dev.7",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",