aqualink 3.1.0 → 3.2.0

package/build/handlers/autoplay.js

@@ -9,49 +9,32 @@ const AGENT_CONFIG = {
   freeSocketTimeout: 4000
 }
 
-// Shared agent reference - can be set from Rest module
-let sharedAgent = null
-const getAgent = () => {
-  if (!sharedAgent) {
-    sharedAgent = new https.Agent(AGENT_CONFIG)
-  }
-  return sharedAgent
-}
-
-// Allow Rest module to inject its agent
-const setSharedAgent = (agent) => {
-  if (!agent) {
-    sharedAgent = null
-    return
-  }
-  if (agent && typeof agent.addRequest === 'function') {
-    sharedAgent = agent
-  }
-}
+const defaultAgent = new https.Agent(AGENT_CONFIG)
 
 const SC_LINK_RE = /<a\s+itemprop="url"\s+href="(\/[^"]+)"/g
 const MAX_REDIRECTS = 3
 const MAX_RESPONSE_BYTES = 5 * 1024 * 1024 // 5 MB
 const MAX_SC_LINKS = 50
-const MAX_SP_RESULTS = 5
+const _MAX_SP_RESULTS = 5
 const DEFAULT_TIMEOUT_MS = 8000
 
-const fastFetch = (url, depth = 0) =>
+const fastFetch = (url, agent, depth = 0) =>
   new Promise((resolve, reject) => {
     if (depth > MAX_REDIRECTS) return reject(new Error('Too many redirects'))
 
     const req = https.get(
       url,
-      { agent: getAgent(), timeout: DEFAULT_TIMEOUT_MS },
+      { agent: agent || defaultAgent, timeout: DEFAULT_TIMEOUT_MS },
       (res) => {
         const { statusCode, headers } = res
 
         if (statusCode >= 300 && statusCode < 400 && headers.location) {
           res.resume()
-          return fastFetch(new URL(headers.location, url).href, depth + 1).then(
-            resolve,
-            reject
-          )
+          return fastFetch(
+            new URL(headers.location, url).href,
+            agent,
+            depth + 1
+          ).then(resolve, reject)
         }
 
         if (statusCode !== 200) {
@@ -96,61 +79,79 @@ const shuffleInPlace = (arr) => {
   return arr
 }
 
-const scAutoPlay = async (baseUrl) => {
-  try {
-    const html = await fastFetch(`${baseUrl}/recommended`)
-    const links = []
-    for (const m of html.matchAll(SC_LINK_RE)) {
-      if (!m[1]) continue
-      links.push(`https://soundcloud.com${m[1]}`)
-      if (links.length >= MAX_SC_LINKS) break
-    }
-    return links.length ? shuffleInPlace(links) : []
-  } catch (err) {
-    console.error('scAutoPlay error:', err?.message || err)
-    return []
+const scAutoPlay = async (baseUrl, agent) => {
+  const html = await fastFetch(`${baseUrl}/recommended`, agent)
+  const links = []
+  for (const m of html.matchAll(SC_LINK_RE)) {
+    if (!m[1]) continue
+    links.push(`https://soundcloud.com${m[1]}`)
+    if (links.length >= MAX_SC_LINKS) break
   }
+  return links.length ? shuffleInPlace(links) : []
 }
 
 const spAutoPlay = async (seed, player, requester, excludedIds = []) => {
-  try {
-    if (!seed?.trackId) return null
+  if (!seed) return null
+
+  let trackId = seed.trackId !== 'local' ? seed.trackId : null
+  let isrc = seed.isrc || null
 
-    const seedQuery = `seed_tracks=${seed.trackId}${seed.artistIds ? `&seed_artists=${seed.artistIds}` : ''}`
-    const res = await player.aqua.resolve({
-      query: seedQuery,
+  if (!trackId && !isrc && seed.title) {
+    const searchRes = await player.aqua.resolve({
+      query: `${seed.author ? `${seed.author} - ` : ''}${seed.title}`,
       source: 'spsearch',
       requester
     })
+    const foundTrack = searchRes?.tracks?.[0]
+    if (foundTrack) {
+      trackId = foundTrack.identifier !== 'local' ? foundTrack.identifier : null
+      isrc = foundTrack.isrc || null
+    }
+  }
+
+  if (!trackId && !isrc) return null
+
+  let query
+  if (isrc) {
+    query = `sprec:mix:isrc:${isrc}`
+  } else {
+    query = `sprec:seed_tracks=${trackId}`
+  }
+
+  let res = await player.aqua.resolve({
+    query,
+    requester
+  })
+
+  if (!res?.tracks?.length && isrc && trackId) {
+    res = await player.aqua.resolve({
+      query: `sprec:seed_tracks=${trackId}`,
+      requester
+    })
+  }
 
-    const candidates = res?.tracks || []
-    if (!candidates.length) return null
+  const candidates = res?.tracks || []
+  if (!candidates.length) return null
 
-    const seen = new Set(excludedIds)
-    const prevId = player.current?.identifier
-    if (prevId) seen.add(prevId)
+  const seen = new Set(excludedIds)
+  const prevId = player.current?.identifier
+  if (prevId) seen.add(prevId)
 
-    const out = []
-    for (const t of candidates) {
-      if (seen.has(t.identifier)) continue
-      seen.add(t.identifier)
-      t.pluginInfo = {
-        ...(t.pluginInfo || {}),
-        clientData: { fromAutoplay: true }
-      }
-      out.push(t)
-      if (out.length === MAX_SP_RESULTS) break
+  const out = []
+  for (const t of candidates) {
+    if (seen.has(t.identifier)) continue
+    seen.add(t.identifier)
+    t.pluginInfo = {
+      ...(t.pluginInfo || {}),
+      clientData: { fromAutoplay: true }
     }
-
-    return out.length ? out : null
-  } catch (err) {
-    console.error('spAutoPlay error:', err)
-    return null
+    out.push(t)
   }
+
+  return out.length ? out : null
 }
 
 module.exports = {
   scAutoPlay,
-  spAutoPlay,
-  setSharedAgent
+  spAutoPlay
 }