add kcp transport

Author: starifly

app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java

@@ -54,6 +54,11 @@ public abstract class StandardV2RayBean extends AbstractBean {
     public String xhttpMode;
     public String xhttpExtra;
 
+    // --------------------------------------- kcp
+
+    public String mKcpSeed;
+    public String headerType;
+
     // --------------------------------------- ech
 
     public Boolean enableECH;
@@ -120,11 +125,14 @@ public void initializeDefaultValues() {
 
         if (JavaUtil.isNullOrBlank(xhttpMode)) xhttpMode = "auto";
         if (JavaUtil.isNullOrBlank(xhttpExtra)) xhttpExtra = "";
+
+        if (JavaUtil.isNullOrBlank(mKcpSeed)) mKcpSeed = "";
+        if (JavaUtil.isNullOrBlank(headerType)) headerType = "none";
     }
 
     @Override
     public void serialize(ByteBufferOutput output) {
-        output.writeInt(5);
+        output.writeInt(6);
         super.serialize(output);
         output.writeString(uuid);
         output.writeString(encryption);
@@ -167,6 +175,11 @@ public void serialize(ByteBufferOutput output) {
                 output.writeString(xhttpExtra);
                 break;
             }
+            case "kcp": {
+                output.writeString(mKcpSeed);
+                output.writeString(headerType);
+                break;
+            }
         }
 
         output.writeString(security);
@@ -245,6 +258,13 @@ public void deserialize(ByteBufferInput input) {
                 }
                 break;
             }
+            case "kcp": {
+                if (version >= 6) {
+                    mKcpSeed = input.readString();
+                    headerType = input.readString();
+                }
+                break;
+            }
         }
 
         security = input.readString();
@@ -298,6 +318,7 @@ public void deserialize(ByteBufferInput input) {
         }
 
         // Note: xhttp fields are read in the switch case above when version >= 4
+        // Note: kcp fields are read in the switch case above when version >= 6
     }
 
     @Override

app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt

@@ -13,6 +13,10 @@ import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.json.JSONObject
 
+private val supportedKcpHeaderType = arrayOf(
+    "none", "srtp", "utp", "wechat-video", "dtls", "wireguard"
+)
+
 data class VmessQRCode(
     var v: String = "",
     var ps: String = "",
@@ -212,6 +216,16 @@ fun StandardV2RayBean.parseDuckSoft(url: HttpUrl) {
             }
         }
 
+        "kcp" -> {
+            url.queryParameter("seed")?.let {
+                mKcpSeed = it
+            }
+            url.queryParameter("headerType")?.let {
+                if (it !in supportedKcpHeaderType) error("unsupported headerType")
+                headerType = it
+            }
+        }
+
         "ws" -> {
             url.queryParameter("host")?.let {
                 host = it
@@ -511,6 +525,15 @@ fun StandardV2RayBean.toUriVMessVLESSTrojan(isTrojan: Boolean): String {
             }
         }
 
+        "kcp" -> {
+            if (headerType.isNotBlank() && headerType != "none") {
+                builder.addQueryParameter("headerType", headerType)
+            }
+            if (mKcpSeed.isNotBlank()) {
+                builder.addQueryParameter("seed", mKcpSeed)
+            }
+        }
+
         "xhttp" -> {
             if (host.isNotBlank()) {
                 builder.addQueryParameter("host", host)
@@ -611,6 +634,23 @@ fun buildSingBoxOutboundStreamSettings(bean: StandardV2RayBean): V2RayTransportO
             }
         }
 
+        "kcp" -> {
+            return V2RayTransportOptions_KCPOptions().apply {
+                type = "kcp"
+                mtu = 1350
+                tti = 50
+                uplink_capacity = 12
+                downlink_capacity = 100
+                congestion = false
+                read_buffer_size = 1
+                write_buffer_size = 1
+                header_type = bean.headerType.takeIf { it.isNotBlank() } ?: "none"
+                if (bean.mKcpSeed.isNotBlank()) {
+                    seed = bean.mKcpSeed
+                }
+            }
+        }
+
         "http" -> {
             return V2RayTransportOptions_HTTPOptions().apply {
                 type = "http"

app/src/main/java/io/nekohasekai/sagernet/ui/profile/StandardV2RaySettingsActivity.kt

@@ -56,6 +56,10 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
     private val xhttpExtra = pbm.add(PreferenceBinding(Type.Text, "xhttpExtra"))
     private val vlessEncryption = pbm.add(PreferenceBinding(Type.Text, "vlessEncryption"))
 
+    // KCP
+    private val mKcpSeed = pbm.add(PreferenceBinding(Type.Text, "mKcpSeed"))
+    private val headerType = pbm.add(PreferenceBinding(Type.Text, "headerType"))
+
     override fun StandardV2RayBean.init() {
         if (this is TrojanBean) {
             this@StandardV2RaySettingsActivity.uuid.fieldName = "password"
@@ -156,6 +160,8 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
     private fun updateView(network: String) {
         host.preference.isVisible = false
         path.preference.isVisible = false
+        mKcpSeed.preference.isVisible = false
+        headerType.preference.isVisible = false
         wsCategory.isVisible = false
         xhttpCategory.isVisible = false
 
@@ -165,6 +171,11 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
                 path.preference.setTitle(R.string.http_path)
             }
 
+            "kcp" -> {
+                mKcpSeed.preference.isVisible = true
+                headerType.preference.isVisible = true
+            }
+
             "http" -> {
                 host.preference.setTitle(R.string.http_host)
                 path.preference.setTitle(R.string.http_path)

app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java

@@ -4669,6 +4669,28 @@ public static class V2RayTransportOptions_XHTTPOptions extends V2RayTransportOpt
 
     }
 
+    public static class V2RayTransportOptions_KCPOptions extends V2RayTransportOptions {
+
+        public Integer mtu;
+
+        public Integer tti;
+
+        public Integer uplink_capacity;
+
+        public Integer downlink_capacity;
+
+        public Boolean congestion;
+
+        public Integer read_buffer_size;
+
+        public Integer write_buffer_size;
+
+        public String header_type;
+
+        public String seed;
+
+    }
+
     // sing-box Options 生成器已经坏了，以下是从 husi 抄的
 
     public static class Outbound_AnyTLSOptions extends Outbound {

app/src/main/res/values-zh-rCN/strings.xml

@@ -186,6 +186,7 @@
     <string name="ws_path">WebSocket 路径</string>
     <string name="http_host">HTTP 主机</string>
     <string name="http_path">HTTP 路径</string>
+    <string name="kcp_header_type">伪装头类型</string>
     <string name="show_bottom_bar">像 SagerNet 一样显示底栏</string>
     <string name="utls_fingerprint">uTLS 指纹</string>
     <string name="grpc_service_name">gRPC 服务名称</string>

app/src/main/res/values/arrays.xml

@@ -317,6 +317,7 @@
 
     <string-array name="networks_value">
         <item>tcp</item>
+        <item>kcp</item>
         <item>ws</item>
         <item>http</item>
         <item>quic</item>
@@ -325,6 +326,15 @@
         <item>xhttp</item>
     </string-array>
 
+    <string-array name="kcp_headers_value">
+        <item>none</item>
+        <item>srtp</item>
+        <item>utp</item>
+        <item>wechat-video</item>
+        <item>dtls</item>
+        <item>wireguard</item>
+    </string-array>
+
     <string-array name="xhttp_mode_entry">
         <item>auto</item>
         <item>packet-up</item>

app/src/main/res/values/strings.xml

@@ -124,6 +124,8 @@
     <string name="ws_path">WebSocket Path</string>
     <string name="http_host">HTTP Host</string>
     <string name="http_path">HTTP Path</string>
+    <string name="kcp_seed">mKCP Seed</string>
+    <string name="kcp_header_type">Header Type</string>
     <string name="grpc_service_name">gRPC ServiceName</string>
     <string name="tls">Use TLS</string>
     <string name="sni">Server Name Indication</string>

app/src/main/res/xml/standard_v2ray_preferences.xml

@@ -75,6 +75,20 @@
             app:key="path"
             app:title="@string/http_path"
             app:useSimpleSummaryProvider="true" />
+        <moe.matsuri.nb4a.ui.SimpleMenuPreference
+            app:defaultValue="none"
+            app:entries="@array/kcp_headers_value"
+            app:entryValues="@array/kcp_headers_value"
+            app:icon="@drawable/ic_baseline_texture_24"
+            app:key="headerType"
+            app:title="@string/kcp_header_type"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:dialogLayout="@layout/layout_password_dialog"
+            app:icon="@drawable/ic_baseline_format_align_left_24"
+            app:key="mKcpSeed"
+            app:title="@string/kcp_seed"
+            app:useSimpleSummaryProvider="true" />
         <moe.matsuri.nb4a.ui.SimpleMenuPreference
             app:entries="@array/transport_layer_encryption_value"
             app:entryValues="@array/transport_layer_encryption_value"

buildScript/lib/core/get_source_env.sh

@@ -1,2 +1,2 @@
-export COMMIT_SING_BOX="de2e9954cf52623731dd6f791dd7085a096e10af"
+export COMMIT_SING_BOX="4cb4e8951886fa7f9c2b403e2b3e8afc5db52017"
 export COMMIT_LIBNEKO="6a85c185d62435a5293ef70ac3b638ae3ee1efa7"