Merge pull request #671 from TheSharks/feat/invidious

Change YT service from Lavalink to Invidious

Author: Dougley

src/classes/VoiceConnection.js

@@ -7,14 +7,20 @@ module.exports = class VoiceConnection {
     this.fresh = true
     this.textChannel = opts.textChannel
 
-    this._encoder.on('trackEnd', this.next.bind(this))
+    this._encoder.on('trackEnd', () => {
+      if (this.playlist.length === 0) {
+        this.textChannel.createMessage('The queue is empty, disconnecting')
+        this.destroy()
+      } else this.next()
+    })
     this._encoder.on('trackError', x => {
       this.textChannel.createMessage(`The track I'm trying to play broke! \`${x.error}\``)
-      this.next.bind(this)
+      this.next()
     })
     this._encoder.on('trackStuck', x => {
+      logger.debug(x)
       this.textChannel.createMessage('Seems the track got stuck, automatically skipping it...')
-      this.next.bind(this)
+      this.next()
     })
     this._encoder.on('trackStart', ctx => {
       const index = this.playlist.findIndex(x => x.track === ctx.track)
@@ -27,13 +33,17 @@ module.exports = class VoiceConnection {
           url: this.nowPlaying.info.uri,
           title: this.nowPlaying.info.title || '[Unknown!]',
           author: {
-            name: this.nowPlaying.info.author || '[Unknown!]'
-          }
+            name: this.nowPlaying.info.author || '[Unknown!]',
+            ...(this.nowPlaying.info.authorImage ? { icon_url: this.nowPlaying.info.authorImage } : {}),
+            ...(this.nowPlaying.info.authorURL ? { url: this.nowPlaying.info.authorURL } : {})
+          },
+          ...(this.nowPlaying.info.image ? { thumbnail: { url: this.nowPlaying.info.image } } : {})
         }
       })
     })
-    this._encoder.once('disconnected', () => {
-      this.textChannel.createMessage('I got disconnected from the voice channel, ending playback')
+    this._encoder.once('disconnected', x => {
+      if (x.byRemote && x.code !== 4014) this.textChannel.createMessage('I got disconnected from the voice channel, ending playback')
+      this.destroy()
     })
   }
 
@@ -61,13 +71,22 @@ module.exports = class VoiceConnection {
     return this._encoder.disconnect()
   }
 
-  resolve (ctx) {
+  async resolve (ctx) {
+    const SA = require('superagent')
+    ctx = ctx.trim()
     try {
-      // eslint-disable-next-line no-new
-      new URL(ctx)
+      const url = new URL(ctx)
+      if (process.env.INVIDIOUS_HOST && /(?:https?:\/\/)?(?:www\.)?youtu(.be|be\.com)/.test(url.hostname)) {
+        if (url.hostname === 'youtu.be') return this._invidiousResolve(url.pathname.slice(1))
+        if (url.searchParams.has('list')) return this._invidiousPlaylist(url.searchParams.get('list'))
+        if (url.searchParams.has('v')) return this._invidiousResolve(url.searchParams.get('v'))
+      }
       return this._encoder.node.loadTracks(ctx)
     } catch (_) {
-      return this._encoder.node.loadTracks(`scsearch:${ctx}`)
+      if (process.env.INVIDIOUS_HOST) {
+        const resp = await SA.get(`${process.env.INVIDIOUS_HOST}/api/v1/search?q=${encodeURIComponent(ctx)}`)
+        return this._invidiousResolve(resp.body[0].videoId)
+      } else return this._encoder.node.loadTracks(`scsearch:${ctx}`)
     }
   }
 
@@ -92,4 +111,55 @@ module.exports = class VoiceConnection {
   addDJs (ctx) {
     return this.controllers.push(ctx)
   }
+
+  async _invidiousResolve (videoId) {
+    const authorImg = (data) => {
+      if (!data.authorThumbnails[0].url || data.authorThumbnails[0].url.length < 1) return undefined // this can happen sometimes
+      else if (!data.authorThumbnails[0].url.startsWith('https:')) return `https:${data.authorThumbnails[0].url}`
+      return data.authorThumbnails[0].url
+    }
+    const SA = require('superagent')
+    const info = await SA.get(`${process.env.INVIDIOUS_HOST}/api/v1/videos/${videoId}`)
+    let lavaresp
+    if (info.body.liveNow) {
+      // lavaresp = await this._encoder.node.loadTracks(`${info.body.hlsUrl}?local=true`)
+      return { loadType: 'LOAD_FAILED', exception: { severity: 'COMMON', message: 'Unable to play livestreams at the moment' } }
+    } else {
+      const itags = ['251', '250', '249', '171', '141', '140', '139']
+      const tag = info.body.adaptiveFormats.find(x => itags.includes(x.itag))
+      lavaresp = await this._encoder.node.loadTracks(`${process.env.INVIDIOUS_HOST}/latest_version?id=${videoId}&itag=${tag.itag}${process.env.INVIDIOUS_PROXY ? '&local=true' : ''}`)
+    }
+    if (lavaresp.loadType !== 'TRACK_LOADED') return lavaresp
+    lavaresp.tracks[0].info = {
+      ...lavaresp.tracks[0].info,
+      author: info.body.author,
+      title: info.body.title,
+      uri: `https://youtu.be/${videoId}`,
+      image: `https://i.ytimg.com/vi/${videoId}/hqdefault.jpg`,
+      authorImage: authorImg(info.body),
+      authorURL: `https://youtube.com${info.body.authorUrl}`
+    }
+    return lavaresp
+  }
+
+  async _invidiousPlaylist (id) {
+    const authorImg = (data) => {
+      if (!data.authorThumbnails[0].url || data.authorThumbnails[0].url.length < 1) return undefined // this can happen sometimes
+      else if (!data.authorThumbnails[0].url.startsWith('https:')) return `https:${data.authorThumbnails[0].url}`
+      return data.authorThumbnails[0].url
+    }
+    const SA = require('superagent')
+    const resp = await SA.get(`${process.env.INVIDIOUS_HOST}/api/v1/playlists/${id}`)
+    const result = await Promise.allSettled(resp.body.videos.map(x => this._invidiousResolve(x.videoId)))
+    this.addMany(result.filter(x => x.status === 'fulfilled').map(x => x.value.tracks).flat(1))
+    return {
+      loadType: 'IV_PLAYLIST_LOADED',
+      uri: `https://youtube.com/playlist?list=${resp.body.playlistId}`,
+      title: resp.body.title,
+      author: resp.body.author,
+      authorImage: authorImg(resp.body),
+      authorURL: `https://youtube.com${resp.body.authorUrl}`,
+      image: resp.body.playlistThumbnail
+    }
+  }
 }

src/commands/music/play.js

@@ -5,27 +5,50 @@ module.exports = new Command(async function (msg, suffix) {
   const player = client.voiceConnectionManager.get(msg.channel.guild.id)
   if (player) {
     const m = await this.safeSendMessage(msg.channel, 'Working on it...')
-    const x = await player.resolve(suffix)
-    switch (x.loadType) {
-      case 'PLAYLIST_LOADED': {
-        if (x.tracks && x.tracks.length > 0) {
-          player.addMany(x.tracks)
-          return m.edit(`Playlist ${x.playlistInfo.name} has been added`)
-        } else return m.edit('Nothing found with your search query')
+    try {
+      const x = await player.resolve(suffix)
+      switch (x.loadType) {
+        case 'PLAYLIST_LOADED': {
+          if (x.tracks && x.tracks.length > 0) {
+            player.addMany(x.tracks)
+            return m.edit(`Playlist ${x.playlistInfo.name} has been added`)
+          } else return m.edit('Nothing found with your search query')
+        }
+        case 'IV_PLAYLIST_LOADED': {
+          return m.edit({
+            content: 'Your playlist has finished loading',
+            embed: {
+              url: x.uri,
+              title: x.title,
+              author: {
+                name: x.author,
+                icon_url: x.authorImage,
+                url: x.authorURL
+              },
+              thumbnail: {
+                url: x.image
+              }
+            }
+          })
+        }
+        case 'SEARCH_RESULT':
+        case 'TRACK_LOADED': {
+          if (x.tracks && x.tracks.length > 0) {
+            player.add(x.tracks[0])
+            return m.edit('Your track has been added')
+          } else return m.edit('Nothing found with your search query')
+        }
+        case 'LOAD_FAILED': {
+          if (x.exception.severity === 'COMMON') return m.edit(`I'm unable to play that track: \`${x.exception.message}\``)
+          else return m.edit("I'm unable to play that track for unknown reasons")
+        }
+        case 'NO_MATCHES': return m.edit('Nothing found with your search query')
+        default: return m.edit('Something went wrong while adding this track, try again later')
       }
-      case 'SEARCH_RESULT':
-      case 'TRACK_LOADED': {
-        if (x.tracks && x.tracks.length > 0) {
-          player.add(x.tracks[0])
-          return m.edit('Your track has been added')
-        } else return m.edit('Nothing found with your search query')
-      }
-      case 'LOAD_FAILED': {
-        if (x.exception.severity === 'COMMON') return m.edit(`I'm unable to play that track: \`${x.exception.message}\``)
-        else return m.edit("I'm unable to play that track for unknown reasons")
-      }
-      case 'NO_MATCHES': return m.edit('Nothing found with your search query')
-      default: return m.edit('Something went wrong while adding this track, try again later')
+    } catch (e) {
+      logger.error('CMD', e)
+      if (!(m instanceof require('eris').Message)) await this.safeSendMessage(msg.channel, 'Something went wrong, try again?')
+      else await m.edit('Something went wrong, try again?')
     }
   } else return this.safeSendMessage(msg.channel, "I'm not streaming in this server")
 }, {

src/commands/music/queue.js

@@ -23,7 +23,7 @@ const createEmbed = (ctx) => {
       fields: ctx.slice(0, 10).map(x => {
         return {
           name: ctx.indexOf(x) + 1,
-          value: `${x.info.title} - ${x.info.author}`
+          value: `[${x.info.title} - ${x.info.author}](${x.info.uri})`
         }
       })
     }