aqualink 2.9.13 → 2.10.1

package/build/structures/Track.js

@@ -1,27 +1,28 @@
-"use strict";
-const { getImageUrl } = require("../handlers/fetchImage");
+'use strict'
+
+const { getImageUrl } = require('../handlers/fetchImage')
 
 class Track {
   constructor(data = {}, requester, nodes) {
-    const { info = {}, encoded = null, playlist = null } = data;
-    
-    this.identifier = info.identifier || '';
-    this.isSeekable = !!info.isSeekable;
-    this.author = info.author || '';
-    this.position = info.position || 0;
-    this.duration = info.length || 0;
-    this.isStream = !!info.isStream;
-    this.title = info.title || '';
-    this.uri = info.uri || '';
-    this.sourceName = info.sourceName || '';
-    this.artworkUrl = info.artworkUrl || '';
-    
-    this.track = encoded;
-    this.playlist = playlist;
-    this.requester = requester;
-    this.nodes = nodes;
-    
-    this._infoCache = null;
+    const info = data.info || {}
+
+    this.identifier = info.identifier || ''
+    this.isSeekable = !!info.isSeekable
+    this.author = info.author || ''
+    this.position = info.position || 0
+    this.duration = info.length || 0
+    this.isStream = !!info.isStream
+    this.title = info.title || ''
+    this.uri = info.uri || ''
+    this.sourceName = info.sourceName || ''
+    this.artworkUrl = info.artworkUrl || ''
+
+    this.track = data.encoded || null
+    this.playlist = data.playlist || null
+    this.requester = requester
+    this.nodes = nodes
+
+    this._infoCache = null
   }
 
   get info() {
@@ -37,140 +38,64 @@ class Track {
         uri: this.uri,
         sourceName: this.sourceName,
         artworkUrl: this.artworkUrl
-      });
+      })
     }
-    return this._infoCache;
+    return this._infoCache
   }
 
   get length() {
-    return this.duration;
+    return this.duration
   }
 
   get thumbnail() {
-    return this.artworkUrl;
+    return this.artworkUrl
   }
 
   resolveThumbnail(url = this.artworkUrl) {
-    if (!url) return null;
-    
+    if (!url) return null
     try {
-      return getImageUrl(url);
-    } catch (error) {
-      console.warn(`Failed to resolve thumbnail for ${url}:`, error.message);
-      return null;
+      return getImageUrl(url)
+    } catch {
+      return null
     }
   }
 
   async resolve(aqua) {
-    const searchPlatform = aqua?.options?.defaultSearchPlatform;
-    if (!searchPlatform) {
-      console.warn("No search platform configured for track resolution");
-      return null;
-    }
-
-    if (!this.author || !this.title) {
-      console.warn("Cannot resolve track: missing author or title");
-      return null;
+    if (!aqua?.options?.defaultSearchPlatform || !this.author || !this.title) {
+      return null
     }
 
     try {
-      const query = `${this.author} - ${this.title}`;
-      
       const result = await aqua.resolve({
-        query,
-        source: searchPlatform,
+        query: `${this.author} - ${this.title}`,
+        source: aqua.options.defaultSearchPlatform,
         requester: this.requester,
         node: this.nodes
-      });
-
-      if (!result?.tracks?.length) {
-        console.debug(`No tracks found for query: ${query}`);
-        return null;
-      }
-      
-      const matchedTrack = this._findBestMatch(result.tracks);
-      if (!matchedTrack) {
-        console.debug(`No matching track found for: ${query}`);
-        return null;
-      }
-
-      this.identifier = matchedTrack.info.identifier;
-      this.track = matchedTrack.track;
-      this.playlist = matchedTrack.playlist || null;
-      this._infoCache = null;
-      
-      return this;
-    } catch (error) {
-      if (error.name === 'TimeoutError') {
-        console.error(`Timeout resolving track: ${this.title}`);
-      } else if (error.name === 'NetworkError') {
-        console.error(`Network error resolving track: ${this.title}`);
-      } else {
-        console.error(`Unexpected error resolving track ${this.title}:`, error.message);
-      }
-      return null;
-    }
-  }
+      })
 
-  _findBestMatch(tracks) {
-    const targetAuthor = this.author.toLowerCase();
-    const targetTitle = this.title.toLowerCase();
-    const targetDuration = this.duration;
-    
-    for (const track of tracks) {
-      const info = track.info;
-      if (info.author?.toLowerCase() === targetAuthor && 
-          info.title?.toLowerCase() === targetTitle) {
-        
-        if (!targetDuration || !info.length || 
-            Math.abs(info.length - targetDuration) <= 2000) {
-          return track;
-        }
-      }
-    }
-    
-    for (const track of tracks) {
-      const info = track.info;
-      if (info.author?.toLowerCase() === targetAuthor) {
-        const titleSimilarity = this._calculateSimilarity(
-          targetTitle, 
-          info.title?.toLowerCase() || ''
-        );
-        
-        if (titleSimilarity > 0.8) {
-          if (!targetDuration || !info.length || 
-              Math.abs(info.length - targetDuration) <= 5000) {
-            return track;
-          }
-        }
-      }
-    }
-    
-    return null;
-  }
+      const track = result?.tracks?.[0]
+      if (!track) return null
+
+      this.identifier = track.info.identifier
+      this.track = track.track
+      this.playlist = track.playlist || null
+      this._infoCache = null
 
-  _calculateSimilarity(str1, str2) {
-    if (!str1 || !str2) return 0;
-    if (str1 === str2) return 1;
-    
-    const words1 = new Set(str1.split(/\s+/));
-    const words2 = new Set(str2.split(/\s+/));
-    
-    const intersection = new Set([...words1].filter(x => words2.has(x)));
-    const union = new Set([...words1, ...words2]);
-    
-    return intersection.size / union.size;
+      return this
+    } catch {
+      return null
+    }
   }
 
   isValid() {
-    return !!(this.identifier && this.title && (this.track || this.uri));
+    return !!(this.identifier && this.title && (this.track || this.uri))
   }
 
   dispose() {
-    this._infoCache = null;
-    this.requester = null;
-    this.nodes = null;
+    this._infoCache = null
+    this.requester = null
+    this.nodes = null
   }
 }
 
-module.exports = Track;
+module.exports = Track

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aqualink",
-  "version": "2.9.13",
+  "version": "2.10.1",
   "description": "An Lavalink client, focused in pure performance and features",
   "main": "build/index.js",
   "types": "index.d.ts",
@@ -40,14 +40,29 @@
     "type": "git",
     "url": "https://github.com/ToddyTheNoobDud/AquaLink"
   },
+  "homepage": "https://roddynnn.github.io/",
   "dependencies": {
     "ws": "^8.18.3",
 		"tseep": "^1.3.1"
   },
+  "contributors": [
+    {
+      "name": "mushroom0162",
+      "url": "https://github.com/ToddyTheNoobDud"
+    },
+    {
+      "name": "SoulDevs",
+      "url": "https://github.com/SoulDevs"
+    },
+    {
+      "name": "bob (asynco)",
+      "url": "https://github.com/asynico"
+    }
+  ],
   "maintainers": [
     {
       "name": "mushroom0162",
       "url": "https://github.com/ToddyTheNoobDud"
     }
   ]
-}
+}