From 3bd509bad9d7ce11ff11b284aaf9c0eb1d4cb358 Mon Sep 17 00:00:00 2001 From: Meow <197331664+Meo597@users.noreply.github.com> Date: Sat, 11 Jul 2026 21:15:51 +0800 Subject: [PATCH] Transport: Rename `network` to `method` https://github.com/XTLS/Xray-core/pull/6426#issuecomment-4899048255 --- docs/config/transport.md | 22 +++++++++---------- docs/config/transports/grpc.md | 2 +- docs/config/transports/httpupgrade.md | 2 +- docs/config/transports/hysteria.md | 2 +- docs/config/transports/mkcp.md | 2 +- docs/config/transports/raw.md | 2 +- docs/config/transports/websocket.md | 2 +- docs/document/level-0/ch07-xray-server.md | 2 +- docs/document/level-0/ch08-xray-clients.md | 2 +- docs/document/level-1/fallbacks-lv1.md | 10 ++++----- docs/document/level-1/fallbacks-with-sni.md | 4 ++-- docs/document/level-1/routing-lv1-part1.md | 2 +- .../level-2/nginx_or_haproxy_tls_tunnel.md | 4 ++-- docs/document/level-2/tproxy.md | 2 +- docs/document/level-2/tproxy_ipv4_and_ipv6.md | 4 ++-- docs/document/level-2/warp.md | 2 +- docs/en/config/transport.md | 22 +++++++++---------- docs/en/config/transports/grpc.md | 2 +- docs/en/config/transports/httpupgrade.md | 2 +- docs/en/config/transports/hysteria.md | 2 +- docs/en/config/transports/mkcp.md | 2 +- docs/en/config/transports/raw.md | 2 +- docs/en/config/transports/websocket.md | 2 +- docs/en/document/level-0/ch07-xray-server.md | 2 +- docs/en/document/level-0/ch08-xray-clients.md | 2 +- docs/en/document/level-1/fallbacks-lv1.md | 10 ++++----- .../en/document/level-1/fallbacks-with-sni.md | 4 ++-- docs/en/document/level-1/routing-lv1-part1.md | 2 +- .../level-2/nginx_or_haproxy_tls_tunnel.md | 4 ++-- docs/en/document/level-2/tproxy.md | 2 +- .../document/level-2/tproxy_ipv4_and_ipv6.md | 4 ++-- docs/en/document/level-2/warp.md | 2 +- docs/ru/config/transport.md | 22 +++++++++---------- docs/ru/config/transports/grpc.md | 2 +- docs/ru/config/transports/httpupgrade.md | 2 +- docs/ru/config/transports/hysteria.md | 2 +- docs/ru/config/transports/mkcp.md | 2 +- docs/ru/config/transports/raw.md | 2 +- docs/ru/config/transports/websocket.md | 2 +- docs/ru/document/level-0/ch07-xray-server.md | 2 +- docs/ru/document/level-0/ch08-xray-clients.md | 2 +- docs/ru/document/level-1/fallbacks-lv1.md | 10 ++++----- .../ru/document/level-1/fallbacks-with-sni.md | 4 ++-- docs/ru/document/level-1/routing-lv1-part1.md | 2 +- .../level-2/nginx_or_haproxy_tls_tunnel.md | 4 ++-- docs/ru/document/level-2/tproxy.md | 2 +- .../document/level-2/tproxy_ipv4_and_ipv6.md | 4 ++-- docs/ru/document/level-2/warp.md | 2 +- 48 files changed, 99 insertions(+), 99 deletions(-) diff --git a/docs/config/transport.md b/docs/config/transport.md index 758eb8cc..75bbbc0b 100644 --- a/docs/config/transport.md +++ b/docs/config/transport.md @@ -27,7 +27,7 @@ // [!code focus:18] "streamSettings": { // 传输方式 - "network": "raw", + "method": "raw", "rawSettings": {}, "xhttpSettings": {}, "kcpSettings": {}, @@ -50,37 +50,37 @@ ### 传输方式 -> `network`: "raw" | "xhttp" | "mkcp" | "grpc" | "websocket" | "httpupgrade" | "hysteria" +> `method`: "raw" | "xhttp" | "mkcp" | "grpc" | "websocket" | "httpupgrade" | "hysteria" 数据流所使用的传输方式类型，默认值为 `raw`。 > `rawSettings`: [RawObject](./transports/raw.md) -数据流的 RAW 配置，仅当 `network` 为 `raw` 时有效。 +数据流的 RAW 配置，仅当 `method` 为 `raw` 时有效。 > `xhttpSettings`: [XHTTPObject](./transports/xhttp.md) -数据流的 XHTTP 配置，仅当 `network` 为 `xhttp` 时有效。 +数据流的 XHTTP 配置，仅当 `method` 为 `xhttp` 时有效。 > `kcpSettings`: [KcpObject](./transports/mkcp.md) -数据流的 mKCP 配置，仅当 `network` 为 `mkcp` 时有效。 +数据流的 mKCP 配置，仅当 `method` 为 `mkcp` 时有效。 > `grpcSettings`: [GRPCObject](./transports/grpc.md) -数据流的 gRPC 配置，仅当 `network` 为 `grpc` 时有效。 +数据流的 gRPC 配置，仅当 `method` 为 `grpc` 时有效。 > `wsSettings`: [WebSocketObject](./transports/websocket.md) -数据流的 WebSocket 配置，仅当 `network` 为 `websocket` 时有效。 +数据流的 WebSocket 配置，仅当 `method` 为 `websocket` 时有效。 > `httpupgradeSettings`: [HTTPUpgradeObject](./transports/httpupgrade.md) -数据流的 HTTPUpgrade 配置，仅当 `network` 为 `httpupgrade` 时有效。 +数据流的 HTTPUpgrade 配置，仅当 `method` 为 `httpupgrade` 时有效。 > `hysteriaSettings`: [HysteriaObject](./transports/hysteria.md) -数据流的 Hysteria 配置，仅当 `network` 为 `hysteria` 时有效。 +数据流的 Hysteria 配置，仅当 `method` 为 `hysteria` 时有效。 ### 传输安全 @@ -127,7 +127,7 @@ FinalMask 配置，用于对流量进行最终的伪装。 ### 出入站协议与传输方式 -此表对应 `protocol + streamSettings.network`。 +此表对应 `protocol + streamSettings.method`。 | | `raw` | `xhttp` | `grpc` | `websocket` | `httpupgrade` | `mkcp` | `hysteria` | | --------------------------------------------------------------------- | ------ | ------- | ------ | ----------- | ------------- | ------ | ---------- | @@ -144,7 +144,7 @@ FinalMask 配置，用于对流量进行最终的伪装。 ### 传输方式与传输安全 -此表对应 `streamSettings.network + streamSettings.security`。 +此表对应 `streamSettings.method + streamSettings.security`。 | | `none` | `tls` | `reality` | | ------------- | ------ | ----- | --------- | diff --git a/docs/config/transports/grpc.md b/docs/config/transports/grpc.md index 70a9494a..8ad99422 100644 --- a/docs/config/transports/grpc.md +++ b/docs/config/transports/grpc.md @@ -44,7 +44,7 @@ gRPC（HTTP/2）内置多路复用，不建议使用 gRPC 与 HTTP/2 时启用 m { // ... "streamSettings": { - "network": "grpc", + "method": "grpc", // [!code focus:10] "grpcSettings": { "authority": "grpc.example.com", diff --git a/docs/config/transports/httpupgrade.md b/docs/config/transports/httpupgrade.md index 8dc11501..5887cd38 100644 --- a/docs/config/transports/httpupgrade.md +++ b/docs/config/transports/httpupgrade.md @@ -18,7 +18,7 @@ { // ... "streamSettings": { - "network": "httpupgrade", + "method": "httpupgrade", // [!code focus:8] "httpupgradeSettings": { "acceptProxyProtocol": false, diff --git a/docs/config/transports/hysteria.md b/docs/config/transports/hysteria.md index 31d6553c..daeba02d 100644 --- a/docs/config/transports/hysteria.md +++ b/docs/config/transports/hysteria.md @@ -13,7 +13,7 @@ Hysteria2 的底层 QUIC 传输的 Xray 实现，通常搭配 hysteria[出站](. { // ... "streamSettings": { - "network": "hysteria", + "method": "hysteria", // [!code focus:17] "hysteriaSettings": { "version": 2, diff --git a/docs/config/transports/mkcp.md b/docs/config/transports/mkcp.md index 145b949b..beb77a70 100644 --- a/docs/config/transports/mkcp.md +++ b/docs/config/transports/mkcp.md @@ -19,7 +19,7 @@ mKCP 牺牲带宽来降低延迟。传输同样的内容，mKCP 一般比 TCP { // ... "streamSettings": { - "network": "mkcp", + "method": "mkcp", // [!code focus:9] "kcpSettings": { "mtu": 1350, diff --git a/docs/config/transports/raw.md b/docs/config/transports/raw.md index 16bc0f2a..b7fc9ddc 100644 --- a/docs/config/transports/raw.md +++ b/docs/config/transports/raw.md @@ -15,7 +15,7 @@ { // ... "streamSettings": { - "network": "raw", + "method": "raw", // [!code focus:6] "rawSettings": { "acceptProxyProtocol": false, diff --git a/docs/config/transports/websocket.md b/docs/config/transports/websocket.md index 97113870..6a53ba68 100644 --- a/docs/config/transports/websocket.md +++ b/docs/config/transports/websocket.md @@ -23,7 +23,7 @@ Websocket 会识别 HTTP 请求的 X-Forwarded-For 头来覆写流量的源地 { // ... "streamSettings": { - "network": "websocket", + "method": "websocket", // [!code focus:9] "wsSettings": { "acceptProxyProtocol": false, diff --git a/docs/document/level-0/ch07-xray-server.md b/docs/document/level-0/ch07-xray-server.md index 0d942161..6e2fc21b 100644 --- a/docs/document/level-0/ch07-xray-server.md +++ b/docs/document/level-0/ch07-xray-server.md @@ -213,7 +213,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": "http/1.1", diff --git a/docs/document/level-0/ch08-xray-clients.md b/docs/document/level-0/ch08-xray-clients.md index 593c83a0..2ecdf5f3 100644 --- a/docs/document/level-0/ch08-xray-clients.md +++ b/docs/document/level-0/ch08-xray-clients.md @@ -216,7 +216,7 @@ "level": 0 }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "serverName": "a-name.yourdomain.com", // 替换成你的真实域名 diff --git a/docs/document/level-1/fallbacks-lv1.md b/docs/document/level-1/fallbacks-lv1.md index b61d0cb0..bde30797 100644 --- a/docs/document/level-1/fallbacks-lv1.md +++ b/docs/document/level-1/fallbacks-lv1.md @@ -172,7 +172,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": ["http/1.1"], @@ -249,7 +249,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "none", "tcpSettings": { "acceptProxyProtocol": true @@ -280,7 +280,7 @@ "decryption": "none" }, "streamSettings": { - "network": "ws", + "method": "ws", "security": "none", "wsSettings": { "acceptProxyProtocol": true, // 提醒：若你用 Nginx/Caddy 等反代 WS，需要删掉这行 @@ -307,7 +307,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "none", "tcpSettings": { "acceptProxyProtocol": true, @@ -345,7 +345,7 @@ ] }, "streamSettings": { - "network": "ws", + "method": "ws", "security": "none", "wsSettings": { "acceptProxyProtocol": true, // 提醒：若你用 Nginx/Caddy 等反代 WS，需要删掉这行 diff --git a/docs/document/level-1/fallbacks-with-sni.md b/docs/document/level-1/fallbacks-with-sni.md index 10fc5212..4dfe78d1 100644 --- a/docs/document/level-1/fallbacks-with-sni.md +++ b/docs/document/level-1/fallbacks-with-sni.md @@ -117,7 +117,7 @@ acme.sh --install-cert -d example.com --fullchain-file /etc/ssl/xray/cert.pem -- ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": ["h2", "http/1.1"], @@ -142,7 +142,7 @@ acme.sh --install-cert -d example.com --fullchain-file /etc/ssl/xray/cert.pem -- ] }, "streamSettings": { - "network": "ws", + "method": "ws", "wsSettings": { "acceptProxyProtocol": true, "path": "/vmessws" diff --git a/docs/document/level-1/routing-lv1-part1.md b/docs/document/level-1/routing-lv1-part1.md index 09c21fa0..1e2e7138 100644 --- a/docs/document/level-1/routing-lv1-part1.md +++ b/docs/document/level-1/routing-lv1-part1.md @@ -90,7 +90,7 @@ "level": 0 }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "serverName": "a-name.yourdomain.com", diff --git a/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md b/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md index c3290193..90568069 100644 --- a/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md +++ b/docs/document/level-2/nginx_or_haproxy_tls_tunnel.md @@ -120,7 +120,7 @@ WantedBy=multi-user.target "decryption": "none" }, "streamSettings": { - "network": "tcp" + "method": "tcp" }, "sniffing": { "enabled": true, @@ -200,7 +200,7 @@ WantedBy=multi-user.target "sockopt": { "mark": 255 }, - "network": "tcp" + "method": "tcp" } }, { diff --git a/docs/document/level-2/tproxy.md b/docs/document/level-2/tproxy.md index 52bf1d61..f91f5c5b 100644 --- a/docs/document/level-2/tproxy.md +++ b/docs/document/level-2/tproxy.md @@ -72,7 +72,7 @@ sudo curl -oL /usr/local/share/xray/geosite.dat https://github.com/Loyalsoldier/ "encryption": "none" }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "xtls", "sockopt": { "mark": 2 diff --git a/docs/document/level-2/tproxy_ipv4_and_ipv6.md b/docs/document/level-2/tproxy_ipv4_and_ipv6.md index 768aa83a..31eb9039 100644 --- a/docs/document/level-2/tproxy_ipv4_and_ipv6.md +++ b/docs/document/level-2/tproxy_ipv4_and_ipv6.md @@ -78,7 +78,7 @@ "sockopt": { "mark": 255 }, - "network": "tcp", + "method": "tcp", "security": "tls", //注意使用 xtls-rprx-vision 流控此处需为 tls "tlsSettings": { //注意使用 xtls-rprx-vision 流控此处需为 tlsSettings @@ -226,7 +226,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "certificates": [ diff --git a/docs/document/level-2/warp.md b/docs/document/level-2/warp.md index a28dac69..dec8767b 100644 --- a/docs/document/level-2/warp.md +++ b/docs/document/level-2/warp.md @@ -200,7 +200,7 @@ bash -c "$(curl -L wgcf-cli.vercel.app)" "security": "auto" }, "streamSettings": { - "network": "tcp" + "method": "tcp" } } ] diff --git a/docs/en/config/transport.md b/docs/en/config/transport.md index a4ba2257..7601adde 100644 --- a/docs/en/config/transport.md +++ b/docs/en/config/transport.md @@ -27,7 +27,7 @@ For direct outbounds such as [Freedom](./outbounds/freedom.md), the peer is usua // [!code focus:18] "streamSettings": { // Transport methods - "network": "raw", + "method": "raw", "rawSettings": {}, "xhttpSettings": {}, "kcpSettings": {}, @@ -50,37 +50,37 @@ For direct outbounds such as [Freedom](./outbounds/freedom.md), the peer is usua ### Transport Methods -> `network`: "raw" | "xhttp" | "mkcp" | "grpc" | "websocket" | "httpupgrade" | "hysteria" +> `method`: "raw" | "xhttp" | "mkcp" | "grpc" | "websocket" | "httpupgrade" | "hysteria" Transport method used by the data stream. The default value is `raw`. > `rawSettings`: [RawObject](./transports/raw.md) -RAW configuration for the data stream. Only valid when `network` is `raw`. +RAW configuration for the data stream. Only valid when `method` is `raw`. > `xhttpSettings`: [XHTTPObject](./transports/xhttp.md) -XHTTP configuration for the data stream. Only valid when `network` is `xhttp`. +XHTTP configuration for the data stream. Only valid when `method` is `xhttp`. > `kcpSettings`: [KcpObject](./transports/mkcp.md) -mKCP configuration for the data stream. Only valid when `network` is `mkcp`. +mKCP configuration for the data stream. Only valid when `method` is `mkcp`. > `grpcSettings`: [GRPCObject](./transports/grpc.md) -gRPC configuration for the data stream. Only valid when `network` is `grpc`. +gRPC configuration for the data stream. Only valid when `method` is `grpc`. > `wsSettings`: [WebSocketObject](./transports/websocket.md) -WebSocket configuration for the data stream. Only valid when `network` is `websocket`. +WebSocket configuration for the data stream. Only valid when `method` is `websocket`. > `httpupgradeSettings`: [HTTPUpgradeObject](./transports/httpupgrade.md) -HTTPUpgrade configuration for the data stream. Only valid when `network` is `httpupgrade`. +HTTPUpgrade configuration for the data stream. Only valid when `method` is `httpupgrade`. > `hysteriaSettings`: [HysteriaObject](./transports/hysteria.md) -Hysteria configuration for the data stream. Only valid when `network` is `hysteria`. +Hysteria configuration for the data stream. Only valid when `method` is `hysteria`. ### Transport Security @@ -126,7 +126,7 @@ Both inbounds and outbounds can configure transport methods and transport securi ### Inbound/Outbound Protocols and Transport Methods -This table corresponds to `protocol + streamSettings.network`. +This table corresponds to `protocol + streamSettings.method`. | | `raw` | `xhttp` | `grpc` | `websocket` | `httpupgrade` | `mkcp` | `hysteria` | | --------------------------------------------------------------------- | --------- | --------- | --------- | ----------- | ------------- | --------- | ---------- | @@ -143,7 +143,7 @@ This table corresponds to `protocol + streamSettings.network`. ### Transport Methods and Transport Security -This table corresponds to `streamSettings.network + streamSettings.security`. +This table corresponds to `streamSettings.method + streamSettings.security`. | | `none` | `tls` | `reality` | | ------------- | ------------- | --------- | ------------- | diff --git a/docs/en/config/transports/grpc.md b/docs/en/config/transports/grpc.md index 4691aade..7313c775 100644 --- a/docs/en/config/transports/grpc.md +++ b/docs/en/config/transports/grpc.md @@ -44,7 +44,7 @@ If you are using fallback, please note the following: { // ... "streamSettings": { - "network": "grpc", + "method": "grpc", // [!code focus:10] "grpcSettings": { "authority": "grpc.example.com", diff --git a/docs/en/config/transports/httpupgrade.md b/docs/en/config/transports/httpupgrade.md index 3eeb03e3..43fe1405 100644 --- a/docs/en/config/transports/httpupgrade.md +++ b/docs/en/config/transports/httpupgrade.md @@ -18,7 +18,7 @@ Its design is not recommended for standalone use; instead, it is intended to wor { // ... "streamSettings": { - "network": "httpupgrade", + "method": "httpupgrade", // [!code focus:8] "httpupgradeSettings": { "acceptProxyProtocol": false, diff --git a/docs/en/config/transports/hysteria.md b/docs/en/config/transports/hysteria.md index fcc90c08..450eea49 100644 --- a/docs/en/config/transports/hysteria.md +++ b/docs/en/config/transports/hysteria.md @@ -13,7 +13,7 @@ Xray implementation of the underlying QUIC transport for Hysteria2, typically us { // ... "streamSettings": { - "network": "hysteria", + "method": "hysteria", // [!code focus:17] "hysteriaSettings": { "version": 2, diff --git a/docs/en/config/transports/mkcp.md b/docs/en/config/transports/mkcp.md index 12d3a499..9be782e1 100644 --- a/docs/en/config/transports/mkcp.md +++ b/docs/en/config/transports/mkcp.md @@ -19,7 +19,7 @@ Please ensure that the firewall configuration on the host is correct. { // ... "streamSettings": { - "network": "mkcp", + "method": "mkcp", // [!code focus:9] "kcpSettings": { "mtu": 1350, diff --git a/docs/en/config/transports/raw.md b/docs/en/config/transports/raw.md index 2994c4b0..41ae3d54 100644 --- a/docs/en/config/transports/raw.md +++ b/docs/en/config/transports/raw.md @@ -15,7 +15,7 @@ It can be combined with various protocols in multiple modes. { // ... "streamSettings": { - "network": "raw", + "method": "raw", // [!code focus:6] "rawSettings": { "acceptProxyProtocol": false, diff --git a/docs/en/config/transports/websocket.md b/docs/en/config/transports/websocket.md index 5cd4da89..e43ce0ec 100644 --- a/docs/en/config/transports/websocket.md +++ b/docs/en/config/transports/websocket.md @@ -23,7 +23,7 @@ WebSocket will recognize the `X-Forwarded-For` header in HTTP requests to overwr { // ... "streamSettings": { - "network": "websocket", + "method": "websocket", // [!code focus:9] "wsSettings": { "acceptProxyProtocol": false, diff --git a/docs/en/document/level-0/ch07-xray-server.md b/docs/en/document/level-0/ch07-xray-server.md index 2c79f039..fe893349 100644 --- a/docs/en/document/level-0/ch07-xray-server.md +++ b/docs/en/document/level-0/ch07-xray-server.md @@ -206,7 +206,7 @@ First, various configurations can refer to the [official VLESS configuration exa ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": "http/1.1", diff --git a/docs/en/document/level-0/ch08-xray-clients.md b/docs/en/document/level-0/ch08-xray-clients.md index d4ddc9ee..df3887db 100644 --- a/docs/en/document/level-0/ch08-xray-clients.md +++ b/docs/en/document/level-0/ch08-xray-clients.md @@ -214,7 +214,7 @@ Its disadvantage is probably that [hand-writing configuration files] is a bit tr "level": 0 }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "serverName": "a-name.yourdomain.com", // Replace with your real domain diff --git a/docs/en/document/level-1/fallbacks-lv1.md b/docs/en/document/level-1/fallbacks-lv1.md index 1db3ebc0..fb383554 100644 --- a/docs/en/document/level-1/fallbacks-lv1.md +++ b/docs/en/document/level-1/fallbacks-lv1.md @@ -172,7 +172,7 @@ Now that you understand what the [Perfect Form of Fallback] is, you can get your ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": ["http/1.1"], @@ -249,7 +249,7 @@ How do we explain this configuration in plain language? ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "none", "tcpSettings": { "acceptProxyProtocol": true @@ -280,7 +280,7 @@ How do we explain this configuration in plain language? "decryption": "none" }, "streamSettings": { - "network": "ws", + "method": "ws", "security": "none", "wsSettings": { "acceptProxyProtocol": true, // Reminder: Delete this line if using Nginx/Caddy to reverse proxy WS @@ -307,7 +307,7 @@ How do we explain this configuration in plain language? ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "none", "tcpSettings": { "acceptProxyProtocol": true, @@ -345,7 +345,7 @@ How do we explain this configuration in plain language? ] }, "streamSettings": { - "network": "ws", + "method": "ws", "security": "none", "wsSettings": { "acceptProxyProtocol": true, // Reminder: Delete this line if using Nginx/Caddy to reverse proxy WS diff --git a/docs/en/document/level-1/fallbacks-with-sni.md b/docs/en/document/level-1/fallbacks-with-sni.md index 135dc875..dad55bf3 100644 --- a/docs/en/document/level-1/fallbacks-with-sni.md +++ b/docs/en/document/level-1/fallbacks-with-sni.md @@ -117,7 +117,7 @@ acme.sh --install-cert -d example.com --fullchain-file /etc/ssl/xray/cert.pem -- ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": ["h2", "http/1.1"], @@ -142,7 +142,7 @@ acme.sh --install-cert -d example.com --fullchain-file /etc/ssl/xray/cert.pem -- ] }, "streamSettings": { - "network": "ws", + "method": "ws", "wsSettings": { "acceptProxyProtocol": true, "path": "/vmessws" diff --git a/docs/en/document/level-1/routing-lv1-part1.md b/docs/en/document/level-1/routing-lv1-part1.md index e4bbb2b2..597a167d 100644 --- a/docs/en/document/level-1/routing-lv1-part1.md +++ b/docs/en/document/level-1/routing-lv1-part1.md @@ -90,7 +90,7 @@ The following outbound configuration example, in plain English, means: Data is s "level": 0 }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "serverName": "a-name.yourdomain.com", diff --git a/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md b/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md index 0d9b67cd..f48788fd 100644 --- a/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md +++ b/docs/en/document/level-2/nginx_or_haproxy_tls_tunnel.md @@ -119,7 +119,7 @@ Enable auto-start on boot: "decryption": "none" }, "streamSettings": { - "network": "tcp" + "method": "tcp" }, "sniffing": { "enabled": true, @@ -199,7 +199,7 @@ Enable auto-start on boot: "sockopt": { "mark": 255 }, - "network": "tcp" + "method": "tcp" } }, { diff --git a/docs/en/document/level-2/tproxy.md b/docs/en/document/level-2/tproxy.md index 0f833421..5bfdaee0 100644 --- a/docs/en/document/level-2/tproxy.md +++ b/docs/en/document/level-2/tproxy.md @@ -72,7 +72,7 @@ sudo curl -oL /usr/local/share/xray/geosite.dat https://github.com/Loyalsoldier/ "encryption": "none" }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "xtls", "sockopt": { "mark": 2 diff --git a/docs/en/document/level-2/tproxy_ipv4_and_ipv6.md b/docs/en/document/level-2/tproxy_ipv4_and_ipv6.md index cac59d50..a604b6f0 100644 --- a/docs/en/document/level-2/tproxy_ipv4_and_ipv6.md +++ b/docs/en/document/level-2/tproxy_ipv4_and_ipv6.md @@ -80,7 +80,7 @@ If the Xray program is not installed on the side router, you can manually downlo "sockopt": { "mark": 255 }, - "network": "tcp", + "method": "tcp", "security": "tls", // Note: must be tls when using xtls-rprx-vision flow "tlsSettings": { // Note: must be tlsSettings when using xtls-rprx-vision flow @@ -228,7 +228,7 @@ If the Xray program is not installed on the side router, you can manually downlo ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "certificates": [ diff --git a/docs/en/document/level-2/warp.md b/docs/en/document/level-2/warp.md index b54a1c9a..6516aa15 100644 --- a/docs/en/document/level-2/warp.md +++ b/docs/en/document/level-2/warp.md @@ -200,7 +200,7 @@ Add the following to your existing routing rules: "security": "auto" }, "streamSettings": { - "network": "tcp" + "method": "tcp" } } ] diff --git a/docs/ru/config/transport.md b/docs/ru/config/transport.md index c440d1b2..b65a19dc 100644 --- a/docs/ru/config/transport.md +++ b/docs/ru/config/transport.md @@ -27,7 +27,7 @@ // [!code focus:18] "streamSettings": { // Способы передачи - "network": "raw", + "method": "raw", "rawSettings": {}, "xhttpSettings": {}, "kcpSettings": {}, @@ -50,37 +50,37 @@ ### Способы передачи -> `network`: "raw" | "xhttp" | "mkcp" | "grpc" | "websocket" | "httpupgrade" | "hysteria" +> `method`: "raw" | "xhttp" | "mkcp" | "grpc" | "websocket" | "httpupgrade" | "hysteria" Способ передачи, используемый потоком данных. Значение по умолчанию — `raw`. > `rawSettings`: [RawObject](./transports/raw.md) -Настройки RAW для потока данных. Действуют только когда `network` равно `raw`. +Настройки RAW для потока данных. Действуют только когда `method` равно `raw`. > `xhttpSettings`: [XHTTPObject](./transports/xhttp.md) -Настройки XHTTP для потока данных. Действуют только когда `network` равно `xhttp`. +Настройки XHTTP для потока данных. Действуют только когда `method` равно `xhttp`. > `kcpSettings`: [KcpObject](./transports/mkcp.md) -Настройки mKCP для потока данных. Действуют только когда `network` равно `mkcp`. +Настройки mKCP для потока данных. Действуют только когда `method` равно `mkcp`. > `grpcSettings`: [GRPCObject](./transports/grpc.md) -Настройки gRPC для потока данных. Действуют только когда `network` равно `grpc`. +Настройки gRPC для потока данных. Действуют только когда `method` равно `grpc`. > `wsSettings`: [WebSocketObject](./transports/websocket.md) -Настройки WebSocket для потока данных. Действуют только когда `network` равно `websocket`. +Настройки WebSocket для потока данных. Действуют только когда `method` равно `websocket`. > `httpupgradeSettings`: [HTTPUpgradeObject](./transports/httpupgrade.md) -Настройки HTTPUpgrade для потока данных. Действуют только когда `network` равно `httpupgrade`. +Настройки HTTPUpgrade для потока данных. Действуют только когда `method` равно `httpupgrade`. > `hysteriaSettings`: [HysteriaObject](./transports/hysteria.md) -Настройки Hysteria для потока данных. Действуют только когда `network` равно `hysteria`. +Настройки Hysteria для потока данных. Действуют только когда `method` равно `hysteria`. ### Безопасность транспорта @@ -126,7 +126,7 @@ REALITY сейчас является одной из самых сильных ### Входящие/исходящие протоколы и способы передачи -Эта таблица соответствует сочетанию `protocol + streamSettings.network`. +Эта таблица соответствует сочетанию `protocol + streamSettings.method`. | | `raw` | `xhttp` | `grpc` | `websocket` | `httpupgrade` | `mkcp` | `hysteria` | | --------------------------------------------------------------------- | -------------- | -------------- | -------------- | -------------- | -------------- | -------------- | -------------- | @@ -143,7 +143,7 @@ REALITY сейчас является одной из самых сильных ### Способы передачи и безопасность транспорта -Эта таблица соответствует сочетанию `streamSettings.network + streamSettings.security`. +Эта таблица соответствует сочетанию `streamSettings.method + streamSettings.security`. | | `none` | `tls` | `reality` | | ------------- | ----------------- | -------------- | ----------------- | diff --git a/docs/ru/config/transports/grpc.md b/docs/ru/config/transports/grpc.md index 4affef6f..9945b179 100644 --- a/docs/ru/config/transports/grpc.md +++ b/docs/ru/config/transports/grpc.md @@ -44,7 +44,7 @@ gRPC (HTTP/2) имеет встроенное мультиплексирован { // ... "streamSettings": { - "network": "grpc", + "method": "grpc", // [!code focus:10] "grpcSettings": { "authority": "grpc.example.com", diff --git a/docs/ru/config/transports/httpupgrade.md b/docs/ru/config/transports/httpupgrade.md index 7cbf411f..b6e0e9c9 100644 --- a/docs/ru/config/transports/httpupgrade.md +++ b/docs/ru/config/transports/httpupgrade.md @@ -19,7 +19,7 @@ { // ... "streamSettings": { - "network": "httpupgrade", + "method": "httpupgrade", // [!code focus:8] "httpupgradeSettings": { "acceptProxyProtocol": false, diff --git a/docs/ru/config/transports/hysteria.md b/docs/ru/config/transports/hysteria.md index bda44660..f463b511 100644 --- a/docs/ru/config/transports/hysteria.md +++ b/docs/ru/config/transports/hysteria.md @@ -13,7 +13,7 @@ { // ... "streamSettings": { - "network": "hysteria", + "method": "hysteria", // [!code focus:17] "hysteriaSettings": { "version": 2, diff --git a/docs/ru/config/transports/mkcp.md b/docs/ru/config/transports/mkcp.md index 64982b11..374d2e1e 100644 --- a/docs/ru/config/transports/mkcp.md +++ b/docs/ru/config/transports/mkcp.md @@ -19,7 +19,7 @@ mKCP жертвует пропускной способностью ради у { // ... "streamSettings": { - "network": "mkcp", + "method": "mkcp", // [!code focus:9] "kcpSettings": { "mtu": 1350, diff --git a/docs/ru/config/transports/raw.md b/docs/ru/config/transports/raw.md index dd3f91ef..6e468cb5 100644 --- a/docs/ru/config/transports/raw.md +++ b/docs/ru/config/transports/raw.md @@ -15,7 +15,7 @@ { // ... "streamSettings": { - "network": "raw", + "method": "raw", // [!code focus:6] "rawSettings": { "acceptProxyProtocol": false, diff --git a/docs/ru/config/transports/websocket.md b/docs/ru/config/transports/websocket.md index c32956b8..f9abd268 100644 --- a/docs/ru/config/transports/websocket.md +++ b/docs/ru/config/transports/websocket.md @@ -23,7 +23,7 @@ WebSocket распознает заголовок X-Forwarded-For в HTTP-зап { // ... "streamSettings": { - "network": "websocket", + "method": "websocket", // [!code focus:9] "wsSettings": { "acceptProxyProtocol": false, diff --git a/docs/ru/document/level-0/ch07-xray-server.md b/docs/ru/document/level-0/ch07-xray-server.md index a62eb9fb..d528fbcf 100644 --- a/docs/ru/document/level-0/ch07-xray-server.md +++ b/docs/ru/document/level-0/ch07-xray-server.md @@ -206,7 +206,7 @@ Xray основан на проекте с открытым исходным к ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": "http/1.1", diff --git a/docs/ru/document/level-0/ch08-xray-clients.md b/docs/ru/document/level-0/ch08-xray-clients.md index 0621371e..76e5815e 100644 --- a/docs/ru/document/level-0/ch08-xray-clients.md +++ b/docs/ru/document/level-0/ch08-xray-clients.md @@ -215,7 +215,7 @@ "level": 0 }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "serverName": "sub.yourdomain.com", // Замените на доменное имя вашего сервера diff --git a/docs/ru/document/level-1/fallbacks-lv1.md b/docs/ru/document/level-1/fallbacks-lv1.md index e2ba3a14..0dd5728a 100644 --- a/docs/ru/document/level-1/fallbacks-lv1.md +++ b/docs/ru/document/level-1/fallbacks-lv1.md @@ -172,7 +172,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": ["http/1.1"], @@ -249,7 +249,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "none", "tcpSettings": { "acceptProxyProtocol": true @@ -280,7 +280,7 @@ "decryption": "none" }, "streamSettings": { - "network": "ws", + "method": "ws", "security": "none", "wsSettings": { "acceptProxyProtocol": true, // Напоминание: если вы используете Nginx/Caddy и т.д. для обратного проксирования WS, удалите эту строку @@ -307,7 +307,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "none", "tcpSettings": { "acceptProxyProtocol": true, @@ -345,7 +345,7 @@ ] }, "streamSettings": { - "network": "ws", + "method": "ws", "security": "none", "wsSettings": { "acceptProxyProtocol": true, // Напоминание: если вы используете Nginx/Caddy и т.д. для обратного проксирования WS, удалите эту строку diff --git a/docs/ru/document/level-1/fallbacks-with-sni.md b/docs/ru/document/level-1/fallbacks-with-sni.md index c11a1af2..625f66f4 100644 --- a/docs/ru/document/level-1/fallbacks-with-sni.md +++ b/docs/ru/document/level-1/fallbacks-with-sni.md @@ -117,7 +117,7 @@ acme.sh --install-cert -d example.com --fullchain-file /etc/ssl/xray/cert.pem -- ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "alpn": ["h2", "http/1.1"], @@ -142,7 +142,7 @@ acme.sh --install-cert -d example.com --fullchain-file /etc/ssl/xray/cert.pem -- ] }, "streamSettings": { - "network": "ws", + "method": "ws", "wsSettings": { "acceptProxyProtocol": true, "path": "/vmessws" diff --git a/docs/ru/document/level-1/routing-lv1-part1.md b/docs/ru/document/level-1/routing-lv1-part1.md index 7fe27201..e72b500e 100644 --- a/docs/ru/document/level-1/routing-lv1-part1.md +++ b/docs/ru/document/level-1/routing-lv1-part1.md @@ -90,7 +90,7 @@ "level": 0 }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "serverName": "a-name.yourdomain.com", diff --git a/docs/ru/document/level-2/nginx_or_haproxy_tls_tunnel.md b/docs/ru/document/level-2/nginx_or_haproxy_tls_tunnel.md index 4b4d209a..f229a6b3 100644 --- a/docs/ru/document/level-2/nginx_or_haproxy_tls_tunnel.md +++ b/docs/ru/document/level-2/nginx_or_haproxy_tls_tunnel.md @@ -120,7 +120,7 @@ WantedBy=multi-user.target "decryption": "none" }, "streamSettings": { - "network": "tcp" + "method": "tcp" }, "sniffing": { "enabled": true, @@ -200,7 +200,7 @@ WantedBy=multi-user.target "sockopt": { "mark": 255 }, - "network": "tcp" + "method": "tcp" } }, { diff --git a/docs/ru/document/level-2/tproxy.md b/docs/ru/document/level-2/tproxy.md index ecf31f21..4e25a9be 100644 --- a/docs/ru/document/level-2/tproxy.md +++ b/docs/ru/document/level-2/tproxy.md @@ -73,7 +73,7 @@ sudo curl -oL /usr/local/share/xray/geosite.dat https://github.com/Loyalsoldier/ "encryption": "none" }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "xtls", "sockopt": { "mark": 2 diff --git a/docs/ru/document/level-2/tproxy_ipv4_and_ipv6.md b/docs/ru/document/level-2/tproxy_ipv4_and_ipv6.md index d0053302..523539f7 100644 --- a/docs/ru/document/level-2/tproxy_ipv4_and_ipv6.md +++ b/docs/ru/document/level-2/tproxy_ipv4_and_ipv6.md @@ -81,7 +81,7 @@ "sockopt": { "mark": 255 }, - "network": "tcp", + "method": "tcp", "security": "tls", // При использовании управления потоком xtls-rprx-vision здесь должно быть указано tls. "tlsSettings": { // При использовании управления потоком xtls-rprx-vision здесь должно быть указано tlsSettings. @@ -232,7 +232,7 @@ ] }, "streamSettings": { - "network": "tcp", + "method": "tcp", "security": "tls", "tlsSettings": { "certificates": [ diff --git a/docs/ru/document/level-2/warp.md b/docs/ru/document/level-2/warp.md index fdbc67e1..63aea806 100644 --- a/docs/ru/document/level-2/warp.md +++ b/docs/ru/document/level-2/warp.md @@ -206,7 +206,7 @@ bash -c "$(curl -L wgcf-cli.vercel.app)" "security": "auto" }, "streamSettings": { - "network": "tcp" + "method": "tcp" } } ]