diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt index d86a65dc..701b7bcc 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt @@ -123,7 +123,7 @@ data class V2rayConfig( var tlsSettings: TlsSettingsBean? = null, var quicSettings: QuicSettingBean? = null, var xtlsSettings: TlsSettingsBean? = null, - val grpcSettings: Any? = null, + var grpcSettings: GrpcSettingsBean? = null, val dsSettings: Any? = null, val sockopt: Any? = null ) { @@ -187,6 +187,8 @@ data class V2rayConfig( data class HeaderBean(var type: String = "none") } + data class GrpcSettingsBean(var serviceName: String = "") + fun populateTransportSettings(transport: String, headerType: String?, host: String?, path: String?, seed: String?, quicSecurity: String?, key: String?): String { var sni = "" @@ -241,6 +243,12 @@ data class V2rayConfig( quicsetting.header.type = headerType ?: "none" quicSettings = quicsetting } + "grpc" -> { + val grpcSetting = GrpcSettingsBean() + grpcSetting.serviceName = path ?: "" + sni = host ?: "" + grpcSettings = grpcSetting + } } return sni } @@ -342,6 +350,12 @@ data class V2rayConfig( quicSetting.security, quicSetting.key) } + "grpc" -> { + val grpcSetting = streamSettings?.grpcSettings ?: return null + listOf("", + "", + grpcSetting.serviceName) + } else -> null } } diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml index 9a91f38a..24d13e72 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -43,10 +43,10 @@ 传输协议(network) 功能设置(不清楚则保持默认值) 伪装类型(type) - 伪装域名host(host/ws host/h2 host)/QUIC 加密方式 - path(ws path/h2 path)/QUIC 加密密钥 - 底层传输安全 - allowInsecure + 伪装域名(host)(host/ws host/h2 host)/QUIC 加密方式 + path(ws path/h2 path)/QUIC 加密密钥/kcp seed/grpc serviceName + 底层传输安全(tls) + 跳过证书验证(allowInsecure) 服务器地址 服务器端口 密码 diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml index 5303fdbb..4c6b7436 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -43,10 +43,10 @@ 網路 更多功能 標頭類型 - 要求主機(host/ws host/h2 host)/QUIC加密方式 - path(ws path/h2 path)/QUIC加密密鑰 - 傳輸層安全性 - allowInsecure + 要求主機(host)(host/ws host/h2 host)/QUIC加密方式 + path(ws path/h2 path)/QUIC加密密鑰/kcp seed/grpc serviceName + 傳輸層安全性(tls) + 跳過證書驗證(allowInsecure) 伺服器位址 伺服器埠 密碼 diff --git a/V2rayNG/app/src/main/res/values/arrays.xml b/V2rayNG/app/src/main/res/values/arrays.xml index 755bb1d6..3a690f7b 100644 --- a/V2rayNG/app/src/main/res/values/arrays.xml +++ b/V2rayNG/app/src/main/res/values/arrays.xml @@ -24,6 +24,7 @@ ws h2 quic + grpc diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index b45ed29b..f15c8c8b 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ more function head type request host(host/ws host/h2 host)/QUIC security - path(ws path/h2 path)/QUIC key + path(ws path/h2 path)/QUIC key/kcp seed/grpc serviceName tls allowInsecure address