Allow more TLDs

This commit is contained in:
Ilya Ig. Petrov 2017-05-26 09:59:26 -07:00
parent 5d06499385
commit 59e7d3abfd

View File

@ -74,9 +74,9 @@
ifProxyMoreDomains: { ifProxyMoreDomains: {
ifDisabled: true, ifDisabled: true,
dflt: false, dflt: false,
category: 'ownProxies', category: 'exceptions',
label: 'проксировать .onion, .i2p и OpenNIC', label: 'проксировать .onion, .i2p и OpenNIC',
desc: 'Проксировать особые домены. Необходима поддержка со стороны прокси.', desc: 'Проксировать особые домены. Необходима поддержка со стороны СВОИХ прокси.',
order: 8, order: 8,
}, },
ifProxyErrors: { ifProxyErrors: {
@ -189,7 +189,18 @@
self.customProxyArray = false; self.customProxyArray = false;
} }
self.included = self.excluded = undefined; [self.included, self.excluded] = [[], []];
if (self.ifProxyMoreDomains) {
self.moreDomains = [
/* Networks */
'onion', 'i2p',
/* OpenNIC */
'bbs', 'chan', 'dyn', 'free', 'geek', 'gopher', 'indy',
'libre', 'neo', 'null', 'o', 'oss', 'oz', 'parody', 'pirate',
/* OpenNIC Alternatives */
'bazar', 'bit', 'coin', 'emc', 'fur', 'ku', 'lib', 'te', 'ti', 'uu'
];
}
if (self.ifMindExceptions && self.exceptions) { if (self.ifMindExceptions && self.exceptions) {
self.included = []; self.included = [];
self.excluded = []; self.excluded = [];
@ -274,7 +285,20 @@
const ifIncluded = pacMods.included && pacMods.included.length; const ifIncluded = pacMods.included && pacMods.included.length;
const ifExcluded = pacMods.excluded && pacMods.excluded.length; const ifExcluded = pacMods.excluded && pacMods.excluded.length;
const ifExceptions = ifIncluded || ifExcluded; const ifManualExceptions = ifIncluded || ifExcluded;
const finalExceptions = {};
if (pacMods.ifProxyMoreDomains) {
pacMods.moreDomains.reduce((acc, tld) => {
acc[tld] = true;
return acc;
}, finalExceptions);
}
if (pacMods.ifMindExceptions || ifManualExceptions) {
Object.assign(finalExceptions, (pacMods.exceptions || {}));
}
const ifExceptions = Object.keys(finalExceptions).length;
if (ifExceptions) { if (ifExceptions) {
res += ` res += `
@ -295,7 +319,7 @@
/******/ /******/
/******/ }; /******/ };
/******/ /******/
/******/ const excWeight = ${JSON.stringify(Object.entries(pacMods.exceptions))}.reduce( domainReducer, 0 ); /******/ const excWeight = ${ JSON.stringify(Object.entries(finalExceptions)) }.reduce( domainReducer, 0 );
/******/ if (excWeight !== 0) { /******/ if (excWeight !== 0) {
/******/ if (excWeight < 0) { /******/ if (excWeight < 0) {
/******/ // Never proxy it! /******/ // Never proxy it!