lavalink-client 1.2.4 → 1.2.6

package/dist/cjs/structures/LavalinkManager.d.ts

@@ -16,7 +16,7 @@ export interface BotClientOptions {
     /** Bot Client Username */
     username?: string;
     /** So users can pass entire objects / classes */
-    [x: string | number | symbol | undefined]: unknown;
+    [x: string | number | symbol]: unknown;
 }
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */

package/dist/cjs/structures/LavalinkManager.js

@@ -93,7 +93,7 @@ class LavalinkManager extends events_1.EventEmitter {
         this.utils = new Utils_1.ManagerUtils(this);
         // use the validators
         this.applyOptions(options);
-        this.validateOptions(options);
+        this.validateOptions(this.options);
         // create classes
         this.nodeManager = new NodeManager_1.NodeManager(this);
     }

package/dist/cjs/structures/Node.d.ts

@@ -130,6 +130,7 @@ export declare class LavalinkNode {
      * @param manager
      */
     constructor(options: LavalinkNodeOptions, manager: NodeManager);
+    private rawRequest;
     /**
      * Makes an API call to the Node
      * @param endpoint The endpoint that we will make the call to
@@ -138,7 +139,7 @@ export declare class LavalinkNode {
      */
     request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
     search(query: SearchQuery, requestUser: unknown): Promise<SearchResult>;
-    lavaSearch(query: LavaSearchQuery, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
+    lavaSearch(query: LavaSearchQuery, requestUser: unknown, throwOnEmpty?: boolean): Promise<SearchResult | LavaSearchResponse>;
     /**
      * Update the Player State on the Lavalink Server
      * @param data

package/dist/cjs/structures/Node.js

@@ -70,13 +70,7 @@ class LavalinkNode {
         this.options.regions = (this.options.regions || []).map(a => a.toLowerCase());
         Object.defineProperty(this, Utils_1.NodeSymbol, { configurable: true, value: true });
     }
-    /**
-     * Makes an API call to the Node
-     * @param endpoint The endpoint that we will make the call to
-     * @param modify Used to modify the request before being sent
-     * @returns The returned data
-     */
-    async request(endpoint, modify, parseAsText = false) {
+    async rawRequest(endpoint, modify) {
         const options = {
             path: `/${this.version}/${endpoint.replace(/^\//gm, "")}`,
             method: "GET",
@@ -91,15 +85,25 @@ class LavalinkNode {
         options.path = url.pathname + url.search;
         const request = await this.rest.request(options);
         this.calls++;
+        return { request, options };
+    }
+    /**
+     * Makes an API call to the Node
+     * @param endpoint The endpoint that we will make the call to
+     * @param modify Used to modify the request before being sent
+     * @returns The returned data
+     */
+    async request(endpoint, modify, parseAsText = false) {
+        const { request, options } = await this.rawRequest(endpoint, modify);
         if (options.method === "DELETE")
             return;
         if (request.statusCode === 404)
-            throw new Error(`Node Request resulted into an error, request-URL: ${url} | headers: ${JSON.stringify(request.headers)}`);
+            throw new Error(`Node Request resulted into an error, request-PATH: ${options.path} | headers: ${JSON.stringify(request.headers)}`);
         return parseAsText ? await request.body.text() : await request.body.json();
     }
     async search(query, requestUser) {
         const Query = this.NodeManager.LavalinkManager.utils.transformQuery(query);
-        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query);
+        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query, Query.source);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
         if (["bcsearch", "bandcamp"].includes(Query.source)) {
@@ -130,7 +134,7 @@ class LavalinkNode {
             tracks: (resTracks.length ? resTracks.map(t => this.NodeManager.LavalinkManager.utils.buildTrack(t, requestUser)) : [])
         };
     }
-    async lavaSearch(query, requestUser) {
+    async lavaSearch(query, requestUser, throwOnEmpty = false) {
         const Query = this.NodeManager.LavalinkManager.utils.transformLavaSearchQuery(query);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
@@ -142,7 +146,10 @@ class LavalinkNode {
             throw new RangeError(`there is no lavasearch-plugin available in the lavalink node: ${this.id}`);
         if (!this.info.plugins.find(v => v.name === "lavasrc-plugin"))
             throw new RangeError(`there is no lavasrc-plugin available in the lavalink node: ${this.id}`);
-        const res = await this.request(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
+        const { request } = await this.rawRequest(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
+        if (throwOnEmpty === true)
+            throw new Error("Nothing found");
+        const res = (request.statusCode === 204 ? {} : await request.body.json());
         return {
             tracks: res.tracks?.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) || [],
             albums: res.albums?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],

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

@@ -100,7 +100,7 @@ export declare class ManagerUtils {
      */
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
-    validateQueryString(node: LavalinkNode, queryString: string): void;
+    validateQueryString(node: LavalinkNode, queryString: string, sourceString?: LavalinkSearchPlatform): void;
     transformQuery(query: SearchQuery): {
         query: string;
         source: any;

package/dist/cjs/structures/Utils.js

@@ -180,15 +180,16 @@ class ManagerUtils {
     async getClosestTrack(data, player) {
         return getClosestTrack(data, player);
     }
-    validateQueryString(node, queryString) {
+    validateQueryString(node, queryString, sourceString) {
         if (!node.info)
             throw new Error("No Lavalink Node was provided");
         if (!node.info.sourceManagers?.length)
             throw new Error("Lavalink Node, has no sourceManagers enabled");
-        // checks for blacklisted links / domains / queries
-        if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || (0, types_1.isRegExp)(v) && v.test(queryString))) {
-            throw new Error(`Query string contains a link / word which is blacklisted.`);
-        }
+        if (sourceString === "speak" && queryString.length > 100)
+            // checks for blacklisted links / domains / queries
+            if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || (0, types_1.isRegExp)(v) && v.test(queryString))) {
+                throw new Error(`Query string contains a link / word which is blacklisted.`);
+            }
         if (!/^https?:\/\//.test(queryString))
             return;
         else if (this.LavalinkManager.options?.linksAllowed === false)

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

@@ -16,7 +16,7 @@ export interface BotClientOptions {
     /** Bot Client Username */
     username?: string;
     /** So users can pass entire objects / classes */
-    [x: string | number | symbol | undefined]: unknown;
+    [x: string | number | symbol]: unknown;
 }
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */

package/dist/esm/structures/LavalinkManager.js

@@ -90,7 +90,7 @@ export class LavalinkManager extends EventEmitter {
         this.utils = new ManagerUtils(this);
         // use the validators
         this.applyOptions(options);
-        this.validateOptions(options);
+        this.validateOptions(this.options);
         // create classes
         this.nodeManager = new NodeManager(this);
     }

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

@@ -130,6 +130,7 @@ export declare class LavalinkNode {
      * @param manager
      */
     constructor(options: LavalinkNodeOptions, manager: NodeManager);
+    private rawRequest;
     /**
      * Makes an API call to the Node
      * @param endpoint The endpoint that we will make the call to
@@ -138,7 +139,7 @@ export declare class LavalinkNode {
      */
     request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
     search(query: SearchQuery, requestUser: unknown): Promise<SearchResult>;
-    lavaSearch(query: LavaSearchQuery, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
+    lavaSearch(query: LavaSearchQuery, requestUser: unknown, throwOnEmpty?: boolean): Promise<SearchResult | LavaSearchResponse>;
     /**
      * Update the Player State on the Lavalink Server
      * @param data

package/dist/esm/structures/Node.js

@@ -66,13 +66,7 @@ export class LavalinkNode {
         this.options.regions = (this.options.regions || []).map(a => a.toLowerCase());
         Object.defineProperty(this, NodeSymbol, { configurable: true, value: true });
     }
-    /**
-     * Makes an API call to the Node
-     * @param endpoint The endpoint that we will make the call to
-     * @param modify Used to modify the request before being sent
-     * @returns The returned data
-     */
-    async request(endpoint, modify, parseAsText = false) {
+    async rawRequest(endpoint, modify) {
         const options = {
             path: `/${this.version}/${endpoint.replace(/^\//gm, "")}`,
             method: "GET",
@@ -87,15 +81,25 @@ export class LavalinkNode {
         options.path = url.pathname + url.search;
         const request = await this.rest.request(options);
         this.calls++;
+        return { request, options };
+    }
+    /**
+     * Makes an API call to the Node
+     * @param endpoint The endpoint that we will make the call to
+     * @param modify Used to modify the request before being sent
+     * @returns The returned data
+     */
+    async request(endpoint, modify, parseAsText = false) {
+        const { request, options } = await this.rawRequest(endpoint, modify);
         if (options.method === "DELETE")
             return;
         if (request.statusCode === 404)
-            throw new Error(`Node Request resulted into an error, request-URL: ${url} | headers: ${JSON.stringify(request.headers)}`);
+            throw new Error(`Node Request resulted into an error, request-PATH: ${options.path} | headers: ${JSON.stringify(request.headers)}`);
         return parseAsText ? await request.body.text() : await request.body.json();
     }
     async search(query, requestUser) {
         const Query = this.NodeManager.LavalinkManager.utils.transformQuery(query);
-        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query);
+        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query, Query.source);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
         if (["bcsearch", "bandcamp"].includes(Query.source)) {
@@ -126,7 +130,7 @@ export class LavalinkNode {
             tracks: (resTracks.length ? resTracks.map(t => this.NodeManager.LavalinkManager.utils.buildTrack(t, requestUser)) : [])
         };
     }
-    async lavaSearch(query, requestUser) {
+    async lavaSearch(query, requestUser, throwOnEmpty = false) {
         const Query = this.NodeManager.LavalinkManager.utils.transformLavaSearchQuery(query);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
@@ -138,7 +142,10 @@ export class LavalinkNode {
             throw new RangeError(`there is no lavasearch-plugin available in the lavalink node: ${this.id}`);
         if (!this.info.plugins.find(v => v.name === "lavasrc-plugin"))
             throw new RangeError(`there is no lavasrc-plugin available in the lavalink node: ${this.id}`);
-        const res = await this.request(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
+        const { request } = await this.rawRequest(`/loadsearch?query=${Query.source ? `${Query.source}:` : ""}${encodeURIComponent(Query.query)}${Query.types?.length ? `&types=${Query.types.join(",")}` : ""}`);
+        if (throwOnEmpty === true)
+            throw new Error("Nothing found");
+        const res = (request.statusCode === 204 ? {} : await request.body.json());
         return {
             tracks: res.tracks?.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) || [],
             albums: res.albums?.map(v => ({ info: v.info, pluginInfo: v?.plugin || v.pluginInfo, tracks: v.tracks.map(v => this.NodeManager.LavalinkManager.utils.buildTrack(v, requestUser)) })) || [],

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

@@ -100,7 +100,7 @@ export declare class ManagerUtils {
      */
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
-    validateQueryString(node: LavalinkNode, queryString: string): void;
+    validateQueryString(node: LavalinkNode, queryString: string, sourceString?: LavalinkSearchPlatform): void;
     transformQuery(query: SearchQuery): {
         query: string;
         source: any;

package/dist/esm/structures/Utils.js

@@ -176,15 +176,16 @@ export class ManagerUtils {
     async getClosestTrack(data, player) {
         return getClosestTrack(data, player);
     }
-    validateQueryString(node, queryString) {
+    validateQueryString(node, queryString, sourceString) {
         if (!node.info)
             throw new Error("No Lavalink Node was provided");
         if (!node.info.sourceManagers?.length)
             throw new Error("Lavalink Node, has no sourceManagers enabled");
-        // checks for blacklisted links / domains / queries
-        if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || isRegExp(v) && v.test(queryString))) {
-            throw new Error(`Query string contains a link / word which is blacklisted.`);
-        }
+        if (sourceString === "speak" && queryString.length > 100)
+            // checks for blacklisted links / domains / queries
+            if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || isRegExp(v) && v.test(queryString))) {
+                throw new Error(`Query string contains a link / word which is blacklisted.`);
+            }
         if (!/^https?:\/\//.test(queryString))
             return;
         else if (this.LavalinkManager.options?.linksAllowed === false)

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

@@ -16,7 +16,7 @@ export interface BotClientOptions {
     /** Bot Client Username */
     username?: string;
     /** So users can pass entire objects / classes */
-    [x: string | number | symbol | undefined]: unknown;
+    [x: string | number | symbol]: unknown;
 }
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */

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

@@ -130,6 +130,7 @@ export declare class LavalinkNode {
      * @param manager
      */
     constructor(options: LavalinkNodeOptions, manager: NodeManager);
+    private rawRequest;
     /**
      * Makes an API call to the Node
      * @param endpoint The endpoint that we will make the call to
@@ -138,7 +139,7 @@ export declare class LavalinkNode {
      */
     request(endpoint: string, modify?: ModifyRequest, parseAsText?: boolean): Promise<unknown>;
     search(query: SearchQuery, requestUser: unknown): Promise<SearchResult>;
-    lavaSearch(query: LavaSearchQuery, requestUser: unknown): Promise<SearchResult | LavaSearchResponse>;
+    lavaSearch(query: LavaSearchQuery, requestUser: unknown, throwOnEmpty?: boolean): Promise<SearchResult | LavaSearchResponse>;
     /**
      * Update the Player State on the Lavalink Server
      * @param data

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

@@ -100,7 +100,7 @@ export declare class ManagerUtils {
      */
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
-    validateQueryString(node: LavalinkNode, queryString: string): void;
+    validateQueryString(node: LavalinkNode, queryString: string, sourceString?: LavalinkSearchPlatform): void;
     transformQuery(query: SearchQuery): {
         query: string;
         source: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",