hoshimi 0.3.1 → 0.3.5

package/dist/index.js

@@ -165,6 +165,7 @@ var Events = /* @__PURE__ */ ((Events2) => {
   Events2["PlayerCreate"] = "playerCreate";
   Events2["PlayerUpdate"] = "playerUpdate";
   Events2["PlayerDestroy"] = "playerDestroy";
+  Events2["PlayerError"] = "playerError";
   Events2["TrackStart"] = "trackStart";
   Events2["TrackEnd"] = "trackEnd";
   Events2["TrackStuck"] = "trackStuck";
@@ -184,6 +185,8 @@ var DestroyReasons = /* @__PURE__ */ ((DestroyReasons2) => {
   DestroyReasons2["NodeDisconnected"] = "Player-NodeDisconnected";
   DestroyReasons2["NodeDestroy"] = "Player-NodeDestroy";
   DestroyReasons2["VoiceChannelDeleted"] = "Player-VoiceChannelDeleted";
+  DestroyReasons2["VoiceChannelLeft"] = "Player-VoiceChannelLeft";
+  DestroyReasons2["ReconnectFailed"] = "Player-ReconnectFailed";
   return DestroyReasons2;
 })(DestroyReasons || {});
 
@@ -371,7 +374,7 @@ var Track = class {
   pluginInfo;
   /**
    * The track user data.
-   * @type {Record<string, unknown>}
+   * @type {TrackUserData}
    */
   userData;
   /**
@@ -441,7 +444,7 @@ var UnresolvedTrack = class {
   pluginInfo;
   /**
    * The track user data.
-   * @type {Record<string, unknown> | undefined}
+   * @type {TrackUserData | undefined}
    */
   userData;
   /**
@@ -469,7 +472,7 @@ var UnresolvedTrack = class {
   constructor(track, requester) {
     this.info = track.info;
     this.encoded = track.encoded;
-    this.requester = requester;
+    this.requester = requester ?? {};
     this.pluginInfo = track.pluginInfo;
     this.userData = track.userData ?? {};
   }
@@ -531,12 +534,20 @@ var UnresolvedTrack = class {
 // package.json
 var package_default = {
   name: "hoshimi",
-  version: "0.3.1",
+  version: "0.3.5",
   description: "A lavalink@v4 client easy to use, up-to-date and all ears.",
   main: "./dist/index.js",
   module: "./dist/index.mjs",
   types: "./dist/index.d.ts",
-  packageManager: "pnpm@10.24.0+sha512.01ff8ae71b4419903b65c60fb2dc9d34cf8bb6e06d03bde112ef38f7a34d6904c424ba66bea5cdcf12890230bf39f9580473140ed9c946fef328b6e5238a345a",
+  packageManager: "pnpm@10.27.0+sha512.72d699da16b1179c14ba9e64dc71c9a40988cbdc65c264cb0e489db7de917f20dcf4d64d8723625f2969ba52d4b7e2a1170682d9ac2a5dcaeaab732b7e16f04a",
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      require: "./dist/index.js",
+      import: "./dist/index.mjs",
+      default: "./dist/index.js"
+    }
+  },
   files: [
     "dist"
   ],
@@ -572,8 +583,8 @@ var package_default = {
   author: "Ganyu Studios",
   license: "MIT",
   devDependencies: {
-    "@biomejs/biome": "^2.3.8",
-    "@types/node": "^24.10.1",
+    "@biomejs/biome": "^2.3.11",
+    "@types/node": "^25.0.3",
     "@types/ws": "^8.18.1",
     husky: "^9.1.7",
     "lint-staged": "^16.2.7",
@@ -761,7 +772,7 @@ function validateManagerOptions(options) {
     throw new OptionError("The manager option 'options.nodes' must be a valid array of nodes and atleast one valid node.");
   if (typeof options.sendPayload !== "function")
     throw new OptionError("The manager option 'options.sendPayload' must be a vaid function.");
-  if (typeof options.queueOptions !== "undefined" && typeof options.queueOptions.maxPreviousTracks !== "number")
+  if (typeof options.queueOptions !== "undefined" && typeof options.queueOptions.maxHistory !== "number")
     throw new OptionError("The manager option 'options.queueOptions.maxPreviousTracks' must be a number.");
   if (typeof options.queueOptions !== "undefined" && typeof options.queueOptions.autoplayFn !== "function")
     throw new OptionError("The manager option 'options.queueOptions.autoplayFn' must be a function.");
@@ -818,7 +829,15 @@ function validatePlayerData(data) {
       player.playing = !data.playerOptions.paused;
     }
     if (typeof data.playerOptions.volume === "number") player.volume = data.playerOptions.volume;
-    if (typeof data.playerOptions.position === "number") player.position = data.playerOptions.position;
+    if (typeof data.playerOptions.position === "number") {
+      player.lastPosition = data.playerOptions.position;
+      player.lastPositionUpdate = Date.now();
+    }
+    if (typeof data.playerOptions.filters === "object") {
+      const timescale = Object.freeze({ ...player.filterManager.data.timescale });
+      Object.assign(player.filterManager.data, data.playerOptions.filters);
+      player.filterManager.check(timescale);
+    }
   }
 }
 function validateNodePlugins(node, plugins) {
@@ -843,9 +862,11 @@ function validateEngine(type) {
 }
 function validateTrack(player, track) {
   if (!track) return Promise.resolve(null);
-  if (isTrack(track)) return Promise.resolve(new Track(track, track.requester));
+  const requesterFn2 = player.manager.options.playerOptions.requesterFn;
+  if (isTrack(track)) return Promise.resolve(new Track(track, requesterFn2(track.requester)));
   if (!isUnresolvedTrack(track)) throw new ResolveError("The track is not a valid unresolved track.");
-  if (!track.resolve || typeof track.resolve !== "function") return new UnresolvedTrack(track, track.requester).resolve(player);
+  if (!track.resolve || typeof track.resolve !== "function")
+    return new UnresolvedTrack(track, requesterFn2(track.requester)).resolve(player);
   return track.resolve(player);
 }
 var isTrack = (track) => {
@@ -877,6 +898,9 @@ function stringify(value, space) {
     space
   );
 }
+function requesterFn(requester) {
+  return requester;
+}
 function isNode(options) {
   return typeof options.host === "string" && typeof options.port === "number" && typeof options.password === "string" && (typeof options.id === "string" || typeof options.id === "undefined") && (typeof options.secure === "boolean" || typeof options.secure === "undefined") && (typeof options.sessionId === "string" || typeof options.sessionId === "undefined") && (typeof options.retryAmount === "number" || typeof options.retryAmount === "undefined") && (typeof options.retryDelay === "number" || typeof options.retryDelay === "undefined");
 }
@@ -1375,8 +1399,8 @@ async function onEnd() {
     (x) => x.info.identifier === this.queue.current.info.identifier && x.info.title === this.queue.current.info.title
   )) {
     this.queue.history.unshift(this.queue.current);
-    if (this.queue.history.length > this.manager.options.queueOptions.maxPreviousTracks)
-      this.queue.history.splice(this.manager.options.queueOptions.maxPreviousTracks, this.queue.history.length);
+    if (this.queue.history.length > this.manager.options.queueOptions.maxHistory)
+      this.queue.history.splice(this.manager.options.queueOptions.maxHistory, this.queue.history.length);
     await this.queue.utils.save();
     this.manager.emit(
       "debug" /* Debug */,
@@ -1386,7 +1410,7 @@ async function onEnd() {
   }
   if (this.loop === 1 /* Track */ && this.queue.current) this.queue.unshift(this.queue.current);
   if (this.loop === 2 /* Queue */ && this.queue.current) this.queue.add(this.queue.current);
-  if (!this.queue.current) this.queue.current = await validateTrack(this, this.queue.shift());
+  if (!this.queue.current) this.queue.current = await validateTrack(this, await this.queue.shift());
   await this.queue.utils.save();
   return;
 }
@@ -1492,7 +1516,8 @@ async function playerUpdate(payload) {
   player.ping = payload.state.ping;
   player.connected = payload.state.connected;
   player.createdTimestamp = payload.state.time;
-  player.position = payload.state.position;
+  player.lastPosition = payload.state.position || 0;
+  player.lastPositionUpdate = Date.now();
   this.nodeManager.manager.emit("playerUpdate" /* PlayerUpdate */, player, oldPlayer, payload);
   this.nodeManager.manager.emit(
     "debug" /* Debug */,
@@ -1532,6 +1557,43 @@ async function socketClosed(payload) {
     `[Player] -> [Socket] The socket has closed: ${this.guildId} | Payload: ${stringify(payload)}`
   );
 }
+async function resumeByLibrary(players) {
+  this.nodeManager.manager.emit("debug" /* Debug */, 2 /* Node */, `[Socket] -> [${this.id}]: Resuming session by library...`);
+  for (const player of players) {
+    try {
+      if (!player.playing && !player.paused && !player.queue.totalSize) {
+        this.nodeManager.manager.emit(
+          "debug" /* Debug */,
+          2 /* Node */,
+          `[Player] -> [Resume] Destroyed player for guild ${player.guildId} due to empty queue.`
+        );
+        await player.destroy();
+        return;
+      }
+      const track = player.queue.current;
+      await player.node.updatePlayer({
+        guildId: player.guildId,
+        playerOptions: { voice: player.voice }
+      });
+      await player.connect();
+      await player.queue.utils.sync(false, true);
+      if (track)
+        await player.play({
+          track,
+          noReplace: false,
+          position: player.lastPosition,
+          paused: player.paused
+        });
+    } catch (error) {
+      this.nodeManager.manager.emit("nodeError" /* NodeError */, this, error);
+    }
+    this.nodeManager.manager.emit(
+      "debug" /* Debug */,
+      2 /* Node */,
+      `[Player] -> [Resume] Resumed player for guild ${player.guildId} using the library.`
+    );
+  }
+}
 
 // src/util/events/websocket.ts
 function onOpen(res) {
@@ -1604,34 +1666,37 @@ async function onMessage(message) {
           this.sessionId = payload.sessionId;
           this.session.resuming = payload.resumed;
           if (payload.resumed) {
-            const players = await this.rest.request({
+            const players2 = await this.rest.request({
               endpoint: `/sessions/${payload.sessionId}/players`
             }) ?? [];
             const timeout = this.nodeManager.manager.options.nodeOptions.resumeTimeout;
-            this.nodeManager.manager.emit("nodeResumed" /* NodeResumed */, this, players, payload);
+            this.nodeManager.manager.emit("nodeResumed" /* NodeResumed */, this, players2, payload);
             this.nodeManager.manager.emit(
               "debug" /* Debug */,
               2 /* Node */,
-              `[Socket] <- [${this.id}]: Resumed session. | Session id: ${payload.sessionId} | Players: ${players.length} | Resumed: ${payload.resumed} | Timeout: ${timeout}ms`
+              `[Socket] <- [${this.id}]: Resumed session. | Session id: ${payload.sessionId} | Players: ${players2.length} | Resumed: ${payload.resumed} | Timeout: ${timeout}ms`
             );
           }
+          const players = this.nodeManager.manager.players.filter((p) => p.node.id === this.id);
+          const isLibrary = this.nodeManager.manager.options.nodeOptions.resumeByLibrary;
+          if (!payload.resumed && isLibrary && players.length) await resumeByLibrary.call(this, players);
           this.info = await this.rest.request({ endpoint: "/info" });
-          this.nodeManager.manager.emit(
-            "debug" /* Debug */,
-            2 /* Node */,
-            `[Socket] <- [${this.id}]: Received ready event. | Session id: ${payload.sessionId} | Resumed: ${payload.resumed}`
-          );
-          this.nodeManager.manager.emit("nodeReady" /* NodeReady */, this, this.retryAmount, payload);
           const isResumable = this.nodeManager.manager.options.nodeOptions.resumable;
           if (isResumable) {
             const timeout = this.nodeManager.manager.options.nodeOptions.resumeTimeout;
             this.nodeManager.manager.emit(
               "debug" /* Debug */,
               2 /* Node */,
-              `[Socket] -> [${this.id}]: Resuming session... | Timeout: ${timeout}ms`
+              `[Socket] -> [${this.id}]: Setting timeout to resume session. | Timeout: ${timeout}ms`
             );
             await this.updateSession(isResumable, timeout);
           }
+          this.nodeManager.manager.emit(
+            "debug" /* Debug */,
+            2 /* Node */,
+            `[Socket] <- [${this.id}]: Received ready event. | Session id: ${payload.sessionId} | Resumed: ${payload.resumed}`
+          );
+          this.nodeManager.manager.emit("nodeReady" /* NodeReady */, this, this.retryAmount, payload);
         }
         break;
       case "event" /* Event */: {
@@ -3005,6 +3070,13 @@ var FilterManager = class {
     this.filters.timescale = !this.filters.timescale;
     return this.apply();
   }
+  /**
+   * Convert the filter settings to a JSON object.
+   * @returns {FilterSettings} The filter settings as a JSON object.
+   */
+  toJSON() {
+    return { ...this.data };
+  }
 };
 
 // src/classes/player/Storage.ts
@@ -3197,10 +3269,23 @@ var Player = class {
    */
   createdTimestamp = 0;
   /**
-   * The position of the player.
+   * The last position received from Lavalink.
    * @type {number}
    */
-  position = 0;
+  lastPosition = 0;
+  /**
+   * The timestamp when the last position change update happened.
+   * @type {number | null}
+   */
+  lastPositionUpdate = null;
+  /**
+   * The current calculated position of the player.
+   * @type {number}
+   * @readonly
+   */
+  get position() {
+    return this.lastPosition + (this.lastPositionUpdate ? Date.now() - this.lastPositionUpdate : 0);
+  }
   /**
    * The voice connection details.
    * @type {PlayerVoice}
@@ -3322,6 +3407,8 @@ var Player = class {
     if (typeof position !== "number" || Number.isNaN(position) || position < 0)
       throw new PlayerError("Position must be a positive number.");
     this.manager.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Seek] Seeking to ${position} for guild: ${this.guildId}`);
+    this.lastPosition = position;
+    this.lastPositionUpdate = Date.now();
     await this.updatePlayer({ playerOptions: { position } });
   }
   /**
@@ -3336,15 +3423,7 @@ var Player = class {
    */
   async disconnect() {
     if (!this.voiceId) return this;
-    await this.manager.options.sendPayload(this.guildId, {
-      op: 4,
-      d: {
-        guild_id: this.guildId,
-        channel_id: null,
-        self_deaf: this.selfDeaf,
-        self_mute: this.selfMute
-      }
-    });
+    await this.setVoice({ voiceId: null });
     this.manager.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Disconnect] Player disconnected for guild: ${this.guildId}`);
     this.connected = false;
     return this;
@@ -3390,15 +3469,20 @@ var Player = class {
   async play(options = {}) {
     if (typeof options !== "object") throw new PlayerError("The play options must be an object.");
     if (options.track) this.queue.current = await validateTrack(this, options.track);
-    else if (!this.queue.current) this.queue.current = await validateTrack(this, this.queue.shift());
+    else if (!this.queue.current) this.queue.current = await validateTrack(this, await this.queue.shift());
     if (!this.queue.current) throw new PlayerError("No track to play.");
     if (!isTrack(this.queue.current) && !isUnresolvedTrack(this.queue.current))
       throw new PlayerError("The track must be a valid Track or UnresolvedTrack instance.");
     this.manager.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Play] A new track is playing: ${this.queue.current.info.title}`);
+    const position = options.position ?? 0;
+    this.lastPosition = position;
+    this.lastPositionUpdate = Date.now();
     await this.updatePlayer({
       noReplace: options.noReplace,
       playerOptions: {
         ...options,
+        position,
+        // Ensure position is sent to Lavalink
         track: {
           userData: this.queue.current.userData,
           encoded: this.queue.current.encoded
@@ -3418,15 +3502,7 @@ var Player = class {
    */
   async connect() {
     if (!this.voiceId) return this;
-    await this.manager.options.sendPayload(this.guildId, {
-      op: 4,
-      d: {
-        guild_id: this.guildId,
-        channel_id: this.voiceId,
-        self_deaf: this.selfDeaf,
-        self_mute: this.selfMute
-      }
-    });
+    await this.setVoice();
     this.manager.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Connect] Player connected for guild: ${this.guildId}`);
     this.connected = true;
     return this;
@@ -3448,7 +3524,8 @@ var Player = class {
     this.manager.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Stop] Player stopped for guild: ${this.guildId}`);
     this.playing = false;
     this.paused = false;
-    this.position = 0;
+    this.lastPosition = 0;
+    this.lastPositionUpdate = null;
     this.queue.current = null;
     return;
   }
@@ -3468,6 +3545,12 @@ var Player = class {
       3 /* Player */,
       `[Player] -> [Pause] Player is now ${paused ? "paused" : "resumed"} for guild: ${this.guildId}`
     );
+    if (paused) {
+      this.lastPositionUpdate = null;
+    } else {
+      this.lastPosition = this.position;
+      this.lastPositionUpdate = Date.now();
+    }
     await this.updatePlayer({ playerOptions: { paused } });
     return paused;
   }
@@ -3518,7 +3601,7 @@ var Player = class {
   }
   /**
    * Set the voice of the player.
-   * @param {Partial<VoiceChannelUpdate>} voice The voice state to set.
+   * @param {NullableVoiceChannelUpdate} options The voice state to set.
    * @returns {Promise<void>}
    * @example
    * ```ts
@@ -3526,27 +3609,17 @@ var Player = class {
    * player.setVoice({ voiceId: "newVoiceId" });
    * ```
    */
-  async setVoice(voice) {
-    if (voice.voiceId === this.voiceId) return;
-    if (voice.voiceId) {
-      this.voiceId = voice.voiceId;
-      this.options.voiceId = voice.voiceId;
-    }
-    if (voice.selfDeaf) {
-      this.selfDeaf = voice.selfDeaf;
-      this.options.selfDeaf = voice.selfDeaf;
-    }
-    if (voice.selfMute) {
-      this.selfMute = voice.selfMute;
-      this.options.selfMute = voice.selfMute;
-    }
+  async setVoice(options = {}) {
+    options.voiceId ??= this.voiceId;
+    options.selfDeaf ??= this.selfDeaf;
+    options.selfMute ??= this.selfMute;
     await this.manager.options.sendPayload(this.guildId, {
       op: 4,
       d: {
         guild_id: this.guildId,
-        self_deaf: this.selfDeaf,
-        self_mute: this.selfMute,
-        channel_id: this.voiceId ?? null
+        self_deaf: options.selfDeaf,
+        self_mute: options.selfMute,
+        channel_id: options.voiceId ?? null
       }
     });
     this.manager.emit(
@@ -3635,6 +3708,13 @@ var Player = class {
       selfDeaf: this.selfDeaf,
       options: this.options,
       voice: this.voice,
+      textId: this.textId,
+      lastPosition: this.lastPosition,
+      lastPositionUpdate: this.lastPositionUpdate,
+      position: this.position,
+      createdTimestamp: this.createdTimestamp,
+      ping: this.ping,
+      filters: this.filterManager.toJSON(),
       queue: this.queue.toJSON(),
       node: this.node.toJSON()
     };
@@ -3756,16 +3836,15 @@ var QueueUtils = class {
    * ```
    */
   save() {
-    const max = this.options.maxPreviousTracks;
+    const max = this.options.maxHistory;
     const length = this.queue.tracks.length;
-    const json = this.queue.toJSON();
     if (length > max) this.queue.history.splice(0, length - max);
     this.queue.player.manager.emit(
       "debug" /* Debug */,
       5 /* Queue */,
-      `[Queue] -> [Adapter] Saving queue for ${this.queue.player.guildId} | Object: ${stringify(json)}`
+      `[Queue] -> [Adapter] Saving queue for ${this.queue.player.guildId} | Object: ${stringify(this.queue.toJSON())}`
     );
-    return this.store.set(this.queue.player.guildId, json);
+    return this.store.set(this.queue.player.guildId, this.queue.toJSON());
   }
   /**
    *
@@ -3931,25 +4010,50 @@ var Queue = class {
   isEmpty() {
     return this.size === 0;
   }
+  /**
+   *
+   * Build a track from a Lavalink track or unresolved Lavalink track.
+   * @param {LavalinkTrack | UnresolvedLavalinkTrack} track The track to build.
+   * @param {TrackRequester} requester The requester of the track.
+   * @returns {Promise<Track>} The built track.
+   * @example
+   * ```ts
+   * const queue = player.queue;
+   * const lavalinkTrack = {...} // some lavalink track
+   * const track = await queue.build(lavalinkTrack, author);
+   *
+   * console.log(track.info.title); // The title of the track
+   * ```
+   */
+  async build(track, requester) {
+    const requesterFn2 = this.player.manager.options.playerOptions.requesterFn;
+    if (isUnresolvedTrack(track)) return new UnresolvedTrack(track, requesterFn2(requester)).resolve(this.player);
+    if (isTrack(track)) return new Track(track, requesterFn2(requester));
+    return track;
+  }
   /**
    *
    * Get the previous track of the queue.
    * @param {boolean} [remove=false] Whether to remove the track from the previous queue.
-   * @returns {Track | null} The previous track of the queue.
+   * @returns {Promise<Track | null>} The previous track of the queue.
    * @example
    * ```ts
    * const queue = player.queue;
    *
-   * console.log(queue.previous()); // null
+   * console.log(await queue.previous()); // null
    * queue.add(track);
    * queue.add(track2);
    *
-   * console.log(queue.previous()); // track
-   * console.log(queue.previous(true)); // track and remove it from the previous tracks
+   * console.log(await queue.previous()); // track
+   * console.log(await queue.previous(true)); // track and remove it from the previous tracks
    * ```
    */
-  previous(remove = false) {
-    if (remove) return this.history.shift() ?? null;
+  async previous(remove = false) {
+    if (remove) {
+      const track = this.history.shift() ?? null;
+      if (track) await this.utils.save();
+      return track;
+    }
     return this.history[0] ?? null;
   }
   /**
@@ -3957,94 +4061,98 @@ var Queue = class {
    * Add a track or tracks to the queue.
    * @param {Track | Track[]} track The track or tracks to add.
    * @param {number} [position] The position to add the track or tracks.
-   * @returns {this} The queue instance.
+   * @returns {Promise<this>} The queue instance.
    * @example
    * ```ts
    * const queue = player.queue;
    *
    * console.log(queue.size); // 0
    *
-   * queue.add(track);
+   * await queue.add(track);
    * console.log(queue.size); // 1
    *
-   * queue.add([track1, track2]);
+   * await queue.add([track1, track2]);
    * console.log(queue.size); // 3
    *
-   * queue.add(track3, 1);
+   * await queue.add(track3, 1);
    * console.log(queue.size); // 4
    * console.log(queue.tracks); // [track1, track3, track2, track]
    * ```
    */
-  add(track, position) {
+  async add(track, position) {
     const tracks = Array.isArray(track) ? track : [track];
     if (typeof position === "number" && position >= 0 && position < this.tracks.length) return this.splice(position, 0, ...tracks);
     this.tracks.push(...tracks);
     this.player.manager.emit("queueUpdate" /* QueueUpdate */, this.player, this);
     this.player.manager.emit("debug" /* Debug */, 5 /* Queue */, `[Queue] -> [Add] Added ${this.tracks.length} tracks to the queue.`);
+    await this.utils.save();
     return this;
   }
   /**
    *
    * Get the first track of the queue.
-   * @returns {HoshimiTrack | null} The first track of the queue.
+   * @returns {Promise<HoshimiTrack | null>} The first track of the queue.
    * @example
    * ```ts
    * const queue = player.queue;
    *
-   * console.log(queue.shift()); // null
-   * queue.add(track);
+   * console.log(await queue.shift()); // null
+   * await queue.add(track);
    *
-   * console.log(queue.shift()); // track
-   * queue.add(track2);
+   * console.log(await queue.shift()); // track
+   * await queue.add(track2);
    * ```
    */
-  shift() {
-    return this.tracks.shift() ?? null;
+  async shift() {
+    const track = this.tracks.shift() ?? null;
+    if (track) await this.utils.save();
+    return track;
   }
   /**
    *
    * Add tracks to the beginning of the queue.
    * @param {Track[]} tracks The tracks to add.
-   * @returns {this} The queue instance.
+   * @returns {Promise<this>} The queue instance.
    * @example
    * ```ts
    * const queue = player.queue;
    *
    * console.log(queue.size); // 0
-   * queue.unshift(track);
+   * await queue.unshift(track);
    *
    * console.log(queue.size); // 1
-   * queue.unshift([track1, track2]);
+   * await queue.unshift(track1, track2);
    *
    * console.log(queue.size); // 3
    * console.log(queue.tracks); // [track1, track2, track]
    * ```
    */
-  unshift(...tracks) {
+  async unshift(...tracks) {
     this.tracks.unshift(...tracks);
     this.player.manager.emit("debug" /* Debug */, 5 /* Queue */, `[Queue] -> [Unshift] Added ${this.tracks.length} tracks to the queue.`);
+    await this.utils.save();
     return this;
   }
   /**
    *
    * Shuffle the queue.
-   * @returns {this} The queue instance.
+   * @returns {Promise<this>} The queue instance.
    * @example
    * ```ts
    * const queue = player.queue;
    *
    * console.log(queue.size); // 0
-   * queue.add(track);
-   * queue.add([track1, track2]);
+   * await queue.add(track);
+   * await queue.add(track1, track2);
    *
    * console.log(queue.size); // 3
    * console.log(queue.tracks); // [track, track1, track2]
    *
-   * queue.shuffle();
+   * await queue.shuffle();
    * console.log(queue.tracks); // [track2, track, track1]
    * ```
    */
-  shuffle() {
+  async shuffle() {
     if (this.size <= 1) return this;
     if (this.size === 2) [this.tracks[0], this.tracks[1]] = [this.tracks[1], this.tracks[0]];
     else {
@@ -4055,31 +4163,33 @@ var Queue = class {
     }
     this.player.manager.emit("queueUpdate" /* QueueUpdate */, this.player, this);
     this.player.manager.emit("debug" /* Debug */, 5 /* Queue */, "[Queue] -> [Shuffle] Shuffled the queue.");
+    await this.utils.save();
     return this;
   }
   /**
    *
    * Clear the queue.
-   * @returns {this} The queue instance.
+   * @returns {Promise<this>} The queue instance.
    * @example
    * ```ts
    * const queue = player.queue;
    *
    * console.log(queue.size); // 0
-   * queue.add(track);
-   * queue.add([track1, track2]);
+   * await queue.add(track);
+   * await queue.add(track1, track2);
    *
    * console.log(queue.size); // 3
-   * queue.clear();
+   * await queue.clear();
    * console.log(queue.size); // 0
    * ```
    */
-  clear() {
+  async clear() {
     this.tracks = [];
     this.history = [];
     this.current = null;
     this.player.manager.emit("queueUpdate" /* QueueUpdate */, this.player, this);
     this.player.manager.emit("debug" /* Debug */, 5 /* Queue */, "[Queue] -> [Clear] Cleared the queue.");
+    await this.utils.save();
     return this;
   }
   /**
@@ -4087,15 +4197,16 @@ var Queue = class {
    * Move a track to a specific position in the queue.
    * @param {Track} track The track to move.
    * @param {number} to The position to move.
-   * @returns {this} The queue instance.
+   * @returns {Promise<this>} The queue instance.
    */
-  move(track, to) {
+  async move(track, to) {
     const index = this.tracks.indexOf(track);
     if (index === -1) return this;
-    this.splice(index, 1);
-    this.add(track, to - 1);
+    await this.splice(index, 1);
+    await this.add(track, to - 1);
     this.player.manager.emit("queueUpdate" /* QueueUpdate */, this.player, this);
     this.player.manager.emit("debug" /* Debug */, 5 /* Queue */, `[Queue] -> [Move] Moved track ${track.info.title} to position ${to}.`);
+    await this.utils.save();
     return this;
   }
   /**
@@ -4104,14 +4215,15 @@ var Queue = class {
    * @param {number} start The start index.
    * @param {number} deleteCount The number of tracks to delete.
    * @param {Track | Track[]} [tracks] The tracks to add.
-   * @returns {this} The queue instance.
+   * @returns {Promise<this>} The queue instance.
    */
-  splice(start, deleteCount, tracks) {
-    if (!this.size && tracks) this.add(tracks);
+  async splice(start, deleteCount, tracks) {
+    if (!this.size && tracks) await this.add(tracks);
     if (tracks) this.tracks.splice(start, deleteCount, ...Array.isArray(tracks) ? tracks : [tracks]);
     else this.tracks.splice(start, deleteCount);
     this.player.manager.emit("queueUpdate" /* QueueUpdate */, this.player, this);
     this.player.manager.emit("debug" /* Debug */, 5 /* Queue */, `[Queue] -> [Splice] Removed ${deleteCount} tracks from the queue.`);
+    await this.utils.save();
     return this;
   }
   /**
@@ -4120,7 +4232,7 @@ var Queue = class {
    * @returns {QueueJson} The queue JSON object.
    */
   toJSON() {
-    const max = this.player.manager.options.queueOptions.maxPreviousTracks;
+    const max = this.player.manager.options.queueOptions.maxHistory;
     if (this.history.length > max) this.history.splice(max, this.history.length);
     return {
       tracks: this.tracks,
@@ -4286,10 +4398,24 @@ var Hoshimi = class extends import_node_events.EventEmitter {
    * 		resumeByLibrary: false,
    * 	},
    * 	queueOptions: {
-   * 		maxPreviousTracks: 25,
-   * 		autoplayFn: autoplayFn,
-   * 		autoPlay: false,
+   *      maxHistory: 25,
+   *      autoplayFn: autoplayFn,
+   *      autoPlay: false,
+   *      storage: new MemoryAdapter(),
+   *      requesterFn: defaultRequesterFn,
    * 	},
+   *   playerOptions: {
+   *    	onDisconnect: {
+   *        autoDestroy: false,
+   *        autoReconnect: false,
+   *        autoQueue: false,
+   *   	},
+   *   	onError: {
+   *        autoDestroy: false,
+   *        autoSkip: false,
+   *        autoStop: false,
+   *      },
+   *   },
    * });
    *
    * console.log(manager); // The manager instance
@@ -4311,11 +4437,24 @@ var Hoshimi = class extends import_node_events.EventEmitter {
         resumeTimeout: options.nodeOptions?.resumeTimeout ?? 1e4
       },
       queueOptions: {
-        maxPreviousTracks: options.queueOptions?.maxPreviousTracks ?? 25,
+        maxHistory: options.queueOptions?.maxHistory ?? 25,
         autoplayFn: options.queueOptions?.autoplayFn ?? autoplayFn,
         autoPlay: options.queueOptions?.autoPlay ?? false,
         storage: options.queueOptions?.storage ?? new MemoryAdapter()
       },
+      playerOptions: {
+        requesterFn: options.playerOptions?.requesterFn ?? requesterFn,
+        onDisconnect: {
+          autoDestroy: options.playerOptions?.onDisconnect?.autoDestroy ?? false,
+          autoReconnect: options.playerOptions?.onDisconnect?.autoReconnect ?? true,
+          autoQueue: options.playerOptions?.onDisconnect?.autoQueue ?? false
+        },
+        onError: {
+          autoDestroy: options.playerOptions?.onError?.autoDestroy ?? false,
+          autoSkip: options.playerOptions?.onError?.autoSkip ?? false,
+          autoStop: options.playerOptions?.onError?.autoStop ?? false
+        }
+      },
       client: {
         id: options.client?.id ?? "",
         username: options.client?.username ?? "hoshimi-client"
@@ -4452,6 +4591,56 @@ var Hoshimi = class extends import_node_events.EventEmitter {
             );
             return;
           }
+          if ("channel_id" in data && typeof data.channel_id === "string") {
+            if (data.channel_id !== player.voiceId) {
+              this.emit(
+                "debug" /* Debug */,
+                3 /* Player */,
+                `[Player] -> [Voice] Updating the voice channel for: ${data.guild_id} | Old: ${player.voiceId} | New: ${data.channel_id}`
+              );
+              player.voice.sessionId = data.session_id ?? player.voice.sessionId;
+              player.voiceId = data.channel_id;
+              player.options.voiceId = data.channel_id;
+              if (!player.connected) await player.connect();
+              return;
+            }
+          } else {
+            this.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Voice] The channel id is missing for: ${data.guild_id}`);
+            const { autoDestroy, autoReconnect, autoQueue } = this.options.playerOptions.onDisconnect;
+            if (autoDestroy) {
+              await player.destroy("Player-VoiceChannelLeft" /* VoiceChannelLeft */);
+              return;
+            }
+            if (autoReconnect) {
+              try {
+                const position = player.position;
+                const paused = player.paused;
+                this.emit(
+                  "debug" /* Debug */,
+                  3 /* Player */,
+                  `[Player] -> [Voice] Attempting to reconnect the player for: ${data.guild_id}`
+                );
+                if (autoQueue && player.queue.current && !player.queue.isEmpty()) await player.connect();
+                if (player.queue.current) return player.play({ track: player.queue.current, paused, position });
+                if (!player.queue.isEmpty()) return player.play({ paused });
+                this.emit(
+                  "debug" /* Debug */,
+                  3 /* Player */,
+                  `[Player] -> [Voice] No tracks to play after reconnect for: ${data.guild_id}`
+                );
+              } catch (error) {
+                this.emit("playerError" /* PlayerError */, player, error);
+                await player.destroy("Player-ReconnectFailed" /* ReconnectFailed */);
+              }
+            }
+            player.voiceId = void 0;
+            player.voice = {
+              endpoint: null,
+              sessionId: null,
+              token: null
+            };
+            return;
+          }
           this.emit("debug" /* Debug */, 3 /* Player */, `[Player] -> [Voice] The player voice is missing for: ${data.guild_id}`);
         }
         break;
@@ -4561,6 +4750,7 @@ var Hoshimi = class extends import_node_events.EventEmitter {
       1 /* Manager */,
       `[Manager] -> [Search] Searching for: ${options.query} (${options.engine ?? "unknown"}) | Result: ${stringify(res)}`
     );
+    const requesterFn2 = this.options.playerOptions.requesterFn;
     switch (res.loadType) {
       case "empty" /* Empty */: {
         return {
@@ -4586,7 +4776,7 @@ var Hoshimi = class extends import_node_events.EventEmitter {
           exception: null,
           playlist: res.data,
           pluginInfo: res.data.pluginInfo,
-          tracks: res.data.tracks.map((t) => new Track(t, options.requester))
+          tracks: res.data.tracks.map((t) => new Track(t, requesterFn2(options.requester)))
         };
       }
       case "search" /* Search */: {
@@ -4595,7 +4785,7 @@ var Hoshimi = class extends import_node_events.EventEmitter {
           exception: null,
           playlist: null,
           pluginInfo: null,
-          tracks: res.data.map((t) => new Track(t, options.requester))
+          tracks: res.data.map((t) => new Track(t, requesterFn2(options.requester)))
         };
       }
       case "track" /* Track */: {
@@ -4604,7 +4794,7 @@ var Hoshimi = class extends import_node_events.EventEmitter {
           exception: null,
           playlist: null,
           pluginInfo: res.data.pluginInfo,
-          tracks: [new Track(res.data, options.requester)]
+          tracks: [new Track(res.data, requesterFn2(options.requester))]
         };
       }
     }