KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-03-03 05:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed cors-anywhere dependency

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-05 18:06:53 +01:00
parent 2cec9f92ab
commit 8169e2dd07
8 changed files with 164 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/app.js
View File

@@ -53,8 +53,6 @@ function startClustered() {
function startSingle(clustered) {
var app = require('./index.js');
var cors_options = {};
var cors_proxy = require('cors-anywhere');
try {
var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
var fs = require('fs');
@@ -70,27 +68,13 @@ function startSingle(clustered) {
var https = require('https');
server = https.Server(credentials, app);
cors_options = {
requireHeader: ['origin', 'x-requested-with'],
removeHeaders: ['cookie', 'cookie2'],
httpsOptions: credentials
};
} catch(err){
console.log("Starting without https (probably on localhost)");
cors_options = {
requireHeader: ['origin', 'x-requested-with'],
removeHeaders: ['cookie', 'cookie2'],
};
var http = require('http');
server = http.Server(app);
//add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*";
}
cors_proxy.createServer(cors_options).listen(8081, function() {
console.log('Running CORS Anywhere on :' + 8081 + " [" + process.pid + "]");
});
if(clustered) {
server.listen(onListen);
} else {

6
server/handlers/io.js
View File

@@ -38,6 +38,12 @@ module.exports = function() {
}
});
socket.on('color', function(msg) {
if(msg.hasOwnProperty("id")) {
List.sendColor(false, socket, msg.id);
}
});
socket.on('chromecast', function(msg) {
try {
if(typeof(msg) == "object" && msg.hasOwnProperty("guid") && msg.hasOwnProperty("socket_id") && msg.hasOwnProperty("channel")) {

20
server/handlers/list.js
View File

@@ -1,3 +1,5 @@
var ColorThief = require('color-thief-jimp');
var Jimp = require('jimp');
function now_playing(list, fn, socket) {
if(typeof(list) !== 'string' || typeof(fn) !== 'function') {
@@ -443,12 +445,16 @@ function send_play(coll, socket)
toSend = {np: np, conf: conf, time: Functions.get_time()};
if(socket === undefined) {
io.to(coll).emit("np", toSend);
//
List.getNextSong(coll)
sendColor(coll, false, np[0].id);
} else {
socket.emit("np", toSend);
sendColor(coll, socket, np[0].id);
}
}
} catch(e){
console.log(e);
if(socket) {
socket.emit("np", {});
} else {
@@ -459,6 +465,19 @@ function send_play(coll, socket)
});
}
function sendColor(coll, socket, id) {
var url = 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg';
Jimp.read(url).then(function (image) {
var c = ColorThief.getColor(image);
if(socket) {
socket.emit("color", {color: c});
} else {
io.to(coll).emit("color", {color: c});
}
});
}
function getNextSong(coll) {
db.collection(coll).aggregate([{
$match:{
@@ -518,6 +537,7 @@ function left_channel(coll, guid, short_id, in_list, socket, change)
Functions.remove_unique_id(short_id);
}
module.exports.sendColor = sendColor;
module.exports.now_playing = now_playing;
module.exports.list = list;
module.exports.skip = skip;

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

@@ -540,6 +540,7 @@ var Channel = {
socket.removeEventListener("channel");
//socket.removeEventListener(id);
}
socket.removeEventListener("color");
document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video);
document.getElementById("playpause").removeEventListener("click", Playercontrols.play_pause);
document.getElementById("fullscreen").removeEventListener("click", Playercontrols.fullscreen);

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

@@ -191,6 +191,7 @@ function setup_chat_listener(){
function setup_list_listener(){
socket.on("channel", List.channel_function);
socket.on("color", Player.setBGimage);
}
function setup_playlist_listener(){

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

@@ -37,7 +37,9 @@ var Player = {
Helper.log("mobile_beginning variable: " + mobile_beginning);
try{
Helper.log("getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]);
} catch(e){}
} catch(e){
}
Helper.log("video_id variable: " + video_id);
Helper.log("---------------------------------");
@@ -56,7 +58,9 @@ var Player = {
if(!chromecastAvailable) {
Player.stopVideo();
}
}catch(e){}
}catch(e){
}
//List.importOldList(channel.toLowerCase());
} else if(paused){
@@ -87,7 +91,7 @@ var Player = {
seekTo = (time - conf.startTime) + Player.np.start;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
Player.setBGimage(video_id);
//Player.setBGimage(video_id);
} else if(!paused){
//Helper.log("gotten new song");
if(previous_video_id === undefined) {
@@ -127,7 +131,7 @@ var Player = {
}catch(e){}
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
//Player.setBGimage(video_id);
//if(player_ready && !Helper.mobilecheck())
if(player_ready && !window.MSStream) {
try {
@@ -324,6 +328,9 @@ var Player = {
window.player = Player.player;
Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
}
if(offline) {
socket.emit("color", {id: id});
}
},
stopVideo: function(){
@@ -366,7 +373,7 @@ var Player = {
};
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
//Player.setBGimage(video_id);
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: video_id, channel: chan.toLowerCase(), start: start, end:end});
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
@@ -402,7 +409,7 @@ var Player = {
};
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
//Player.setBGimage(video_id);
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: video_id, channel: chan.toLowerCase(), start: start, end: end});
@@ -517,32 +524,19 @@ var Player = {
},
readyLooks: function() {
Player.setBGimage(video_id);
//Player.setBGimage(video_id);
},
setBGimage: function(id){
if(id !== undefined && !embed)
{
var img = new Image();
img.onload = function ()
{
var colorThief = new ColorThief();
var color = colorThief.getColor(img);
if(window.location.pathname != "/") {
document.getElementById("main-container").style.backgroundColor = Helper.rgbToHsl(color,true);
$("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2]));
var new_color = Helper.rgbToHex(color[0], color[1], color[2]);
new_color = Helper.hexToComplimentary(new_color);
new_color = Helper.hexToRgb(new_color);
new_color = Helper.rgbToHsl([new_color.r, new_color.g, new_color.b], true);
$("#controls").css("background", new_color);
}
};
img.crossOrigin = 'Anonymous';
img.src = 'https://zoff.me:8081/https://img.youtube.com/vi/'+id+'/mqdefault.jpg';
setBGimage: function(c){
var color = c.color;
if(window.location.pathname != "/") {
document.getElementById("main-container").style.backgroundColor = Helper.rgbToHsl(color,true);
$("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2]));
var new_color = Helper.rgbToHex(color[0], color[1], color[2]);
new_color = Helper.hexToComplimentary(new_color);
new_color = Helper.hexToRgb(new_color);
new_color = Helper.rgbToHsl([new_color.r, new_color.g, new_color.b], true);
$("#controls").css("background", new_color);
}
},