From 5b39b3ac141e2428cc65141f312c72af4be16c94 Mon Sep 17 00:00:00 2001 From: mzz2017 <2017@duck.com> Date: Sat, 15 Jun 2024 02:07:41 +0800 Subject: [PATCH 1/2] docs: add protocols uri schema --- docs/en/proxy-protocols.md | 36 +++++++++++++++++++++++++++++++++--- docs/zh/proxy-protocols.md | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/docs/en/proxy-protocols.md b/docs/en/proxy-protocols.md index c8838a058d..ced96874db 100644 --- a/docs/en/proxy-protocols.md +++ b/docs/en/proxy-protocols.md @@ -3,31 +3,61 @@ > **Note**: dae currently supports the following proxy protocols - [x] HTTP(S), naiveproxy + ``` + https://[[user:]pass@]hostname:port/ + ``` - [x] Socks - [x] Socks4 - [x] Socks4a - [x] Socks5 + + ``` + socks4://[[user:]pass@]hostname:port/ + socks5://[[user:]pass@]hostname:port/ + ``` + - [x] VMess(AEAD, alterID=0) / VLESS - [x] TCP - [x] WS - [x] TLS - [x] gRPC - - [x] h2 - [x] Meek - [x] HTTPUpgrade + + [v2rayN URI Schema](https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)) + + [DuckSoft URI Schema](https://github.com/XTLS/Xray-core/discussions/716) + - [x] Shadowsocks - [x] AEAD Ciphers - [x] Stream Ciphers - [x] simple-obfs - [ ] v2ray-plugin - [x] Websocket (+TLS) + + [SIP002](https://shadowsocks.org/doc/sip002.html) + + [SIP008](https://shadowsocks.org/doc/sip008.html) + - [x] ShadowsocksR + - [x] Trojan - [x] Trojan-gfw - [x] Trojan-go -- [x] [Tuic (v5)](https://github.com/daeuniverse/dae/discussions/182) + + [trojan/trojan-go URI Schema](https://p4gefau1t.github.io/trojan-go/developer/url/) + +- [x] Tuic (v5) + + [Tuic URI Schema](https://github.com/daeuniverse/dae/discussions/182) + - [x] [Juicity](https://github.com/juicity/juicity) -- [x] [Proxy chain (flexible protocol)](https://github.com/daeuniverse/dae/discussions/236) + + [Juicity URI Schema](https://github.com/juicity/juicity?tab=readme-ov-file#link-format) + +- [x] [Proxy chain (flexible protocol)] + + [Proxy chain URI Schema](https://github.com/daeuniverse/dae/discussions/236) For other requirements, one way to expand protocol support is by using external proxy programs. Below is an example of using the external naiveproxy. diff --git a/docs/zh/proxy-protocols.md b/docs/zh/proxy-protocols.md index 61fe545d23..3fd472bc82 100644 --- a/docs/zh/proxy-protocols.md +++ b/docs/zh/proxy-protocols.md @@ -3,10 +3,19 @@ > **Note**: dae 目前支持以下代理协议 - [x] HTTP(S), naiveproxy + ``` + https://[[user:]pass@]hostname:port/ + ``` - [x] Socks - [x] Socks4 - [x] Socks4a - [x] Socks5 + + ``` + socks4://[[user:]pass@]hostname:port/ + socks5://[[user:]pass@]hostname:port/ + ``` + - [x] VMess(AEAD, alterID=0) / VLESS - [x] TCP - [x] WS @@ -14,19 +23,41 @@ - [x] gRPC - [x] Meek - [x] HTTPUpgrade + + [v2rayN URI Schema](https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)) + + [DuckSoft URI Schema](https://github.com/XTLS/Xray-core/discussions/716) + - [x] Shadowsocks - [x] AEAD Ciphers - [x] Stream Ciphers - [x] simple-obfs - [ ] v2ray-plugin - [x] Websocket (+TLS) + + [SIP002](https://shadowsocks.org/doc/sip002.html) + + [SIP008](https://shadowsocks.org/doc/sip008.html) + - [x] ShadowsocksR + - [x] Trojan - [x] Trojan-gfw - [x] Trojan-go -- [x] [Tuic (v5)](https://github.com/daeuniverse/dae/discussions/182) + + [trojan/trojan-go URI Schema](https://p4gefau1t.github.io/trojan-go/developer/url/) + +- [x] Tuic (v5) + + [Tuic URI Schema](https://github.com/daeuniverse/dae/discussions/182) + - [x] [Juicity](https://github.com/juicity/juicity) -- [x] [Proxy chain (flexible protocol)](https://github.com/daeuniverse/dae/discussions/236) + + [Juicity URI Schema](https://github.com/juicity/juicity?tab=readme-ov-file#link-format) + +- [x] [Proxy chain (flexible protocol)] + + [Proxy chain URI Schema](https://github.com/daeuniverse/dae/discussions/236) 有其他需求的，一种方式是通过外接其他代理程序来扩展协议支持。下面给出外接 naiveproxy 的例子。 From a9ad40f8e53c96ffb3b6426ff7cef48679cff38a Mon Sep 17 00:00:00 2001 From: mzz2017 <2017@duck.com> Date: Sun, 16 Jun 2024 03:51:52 +0800 Subject: [PATCH 2/2] fix: style --- docs/en/proxy-protocols.md | 4 ++-- docs/zh/proxy-protocols.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/proxy-protocols.md b/docs/en/proxy-protocols.md index ced96874db..452bc241e0 100644 --- a/docs/en/proxy-protocols.md +++ b/docs/en/proxy-protocols.md @@ -51,11 +51,11 @@ [Tuic URI Schema](https://github.com/daeuniverse/dae/discussions/182) -- [x] [Juicity](https://github.com/juicity/juicity) +- [x] Juicity [Juicity URI Schema](https://github.com/juicity/juicity?tab=readme-ov-file#link-format) -- [x] [Proxy chain (flexible protocol)] +- [x] Proxy chain (flexible protocol) [Proxy chain URI Schema](https://github.com/daeuniverse/dae/discussions/236) diff --git a/docs/zh/proxy-protocols.md b/docs/zh/proxy-protocols.md index 3fd472bc82..d1eb262f59 100644 --- a/docs/zh/proxy-protocols.md +++ b/docs/zh/proxy-protocols.md @@ -51,11 +51,11 @@ [Tuic URI Schema](https://github.com/daeuniverse/dae/discussions/182) -- [x] [Juicity](https://github.com/juicity/juicity) +- [x] Juicity [Juicity URI Schema](https://github.com/juicity/juicity?tab=readme-ov-file#link-format) -- [x] [Proxy chain (flexible protocol)] +- [x] Proxy chain (flexible protocol) [Proxy chain URI Schema](https://github.com/daeuniverse/dae/discussions/236)