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

progress commit, pairing still not fixed

Browse Source
This commit is contained in:
R. Aidan Campbell 2016-03-12 11:28:24 -05:00
parent 8b2ab541b8
commit 15e00aeff9
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
static/js/index.js
View File

@ -18,6 +18,7 @@ function attachListeners() {
} }
function snackbarLog(givenMessage) { function snackbarLog(givenMessage) {
console.log(givenMessage);
var data = { var data = {
message: givenMessage, message: givenMessage,
timeout: 5000 timeout: 5000
@ -35,19 +36,23 @@ function moduleDidLoad() {
sendMessage('makeCert', []).then(function (cert) { sendMessage('makeCert', []).then(function (cert) {
storeData('cert', cert, null); storeData('cert', cert, null);
pairingCert = cert; pairingCert = cert;
console.log("Generated new cert.") console.log("Generated new cert.");
}); if(!myUniqueid) { // if we didn't have a cert, then we probably don't have a unique ID either. so let's do that too.
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]);
}
if(!myUniqueid) {
console.log("Failed to get uniqueId. Generating new one"); console.log("Failed to get uniqueId. Generating new one");
myUniqueid = uniqueid(); myUniqueid = uniqueid();
console.log("genereated new uniqueId");
storeData('uniqueid', myUniqueid, null); storeData('uniqueid', myUniqueid, null);
}
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
snackbarLog('Initialization complete.'); snackbarLog('Initialization complete.');
}); });
} }
});
} else { // both branches execure the httpInit function, but we're skipping this one if we haven't generated things yet.
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
snackbarLog('Initialization complete.');
});
}
}
// because the user can change the target host at any time, we continually have to check // because the user can change the target host at any time, we continually have to check
function updateTarget() { function updateTarget() {
@ -70,14 +75,15 @@ function hideAllWorkflowDivs() {
// pair button was pushed. pass what the user entered into the GFEHostIPField. // pair button was pushed. pass what the user entered into the GFEHostIPField.
function pairPushed() { function pairPushed() {
updateTarget();
if(!pairingCert) { if(!pairingCert) {
snackbarLog('ERROR: cert has not been generated yet. Is NaCL initialized?'); snackbarLog('ERROR: cert has not been generated yet. Is NaCL initialized?');
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; return;
} }
$('#pairButton')[0].innerHTML = 'Pairing...'; $('#pairButton')[0].innerHTML = 'Pairing...';
snackbarLog('Attempting pair to: ' + target); snackbarLog('Attempting pair to: ' + target);
updateTarget();
var randomNumber = String("0000" + (Math.random()*10000|0)).slice(-4); var randomNumber = String("0000" + (Math.random()*10000|0)).slice(-4);
var pairingDialog = document.querySelector('#pairingDialog'); var pairingDialog = document.querySelector('#pairingDialog');
document.getElementById('pairingDialogText').innerHTML = document.getElementById('pairingDialogText').innerHTML =
@ -86,13 +92,16 @@ function pairPushed() {
pairingDialog.querySelector('#CancelPairingDialog').addEventListener('click', function() { pairingDialog.querySelector('#CancelPairingDialog').addEventListener('click', function() {
pairingDialog.close(); pairingDialog.close();
}); });
sendMessage('pair', [target, randomNumber]).then(function (ret2) { console.log('sending pairing request to ' + target + ' with random number ' + randomNumber);
if (ret2 === 0) { // pairing was successful. save this host. sendMessage('pair', [target, randomNumber]).then(function (ret3) {
console.log('"pair" call returned.');
console.log(ret3);
if (ret3 === 0) { // pairing was successful. save this host.
$('#pairButton')[0].innerHTML = 'Paired'; $('#pairButton')[0].innerHTML = 'Paired';
snackbarLog('Pairing successful'); snackbarLog('Pairing successful');
pairingDialog.close(); pairingDialog.close();
var hostSelect = $('#selectHost')[0]; var hostSelect = $('#selectHost')[0];
for(var i = 0; i < hostSelect.length; i++) { for(var i = 0; i < hostSelect.length; i++) { // check if we already have the host.
if (hostSelect.options[i].value == target) return; if (hostSelect.options[i].value == target) return;
} }
@ -102,15 +111,15 @@ function pairPushed() {
$('#selectHost')[0].appendChild(opt); $('#selectHost')[0].appendChild(opt);
hosts.push(target); hosts.push(target);
saveHosts(); saveHosts();
// move directly on to retrieving the apps list.
showAppsPushed();
} else { } else {
snackbarLog('Pairing failed'); snackbarLog('Pairing failed');
$('#pairButton')[0].innerHTML = 'Pairing Failed'; $('#pairButton')[0].innerHTML = 'Pairing Failed';
document.getElementById('pairingDialogText').innerHTML = 'Error: Pairing failed with code: ' + ret2; document.getElementById('pairingDialogText').innerHTML = 'Error: Pairing failed with code: ' + ret3;
} }
console.log("pairing attempt returned: " + ret2); console.log("pairing attempt returned: " + ret3);
}); });
// move directly on to retrieving the apps list.
showAppsPushed();
} }
// someone pushed the "show apps" button. // someone pushed the "show apps" button.