Skip to content

Commit 3688b41

Browse files
committed
🆙 Update documentations and bump version to 4.3.0.0
1 parent d6d105f commit 3688b41

File tree

3 files changed

+56
-32
lines changed

3 files changed

+56
-32
lines changed

Diff for: ‎CHANGES

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
4.3.0.0 2020-10-19
2+
- Cleanup and update dependencies (#2983)
3+
- Geosite group validation + PAC regeneration on version update (#2988)
4+
- PAC: add options for direct and proxied groups (#2990)
5+
- Transition to WPF: ForwardProxyView + HotkeysView + OnlineConfigView + VersionUpdatePromptView (#2991)
6+
17
4.2.1.0 2020-10-12
28
- SIP008 support (#2942)
39
- Exclude @cn from PAC proxied list (#2982)

Diff for: ‎README.md

+49-31
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
[中文说明]
77

8-
#### Features
8+
## Features
99

1010
1. System proxy configuration
1111
2. PAC mode and global mode
@@ -15,15 +15,15 @@
1515
6. Supports UDP relay (see Usage)
1616
7. Supports plugins
1717

18-
#### Download
18+
## Downloads
1919

2020
Download the latest release from [release page].
2121

22-
#### Requirements
22+
## Requirements
2323

2424
Microsoft [.NET Framework 4.7.2] or higher, Microsoft [Visual C++ 2015 Redistributable] (x86) .
2525

26-
#### Basic
26+
## Basics
2727

2828
1. Find Shadowsocks icon in the notification tray
2929
2. You can add multiple servers in servers menu
@@ -33,38 +33,51 @@ proxy addons in your browser, or set them to use system proxy
3333
system proxy. Set Socks5 or HTTP proxy to 127.0.0.1:1080. You can change this
3434
port in `Servers -> Edit Servers`
3535

36-
#### PAC
36+
## PAC
3737

38-
1. You can change PAC rules by editing the PAC file. When you save the PAC file
39-
with any editor, Shadowsocks will notify browsers about the change automatically
40-
2. You can also update PAC file from [GeoSite] \(maintained by 3rd party)
41-
3. You can also use online PAC URL
38+
- The PAC rules are generated from the geosite database in [v2fly/domain-list-community](https://github.com/v2fly/domain-list-community).
39+
- Generation modes: whitelist mode and blacklist mode.
40+
- Domain groups: `geositeDirectGroups` and `geositeProxiedGroups`.
41+
- `geositeDirectGroups` is initialized with `cn` and `geolocation-!cn@cn`.
42+
- `geositeProxiedGroups` is initialized with `geolocation-!cn`.
43+
- To switch between different modes, modify the `geositePreferDirect` property in `gui-config.json`
44+
- When `geositePreferDirect` is false (default), PAC works in whitelist mode. Exception rules are generated from `geositeDirectGroups`. Unmatched domains goes through the proxy.
45+
- When `geositePreferDirect` is true, PAC works in blacklist mode. Blocking rules are generated from `geositeProxiedGroups`. Exception rules are generated from `geositeDirectGroups`. Unmatched domains are connected to directly.
46+
- Starting from 4.3.0.0, shadowsocks-windows defaults to whitelist mode with Chinese domains excluded from connecting via the proxy.
47+
- The new default values make sure that:
48+
- When in whitelist mode, Chinese domains, including non-Chinese companies' Chinese CDNs, are connected to directly.
49+
- When in blacklist mode, only non-Chinese domains goes through the proxy. Chinese domains, as well as non-Chinese companies' Chinese CDNs, are connected to directly.
50+
51+
### User-defined rules
52+
53+
- To define your own PAC rules, it's recommended to use the `user-rule.txt` file.
54+
- You can also modify `pac.txt` directly. But your modifications won't persist after updating geosite from the upstream.
4255

4356
For Windows10 Store and related applications, please execute the following command under Admin privilege:
4457
```
4558
netsh winhttp import proxy source=ie
4659
```
4760

48-
#### Server Auto Switching
61+
## Server Auto Switching
4962

5063
1. Load balance: choosing server randomly
5164
2. High availability: choosing the best server (low latency and packet loss)
5265
3. Choose By Total Package Loss: ping and choose. Please also enable
5366
`Availability Statistics` in the menu if you want to use this
5467
4. Write your own strategy by implement IStrategy interface and send us a pull request!
5568

56-
#### UDP
69+
## UDP
5770

5871
For UDP, you need to use SocksCap or ProxyCap to force programs you want
5972
to be proxied to tunnel over Shadowsocks
6073

61-
#### Multiple Instances
74+
## Multiple Instances
6275

6376
If you want to manage multiple servers using other tools like SwitchyOmega,
6477
you can start multiple Shadowsocks instances. To avoid configuration conflicts,
6578
copy Shadowsocks to a new directory and choose a different local port.
6679

67-
#### Plugins
80+
## Plugins
6881

6982
If you would like to connect to server via a plugin, please set the plugin's
7083
path (relative or absolute) on Edit Servers form.
@@ -73,65 +86,70 @@ _Note_: Forward Proxy will not be used while a plugin is enabled.
7386
Details:
7487
[Working with non SIP003 standard Plugin].
7588

76-
#### Global hotkeys
89+
## Global hotkeys
7790

7891
Hotkeys could be registered automatically on startup.
7992
If you are using multiple instances of Shadowsocks,
8093
you must set different key combination for each instance.
8194

82-
##### How to input?
95+
### How to input?
8396

8497
1. Put focus in the corresponding textbox.
8598
2. Press the key combination that you want to use.
8699
3. Release all keys when you think it is ready.
87100
4. Your input appears in the textbox.
88101

89-
##### How to change?
102+
### How to change?
90103

91104
1. Put focus in the corresponding textbox.
92105
2. Press BackSpace key to clear content.
93106
3. Re-input new key combination.
94107

95-
##### How to deactivate?
108+
### How to deactivate?
96109

97110
1. Clear content in the textbox that you want to deactivate,
98111
if you want to deactivate all, please clear all textboxes.
99112
2. Press OK button to confirm.
100113

101-
##### Meaning of label color
114+
### Meaning of label color
102115

103116
- Green: This key combination is not occupied by other programs and register successfully.
104117
- Yellow: This key combination is occupied by other programs and you have to change to another one.
105118
- Transparent without color: The initial status.
106119

107-
#### Server Configuration
120+
## Server Configuration
108121

109122
Please visit [Servers] for more information.
110123

111-
#### Experimental
124+
## Experimental
112125

113126
[Experimental Features]
114127

115-
#### Development
128+
## Development
116129

117-
1. [Visual Studio 2017] & [.NET Framework 4.7.2 Developer Pack] are required.
130+
1. [Visual Studio 2019] & [.NET Framework 4.7.2 Developer Pack] are required.
118131
2. It is recommended to share your idea on the Issue Board before you start to work,
119132
especially for feature development.
120133

121-
#### License
134+
## License
122135

123136
[GPLv3]
124137

125-
#### Open Source Components / Libraries
138+
## Open Source Components / Libraries
126139

127140
```
128-
Caseless.Fody (MIT) https://github.com/Fody/Caseless
129-
Costura.Fody (MIT) https://github.com/Fody/Costura
130-
Fody (MIT) https://github.com/Fody/Fody
131-
GlobalHotKey (GPLv3) https://github.com/kirmir/GlobalHotKey
132-
Newtonsoft.Json (MIT) https://www.newtonsoft.com/json
133-
StringEx.CS () https://github.com/LazyMode/StringEx
134-
ZXing.Net (Apache 2.0) https://github.com/micjahn/ZXing.Net
141+
Caseless.Fody (MIT) https://github.com/Fody/Caseless
142+
Costura.Fody (MIT) https://github.com/Fody/Costura
143+
Fody (MIT) https://github.com/Fody/Fody
144+
GlobalHotKey (GPLv3) https://github.com/kirmir/GlobalHotKey
145+
MdXaml (MIT) https://github.com/whistyun/MdXaml
146+
Newtonsoft.Json (MIT) https://www.newtonsoft.com/json
147+
ReactiveUI.WPF (MIT) https://github.com/reactiveui/ReactiveUI
148+
ReactiveUI.Events.WPF (MIT) https://github.com/reactiveui/ReactiveUI
149+
ReactiveUI.Fody (MIT) https://github.com/reactiveui/ReactiveUI
150+
ReactiveUI.Validation (MIT) https://github.com/reactiveui/ReactiveUI.Validation
151+
WPFLocalizationExtension (MS-PL) https://github.com/XAMLMarkupExtensions/WPFLocalizationExtension/
152+
ZXing.Net (Apache 2.0) https://github.com/micjahn/ZXing.Net
135153
136154
libsscrypto (GPLv2) https://github.com/shadowsocks/libsscrypto
137155
Privoxy (GPLv2) https://www.privoxy.org

Diff for: ‎shadowsocks-csharp/Controller/Service/UpdateChecker.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class UpdateChecker
3333

3434
public event EventHandler CheckUpdateCompleted;
3535

36-
public const string Version = "4.2.1.0";
36+
public const string Version = "4.3.0.0";
3737
private readonly Version _version;
3838

3939
public UpdateChecker()

0 commit comments

Comments
 (0)