Migrations
/
wappalyzer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use promises for options in WebExtension driver

Browse Source
main
Elbert Alias 8 years ago
parent b8372c6926
commit d4a4bfd3ee
9 changed files with 145 additions and 95 deletions
Show Stats Download Patch File Download Diff File

5
src/drivers/bookmarklet/driver.js
Unescape View File

@ -1,7 +1,10 @@
/**
* Bookmarklet driver
* WebExtension driver
*/
/** global: wappalyzer */
/** global: XMLHttpRequest */
(function() {
if ( typeof wappalyzer === 'undefined' ) {
return;

15
src/drivers/phantomjs/driver.js
Unescape View File

@ -1,3 +1,10 @@
/**
* PhantomJS driver
*/
/** global: phantom */
/** global: wappalyzer */
(function() {
var
url,
@ -16,7 +23,9 @@
require('fs').changeWorkingDirectory(scriptDir);
require('system').args.forEach(function(arg, i) {
var arr = /^(--[^=]+)=(.+)$/.exec(arg);
var
value,
arr = /^(--[^=]+)=(.+)$/.exec(arg);
if ( arr && arr.length === 3 ) {
arg = arr[1];
@ -35,7 +44,9 @@
break;
case '--resource-timeout':
if ( value ) {
resourceTimeout = value;
}
break;
default:
@ -112,7 +123,7 @@
init: function() {
var
page, hostname,
headers = {};
headers = {},
a = document.createElement('a'),
json = JSON.parse(require('fs').read('apps.json'));

2
src/drivers/webextension/css/options.css
Unescape View File

@ -83,7 +83,7 @@ a:active {
#about {
border-top: 1px solid #dbdbdb;
margin-top: 2.5rem;
margin-top: 1.5rem;
padding: 1.5rem 0 0 0;
}

2
src/drivers/webextension/js/content.js
Unescape View File

@ -1,3 +1,5 @@
/** global: browser */
(function() {
var c = {
init: function() {

6
src/drivers/webextension/js/defaults.js
Unescape View File

@ -1,6 +0,0 @@
var defaults = {
autoAnalyzeHeaders: 0,
upgradeMessage: 1,
dynamicIcon: 1,
tracking: 1
};

75
src/drivers/webextension/js/driver.js
Unescape View File

@ -24,6 +24,26 @@
console.log('[wappalyzer ' + args.type + '] ' + args.message);
},
/**
* Get a value from localStorage
*/
getOption: function(name, defaultValue, callback) {
browser.storage.local.get(name).then(function(item) {
callback(item.hasOwnProperty(name) ? item[name] : defaultValue);
});
},
/**
* Set a value in localStorage
*/
setOption: function(name, value) {
var option = {};
option[name] = value;
browser.storage.local.set(option);
},
/**
* Initialize
*/
@ -54,19 +74,27 @@
try {
var version = browser.runtime.getManifest().version;
if ( localStorage['version'] == null ) {
firstRun = true;
// Set defaults
for ( var option in defaults ) {
localStorage[option] = defaults[option];
w.driver.getOption('version', null, function(previousVersion) {
if ( previousVersion === null ) {
w.driver.goToURL({
url: w.config.websiteURL + 'installed'
});
} else if ( version !== previousVersion ) {
w.driver.getOption('upgradeMessage', true, function(upgradeMessage) {
if ( upgradeMessage ) {
w.driver.goToURL({
url: w.config.websiteURL + 'upgraded',
background: true
});
}
} else if ( version !== localStorage['version'] && parseInt(localStorage['upgradeMessage'], 10) ) {
upgraded = true;
});
}
localStorage['version'] = version;
} catch(e) { }
w.driver.setOption('version', version);
});
} catch(e) {
// Do nothing
}
if ( typeof chrome === 'undefined' ) {
browser.runtime.onMessage.addListener(w.driver.onMessage);
@ -183,10 +211,14 @@
},
/**
* Open a tab
*/
goToURL: function(args) {
var url = args.url + ( typeof args.medium === 'undefined' ? '' : '?pk_campaign=chrome&pk_kwd=' + args.medium);
browser.tabs.create({ url: url, active: args.background === undefined || !args.background });
browser.tabs.create({
url: args.url,
active: args.background === undefined || !args.background
});
},
/**
@ -208,24 +240,28 @@
tabCache[tab.id].appsDetected = w.detected[url];
if ( count > 0 ) {
// Find the main application to display
w.driver.getOption('dynamicIcon', true, function(dynamicIcon) {
var appName, found = false;
// Find the main application to display
w.driver.categoryOrder.forEach(function(match) {
for ( appName in w.detected[url] ) {
w.apps[appName].cats.forEach(function(cat) {
var icon = w.apps[appName].icon || 'default.svg';
if ( !parseInt(localStorage['dynamicIcon'], 10) ) {
if ( !dynamicIcon ) {
icon = 'default.svg';
}
if ( cat == match && !found ) {
if ( cat === match && !found ) {
if ( /\.svg$/i.test(icon) ) {
icon = 'converted/' + icon + '.png';
}
browser.pageAction.setIcon({ tabId: tab.id, path: 'images/icons/' + icon });
browser.pageAction.setIcon({
tabId: tab.id,
path: 'images/icons/' + icon
});
found = true;
}
@ -239,6 +275,7 @@
} else {
browser.pageAction.show(tab.id);
}
});
};
},
@ -246,7 +283,8 @@
* Anonymously track detected applications for research purposes
*/
ping: function() {
if ( Object.keys(w.ping.hostnames).length && parseInt(localStorage['tracking'], 10) ) {
w.driver.getOption('tracking', true, function(tracking) {
if ( Object.keys(w.ping.hostnames).length && tracking ) {
w.driver.post('http://ping.wappalyzer.com/v2/', w.ping);
w.log('w.driver.ping: ' + JSON.stringify(w.ping));
@ -257,6 +295,7 @@
w.adCache = [];
}
});
},
/**

74
src/drivers/webextension/js/options.js
Unescape View File

@ -1,57 +1,61 @@
/** global: localStorage */
document.addEventListener('DOMContentLoaded', function() {
var d = document;
var options = {
opts: defaults,
init: function() {
options.load();
d.getElementById('github' ).addEventListener('click', function() { window.open(wappalyzer.config.githubURL); });
d.getElementById('twitter' ).addEventListener('click', function() { window.open(wappalyzer.config.twitterURL); });
d.getElementById('wappalyzer').addEventListener('click', function() { window.open(wappalyzer.config.websiteURL + '?pk_campaign=chrome&pk_kwd=options'); });
d.querySelector('#github' ).addEventListener('click', function() { open(wappalyzer.config.githubURL); });
d.querySelector('#twitter' ).addEventListener('click', function() { open(wappalyzer.config.twitterURL); });
d.querySelector('#wappalyzer').addEventListener('click', function() { open(wappalyzer.config.websiteURL); });
},
d.getElementById('options-save').addEventListener('click', options.save);
get: function(name, defaultValue, callback) {
browser.storage.local.get(name).then(function(item) {
callback(item.hasOwnProperty(name) ? item[name] : defaultValue);
});
},
load: function() {
var option, value;
set: function(name, value) {
var option = {};
for ( option in options.opts ) {
if ( value = localStorage[option] ) {
options.opts[option] = value;
}
}
option[name] = value;
if ( parseInt(options.opts.upgradeMessage) ) {
d.getElementById('option-upgrade-message').setAttribute('checked', 'checked');
}
browser.storage.local.set(option);
},
if ( parseInt(options.opts.dynamicIcon) ) {
d.getElementById('option-dynamic-icon').setAttribute('checked', 'checked');
}
load: function() {
options.get('upgradeMessage', true, function(value) {
var el = d.querySelector('#option-upgrade-message');
if ( parseInt(options.opts.tracking) ) {
d.getElementById('option-tracking').setAttribute('checked', 'checked');
}
},
el.checked = value;
save: function() {
var option;
el.addEventListener('change', function() {
options.set('upgradeMessage', el.checked);
});
});
options.opts.upgradeMessage = d.getElementById('option-upgrade-message').checked ? 1 : 0;
options.opts.dynamicIcon = d.getElementById('option-dynamic-icon' ).checked ? 1 : 0;
options.opts.tracking = d.getElementById('option-tracking' ).checked ? 1 : 0;
options.get('dynamicIcon', true, function(value) {
var el = d.querySelector('#option-dynamic-icon');
for ( option in options.opts ) {
localStorage[option] = options.opts[option];
}
el.checked = value;
el.addEventListener('change', function() {
options.set('dynamicIcon', el.checked);
});
});
options.get('tracking', true, function(value) {
var el = d.querySelector('#option-tracking');
d.getElementById('options-saved').style.display = 'inline';
el.checked = value;
setTimeout(function(){
d.getElementById('options-saved').style.display = 'none';
}, 2000);
el.addEventListener('change', function() {
options.set('tracking', el.checked);
});
});
}
};

1
src/drivers/webextension/manifest.json
Unescape View File

@ -63,6 +63,7 @@
"open_in_tab": false
},
"permissions": [
"storage",
"tabs",
"webRequest",
"webNavigation",

4
src/drivers/webextension/options.html
Unescape View File

@ -33,10 +33,6 @@
<label for="option-tracking"><input id="option-tracking" type="checkbox"> <span data-i18n="optionTracking">Anonymously send reports on detected applications to wappalyzer.com for research</span></label>
</p>
<p>
<button id="options-save" data-i18n="optionsSave">Save options</button> <span id="options-saved" data-i18n="optionsSaved">Saved</span>
</p>
<div id="about">
<p>
<button id="github"><img src="images/github.png" width="16" height="16" alt=""/> <span data-i18n="github" >Fork Wappalyzer on GitHub!</span></button><!--

Write Preview
Loading…
Cancel
Save