Merge branch 'master' into unix-sockets

1 files changed, 36 insertions, 77 deletions

diff --git a/assets/js/embed.js b/assets/js/embed.js
index 9d0be0ea..b11b5e5a 100644
--- a/assets/js/embed.js
+++ b/assets/js/embed.js
@@ -1,103 +1,62 @@
-var video_data = JSON.parse(document.getElementById('video_data').innerHTML);
-
-function get_playlist(plid, retries) {
-    if (retries == undefined) retries = 5;
-
-    if (retries <= 0) {
-        console.log('Failed to pull playlist');
-        return;
-    }
+'use strict';
+var video_data = JSON.parse(document.getElementById('video_data').textContent);
 
+function get_playlist(plid) {
+    var plid_url;
     if (plid.startsWith('RD')) {
-        var plid_url = '/api/v1/mixes/' + plid +
+        plid_url = '/api/v1/mixes/' + plid +
             '?continuation=' + video_data.id +
             '&format=html&hl=' + video_data.preferences.locale;
     } else {
-        var plid_url = '/api/v1/playlists/' + plid +
+        plid_url = '/api/v1/playlists/' + plid +
             '?index=' + video_data.index +
             '&continuation' + video_data.id +
             '&format=html&hl=' + video_data.preferences.locale;
     }
 
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = 'json';
-    xhr.timeout = 10000;
-    xhr.open('GET', plid_url, true);
-
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4) {
-            if (xhr.status === 200) {
-                if (xhr.response.nextVideo) {
-                    player.on('ended', function () {
-                        var url = new URL('https://example.com/embed/' + xhr.response.nextVideo);
-
-                        url.searchParams.set('list', plid);
-                        if (!plid.startsWith('RD')) {
-                            url.searchParams.set('index', xhr.response.index);
-                        }
-
-                        if (video_data.params.autoplay || video_data.params.continue_autoplay) {
-                            url.searchParams.set('autoplay', '1');
-                        }
-
-                        if (video_data.params.listen !== video_data.preferences.listen) {
-                            url.searchParams.set('listen', video_data.params.listen);
-                        }
-
-                        if (video_data.params.speed !== video_data.preferences.speed) {
-                            url.searchParams.set('speed', video_data.params.speed);
-                        }
-
-                        if (video_data.params.local !== video_data.preferences.local) {
-                            url.searchParams.set('local', video_data.params.local);
-                        }
-
-                        location.assign(url.pathname + url.search);
-                    });
-                }
-            }
+    helpers.xhr('GET', plid_url, {retries: 5, entity_name: 'playlist'}, {
+        on200: function (response) {
+            if (!response.nextVideo)
+                return;
+
+            player.on('ended', function () {
+                var url = new URL('https://example.com/embed/' + response.nextVideo);
+
+                url.searchParams.set('list', plid);
+                if (!plid.startsWith('RD'))
+                    url.searchParams.set('index', response.index);
+                if (video_data.params.autoplay || video_data.params.continue_autoplay)
+                    url.searchParams.set('autoplay', '1');
+                if (video_data.params.listen !== video_data.preferences.listen)
+                    url.searchParams.set('listen', video_data.params.listen);
+                if (video_data.params.speed !== video_data.preferences.speed)
+                    url.searchParams.set('speed', video_data.params.speed);
+                if (video_data.params.local !== video_data.preferences.local)
+                    url.searchParams.set('local', video_data.params.local);
+
+                location.assign(url.pathname + url.search);
+            });
         }
-    }
-
-    xhr.onerror = function () {
-        console.log('Pulling playlist failed... ' + retries + '/5');
-        setTimeout(function () { get_playlist(plid, retries - 1) }, 1000);
-    }
-
-    xhr.ontimeout = function () {
-        console.log('Pulling playlist failed... ' + retries + '/5');
-        get_playlist(plid, retries - 1);
-    }
-
-    xhr.send();
+    });
 }
 
-window.addEventListener('load', function (e) {
+addEventListener('load', function (e) {
     if (video_data.plid) {
         get_playlist(video_data.plid);
     } else if (video_data.video_series) {
         player.on('ended', function () {
             var url = new URL('https://example.com/embed/' + video_data.video_series.shift());
 
-            if (video_data.params.autoplay || video_data.params.continue_autoplay) {
+            if (video_data.params.autoplay || video_data.params.continue_autoplay)
                 url.searchParams.set('autoplay', '1');
-            }
-
-            if (video_data.params.listen !== video_data.preferences.listen) {
+            if (video_data.params.listen !== video_data.preferences.listen)
                 url.searchParams.set('listen', video_data.params.listen);
-            }
-
-            if (video_data.params.speed !== video_data.preferences.speed) {
+            if (video_data.params.speed !== video_data.preferences.speed)
                 url.searchParams.set('speed', video_data.params.speed);
-            }
-
-            if (video_data.params.local !== video_data.preferences.local) {
+            if (video_data.params.local !== video_data.preferences.local)
                 url.searchParams.set('local', video_data.params.local);
-            }
-
-            if (video_data.video_series.length !== 0) {
-                url.searchParams.set('playlist', video_data.video_series.join(','))
-            }
+            if (video_data.video_series.length !== 0)
+                url.searchParams.set('playlist', video_data.video_series.join(','));
 
             location.assign(url.pathname + url.search);
         });