magmastream 2.10.6-alpha.5 → 2.10.6-alpha.7

package/dist/structures/Manager.d.ts

@@ -38,6 +38,11 @@ export declare class Manager extends EventEmitter {
      */
     constructor(options: StandaloneManagerOptions);
     constructor(options: ManagerOptions, isWrapper: true);
+    /**
+     * Waits until the Redis client is connected, at most `timeoutMs`. Never throws: when Redis is not
+     * ready in time, init continues and commands fail later with Redis's own error.
+     */
+    private waitForRedis;
     /**
      * Initiates the Manager.
      * @param clientId - The Discord client ID (only required when not using any of the magmastream wrappers).

package/dist/structures/Manager.js

@@ -179,6 +179,30 @@ class Manager extends events_1.EventEmitter {
             });
         }
     }
+    /**
+     * Waits until the Redis client is connected, at most `timeoutMs`. Never throws: when Redis is not
+     * ready in time, init continues and commands fail later with Redis's own error.
+     */
+    async waitForRedis(timeoutMs = 10_000) {
+        const redis = this.redis;
+        if (!redis || redis.status === "ready")
+            return;
+        await new Promise((resolve) => {
+            const done = (message) => {
+                clearTimeout(timer);
+                redis.off("ready", onReady);
+                redis.off("end", onEnd);
+                if (message)
+                    this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] ${message}`);
+                resolve();
+            };
+            const onReady = () => done();
+            const onEnd = () => done("Redis connection ended before it was ready.");
+            const timer = setTimeout(() => done(`Redis was not ready after ${timeoutMs}ms, continuing without waiting.`), timeoutMs);
+            redis.once("ready", onReady);
+            redis.once("end", onEnd);
+        });
+    }
     /**
      * Initiates the Manager.
      * @param clientId - The Discord client ID (only required when not using any of the magmastream wrappers).
@@ -209,6 +233,9 @@ class Manager extends events_1.EventEmitter {
         }
         if (this.options.stateStorage.type === Enums_1.StateStorageType.Redis) {
             this.redis = new ioredis_1.default(lodash_1.default.omit(this.options.stateStorage.redisConfig, "prefix"));
+            // Nodes read and write their session ids as soon as they connect. With enableOfflineQueue: false,
+            // any command sent before Redis is ready fails, so wait for the connection first.
+            await this.waitForRedis();
         }
         const results = await Promise.allSettled([...this.nodes.values()].map(async (node) => {
             await node.connect();

package/dist/structures/Node.js

@@ -12,6 +12,8 @@ const Enums_1 = require("./Enums");
 const MagmastreamError_1 = require("./MagmastreamError");
 const validSponsorBlocks = Object.values(Enums_1.SponsorBlockSegment).map((segment) => segment.toLowerCase());
 const TRACK_REQUIRED_EVENTS = new Set(["TrackStartEvent", "TrackEndEvent", "TrackStuckEvent", "TrackExceptionEvent"]);
+/** How many recently played tracks autoplay avoids picking again. */
+const AUTOPLAY_HISTORY_SIZE = 20;
 class Node {
     manager;
     options;
@@ -496,7 +498,14 @@ class Node {
                 const hadPreviousSession = this.pendingResumeSessionId && this.pendingResumeSessionId !== payload.sessionId;
                 this.pendingResumeSessionId = null;
                 this.sessionId = payload.sessionId;
-                await this.updateSessionId();
+                // Storing the session id only matters for resuming after a restart. A storage failure must not stop
+                // the node from loading its info and player states.
+                try {
+                    await this.updateSessionId();
+                }
+                catch (err) {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Could not store sessionId for node ${this.options.identifier}, session resume may not work after a restart: ${err instanceof Error ? (err.cause instanceof Error ? err.cause.message : err.message) : String(err)}`);
+                }
                 this.info = await this.fetchInfo();
                 this.isNodeLink = this.isNodeLink || Boolean(this.info.isNodelink);
                 this.rest.isNodeLink = this.isNodeLink;
@@ -910,7 +919,15 @@ class Node {
             .toLowerCase()
             .replace(/\s+/g, "")
             .replace(/[^a-z0-9]/g, "");
-        const filteredTracks = tracks.filter((track) => track.identifier !== lastTrack.identifier && track.uri !== lastTrack.uri && normalize(track.title) !== normalize(lastTrack.title));
+        const isSameTrack = (a, b) => a.identifier === b.identifier || a.uri === b.uri || normalize(a.title) === normalize(b.title);
+        // Sources answer a seed with the same tracks every time, so only checking the last track
+        // lets autoplay bounce between two songs. Skip recently played tracks, and only when every
+        // recommendation was played recently, fall back to skipping just the last track.
+        const recentTracks = PreviousQueue.slice(-AUTOPLAY_HISTORY_SIZE);
+        let filteredTracks = tracks.filter((track) => !recentTracks.some((recent) => isSameTrack(track, recent)));
+        if (!filteredTracks.length) {
+            filteredTracks = tracks.filter((track) => !isSameTrack(track, lastTrack));
+        }
         if (filteredTracks.length) {
             const randomTrack = filteredTracks[Math.floor(Math.random() * filteredTracks.length)];
             await player.queue.add(randomTrack);

package/dist/structures/Utils.js

@@ -238,7 +238,17 @@ class AutoPlayUtils {
         if (apiKey) {
             return await this.getRecommendedTracksFromLastFm(track, apiKey);
         }
-        const enabledSources = node.info.sourceManagers;
+        // node.info is only set once the node's "ready" message is handled, so a just-connected node has none yet
+        let info = node.info;
+        if (!info) {
+            try {
+                info = node.info = await node.fetchInfo();
+            }
+            catch (error) {
+                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[AUTOPLAY] Node ${node.options.identifier} has no info yet: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        const enabledSources = info?.sourceManagers ?? [];
         const autoPlaySearchPlatforms = this.manager.options.autoPlaySearchPlatforms;
         // Iterate over autoplay platforms in order of priority
         for (const platform of autoPlaySearchPlatforms) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.6-alpha.5",
+    "version": "2.10.6-alpha.7",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
         "prepare": "npm run build",
         "build": "tsc",
         "types": "rtb --dist dist",
-        "test": "npm run build && node --test tests/player-state.test.cjs tests/hot-paths.test.cjs tests/restore-performance.test.cjs tests/lyrics.test.cjs",
+        "test": "npm run build && node --test tests/player-state.test.cjs tests/hot-paths.test.cjs tests/restore-performance.test.cjs tests/lyrics.test.cjs tests/autoplay.test.cjs tests/session-storage.test.cjs",
         "format": "prettier --write .",
         "format:check": "prettier --check .",
         "lint": "eslint \"src/**/*.{ts,js}\"",