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

Renamed "Moonlight GUI" to "index.js"

Browse Source 
Changed utils.js:316 to be a 'backend' error
This commit is contained in:
Paulin Jorys 2017-07-11 13:28:22 +02:00
parent 1c0a575ccc
commit cfaa0efde4
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
static/js/index.js
View File

@ -157,7 +157,7 @@ function beginBackgroundPollingOfHost(host) {
} }
function stopBackgroundPollingOfHost(host) { function stopBackgroundPollingOfHost(host) {
console.log('%c[Moonlight GUI, backgroundPolling]', 'color: green;', 'Stopping background polling of host ' + host.serverUid + '\n', host, host.toString()); //Logging both object (for console) and toString-ed object (for text logs) console.log('%c[index.js, backgroundPolling]', 'color: green;', 'Stopping background polling of host ' + host.serverUid + '\n', host, host.toString()); //Logging both object (for console) and toString-ed object (for text logs)
window.clearInterval(activePolls[host.serverUid]); window.clearInterval(activePolls[host.serverUid]);
delete activePolls[host.serverUid]; delete activePolls[host.serverUid];
} }
@ -187,24 +187,24 @@ function updateBitrateField() {
function moduleDidLoad() { function moduleDidLoad() {
if(!myUniqueid) { if(!myUniqueid) {
console.warn('%c[Moonlight GUI, moduleDidLoad]', 'color: green;', 'Failed to get uniqueId. We should have already generated one. Regenerating...'); console.warn('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed to get uniqueId. We should have already generated one. Regenerating...');
myUniqueid = uniqueid(); myUniqueid = uniqueid();
storeData('uniqueid', myUniqueid, null); storeData('uniqueid', myUniqueid, null);
} }
if(!pairingCert) { // we couldn't load a cert. Make one. if(!pairingCert) { // we couldn't load a cert. Make one.
console.warn('%c[Moonlight GUI, moduleDidLoad]', 'color: green;', 'Failed to load local cert. Generating new one'); console.warn('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed to load local cert. Generating new one');
sendMessage('makeCert', []).then(function (cert) { sendMessage('makeCert', []).then(function (cert) {
storeData('cert', cert, null); storeData('cert', cert, null);
pairingCert = cert; pairingCert = cert;
console.info('%c[Moonlight GUI, moduleDidLoad]', 'color: green;', 'Generated new cert:', cert); console.info('%c[index.js, moduleDidLoad]', 'color: green;', 'Generated new cert:', cert);
}, function (failedCert) { }, function (failedCert) {
console.error('%c[Moonlight GUI, moduleDidLoad]', 'color: green;', 'Failed to generate new cert! Returned error was: \n', failedCert); console.error('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed to generate new cert! Returned error was: \n', failedCert);
}).then(function (ret) { }).then(function (ret) {
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
restoreUiAfterNaClLoad(); restoreUiAfterNaClLoad();
}, function (failedInit) { }, function (failedInit) {
console.error('%c[Moonlight GUI, moduleDidLoad]', 'color: green;', 'Failed httpInit! Returned error was: ', failedInit); console.error('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed httpInit! Returned error was: ', failedInit);
}); });
}); });
} }
@ -212,7 +212,7 @@ function moduleDidLoad() {
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
restoreUiAfterNaClLoad(); restoreUiAfterNaClLoad();
}, function (failedInit) { }, function (failedInit) {
console.error('%c[Moonlight GUI, moduleDidLoad]', 'color: green;', 'Failed httpInit! Returned error was: ', failedInit); console.error('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed httpInit! Returned error was: ', failedInit);
}); });
} }
} }
@ -221,7 +221,7 @@ function moduleDidLoad() {
function pairTo(nvhttpHost, onSuccess, onFailure) { function pairTo(nvhttpHost, onSuccess, onFailure) {
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.warn('%c[Moonlight GUI]', 'color: green;', 'User wants to pair, and we still have no cert. Problem = very yes.'); console.warn('%c[index.js]', 'color: green;', 'User wants to pair, and we still have no cert. Problem = very yes.');
onFailure(); onFailure();
return; return;
} }
@ -229,7 +229,7 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
nvhttpHost.pollServer(function (ret) { nvhttpHost.pollServer(function (ret) {
if (!nvhttpHost.online) { if (!nvhttpHost.online) {
snackbarLog('Failed to connect to ' + nvhttpHost.hostname + '! Are you sure the host is on?'); snackbarLog('Failed to connect to ' + nvhttpHost.hostname + '! Are you sure the host is on?');
console.error('%c[Moonlight GUI]', 'color: green;', 'Host declared as offline:', nvhttpHost, nvhttpHost.toString()); //Logging both the object and the toString version for text logs console.error('%c[index.js]', 'color: green;', 'Host declared as offline:', nvhttpHost, nvhttpHost.toString()); //Logging both the object and the toString version for text logs
onFailure(); onFailure();
return; return;
} }
@ -249,7 +249,7 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
pairingDialog.close(); pairingDialog.close();
}); });
console.log('%c[Moonlight GUI]', 'color: green;', 'Sending pairing request to ' + nvhttpHost.hostname + ' with random number' + randomNumber); console.log('%c[index.js]', 'color: green;', 'Sending pairing request to ' + nvhttpHost.hostname + ' with random number' + randomNumber);
nvhttpHost.pair(randomNumber).then(function (paired) { nvhttpHost.pair(randomNumber).then(function (paired) {
if (!paired) { if (!paired) {
if (nvhttpHost.currentGame != 0) { if (nvhttpHost.currentGame != 0) {
@ -257,7 +257,7 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
} else { } else {
$('#pairingDialogText').html('Error: failed to pair with ' + nvhttpHost.hostname + '.'); $('#pairingDialogText').html('Error: failed to pair with ' + nvhttpHost.hostname + '.');
} }
console.log('%c[Moonlight GUI]', 'color: green;', 'Failed API object:', nvhttpHost, nvhttpHost.toString()); //Logging both the object and the toString version for text logs console.log('%c[index.js]', 'color: green;', 'Failed API object:', nvhttpHost, nvhttpHost.toString()); //Logging both the object and the toString version for text logs
onFailure(); onFailure();
return; return;
} }
@ -267,8 +267,8 @@ function pairTo(nvhttpHost, onSuccess, onFailure) {
onSuccess(); onSuccess();
}, function (failedPairing) { }, function (failedPairing) {
snackbarLog('Failed pairing to: ' + nvhttpHost.hostname); snackbarLog('Failed pairing to: ' + nvhttpHost.hostname);
console.error('%c[Moonlight GUI]', 'color: green;', 'Pairing failed, and returned:', failedPairing); console.error('%c[index.js]', 'color: green;', 'Pairing failed, and returned:', failedPairing);
console.error('%c[Moonlight GUI]', 'color: green;', 'Failed API object:', nvhttpHost, nvhttpHost.toString()); //Logging both the object and the toString version for text logs console.error('%c[index.js]', 'color: green;', 'Failed API object:', nvhttpHost, nvhttpHost.toString()); //Logging both the object and the toString version for text logs
onFailure(); onFailure();
}); });
}); });
@ -404,10 +404,10 @@ function stylizeBoxArt(freshApi, appIdToStylize) {
// show the app list // show the app list
function showApps(host) { function showApps(host) {
if(!host || !host.paired) { // safety checking. shouldn't happen. if(!host || !host.paired) { // safety checking. shouldn't happen.
console.log('%c[Moonlight GUI, showApps]', 'color: green;', 'Moved into showApps, but `host` did not initialize properly! Failing.'); console.log('%c[index.js, showApps]', 'color: green;', 'Moved into showApps, but `host` did not initialize properly! Failing.');
return; return;
} }
console.log('%c[Moonlight GUI, showApps]', 'color: green;', 'Current host object:', host, host.toString()); //Logging both object (for console) and toString-ed object (for text logs) console.log('%c[index.js, showApps]', 'color: green;', 'Current host object:', host, host.toString()); //Logging both object (for console) and toString-ed object (for text logs)
$('#quitCurrentApp').show(); $('#quitCurrentApp').show();
$("#gameList .game-container").remove(); $("#gameList .game-container").remove();
@ -486,7 +486,7 @@ function showApps(host) {
// set the layout to the initial mode you see when you open moonlight // set the layout to the initial mode you see when you open moonlight
function showHostsAndSettingsMode() { function showHostsAndSettingsMode() {
console.log('%c[Moonlight GUI]', 'color: green;', 'Entering "Show apps and hosts" mode'); console.log('%c[index.js]', 'color: green;', 'Entering "Show apps and hosts" mode');
$("#main-navigation").show(); $("#main-navigation").show();
$(".nav-menu-parent").show(); $(".nav-menu-parent").show();
$("#externalAudioBtn").show(); $("#externalAudioBtn").show();
@ -501,7 +501,7 @@ function showHostsAndSettingsMode() {
} }
function showAppsMode() { function showAppsMode() {
console.log('%c[Moonlight GUI]', 'color: green;', 'Entrering "Show apps" mode'); console.log('%c[index.js]', 'color: green;', 'Entrering "Show apps" mode');
$('#backIcon').show(); $('#backIcon').show();
$("#main-navigation").show(); $("#main-navigation").show();
$("#main-content").children().not("#listener, #loadingSpinner, #naclSpinner").show(); $("#main-content").children().not("#listener, #loadingSpinner, #naclSpinner").show();
@ -524,7 +524,7 @@ function showAppsMode() {
// if the given app is already running, just resume it. // if the given app is already running, just resume it.
function startGame(host, appID) { function startGame(host, appID) {
if(!host || !host.paired) { if(!host || !host.paired) {
console.error('%c[Moonlight GUI, startGame]', 'color: green;', 'Attempted to start a game, but `host` did not initialize properly. Host object: ', host); console.error('%c[index.js, startGame]', 'color: green;', 'Attempted to start a game, but `host` did not initialize properly. Host object: ', host);
return; return;
} }
@ -784,7 +784,7 @@ function updateDefaultBitrate() {
} }
function onWindowLoad(){ function onWindowLoad(){
console.log('%c[Moonlight GUI]', 'color: green;', 'Moonlight\'s main window loaded'); console.log('%c[index.js]', 'color: green;', 'Moonlight\'s main window loaded');
// don't show the game selection div // don't show the game selection div
$('#gameSelection').css('display', 'none'); $('#gameSelection').css('display', 'none');
@ -856,7 +856,7 @@ function onWindowLoad(){
revivedHost.hostname = hosts[hostUID].hostname; revivedHost.hostname = hosts[hostUID].hostname;
addHostToGrid(revivedHost); addHostToGrid(revivedHost);
} }
console.log('%c[Moonlight GUI]', 'color: green;', 'Loaded previously connected hosts'); console.log('%c[index.js]', 'color: green;', 'Loaded previously connected hosts');
}); });
} }
} }

2
static/js/utils.js
View File

@ -313,7 +313,7 @@ NvHTTP.prototype = {
getAppList: function () { getAppList: function () {
if (this._memCachedApplist) { if (this._memCachedApplist) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
console.log('%c[Moonlight GUI]', 'color: green;', 'Returning memory-cached apps list'); console.log('%c[utils.js]', 'color: gray;', 'Returning memory-cached apps list');
resolve(this._memCachedApplist); resolve(this._memCachedApplist);
return; return;
}.bind(this)); }.bind(this));