Skip to content

Commit

Permalink
v8.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@erosman
erosman authored Feb 11, 2024
1 parent a228260 commit 7ec9384
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 36 deletions.
37 changes: 25 additions & 12 deletions src/content/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

<h2 id="changelog">Changelog</h2>
<dl>
<dt>8.10</dt>
<dd>Added new options to the proxy types</dd>

<dt>8.9</dt>
<dd>Added "Log" to the toolbar popup buttons (#44)</dd>
Expand All @@ -32,8 +34,8 @@ <h2 id="changelog">Changelog</h2>
<dd>Updated add pattern user interface (#105)</dd>
<dd>Updated code to process duplicate hostname:port (#33, #76)</dd>
<dd>Updated options to disable "Store Locally" on Firefox (Chrome only)</dd>
<dd>Updated popup include/exclude host feature</dd>
<dd>Updated popup user interface</dd>
<dd>Updated toolbar popup include/exclude host feature</dd>
<dd>Updated toolbar popup user interface</dd>

<dt>8.8</dt>
<dd>Added Show hidden feature</dd>
Expand Down Expand Up @@ -94,7 +96,7 @@ <h2 id="changelog">Changelog</h2>
<dd>Added Keyboard Shortcut feature</dd>
<dd>Added pattern import/export</dd>
<dd>Added port search to search filter</dd>
<dd>Added search filter to Toolbar popup (#23)</dd>
<dd>Added search filter to toolbar popup (#23)</dd>
<dd>Fixed a pattern conversion issue (#28)</dd>
<dd>Fixed an error in Sync (#36)</dd>
<dd>Fixed Tab Proxy icon when reloading a tab (#33)</dd>
Expand Down Expand Up @@ -144,18 +146,29 @@ <h2 id="credits">Credits</h2>
<dd>zh_CN: <a href="https://github.com/wsxy162" target="_blank">FeralMeow </a></dd>
<dd>zh_TW: <a href="https://github.com/samuikaze" target="_blank">samuikaze</a></dd>

<dt>Founder</dt>
<dd>
<img class="figure" src="../image/ericjung.png" alt=""><br>
<a href="mailto:[email protected]">Eric H. Jung</a><br>
Denver, Colorado, USA<br>
Founder & original developer<br>
CEO of <a href="https://getfoxyproxy.org/order/" target="_blank">getfoxyproxy.org</a>
</dd>
</dl>


<p style="margin-top: 3em;">Please <a href="https://www.paypal.me/ericjung2/5.99" target="_blank">donate</a> or <a
href="https://getfoxyproxy.org/order/" target="_blank">buy dedicated VPN/Proxy Servers</a> in over 100 countries.<br>
<i>(including such remote places like <a href="https://wikipedia.org/wiki/Réunion" target="_blank">Reunion
Island</a>)</i></p>

<figure>
<!-- <figure>
<img src="../image/ericjung.png" alt="">
<figcaption><a href="mailto:[email protected]">Eric H. Jung</a><br>Denver, Colorado, USA</figcaption>
</figure>
<figcaption><a href="mailto:[email protected]">Eric H. Jung</a><br>
Denver, Colorado, USA<br>
Founder & original developer<br>
CEO of <a href="https://getfoxyproxy.org/order/" target="_blank">getfoxyproxy.org</a>
</figcaption>
</figure> -->

<p style="margin-top: 3em;">Please <a href="https://www.paypal.me/ericjung2/5.99" target="_blank">donate</a> or
<a href="https://getfoxyproxy.org/order/" target="_blank">buy dedicated VPN/Proxy Servers</a> in over 100 countries.<br>
<i>(including such remote places like <a href="https://wikipedia.org/wiki/Réunion" target="_blank">Reunion Island</a>)</i>
</p>

<p style="font: 1.5em cursive;">Thank you for using FoxyProxy!</p>
<img src="../image/logo.svg" style="width: 5em;" alt="">
Expand Down
49 changes: 46 additions & 3 deletions src/content/help.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,12 +830,55 @@ <h4 id="local-servers">Local Servers</h4>
<ul>
<li>Go to Proxy tab ➤ Add a new proxy</li>
<li>Fill the details according to own preference e.g. Title: TOR</li>
<li>TOR ➤ Type: SOCKS, Hostname: 127.0.0.1, Port: 9050</li>
<li>Psiphon ➤ Type: SOCKS, Hostname: 127.0.0.1, Port: 60351</li>
<li>Privoxy ➤ Type: HTTPS, Hostname: 127.0.0.1, Port: 8118</li>
<li>Add patterns to limit to some URLs only</li>
</ul>

<table>
<caption>Examples</caption>
<thead>
<tr>
<th>Server</th>
<th>Type</th>
<th>Hostname</th>
<th>Port <span>(default)</span></th>
</tr>
</thead>
<tbody class="code">
<tr>
<th>TOR</th>
<td>SOCKS5</td>
<td>127.0.0.1</td>
<td>9050</td>
</tr>
<tr>
<th>Psiphon</th>
<td>SOCKS5</td>
<td>127.0.0.1</td>
<td>60351</td>
</tr>
<tr>
<th>Privoxy</th>
<td>HTTPS</td>
<td>127.0.0.1</td>
<td>8118</td>
</tr>
<tr>
<th>v2rayA</th>
<td>SOCKS5</td>
<td>127.0.0.1</td>
<td>20170</td>
</tr>
<tr>
<th>v2rayA</th>
<td>HTTP</td>
<td>127.0.0.1</td>
<td>20171<br>20172 (http with shunt rules)</td>
</tr>
</tbody>
</table>



<h3 id="patterns">Patterns</h3>

<p>Add patterns to be used in "Proxy by Patterns"</p>
Expand Down
2 changes: 2 additions & 0 deletions src/content/iframe.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ figure {
padding: 0;
}

img.figure,
figure img {
border-radius: 1em;
border: 4px solid var(--nav-hover);
Expand Down Expand Up @@ -151,6 +152,7 @@ dd > dl {
margin: 1em auto;
}

th span,
dt span,
li span {
margin-left: 0.5em;
Expand Down
9 changes: 7 additions & 2 deletions src/content/options.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,16 @@
<option value="socks4">SOCKS4</option>
<option value="socks5">SOCKS5</option>
<!-- <option value="quic">QUIC</option> -->
<option value="pac">PAC</option>
<option value="direct">DIRECT</option>
<option value="socks5">TOR</option>
<option value="socks5">Psiphon</option>
<option value="http">Privoxy</option>
<option value="pac">PAC</option>
<option value="direct">DIRECT</option>
<option value="socks5">v2rayA-socks5</option>
<option value="http">v2rayA-http</option>
<option value="http">v2rayA-http-rules</option>


</select>

<label data-i18n="port"></label>
Expand Down
55 changes: 36 additions & 19 deletions src/content/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,42 +528,59 @@ class Proxies {
type.addEventListener('change', e => {
pxy.dataset.type = e.target.value; // show/hide elements

switch (e.target.options[e.target.selectedIndex].textContent) {
const id = e.target.options[e.target.selectedIndex].textContent;
const fillData = () => {
flag.textContent = id === 'DIRECT' ? '⮕' : '🌎';
sumTitle.textContent = id;
title.value = id;
};

switch (id) {
case 'PAC':
fillData();
break;

case 'DIRECT':
fillData();
hostname.value = id;
break;

// --- auto-fill helpers
case 'TOR':
flag.textContent = '🌎';
sumTitle.textContent = 'TOR';
title.value = 'TOR';
fillData();
hostname.value = '127.0.0.1';
port.value = '9050';
break;

case 'Psiphon':
flag.textContent = '🌎';
sumTitle.textContent = 'Psiphon';
title.value = 'Psiphon';
fillData();
hostname.value = '127.0.0.1';
port.value = '60351';
break;

case 'Privoxy':
flag.textContent = '🌎';
sumTitle.textContent = 'Privoxy';
title.value = 'Privoxy';
fillData();
hostname.value = '127.0.0.1';
port.value = '8118';
break;

case 'PAC':
flag.textContent = '🌎';
sumTitle.textContent = 'PAC';
title.value = 'PAC';
// By default v2rayA will open 20170 (socks5), 20171 (http), 20172 (http with shunt rules) ports through the core
case 'v2rayA-socks5':
fillData();
hostname.value = '127.0.0.1';
port.value = '20170';
break;

case 'DIRECT':
flag.textContent = '⮕';
sumTitle.textContent = 'DIRECT';
title.value = 'DIRECT';
hostname.value = 'DIRECT';
case 'v2rayA-http':
fillData();
hostname.value = '127.0.0.1';
port.value = '20171';
break;

case 'v2rayA-http-rules':
fillData();
hostname.value = '127.0.0.1';
port.value = '20172';
break;
}
});
Expand Down
2 changes: 2 additions & 0 deletions src/content/proxy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Setting single proxy for all fails
// https://bugs.chromium.org/p/chromium/issues/detail?id=1495756
// Issue 1495756: Support bypassList for PAC scripts in the chrome.proxy API
// https://chromium-review.googlesource.com/c/chromium/src/+/5227338
// Implement bypassList for PAC scripts in chrome.proxy API
// Chrome bypassList applies to 'fixed_servers', not 'pac_script' or URL
// Firefox passthrough applies to all set in proxy.settings.set, i.e. PAC URL
// manual bypass list:
Expand Down

0 comments on commit 7ec9384

Please sign in to comment.