lavalink-client 2.3.3 → 2.3.5

package/dist/esm/structures/Player.js

@@ -1,8 +1,8 @@
-import { DebugEvents } from "./Constants";
-import { bandCampSearch } from "./CustomSearches/BandCampSearch";
-import { FilterManager } from "./Filters";
-import { Queue, QueueSaver } from "./Queue";
-import { queueTrackEnd } from "./Utils";
+import { DebugEvents } from "./Constants.js";
+import { bandCampSearch } from "./CustomSearches/BandCampSearch.js";
+import { FilterManager } from "./Filters.js";
+import { Queue, QueueSaver } from "./Queue.js";
+import { queueTrackEnd } from "./Utils.js";
 export class Player {
     /** Filter Manager per player */
     filterManager;
@@ -135,7 +135,7 @@ export class Player {
      */
     async play(options = {}) {
         if (this.get("internal_queueempty")) {
-            if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                 this.LavalinkManager.emit("debug", DebugEvents.PlayerPlayQueueEmptyTimeoutClear, {
                     state: "log",
                     message: `Player was called to play something, while there was a queueEmpty Timeout set, clearing the timeout.`,
@@ -147,8 +147,31 @@ export class Player {
         }
         // if clientTrack provided, override options.track object
         if (options?.clientTrack && (this.LavalinkManager.utils.isTrack(options?.clientTrack) || this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack))) {
-            if (this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack))
-                await options.clientTrack.resolve(this);
+            if (this.LavalinkManager.utils.isUnresolvedTrack(options.clientTrack)) {
+                try {
+                    // resolve the unresolved track
+                    await options.clientTrack.resolve(this);
+                }
+                catch (error) {
+                    if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+                        this.LavalinkManager.emit("debug", DebugEvents.PlayerPlayUnresolvedTrackFailed, {
+                            state: "error",
+                            error: error,
+                            message: `Player Play was called with clientTrack, Song is unresolved, but couldn't resolve it`,
+                            functionLayer: "Player > play() > resolve currentTrack",
+                        });
+                    }
+                    this.LavalinkManager.emit("trackError", this, this.queue.current, error);
+                    if (options && "clientTrack" in options)
+                        delete options.clientTrack;
+                    if (options && "track" in options)
+                        delete options.track;
+                    // try to play the next track if possible
+                    if (this.LavalinkManager.options?.autoSkipOnResolveError === true && this.queue.tracks[0])
+                        return this.play(options);
+                    return this;
+                }
+            }
             if ((typeof options.track?.userData === "object" || typeof options.clientTrack?.userData === "object") && options.clientTrack)
                 options.clientTrack.userData = { ...(options?.clientTrack.userData || {}), ...(options.track?.userData || {}) };
             options.track = {
@@ -182,7 +205,7 @@ export class Player {
                     ...(track.userData || {}),
                     requester: this.LavalinkManager.utils.getTransformedRequester(options?.track?.requester || {})
                 };
-            if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                 this.LavalinkManager.emit("debug", DebugEvents.PlayerPlayWithTrackReplace, {
                     state: "log",
                     message: `Player was called to play something, with a specific track provided. Replacing the current Track and resolving the track on trackStart Event.`,
@@ -206,7 +229,7 @@ export class Player {
         if (!this.queue.current && this.queue.tracks.length)
             await queueTrackEnd(this);
         if (this.queue.current && this.LavalinkManager.utils.isUnresolvedTrack(this.queue.current)) {
-            if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                 this.LavalinkManager.emit("debug", DebugEvents.PlayerPlayUnresolvedTrack, {
                     state: "log",
                     message: `Player Play was called, current Queue Song is unresolved, resolving the track.`,
@@ -220,7 +243,7 @@ export class Player {
                     this.queue.current.userData = { ...(this.queue.current?.userData || {}), ...(options.track?.userData || {}) };
             }
             catch (error) {
-                if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+                if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                     this.LavalinkManager.emit("debug", DebugEvents.PlayerPlayUnresolvedTrackFailed, {
                         state: "error",
                         error: error,
@@ -294,7 +317,7 @@ export class Player {
             : this.volume), 1000), 0));
         const now = performance.now();
         if (this.LavalinkManager.options.playerOptions.applyVolumeAsFilter) {
-            if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                 this.LavalinkManager.emit("debug", DebugEvents.PlayerVolumeAsFilter, {
                     state: "log",
                     message: `Player Volume was set as a Filter, because LavalinkManager option "playerOptions.applyVolumeAsFilter" is true`,
@@ -346,7 +369,7 @@ export class Player {
     async search(query, requestUser, throwOnEmpty = false) {
         const Query = this.LavalinkManager.utils.transformQuery(query);
         if (["bcsearch", "bandcamp"].includes(Query.source) && !this.node.info.sourceManagers.includes("bandcamp")) {
-            if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                 this.LavalinkManager.emit("debug", DebugEvents.BandcampSearchLokalEngine, {
                     state: "log",
                     message: `Player.search was called with a Bandcamp Query, but no bandcamp search was enabled on lavalink, searching with the custom Search Engine.`,
@@ -556,7 +579,7 @@ export class Player {
         const updateNode = typeof newNode === "string" ? this.LavalinkManager.nodeManager.nodes.get(newNode) : newNode;
         if (!updateNode)
             throw new Error("Could not find the new Node");
-        if (typeof this.options.node === "string" && this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+        if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
             this.LavalinkManager.emit("debug", DebugEvents.PlayerChangeNode, {
                 state: "log",
                 message: `Player.changeNode() was executed, trying to change from "${this.node.id}" to "${updateNode.id}"`,

package/dist/esm/structures/Queue.d.ts

@@ -1,6 +1,6 @@
-import { MiniMap } from "./Utils";
-import type { Track, UnresolvedTrack } from "./Types/Track";
-import type { ManagerQueueOptions, QueueStoreManager, StoredQueue } from "./Types/Queue";
+import { MiniMap } from "./Utils.js";
+import type { Track, UnresolvedTrack } from "./Types/Track.js";
+import type { ManagerQueueOptions, QueueStoreManager, StoredQueue } from "./Types/Queue.js";
 export declare class QueueSaver {
     /**
      * The queue store manager

package/dist/esm/structures/Queue.js

@@ -1,4 +1,4 @@
-import { ManagerUtils, MiniMap, QueueSymbol } from "./Utils";
+import { ManagerUtils, MiniMap, QueueSymbol } from "./Utils.js";
 export class QueueSaver {
     /**
      * The queue store manager

package/dist/esm/structures/Types/Filters.d.ts

@@ -1,4 +1,4 @@
-import type { FloatNumber, IntegerNumber } from "./Utils";
+import type { FloatNumber, IntegerNumber } from "./Utils.js";
 /** The Audio Outputs type */
 export type AudioOutputs = "mono" | "stereo" | "left" | "right";
 /** The "active" / "disabled" Player Filters */

package/dist/esm/structures/Types/Manager.d.ts

@@ -1,10 +1,10 @@
-import type { DebugEvents } from "../Constants";
-import type { Player } from "../Player";
-import type { LavalinkNodeOptions } from "./Node";
-import type { DestroyReasonsType, PlayerJson } from "./Player";
-import type { ManagerQueueOptions } from "./Queue";
-import type { Track, UnresolvedTrack } from "./Track";
-import type { GuildShardPayload, SearchPlatform, SponsorBlockChaptersLoaded, SponsorBlockChapterStarted, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, TrackExceptionEvent, TrackEndEvent, TrackStuckEvent, WebSocketClosedEvent, TrackStartEvent } from "./Utils";
+import type { DebugEvents } from "../Constants.js";
+import type { Player } from "../Player.js";
+import type { LavalinkNodeOptions } from "./Node.js";
+import type { DestroyReasonsType, PlayerJson } from "./Player.js";
+import type { ManagerQueueOptions } from "./Queue.js";
+import type { Track, UnresolvedTrack } from "./Track.js";
+import type { GuildShardPayload, SearchPlatform, SponsorBlockChaptersLoaded, SponsorBlockChapterStarted, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, TrackExceptionEvent, TrackEndEvent, TrackStuckEvent, WebSocketClosedEvent, TrackStartEvent } from "./Utils.js";
 /**
  * The events from the lavalink Manager
  */

package/dist/esm/structures/Types/Node.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import type internal from "stream";
-import type { LavalinkNode } from "../Node";
-import type { DestroyReasonsType } from "./Player";
-import type { InvalidLavalinkRestRequest, LavalinkPlayer } from "./Utils";
+import type { LavalinkNode } from "../Node.js";
+import type { DestroyReasonsType } from "./Player.js";
+import type { InvalidLavalinkRestRequest, LavalinkPlayer } from "./Utils.js";
 /** Ability to manipulate fetch requests */
 export type ModifyRequest = (options: RequestInit & {
     path: string;

package/dist/esm/structures/Types/Player.d.ts

@@ -1,8 +1,8 @@
-import type { DestroyReasons } from "../Constants";
-import type { LavalinkNode } from "../Node";
-import type { EQBand, FilterData, LavalinkFilterData } from "./Filters";
-import type { Track, UnresolvedTrack } from "./Track";
-import type { Base64, LavalinkPlayerVoiceOptions } from "./Utils";
+import type { DestroyReasons } from "../Constants.js";
+import type { LavalinkNode } from "../Node.js";
+import type { EQBand, FilterData, LavalinkFilterData } from "./Filters.js";
+import type { Track, UnresolvedTrack } from "./Track.js";
+import type { Base64, LavalinkPlayerVoiceOptions } from "./Utils.js";
 export type DestroyReasonsType = keyof typeof DestroyReasons | string;
 export interface PlayerJson {
     /** Guild Id where the player was playing in */

package/dist/esm/structures/Types/Queue.d.ts

@@ -1,4 +1,4 @@
-import type { Track, UnresolvedTrack } from "./Track";
+import type { Track, UnresolvedTrack } from "./Track.js";
 export interface StoredQueue {
     current: Track | null;
     previous: Track[];

package/dist/esm/structures/Types/Track.d.ts

@@ -1,6 +1,6 @@
-import type { Player } from "../Player";
-import type { anyObject } from "./Player";
-import type { Base64 } from "./Utils";
+import type { Player } from "../Player.js";
+import type { anyObject } from "./Player.js";
+import type { Base64 } from "./Utils.js";
 /** Sourcenames provided by lavalink server */
 export type LavalinkSourceNames = "youtube" | "youtubemusic" | "soundcloud" | "bandcamp" | "twitch";
 /** Source Names provided by lava src plugin */

package/dist/esm/structures/Types/Utils.d.ts

@@ -1,8 +1,8 @@
-import type { MiniMap } from "../Utils";
-import type { LavalinkFilterData } from "./Filters";
-import type { NodeStats } from "./Node";
-import type { LavalinkPlayOptions } from "./Player";
-import type { LavalinkTrack, PluginInfo, Track, UnresolvedTrack } from "./Track";
+import type { MiniMap } from "../Utils.js";
+import type { LavalinkFilterData } from "./Filters.js";
+import type { NodeStats } from "./Node.js";
+import type { LavalinkPlayOptions } from "./Player.js";
+import type { LavalinkTrack, PluginInfo, Track, UnresolvedTrack } from "./Track.js";
 /** Helper for generating Opaque types. */
 export type Opaque<T, K> = T & {
     __opaque__: K;

package/dist/esm/structures/Utils.d.ts

@@ -1,9 +1,9 @@
-import type { LavalinkNodeOptions } from "./Types/Node";
-import type { LavalinkSearchPlatform, LavaSearchQuery, MiniMapConstructor, SearchPlatform, SearchQuery } from "./Types/Utils";
-import type { LavalinkManager } from "./LavalinkManager";
-import type { LavalinkNode } from "./Node";
-import type { Player } from "./Player";
-import type { LavalinkTrack, Track, UnresolvedQuery, UnresolvedTrack } from "./Types/Track";
+import type { LavalinkNodeOptions } from "./Types/Node.js";
+import type { LavalinkSearchPlatform, LavaSearchQuery, MiniMapConstructor, SearchPlatform, SearchQuery } from "./Types/Utils.js";
+import type { LavalinkManager } from "./LavalinkManager.js";
+import type { LavalinkNode } from "./Node.js";
+import type { Player } from "./Player.js";
+import type { LavalinkTrack, Track, UnresolvedQuery, UnresolvedTrack } from "./Types/Track.js";
 export declare const TrackSymbol: unique symbol;
 export declare const UnresolvedTrackSymbol: unique symbol;
 export declare const QueueSymbol: unique symbol;

package/dist/esm/structures/Utils.js

@@ -1,7 +1,7 @@
 import { URL } from "node:url";
 import { isRegExp } from "node:util/types";
-import { DebugEvents } from "./Constants";
-import { DefaultSources, LavalinkPlugins, SourceLinksRegexes } from "./LavalinkManagerStatics";
+import { DebugEvents } from "./Constants.js";
+import { DefaultSources, LavalinkPlugins, SourceLinksRegexes } from "./LavalinkManagerStatics.js";
 export const TrackSymbol = Symbol("LC-Track");
 export const UnresolvedTrackSymbol = Symbol("LC-Track-Unresolved");
 export const QueueSymbol = Symbol("LC-Queue");
@@ -421,11 +421,27 @@ export async function queueTrackEnd(player) {
         player.queue.tracks.push(player.queue.current);
     // change the current Track to the next upcoming one
     const nextSong = player.queue.tracks.shift();
-    if (player.LavalinkManager.utils.isUnresolvedTrack(nextSong))
-        await nextSong.resolve(player);
-    player.queue.current = nextSong || null;
-    // save it in the DB
-    await player.queue.utils.save();
+    try {
+        if (player.LavalinkManager.utils.isUnresolvedTrack(nextSong))
+            await nextSong.resolve(player);
+        player.queue.current = nextSong || null;
+        // save it in the DB
+        await player.queue.utils.save();
+    }
+    catch (error) {
+        if (player.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+            player.LavalinkManager.emit("debug", DebugEvents.PlayerPlayUnresolvedTrackFailed, {
+                state: "error",
+                error: error,
+                message: `queueTrackEnd Util was called, tried to resolve the next track, but failed to find the closest matching song`,
+                functionLayer: "Player > play() > resolve currentTrack",
+            });
+        }
+        player.LavalinkManager.emit("trackError", player, player.queue.current, error);
+        // try to play the next track if possible
+        if (player.LavalinkManager.options?.autoSkipOnResolveError === true && player.queue.tracks[0])
+            return queueTrackEnd(player);
+    }
     // return the new current Track
     return player.queue.current;
 }

package/dist/types/structures/Constants.d.ts

@@ -3,6 +3,7 @@ export declare enum DebugEvents {
     SetSponsorBlock = "SetSponsorBlock",
     DeleteSponsorBlock = "DeleteSponsorBlock",
     TrackEndReplaced = "TrackEndReplaced",
+    AutoplayExecution = "AutoplayExecution",
     AutoplayNoSongsAdded = "AutoplayNoSongsAdded",
     AutoplayThresholdSpamLimiter = "AutoplayThresholdSpamLimiter",
     TriggerQueueEmptyInterval = "TriggerQueueEmptyInterval",

package/dist/types/structures/NodeManager.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { EventEmitter } from "stream";
+import { EventEmitter } from "events";
 import { LavalinkNode } from "./Node";
 import { MiniMap } from "./Utils";
 import type { LavalinkNodeIdentifier, LavalinkNodeOptions, NodeManagerEvents } from "./Types/Node";

package/package.json

@@ -1,21 +1,27 @@
 {
   "name": "lavalink-client",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.js",
   "scripts": {
     "build": "npm run build:cjs && npm run build:esm && npm run build:types",
-    "build:cjs": "node tools/cleanup cjs && tsc -p config/tsconfig.cjs.json",
-    "build:esm": "node tools/cleanup esm && tsc -p config/tsconfig.esm.json",
-    "build:types": "node tools/cleanup types && tsc -p config/tsconfig.types.json",
+    "build:cjs": "node tools/cleanup cjs && tsc -p config/tsconfig.cjs.json && tsc-alias -p config/tsconfig.cjs.json && node tools/fixup cjs",
+    "build:esm": "node tools/cleanup esm && tsc -p config/tsconfig.esm.json && tsc-alias -p config/tsconfig.esm.json && node tools/fixup esm",
+    "build:types": "node tools/cleanup types && tsc -p config/tsconfig.types.json && tsc-alias -p config/tsconfig.types.json",
     "clean": "node tools/cleanup",
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
     "test": "node -v",
     "docs": "npx typedoc"
   },
+  "exports": {
+    "require": "./dist/cjs/index.js",
+    "import": "./dist/esm/index.js",
+    "types": "./dist/types/index.d.js",
+    "default": "./dist/cjs/index.js"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +58,7 @@
     "@typescript-eslint/eslint-plugin": "^6.4.0",
     "@typescript-eslint/parser": "^6.4.0",
     "eslint": "^8.47.0",
-    "ts-loader": "^9.4.4",
+    "tsc-alias": "^1.8.10",
     "typedoc": "^0.25.4",
     "typedoc-theme-hierarchy": "^4.1.2",
     "typescript": "^5.1.6"
@@ -62,6 +68,7 @@
     "ws": "^8.13.0"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=18.0.0",
+    "bun": ">=1.0.0"
   }
 }