streamify-audio 2.3.0 → 2.3.1

package/index.d.ts

@@ -203,6 +203,15 @@ declare module 'streamify-audio' {
             enabled?: boolean;
             maxTracks?: number;
         };
+        stream?: {
+            dataTimeout?: number;
+            pipeDataTimeout?: number;
+            liveDataTimeout?: number;
+            extractTimeout?: number;
+            urlCacheTTL?: number;
+            bufferSize?: string;
+            maxRetries?: number;
+        };
     }
 
     export interface ManagerStats {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "streamify-audio",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Dual-mode audio library: HTTP streaming proxy + Discord player (Lavalink alternative). Supports YouTube, Spotify, SoundCloud with audio filters.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/config.js

@@ -41,10 +41,16 @@ const defaults = {
     },
     stream: {
         dataTimeout: 8000,
+        pipeDataTimeout: 20000,
         liveDataTimeout: 15000,
+        extractTimeout: 30000,
         urlCacheTTL: 1800,
         bufferSize: '1M',
         maxRetries: 2
+    },
+    sponsorblock: {
+        enabled: false,
+        categories: ['sponsor', 'selfpromo']
     }
 };
 
@@ -119,6 +125,11 @@ function load(options = {}) {
             ...defaults.stream,
             ...fileConfig.stream,
             ...options.stream
+        },
+        sponsorblock: {
+            ...defaults.sponsorblock,
+            ...fileConfig.sponsorblock,
+            ...options.sponsorblock
         }
     };
 

package/src/discord/Manager.js

@@ -403,7 +403,7 @@ class Manager extends EventEmitter {
     }
 
     async _resolveSpotifyToYouTube(track) {
-        const videoId = await spotify.resolveToYouTube(track.id, this.config);
+        const videoId = await spotify.resolveToYouTube(track.id, this.config, track);
         return videoId;
     }
 

package/src/discord/Stream.js

@@ -95,7 +95,7 @@ class StreamController {
             log.info('STREAM', `Resolving Spotify track to YouTube: ${this.track.title}`);
             try {
                 const spotify = require('../providers/spotify');
-                videoId = await spotify.resolveToYouTube(this.track.id, this.config);
+                videoId = await spotify.resolveToYouTube(this.track.id, this.config, this.track);
                 this.track._resolvedId = videoId;
                 this.metrics.metadata = Date.now() - this.startTime;
             } catch (error) {
@@ -238,7 +238,7 @@ class StreamController {
                 ytdlpArgs.unshift('--cookies', this.config.cookiesPath);
             }
 
-            if (this.config.sponsorblock?.enabled !== false && isYouTube) {
+            if (this.config.sponsorblock?.enabled === true && isYouTube) {
                 const categories = this.config.sponsorblock?.categories || ['sponsor', 'selfpromo'];
                 ytdlpArgs.push('--sponsorblock-remove', categories.join(','));
             }
@@ -365,11 +365,9 @@ class StreamController {
             const url = `https://www.youtube.com/watch?v=${videoId}`;
             const args = [
                 '--get-url',
-                '-f', config.ytdlp.format,
+                '-f', 'bestaudio/best',
                 '--no-playlist',
-                '--no-check-certificates',
                 '--no-warnings',
-                '--no-cache-dir',
                 url
             ];
 
@@ -381,20 +379,16 @@ class StreamController {
                 args.unshift('--cookies', config.cookiesPath);
             }
 
-            if (config.sponsorblock?.enabled !== false && isYouTube) {
-                const categories = config.sponsorblock?.categories || ['sponsor', 'selfpromo'];
-                args.push('--sponsorblock-remove', categories.join(','));
-            }
-
             const env = { ...process.env, PATH: '/usr/local/bin:/root/.deno/bin:' + process.env.PATH };
             const proc = spawn(config.ytdlpPath, args, { env });
 
             let stdout = '';
             let stderr = '';
+            const extractTimeout = config.stream?.extractTimeout || 30000;
             const timeout = setTimeout(() => {
                 proc.kill('SIGKILL');
                 reject(new Error('URL extraction timed out'));
-            }, 15000);
+            }, extractTimeout);
 
             proc.stdout.on('data', (data) => { stdout += data; });
             proc.stderr.on('data', (data) => { stderr += data; });
@@ -422,9 +416,12 @@ class StreamController {
         const ffmpeg = this.ffmpeg;
         const ytdlp = this.ytdlp;
         const isLive = this.track.isLive === true || this.track.duration === 0;
+        const isPipe = !!this.ytdlp;
         const timeoutMs = isLive
             ? (this.config.stream?.liveDataTimeout || 15000)
-            : (this.config.stream?.dataTimeout || 8000);
+            : isPipe
+                ? (this.config.stream?.pipeDataTimeout || 20000)
+                : (this.config.stream?.dataTimeout || 8000);
 
         return new Promise((resolve, reject) => {
             if (!ffmpeg) return resolve();

package/src/providers/spotify.js

@@ -104,14 +104,14 @@ async function getInfo(trackId, config) {
     };
 }
 
-async function resolveToYouTube(trackId, config) {
+async function resolveToYouTube(trackId, config, trackInfo = null) {
     const cached = youtubeIdCache.get(trackId);
     if (cached && Date.now() < cached.expires) {
         log.info('SPOTIFY', `Using cached YouTube ID: ${cached.videoId}`);
         return cached.videoId;
     }
 
-    const track = await getInfo(trackId, config);
+    const track = trackInfo || await getInfo(trackId, config);
     const searchQuery = `${track.author} - ${track.title}`;
     log.info('SPOTIFY', `Searching YouTube: "${searchQuery}"`);
 

package/youtube-cookies.txt

@@ -16,11 +16,11 @@
 .youtube.com	TRUE	/	TRUE	1803850170	__Secure-1PSID	g.a0006AhyolP4RoeyrQXcHsFnRGkuVLVIZ9QQsgpwFaXGd822GTtb9khH10B1YSjuMht-R8LNjAACgYKAQ8SARMSFQHGX2MiWX5D8_L5MAZK1TLabPQMghoVAUF8yKoFUiQLoi8zHLuskryhcx1P0076
 .youtube.com	TRUE	/	TRUE	1803850170	__Secure-3PSID	g.a0006AhyolP4RoeyrQXcHsFnRGkuVLVIZ9QQsgpwFaXGd822GTtbc5VtVrqvDy9fWzO4vguctgACgYKAUkSARMSFQHGX2MinKYgh3CtvTW5E5T8SwXiERoVAUF8yKqzIJTS4ajNX5uO8nh3r0j10076
 .youtube.com	TRUE	/	TRUE	1803850170	LOGIN_INFO	AFmmF2swRQIgH6IrdLYFOhW8xu4opIUHTGxAf33LzI5EXw6pdoqsh_gCIQCxYHQL4VZEyb3nE-rhXM6VU2ua99G4AhzKl4JJlzZBEQ:QUQ3MjNmeFpJOS1rVDgtM2I4cm50Z3M4NUplLTlSbXV4OFl4MTM5eUtHX3FEcVNmT2ltVFlSWmpQdlR2QTVqR29mZlUtTVh4OEhkOGw4Rkd5d2tQZm52NXJmQzdrMFJPVk5uYTFLNFFMZWlGelJhRVk1TkVaMm9Uby0xWlcwR3ozYkwwY2lWT21pV2dpU0lsWW5saFhMektISWxwUkRUcXl3
-.youtube.com	TRUE	/	FALSE	1803305074	SIDCC	AKEyXzW6XAqY9tNhDWlFzlv-TcDtmpxQxQjOpTwkeLq7ddP20Ecx5ttbRGa7K7WKJVXYBIsbGTE
-.youtube.com	TRUE	/	TRUE	1803305074	__Secure-1PSIDCC	AKEyXzVdeiA5hPJOoWk_iVZXhBC3-3D4ZAlHjwkIdtnQ-y_iHxOeAdYucag2Dv-EMebAtINo-Q
-.youtube.com	TRUE	/	TRUE	1803305074	__Secure-3PSIDCC	AKEyXzX9LV_1LP1Z1T6SCow5CKbPxteZg-XPIOt3o2Uu6OlsIn6Z2S3gRZBgUTHpaiRcVbPYbg
+.youtube.com	TRUE	/	FALSE	1803305829	SIDCC	AKEyXzVSEL6KtSGHvInzUQ0BSfXpz5ZrLa-0C-Eai37AQJIjMlJt1w_sEekg2V8xFZDAAGxTWAw
+.youtube.com	TRUE	/	TRUE	1803305829	__Secure-1PSIDCC	AKEyXzXpSwFxdQf2HR6oN-bhlMdxFzAE_V_Yj8xI1esygZBBs74ztRf0QOQkFC9uwI136LDjIA
+.youtube.com	TRUE	/	TRUE	1803305829	__Secure-3PSIDCC	AKEyXzUPIscYupkn1WfA8pYnKB611cDvKT0mlN3DFM6aP68r90lpGrwcI3cggeJuvS__Yir28g
 .youtube.com	TRUE	/	TRUE	1787290794	__Secure-YNID	16.YT=uhIB3j65_j5F-nN_AIVu93J6J4tqe4fviGdBQuGk0X5EW7VRESfm4qMadhbgM04D7x1YyYRXKI0UIHJjiRMWqsP5PmT_qrHoTUSn4MOLA-FPeX09ELODYdpGvps9F6B3EFC2jC4MXYiWVY6KGZRiEoYBh_KWkh4Suwgn38LgfqN0E4Xv3YAzCB390qeKtLVkaqlQDUIvhnqGBPrObW-DzawPn00gHQph8VM2Zrklq_BzRYVaZHKHs2WkKlHqLljxwOiNXcsLrIkLqGsCgKR_onVOnlWN2gd0zojNv0VyuwYgfB9GBOLzweTnTWBZmp9IPWRA39DH4zMFerdTND-Yfg
 .youtube.com	TRUE	/	TRUE	0	YSC	-LHUdUOZvC4
-.youtube.com	TRUE	/	TRUE	1787321074	VISITOR_INFO1_LIVE	AuEVGsoJz2Y
-.youtube.com	TRUE	/	TRUE	1787321074	VISITOR_PRIVACY_METADATA	CgJVUxIEGgAgVQ%3D%3D
+.youtube.com	TRUE	/	TRUE	1787321829	VISITOR_INFO1_LIVE	AuEVGsoJz2Y
+.youtube.com	TRUE	/	TRUE	1787321829	VISITOR_PRIVACY_METADATA	CgJVUxIEGgAgVQ%3D%3D
 .youtube.com	TRUE	/	TRUE	1787290794	__Secure-ROLLOUT_TOKEN	CIbdoKq8kOipXhC__cjij6WSAxiZi8-rseySAw%3D%3D