magmastream 2.10.2-alpha.4 → 2.10.2-alpha.6

package/dist/structures/Manager.d.ts

@@ -143,13 +143,13 @@ export declare class Manager extends EventEmitter {
      */
     get useableNode(): Node;
     /**
-     * Handles the shutdown of the process by saving all active players' states and optionally cleaning up inactive players.
+     * Handles the shutdown of the process by saving all active players' states.
      * This function is called when the process is about to exit.
      * It iterates through all players and calls {@link savePlayerState} to save their states.
-     * Optionally, it also calls {@link cleanupInactivePlayers} to remove any stale player state files.
-     * After saving and cleaning up, it exits the process.
+     * After saving, it exits the process.
+     * @param stopProcess - A function to stop the process.
      */
-    handleShutdown(): Promise<void>;
+    handleShutdown(stopProcess?: () => Promise<void>): Promise<void>;
     /**
      * Parses a YouTube title into a clean title and author.
      * @param title - The original title of the YouTube video.

package/dist/structures/Manager.js

@@ -736,13 +736,13 @@ class Manager extends events_1.EventEmitter {
         return this.options.enablePriorityMode ? this.priorityNode : this.options.useNode === Enums_1.UseNodeOptions.LeastLoad ? this.leastLoadNode.first() : this.leastPlayersNode.first();
     }
     /**
-     * Handles the shutdown of the process by saving all active players' states and optionally cleaning up inactive players.
+     * Handles the shutdown of the process by saving all active players' states.
      * This function is called when the process is about to exit.
      * It iterates through all players and calls {@link savePlayerState} to save their states.
-     * Optionally, it also calls {@link cleanupInactivePlayers} to remove any stale player state files.
-     * After saving and cleaning up, it exits the process.
+     * After saving, it exits the process.
+     * @param stopProcess - A function to stop the process.
      */
-    async handleShutdown() {
+    async handleShutdown(stopProcess) {
         this.unloadPlugins();
         console.warn("\x1b[31m%s\x1b[0m", "MAGMASTREAM WARNING: Shutting down! Please wait, saving active players...");
         try {
@@ -763,9 +763,12 @@ class Manager extends events_1.EventEmitter {
                 }
             });
             await Promise.allSettled(savePromises);
-            setTimeout(() => {
+            setTimeout(async () => {
                 console.warn("\x1b[32m%s\x1b[0m", "MAGMASTREAM INFO: Shutting down complete, exiting...");
-                process.exit(0);
+                if (stopProcess)
+                    await stopProcess();
+                else
+                    process.exit(0);
             }, 500);
         }
         catch (err) {

package/dist/structures/Rest.d.ts

@@ -5,8 +5,6 @@ import { LavalinkSession, LavaPlayer, RestPlayOptions } from "./Types";
 export declare class Rest {
     /** The Node that this Rest instance is connected to. */
     private node;
-    /** The ID of the current session. */
-    private sessionId;
     /** The password for the Node. */
     private readonly password;
     /** The URL of the Node. */
@@ -16,6 +14,11 @@ export declare class Rest {
     /** Whether the node is a NodeLink. */
     isNodeLink: boolean;
     constructor(node: Node, manager: Manager);
+    /**
+     * Gets the session ID.
+     * @returns {string} Returns the session ID.
+     */
+    private get sessionId();
     /**
      * Sets the session ID.
      * This method is used to set the session ID after a resume operation is done.

package/dist/structures/Rest.js

@@ -10,8 +10,6 @@ const MagmastreamError_1 = require("./MagmastreamError");
 class Rest {
     /** The Node that this Rest instance is connected to. */
     node;
-    /** The ID of the current session. */
-    sessionId;
     /** The password for the Node. */
     password;
     /** The URL of the Node. */
@@ -23,11 +21,17 @@ class Rest {
     constructor(node, manager) {
         this.node = node;
         this.url = `http${node.options.useSSL ? "s" : ""}://${node.options.host}:${node.options.port}`;
-        this.sessionId = node.sessionId;
         this.password = node.options.password;
         this.manager = manager;
         this.isNodeLink = node.isNodeLink;
     }
+    /**
+     * Gets the session ID.
+     * @returns {string} Returns the session ID.
+     */
+    get sessionId() {
+        return this.node.sessionId;
+    }
     /**
      * Sets the session ID.
      * This method is used to set the session ID after a resume operation is done.
@@ -35,8 +39,8 @@ class Rest {
      * @returns {string} Returns the set session ID.
      */
     setSessionId(sessionId) {
-        this.sessionId = sessionId;
-        return this.sessionId;
+        this.node.sessionId = sessionId;
+        return this.node.sessionId;
     }
     /**
      * Retrieves the player that is currently running on the node.
@@ -44,6 +48,10 @@ class Rest {
      * @returns {Promise<LavaPlayer>} Returns the player.
      */
     async getPlayer(guildId) {
+        if (!this.sessionId) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Skipping getPlayer for ${guildId} - no session ID on node ${this.node.options.identifier}`);
+            return null;
+        }
         const result = await this.get(`/v4/sessions/${this.sessionId}/players/${guildId}`);
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Getting player on node: ${this.node.options.identifier} : ${Utils_1.JSONUtils.safe(result, 2)}`);
         return result;
@@ -54,6 +62,10 @@ class Rest {
      * @returns {Promise<LavaPlayer>} Returns the updated player.
      */
     async updatePlayer(options) {
+        if (!this.sessionId) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Skipping updatePlayer for guildId: ${options.guildId} - no session ID on node ${this.node.options.identifier}`);
+            return null;
+        }
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Updating player: ${options.guildId}: ${Utils_1.JSONUtils.safe(options, 2)}`);
         return await this.patch(`/v4/sessions/${this.sessionId}/players/${options.guildId}?noReplace=${options.noReplace ?? false}`, options.data);
     }
@@ -63,6 +75,10 @@ class Rest {
      * @returns {Promise<void>} Returns void (204 No Content).
      */
     async destroyPlayer(guildId) {
+        if (!this.sessionId) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Skipping destroyPlayer for guildId: ${guildId} - no session ID on node ${this.node.options.identifier}`);
+            return;
+        }
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Destroying player: ${guildId}`);
         return await this.delete(`/v4/sessions/${this.sessionId}/players/${guildId}`);
     }
@@ -73,6 +89,10 @@ class Rest {
      * @returns {Promise<LavalinkSession>} The updated session.
      */
     async updateSession(resuming, timeout) {
+        if (!this.sessionId) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Skipping updateSession for resuming: ${resuming} timeout: ${timeout} - no session ID on node ${this.node.options.identifier}`);
+            return null;
+        }
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] Updating session: ${this.sessionId}`);
         return await this.patch(`/v4/sessions/${this.sessionId}`, { resuming, timeout });
     }
@@ -115,9 +135,16 @@ class Rest {
         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 === 404) {
+            if (data?.message === "Guild not found") {
+                // Lavalink sometimes returns "Guild not found" for inactive players
+                return [];
+            }
+            if (data?.message === "Session not found") {
+                // Session expired — trigger reconnection instead of crashing
+                this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this.node, new MagmastreamError_1.MagmaStreamError({ code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED, message: "Session not found" }));
+                return [];
+            }
         }
         const message = typeof data === "string"
             ? data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.2-alpha.4",
+    "version": "2.10.2-alpha.6",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -16,8 +16,8 @@
         "lint": "eslint \"src/**/*.{ts,js}\"",
         "lint:fix": "eslint --fix \"src/**/*.{ts,js}\"",
         "ci": "run-s format:check lint build types",
-        "release:alpha": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=alpha && npm publish --tag alpha && git push && git push --tags",
-        "release:dev": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=dev && npm publish --tag dev && git push && git push --tags"
+        "release:alpha": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=alpha && npm publish --tag alpha && git push && git push --follow-tags",
+        "release:dev": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=dev && npm publish --tag dev && git push && git push --follow-tags"
     },
     "devDependencies": {
         "@favware/rollup-type-bundler": "^4.0.0",