moonlight-stream/moonlight-chrome
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-chrome.git synced 2025-08-17 16:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUUID is now saved

Browse Source
This commit is contained in:
R. Aidan Campbell 2016-03-10 22:23:51 -05:00
parent 73285c4ff2
commit 4050fe0d3b
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
static/js/index.js
View File

@ -1,6 +1,7 @@
var target = ""; var target = "";
var hosts = []; var hosts = [];
var pairingCert; var pairingCert;
var myGuuid;
// Called by the common.js module. // Called by the common.js module.
function attachListeners() { function attachListeners() {
@ -25,11 +26,16 @@ function moduleDidLoad() {
if(!pairingCert) { // we couldn't load a cert. Make one. if(!pairingCert) { // we couldn't load a cert. Make one.
console.log("Failed to load local cert. Generating new one"); console.log("Failed to load local cert. Generating new one");
sendMessage('makeCert', []).then(function (cert) { sendMessage('makeCert', []).then(function (cert) {
storeData('cert', cert, null); //TODO: this may go 1 level too deep. i.e. reading it will be cert.cert.cert storeData('cert', cert, null);
pairingCert = cert; pairingCert = cert;
console.log("Generated new cert.") console.log("Generated new cert.")
}); });
} }
if(!myGuuid) {
console.log("Failed to get guuid. Generating new one");
myGuuid = guuid();
storeData('guuid', myGuuid, null);
}
} }
// we want the user to progress through the streaming process // we want the user to progress through the streaming process
@ -46,6 +52,7 @@ function hideAllWorkflowDivs() {
function pairPushed() { function pairPushed() {
if(!pairingCert) { if(!pairingCert) {
console.log("User wants to pair, and we still have no cert. Problem = very yes.") console.log("User wants to pair, and we still have no cert. Problem = very yes.")
return;
} }
target = $('#GFEHostIPField')[0].value; target = $('#GFEHostIPField')[0].value;
if (target == null || target == "127.0.0.1") { if (target == null || target == "127.0.0.1") {
@ -53,10 +60,11 @@ function pairPushed() {
target = e.options[e.selectedIndex].value; target = e.options[e.selectedIndex].value;
} }
console.log("Attempting to pair to: " + target); console.log("Attempting to pair to: " + target);
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, guuid()]).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myGuuid]).then(function (ret) {
console.log('httpInit function completed. it returned: ' + ret);
sendMessage('pair', [target, "1233"]).then(function (ret2) { sendMessage('pair', [target, "1233"]).then(function (ret2) {
console.log("pair attempt to to " + target + " has returned."); console.log("pair attempt to to " + target + " has returned.");
console.log("pairing attempt returned: " + ret2) console.log("pairing attempt returned: " + ret2);
}) })
}); });
} }
@ -75,7 +83,7 @@ function showAppsPushed() {
} }
function showAppsMode() { function showAppsMode() {
console.log("entering show apps mode.") console.log("entering show apps mode.");
$('#streamSettings').css('display', 'none'); $('#streamSettings').css('display', 'none');
$('#hostSettings').css('display', 'none'); $('#hostSettings').css('display', 'none');
$('#gameSelection').css('display', 'inline-block'); $('#gameSelection').css('display', 'inline-block');
@ -97,9 +105,11 @@ function startPushed() {
// we told the user it was in Mbps. We're dirty liars and use Kbps behind their back. // we told the user it was in Mbps. We're dirty liars and use Kbps behind their back.
var bitrate = parseInt($("#bitrateSlider").val()) * 1024; var bitrate = parseInt($("#bitrateSlider").val()) * 1024;
console.log('startRequest:' + target + ":" + streamWidth + "x" + streamHeight + ":" + frameRate); console.log('startRequest:' + target + ":" + streamWidth + ":" + streamHeight + ":" + frameRate + ":" + bitrate);
sendMessage('startRequest', [target, streamWidth, streamHeight, frameRate, bitrate]); sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myGuuid]).then(function (ret) {
sendMessage('startRequest', [target, streamWidth, streamHeight, frameRate, bitrate]);
});
// we just finished the gameSelection section. only expose the NaCl section // we just finished the gameSelection section. only expose the NaCl section
playGameMode(); playGameMode();
@ -223,6 +233,11 @@ function onWindowLoad(){
pairingCert = savedCert.cert; pairingCert = savedCert.cert;
} }
}); });
chrome.storage.sync.get('guuid', function(savedGuuid) {
if (savedGuuid.guuid != null) { // we have a saved guuid
myGuuid = savedGuuid.guuid;
}
})
} }
} }