magmastream 2.9.3-dev.3 → 2.9.3-dev.31

package/dist/structures/Node.js

@@ -31,7 +31,6 @@ class Node {
     reconnectTimeout;
     reconnectAttempts = 1;
     redisPrefix;
-    sessionIdsFilePath;
     sessionIdsMap = new Map();
     /**
      * Creates an instance of Node.
@@ -97,18 +96,10 @@ class Node {
         switch (this.manager.options.stateStorage.type) {
             case Enums_1.StateStorageType.Memory:
             case Enums_1.StateStorageType.JSON:
-                this.sessionIdsFilePath = path_1.default.join(process.cwd(), "magmastream", "sessionData", "sessionIds.json");
-                const configDir = path_1.default.dirname(this.sessionIdsFilePath);
-                if (!fs_1.default.existsSync(configDir)) {
-                    fs_1.default.mkdirSync(configDir, { recursive: true });
-                }
-                this.createSessionIdsFile();
                 this.createReadmeFile();
                 break;
             case Enums_1.StateStorageType.Redis:
-                this.redisPrefix = this.manager.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                    ? this.manager.options.stateStorage.redisConfig.prefix
-                    : this.manager.options.stateStorage.redisConfig.prefix ?? "magmastream:";
+                this.redisPrefix = Utils_1.PlayerUtils.getRedisKey();
                 break;
         }
     }
@@ -125,16 +116,19 @@ class Node {
     get address() {
         return `${this.options.host}:${this.options.port}`;
     }
-    /**
-     * Creates the sessionIds.json file if it doesn't exist. This file is used to
-     * store the session IDs for each node. The session IDs are used to identify
-     * the node when resuming a session.
-     */
-    createSessionIdsFile() {
-        if (!fs_1.default.existsSync(this.sessionIdsFilePath)) {
-            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Creating sessionId file at: ${this.sessionIdsFilePath}`);
-            fs_1.default.writeFileSync(this.sessionIdsFilePath, Utils_1.JSONUtils.safe({}), "utf-8");
-        }
+    getCompositeKey() {
+        return `${this.options.identifier}::${this.manager.options.clusterId}`;
+    }
+    getRedisSessionIdsKey() {
+        return `${this.redisPrefix}node:sessionIds`;
+    }
+    getNodeSessionsDir() {
+        return path_1.default.join(process.cwd(), "magmastream", "sessionData", "nodeSessions");
+    }
+    getNodeSessionPath() {
+        const safeId = String(this.options.identifier).replace(/[^a-zA-Z0-9._-]/g, "_");
+        const clusterId = String(this.manager.options.clusterId ?? 0);
+        return path_1.default.join(this.getNodeSessionsDir(), `${safeId}__${clusterId}.txt`);
     }
     /**
      * Loads session IDs from the sessionIds.json file if it exists.
@@ -148,49 +142,43 @@ class Node {
         switch (this.manager.options.stateStorage.type) {
             case Enums_1.StateStorageType.Memory:
             case Enums_1.StateStorageType.JSON: {
-                if (fs_1.default.existsSync(this.sessionIdsFilePath)) {
-                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Loading sessionIds from file: ${this.sessionIdsFilePath}`);
-                    const sessionIdsData = fs_1.default.readFileSync(this.sessionIdsFilePath, "utf-8");
-                    this.sessionIdsMap = new Map(Object.entries(JSON.parse(sessionIdsData)));
-                    const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-                    if (this.sessionIdsMap.has(compositeKey)) {
-                        this.sessionId = this.sessionIdsMap.get(compositeKey);
-                    }
+                const dir = this.getNodeSessionsDir();
+                const filePath = this.getNodeSessionPath();
+                if (!fs_1.default.existsSync(dir))
+                    fs_1.default.mkdirSync(dir, { recursive: true });
+                if (!fs_1.default.existsSync(filePath)) {
+                    this.sessionId = null;
+                    return;
+                }
+                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;
                 }
                 break;
             }
-            case Enums_1.StateStorageType.Redis:
-                const key = `${this.redisPrefix}node:sessionIds`;
-                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Loading sessionIds from Redis key: ${key}`);
-                const currentRaw = await this.manager.redis.get(key);
-                if (currentRaw) {
-                    try {
-                        const sessionIds = JSON.parse(currentRaw);
-                        if (typeof sessionIds !== "object" || Array.isArray(sessionIds)) {
-                            throw new MagmastreamError_1.MagmaStreamError({
-                                code: Enums_1.MagmaStreamErrorCode.NODE_SESSION_IDS_LOAD_FAILED,
-                                message: "Invalid sessionIds data type from Redis.",
-                                context: { sessionIds },
-                            });
-                        }
-                        this.sessionIdsMap = new Map(Object.entries(sessionIds));
-                        const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-                        if (this.sessionIdsMap.has(compositeKey)) {
-                            this.sessionId = this.sessionIdsMap.get(compositeKey) || null;
-                            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Restored sessionId for ${compositeKey}: ${this.sessionId}`);
-                        }
-                    }
-                    catch (err) {
-                        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Failed to parse Redis sessionIds: ${err.message}`);
-                        this.sessionIdsMap = new Map();
+            case Enums_1.StateStorageType.Redis: {
+                const key = this.getRedisSessionIdsKey();
+                const compositeKey = this.getCompositeKey();
+                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Loading sessionId from Redis hash: ${key} field: ${compositeKey}`);
+                try {
+                    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}`);
                     }
                 }
-                else {
-                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] No sessionIds found in Redis — creating new key.`);
-                    await this.manager.redis.set(key, Utils_1.JSONUtils.safe({}));
-                    this.sessionIdsMap = new Map();
+                catch (err) {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Failed to load sessionId from Redis hash: ${err.message}`);
+                    this.sessionId = null;
                 }
                 break;
+            }
         }
     }
     /**
@@ -207,84 +195,53 @@ class Node {
     async updateSessionId() {
         switch (this.manager.options.stateStorage.type) {
             case Enums_1.StateStorageType.Memory:
-            case Enums_1.StateStorageType.JSON: {
-                const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-                const filePath = this.sessionIdsFilePath;
-                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Updating sessionIds to file: ${filePath}`);
-                let updated = false;
-                let retries = 3;
-                while (!updated && retries > 0) {
-                    try {
-                        let fileData = {};
-                        if (fs_1.default.existsSync(filePath)) {
-                            try {
-                                const raw = fs_1.default.readFileSync(filePath, "utf-8");
-                                fileData = raw.trim() ? JSON.parse(raw) : {};
-                            }
-                            catch (err) {
-                                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Failed to read/parse sessionIds.json: ${err.message}`);
-                                fileData = {};
-                            }
-                        }
-                        fileData[compositeKey] = this.sessionId;
-                        const tmpPath = `${filePath}.tmp`;
-                        fs_1.default.writeFileSync(tmpPath, Utils_1.JSONUtils.safe(fileData, 2), "utf-8");
-                        fs_1.default.renameSync(tmpPath, filePath);
-                        this.sessionIdsMap = new Map(Object.entries(fileData));
-                        updated = true;
-                    }
-                    catch (err) {
-                        retries--;
-                        if (retries === 0) {
-                            throw new MagmastreamError_1.MagmaStreamError({
-                                code: Enums_1.MagmaStreamErrorCode.NODE_SESSION_IDS_UPDATE_FAILED,
-                                message: `Failed to update sessionIds after retries.`,
-                                cause: err instanceof Error ? err : undefined,
-                                context: { filePath, compositeKey, storage: "file" },
-                            });
-                        }
-                        await new Promise((r) => setTimeout(r, 50));
-                    }
-                }
-                break;
+            case Enums_1.StateStorageType.JSON:
+                return this.updateSessionIdFile();
+            case Enums_1.StateStorageType.Redis:
+                return this.updateSessionIdRedis();
+        }
+    }
+    async updateSessionIdFile() {
+        const dir = this.getNodeSessionsDir();
+        const filePath = this.getNodeSessionPath();
+        const tmpPath = `${filePath}.tmp`;
+        if (!fs_1.default.existsSync(dir))
+            fs_1.default.mkdirSync(dir, { recursive: true });
+        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 {
+                if (fs_1.default.existsSync(filePath))
+                    fs_1.default.unlinkSync(filePath);
             }
-            case Enums_1.StateStorageType.Redis: {
-                const key = `${this.redisPrefix}node:sessionIds`;
-                const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Updating sessionIds in Redis key: ${key}`);
-                let sessionIds = {};
-                try {
-                    const currentRaw = await this.manager.redis.get(key);
-                    if (currentRaw) {
-                        sessionIds = JSON.parse(currentRaw);
-                        if (typeof sessionIds !== "object" || Array.isArray(sessionIds)) {
-                            throw new Error("Invalid data type in Redis");
-                        }
-                    }
-                    else {
-                        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Redis key not found — creating new sessionIds key.`);
-                        sessionIds = {};
-                    }
-                }
-                catch (err) {
-                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Corrupted Redis sessionIds, reinitializing: ${err.message}`);
-                    sessionIds = {};
-                }
-                try {
-                    sessionIds[compositeKey] = this.sessionId;
-                    this.sessionIdsMap = new Map(Object.entries(sessionIds));
-                    await this.manager.redis.set(key, Utils_1.JSONUtils.safe(sessionIds));
-                }
-                catch (err) {
-                    throw new MagmastreamError_1.MagmaStreamError({
-                        code: Enums_1.MagmaStreamErrorCode.NODE_SESSION_IDS_UPDATE_FAILED,
-                        message: `Failed to update sessionIds in Redis.`,
-                        cause: err instanceof Error ? err : undefined,
-                        context: { key, compositeKey, storage: "redis" },
-                    });
-                }
-                break;
+            catch { }
+            this.sessionIdsMap.delete(this.getCompositeKey());
+        }
+    }
+    async updateSessionIdRedis() {
+        const key = this.getRedisSessionIdsKey();
+        const compositeKey = this.getCompositeKey();
+        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Updating sessionId in Redis hash: ${key} field: ${compositeKey}`);
+        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) {
+            throw new MagmastreamError_1.MagmaStreamError({
+                code: Enums_1.MagmaStreamErrorCode.NODE_SESSION_IDS_UPDATE_FAILED,
+                message: "Failed to update sessionId in Redis hash.",
+                cause: err instanceof Error ? err : undefined,
+                context: { key, compositeKey, storage: "redis-hash" },
+            });
         }
     }
     /**
@@ -305,12 +262,7 @@ class Node {
             "User-Id": this.manager.options.clientId,
             "Client-Name": this.manager.options.clientName,
         };
-        const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-        if (this.sessionId) {
-            headers["Session-Id"] = this.sessionId;
-        }
-        else if (this.options.enableSessionResumeOption && this.sessionIdsMap.has(compositeKey)) {
-            this.sessionId = this.sessionIdsMap.get(compositeKey) || null;
+        if (typeof this.sessionId === "string" && this.sessionId.length > 0) {
             headers["Session-Id"] = this.sessionId;
         }
         this.socket = new ws_1.default(`ws${this.options.useSSL ? "s" : ""}://${this.address}/v4/websocket`, { headers });
@@ -356,9 +308,7 @@ class Node {
         // Automove all players connected to that node
         const players = this.manager.players.filter((p) => p.node == this);
         if (players.size) {
-            for (const player of players.values()) {
-                await player.autoMoveNode();
-            }
+            await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
         }
         this.socket.close(1000, "destroy");
         this.socket.removeAllListeners();
@@ -537,10 +487,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;
                 this.sessionId = payload.sessionId;
                 await this.updateSessionId();
                 this.info = await this.fetchInfo();
-                if (payload.resumed) {
+                if (payload.resumed || !hadPreviousSession) {
                     await this.manager.loadPlayerStates(this.options.identifier);
                 }
                 if (this.options.enableSessionResumeOption) {
@@ -808,7 +759,7 @@ class Node {
             }
         }
         if (playNextOnEnd)
-            await player.play();
+            await player.play({ startTime: 0 });
     }
     /**
      * Plays the next track in the queue.
@@ -826,7 +777,7 @@ class Node {
         await player.queue.setCurrent(await player.queue.dequeue());
         this.manager.emit(Enums_1.ManagerEventTypes.TrackEnd, player, track, payload);
         if (this.manager.options.playNextOnEnd)
-            await player.play();
+            await player.play({ startTime: 0 });
     }
     /**
      * Handles the event when a queue ends.
@@ -1222,8 +1173,12 @@ class Node {
      * @private
      */
     createReadmeFile() {
-        const readmeFilePath = path_1.default.join(process.cwd(), "magmastream", "README.md");
+        const baseDir = path_1.default.join(process.cwd(), "magmastream");
+        const readmeFilePath = path_1.default.join(baseDir, "README.md");
         const message = "Please do NOT delete the magmastream/ folder as it is used to store player data for autoresume etc.";
+        if (!fs_1.default.existsSync(baseDir)) {
+            fs_1.default.mkdirSync(baseDir, { recursive: true });
+        }
         if (!fs_1.default.existsSync(readmeFilePath)) {
             fs_1.default.writeFileSync(readmeFilePath, message, "utf-8");
             this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Created README file at: ${readmeFilePath}`);