magmastream 2.9.3-dev.13 → 2.9.3-dev.14

package/dist/index.d.ts

@@ -322,6 +322,7 @@ declare enum MagmaStreamErrorCode {
     UTILS_TRACK_PARTIAL_INVALID = "MS_UTILS_TRACK_PARTIAL_INVALID",
     UTILS_TRACK_BUILD_FAILED = "MS_UTILS_TRACK_BUILD_FAILED",
     UTILS_AUTOPLAY_BUILD_FAILED = "MS_UTILS_AUTOPLAY_BUILD_FAILED",
+    UTILS_PLAYER_SERIALIZE_FAILED = "MS_UTILS_PLAYER_SERIALIZE_FAILED",
     PLUGIN_LOAD_FAILED = "MS_PLUGIN_LOAD_FAILED",
     PLUGIN_RUNTIME_ERROR = "MS_PLUGIN_RUNTIME_ERROR"
 }
@@ -2355,6 +2356,11 @@ declare class Player {
      * @returns {NodeJS.Timeout | null} - The dynamic loop interval of the player.
      */
     getDynamicLoopIntervalPublic(): NodeJS.Timeout | null;
+    /**
+     * Retrieves the data associated with the player.
+     * @returns {Record<string, unknown>} - The data associated with the player.
+     */
+    getSerializableData(): Record<string, unknown>;
     /**
      * Retrieves the current lyrics for the playing track.
      * @param skipTrackSource - Indicates whether to skip the track source when fetching lyrics.
@@ -3594,7 +3600,7 @@ declare abstract class PlayerUtils {
      * @param player The Player instance to serialize
      * @returns The serialized Player instance
      */
-    static serializePlayer(player: Player): Promise<Record<string, unknown>>;
+    static serializePlayer(player: Player): Promise<Record<string, unknown> | null>;
     /**
      * Gets the base directory for player data.
      */

package/dist/structures/Enums.js

@@ -328,6 +328,7 @@ var MagmaStreamErrorCode;
     MagmaStreamErrorCode["UTILS_TRACK_PARTIAL_INVALID"] = "MS_UTILS_TRACK_PARTIAL_INVALID";
     MagmaStreamErrorCode["UTILS_TRACK_BUILD_FAILED"] = "MS_UTILS_TRACK_BUILD_FAILED";
     MagmaStreamErrorCode["UTILS_AUTOPLAY_BUILD_FAILED"] = "MS_UTILS_AUTOPLAY_BUILD_FAILED";
+    MagmaStreamErrorCode["UTILS_PLAYER_SERIALIZE_FAILED"] = "MS_UTILS_PLAYER_SERIALIZE_FAILED";
     // PLUGIN (1800)
     MagmaStreamErrorCode["PLUGIN_LOAD_FAILED"] = "MS_PLUGIN_LOAD_FAILED";
     MagmaStreamErrorCode["PLUGIN_RUNTIME_ERROR"] = "MS_PLUGIN_RUNTIME_ERROR";
@@ -381,6 +382,7 @@ exports.MagmaStreamErrorNumbers = {
     [MagmaStreamErrorCode.UTILS_TRACK_PARTIAL_INVALID]: 1700,
     [MagmaStreamErrorCode.UTILS_TRACK_BUILD_FAILED]: 1701,
     [MagmaStreamErrorCode.UTILS_AUTOPLAY_BUILD_FAILED]: 1702,
+    [MagmaStreamErrorCode.UTILS_PLAYER_SERIALIZE_FAILED]: 1703,
     // PLUGIN
     [MagmaStreamErrorCode.PLUGIN_LOAD_FAILED]: 1800,
     [MagmaStreamErrorCode.PLUGIN_RUNTIME_ERROR]: 1801,

package/dist/structures/Player.js

@@ -1082,6 +1082,13 @@ class Player {
     getDynamicLoopIntervalPublic() {
         return this.dynamicLoopInterval;
     }
+    /**
+     * Retrieves the data associated with the player.
+     * @returns {Record<string, unknown>} - The data associated with the player.
+     */
+    getSerializableData() {
+        return { ...this.data };
+    }
     /**
      * Retrieves the current lyrics for the playing track.
      * @param skipTrackSource - Indicates whether to skip the track source when fetching lyrics.

package/dist/structures/Utils.js

@@ -9,7 +9,7 @@ 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 { isPlainObject } from "lodash";
 // import playwright from "playwright";
 /** @hidden */
 const SIZES = ["0", "1", "2", "3", "default", "mqdefault", "hqdefault", "maxresdefault"];
@@ -623,20 +623,6 @@ class PlayerUtils {
      * @returns The serialized Player instance
      */
     static async serializePlayer(player) {
-        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;
@@ -653,59 +639,99 @@ class PlayerUtils {
             }
             return false;
         };
-        const safeReplacer = (key, value) => {
-            if (isNonSerializable(value))
-                return undefined;
-            if (key === "manager")
-                return null;
-            if (key === "node")
-                return safeNode;
-            if (key === "filters") {
-                const filters = { ...value };
-                delete filters.player;
-                return {
-                    distortion: filters["distortion"] ?? null,
-                    equalizer: filters["equalizer"] ?? [],
-                    karaoke: filters["karaoke"] ?? null,
-                    rotation: filters["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,
-                };
+        const safeSerialize = (obj) => {
+            if (!obj || typeof obj !== "object")
+                return obj;
+            const result = {};
+            for (const [k, v] of Object.entries(obj)) {
+                if (!isNonSerializable(v)) {
+                    result[k] = v;
+                }
             }
-            return value;
+            return result;
         };
-        let serialized;
         try {
-            serialized = JSON.stringify(player, safeReplacer);
+            const [current, tracks, previous] = await Promise.all([player.queue.getCurrent(), player.queue.getTracks(), player.queue.getPrevious()]);
+            const serializeTrack = (track) => {
+                try {
+                    return {
+                        ...track,
+                        requester: track.requester ? { id: track.requester.id, username: track.requester.username } : null,
+                    };
+                }
+                catch {
+                    return null;
+                }
+            };
+            const safeCurrent = current ? serializeTrack(current) : null;
+            const safeTracks = tracks.map(serializeTrack).filter((t) => t !== null);
+            const safePrevious = previous.map(serializeTrack).filter((t) => t !== null);
+            let safeNode = null;
+            if (player.node) {
+                try {
+                    safeNode = JSON.parse(JSON.stringify(player.node, (key, value) => {
+                        if (["rest", "players", "shards", "manager"].includes(key))
+                            return undefined;
+                        if (isNonSerializable(value))
+                            return undefined;
+                        return value;
+                    }));
+                }
+                catch {
+                    safeNode = null;
+                }
+            }
+            const snapshot = {
+                options: player.options,
+                voiceState: player.voiceState,
+                clusterId: player.clusterId,
+                guildId: player.guildId,
+                voiceChannelId: player.voiceChannelId ?? null,
+                textChannelId: player.textChannelId ?? null,
+                volume: player.volume,
+                paused: player.paused,
+                playing: player.playing,
+                position: player.position,
+                trackRepeat: player.trackRepeat,
+                queueRepeat: player.queueRepeat,
+                dynamicRepeat: player.dynamicRepeat,
+                node: safeNode,
+                queue: {
+                    current: safeCurrent,
+                    tracks: safeTracks,
+                    previous: safePrevious,
+                },
+                filters: player.filters
+                    ? {
+                        distortion: player.filters.distortion ?? null,
+                        equalizer: player.filters.equalizer ?? [],
+                        karaoke: player.filters.karaoke ?? null,
+                        rotation: player.filters.rotation ?? null,
+                        timescale: player.filters.timescale ?? null,
+                        vibrato: player.filters.vibrato ?? null,
+                        reverb: player.filters.reverb ?? null,
+                        volume: player.filters.volume ?? 1.0,
+                        bassBoostlevel: player.filters.bassBoostlevel ?? null,
+                        filterStatus: { ...player.filters.filtersStatus },
+                    }
+                    : null,
+                data: safeSerialize(player.getSerializableData()),
+            };
+            // Sanity check
+            JSON.stringify(snapshot);
+            return snapshot;
         }
         catch (err) {
             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)}`,
+                    code: Enums_1.MagmaStreamErrorCode.UTILS_PLAYER_SERIALIZE_FAILED,
+                    message: `An error occurred while serializing player: ${err instanceof Error ? err.message : String(err)}`,
                     cause: err instanceof Error ? err : undefined,
                 });
             console.error(error);
+            return null;
         }
-        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.13",
+	"version": "2.9.3-dev.14",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",