From b55607ec1d861828b51cc6ab6e915ecf7a87c550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 5 Jun 2018 11:02:03 +0200 Subject: [PATCH] Sending more values to get chromecast to think it is the mobile phone --- server/handlers/functions.js | 2 +- server/handlers/io.js | 7 ++++--- server/public/assets/js/functions.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/handlers/functions.js b/server/handlers/functions.js index 1e8db852..f7b73c49 100644 --- a/server/handlers/functions.js +++ b/server/handlers/functions.js @@ -256,7 +256,7 @@ function getSessionChatPass(id, callback) { function setChromecastHost(id, other_id, list, callback) { try { - console.log("settingChromecastHost: ", socket.cookie_id, msg.guid); + console.log("settingChromecastHost: ", id, other_id); if(id == "empty" || id == undefined) { callback(); return; diff --git a/server/handlers/io.js b/server/handlers/io.js index 72391625..f4cfdc1c 100644 --- a/server/handlers/io.js +++ b/server/handlers/io.js @@ -89,14 +89,14 @@ module.exports = function() { db.collection("connected_users").find({"_id": msg.channel}, function(err, connected_users_channel) { console.log("another error", err); console.log("test: ", connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.guid) > -1, connected_users_channel.length > 0, connected_users_channel[0].users.indexOf(msg.guid) > -1, connected_users_channel) - if(connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.socket_id) > -1) { + if(connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.guid) > -1) { coll = msg.channel.toLowerCase();//.replace(/ /g,''); coll = Functions.removeEmojis(coll).toLowerCase(); coll = filter.clean(coll); if(coll.indexOf("?") > -1){ coll = coll.substring(0, coll.indexOf("?")); } - Functions.setChromecastHost(socket.cookie_id, msg.guid, msg.channel, function(results) { + Functions.setChromecastHost(socket.cookie_id, msg.socketid, msg.channel, function(results) { console.log("setChromecastHost: ", results); }); //socket.cookie_id = msg.guid; @@ -121,7 +121,7 @@ module.exports = function() { socket.on("get_id", function() { console.log("gotten request from mobile", Functions.getSession(socket)); - socket.emit("id_chromecast", Functions.getSession(socket)); + socket.emit("id_chromecast", {cookie_id: Functions.getSession(socket), guid: guid}); }); socket.on("error_video", function(msg) { @@ -687,6 +687,7 @@ module.exports = function() { socket.emit('update_required', result); return; } + if(coll == undefined) return; if(chromecast_object) { console.log("chromecast object", Functions.getSession(socket)); return; diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index 91677306..7ae15d0d 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -450,7 +450,7 @@ function get_list_listener(){ }); socket.on("id_chromecast", function(msg) { chromecast_specs_sent = true; - castSession.sendMessage("urn:x-cast:zoff.me", {type: "mobilespecs", guid: msg, socketid: socket.id, channel: chan.toLowerCase()}) + castSession.sendMessage("urn:x-cast:zoff.me", {type: "mobilespecs", guid: msg.guid, socketid: msg.cookie_id, channel: chan.toLowerCase()}) }) }