magmastream 2.9.3-dev.6 → 2.9.3-dev.8

package/dist/structures/Utils.js

@@ -9,6 +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 playwright from "playwright";
 /** @hidden */
 const SIZES = ["0", "1", "2", "3", "default", "mqdefault", "hqdefault", "maxresdefault"];
@@ -623,65 +624,89 @@ 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") {
+                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,
+                };
+            }
+            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.6",
+	"version": "2.9.3-dev.8",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",