diff --git a/static/js/common.js b/static/js/common.js index be48b5b..db28a2a 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -317,7 +317,7 @@ var common = (function() { function updateStatus(opt_message) { if (opt_message) { statusText = opt_message; - console.log('common.js: ' + statusText); + console.log('%c[updateStatus, common.js]', 'color: gray;', statusText); } var statusField = document.getElementById('statusField'); if (statusField) { diff --git a/static/js/index.js b/static/js/index.js index 2631d9f..88a31ac 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -157,13 +157,13 @@ function beginBackgroundPollingOfHost(host) { } function stopBackgroundPollingOfHost(host) { - console.log('stopping background polling of server: ' + host.toString()); - window.clearInterval(activePolls[host.serverUid]); - delete activePolls[host.serverUid]; + 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]); + delete activePolls[host.serverUid]; } function snackbarLog(givenMessage) { - console.log(givenMessage); + console.log('%c[index.js, snackbarLog]', 'color: green;', givenMessage); var data = { message: givenMessage, timeout: 2000 @@ -172,7 +172,7 @@ function snackbarLog(givenMessage) { } function snackbarLogLong(givenMessage) { - console.log(givenMessage); + console.log('%c[index.js, snackbarLog]', 'color: green;', givenMessage); var data = { message: givenMessage, timeout: 5000 @@ -187,26 +187,24 @@ function updateBitrateField() { function moduleDidLoad() { if(!myUniqueid) { - console.log("Failed to get uniqueId. We should have already generated one. Regenerating..."); - myUniqueid = uniqueid(); - storeData('uniqueid', myUniqueid, null); + console.warn('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed to get uniqueId. We should have already generated one. Regenerating...'); + myUniqueid = uniqueid(); + storeData('uniqueid', myUniqueid, null); } if(!pairingCert) { // we couldn't load a cert. Make one. - console.log("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) { storeData('cert', cert, null); pairingCert = cert; - console.log("Generated new cert."); + console.info('%c[index.js, moduleDidLoad]', 'color: green;', 'Generated new cert:', cert); }, function (failedCert) { - console.log('ERROR: failed to generate new cert!'); - console.log('Returned error was: ' + failedCert); + console.error('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed to generate new cert! Returned error was: \n', failedCert); }).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { restoreUiAfterNaClLoad(); }, function (failedInit) { - console.log('ERROR: failed httpInit!'); - console.log('Returned error was: ' + failedInit); + console.error('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed httpInit! Returned error was: ', failedInit); }); }); } @@ -214,8 +212,7 @@ function moduleDidLoad() { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { restoreUiAfterNaClLoad(); }, function (failedInit) { - console.log('ERROR: failed httpInit!'); - console.log('Returned error was: ' + failedInit); + console.error('%c[index.js, moduleDidLoad]', 'color: green;', 'Failed httpInit! Returned error was: ', failedInit); }); } } @@ -224,7 +221,7 @@ function moduleDidLoad() { function pairTo(nvhttpHost, onSuccess, onFailure) { if(!pairingCert) { 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.warn('%c[index.js]', 'color: green;', 'User wants to pair, and we still have no cert. Problem = very yes.'); onFailure(); return; } @@ -232,7 +229,7 @@ function pairTo(nvhttpHost, onSuccess, onFailure) { nvhttpHost.pollServer(function (ret) { if (!nvhttpHost.online) { snackbarLog('Failed to connect to ' + nvhttpHost.hostname + '! Are you sure the host is on?'); - console.log(nvhttpHost.toString()); + 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(); return; } @@ -252,7 +249,7 @@ function pairTo(nvhttpHost, onSuccess, onFailure) { pairingDialog.close(); }); - console.log('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) { if (!paired) { if (nvhttpHost.currentGame != 0) { @@ -260,8 +257,7 @@ function pairTo(nvhttpHost, onSuccess, onFailure) { } else { $('#pairingDialogText').html('Error: failed to pair with ' + nvhttpHost.hostname + '.'); } - console.log('failed API object: '); - console.log(nvhttpHost.toString()); + 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(); return; } @@ -271,9 +267,8 @@ function pairTo(nvhttpHost, onSuccess, onFailure) { onSuccess(); }, function (failedPairing) { snackbarLog('Failed pairing to: ' + nvhttpHost.hostname); - console.log('pairing failed, and returned ' + failedPairing); - console.log('failed API object: '); - console.log(nvhttpHost.toString()); + console.error('%c[index.js]', 'color: green;', 'Pairing failed, and returned:', failedPairing); + 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(); }); }); @@ -417,10 +412,10 @@ function stylizeBoxArt(freshApi, appIdToStylize) { // show the app list function showApps(host) { if(!host || !host.paired) { // safety checking. shouldn't happen. - console.log('Moved into showApps, but `host` did not initialize properly! Failing.'); - return; + console.log('%c[index.js, showApps]', 'color: green;', 'Moved into showApps, but `host` did not initialize properly! Failing.'); + return; } - console.log(host); + 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(); $("#gameList .game-container").remove(); @@ -464,9 +459,7 @@ function showApps(host) { } }, function (failedPromise) { - console.log('Error! Failed to retrieve box art for app ID: ' + app.id + '. Returned value was: ' + failedPromise) - console.log('failed host object: '); - console.log(host.toString()); + console.log('%c[index.js, showApps]', 'color: green;', 'Error! Failed to retrieve box art for app ID: ' + app.id + '. Returned value was: ' + failedPromise, '\n Host object:', host, host.toString()); if ($('#game-' + app.id).length === 0) { // double clicking the button will cause multiple box arts to appear. @@ -489,9 +482,7 @@ function showApps(host) { }, function (failedAppList) { $('#naclSpinner').hide(); - console.log('Failed to get applist from host: ' + host.hostname); - console.log('failed host object: '); - console.log(host.toString()); + console.log('%c[index.js, showApps]', 'color: green;', 'Failed to get applist from host: ' + host.hostname, '\n Host object:', host, host.toString()); }); showAppsMode(); @@ -499,7 +490,7 @@ function showApps(host) { // set the layout to the initial mode you see when you open moonlight function showHostsAndSettingsMode() { - console.log('entering show hosts and settings mode.'); + console.log('%c[index.js]', 'color: green;', 'Entering "Show apps and hosts" mode'); $("#main-navigation").show(); $(".nav-menu-parent").show(); $("#externalAudioBtn").show(); @@ -514,7 +505,7 @@ function showHostsAndSettingsMode() { } function showAppsMode() { - console.log("entering show apps mode."); + console.log('%c[index.js]', 'color: green;', 'Entrering "Show apps" mode'); $('#backIcon').show(); $("#main-navigation").show(); $("#main-content").children().not("#listener, #loadingSpinner, #naclSpinner").show(); @@ -537,8 +528,8 @@ function showAppsMode() { // if the given app is already running, just resume it. function startGame(host, appID) { if(!host || !host.paired) { - console.log('attempted to start a game, but `host` did not initialize properly. Failing!'); - return; + console.error('%c[index.js, startGame]', 'color: green;', 'Attempted to start a game, but `host` did not initialize properly. Host object: ', host); + return; } // refresh the server info, because the user might have quit the game. @@ -555,11 +546,11 @@ function startGame(host, appID) { $('#cancelQuitApp').off('click'); $('#cancelQuitApp').on('click', function () { quitAppDialog.close(); - console.log('closing app dialog, and returning'); + console.log('[index.js, startGame]','color: green;', 'Closing app dialog, and returning'); }); $('#continueQuitApp').off('click'); $('#continueQuitApp').on('click', function () { - console.log('stopping game, and closing app dialog, and returning'); + console.log('[index.js, startGame]','color: green;', 'Stopping game, and closing app dialog, and returning'); stopGame(host, function () { // please oh please don't infinite loop with recursion startGame(host, appID); @@ -569,10 +560,7 @@ function startGame(host, appID) { return; }, function (failedCurrentApp) { - console.log('ERROR: failed to get the current running app from host!'); - console.log('Returned error was: ' + failedCurrentApp); - console.log('failed host object: '); - console.log(host.toString()); + console.error('[index.js, startGame]','color: green;', 'Failed to get the current running app from host! Returned error was:' + failedCurrentApp, '\n Host object:', host, host.toString()); return; }); return; @@ -583,7 +571,7 @@ function startGame(host, appID) { var streamHeight = $('#selectResolution').data('value').split(':')[1]; // we told the user it was in Mbps. We're dirty liars and use Kbps behind their back. var bitrate = parseInt($("#bitrateSlider").val()) * 1000; - console.log('startRequest:' + host.address + ":" + streamWidth + ":" + streamHeight + ":" + frameRate + ":" + bitrate); + console.log('%c[index.js, startGame]','color:green;', 'startRequest:' + host.address + ":" + streamWidth + ":" + streamHeight + ":" + frameRate + ":" + bitrate); var rikey = generateRemoteInputKey(); var rikeyid = generateRemoteInputKeyId(); @@ -596,8 +584,7 @@ function startGame(host, appID) { sendMessage('startRequest', [host.address, streamWidth, streamHeight, frameRate, bitrate.toString(), rikey, rikeyid.toString(), host.appVersion]); }, function (failedResumeApp) { - console.log('ERROR: failed to resume the app!'); - console.log('Returned error was: ' + failedResumeApp); + console.eror('%c[index.js, startGame]', 'color:green;', 'Failed to resume the app! Returned error was' + failedResumeApp); return; }); } @@ -614,8 +601,7 @@ function startGame(host, appID) { sendMessage('startRequest', [host.address, streamWidth, streamHeight, frameRate, bitrate.toString(), rikey, rikeyid.toString(), host.appVersion]); }, function (failedLaunchApp) { - console.log('ERROR: failed to launch app with appID: ' + appID); - console.log('Returned error was: ' + failedLaunchApp); + console.error('%c[index.js, launchApp]','color: green;','Failed to launch app width id: ' + appID + '\nReturned error was: ' + failedLaunchApp); return; }); @@ -624,7 +610,7 @@ function startGame(host, appID) { } function playGameMode() { - console.log("entering play game mode"); + console.log('%c[index.js, playGameMode]', 'color:green;', 'Entering play game mode'); isInGame = true; $("#main-navigation").hide(); @@ -667,12 +653,12 @@ function stopGameWithConfirmation() { quitAppDialog.showModal(); $('#cancelQuitApp').off('click'); $('#cancelQuitApp').on('click', function () { - console.log('closing app dialog, and returning'); + console.log('%c[index.js, stopGameWithConfirmation]', 'color:green;', 'Closing app dialog, and returning'); quitAppDialog.close(); }); $('#continueQuitApp').off('click'); $('#continueQuitApp').on('click', function () { - console.log('stopping game, and closing app dialog, and returning'); + console.log('%c[index.js, stopGameWithConfirmation]', 'color:green;', 'Stopping game, and closing app dialog, and returning'); stopGame(api); quitAppDialog.close(); }); @@ -702,21 +688,16 @@ function stopGame(host, callbackFunction) { stylizeBoxArt(host, runningApp.id); if (typeof(callbackFunction) === "function") callbackFunction(); }, function (failedRefreshInfo2) { - console.log('ERROR: failed to refresh server info!'); - console.log('Returned error was: ' + failedRefreshInfo2); - console.log('failed server was: ' + host.toString()); + console.error('%c[index.js, stopGame]', 'color:green;', 'Failed to refresh server info! Returned error was:' + failedRefreshInfo + ' and failed server was:', host, host.toString()); }); }, function (failedQuitApp) { - console.log('ERROR: failed to quit app!'); - console.log('Returned error was: ' + failedQuitApp); + console.error('%c[index.js, stopGame]', 'color:green;', 'Failed to quit app! Returned error was:' + failedQuitApp); }); }, function (failedGetApp) { - console.log('ERROR: failed to get app ID!'); - console.log('Returned error was: ' + failedRefreshInfo); + console.error('%c[index.js, stopGame]', 'color:green;', 'Failed to get app ID! Returned error was:' + failedRefreshInfo); }); }, function (failedRefreshInfo) { - console.log('ERROR: failed to refresh server info!'); - console.log('Returned error was: ' + failedRefreshInfo); + console.error('%c[index.js, stopGame]', 'color:green;', 'Failed to refresh server info! Returned error was:' + failedRefreshInfo); }); } @@ -761,7 +742,7 @@ function saveRemoteAudio() { // checking the new state setTimeout(function() { var remoteAudioState = $("#remoteAudioEnabledSwitch").parent().hasClass('is-checked'); - console.log('saving remote audio state : ' + remoteAudioState); + console.log('%c[index.js, saveRemoteAudio]', 'color: green;', 'Saving remote audio state : ' + remoteAudioState); storeData('remoteAudio', remoteAudioState, null); }, 100); } @@ -797,7 +778,7 @@ function updateDefaultBitrate() { } function onWindowLoad(){ - console.log('Window loaded.'); + console.log('%c[index.js]', 'color: green;', 'Moonlight\'s main window loaded'); // don't show the game selection div $('#gameSelection').css('display', 'none'); @@ -869,7 +850,7 @@ function onWindowLoad(){ revivedHost.hostname = hosts[hostUID].hostname; addHostToGrid(revivedHost); } - console.log('Loaded previously connected hosts.'); + console.log('%c[index.js]', 'color: green;', 'Loaded previously connected hosts'); }); } } diff --git a/static/js/messages.js b/static/js/messages.js index dc1c20b..9ea552e 100644 --- a/static/js/messages.js +++ b/static/js/messages.js @@ -1,11 +1,18 @@ var callbacks = {} var callbacks_ids = 1; +/** + * var sendMessage - Sends a message with arguments to the NaCl module + * + * @param {String} method A named method + * @param {(String|Array)} params An array of options or a signle string + * @return {void} The NaCl module calls back trought the handleMessage method + */ var sendMessage = function(method, params) { return new Promise(function(resolve, reject) { var id = callbacks_ids++; callbacks[id] = {'resolve': resolve, 'reject': reject}; - + common.naclModule.postMessage({ 'callbackId': id, 'method': method, @@ -14,14 +21,20 @@ var sendMessage = function(method, params) { }); } +/** + * handleMessage - Handles messages from the NaCl module + * + * @param {Object} msg An object given by the NaCl module + * @return {void} + */ function handleMessage(msg) { if (msg.data.callbackId && callbacks[msg.data.callbackId]) { // if it's a callback, treat it as such callbacks[msg.data.callbackId][msg.data.type](msg.data.ret); delete callbacks[msg.data.callbackId] } else { // else, it's just info, or an event - console.log(msg.data); + console.log('%c[messages.js, handleMessage]', 'color:gray;', 'Message data: ', msg.data) if(msg.data === 'streamTerminated') { // if it's a recognized event, notify the appropriate function - $('#loadingSpinner').css('display', 'none'); // This is a fallback for RTSP handshake failing, which immediately terminates the stream. + $('#loadingSpinner').css('display', 'none'); // This is a fallback for RTSP handshake failing, which immediately terminates the stream. $('body').css('backgroundColor', '#282C38'); api.refreshServerInfo().then(function (ret) { // refresh the serverinfo to acknowledge the currently running app diff --git a/static/js/utils.js b/static/js/utils.js index eaa4c16..79a7fef 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -32,7 +32,7 @@ String.prototype.toHex = function() { } function NvHTTP(address, clientUid, userEnteredAddress = '') { - console.log(this); + console.log('%c[utils.js, NvHTTP Object]', 'color: gray;', this); this.address = address; this.paired = false; this.currentGame = 0; @@ -95,7 +95,7 @@ NvHTTP.prototype = { // try HTTPS first return sendMessage('openUrl', [ 'https://' + givenAddress + ':47984' + '/serverinfo?' + this._buildUidStr(), false]).then(function(ret) { if (!this._parseServerInfo(ret)) { // if that fails - console.log('Failed to parse serverinfo from HTTPS, falling back to HTTP'); + console.log('%c[utils.js, utils.js, refreshServerInfoAtAddress]', 'color: gray;', 'Failed to parse serverinfo from HTTPS, falling back to HTTP'); // try HTTP as a failover. Useful to clients who aren't paired yet return sendMessage('openUrl', [ 'http://' + givenAddress + ':47989' + '/serverinfo?' + this._buildUidStr(), false]).then(function(retHttp) { return this._parseServerInfo(retHttp); @@ -165,7 +165,7 @@ NvHTTP.prototype = { this.refreshServerInfoAtAddress(this.userEnteredAddress).then(function(successUserEntered) { onSuccess(this.userEnteredAddress); }.bind(this), function(failureUserEntered) { - console.log('WARN! Failed to contact host: ' + this.hostname + '\r\n' + this.toString()); + console.warn('%c[utils.js, utils.js, selectServerAddress]', 'color: gray;', 'Failed to contact host ' + this.hostname, this); onFailure(); }.bind(this)); }.bind(this)); @@ -194,7 +194,7 @@ NvHTTP.prototype = { _prepareForStorage: function() { this._memCachedBoxArtArray = {}; }, - + _parseServerInfo: function(xmlStr) { $xml = this._parseXML(xmlStr); $root = $xml.find('root'); @@ -207,9 +207,8 @@ NvHTTP.prototype = { // if we received a UID that isn't the one we expected, fail. return false; } - - console.log('parsing server info: '); - console.log($root); + + console.log('%c[utils.js, _parseServerInfo]', 'color:gray;', 'Parsing server info:', $root); this.paired = $root.find("PairStatus").text().trim() == 1; this.currentGame = parseInt($root.find("currentgame").text().trim(), 10); @@ -245,44 +244,44 @@ NvHTTP.prototype = { if ($root.find("state").text().trim().endsWith("_SERVER_AVAILABLE")) { this.currentGame = 0; } - + return true; }, - + getAppById: function (appId) { return this.getAppList().then(function (list) { var retApp = null; - + list.some(function (app) { if (app.id == appId) { retApp = app; return true; } - + return false; }); - + return retApp; }); }, - + getAppByName: function (appName) { return this.getAppList().then(function (list) { var retApp = null; - + list.some(function (app) { if (app.title == appName) { retApp = app; return true; } - + return false; }); - + return retApp; }); }, - + getAppListWithCacheFlush: function () { return sendMessage('openUrl', [this._baseUrlHttps + '/applist?' + this._buildUidStr(), false]).then(function (ret) { $xml = this._parseXML(ret); @@ -290,14 +289,14 @@ NvHTTP.prototype = { if ($root.attr("status_code") != 200) { // TODO: Bubble up an error here - console.log('applist request failed: ' + $root.attr("status_code")); + console.error('%c[utils.js, utils.js, getAppListWithCacheFlush]', 'color: gray;', 'Applist request failed', $root.attr("status_code")); return []; } - + var rootElement = $xml.find("root")[0]; var appElements = rootElement.getElementsByTagName("App"); var appList = []; - + for (var i = 0, len = appElements.length; i < len; i++) { appList.push({ title: appElements[i].getElementsByTagName("AppTitle")[0].innerHTML.trim(), @@ -306,7 +305,7 @@ NvHTTP.prototype = { } this._memCachedApplist = appList; - + return appList; }.bind(this)); }, @@ -314,7 +313,7 @@ NvHTTP.prototype = { getAppList: function () { if (this._memCachedApplist) { return new Promise(function (resolve, reject) { - console.log('returning memory cached app list'); + console.log('%c[utils.js, utils.js]', 'color: gray;', 'Returning memory-cached apps list'); resolve(this._memCachedApplist); return; }.bind(this)); @@ -327,12 +326,12 @@ NvHTTP.prototype = { // this is inefficient, but works well. warmBoxArtCache: function () { if (!this.paired) { - console.log('not warming box art cache from unpaired host.'); - return; + console.log('%c[utils.js, warmBoxArtCache]', 'color: grey;', 'Not warming box art cache for unpaired host'); + return; } if (Object.keys(this._memCachedBoxArtArray).length != 0) { - console.log('box art cache already warmed.'); - return; + console.log('%c[utils.js, warmBoxArtCache]', 'color: grey;', 'Box art cache already warmed'); + return; } if (chrome.storage) { chrome.storage.local.get('boxArtCache', function(JSONCachedBoxArtArray) { @@ -343,15 +342,15 @@ NvHTTP.prototype = { for (var key in storedBoxArtArray) { this._memCachedBoxArtArray[key] = _base64ToArrayBuffer(storedBoxArtArray[key]); } - console.log('box art cache warmed.'); + console.log('%c[utils.js, warmBoxArtCache]', 'color: grey;', 'Box art cache warmed'); } else { - console.log('WARN: no box art found in storage. Cannot warm cache!'); - return; + console.warn('%c[utils.js, warmBoxArtCache]', 'color: grey;', 'No box art found in storage. Cannot warm cache!'); + return; } }.bind(this)); } }, - + // returns the box art of the given appID. // three layers of response time are possible: memory cached (in javascript), storage cached (in chrome.storage.local), and streamed (host sends binary over the network) getBoxArt: function (appId) { @@ -361,13 +360,13 @@ NvHTTP.prototype = { if (this._memCachedBoxArtArray[appId] === null) { // This means a previous box art request failed, don't try again return new Promise(function (resolve, reject) { - console.log('returning cached box art failure result'); - reject(null); - return; + console.error('%c[utils.js, utils.js, getBoxArt]', 'color: gray;', 'Returning cached box-art failure result') + reject(null); + return; }.bind(this)); } else if (this._memCachedBoxArtArray[appId] !== undefined) { return new Promise(function (resolve, reject) { - console.log('returning memory cached box art'); + console.log('%c[utils.js, utils.js, getBoxArt]', 'color: gray;', 'Returning memory-cached box-art'); resolve(this._memCachedBoxArtArray[appId]); return; }.bind(this)); @@ -392,7 +391,7 @@ NvHTTP.prototype = { // if we already have it, load it. if (storedBoxArtArray[appId] !== undefined && Object.keys(storedBoxArtArray).length !== 0 && storedBoxArtArray[appId].constructor !== Object) { - console.log('returning storage cached box art'); + console.log('%c[utils.js, getBoxArt]', 'color: gray;', 'Returning strage-cached box art for app: ', appId); resolve(storedBoxArtArray[appId]); return; } @@ -401,7 +400,7 @@ NvHTTP.prototype = { sendMessage('openUrl', [ this._baseUrlHttps + '/appasset?'+this._buildUidStr() + - '&appid=' + appId + + '&appid=' + appId + '&AssetType=2&AssetIdx=0', true ]).then(function(streamedBoxArt) { @@ -416,13 +415,13 @@ NvHTTP.prototype = { obj['boxArtCache'] = arrayToStore; // storage is in JSON format. JSON does not support binary data. chrome.storage.local.set(obj, function(onSuccess) {}); - console.log('returning streamed box art'); + console.log('%c[utils.js, utils.js, getBoxArt]', 'color: gray;', 'Returning streamed box art'); resolve(streamedBoxArt); return; }.bind(this), function(error) { // Cache the failure but not persistently this._memCachedBoxArtArray[appId] = null; - console.log('box art request failed'); + console.error('%c[utils.js, utils.js, getBoxArt]', 'color: gray;', 'Box-art request failed!', error); reject(error); return; }.bind(this)); @@ -430,17 +429,17 @@ NvHTTP.prototype = { }.bind(this)); } else { // shouldn't run because we always have chrome.storage, but I'm not going to antagonize other browsers - console.log('WARN: Chrome.storage not detected! Box art will not be saved!'); + console.warn('%c[utils.js, utils.js, getBoxArt]', 'color: gray;', 'chrome.storage not detected! Box art will not be saved!'); return sendMessage('openUrl', [ this._baseUrlHttps + '/appasset?'+this._buildUidStr() + - '&appid=' + appId + + '&appid=' + appId + '&AssetType=2&AssetIdx=0', true ]); } }, - + launchApp: function (appId, mode, sops, rikey, rikeyid, localAudio, surroundAudioInfo) { return sendMessage('openUrl', [ this._baseUrlHttps + @@ -457,7 +456,7 @@ NvHTTP.prototype = { return true; }); }, - + resumeApp: function (rikey, rikeyid) { return sendMessage('openUrl', [ this._baseUrlHttps + @@ -469,7 +468,7 @@ NvHTTP.prototype = { return true; }); }, - + quitApp: function () { return sendMessage('openUrl', [this._baseUrlHttps + '/cancel?' + this._buildUidStr(), false]) // Refresh server info after quitting because it may silently fail if the @@ -477,15 +476,15 @@ NvHTTP.prototype = { // TODO: We should probably bubble this up to our caller. .then(this.refreshServerInfo()); }, - + pair: function(randomNumber) { return this.refreshServerInfo().then(function () { if (this.paired) return true; - + if (this.currentGame != 0) return false; - + return sendMessage('pair', [this.serverMajorVersion.toString(), this.address, randomNumber]).then(function (pairStatus) { return sendMessage('openUrl', [this._baseUrlHttps + '/pair?uniqueid=' + this.clientUid + '&devicename=roth&updateState=1&phrase=pairchallenge', false]).then(function (ret) { $xml = this._parseXML(ret); @@ -495,11 +494,11 @@ NvHTTP.prototype = { }.bind(this)); }.bind(this)); }, - + _buildUidStr: function () { return 'uniqueid=' + this.clientUid + '&uuid=' + guuid(); }, - + _parseXML: function (xmlData) { return $($.parseXML(xmlData.toString())); },