streamify-audio 2.2.2 → 2.2.6

package/index.js

@@ -100,7 +100,7 @@ class Streamify extends EventEmitter {
     async search(source, query, limit = 10) {
         if (!this.running) throw new Error('Streamify not started. Call .start() first');
 
-        switch (source) {
+        switch (source.toLowerCase()) {
             case 'youtube':
             case 'yt':
                 return youtube.search(query, limit, this.config);
@@ -110,6 +110,21 @@ class Streamify extends EventEmitter {
             case 'soundcloud':
             case 'sc':
                 return soundcloud.search(query, limit, this.config);
+            case 'twitch':
+                const twitch = require('./src/providers/twitch');
+                return { tracks: [await twitch.getInfo(query, this.config)], source: 'twitch' };
+            case 'mixcloud':
+                const mixcloud = require('./src/providers/mixcloud');
+                return { tracks: [await mixcloud.getInfo(query, this.config)], source: 'mixcloud' };
+            case 'bandcamp':
+                const bandcamp = require('./src/providers/bandcamp');
+                return { tracks: [await bandcamp.getInfo(query, this.config)], source: 'bandcamp' };
+            case 'http':
+                const http = require('./src/providers/http');
+                return { tracks: [await http.getInfo(query, this.config)], source: 'http' };
+            case 'local':
+                const local = require('./src/providers/local');
+                return { tracks: [await local.getInfo(query, this.config)], source: 'local' };
             default:
                 throw new Error(`Unknown source: ${source}`);
         }
@@ -118,13 +133,26 @@ class Streamify extends EventEmitter {
     async getInfo(source, id) {
         if (!this.running) throw new Error('Streamify not started. Call .start() first');
 
-        switch (source) {
+        switch (source.toLowerCase()) {
             case 'youtube':
             case 'yt':
                 return youtube.getInfo(id, this.config);
             case 'spotify':
             case 'sp':
                 return spotify.getInfo(id, this.config);
+            case 'soundcloud':
+            case 'sc':
+                return soundcloud.getInfo(id, this.config);
+            case 'twitch':
+                return require('./src/providers/twitch').getInfo(id, this.config);
+            case 'mixcloud':
+                return require('./src/providers/mixcloud').getInfo(id, this.config);
+            case 'bandcamp':
+                return require('./src/providers/bandcamp').getInfo(id, this.config);
+            case 'http':
+                return require('./src/providers/http').getInfo(id, this.config);
+            case 'local':
+                return require('./src/providers/local').getInfo(id, this.config);
             default:
                 throw new Error(`Unknown source: ${source}`);
         }
@@ -134,7 +162,7 @@ class Streamify extends EventEmitter {
         if (!this.config) throw new Error('Streamify not started. Call .start() first');
 
         let endpoint;
-        switch (source) {
+        switch (source.toLowerCase()) {
             case 'youtube':
             case 'yt':
                 endpoint = `/youtube/stream/${id}`;
@@ -147,6 +175,13 @@ class Streamify extends EventEmitter {
             case 'sc':
                 endpoint = `/soundcloud/stream/${id}`;
                 break;
+            case 'twitch':
+            case 'mixcloud':
+            case 'bandcamp':
+            case 'http':
+            case 'local':
+                endpoint = `/stream/${source.toLowerCase()}/${encodeURIComponent(id)}`;
+                break;
             default:
                 throw new Error(`Unknown source: ${source}`);
         }
@@ -191,6 +226,31 @@ class Streamify extends EventEmitter {
         getStream: (id, filters = {}) => this.getStream('soundcloud', id, filters)
     };
 
+    twitch = {
+        getInfo: (id) => this.getInfo('twitch', id),
+        getStreamUrl: (id, filters = {}) => this.getStreamUrl('twitch', id, filters)
+    };
+
+    mixcloud = {
+        getInfo: (id) => this.getInfo('mixcloud', id),
+        getStreamUrl: (id, filters = {}) => this.getStreamUrl('mixcloud', id, filters)
+    };
+
+    bandcamp = {
+        getInfo: (id) => this.getInfo('bandcamp', id),
+        getStreamUrl: (id, filters = {}) => this.getStreamUrl('bandcamp', id, filters)
+    };
+
+    http = {
+        getInfo: (url) => this.getInfo('http', url),
+        getStreamUrl: (url, filters = {}) => this.getStreamUrl('http', url, filters)
+    };
+
+    local = {
+        getInfo: (path) => this.getInfo('local', path),
+        getStreamUrl: (path, filters = {}) => this.getStreamUrl('local', path, filters)
+    };
+
     async getActiveStreams() {
         const res = await fetch(`${this.getBaseUrl()}/streams`);
         return res.json();
@@ -249,4 +309,8 @@ Streamify.Manager = Manager;
 Streamify.Player = Manager ? require('./src/discord/Player') : null;
 Streamify.Queue = Manager ? require('./src/discord/Queue') : null;
 
+const { getEffectPresetsInfo, EFFECT_PRESETS } = require('./src/filters/ffmpeg');
+Streamify.getEffectPresetsInfo = getEffectPresetsInfo;
+Streamify.EFFECT_PRESETS = EFFECT_PRESETS;
+
 module.exports = Streamify;

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "streamify-audio",
-  "version": "2.2.2",
+  "version": "2.2.6",
   "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",
   "bin": {
-    "streamify": "./bin/streamify.js"
+    "streamify": "bin/streamify.js"
   },
   "scripts": {
-    "start": "node index.js",
-    "dev": "node index.js --dev"
+    "start": "UV_THREADPOOL_SIZE=64 node --noconcurrent-sweeping --max-old-space-size=2048 --expose-gc index.js",
+    "dev": "UV_THREADPOOL_SIZE=64 node --noconcurrent-sweeping --max-old-space-size=2048 --expose-gc index.js --dev",
+    "test": "node --test tests/*.test.js"
   },
   "keywords": [
     "discord",
@@ -29,7 +30,8 @@
   "author": "Lucas",
   "license": "MIT",
   "dependencies": {
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "opusscript": "^0.0.8"
   },
   "optionalDependencies": {
     "@discordjs/opus": "^0.9.0",
@@ -48,7 +50,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/LucasCzechia/streamify.git"
+    "url": "git+https://github.com/LucasCzechia/streamify.git"
   },
   "homepage": "https://github.com/LucasCzechia/streamify#readme",
   "bugs": {

package/src/cache/index.js

@@ -56,6 +56,7 @@ function cleanup() {
     }
 }
 
-setInterval(cleanup, 60000);
+const cleanupInterval = setInterval(cleanup, 60000);
+cleanupInterval.unref();
 
 module.exports = { get, set, del, clear, stats };

package/src/config.js

@@ -18,9 +18,20 @@ const defaults = {
         clientId: null,
         clientSecret: null
     },
+    voiceChannelStatus: {
+        enabled: false,
+        template: '🎶 Now Playing: {title} - {artist} | Requested by: {requester}'
+    },
     audio: {
         bitrate: '128k',
-        format: 'opus'
+        format: 'opus',
+        vbr: true,
+        compressionLevel: 10,
+        application: 'audio'
+    },
+    ytdlp: {
+        format: 'bestaudio/bestaudio[ext=webm]/bestaudio[ext=mp4]/18/22/best',
+        additionalArgs: []
     },
     cache: {
         enabled: true,
@@ -57,6 +68,7 @@ function checkYtdlpVersion(ytdlpPath) {
 }
 
 function load(options = {}) {
+    options = options || {};
     let fileConfig = {};
 
     if (options.configPath && fs.existsSync(options.configPath)) {
@@ -90,6 +102,11 @@ function load(options = {}) {
             ...fileConfig.audio,
             ...options.audio
         },
+        ytdlp: {
+            ...defaults.ytdlp,
+            ...fileConfig.ytdlp,
+            ...options.ytdlp
+        },
         cache: {
             ...defaults.cache,
             ...fileConfig.cache,

package/src/discord/Manager.js

@@ -3,6 +3,11 @@ const Player = require('./Player');
 const youtube = require('../providers/youtube');
 const spotify = require('../providers/spotify');
 const soundcloud = require('../providers/soundcloud');
+const twitch = require('../providers/twitch');
+const mixcloud = require('../providers/mixcloud');
+const bandcamp = require('../providers/bandcamp');
+const httpProvider = require('../providers/http');
+const localProvider = require('../providers/local');
 const log = require('../utils/logger');
 const { loadConfig } = require('../config');
 
@@ -73,6 +78,11 @@ class Manager extends EventEmitter {
             maxTracks: options.autoplay?.maxTracks ?? 5
         };
 
+        this.voiceChannelStatus = {
+            enabled: options.voiceChannelStatus?.enabled ?? false,
+            template: options.voiceChannelStatus?.template ?? '🎶 Now Playing: {title} - {artist} | Requested by: {requester}'
+        };
+
         this._setupVoiceStateListener();
 
         log.info('MANAGER', 'Streamify Manager initialized');
@@ -91,6 +101,10 @@ class Manager extends EventEmitter {
             }
 
             if (oldState.id === botId && newState.channelId && oldState.channelId !== newState.channelId) {
+                // Clear status of the old channel
+                if (oldState.channelId) {
+                    this.clearVoiceStatus(oldState.channelId);
+                }
                 player.voiceChannelId = newState.channelId;
                 player.emit('channelMove', newState.channelId);
                 return;
@@ -103,12 +117,16 @@ class Manager extends EventEmitter {
                 const members = channel.members.filter(m => !m.user.bot);
                 const memberCount = members.size;
 
-                if (oldState.channelId === player.voiceChannelId && newState.channelId !== player.voiceChannelId) {
-                    player.emit('userLeave', oldState.member, memberCount);
-                }
+                // Ignore bots for join/leave events
+                const transitionedMember = newState.member || oldState.member;
+                if (transitionedMember && !transitionedMember.user.bot) {
+                    if (oldState.channelId === player.voiceChannelId && newState.channelId !== player.voiceChannelId) {
+                        player.emit('userLeave', transitionedMember, memberCount);
+                    }
 
-                if (newState.channelId === player.voiceChannelId && oldState.channelId !== player.voiceChannelId) {
-                    player.emit('userJoin', newState.member, memberCount);
+                    if (newState.channelId === player.voiceChannelId && oldState.channelId !== player.voiceChannelId) {
+                        player.emit('userJoin', transitionedMember, memberCount);
+                    }
                 }
 
                 if (memberCount < player.autoPause.minUsers) {
@@ -165,7 +183,8 @@ class Manager extends EventEmitter {
             maxPreviousTracks: this.maxPreviousTracks,
             autoLeave: this.autoLeave,
             autoPause: this.autoPause,
-            autoplay: this.autoplay
+            autoplay: this.autoplay,
+            voiceChannelStatus: this.voiceChannelStatus
         });
 
         player.on('destroy', () => {
@@ -184,6 +203,20 @@ class Manager extends EventEmitter {
         return this.players.get(guildId);
     }
 
+    async clearVoiceStatus(channelId) {
+        if (!channelId) return false;
+        try {
+            await this.client.rest.put(`/channels/${channelId}/voice-status`, {
+                body: { status: "" }
+            });
+            log.debug('MANAGER', `Cleared voice status for channel ${channelId}`);
+            return true;
+        } catch (error) {
+            log.debug('MANAGER', `Failed to clear voice status for ${channelId}: ${error.message}`);
+            return false;
+        }
+    }
+
     destroy(guildId) {
         const player = this.players.get(guildId);
         if (player) {
@@ -217,7 +250,7 @@ class Manager extends EventEmitter {
                     if (!this._isProviderEnabled('youtube')) {
                         throw new Error('YouTube provider is disabled');
                     }
-                    result = await youtube.search(query, limit, this.config);
+                    result = await youtube.search(query, limit, this.config, options);
                     break;
 
                 case 'spotify':
@@ -239,6 +272,31 @@ class Manager extends EventEmitter {
                     result = await soundcloud.search(query, limit, this.config);
                     break;
 
+                case 'twitch':
+                    result = await twitch.getInfo(query, this.config);
+                    result = { tracks: [result], source: 'twitch' };
+                    break;
+
+                case 'mixcloud':
+                    result = await mixcloud.getInfo(query, this.config);
+                    result = { tracks: [result], source: 'mixcloud' };
+                    break;
+
+                case 'bandcamp':
+                    result = await bandcamp.getInfo(query, this.config);
+                    result = { tracks: [result], source: 'bandcamp' };
+                    break;
+
+                case 'local':
+                    result = await localProvider.getInfo(query, this.config);
+                    result = { tracks: [result], source: 'local' };
+                    break;
+
+                case 'http':
+                    result = await httpProvider.getInfo(query, this.config);
+                    result = { tracks: [result], source: 'http' };
+                    break;
+
                 default:
                     if (!this._isProviderEnabled('youtube')) {
                         throw new Error('YouTube provider is disabled');
@@ -285,6 +343,21 @@ class Manager extends EventEmitter {
                     }
                     return await soundcloud.getInfo(id, this.config);
 
+                case 'twitch':
+                    return await twitch.getInfo(id, this.config);
+
+                case 'mixcloud':
+                    return await mixcloud.getInfo(id, this.config);
+
+                case 'bandcamp':
+                    return await bandcamp.getInfo(id, this.config);
+
+                case 'local':
+                    return await localProvider.getInfo(id, this.config);
+
+                case 'http':
+                    return await httpProvider.getInfo(id, this.config);
+
                 default:
                     if (!this._isProviderEnabled('youtube')) {
                         throw new Error('YouTube provider is disabled');
@@ -351,6 +424,15 @@ class Manager extends EventEmitter {
             soundcloud: [
                 /soundcloud\.com\/([^\/]+\/[^\/\?]+)/,
                 /api\.soundcloud\.com\/tracks\/(\d+)/
+            ],
+            twitch: [
+                /twitch\.tv\/([a-zA-Z0-9_]+)/
+            ],
+            mixcloud: [
+                /mixcloud\.com\/([^\/]+\/[^\/]+)/
+            ],
+            bandcamp: [
+                /[a-zA-Z0-9-]+\.bandcamp\.com\/(track|album)\/([a-zA-Z0-9-]+)/
             ]
         };
 
@@ -362,10 +444,22 @@ class Manager extends EventEmitter {
             }
         }
 
+        if (input.startsWith('/') || input.startsWith('./') || input.startsWith('file://')) {
+            return 'local';
+        }
+
+        if (input.startsWith('http') && /\.(mp3|wav|ogg|flac|m4a|aac)(\?.*)?$/i.test(input)) {
+            return 'http';
+        }
+
         return null;
     }
 
     _extractId(input, source) {
+        if (['twitch', 'mixcloud', 'bandcamp', 'local', 'http'].includes(source)) {
+            return { source, id: input };
+        }
+
         const patterns = {
             youtube: /(?:youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/embed\/|youtube\.com\/shorts\/|music\.youtube\.com\/watch\?v=|youtube\.com\/live\/)([a-zA-Z0-9_-]{11})/,
             youtube_playlist: /youtube\.com\/playlist\?list=([a-zA-Z0-9_-]+)/,