KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fallback with iframed soundcloud player for rate-limit reached

Browse Source 
- Messes up history of current tab, but it's better than not playing any music
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-25 17:49:49 +02:00
parent e5221ad88b
commit 39a2fc6532
12 changed files with 271 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/public/assets/js/channel.js
View File

@@ -197,7 +197,8 @@ var Channel = {
Player.player.setVolume(Crypt.get_volume());
} catch(e){}
try {
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
if(scUsingWidget) Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume());
else Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
} catch(e){}
}
Helper.removeClass(".video-container", "no-opacity");

30
server/public/assets/js/functions.js
View File

@@ -35,13 +35,23 @@ function resizeFunction() {
if(!client && !embed) {
var scPlaying = false;
var ytPlaying = false;
try {
ytPlaying = Player.player.getPlayerState() == YT.PlayerState.PLAYING || Player.player.getPlayerState() == YT.PlayerState.BUFFERING;
} catch(e) {}
try {
scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){}
resizePlaylistPlaying(ytPlaying || scPlaying);
if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(paused) {
try {
ytPlaying = Player.player.getPlayerState() == YT.PlayerState.PLAYING || Player.player.getPlayerState() == YT.PlayerState.BUFFERING;
} catch(e) {}
scPlaying = !paused;
resizePlaylistPlaying(ytPlaying || scPlaying);
})
} else {
try {
ytPlaying = Player.player.getPlayerState() == YT.PlayerState.PLAYING || Player.player.getPlayerState() == YT.PlayerState.BUFFERING;
} catch(e) {}
try {
scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){}
resizePlaylistPlaying(ytPlaying || scPlaying);
}
return;
}
}
@@ -185,7 +195,8 @@ function hide_native(way) {
Helper.setHtml("#chromecast_text", "Playing on<br>" + castSession.getCastDevice().friendlyName);
}
Player.player.setVolume(100);
Player.soundcloud_player.setVolume(1);
if(scUsingWidget) Player.soundcloud_player.setVolume(100);
else Player.soundcloud_player.setVolume(1);
Helper.addClass("#player_overlay_text", "hide");
} else if(way == 0){
@@ -214,7 +225,8 @@ function hide_native(way) {
if(!Helper.mobilecheck()){
Player.player.setVolume(Crypt.get_volume());
Playercontrols.visualVolume(Crypt.get_volume());
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
if(scUsingWidget) Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume());
else Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
}
Helper.addClass("#player_overlay", "hide");
Helper.removeClass("#player_overlay_text", "hide");

3
server/public/assets/js/hostcontroller.js
View File

@@ -40,7 +40,8 @@ var Hostcontroller = {
try {
Playercontrols.visualVolume(arr.value);
Player.setVolume(arr.value);
Player.soundcloud_player.setVolume(arr.value / 100);
if(scUsingWidget) Player.soundcloud_player.setVolume(arr.value);
else Player.soundcloud_player.setVolume(arr.value / 100);
try {
localStorage.setItem("volume", arr.value);
} catch(e){}

22
server/public/assets/js/listeners.js
View File

@@ -12,6 +12,9 @@ try {
} catch(e) {
_VERSION = 6;
}
var SC_widget;
var scUsingWidget = false;
var SC_player;
var soundcloud_enabled = true;
var local_new_channel = false;
var sc_need_initialization = false;
@@ -257,25 +260,29 @@ window.addEventListener("DOMContentLoaded", function() {
tagSC.readyState == "complete"){
tagSC.onreadystatechange = null;
if(sc_need_initialization) {
Player.soundcloudReady();
//Player.soundcloudReady();
} else {
SC.initialize({
SC_player = SC;
SC_player.initialize({
client_id: api_key.soundcloud
}, function() {
});
}
Player.loadSoundCloudIframe();
}
};
} else { //Others
tagSC.onload = function(){
if(sc_need_initialization) {
Player.soundcloudReady();
//Player.soundcloudReady();
} else {
SC.initialize({
SC_player = SC;
SC_player.initialize({
client_id: api_key.soundcloud
}, function() {
});
}
Player.loadSoundCloudIframe();
};
}
tagSC.src = "https://connect.soundcloud.com/sdk/sdk-3.3.0.js";
@@ -283,7 +290,7 @@ window.addEventListener("DOMContentLoaded", function() {
firstScriptTagSC.parentNode.insertBefore(tagSC, firstScriptTagSC);
}
} else if(window.location.pathname == "/" && client) {
Player.loadSoundCloudPlayer();
//Player.loadSoundCloudPlayer();
}
if(Helper.mobilecheck()) {
@@ -676,6 +683,7 @@ function addDynamicListeners() {
Player.soundcloud_player.unbind("play", Player.soundcloudPlay);
Player.soundcloud_player.kill();
} catch(error){}
if(scUsingWidget) document.querySelector("#sc_player").innerHTML = "";
socket.removeEventListener("np");
socket.removeEventListener("id");
socket.removeEventListener(id);
@@ -711,7 +719,9 @@ function addDynamicListeners() {
});
addListener("click", "#player_overlay", function(event) {
if(videoSource == "soundcloud") Playercontrols.play_pause();
if(videoSource == "soundcloud") {
Playercontrols.play_pause();
}
});
/*

191
server/public/assets/js/player.js
View File

@@ -7,6 +7,7 @@ var Player = {
stopInterval: false,
fireplace: "",
np: {},
seeking: false,
soundcloud_dead: false,
soundcloud_player: {
setVolume: function(val) {}
@@ -301,7 +302,7 @@ var Player = {
return;
}
try {
if(SC == null) return;
if(SC_player == null) return;
} catch(e) {
return;
}
@@ -314,7 +315,7 @@ var Player = {
soundcloud_loading = false;
var _autoAdd = "false";
try {
if(SC == null || !SC.stream) return;
if(SC_player == null || !SC_player.stream) return;
} catch(e) {
return;
}
@@ -324,14 +325,15 @@ var Player = {
_autoAdd = "true";
Helper.removeClass("#player_loader_container", "hide");
}
SC.stream("/tracks/" + id).then(function(player){
SC_player.stream("/tracks/" + id).then(function(player){
Player.soundcloud_player = player;
Player.soundcloud_player.bind("finish", Player.soundcloudFinish);
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
window.player = player;
Player.soundcloud_dead = false;
SC.get('/tracks', {
SC_player.get('/tracks', {
ids: id
}).then(function(tracks) {
var sound = tracks[0];
@@ -342,18 +344,17 @@ var Player = {
});
if(_autoplay) {
player.play().then(function(){
scUsingWidget = false;
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
Player.soundcloud_player.seek((seekTo) * 1000);
}).catch(function(e){
});
}
}).catch(function(error) {
curr_playing = id;
emit("skip", {error: 5, id: id, channel: chan.toLowerCase()});
setTimeout(function() {
toast("Seems the SoundCloud-API rate-limit has been reached..", "red lighten");
}, 1000);
Player.initializeSCWidget(_autoplay, id);
});
//Player.initializeSCWidget(_autoplay, id);
//Player.initializeSCWidget(_autoplay, id);
} else {
try {
Player.soundcloud_player.seek(seekTo * 1000);
@@ -382,6 +383,46 @@ var Player = {
Helper.addClass("#player_overlay_text", "hide");
},
initializeSCWidget: function(_autoplay, id) {
try {
Player.soundcloud_player.unbind("finish", Player.soundcloudFinish);
Player.soundcloud_player.unbind("pause", Player.soundcloudPause);
Player.soundcloud_player.unbind("play", Player.soundcloudPlay);
//Player.soundcloud_player.unbind("seek", Player.soundcloudSeek);
}catch(e){}
var this_autoplay = "";
scUsingWidget = true;
if(_autoplay) this_autoplay = "?auto_play=true";
if(document.querySelectorAll("#scplayerElement").length == 0) {
var single = "single_active=false";
if(_autoplay) single = "&"+single;
else single = "?"+single;
document.querySelector("#sc_player").innerHTML = '<iframe id="scplayerElement" style="opacity:0;" width="100%" height="166" scrolling="no" frameborder="no" allow="autoplay;" \
src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/' + id + this_autoplay + '"> \
</iframe>';
Player.addSCWidgetElements();
} else {
Player.soundcloud_player.bind("finish", Player.soundcloudFinish);
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
Player.soundcloud_player.load('https://api.soundcloud.com/tracks/' + id + this_autoplay, {single_active: false});
}
},
addSCWidgetElements: function() {
try {
Player.soundcloud_player = SC_widget.Widget(document.querySelector("#scplayerElement"));
Player.soundcloud_player.seek = Player.soundcloud_player.seekTo;
Player.soundcloud_player.bind("finish", Player.soundcloudFinish);
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
} catch(e) {
setTimeout(function() {
Player.addSCWidgetElements();
}, 500);
}
},
loadVideoById: function(id, this_duration, start, end){
if(id == undefined) return;
var s;
@@ -504,7 +545,8 @@ var Player = {
castSession.setVolume(vol/100);
} else {
Player.player.setVolume(vol);
Player.soundcloud_player.setVolume(vol / 100);
if(scUsingWidget) Player.soundcloud_player.setVolume(vol);
else Player.soundcloud_player.setVolume(vol / 100);
}
},
@@ -661,16 +703,27 @@ var Player = {
playing = false;
end_programmatically = false;
} else {
was_stopped = true;
if(!scUsingWidget) was_stopped = true;
if(!embed && !client && window.location.pathname != "/") {
var scPlaying = false;
try {
scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){}
try {
resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING);
} catch(e) {
resizePlaylistPlaying(scPlaying);
if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(paused) {
scPlaying = !paused;
try {
resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING);
} catch(e) {
resizePlaylistPlaying(scPlaying);
}
});
} else {
try {
scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){}
try {
resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING);
} catch(e) {
resizePlaylistPlaying(scPlaying);
}
}
}
if(!chromecastAvailable){
@@ -697,9 +750,19 @@ var Player = {
if(videoSource == "youtube") {
Player.soundcloud_player.pause();
} else if(soundcloud_loading){
Player.soundcloud_player.seek((seekTo) * 1000);
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
soundcloud_loading = false;
if(scUsingWidget) {
Player.soundcloud_player.getPosition(function(pos) {
Player.seeking = true;
Player.soundcloud_player.seek((seekTo) * 1000);
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume());
soundcloud_loading = false;
})
} else {
Player.seeking = true;
Player.soundcloud_player.seek((seekTo) * 1000);
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
soundcloud_loading = false;
}
}
if(embed) {
Helper.css("#player", "visibility", "visible");
@@ -714,10 +777,17 @@ var Player = {
}
if(!embed && !client && window.location.pathname != "/") {
var scPlaying = false;
try {
scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){}
resizePlaylistPlaying(scPlaying);
if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(paused) {
scPlaying = !paused;
resizePlaylistPlaying(scPlaying);
});
} else {
try {
scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){}
resizePlaylistPlaying(scPlaying);
}
}
Helper.css("#playpause", "visibility", "visible");
@@ -739,6 +809,7 @@ var Player = {
if(u == undefined) u = "";*/
paused = false;
was_stopped = false;
socket.emit('pos', {channel: chan.toLowerCase()});
} else {
paused = false;
@@ -748,13 +819,13 @@ var Player = {
},
soundcloudReady: function() {
if(SC == undefined && sc_need_initialization) {
if(SC_player == undefined && sc_need_initialization) {
sc_need_initialization = true;
return;
}
sc_need_initialization = false;
try {
SC.initialize({
SC_player.initialize({
client_id: api_key.soundcloud
}, function() {
});
@@ -942,7 +1013,13 @@ var Player = {
dMinutes = Math.floor(duration / 60);
dSeconds = duration - dMinutes * 60;
if(videoSource == "soundcloud") {
currDurr = Math.floor(Player.soundcloud_player.currentTime()) / 1000;
if(scUsingWidget) {
Player.soundcloud_player.getPosition(function(pos) {
currDurr = Math.floor(pos) / 1000;
});
} else {
currDurr = Math.floor(Player.soundcloud_player.currentTime()) / 1000;
}
} else {
currDurr = Player.player.getCurrentTime() !== undefined ? Math.floor(Player.player.getCurrentTime()) : seekTo;
}
@@ -974,6 +1051,21 @@ var Player = {
document.getElementById("bar").style.width = per+"%";
}
if(videoSource == "soundcloud") {
if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(playing) {
playing = !playing;
if(Math.ceil(currDurr) + 1 > Player.np.end && playing) {
end_programmatically = true;
if(!offline) {
Player.soundcloud_player.pause();
was_stopped = false;
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
} else {
Player.playNext();
}
}
})
} else {
if(Math.ceil(currDurr) + 1 > Player.np.end && Player.soundcloud_player.isPlaying()) {
end_programmatically = true;
if(!offline) {
@@ -984,6 +1076,7 @@ var Player = {
Player.playNext();
}
}
}
} else {
if(Math.ceil(Player.player.getCurrentTime()) >= Player.np.end && (Player.player.getPlayerState() == YT.PlayerState.PLAYING)) {
end_programmatically = true;
@@ -1030,7 +1123,7 @@ var Player = {
loadSoundCloudPlayer: function() {
if(document.querySelectorAll("script[src='https://connect.soundcloud.com/sdk/sdk-3.3.0.js']").length == 1) {
try {
Player.soundcloudReady();
//Player.soundcloudReady();
} catch(error) {
sc_need_initialization = true;
//console.error(error);
@@ -1043,18 +1136,54 @@ var Player = {
if (tagSC.readyState == "loaded" ||
tagSC.readyState == "complete"){
tagSC.onreadystatechange = null;
Player.soundcloudReady();
SC_player = SC;
//Player.soundcloudReady();
Player.loadSoundCloudIframe();
}
};
} else { //Others
tagSC.onload = function(){
Player.soundcloudReady();
SC_player = SC;
//Player.soundcloudReady();
Player.loadSoundCloudIframe();
};
}
tagSC.src = "https://connect.soundcloud.com/sdk/sdk-3.3.0.js";
firstScriptTagSC = document.getElementsByTagName('script')[0];
firstScriptTagSC.parentNode.insertBefore(tagSC, firstScriptTagSC);
}
},
loadSoundCloudIframe: function() {
if(document.querySelectorAll("script[src='/assets/sclib/scapi.js']").length == 1) {
try {
Player.soundcloudReady();
} catch(error) {
//sc_need_initialization = true;
//console.error(error);
//console.error("Seems SoundCloud script isn't correctly loaded. Please reload the page.");
}
} else {
tagSC = document.createElement('script');
if (tagSC.readyState){ //IE
tagSC.onreadystatechange = function(){
if (tagSC.readyState == "loaded" ||
tagSC.readyState == "complete"){
tagSC.onreadystatechange = null;
SC_widget = SC;
Player.soundcloudReady();
}
};
} else { //Others
tagSC.onload = function(){
SC_widget = SC;
Player.soundcloudReady();
};
}
tagSC.src = "/assets/sclib/scapi.js";
firstScriptTagSC = document.getElementsByTagName('script')[0];
firstScriptTagSC.parentNode.insertBefore(tagSC, firstScriptTagSC);
}
}
};

50
server/public/assets/js/playercontrols.js
View File

@@ -191,10 +191,22 @@ var Playercontrols = {
play_pause: function() {
if(!chromecastAvailable){
if(videoSource == "soundcloud") {
if(!Player.soundcloud_player.isPlaying()) {
Player.playVideo();
if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(playing) {
playing = !playing;
if(!playing) {
Player.playVideo();
} else {
Player.pauseVideo();
}
was_stopped = true;
});
} else {
Player.pauseVideo();
if(!Player.soundcloud_player.isPlaying()) {
Player.playVideo();
} else {
Player.pauseVideo();
}
}
} else {
if(Player.player.getPlayerState() == YT.PlayerState.PLAYING)
@@ -273,7 +285,8 @@ var Playercontrols = {
setVolume: function(vol) {
Player.setVolume(vol);
Player.soundcloud_player.setVolume(vol / 100);
if(scUsingWidget) Player.soundcloud_player.setVolume(vol);
else Player.soundcloud_player.setVolume(vol / 100);
Playercontrols.choose_button(vol, false);
if(Player.player.isMuted())
Player.player.unMute();
@@ -355,14 +368,29 @@ var Playercontrols = {
playPause: function() {
if(videoSource == "soundcloud") {
if(!Player.soundcloud_player.isPlaying()) {
Helper.addClass("#play", "hide");
Helper.removeClass("#pause", "hide");
Player.soundcloud_player.play();
if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(playing) {
playing = !playing;
if(!playing) {
Helper.addClass("#play", "hide");
Helper.removeClass("#pause", "hide");
Player.soundcloud_player.play();
} else {
Helper.removeClass("#play", "hide");
Helper.addClass("#pause", "hide");
Player.soundcloud_player.pause();
}
})
} else {
Helper.removeClass("#play", "hide");
Helper.addClass("#pause", "hide");
Player.soundcloud_player.pause();
if(!Player.soundcloud_player.isPlaying()) {
Helper.addClass("#play", "hide");
Helper.removeClass("#pause", "hide");
Player.soundcloud_player.play();
} else {
Helper.removeClass("#play", "hide");
Helper.addClass("#pause", "hide");
Player.soundcloud_player.pause();
}
}
} else {
state = Player.player.getPlayerState();

2
server/public/assets/js/search.js
View File

@@ -202,7 +202,7 @@ var Search = {
return;
}
if(keyword.length == 0) return;
SC.get('/tracks', {
SC_player.get('/tracks', {
q: keyword
}).then(function(tracks) {
var pre_result = document.createElement("div");