magmastream 2.9.3-dev.2 → 2.9.3-dev.21

package/dist/statestorage/JsonQueue.js

@@ -17,6 +17,10 @@ class JsonQueue {
      * The base path for the queue files.
      */
     basePath;
+    /**
+     * Whether the queue has been destroyed.
+     */
+    destroyed = false;
     /**
      * @param guildId The guild ID.
      * @param manager The manager.
@@ -56,8 +60,7 @@ class JsonQueue {
             this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[JSONQUEUE] Added ${tracks.length} track(s) to queue`);
             if (this.manager.players.has(this.guildId) && this.manager.players.get(this.guildId).isAutoplay) {
                 if (!isArray) {
-                    const AutoplayUser = (await this.manager.players.get(this.guildId).get("Internal_AutoplayUser"));
-                    if (AutoplayUser && AutoplayUser.id === track.requester.id) {
+                    if (track.isAutoplay) {
                         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                             details: {
@@ -173,6 +176,27 @@ class JsonQueue {
             console.error(error);
         }
     }
+    /**
+     * Destroys the queue and releases all resources.
+     * After calling this method, the queue must not be used again.
+     */
+    async destroy() {
+        if (this.destroyed)
+            return;
+        this.destroyed = true;
+        try {
+            await Promise.all([this.deleteFile(this.queuePath), this.deleteFile(this.currentPath), this.deleteFile(this.previousPath)]);
+        }
+        catch (err) {
+            console.error(err instanceof MagmastreamError_1.MagmaStreamError
+                ? err
+                : new MagmastreamError_1.MagmaStreamError({
+                    code: Enums_1.MagmaStreamErrorCode.QUEUE_JSON_ERROR,
+                    message: `Failed to destroy JSONQueue for guild ${this.guildId}`,
+                    cause: err,
+                }));
+        }
+    }
     /**
      * @returns The total duration of the queue.
      */
@@ -349,7 +373,7 @@ class JsonQueue {
             const queue = await this.getQueue();
             const userMap = new Map();
             for (const track of queue) {
-                const userId = track.requester.id;
+                const userId = track.requester.id.toString();
                 if (!userMap.has(userId))
                     userMap.set(userId, []);
                 userMap.get(userId).push(track);
@@ -474,7 +498,7 @@ class JsonQueue {
             const queue = await this.getQueue();
             const userMap = new Map();
             for (const track of queue) {
-                const userId = track.requester.id;
+                const userId = track.requester.id.toString();
                 if (!userMap.has(userId))
                     userMap.set(userId, []);
                 userMap.get(userId).push(track);

package/dist/statestorage/MemoryQueue.js

@@ -16,6 +16,10 @@ class MemoryQueue extends Array {
     manager;
     /** The guild ID property. */
     guildId;
+    /**
+     * Whether the queue has been destroyed.
+     */
+    destroyed = false;
     /**
      * Constructs a new Queue.
      * @param guildId The guild ID.
@@ -34,7 +38,7 @@ class MemoryQueue extends Array {
      * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
      * @param [offset=null] The position to add the track(s) at. If not provided, the track(s) will be added at the end of the queue.
      */
-    async add(track, offset) {
+    add(track, offset) {
         try {
             const isArray = Array.isArray(track);
             const tracks = isArray ? [...track] : [track];
@@ -84,8 +88,7 @@ class MemoryQueue extends Array {
             }
             if (this.manager.players.has(this.guildId) && this.manager.players.get(this.guildId).isAutoplay) {
                 if (!isArray) {
-                    const AutoplayUser = this.manager.players.get(this.guildId).get("Internal_AutoplayUser");
-                    if (AutoplayUser && AutoplayUser.id === track.requester.id) {
+                    if (track.isAutoplay) {
                         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                             details: {
@@ -123,7 +126,7 @@ class MemoryQueue extends Array {
      * Adds a track to the previous tracks.
      * @param track The track or tracks to add. Can be a single `Track` or an array of `Track`s.
      */
-    async addPrevious(track) {
+    addPrevious(track) {
         try {
             const max = this.manager.options.maxPreviousTracks;
             if (Array.isArray(track)) {
@@ -155,7 +158,7 @@ class MemoryQueue extends Array {
      * Clears the queue.
      * This will remove all tracks from the queue and emit a state update event.
      */
-    async clear() {
+    clear() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -187,20 +190,32 @@ class MemoryQueue extends Array {
     /**
      * Clears the previous tracks.
      */
-    async clearPrevious() {
+    clearPrevious() {
         this.previous = [];
     }
     /**
      * Removes the first element from the queue.
      */
-    async dequeue() {
+    dequeue() {
         return super.shift();
     }
+    /**
+     * Destroys the queue and releases all resources.
+     * After calling this method, the queue must not be used again.
+     */
+    destroy() {
+        if (this.destroyed)
+            return;
+        this.destroyed = true;
+        this.splice(0);
+        this.previous.length = 0;
+        this.current = null;
+    }
     /**
      * The total duration of the queue in milliseconds.
      * This includes the duration of the currently playing track.
      */
-    async duration() {
+    duration() {
         const current = this.current?.duration ?? 0;
         return this.reduce((acc, cur) => acc + (cur.duration || 0), current);
     }
@@ -208,7 +223,7 @@ class MemoryQueue extends Array {
      * Adds the specified track or tracks to the front of the queue.
      * @param track The track or tracks to add.
      */
-    async enqueueFront(track) {
+    enqueueFront(track) {
         if (Array.isArray(track)) {
             this.unshift(...track);
         }
@@ -219,49 +234,49 @@ class MemoryQueue extends Array {
     /**
      * @returns Whether all elements in the queue satisfy the provided testing function.
      */
-    async everyAsync(callback) {
+    everyAsync(callback) {
         return this.every(callback);
     }
     /**
      * @returns A new array with all elements that pass the test implemented by the provided function.
      */
-    async filterAsync(callback) {
+    filterAsync(callback) {
         return this.filter(callback);
     }
     /**
      * @returns The first element in the queue that satisfies the provided testing function.
      */
-    async findAsync(callback) {
+    findAsync(callback) {
         return this.find(callback);
     }
     /**
      * @returns The current track.
      */
-    async getCurrent() {
+    getCurrent() {
         return this.current;
     }
     /**
      * @returns The previous tracks.
      */
-    async getPrevious() {
+    getPrevious() {
         return [...this.previous];
     }
     /**
      * @returns The tracks in the queue from start to end.
      */
-    async getSlice(start, end) {
+    getSlice(start, end) {
         return this.slice(start, end); // Native sync method, still wrapped in a Promise
     }
     /**
      * @returns The tracks in the queue.
      */
-    async getTracks() {
+    getTracks() {
         return [...this]; // clone to avoid direct mutation
     }
     /**
      * @returns A new array with the results of calling a provided function on every element in the queue.
      */
-    async mapAsync(callback) {
+    mapAsync(callback) {
         return this.map(callback);
     }
     /**
@@ -271,16 +286,16 @@ class MemoryQueue extends Array {
      * @param items The elements to add to the queue.
      * @returns The modified queue.
      */
-    async modifyAt(start, deleteCount = 0, ...items) {
+    modifyAt(start, deleteCount = 0, ...items) {
         return super.splice(start, deleteCount, ...items);
     }
     /**
      * @returns The newest track.
      */
-    async popPrevious() {
+    popPrevious() {
         return this.previous.pop() || null; // get newest track
     }
-    async remove(startOrPosition = 0, end) {
+    remove(startOrPosition = 0, end) {
         try {
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
             if (typeof end !== "undefined") {
@@ -332,7 +347,7 @@ class MemoryQueue extends Array {
     /**
      * Shuffles the queue to play tracks requested by each user one by one.
      */
-    async roundRobinShuffle() {
+    roundRobinShuffle() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -340,11 +355,11 @@ class MemoryQueue extends Array {
             const userTracks = new Map();
             // Group the tracks in the queue by the user that requested them.
             this.forEach((track) => {
-                const user = track.requester.id;
-                if (!userTracks.has(user)) {
-                    userTracks.set(user, []);
+                const userId = track.requester.id.toString();
+                if (!userTracks.has(userId)) {
+                    userTracks.set(userId, []);
                 }
-                userTracks.get(user).push(track);
+                userTracks.get(userId).push(track);
             });
             // Shuffle the tracks of each user.
             userTracks.forEach((tracks) => {
@@ -395,20 +410,20 @@ class MemoryQueue extends Array {
     /**
      * @param track The track to set.
      */
-    async setCurrent(track) {
+    setCurrent(track) {
         this.current = track;
     }
     /**
      * @param tracks The tracks to set.
      */
-    async setPrevious(tracks) {
+    setPrevious(tracks) {
         this.previous = [...tracks];
     }
     /**
      * Shuffles the queue.
      * This will randomize the order of the tracks in the queue and emit a state update event.
      */
-    async shuffle() {
+    shuffle() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -444,13 +459,13 @@ class MemoryQueue extends Array {
      * This does not include the currently playing track.
      * @returns The size of tracks in the queue.
      */
-    async size() {
+    size() {
         return this.length;
     }
     /**
      * @returns Whether at least one element in the queue satisfies the provided testing function.
      */
-    async someAsync(callback) {
+    someAsync(callback) {
         return this.some(callback);
     }
     /**
@@ -458,24 +473,24 @@ class MemoryQueue extends Array {
      * This includes the current track if it is not null.
      * @returns The total size of tracks in the queue including the current track.
      */
-    async totalSize() {
+    totalSize() {
         return this.length + (this.current ? 1 : 0);
     }
     /**
      * Shuffles the queue to play tracks requested by each user one block at a time.
      */
-    async userBlockShuffle() {
+    userBlockShuffle() {
         try {
             // Capture the current state of the player for event emission.
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
             // Group the tracks in the queue by the user that requested them.
             const userTracks = new Map();
             this.forEach((track) => {
-                const user = track.requester.id;
-                if (!userTracks.has(user)) {
-                    userTracks.set(user, []);
+                const userId = track.requester.id.toString();
+                if (!userTracks.has(userId)) {
+                    userTracks.set(userId, []);
                 }
-                userTracks.get(user).push(track);
+                userTracks.get(userId).push(track);
             });
             // Create a new array for the shuffled queue.
             const shuffledQueue = [];

package/dist/statestorage/RedisQueue.js

@@ -18,6 +18,10 @@ class RedisQueue {
      * The Redis instance.
      */
     redis;
+    /**
+     * Whether the queue has been destroyed.
+     */
+    destroyed = false;
     /**
      * Constructs a new RedisQueue.
      * @param guildId The guild ID.
@@ -27,11 +31,7 @@ class RedisQueue {
         this.guildId = guildId;
         this.manager = manager;
         this.redis = manager.redis;
-        const rawPrefix = manager.options.stateStorage.redisConfig.prefix;
-        let clean = typeof rawPrefix === "string" ? rawPrefix.trim() : "";
-        if (!clean.endsWith(":"))
-            clean = clean || "magmastream";
-        this.redisPrefix = `${clean}:`;
+        this.redisPrefix = Utils_1.PlayerUtils.getRedisKey();
     }
     // #region Public
     /**
@@ -81,8 +81,7 @@ class RedisQueue {
             // Autoplay logic
             if (this.manager.players.has(this.guildId) && this.manager.players.get(this.guildId).isAutoplay) {
                 if (!Array.isArray(track)) {
-                    const AutoplayUser = (await this.manager.players.get(this.guildId).get("Internal_AutoplayUser"));
-                    if (AutoplayUser && AutoplayUser.id === track.requester.id) {
+                    if (track.isAutoplay) {
                         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                             details: {
@@ -223,6 +222,28 @@ class RedisQueue {
             console.error(error);
         }
     }
+    /**
+     * Destroys the queue and releases all resources.
+     * After calling this method, the queue must not be used again.
+     */
+    async destroy() {
+        if (this.destroyed)
+            return;
+        this.destroyed = true;
+        try {
+            await this.redis.del(this.queueKey, this.previousKey, this.currentKey);
+        }
+        catch (err) {
+            const error = err instanceof MagmastreamError_1.MagmaStreamError
+                ? err
+                : new MagmastreamError_1.MagmaStreamError({
+                    code: Enums_1.MagmaStreamErrorCode.QUEUE_REDIS_ERROR,
+                    message: `Failed to destroy RedisQueue for guild ${this.guildId}: ${err.message}`,
+                    cause: err,
+                });
+            console.error(error);
+        }
+    }
     /**
      * @returns The total duration of the queue in milliseconds.
      * This includes the duration of the currently playing track.
@@ -488,7 +509,7 @@ class RedisQueue {
             const deserialized = rawTracks.map(this.deserialize);
             const userMap = new Map();
             for (const track of deserialized) {
-                const userId = track.requester.id;
+                const userId = track.requester.id.toString();
                 if (!userMap.has(userId))
                     userMap.set(userId, []);
                 userMap.get(userId).push(track);
@@ -659,7 +680,7 @@ class RedisQueue {
             const deserialized = rawTracks.map(this.deserialize);
             const userMap = new Map();
             for (const track of deserialized) {
-                const userId = track.requester.id;
+                const userId = track.requester.id.toString();
                 if (!userMap.has(userId))
                     userMap.set(userId, []);
                 userMap.get(userId).push(track);

package/dist/structures/Enums.js

@@ -163,6 +163,8 @@ var TrackPartial;
     TrackPartial["PluginInfo"] = "pluginInfo";
     /** The custom data of the track */
     TrackPartial["CustomData"] = "customData";
+    /** Whether the track got autoplayed */
+    TrackPartial["IsAutoPlay"] = "isAutoplay";
 })(TrackPartial || (exports.TrackPartial = TrackPartial = {}));
 /**
  * Manager Event Types Enum
@@ -283,6 +285,7 @@ var MagmaStreamErrorCode;
     MagmaStreamErrorCode["GENERAL_UNKNOWN"] = "MS_GENERAL_UNKNOWN";
     MagmaStreamErrorCode["GENERAL_TIMEOUT"] = "MS_GENERAL_TIMEOUT";
     MagmaStreamErrorCode["GENERAL_INVALID_MANAGER"] = "MS_GENERAL_INVALID_MANAGER";
+    MagmaStreamErrorCode["INTENT_MISSING"] = "MS_INTENT_MISSING";
     // MANAGER (1100)
     MagmaStreamErrorCode["MANAGER_INIT_FAILED"] = "MS_MANAGER_INIT_FAILED";
     MagmaStreamErrorCode["MANAGER_INVALID_CONFIG"] = "MS_MANAGER_INVALID_CONFIG";
@@ -326,6 +329,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";
@@ -336,6 +340,7 @@ exports.MagmaStreamErrorNumbers = {
     [MagmaStreamErrorCode.GENERAL_UNKNOWN]: 1000,
     [MagmaStreamErrorCode.GENERAL_TIMEOUT]: 1001,
     [MagmaStreamErrorCode.GENERAL_INVALID_MANAGER]: 1002,
+    [MagmaStreamErrorCode.INTENT_MISSING]: 1003,
     // MANAGER
     [MagmaStreamErrorCode.MANAGER_INIT_FAILED]: 1100,
     [MagmaStreamErrorCode.MANAGER_INVALID_CONFIG]: 1101,
@@ -379,6 +384,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/Filters.js

@@ -8,8 +8,6 @@ class Filters {
     distortion;
     equalizer;
     karaoke;
-    manager;
-    player;
     rotation;
     timescale;
     vibrato;
@@ -17,15 +15,16 @@ class Filters {
     volume;
     bassBoostlevel;
     filtersStatus;
+    manager;
+    player;
     constructor(player, manager) {
         this.distortion = null;
         this.equalizer = [];
         this.karaoke = null;
-        this.manager = manager;
-        this.player = player;
         this.rotation = null;
         this.timescale = null;
         this.vibrato = null;
+        this.reverb = null;
         this.volume = 1.0;
         this.bassBoostlevel = 0;
         // Initialize filter status
@@ -33,6 +32,8 @@ class Filters {
             acc[filter] = false;
             return acc;
         }, {});
+        this.manager = manager;
+        this.player = player;
     }
     /**
      * Updates the player's audio filters.