Skip to content

Commit

Permalink
Update documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
nekohasekai committed Sep 13, 2022
1 parent b271e19 commit 1db7f45
Show file tree
Hide file tree
Showing 11 changed files with 397 additions and 1 deletion.
2 changes: 1 addition & 1 deletion constant/version.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package constant

var (
Version = "1.1-beta3"
Version = "1.1-beta4"
Commit = ""
)
16 changes: 16 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
#### 1.1-beta4

* Add internal simple-obfs and v2ray-plugin [Shadowsocks plugins](/configuration/outbound/shadowsocks#plugin)
* Add [ShadowsocksR outbound](/configuration/outbound/shadowsocksr)
* Add [VLESS outbound and XUDP](/configuration/outbound/vless)
* Skip wait for hysteria tcp handshake response
* Fix socks4 client
* Fix hysteria inbound
* Fix concurrent write

#### 1.0.3

* Fix socks4 client
* Fix hysteria inbound
* Fix concurrent write

#### 1.1-beta3

* Fix using custom TLS client in http2 client
Expand Down
12 changes: 12 additions & 0 deletions docs/configuration/outbound/shadowsocks.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"server_port": 1080,
"method": "2022-blake3-aes-128-gcm",
"password": "8JCsPssfgS8tiRwiMlhARg==",
"plugin": "",
"plugin_opts": "",
"network": "udp",
"udp_over_tcp": false,
"multiplex": {},
Expand Down Expand Up @@ -65,6 +67,16 @@ Legacy encryption methods:

The shadowsocks password.

#### plugin

Shadowsocks SIP003 plugin, implemented in internal.

Only `obfs-local` and `v2ray-plugin` are supported.

#### plugin_opts

Shadowsocks SIP003 plugin options.

#### network

Enabled network
Expand Down
12 changes: 12 additions & 0 deletions docs/configuration/outbound/shadowsocks.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"server_port": 1080,
"method": "2022-blake3-aes-128-gcm",
"password": "8JCsPssfgS8tiRwiMlhARg==",
"plugin": "",
"plugin_opts": "",
"network": "udp",
"udp_over_tcp": false,
"multiplex": {},
Expand Down Expand Up @@ -65,6 +67,16 @@

Shadowsocks 密码。

#### plugin

Shadowsocks SIP003 插件,由内部实现。

仅支持 `obfs-local``v2ray-plugin`

#### plugin_opts

Shadowsocks SIP003 插件参数。

#### network

启用的网络协议
Expand Down
106 changes: 106 additions & 0 deletions docs/configuration/outbound/shadowsocksr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
### Structure

```json
{
"type": "shadowsocksr",
"tag": "ssr-out",

"server": "127.0.0.1",
"server_port": 1080,
"method": "aes-128-cfb",
"password": "8JCsPssfgS8tiRwiMlhARg==",
"obfs": "plain",
"obfs_param": "",
"protocol": "origin",
"protocol_param": "",
"network": "udp",

... // Dial Fields
}
```

!!! warning ""

The ShadowsocksR protocol is obsolete and unmaintained. This outbound is provided for compatibility only.

!!! warning ""

ShadowsocksR is not included by default, see [Installation](/#installation).

### Fields

#### server

==Required==

The server address.

#### server_port

==Required==

The server port.

#### method

==Required==

Encryption methods:

* `aes-128-ctr`
* `aes-192-ctr`
* `aes-256-ctr`
* `aes-128-cfb`
* `aes-192-cfb`
* `aes-256-cfb`
* `rc4-md5`
* `chacha20-ietf`
* `xchacha20`

#### password

==Required==

The shadowsocks password.

#### obfs

The ShadowsocksR obfuscate.

* plain
* http_simple
* http_post
* random_head
* tls1.2_ticket_auth

#### obfs_param

The ShadowsocksR obfuscate parameter.

#### protocol

The ShadowsocksR protocol.

* origin
* verify_sha1
* auth_sha1_v4
* auth_aes128_md5
* auth_aes128_sha1
* auth_chain_a
* auth_chain_b

#### protocol_param

The ShadowsocksR protocol parameter.

#### network

Enabled network

One of `tcp` `udp`.

Both is enabled by default.

### Dial Fields

See [Dial Fields](/configuration/shared/dial) for details.
106 changes: 106 additions & 0 deletions docs/configuration/outbound/shadowsocksr.zh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
### 结构

```json
{
"type": "shadowsocksr",
"tag": "ssr-out",

"server": "127.0.0.1",
"server_port": 1080,
"method": "aes-128-cfb",
"password": "8JCsPssfgS8tiRwiMlhARg==",
"obfs": "plain",
"obfs_param": "",
"protocol": "origin",
"protocol_param": "",
"network": "udp",

... // 拨号字段
}
```

!!! warning ""

ShadowsocksR 协议已过时且无人维护。 提供此出站仅出于兼容性目的。

!!! warning ""

默认安装不包含被 ShadowsocksR,参阅 [安装](/zh/#_2)。

### 字段

#### server

==必填==

服务器地址。

#### server_port

==必填==

服务器端口。

#### method

==必填==

加密方法:

* `aes-128-ctr`
* `aes-192-ctr`
* `aes-256-ctr`
* `aes-128-cfb`
* `aes-192-cfb`
* `aes-256-cfb`
* `rc4-md5`
* `chacha20-ietf`
* `xchacha20`

#### password

==必填==

Shadowsocks 密码。

#### obfs

ShadowsocksR 混淆。

* plain
* http_simple
* http_post
* random_head
* tls1.2_ticket_auth

#### obfs_param

ShadowsocksR 混淆参数。

#### protocol

ShadowsocksR 协议。

* origin
* verify_sha1
* auth_sha1_v4
* auth_aes128_md5
* auth_aes128_sha1
* auth_chain_a
* auth_chain_b

#### protocol_param

ShadowsocksR 协议参数。

#### network

启用的网络协议

`tcp``udp`

默认所有。

### 拨号字段

参阅 [拨号字段](/zh/configuration/shared/dial/)
70 changes: 70 additions & 0 deletions docs/configuration/outbound/vless.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### Structure

```json
{
"type": "vless",
"tag": "vless-out",

"server": "127.0.0.1",
"server_port": 1080,
"uuid": "bf000d23-0752-40b4-affe-68f7707a9661",
"network": "tcp",
"tls": {},
"packet_encoding": "",
"transport": {},

... // Dial Fields
}
```

!!! warning ""

The VLESS protocol is architecturally coupled to v2ray and is unmaintained. This outbound is provided for compatibility purposes only.

### Fields

#### server

==Required==

The server address.

#### server_port

==Required==

The server port.

#### uuid

==Required==

The VLESS user id.

#### network

Enabled network

One of `tcp` `udp`.

Both is enabled by default.

#### tls

TLS configuration, see [TLS](/configuration/shared/tls/#outbound).

#### packet_encoding

| Encoding | Description |
|------------|-----------------------|
| (none) | Disabled |
| packetaddr | Supported by v2ray 5+ |
| xudp | Supported by xray |

#### transport

V2Ray Transport configuration, see [V2Ray Transport](/configuration/shared/v2ray-transport).

### Dial Fields

See [Dial Fields](/configuration/shared/dial) for details.
Loading

0 comments on commit 1db7f45

Please sign in to comment.