magmastream 2.10.0 → 2.10.1-dev.1

package/dist/structures/Manager.d.ts

@@ -4,7 +4,7 @@ import { EventEmitter } from "events";
 import { Node } from "./Node";
 import { Player } from "./Player";
 import { Redis as RedisClient } from "ioredis";
-import { AnyGuild, AnyUser, ManagerEvents, ManagerInitOptions, ManagerOptions, NodeOptions, PlayerOptions, SearchQuery, SearchResult, TrackData, VoicePacket, VoiceServer, VoiceState } from "./Types";
+import { AnyGuild, AnyUser, DiscordVoiceState, ManagerEvents, ManagerInitOptions, ManagerOptions, NodeOptions, PlayerOptions, SearchQuery, SearchResult, TrackData, VoicePacket, VoiceServer } from "./Types";
 /**
  * The main hub for interacting with Lavalink and using Magmastream.
  */
@@ -95,7 +95,7 @@ export declare class Manager extends EventEmitter {
      * @returns A promise that resolves when the voice state update is handled.
      * @emits {debug} - Emits a debug message indicating the voice state is being updated.
      */
-    updateVoiceState(data: VoicePacket | VoiceServer | VoiceState): Promise<void>;
+    updateVoiceState(data: VoicePacket | VoiceServer | DiscordVoiceState): Promise<void>;
     /**
      * Decodes an array of base64 encoded tracks and returns an array of TrackData.
      * Emits a debug event with the tracks being decoded.

package/dist/structures/Manager.js

@@ -544,7 +544,8 @@ class Manager extends events_1.EventEmitter {
             await player.play(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester, currentTrack.isAutoplay), { startTime: lavaPlayer.state.position ?? 0 });
             await node.rest.delete(`/v4/sessions/${state.node.sessionId}/players/${state.guildId}`);
         }
-        await player.pause(state.paused);
+        if (state.paused)
+            await player.pause(true);
         await cleanup();
         this.emit(Enums_1.ManagerEventTypes.PlayerRestored, player, node);
         await this.sleep(1000);

package/dist/structures/Player.d.ts

@@ -1,7 +1,7 @@
 import { Filters } from "./Filters";
 import { Manager } from "./Manager";
 import { Node } from "./Node";
-import { AnyMessage, IQueue, Lyrics, PlayerOptions, PlayOptions, SearchQuery, SearchResult, Track, VoiceState } from "./Types";
+import { AnyMessage, IQueue, Lyrics, PlayerOptions, PlayerVoiceState, PlayOptions, SearchQuery, SearchResult, Track } from "./Types";
 import { SponsorBlockSegment, StateTypes } from "./Enums";
 import { WebSocket } from "ws";
 export declare class Player {
@@ -38,8 +38,8 @@ export declare class Player {
     state: StateTypes;
     /** The equalizer bands array. */
     bands: number[];
-    /** The voice state object from Discord. */
-    voiceState: VoiceState;
+    /** The voice state object from the node. */
+    voiceState: PlayerVoiceState;
     /** The Manager. */
     manager: Manager;
     /** The autoplay state of the player. */

package/dist/structures/Player.js

@@ -46,7 +46,7 @@ class Player {
     state = Enums_1.StateTypes.Disconnected;
     /** The equalizer bands array. */
     bands = new Array(15).fill(0.0);
-    /** The voice state object from Discord. */
+    /** The voice state object from the node. */
     voiceState;
     /** The Manager. */
     manager;
@@ -95,10 +95,7 @@ class Player {
         };
         // Set the guild ID and voice state.
         this.guildId = options.guildId;
-        this.voiceState = Object.assign({
-            op: "voiceUpdate",
-            guild_id: options.guildId,
-        });
+        this.voiceState = {};
         // Set the voice and text channels if they exist.
         if (options.voiceChannelId)
             this.voiceChannelId = options.voiceChannelId;
@@ -388,8 +385,11 @@ class Player {
         await this.node.rest.updatePlayer({
             guildId: this.guildId,
             data: {
-                encodedTrack: (await this.queue.getCurrent()).track,
+                track: {
+                    encoded: (await this.queue.getCurrent()).track,
+                },
                 ...finalOptions,
+                position: finalOptions.startTime || 0,
             },
         });
         this.playing = true;
@@ -694,7 +694,10 @@ class Player {
             guildId: this.guildId,
             data: {
                 position: 0,
-                encodedTrack: (await this.queue.getCurrent())?.track,
+                track: {
+                    encoded: (await this.queue.getCurrent())?.track,
+                    userData: (await this.queue.getCurrent())?.requester,
+                },
             },
         });
         return this;
@@ -730,7 +733,7 @@ class Player {
         this.node.rest.updatePlayer({
             guildId: this.guildId,
             data: {
-                encodedTrack: null,
+                track: null,
             },
         });
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
@@ -940,7 +943,13 @@ class Player {
             this.manager.players.set(this.guildId, this);
             await this.node.rest.updatePlayer({
                 guildId: this.guildId,
-                data: { paused: this.paused, volume: this.volume, position: playerPosition, encodedTrack: currentTrack?.track, voice: { token, endpoint, sessionId, channelId } },
+                data: {
+                    paused: this.paused,
+                    volume: this.volume,
+                    position: playerPosition,
+                    track: { encoded: currentTrack?.track },
+                    voice: { token, endpoint, sessionId, channelId },
+                },
             });
             await this.filters.updateFilters();
         }

package/dist/structures/Types.d.ts

@@ -645,7 +645,7 @@ export interface ManagerEvents {
  */
 export interface VoicePacket {
     t?: "VOICE_SERVER_UPDATE" | "VOICE_STATE_UPDATE";
-    d: VoiceState | VoiceServer;
+    d: DiscordVoiceState | VoiceServer;
 }
 /**
  * Voice Server
@@ -663,7 +663,7 @@ export interface Extendable {
 /**
  * Voice State
  */
-export interface VoiceState {
+export interface PlayerVoiceState {
     op: "voiceUpdate";
     guildId: string;
     event: VoiceServer;
@@ -673,12 +673,14 @@ export interface VoiceState {
 /**
  * Voice State
  */
-export interface VoiceState {
+export interface DiscordVoiceState {
     guild_id: string;
     user_id: string;
     session_id: string;
     channel_id: string;
 }
+/** @deprecated Use DiscordVoiceState or PlayerVoiceState instead */
+export type VoiceState = DiscordVoiceState | PlayerVoiceState;
 /**
  * NodeStats interface
  */
@@ -1069,28 +1071,32 @@ export interface PlayOptions {
  * RestPlayOptions interface
  */
 export interface RestPlayOptions {
+    /** The guild ID the Player belongs to. */
     guildId: string;
+    /** Whether to not replace the track if a play payload is sent. */
+    noReplace?: boolean;
     data: {
         /** The base64 encoded track. */
-        encodedTrack?: string;
-        /** The track ID. */
-        identifier?: string;
-        /** The track time to start at. */
-        startTime?: number;
+        track?: {
+            /** The base64 encoded track. */
+            encoded?: string | null;
+            /** The track ID. */
+            identifier?: string | null;
+            /** The user data of the track. */
+            userData?: object;
+        };
+        /** The player position in a track. */
+        position?: number;
         /** The track time to end at. */
         endTime?: number;
         /** The player volume level. */
         volume?: number;
-        /** The player position in a track. */
-        position?: number;
         /** Whether the player is paused. */
         paused?: boolean;
         /** The audio effects. */
         filters?: object;
         /** voice payload. */
         voice?: LavalinkVoiceStateUpdate;
-        /** Whether to not replace the track if a play payload is sent. */
-        noReplace?: boolean;
     };
 }
 /**
@@ -1111,7 +1117,7 @@ export interface SerializedPlayerState {
     queueRepeat: boolean;
     dynamicRepeat: boolean;
     dynamicLoopInterval?: number;
-    voiceState: VoiceState;
+    voiceState: PlayerVoiceState;
     options: PlayerOptions;
     node: {
         sessionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.0",
+    "version": "2.10.1-dev.1",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -100,9 +100,9 @@
     ],
     "repository": {
         "type": "git",
-        "url": "git+https://gitryx.com/MagmaStream/magmastream.git#main"
+        "url": "https://gitryx.com/MagmaStream/magmastream.git"
     },
     "homepage": "https://docs.magmastream.com",
     "author": "Abel Purnwasy",
     "license": "Apache-2.0"
-}
+}