aqualink 2.18.1 → 2.19.1

package/build/handlers/autoplay.js

@@ -1,121 +1,148 @@
-const https = require('https')
-
-const AGENT_CONFIG = {
-  keepAlive: true,
-  maxSockets: 5,
-  maxFreeSockets: 2,
-  timeout: 8000,
-  freeSocketTimeout: 4000
-}
-
-const agent = 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 DEFAULT_TIMEOUT_MS = 8000
-
-const fastFetch = (url, depth = 0) => new Promise((resolve, reject) => {
-  if (depth > MAX_REDIRECTS) return reject(new Error('Too many redirects'))
-
-  const req = https.get(url, { agent, 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)
-    }
-
-    if (statusCode !== 200) {
-      res.resume()
-      return reject(new Error(`HTTP ${statusCode}`))
-    }
-
-    const chunks = []
-    let received = 0
-
-    res.on('data', chunk => {
-      received += chunk.length
-      if (received > MAX_RESPONSE_BYTES) {
-        req.destroy(new Error('Response too large'))
-        return
-      }
-      chunks.push(chunk)
-    })
-
-    res.on('end', () => {
-      try {
-        const buf = Buffer.concat(chunks)
-        resolve(buf.toString())
-      } catch (err) {
-        reject(err)
-      }
-    })
-  })
-
-  req.on('error', reject)
-  req.setTimeout(DEFAULT_TIMEOUT_MS, () => req.destroy(new Error('Timeout')))
-})
-
-const shuffleInPlace = arr => {
-  for (let i = arr.length - 1; i > 0; i--) {
-    const j = Math.random() * (i + 1) | 0
-    const tmp = arr[i]
-    arr[i] = arr[j]
-    arr[j] = tmp
-  }
-  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 spAutoPlay = async (seed, player, requester, excludedIds = []) => {
-  try {
-    if (!seed?.trackId) return null
-
-    const seedQuery = `seed_tracks=${seed.trackId}${seed.artistIds ? `&seed_artists=${seed.artistIds}` : ''}`
-    const res = await player.aqua.resolve({ query: seedQuery, source: 'spsearch', requester })
-
-    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 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
-    }
-
-    return out.length ? out : null
-  } catch (err) {
-    console.error('spAutoPlay error:', err)
-    return null
-  }
-}
-
-module.exports = {
-  scAutoPlay,
-  spAutoPlay
-}
+const https = require('https')
+
+// Default agent config (used only if shared agent not provided)
+const AGENT_CONFIG = {
+  keepAlive: true,
+  maxSockets: 64,
+  maxFreeSockets: 32,
+  timeout: 8000,
+  freeSocketTimeout: 4000
+}
+
+// Shared agent reference - can be set from Rest module
+let sharedAgent = null
+const getAgent = () => sharedAgent || (sharedAgent = new https.Agent(AGENT_CONFIG))
+
+// Allow Rest module to inject its agent
+const setSharedAgent = (agent) => {
+  if (agent && typeof agent.request === 'function') {
+    sharedAgent = agent
+  }
+}
+
+
+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 DEFAULT_TIMEOUT_MS = 8000
+
+const fastFetch = (url, 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 },
+      (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
+          )
+        }
+
+        if (statusCode !== 200) {
+          res.resume()
+          return reject(new Error(`HTTP ${statusCode}`))
+        }
+
+        const chunks = []
+        let received = 0
+
+        res.on('data', (chunk) => {
+          received += chunk.length
+          if (received > MAX_RESPONSE_BYTES) {
+            req.destroy(new Error('Response too large'))
+            return
+          }
+          chunks.push(chunk)
+        })
+
+        res.on('end', () => {
+          try {
+            const buf = Buffer.concat(chunks)
+            resolve(buf.toString())
+          } catch (err) {
+            reject(err)
+          }
+        })
+      }
+    )
+
+    req.on('error', reject)
+    req.setTimeout(DEFAULT_TIMEOUT_MS, () => req.destroy(new Error('Timeout')))
+  })
+
+const shuffleInPlace = (arr) => {
+  for (let i = arr.length - 1; i > 0; i--) {
+    const j = (Math.random() * (i + 1)) | 0
+    const tmp = arr[i]
+    arr[i] = arr[j]
+    arr[j] = tmp
+  }
+  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 spAutoPlay = async (seed, player, requester, excludedIds = []) => {
+  try {
+    if (!seed?.trackId) return null
+
+    const seedQuery = `seed_tracks=${seed.trackId}${seed.artistIds ? `&seed_artists=${seed.artistIds}` : ''}`
+    const res = await player.aqua.resolve({
+      query: seedQuery,
+      source: 'spsearch',
+      requester
+    })
+
+    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 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
+    }
+
+    return out.length ? out : null
+  } catch (err) {
+    console.error('spAutoPlay error:', err)
+    return null
+  }
+}
+
+module.exports = {
+  scAutoPlay,
+  spAutoPlay,
+  setSharedAgent
+}

package/build/handlers/fetchImage.js

@@ -1,148 +1,152 @@
-const https = require('https');
-
-const sourceHandlers = {
-    spotify: fetchSpotifyThumbnail,
-    youtube: fetchYouTubeThumbnail
-};
-
-const YOUTUBE_QUALITIES = ['maxresdefault', 'hqdefault', 'mqdefault', 'default'];
-
-const YOUTUBE_ID_REGEX = /^[a-zA-Z0-9_-]{11}$/;
-const SPOTIFY_URI_REGEX = /^https:\/\/open\.spotify\.com\/(track|album|playlist)\/[a-zA-Z0-9]+/;
-
-async function getImageUrl(info) {
-    if (!info?.sourceName || !info?.uri) return null;
-    
-    const sourceName = info.sourceName.toLowerCase();
-    const handler = sourceHandlers[sourceName];
-    
-    if (!handler) return null;
-    
-    try {
-        const param = sourceName === 'spotify' ? info.uri : 
-                     sourceName === 'youtube' ? extractYouTubeId(info.uri) : info.uri;
-        
-        if (!param) return null;
-        
-        return await handler(param);
-    } catch (error) {
-        console.error(`Error fetching ${sourceName} thumbnail:`, error.message);
-        return null;
-    }
-}
-
-function extractYouTubeId(uri) {
-    if (!uri) return null;
-    
-    let id = null;
-    
-    if (uri.includes('youtube.com/watch?v=')) {
-        id = uri.split('v=')[1]?.split('&')[0];
-    } else if (uri.includes('youtu.be/')) {
-        id = uri.split('youtu.be/')[1]?.split('?')[0];
-    } else if (uri.includes('youtube.com/embed/')) {
-        id = uri.split('embed/')[1]?.split('?')[0];
-    } else if (YOUTUBE_ID_REGEX.test(uri)) {
-        id = uri;
-    }
-    
-    return id && YOUTUBE_ID_REGEX.test(id) ? id : null;
-}
-
-async function fetchSpotifyThumbnail(uri) {
-    if (!SPOTIFY_URI_REGEX.test(uri)) {
-        throw new Error('Invalid Spotify URI format');
-    }
-    
-    const url = `https://open.spotify.com/oembed?url=${encodeURIComponent(uri)}`;
-    
-    try {
-        const data = await fetchJson(url);
-        return data?.thumbnail_url || null;
-    } catch (error) {
-        throw new Error(`Spotify fetch failed: ${error.message}`);
-    }
-}
-
-async function fetchYouTubeThumbnail(identifier) {
-    if (!identifier || !YOUTUBE_ID_REGEX.test(identifier)) {
-        throw new Error('Invalid YouTube identifier');
-    }
-    
-    for (const quality of YOUTUBE_QUALITIES) {
-        const url = `https://img.youtube.com/vi/${identifier}/${quality}.jpg`;
-        
-        try {
-            const exists = await checkImageExists(url);
-            if (exists) return url;
-        } catch (error) {
-            continue;
-        }
-    }
-    
-    return null;
-}
-
-function fetchJson(url) {
-    return new Promise((resolve, reject) => {
-        const request = https.get(url, (res) => {
-            if (res.statusCode !== 200) {
-                res.resume();
-                return reject(new Error(`HTTP ${res.statusCode}`));
-            }
-            
-            const chunks = [];
-            let totalLength = 0;
-            
-            res.on('data', chunk => {
-                chunks.push(chunk);
-                totalLength += chunk.length;
-                
-                if (totalLength > 1024 * 1024) {
-                    res.destroy();
-                    reject(new Error('Response too large'));
-                }
-            });
-            
-            res.on('end', () => {
-                try {
-                    const data = Buffer.concat(chunks, totalLength).toString('utf8');
-                    const json = JSON.parse(data);
-                    resolve(json);
-                } catch (error) {
-                    reject(new Error(`JSON parse error: ${error.message}`));
-                }
-            });
-        });
-        
-        request.setTimeout(5000, () => {
-            request.destroy();
-            reject(new Error('Request timeout'));
-        });
-        
-        request.on('error', (error) => {
-            reject(new Error(`Request error: ${error.message}`));
-        });
-    });
-}
-
-function checkImageExists(url) {
-    return new Promise((resolve) => {
-        const request = https.request(url, { method: 'HEAD' }, (res) => {
-            resolve(res.statusCode === 200);
-        });
-        
-        request.setTimeout(3000, () => {
-            request.destroy();
-            resolve(false);
-        });
-        
-        request.on('error', () => resolve(false));
-        request.end();
-    });
-}
-
-
-module.exports = { 
-    getImageUrl,
-};
+const https = require('https')
+
+const sourceHandlers = {
+  spotify: fetchSpotifyThumbnail,
+  youtube: fetchYouTubeThumbnail
+}
+
+const YOUTUBE_QUALITIES = ['maxresdefault', 'hqdefault', 'mqdefault', 'default']
+
+const YOUTUBE_ID_REGEX = /^[a-zA-Z0-9_-]{11}$/
+const SPOTIFY_URI_REGEX =
+  /^https:\/\/open\.spotify\.com\/(track|album|playlist)\/[a-zA-Z0-9]+/
+
+async function getImageUrl(info) {
+  if (!info?.sourceName || !info?.uri) return null
+
+  const sourceName = info.sourceName.toLowerCase()
+  const handler = sourceHandlers[sourceName]
+
+  if (!handler) return null
+
+  try {
+    const param =
+      sourceName === 'spotify'
+        ? info.uri
+        : sourceName === 'youtube'
+          ? extractYouTubeId(info.uri)
+          : info.uri
+
+    if (!param) return null
+
+    return await handler(param)
+  } catch (error) {
+    console.error(`Error fetching ${sourceName} thumbnail:`, error.message)
+    return null
+  }
+}
+
+function extractYouTubeId(uri) {
+  if (!uri) return null
+
+  let id = null
+
+  if (uri.includes('youtube.com/watch?v=')) {
+    id = uri.split('v=')[1]?.split('&')[0]
+  } else if (uri.includes('youtu.be/')) {
+    id = uri.split('youtu.be/')[1]?.split('?')[0]
+  } else if (uri.includes('youtube.com/embed/')) {
+    id = uri.split('embed/')[1]?.split('?')[0]
+  } else if (YOUTUBE_ID_REGEX.test(uri)) {
+    id = uri
+  }
+
+  return id && YOUTUBE_ID_REGEX.test(id) ? id : null
+}
+
+async function fetchSpotifyThumbnail(uri) {
+  if (!SPOTIFY_URI_REGEX.test(uri)) {
+    throw new Error('Invalid Spotify URI format')
+  }
+
+  const url = `https://open.spotify.com/oembed?url=${encodeURIComponent(uri)}`
+
+  try {
+    const data = await fetchJson(url)
+    return data?.thumbnail_url || null
+  } catch (error) {
+    throw new Error(`Spotify fetch failed: ${error.message}`)
+  }
+}
+
+async function fetchYouTubeThumbnail(identifier) {
+  if (!identifier || !YOUTUBE_ID_REGEX.test(identifier)) {
+    throw new Error('Invalid YouTube identifier')
+  }
+
+  for (const quality of YOUTUBE_QUALITIES) {
+    const url = `https://img.youtube.com/vi/${identifier}/${quality}.jpg`
+
+    try {
+      const exists = await checkImageExists(url)
+      if (exists) return url
+    } catch (error) {
+      continue
+    }
+  }
+
+  return null
+}
+
+function fetchJson(url) {
+  return new Promise((resolve, reject) => {
+    const request = https.get(url, (res) => {
+      if (res.statusCode !== 200) {
+        res.resume()
+        return reject(new Error(`HTTP ${res.statusCode}`))
+      }
+
+      const chunks = []
+      let totalLength = 0
+
+      res.on('data', (chunk) => {
+        chunks.push(chunk)
+        totalLength += chunk.length
+
+        if (totalLength > 1024 * 1024) {
+          res.destroy()
+          reject(new Error('Response too large'))
+        }
+      })
+
+      res.on('end', () => {
+        try {
+          const data = Buffer.concat(chunks, totalLength).toString('utf8')
+          const json = JSON.parse(data)
+          resolve(json)
+        } catch (error) {
+          reject(new Error(`JSON parse error: ${error.message}`))
+        }
+      })
+    })
+
+    request.setTimeout(5000, () => {
+      request.destroy()
+      reject(new Error('Request timeout'))
+    })
+
+    request.on('error', (error) => {
+      reject(new Error(`Request error: ${error.message}`))
+    })
+  })
+}
+
+function checkImageExists(url) {
+  return new Promise((resolve) => {
+    const request = https.request(url, { method: 'HEAD' }, (res) => {
+      resolve(res.statusCode === 200)
+    })
+
+    request.setTimeout(3000, () => {
+      request.destroy()
+      resolve(false)
+    })
+
+    request.on('error', () => resolve(false))
+    request.end()
+  })
+}
+
+module.exports = {
+  getImageUrl
+}