anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2024-11-24 02:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

More comments and restyle

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2017-10-17 22:31:55 +05:00
parent 7ac474a5e7
commit 5f3da48cc9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
View File

@ -146,7 +146,7 @@
!(dProp in mods) ||
Boolean(configs[dProp].dflt) === Boolean(mods[dProp])
);
const ifMods = configs[dProp].ifDfltMods;
const ifMods = configs[dProp].ifDfltMods; // If default value implies PAC-script modification.
return ifDflt ? !ifMods : ifMods;
});
@ -159,9 +159,9 @@
if (self.customProxyStringRaw) {
customProxyArray = self.customProxyStringRaw
.replace(/#.*$/mg, '') // Strip comments.
.split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g )
.split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g ) // Split by (<other whitespace>*<semi-colon or newline>+<other whitespace>*)+
.map( (p) => p.trim() )
.filter( (p) => p && /\s+/g.test(p) );
.filter( (p) => p && /\s+/g.test(p) ); // At least one space is required.
if (self.ifUseSecureProxiesOnly) {
customProxyArray = customProxyArray.filter( (pStr) => /^HTTPS\s/.test(pStr) );
}
@ -448,9 +448,14 @@ ${ pacMods.filteredCustomsString
return cb(null, res, ...accWarns);
}
const newHosts = (pacMods.customProxyArray || []).map( (ps) => ps.split(/\s+/)[1] );
window.utils.fireRequest('ip-to-host-replace-all', newHosts, (err, res, ...moreWarns) => cb( err, res, ...accWarns.concat(moreWarns) ));
window.utils.fireRequest(
'ip-to-host-replace-all',
newHosts,
(err, res, ...moreWarns) =>
cb(err, res, ...accWarns, ...moreWarns),
);
}
},
);
},