+
### MailHops Route Map
@@ -21,7 +21,7 @@ MailHops is an email route API. It does a few things:
### MailHops Options
-
+
### MailHops Dashboard
diff --git a/build.sh b/build.sh
index 840695a..4d4f73b 100755
--- a/build.sh
+++ b/build.sh
@@ -4,4 +4,4 @@ filename='mailhops'
rm -f $filename.zip
-zip -r $filename.zip ./ -x ./images/* -i *.js *.xul *.png *.gif *.css *.json *.dtd _locales/*/messages.json *.manifest
+zip -r $filename.zip ./ -i *.js *.xhtml *.html *.png *.svg *.gif *.css *.json _locales/*/messages.json
diff --git a/chrome.manifest b/chrome.manifest
deleted file mode 100644
index 918e31a..0000000
--- a/chrome.manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-content mailhops chrome/content/
-
-skin mailhops classic/1.0 chrome/skin/classic/
-
-locale mailhops de chrome/locale/de/
-locale mailhops en chrome/locale/en/
-locale mailhops es chrome/locale/es/
-locale mailhops fr chrome/locale/fr/
-locale mailhops ja chrome/locale/ja/
-locale mailhops pl chrome/locale/pl/
-locale mailhops pt-BR chrome/locale/pt-BR/
-locale mailhops ru chrome/locale/ru/
-locale mailhops zh-CN chrome/locale/zh-CN/
-
-overlay chrome://messenger/content/messenger.xul chrome://mailhops/content/msgNotificationBar.xul
-overlay chrome://messenger/content/messenger.xul chrome://mailhops/content/msgListColumn.xul
\ No newline at end of file
diff --git a/chrome/content/mailhops-2-msgNotificationBar.js b/chrome/content/mailhops-2-msgNotificationBar.js
deleted file mode 100644
index 0e34d8f..0000000
--- a/chrome/content/mailhops-2-msgNotificationBar.js
+++ /dev/null
@@ -1,444 +0,0 @@
-var mailHopsDisplay =
-{
- resultBox: null,
- resultText: null,
- resultDetails: null,
- mailhopsDataPaneHops: null,
- mailhopsDataPaneSPF: null,
- mailhopsDataPaneDKIM: null,
- mailhopsDataPaneMailer: null,
- mailhopsDataPaneDNSBL: null,
- mailhopsResultWeather: null,
- mailhopsUnsubscribe: null,
- mailHopsAccountMessage: null,
- mhBox: null,
- options: null,
-
- init: function(options, reload){
-
- this.options = options;
- this.mhBox = document.getElementById("mailhopsNoficationBox");
- this.mhNoteBox = document.getElementById("mailhopsNotification");
- this.resultBox = document.getElementById("mailhopsResult");
- this.resultText = document.getElementById("mailhopsResultText");
- this.mailhopsResultWeather = document.getElementById("mailhopsResultWeather");
- this.mailhopsUnsubscribe = document.getElementById("mailhopsUnsubscribe");
- this.resultDetails = document.getElementById("mailhopsDataPaneDetails");
- this.mailHopsAccountMessage = document.getElementById("mailHopsAccountMessage");
- this.mailhopsDataPaneHops = document.getElementById("mailhopsDataPaneHops");
-
- //auth
- this.mailhopsDataPaneSPF = document.getElementById("mailhopsDataPaneSPF");
- this.mailhopsDataPaneDKIM = document.getElementById("mailhopsDataPaneDKIM");
- this.mailhopsDataPaneMailer = document.getElementById("mailhopsDataPaneMailer");
- this.mailhopsDataPaneDNSBL = document.getElementById("mailhopsDataPaneDNSBL");
-
- //wait for message to be selected before showing
- if (!reload && this.mhBox)
- this.mhBox.style.display = 'none';
-
- //event listner for route click to launch map
- this.mailhopsDataPaneDNSBL.addEventListener("click", function () {
- if(this.hasAttribute('data-ip'))
- mailHopsUtils.launchSpamHausURL( this.getAttribute('data-ip') );
- });
-
- this.resultText.addEventListener("click", function () {
- if(this.value.indexOf('Rate Limit')!==-1)
- window.openDialog("chrome://mailhops/content/preferences.xul","","chrome, dialog, modal, centerscreen").focus();
- else if(this.hasAttribute('data-route'))
- mailHopsUtils.launchMap( String(this.getAttribute('data-route')), options );
- });
-
- this.mailhopsResultWeather.addEventListener("click", function () {
- mailHopsUtils.launchExternalURL(this.getAttribute('href'));
- });
-
- this.mailHopsAccountMessage.addEventListener("click", function () {
- mailHopsUtils.launchExternalURL(this.getAttribute('href'));
- this.style.display = 'none';
- });
-
- this.mailhopsDataPaneHops.addEventListener("click", function () {
- this.parentElement.classList.toggle('active');
- if(mailHopsDisplay.resultDetails.style.display !== 'block')
- mailHopsDisplay.resultDetails.style.display = 'block';
- else
- mailHopsDisplay.resultDetails.style.display = 'none';
- });
-
- this.mailhopsUnsubscribe.addEventListener("click", function () {
- if(this.getAttribute('href'))
- mailHopsUtils.launchExternalURL(this.getAttribute('href'));
- });
-
- if(!!options.bar_color)
- this.mhNoteBox.style.background = options.bar_color;
- else
- this.mhNoteBox.style.background = '';
-
- if(!!options.font_size)
- this.mhNoteBox.style.fontSize = options.font_size;
-
- if(!!options.font_color){
- this.resultText.style.color = options.font_color;
- this.mailhopsResultWeather.style.color = options.font_color;
- this.mailhopsUnsubscribe.style.color = options.font_color;
- this.mailhopsDataPaneSPF.style.color = options.font_color;
- this.mailhopsDataPaneDKIM.style.color = options.font_color;
- this.mailhopsDataPaneMailer.style.color = options.font_color;
- this.mailhopsDataPaneDNSBL.style.color = options.font_color;
- }
- },
-
- lists: function( header_unsubscribe ){
-
- this.mailhopsUnsubscribe.style.display='none';
-
- if(header_unsubscribe){
- this.mailhopsUnsubscribe.style.display='';
- var listArr=header_unsubscribe.split(',');
- var href='';
- if(listArr.length){
- for(var h=0;h'+ description + asn + '
\
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/content/preferences.html b/content/preferences.html
new file mode 100644
index 0000000..c7bab5b
--- /dev/null
+++ b/content/preferences.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ MailHops Plan Info
+ +
+
+
+
+
+
+
+
'; + + if (msg.message.secure.indexOf(route[i].ip) !== -1) { + description += '
';
+ }
+
+ if (route[i].host)
+ description += route[i].host;
+ if (route[i].whois && route[i].whois.descr)
+ description += route[i].whois.descr;
+ if (route[i].whois && route[i].whois.netname)
+ description += route[i].whois.netname;
+
+ var weather = '';
+ if (route[i].weather) {
+ weather = ' ASN Org: ' + route[i].asn.autonomous_system_organization; + asn += ' (' + route[i].asn.autonomous_system_number + ')' + } + + var auth = ''; + if (msg.message.auth.length) { + for (var a = 0; a < msg.message.auth.length; a++){ + auth += ''; + } + } + // append child + items.push('
\
+
');
+ }
+ // header
+ document.getElementById('hop-message-header').innerHTML = `${route.length} Hops`;
+ if (sender && client) {
+ document.getElementById('hop-message-header').innerHTML += ' over '+MailHopsUtils.getDistance(sender, client, unit) + ' ' + unit;
+ }
+ // hop list
+ document.getElementById('hop-list').innerHTML = items.join('') + distance;
+
+}
+
+function doOpenURL(url) {
+ if (url) {
+ browser.tabs.create({ url: url });
+ }
+}
diff --git a/js/preferences.js b/js/preferences.js
new file mode 100644
index 0000000..d8d48f2
--- /dev/null
+++ b/js/preferences.js
@@ -0,0 +1,98 @@
+var mailHopPreferences = {
+ api_key: '', //api key
+ valid_api_key: false,
+ owm_key: '', //OpenWeatherMap.org api key
+
+ loadPreferences: function(){
+ var self = this;
+ this.api_key = document.getElementById("mailhop.api_key");
+ this.owm_key = document.getElementById("mailhop.owm_key");
+
+ document.getElementById("save").addEventListener("click", function () {
+ self.saveAPIKey();
+ });
+
+ var getting = browser.storage.local.get();
+ getting.then(data => {
+ if (data.api_key) {
+ self.api_key.value = data.api_key;
+ document.getElementById("join-link").innerHTML = 'My Account';
+ document.getElementById("join-link").setAttribute('href','https://mailhops.com/account/'+data.api_key);
+ }
+ if (data.owm_key) {
+ self.owm_key.value = data.owm_key;
+ }
+ }, error => {
+ self.planError(JSON.stringify(error));
+ });
+ },
+
+ savePreferences: function () {
+ var self = this;
+ browser.storage.local.set({
+ api_key: self.api_key.value.trim(),
+ owm_key: self.owm_key.value.trim()
+ });
+ return true;
+ },
+
+ planError: function(error){
+ this.valid_api_key=false;
+ document.getElementById("plan-error").style.display = 'block';
+ document.getElementById("plan-error").innerHTML = error;
+ document.getElementById("plan").innerHTML = '';
+ document.getElementById("status").innerHTML = '';
+ document.getElementById("rate-limit").innerHTML = '';
+ document.getElementById("rate-remaining").innerHTML = '';
+ document.getElementById("rate-reset").innerHTML = '';
+ },
+ saveAPIKey: function() {
+ if(Boolean(this.api_key) && this.api_key.value != ''){
+ var xmlhttp = new XMLHttpRequest();
+ var apiBase = 'https://api.mailhops.com',
+ accountURL = '/v2/accounts/?api_key='+this.api_key.value.trim(),
+ api_key = this.api_key.value.trim(),
+ self = this;
+
+ xmlhttp.open("GET", apiBase+accountURL, true);
+ xmlhttp.onreadystatechange=function() {
+ if (xmlhttp.readyState===4) {
+ try {
+ var data = JSON.parse(xmlhttp.responseText);
+ if(xmlhttp.status===200){
+ self.valid_api_key=true;
+ document.getElementById("plan-error").style.display = 'none';
+ // set plan info
+ document.getElementById("plan").innerHTML = "Plan: "+data.account.subscriptions.data[0].plan.name;
+ document.getElementById("status").innerHTML = "Status: "+data.account.subscriptions.data[0].status;
+ document.getElementById("rate-limit").innerHTML = "Limit: "+data.account.rate.limit;
+ document.getElementById("rate-remaining").innerHTML = "Remaining: "+data.account.rate.remaining;
+ if(data.account.rate.reset/60 < 60)
+ document.getElementById("rate-reset").innerHTML = "Resets in: "+Math.round(data.account.rate.reset/60)+" min.";
+ else
+ document.getElementById("rate-reset").innerHTML = "Resets in: " + Math.round(data.account.rate.reset / 60 / 60) + " hr.";
+
+ document.getElementById("join-link").innerHTML = 'My Account';
+ document.getElementById("join-link").setAttribute('href','https://mailhops.com/account/'+api_key);
+
+ } else if (xmlhttp.status === 401) {
+ self.planError("That API key could not be found.");
+ }
+ else if (!!data.error) {
+ self.planError(xmlhttp.status+': '+data.error.message);
+ }
+ mailHopPreferences.savePreferences();
+ } catch (e){
+ self.planError('Connection Failed to\n '+e+'!');
+ }
+ }
+ };
+ xmlhttp.send(null);
+ } else {
+ this.planError('Enter a valid API key above.');
+ }
+ }
+
+ };
+
+mailHopPreferences.loadPreferences();
\ No newline at end of file
diff --git a/chrome/content/mailhops-1-utils.js b/js/utils.js
similarity index 82%
rename from chrome/content/mailhops-1-utils.js
rename to js/utils.js
index a2302c5..7638420 100644
--- a/chrome/content/mailhops-1-utils.js
+++ b/js/utils.js
@@ -1,4 +1,4 @@
-var mailHopsUtils = {
+const MailHopsUtils = {
countries: ["ad","ae","af","ag","ai","al","am","an","ao","ar","as","at","au","aw","ax","az","ba","bb","bd","be","bf","bg","bh","bi","bj","bm","bn","bo","br","bs","bt","bv","bw","by","bz","ca","catalonia","cc","cd","cf","cg","ch","ci","ck","cl","cm","cn","co","cr","cs","cu","cv","cx","cy","cz","de","dj","dk","dm","do","dz","ec","ee","eg","eh","england","er","es","et","europeanunion","fam","fi","fj","fk","fm","fo","fr","ga","gb","gd","ge","gf","gh","gi","gl","gm","gn","gp","gq","gr","gs","gt","gu","gw","gy","hk","hm","hn","hr","ht","hu","id","ie","il","in","io","iq","ir","is","it","jm","jo","jp","ke","kg","kh","ki","km","kn","kp","kr","kw","ky","kz","la","lb","lc","li","lk","lr","ls","lt","lu","lv","ly","ma","mc","md","me","mg","mh","mk","ml","mm","mn","mo","mp","mq","mr","ms","mt","mu","mv","mw","mx","my","mz","na","nc","ne","nf","ng","ni","nl","no","np","nr","nu","nz","om","pa","pe","pf","pg","ph","pk","pl","pm","pn","pr","ps","pt","pw","py","qa","re","ro","rs","ru","rw","sa","sb","sc","scotland","sd","se","sg","sh","si","sj","sk","sl","sm","sn","so","sr","st","sv","sy","sz","tc","td","tf","tg","th","tj","tk","tl","tm","tn","to","tr","tt","tv","tw","tz","ua","ug","um","us","uy","uz","va","vc","ve","vg","vi","vn","vu","wales","wf","ws","ye","yt","za","zm","zw"],
@@ -110,36 +110,12 @@ addCommas: function(nStr){
return x1 + x2;
},
-launchExternalURL: function(url){
- var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance().QueryInterface(Components.interfaces.nsIMessenger);
- messenger.launchExternalURL(url);
-},
-
-launchWhoIs: function(ip){
- this.launchExternalURL('https://www.mailhops.com/whois/' + ip);
-},
-
launchSpamHausURL: function(ip){
this.launchExternalURL('http://www.spamhaus.org/query/bl?ip=' + ip);
},
-launchMap: function(route,options){
-
- if(route != ''){
- var lookupURL=this.getAPIUrl(options)+'/map/?'+this.getAPIUrlParams(options)+'&l='+options.lan+'&u='+options.unit+'&r='+String(route);
-
- if(options.fkey != '')
- lookupURL += '&fkey='+options.fkey;
-
- if(options.map_provider)
- lookupURL += '&mp='+options.map_provider;
-
- window.openDialog("chrome://mailhops/content/mailhopsMap.xul","MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=1024,height=768,resizable=yes', {src: lookupURL});
- }
-},
-
-getAPIUrl: function(options){
- return options.api_http+options.api_host+'/v2';
+getAPIUrl: function(){
+ return 'https://api.mailhops.com/v2';
},
getAPIUrlParams: function(options){
@@ -178,14 +154,14 @@ getWeatherIcon: function(icon){
},
getDistance: function(from, to, unit) {
- if(!from || !to || !from['lat'] || !to['lat'])
+ if(!from || !to || !from.coords)
return 0;
- var lat = parseFloat(from['lat']);
- var lon1 = parseFloat(from['lng']);
- var lat2 = parseFloat(to['lat']);
- var lon2 = parseFloat(to['lng']);
- unit = unit || 'mi';//mi or km
+ var lat = parseFloat(from.coords[1]);
+ var lon1 = parseFloat(from.coords[0]);
+ var lat2 = parseFloat(to.coords[1]);
+ var lon2 = parseFloat(to.coords[0]);
+ unit = unit || 'mi'; //mi or km
lat *= (Math.PI/180);
lon1 *= (Math.PI/180);
@@ -197,17 +173,24 @@ getDistance: function(from, to, unit) {
if (unit == 'mi') {
dist = (dist / 1.609344);
}
- return dist;
+ return this.addCommas(Math.round(dist));
},
-
- getOriginatingCountryCode: function(route) {
+ getSender: function(route) {
if(route && route.length){
- for(var r=0; r\
+ 
' + header + weather +' \
+
\
+