phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into uniques

Browse Source
This commit is contained in:
Jack Miner 2014-05-31 05:56:50 +01:00
commit 017d8a2871
11 changed files with 58 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/artifact.js
View File

@ -35,7 +35,7 @@ window.artifact.requestData = function() {
if (isIdle()) {
artifact.idle = true;
} else {
window.postAjax('getArtifactInfo', {}, artifact.handleSuccess, artifact.handleError);
window.postAjax('artifacts', {}, artifact.handleSuccess, artifact.handleError);
}
}

11
code/boot.js
View File

@ -640,17 +640,6 @@ function boot() {
window.iitcLoaded = true;
window.runHooks('iitcLoaded');
if (!haveDetectedMungeSet()) {
dialog({
title:'IITC unavailable',
html:'<p>IITC failed to detect the appropriate network protocol "munge" parameters from the standard intel site. '
+'This can happen when Niantic make changes to the standard intel site.</p>'
+'<p>The IITC developers are made aware of these problems and will be working on a fix. Please see the following for news/updates.</p>'
+'<ul><li><a href="http://iitc.jonatkins.com/" target="_blank">IITC Home Page</a></li>'
+'<li><a href="https://plus.google.com/105383756361375410867/posts" target="_blank">IITC G+ Page</a></li>'
+'<li><a href="https://plus.google.com/communities/105647403088015055797" target="_blank">IITC G+ Community</a></li></ol>'
});
}
if (typeof android !== 'undefined' && android && android.bootFinished) {
android.bootFinished();

14
code/chat.js
View File

@ -79,7 +79,7 @@ window.chat.genPostData = function(isFaction, storageHash, getOlderMsgs) {
maxLngE6: Math.round(ne.lng*1E6),
minTimestampMs: -1,
maxTimestampMs: -1,
chatTabGet: isFaction ? 'faction' : 'all'
tab: isFaction ? 'faction' : 'all'
}
if(getOlderMsgs) {
@ -125,7 +125,7 @@ window.chat.requestFaction = function(getOlderMsgs, isRetry) {
var d = chat.genPostData(true, chat._faction, getOlderMsgs);
var r = window.postAjax(
'getPaginatedPlexts',
'getPlexts',
d,
function(data, textStatus, jqXHR) { chat.handleFaction(data, getOlderMsgs); },
isRetry
@ -176,7 +176,7 @@ window.chat.requestPublic = function(getOlderMsgs, isRetry) {
var d = chat.genPostData(false, chat._public, getOlderMsgs);
var r = window.postAjax(
'getPaginatedPlexts',
'getPlexts',
d,
function(data, textStatus, jqXHR) { chat.handlePublic(data, getOlderMsgs); },
isRetry
@ -689,10 +689,10 @@ window.chat.postMsg = function() {
var publik = c === 'public';
var latlng = map.getCenter();
var data = {messageSendPlext: msg,
latE6SendPlext: Math.round(latlng.lat*1E6),
lngE6SendPlext: Math.round(latlng.lng*1E6),
chatTabSendPlext: publik ? 'all' : 'faction'};
var data = {message: msg,
latE6: Math.round(latlng.lat*1E6),
lngE6: Math.round(latlng.lng*1E6),
tab: publik ? 'all' : 'faction'};
var errMsg = 'Your message could not be delivered. You can copy&' +
'paste it here and try again if you want:\n\n' + msg;

4
code/map_data_request.js
View File

@ -394,14 +394,14 @@ window.MapDataRequest.prototype.sendTileRequest = function(tiles) {
}
}
var data = { quadKeys: tilesList };
var data = { tileKeys: tilesList };
this.activeRequestCount += 1;
var savedThis = this;
// NOTE: don't add the request with window.request.add, as we don't want the abort handling to apply to map data any more
window.postAjax('getThinnedEntities', data,
window.postAjax('getEntities', data,
function(data, textStatus, jqXHR) { savedThis.handleResponse (data, tiles, true); }, // request successful callback
function() { savedThis.handleResponse (undefined, tiles, false); } // request failed callback
);

279
code/munge.js
View File

@ -1,279 +0,0 @@
// REQUEST PARAMETER MUNGING /////////////////////////////////////////////
//TODO: the double inclusion is planned - but not yet in place
// WARNING: this code is included in IITC twice!
// once within the main body of IITC code, inside the wrapper function
// additionally, outside of the wrapper code - used to detect if the required munging code will work
// before IITC actually starts
// wrap in an anonymous function to limit scope
;(function(){
var requestParameterMunges = [
// all old munge sets deleted - there's no sign that any old ones will become active again
// the current munge set auto-detection code is working very well. as any site update that breaks that detection
// code will also, almost certainly, change the munges in use, it seems pointless keeping this set up to date by hand
// at this time. If that auto-detection breaks, it may be easier to quickly add a munge set by hand than update
// the regular expressions, so the list-based code remains available for the future
// // set 11 - 2013-12-06
// {
// 'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO
// 'dashboard.getGameScore': '4oid643d9zc168hs', // GET_GAME_SCORE
// 'dashboard.getPaginatedPlexts': 's1msyywq51ntudpe', // GET_PAGINATED_PLEXTS
// 'dashboard.getThinnedEntities': '4467ff9bgxxe4csa', // GET_THINNED_ENTITIES
// 'dashboard.getPortalDetails': 'c00thnhf1yp3z6mn', // GET_PORTAL_DETAILS
// 'dashboard.redeemReward': 'ivshfv9zvyfxyqcd', // REDEEM_REWARD
// 'dashboard.sendInviteEmail': '1rsx15vc0m8wwdax', // SEND_INVITE_EMAIL
// 'dashboard.sendPlext': 'tods2imd0xcfsug6', // SEND_PLEXT
//
// // common parameters
// method: '0wvzluo8av4sk17f',
// version: 'paeh4g353xu06kfg',
// version_parameter: '4acc1e3230c3fd66be3422c0df8dc637336bbd7c',
//
// // GET_THINNED_ENTITIES
// quadKeys: 'ilgv0w4dlldky1yh',
//
// // GET_PORTAL_DETAILS
// guid: '7o8tzmj6oxz1n5w3',
//
// // REDEEM_REWARD
// passcode: 'passcode', // no munging on this parameter
//
// // SEND_INVITE_EMAIL
// inviteeEmailAddress: 'p4rwszdfovuwfdgp',
//
// // GET_PAGINATED_PLEXTS
// desiredNumItems: 'kxsbuvc90l6f40xn',
// minLatE6: 'llizye3i5dbapxac',
// minLngE6: 'w01zpiba1mn5tsab',
// maxLatE6: 'd5phhqzj2tbsq599',
// maxLngE6: 'avq5srnvg431aehn',
// minTimestampMs: 'mhsav5by25wi4s46',
// maxTimestampMs: 'hpu7l8h7eccwytyt',
// chatTab: 'q9343nem7hs1v37b',
// ascendingTimestampOrder: '7pc5c9ggh03pig1b',
//
// // SEND_PLEXT
// message: '8exta9k7y8huhqmc',
// latE6: '7ffwyf3zd2yf8xam',
// lngE6: 'n7ewiach2v22iy20',
//// chatTab: 'q9343nem7hs1v37b', // duplicate from GET_PAGINATED_PLEXTS
//
// },
];
// in the recent stock site updates, their javascript code has been less obfuscated, but also the munge parameters
// change on every release. I can only assume it's now an integrated step in the build/release system, rather
// than continued efforts to block iitc. the lighter obfuscation on the code makes it easier to parse and find
// the munges in the code - so let's attempt that
function extractMungeFromStock() {
try {
var foundMunges = {};
// these are easy - directly available in variables
// NOTE: the .toString() is there so missing variables throw an exception, rather than storing 'undefined'
foundMunges['dashboard.getArtifactInfo'] = nemesis.dashboard.requests.MethodName.GET_ARTIFACT_INFO.toString();
foundMunges['dashboard.getGameScore'] = nemesis.dashboard.requests.MethodName.GET_GAME_SCORE.toString();
foundMunges['dashboard.getPaginatedPlexts'] = nemesis.dashboard.requests.MethodName.GET_PAGINATED_PLEXTS.toString();
foundMunges['dashboard.getThinnedEntities'] = nemesis.dashboard.requests.MethodName.GET_THINNED_ENTITIES.toString();
foundMunges['dashboard.getPortalDetails'] = nemesis.dashboard.requests.MethodName.GET_PORTAL_DETAILS.toString();
// foundMunges['dashboard.redeemReward'] = nemesis.dashboard.requests.MethodName.REDEEM_REWARD.toString();
// foundMunges['dashboard.sendInviteEmail'] = nemesis.dashboard.requests.MethodName.SEND_INVITE_EMAIL.toString();
foundMunges['dashboard.sendPlext'] = nemesis.dashboard.requests.MethodName.SEND_PLEXT.toString();
// the rest are trickier - we need to parse the functions of the stock site. these break very often
// on site updates
// // regular expression - to match either x.abcdef123456wxyz or x["123456abcdefwxyz"] format for property access
// var mungeRegExpProp = '(?:\\.([a-z][a-z0-9]{15})|\\["([0-9][a-z0-9]{15})"\\])';
// // and one to match members of object literal initialisation - {abcdef123456wxyz: or {"123456abcdefwxyz":
// var mungeRegExpLit = '(?:([a-z][a-z0-9]{15})|"([0-9][a-z0-9]{15})"):';
// some cases don't munge now?!?! odd!
var mungeRegExpProp = '(?:\\.([a-z][a-z0-9]{15}|[a-z][a-zA-Z0-9]*)|\\["([0-9][a-z0-9]{15})"\\])';
var mungeRegExpLit = '(?:((?:[a-z][a-z0-9]{15})|[a-z][a-zA-Z0-9]*)|"([0-9][a-z0-9]{15})"):';
// common parameters - method, version, version_parameter - currently found in the
// nemesis.dashboard.network.XhrController.prototype.doSendRequest_ function
// look for something like
// var e = a.getData();
// e["3sld77nsm0tjmkvi"] = c;
// e.xz7q6r3aja5ttvoo = "b121024077de2a0dc6b34119e4440785c9ea5e64";
var reg = new RegExp('getData\\(\\);.*\\n.*'+mungeRegExpProp+' =.*\n.*'+mungeRegExpProp+' *= *"([a-z0-9]{40})','m');
var result = reg.exec(nemesis.dashboard.network.XhrController.prototype.doSendRequest_.toString());
// there's two ways of matching the munge expression, so try both
foundMunges.method = result[1] || result[2];
foundMunges.version = result[3] || result[4];
foundMunges.version_parameter = result[5];
// GET_THINNED_ENTITIES parameters
var reg = new RegExp('GET_THINNED_ENTITIES, nemesis.dashboard.network.XhrController.Priority.[A-Z]+, {'
+mungeRegExpLit+'[a-z]');
var result = reg.exec(nemesis.dashboard.network.DataFetcher.prototype.getGameEntities.toString());
foundMunges.quadKeys = result[1] || result[2];
// GET_PAGINATED_PLEXTS
var reg = new RegExp('[a-z] = {'+mungeRegExpLit+'Math.round\\(1E6 \\* [a-z].bounds.sw.lat\\(\\)\\), '
+mungeRegExpLit+'Math.round\\(1E6 \\* [a-z].bounds.sw.lng\\(\\)\\), '
+mungeRegExpLit+'Math.round\\(1E6 \\* [a-z].bounds.ne.lat\\(\\)\\), '
+mungeRegExpLit+'Math.round\\(1E6 \\* [a-z].bounds.ne.lng\\(\\)\\), '
+mungeRegExpLit+'[a-z], '+mungeRegExpLit+'[a-z]};\n'
+' *[a-z]'+mungeRegExpProp+' = [a-z];\n'
+' *-1 < [a-z] && \\([a-z]'+mungeRegExpProp+' = !0\\);', 'm');
var result = reg.exec(nemesis.dashboard.network.PlextStore.prototype.getPlexts.toString());
// foundMunges.desiredNumItems = result[1] || result[2];
foundMunges.minLatE6 = result[1] || result[2];
foundMunges.minLngE6 = result[3] || result[4];
foundMunges.maxLatE6 = result[5] || result[6];
foundMunges.maxLngE6 = result[7] || result[8];
foundMunges.minTimestampMs = result[9] || result[10];
foundMunges.maxTimestampMs = result[11] || result[12];
foundMunges.chatTabGet = result[13] || result[14]; //guessed parameter name - only seen munged
foundMunges.ascendingTimestampOrder = result[15] || result[16];
// SEND_PLEXT
var reg = new RegExp('SEND_PLEXT, nemesis.dashboard.network.XhrController.Priority.[A-Z]+, {'
+mungeRegExpLit+'[a-z], '
+mungeRegExpLit+'[a-z], '
+mungeRegExpLit+'[a-z], '
+mungeRegExpLit+'[a-z]}');
var result = reg.exec(nemesis.dashboard.network.PlextStore.prototype.sendPlext.toString());
foundMunges.messageSendPlext = result[1] || result[2];
foundMunges.latE6SendPlext = result[3] || result[4];
foundMunges.lngE6SendPlext = result[5] || result[6];
foundMunges.chatTabSendPlext = result[7] || result[8];
// if (chatTab != foundMunges.chatTab) throw 'Error: inconsistent munge parsing for chatTab';
// GET_PORTAL_DETAILS
var reg = new RegExp('GET_PORTAL_DETAILS, nemesis.dashboard.network.XhrController.Priority.[A-Z]+, {'
+mungeRegExpLit+'a}');
var result = reg.exec(nemesis.dashboard.network.DataFetcher.prototype.getPortalDetails.toString());
foundMunges.guid = result[1] || result[2];
// // SEND_INVITE_EMAIL
// var reg = new RegExp('SEND_INVITE_EMAIL, nemesis.dashboard.network.XhrController.Priority.[A-Z]+, {'+mungeRegExpLit+'b}');
// foundMunges.inviteeEmailAddress = result[1] || result[2];
return foundMunges;
} catch(e) {
console.warn('Failed to extract munges from the code: '+e);
}
}
var activeMunge = null;
// attempt to guess the munge set in use, by looking through the functions of the stock intel page for one of the munged params
window.detectActiveMungeSet = function() {
// first, try and parse the stock functions and extract the munges directly
activeMunge = extractMungeFromStock();
if (activeMunge) {
console.log('IITC: Successfully extracted munges from stock javascript - excellent work!');
} else {
console.warn('IITC: failed to detect a munge set from the code - searching our list...');
// try to find a matching munge set from the pre-defined ones. this code remains as in the case of
// things breaking it can be quicker to update the table than to fix the regular expressions used
// above
try {
for (var i in requestParameterMunges) {
if (requestParameterMunges[i]['dashboard.getThinnedEntities'] == nemesis.dashboard.requests.MethodName.GET_THINNED_ENTITIES) {
console.log('IITC: found a match with munge set index '+i);
activeMunge = requestParameterMunges[i];
break;
}
}
} catch(e) {
console.warn('IITC: failed to find matching munge set from supplied list');
}
}
if (!activeMunge) {
console.warn('IITC: Error!! failed to find a parameter munge set - neither extracting from stock, or searching through table. IITC CANNOT WORK');
throw {error:'Failed to find a munge set'};
}
}
window.haveDetectedMungeSet = function() {
try {
if (!activeMunge) detectActiveMungeSet();
} catch(e) {
}
return activeMunge != null;
}
window.mungeOneString = function(str) {
if (!activeMunge) detectActiveMungeSet();
return activeMunge[str];
}
// niantic now add some munging to the request parameters. so far, only two sets of this munging have been seen
window.requestDataMunge = function(data) {
if (!activeMunge) detectActiveMungeSet();
function munge(obj) {
if (Object.prototype.toString.call(obj) === '[object Array]') {
// an array - munge each element of it
var newobj = [];
for (var i in obj) {
newobj[i] = munge(obj[i]);
}
return newobj;
} else if (typeof obj === 'object') {
// an object: munge each property name, and pass the value through the munge process
var newobj = Object();
for (var p in obj) {
var m = activeMunge[p];
if (m === undefined) {
console.error('Error: failed to find munge for object property '+p);
newobj[p] = obj[p];
} else {
// rename the property
newobj[m] = munge(obj[p]);
}
}
return newobj;
} else {
// neither an array or an object - so must be a simple value. return it unmodified
return obj;
}
};
var newdata = munge(data);
try {
newdata = nemesis.dashboard.requests.normalizeParamCount(newdata);
} catch(e) {
if (!window._mungeHaveLoggedError) {
console.warn('Failed to call the stock site normalizeParamCount() function: '+e);
window._mungeHaveLoggedError = true;
}
}
return newdata;
}
//anonymous function end
}());

12
code/utils_misc.js
View File

@ -140,19 +140,13 @@ window.digits = function(d) {
// error: see above. Additionally it is logged if the request failed.
window.postAjax = function(action, data, success, error) {
var methodName = 'dashboard.'+action;
var versionStr = 'version_parameter';
var versionStr = nemesis.dashboard.config.CURRENT_VERSION;
var post_data = JSON.stringify($.extend({}, data, {v: versionStr}));
// munging of the method name - seen in Set 2 onwards
methodName = mungeOneString(methodName);
// and of the 'version' parameter (we assume it's a version - if missing/wrong that's what the error refers to)
versionStr = mungeOneString(versionStr);
var post_data = JSON.stringify(window.requestDataMunge($.extend({}, data, {method: methodName, version: versionStr})));
var remove = function(data, textStatus, jqXHR) { window.requests.remove(jqXHR); };
var errCnt = function(jqXHR) { window.failedRequestCount++; window.requests.remove(jqXHR); };
var result = $.ajax({
url: '/r/'+methodName,
url: '/r/'+action,
type: 'POST',
data: post_data,
context: data,

2
main.js
View File

@ -1,7 +1,7 @@
// ==UserScript==
// @id ingress-intel-total-conversion@jonatkins
// @name IITC: Ingress intel map total conversion
// @version 0.16.13.@@DATETIMEVERSION@@
// @version 0.17.2.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@

4
mobile/AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cradle.iitc_mobile"
android:installLocation="auto"
android:versionCode="74"
android:versionName="0.11.1">
android:versionCode="75"
android:versionName="0.11.2">
<uses-sdk
android:minSdkVersion="14"

8
plugins/guess-player-levels.user.js
View File

@ -2,7 +2,7 @@
// @id iitc-plugin-guess-player-levels@breunigs
// @name IITC plugin: guess player level
// @category Info
// @version 0.5.4.@@DATETIMEVERSION@@
// @version 0.5.5.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@ -121,9 +121,9 @@ window.plugin.guessPlayerLevels.setupChatNickHelper = function() {
}
window.plugin.guessPlayerLevels.extractPortalData = function(data) {
if(!data.success || !data.details.portalV2) return;
if(!data.success) return;
var r = data.details.resonatorArray.resonators;
var r = data.details.resonators;
/* Due to the Jarvis Virus/ADA Refactor it's possible for a player to own resonators on a portal at a higher level
than the player themselves. It is not possible to detect for sure when this has happened, but in many cases it will
@ -419,7 +419,7 @@ window.plugin.guessPlayerLevels.guess = function() {
$.each(window.portals, function(guid,p) {
var details = portalDetail.get(guid);
if(details) {
var r = details.resonatorArray.resonators;
var r = details.resonators;
$.each(r, function(ind, reso) {
if(!reso) return true;
var nick = reso.owner;

19
website/page/home.php
View File

@ -13,6 +13,25 @@ offers many more features. It is available for
<h3>Latest news</h3>
<h4>31st May 2014</h4>
<p>
IITC 0.17.1 and IITC Mobile 0.11.1 have just been released.
</p>
<p>
Another critical update, due to more changes by Niantic. Hopefully the last one for a while - all recent breaking changes
were caused by Niantic removing the obsfucation of data requests one bit at a time - the final piece has been removed now.
</p>
<p>
<b>Lost bookmarks? Drawn items?</b> In the latest Niantic site update they changed the server to always go to the
<code>http<b>s</b></code> version. It is possible to copy your data to the new location - further details
<a href="https://plus.google.com/105383756361375410867/posts/749UX2nQcaP">here</a>.
</p>
<p>
Additionally, a few bugs were fixed since the previous release, and now most map layers support zooming in closer than before.
<b>Note</b>: There can be issues on Chrome when zooming beyond zoom level 18 (the previous default maximum for several maps).
Just zoom out again if the zoom/layer controls, or the COMM panel, disappear.
</p>
<h4>24th May 2014</h4>
<p>
And another IITC update, IITC 0.16.12 and IITC Mobile 0.11.0 have just been released, to fix things after the most recent

19
website/page/news.php
View File

@ -1,5 +1,24 @@
<h2>News</h2>
<h4>31st May 2014</h4>
<p>
IITC 0.17.1 and IITC Mobile 0.11.1 have just been released.
</p>
<p>
Another critical update, due to more changes by Niantic. Hopefully the last one for a while - all recent breaking changes
were caused by Niantic removing the obsfucation of data requests one bit at a time - the final piece has been removed now.
</p>
<p>
<b>Lost bookmarks? Drawn items?</b> In the latest Niantic site update they changed the server to always go to the
<code>http<b>s</b></code> version. It is possible to copy your data to the new location - further details
<a href="https://plus.google.com/105383756361375410867/posts/749UX2nQcaP">here</a>.
</p>
<p>
Additionally, a few bugs were fixed since the previous release, and now most map layers support zooming in closer than before.
<b>Note</b>: There can be issues on Chrome when zooming beyond zoom level 18 (the previous default maximum for several maps).
Just zoom out again if the zoom/layer controls, or the COMM panel, disappear.
</p>
<h4>24th May 2014</h4>
<p>
And another IITC update, IITC 0.16.12 and IITC Mobile 0.11.0 have just been released, to fix things after the most recent