magmastream 2.10.2-dev.3 → 2.10.3-alpha.0

package/dist/structures/Manager.d.ts

@@ -169,7 +169,6 @@ export declare class Manager extends EventEmitter {
      * @param string - The string to escape.
      * @returns The escaped string.
      */
-    private escapeRegExp;
     /**
      * Checks if the given data is a voice update.
      * @param data The data to check.

package/dist/structures/Manager.js

@@ -16,6 +16,11 @@ const Enums_1 = require("./Enums");
 const package_json_1 = require("../../package.json");
 const MagmastreamError_1 = require("./MagmastreamError");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+const YOUTUBE_URL_PATTERN = /(youtube\.com|youtu\.be)/;
+const BLOCKED_WORDS_PATTERN = new RegExp(`\\b(${blockedWords_1.blockedWords.map(escapeRegExp).join("|")})\\b`, "gi");
 /**
  * The main hub for interacting with Lavalink and using Magmastream.
  */
@@ -258,7 +263,7 @@ class Manager extends events_1.EventEmitter {
             }
             if (this.options.normalizeYouTubeTitles && "tracks" in result) {
                 const processTrack = (track) => {
-                    if (!/(youtube\.com|youtu\.be)/.test(track.uri))
+                    if (!YOUTUBE_URL_PATTERN.test(track.uri))
                         return track;
                     const { cleanTitle, cleanAuthor } = this.parseYouTubeTitle(track.title, track.author);
                     track.title = cleanTitle;
@@ -267,7 +272,7 @@ class Manager extends events_1.EventEmitter {
                 };
                 result.tracks = result.tracks.map(processTrack);
                 if ("playlist" in result && result.playlist) {
-                    result.playlist.tracks = result.playlist.tracks.map(processTrack);
+                    result.playlist.tracks = result.tracks;
                 }
             }
             const summary = "tracks" in result ? result.tracks.map((t) => Object.fromEntries(Object.entries(t).filter(([key]) => key !== "requester"))) : [];
@@ -780,9 +785,7 @@ class Manager extends events_1.EventEmitter {
         const cleanAuthor = originalAuthor.replace("- Topic", "").trim();
         title = title.replace("Topic -", "").trim();
         // Remove blocked words and phrases
-        const escapedBlockedWords = blockedWords_1.blockedWords.map((word) => this.escapeRegExp(word));
-        const blockedWordsPattern = new RegExp(`\\b(${escapedBlockedWords.join("|")})\\b`, "gi");
-        title = title.replace(blockedWordsPattern, "").trim();
+        title = title.replace(BLOCKED_WORDS_PATTERN, "").trim();
         // Remove empty brackets and balance remaining brackets
         title = title
             .replace(/[([{]\s*[)\]}]/g, "") // Empty brackets
@@ -847,10 +850,6 @@ class Manager extends events_1.EventEmitter {
      * @param string - The string to escape.
      * @returns The escaped string.
      */
-    escapeRegExp(string) {
-        // Replace special regex characters with their escaped counterparts
-        return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    }
     /**
      * Checks if the given data is a voice update.
      * @param data The data to check.

package/dist/structures/Node.d.ts

@@ -23,7 +23,8 @@ export declare class Node {
     private reconnectTimeout?;
     private reconnectAttempts;
     private redisPrefix?;
-    private sessionIdsMap;
+    /** Session ID sent in the reconnect header for resumption — cleared once the ready op is received. */
+    private pendingResumeSessionId;
     /**
      * Creates an instance of Node.
      * @param manager - The manager for the node.

package/dist/structures/Node.js

@@ -31,7 +31,8 @@ class Node {
     reconnectTimeout;
     reconnectAttempts = 1;
     redisPrefix;
-    sessionIdsMap = new Map();
+    /** Session ID sent in the reconnect header for resumption — cleared once the ready op is received. */
+    pendingResumeSessionId = null;
     /**
      * Creates an instance of Node.
      * @param manager - The manager for the node.
@@ -153,8 +154,6 @@ class Node {
                 try {
                     const raw = fs_1.default.readFileSync(filePath, "utf-8").trim();
                     this.sessionId = raw.length ? raw : null;
-                    if (this.sessionId)
-                        this.sessionIdsMap.set(this.getCompositeKey(), this.sessionId);
                 }
                 catch {
                     this.sessionId = null;
@@ -169,7 +168,6 @@ class Node {
                     const sid = await this.manager.redis.hget(key, compositeKey);
                     this.sessionId = sid ?? null;
                     if (this.sessionId) {
-                        this.sessionIdsMap.set(compositeKey, this.sessionId);
                         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Restored sessionId for ${compositeKey}: ${this.sessionId}`);
                     }
                 }
@@ -210,7 +208,6 @@ class Node {
         if (this.sessionId) {
             fs_1.default.writeFileSync(tmpPath, this.sessionId, "utf-8");
             fs_1.default.renameSync(tmpPath, filePath);
-            this.sessionIdsMap.set(this.getCompositeKey(), this.sessionId);
         }
         else {
             try {
@@ -218,7 +215,6 @@ class Node {
                     fs_1.default.unlinkSync(filePath);
             }
             catch { }
-            this.sessionIdsMap.delete(this.getCompositeKey());
         }
     }
     async updateSessionIdRedis() {
@@ -228,11 +224,9 @@ class Node {
         try {
             if (this.sessionId) {
                 await this.manager.redis.hset(key, compositeKey, this.sessionId);
-                this.sessionIdsMap.set(compositeKey, this.sessionId);
             }
             else {
                 await this.manager.redis.hdel(key, compositeKey);
-                this.sessionIdsMap.delete(compositeKey);
             }
         }
         catch (err) {
@@ -262,8 +256,16 @@ class Node {
             "User-Id": this.manager.options.clientId,
             "Client-Name": this.manager.options.clientName,
         };
-        if (typeof this.sessionId === "string" && this.sessionId.length > 0) {
-            headers["Session-Id"] = this.sessionId;
+        // Capture resume session ID for the WS header, then clear this.sessionId.
+        // REST calls guard on this.sessionId being non-null — keeping the stale value
+        // would let updatePlayer/destroyPlayer fire with an invalid session during the
+        // reconnect window (between connect() and the 'ready' op).
+        // pendingResumeSessionId is kept so the 'ready' handler can still compute
+        // hadPreviousSession correctly. this.sessionId is re-set by 'ready'.
+        this.pendingResumeSessionId = this.sessionId;
+        this.sessionId = null;
+        if (typeof this.pendingResumeSessionId === "string" && this.pendingResumeSessionId.length > 0) {
+            headers["Session-Id"] = this.pendingResumeSessionId;
         }
         this.socket = new ws_1.default(`ws${this.options.useSSL ? "s" : ""}://${this.address}/v4/websocket`, { headers });
         this.socket.on("open", this.open.bind(this));
@@ -274,7 +276,7 @@ class Node {
         const debugInfo = {
             connected: this.connected,
             address: this.address,
-            sessionId: this.sessionId,
+            pendingResumeSessionId: this.pendingResumeSessionId,
             options: {
                 clientId: this.manager.options.clientId,
                 clientName: this.manager.options.clientName,
@@ -295,8 +297,6 @@ class Node {
      * @returns {Promise<void>} A promise that resolves when the node and its resources have been destroyed.
      */
     async destroy() {
-        if (!this.connected)
-            return;
         const debugInfo = {
             connected: this.connected,
             identifier: this.options.identifier,
@@ -310,10 +310,16 @@ class Node {
         if (players.size) {
             await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
         }
-        this.socket.close(1000, "destroy");
-        this.socket.removeAllListeners();
-        this.reconnectAttempts = 1;
+        // Always clear reconnect state regardless of connection status
         clearTimeout(this.reconnectTimeout);
+        this.reconnectTimeout = undefined;
+        this.reconnectAttempts = 1;
+        // Only close the socket if it is actually open
+        if (this.connected) {
+            this.socket.close(1000, "destroy");
+            this.socket.removeAllListeners();
+        }
+        this.socket = null;
         this.manager.emit(Enums_1.ManagerEventTypes.NodeDestroy, this);
         this.manager.nodes.delete(this.options.identifier);
     }
@@ -487,7 +493,11 @@ class Node {
             case "ready":
                 this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Node message: ${Utils_1.JSONUtils.safe(payload, 2)}`);
                 this.rest.setSessionId(payload.sessionId);
-                const hadPreviousSession = this.sessionId && this.sessionId !== payload.sessionId;
+                // pendingResumeSessionId holds what we sent in Session-Id header (if anything).
+                // Use it — not this.sessionId which was nulled in connect() — to detect whether
+                // we attempted resumption with a different session than what Lavalink gave back.
+                const hadPreviousSession = this.pendingResumeSessionId && this.pendingResumeSessionId !== payload.sessionId;
+                this.pendingResumeSessionId = null;
                 this.sessionId = payload.sessionId;
                 await this.updateSessionId();
                 this.info = await this.fetchInfo();
@@ -520,6 +530,11 @@ class Node {
             return;
         const track = await player.queue.getCurrent();
         const type = payload.type;
+        const TRACK_EVENTS = ["TrackStartEvent", "TrackEndEvent", "TrackStuckEvent", "TrackExceptionEvent"];
+        if (!track && TRACK_EVENTS.includes(type)) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[Node] Received ${type} for guild ${payload.guildId} but queue has no current track — ignoring.`);
+            return;
+        }
         let error;
         switch (type) {
             case "TrackStartEvent":
@@ -1125,7 +1140,7 @@ class Node {
             });
         }
         try {
-            await this.rest.put(`/v4/sessions/${this.sessionId}/players/${player.guildId}/sponsorblock/categories`, Utils_1.JSONUtils.safe(segments.map((v) => v.toLowerCase()), 2));
+            await this.rest.put(`/v4/sessions/${this.sessionId}/players/${player.guildId}/sponsorblock/categories`, segments.map((v) => v.toLowerCase()));
         }
         catch (err) {
             throw err instanceof MagmastreamError_1.MagmaStreamError

package/dist/structures/Player.js

@@ -943,7 +943,12 @@ class Player {
                     context: { guildId: this.guildId },
                 });
             }
-            await this.node.rest.destroyPlayer(this.guildId).catch(() => { });
+            // Only destroy the player on the old node if it is still reachable.
+            // If the server is down the REST call would fail anyway; skipping it
+            // also prevents a spurious error when switching nodes during an outage.
+            if (this.node.connected) {
+                await this.node.rest.destroyPlayer(this.guildId).catch(() => { });
+            }
             this.manager.players.delete(this.guildId);
             this.node = node;
             this.manager.players.set(this.guildId, this);

package/dist/structures/Rest.js

@@ -104,8 +104,6 @@ class Rest {
      */
     async request(method, endpoint, body) {
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] ${method} request to ${endpoint} with body: ${Utils_1.JSONUtils.safe(body, 2)}`);
-        const controller = new AbortController();
-        const timeoutHandle = setTimeout(() => controller.abort(), this.node.options.apiRequestTimeoutMs);
         let response = null;
         try {
             response = await (0, undici_1.fetch)(this.url + endpoint, {
@@ -115,11 +113,11 @@ class Rest {
                     Authorization: this.password,
                 },
                 body: body !== undefined ? JSON.stringify(body) : undefined,
-                signal: controller.signal,
+                signal: AbortSignal.timeout(this.node.options.apiRequestTimeoutMs),
             });
         }
         catch (e) {
-            const isTimeout = e instanceof Error && e.name === "AbortError";
+            const isTimeout = e instanceof Error && (e.name === "AbortError" || e.name === "TimeoutError");
             const message = e instanceof Error ? e.message : "Unknown error";
             const error = new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
@@ -128,9 +126,6 @@ class Rest {
             this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this.node, error);
             return null;
         }
-        finally {
-            clearTimeout(timeoutHandle);
-        }
         const { status } = response;
         const data = status !== 204 ? await response.json() : null;
         if (status >= 200 && status < 300) {

package/dist/wrappers/discord.js.js

@@ -15,7 +15,7 @@ class DiscordJSManager extends Manager_1.Manager {
     constructor(client, options) {
         super(options, true);
         this.client = client;
-        const { version: djsVersion } = moduleRequire("discord.js/package.json");
+        const { version: djsVersion } = moduleRequire("discord.js");
         const [major, minor] = djsVersion.split(".").map(Number);
         if (!this.client.options.intents.has(GUILD_VOICE_STATES_INTENT)) {
             throw new MagmastreamError_1.MagmaStreamError({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.2-dev.3",
+    "version": "2.10.3-alpha.0",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -16,8 +16,10 @@
         "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 --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"
+        "version:alpha": "node scripts/prerelease-version.cjs alpha",
+        "version:dev": "node scripts/prerelease-version.cjs dev",
+        "release:alpha": "npm run format && npm run lint:fix && npm run ci && npm run version:alpha && npm publish --tag alpha && git push && git push --follow-tags",
+        "release:dev": "npm run format && npm run lint:fix && npm run ci && npm run version:dev && npm publish --tag dev && git push && git push --follow-tags"
     },
     "devDependencies": {
         "@favware/rollup-type-bundler": "^4.0.0",