magmastream 2.9.0-dev.34 → 2.9.0-dev.36

package/dist/structures/Node.js

@@ -50,18 +50,23 @@ class Node {
         }
         (0, nodeCheck_1.default)(options);
         this.options = {
-            port: 2333,
-            password: "youshallnotpass",
-            useSSL: false,
-            maxRetryAttempts: 30,
-            retryDelayMs: 60000,
-            nodePriority: 0,
             ...options,
+            host: options.host ?? "localhost",
+            port: options.port ?? 2333,
+            password: options.password ?? "youshallnotpass",
+            useSSL: options.useSSL ?? false,
+            identifier: options.identifier ?? options.host,
+            maxRetryAttempts: options.maxRetryAttempts ?? 30,
+            retryDelayMs: options.retryDelayMs ?? 60000,
+            enableSessionResumeOption: options.enableSessionResumeOption ?? false,
+            sessionTimeoutMs: options.sessionTimeoutMs ?? 1000,
+            apiRequestTimeoutMs: options.apiRequestTimeoutMs ?? 10000,
+            nodePriority: options.nodePriority ?? 0,
+            isNodeLink: options.isNodeLink ?? false,
         };
         if (this.options.useSSL) {
             this.options.port = 443;
         }
-        this.options.identifier = options.identifier || options.host;
         this.stats = {
             players: 0,
             playingPlayers: 0,
@@ -517,7 +522,8 @@ class Node {
             this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
                 changeType: Enums_1.PlayerStateEventTypes.TrackChange,
                 details: {
-                    changeType: "autoPlay",
+                    type: "track",
+                    action: "autoPlay",
                     track: track,
                 },
             });
@@ -526,7 +532,8 @@ class Node {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "start",
+                type: "track",
+                action: "start",
                 track: track,
             },
         });
@@ -593,7 +600,8 @@ class Node {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "end",
+                type: "track",
+                action: "end",
                 track: track,
             },
         });

package/dist/structures/Player.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Player = void 0;
 const tslib_1 = require("tslib");
 const Filters_1 = require("./Filters");
-const Queue_1 = require("./Queue");
+const MemoryQueue_1 = require("../statestorage/MemoryQueue");
 const Utils_1 = require("./Utils");
 const _ = tslib_1.__importStar(require("lodash"));
 const playerCheck_1 = tslib_1.__importDefault(require("../utils/playerCheck"));
-const RedisQueue_1 = require("./RedisQueue");
-// import { IQueue, Lyrics, PlayerOptions, PlayerUpdateVoiceState, PlayOptions, SearchQuery, SearchResult, Track, VoiceState } from "./Types";
+const RedisQueue_1 = require("../statestorage/RedisQueue");
 const Enums_1 = require("./Enums");
 const ws_1 = require("ws");
+const JsonQueue_1 = require("../statestorage/JsonQueue");
 class Player {
     options;
     /** The Queue for the Player. */
@@ -98,15 +98,20 @@ class Player {
         if (!this.node)
             throw new RangeError("No available nodes.");
         // Initialize the queue with the guild ID and manager.
-        if (this.manager.options.stateStorage.type === Enums_1.StateStorageType.Redis) {
-            this.queue = new RedisQueue_1.RedisQueue(this.guildId, this.manager);
-        }
-        else {
-            this.queue = new Queue_1.Queue(this.guildId, this.manager);
-        }
-        if (this.queue instanceof Queue_1.Queue) {
-            this.queue.previous = [];
+        switch (this.manager.options.stateStorage.type) {
+            case Enums_1.StateStorageType.Redis:
+                this.queue = new RedisQueue_1.RedisQueue(this.guildId, this.manager);
+                break;
+            case Enums_1.StateStorageType.Memory:
+                this.queue = new MemoryQueue_1.MemoryQueue(this.guildId, this.manager);
+                break;
+            case Enums_1.StateStorageType.JSON:
+                this.queue = new JsonQueue_1.JsonQueue(this.guildId, this.manager);
+                break;
         }
+        // if (this.queue instanceof MemoryQueue) {
+        // 	this.queue.previous = [];
+        // }
         // Add the player to the manager's player collection.
         this.manager.players.set(options.guildId, this);
         // Set the initial volume.
@@ -181,7 +186,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ConnectionChange,
             details: {
-                changeType: "connect",
+                type: "connection",
+                action: "connect",
                 previousConnection: oldPlayer?.state === Enums_1.StateTypes.Connected,
                 currentConnection: true,
             },
@@ -216,7 +222,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ConnectionChange,
             details: {
-                changeType: "disconnect",
+                type: "connection",
+                action: "disconnect",
                 previousConnection: oldPlayer.state === Enums_1.StateTypes.Connected,
                 currentConnection: false,
             },
@@ -231,7 +238,6 @@ class Player {
      * @emits {PlayerStateUpdate} - Emitted when the player state is updated.
      */
     async destroy(disconnect = true) {
-        const oldPlayer = this ? { ...this } : null;
         this.state = Enums_1.StateTypes.Destroying;
         if (disconnect) {
             await this.disconnect().catch((err) => {
@@ -244,11 +250,10 @@ class Player {
         await this.queue.clear();
         await this.queue.clearPrevious();
         await this.queue.setCurrent(null);
-        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, null, {
-            changeType: Enums_1.PlayerStateEventTypes.PlayerDestroy,
-        });
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerDestroy, this);
         const deleted = this.manager.players.delete(this.guildId);
+        if (this.manager.options.stateStorage.deleteInactivePlayers)
+            await this.manager.cleanupInactivePlayer(this.guildId);
         return deleted;
     }
     /**
@@ -270,7 +275,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ChannelChange,
             details: {
-                changeType: "voice",
+                type: "channel",
+                action: "voice",
                 previousChannel: oldPlayer.voiceChannelId || null,
                 currentChannel: this.voiceChannelId,
             },
@@ -299,7 +305,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ChannelChange,
             details: {
-                changeType: "text",
+                type: "channel",
+                action: "text",
                 previousChannel: oldPlayer.textChannelId || null,
                 currentChannel: this.textChannelId,
             },
@@ -378,6 +385,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.AutoPlayChange,
             details: {
+                type: "autoplay",
+                action: "toggle",
                 previousAutoplay: oldPlayer.isAutoplay,
                 currentAutoplay: this.isAutoplay,
             },
@@ -410,17 +419,19 @@ class Player {
         if (volume < 0 || volume > 1000)
             throw new RangeError("Volume must be between 0 and 1000.");
         const oldVolume = this.volume;
+        const oldPlayer = { ...this };
         await this.node.rest.updatePlayer({
             guildId: this.options.guildId,
             data: { volume },
         });
         this.volume = volume;
-        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, {
+        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.VolumeChange,
             details: {
+                type: "volume",
+                action: "adjust",
                 previousVolume: oldVolume,
                 currentVolume: this.volume,
-                isGradual: false,
             },
         });
         return this;
@@ -477,8 +488,9 @@ class Player {
         // Emit an event indicating the repeat mode has changed
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.RepeatChange,
-            detail: {
-                changeType: "track",
+            details: {
+                type: "repeat",
+                action: "track",
                 previousRepeat: this.getRepeatState(oldPlayer),
                 currentRepeat: this.getRepeatState(this),
             },
@@ -511,8 +523,9 @@ class Player {
         // Emit the player state update event
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.RepeatChange,
-            detail: {
-                changeType: "queue",
+            details: {
+                type: "repeat",
+                action: "queue",
                 previousRepeat: this.getRepeatState(oldPlayer),
                 currentRepeat: this.getRepeatState(this),
             },
@@ -567,8 +580,9 @@ class Player {
         // Emit a player state update event
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.RepeatChange,
-            detail: {
-                changeType: "dynamic",
+            details: {
+                type: "repeat",
+                action: "dynamic",
                 previousRepeat: this.getRepeatState(oldPlayer),
                 currentRepeat: this.getRepeatState(this),
             },
@@ -622,7 +636,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "remove",
+                type: "queue",
+                action: "remove",
                 tracks: removedTracks,
             },
         });
@@ -657,6 +672,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.PauseChange,
             details: {
+                type: "pause",
+                action: "pause",
                 previousPause: oldPlayer.paused,
                 currentPause: this.paused,
             },
@@ -684,7 +701,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "previous",
+                type: "track",
+                action: "previous",
                 track: lastTrack,
             },
         });
@@ -724,7 +742,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "timeUpdate",
+                type: "track",
+                action: "timeUpdate",
                 previousTime: oldPlayer.position,
                 currentTime: this.position,
             },

package/dist/structures/Rest.js

@@ -101,6 +101,7 @@ class Rest {
                 Authorization: this.password,
             },
             data: body,
+            timeout: this.node.options.apiRequestTimeoutMs,
         };
         try {
             const response = await (0, axios_1.default)(config);
@@ -108,7 +109,7 @@ class Rest {
         }
         catch (error) {
             if (!error.response) {
-                console.error("No response from node:", error.message);
+                console.error(`[REST] No response from node: ${error.message}`);
                 return null;
             }
             if (error.response.data?.message === "Guild not found") {

package/dist/structures/Utils.js

@@ -167,6 +167,10 @@ class AutoPlayUtils {
             throw new Error("No available nodes.");
         }
         const apiKey = this.manager.options.lastFmApiKey;
+        // Check if Last.fm API is available
+        if (apiKey) {
+            return await this.getRecommendedTracksFromLastFm(track, apiKey);
+        }
         const enabledSources = node.info.sourceManagers;
         const autoPlaySearchPlatforms = this.manager.options.autoPlaySearchPlatforms;
         // Iterate over autoplay platforms in order of priority
@@ -179,10 +183,6 @@ class AutoPlayUtils {
                 }
             }
         }
-        // Check if Last.fm API is available
-        if (apiKey) {
-            return await this.getRecommendedTracksFromLastFm(track, apiKey);
-        }
         return [];
     }
     /**
@@ -685,7 +685,7 @@ class Structure {
 exports.Structure = Structure;
 const structures = {
     Player: require("./Player").Player,
-    Queue: require("./Queue").Queue,
+    Queue: require("../statestorage/MemoryQueue").MemoryQueue,
     Node: require("./Node").Node,
     Filters: require("./Filters").Filters,
     Manager: require("./Manager").Manager,

package/dist/wrappers/seyfert.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SeyfertManager = void 0;
+const tslib_1 = require("tslib");
+const Manager_1 = require("../structures/Manager");
+const common_1 = require("seyfert/lib/common");
+tslib_1.__exportStar(require("../index"), exports);
+/**
+ * Seyfert wrapper for Magmastream.
+ *
+ * @note This wrapper does require the manual implementation of the "raw" and "ready" events, to call the `updateVoiceState` and `init` methods respectively.
+ *
+ * @example
+ * ```typescript
+ * const client = new Client();
+ * const manager = new SeyfertManager(client, options);
+ *
+ * client.events.values.RAW = {
+ *     data: { name: "raw" },
+ *     run: async (data) => {
+ *         await manager.updateVoiceState(data);
+ *     }
+ * }
+ *
+ * client.events.values.READY = {
+ *     data: { name: "ready" },
+ *     run: async (user, client) => {
+ *         await manager.init({ clientId: client.botId });
+ *     }
+ * }
+ * ```
+ */
+class SeyfertManager extends Manager_1.Manager {
+    client;
+    constructor(client, options) {
+        super(options);
+        this.client = client;
+    }
+    send(packet) {
+        this.client.gateway.send((0, common_1.calculateShardId)(packet.d.guild_id), packet);
+    }
+}
+exports.SeyfertManager = SeyfertManager;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.0-dev.34",
+	"version": "2.9.0-dev.36",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -30,7 +30,6 @@
 	"dependencies": {
 		"@discordjs/collection": "^2.1.1",
 		"axios": "^1.9.0",
-		"cheerio": "^1.1.0",
 		"events": "^3.3.0",
 		"ioredis": "^5.6.1",
 		"jsdom": "^26.1.0",
@@ -42,7 +41,8 @@
 		"detritus-client": "0.16.x",
 		"discord.js": "14.x",
 		"eris": "0.18.x",
-		"oceanic.js": "1.12.0"
+		"oceanic.js": "1.12.0",
+		"seyfert": "3.2.x"
 	},
 	"engines": {
 		"node": ">=16.0.0"