add vless encroption

Author: starifly

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

@@ -11,6 +11,7 @@ public abstract class StandardV2RayBean extends AbstractBean {
 
     public String uuid;
     public String encryption; // or VLESS flow
+    public String vlessEncryption; // VLESS ncryption
 
     //////// End of VMess & VLESS ////////
 
@@ -78,6 +79,7 @@ public void initializeDefaultValues() {
         if (JavaUtil.isNullOrBlank(uuid)) uuid = "";
 
         if (JavaUtil.isNullOrBlank(encryption)) encryption = "";
+        if (JavaUtil.isNullOrBlank(vlessEncryption)) vlessEncryption = "";
 
         if (JavaUtil.isNullOrBlank(type)) type = "tcp";
         else if ("h2".equals(type)) type = "http";
@@ -122,10 +124,11 @@ public void initializeDefaultValues() {
 
     @Override
     public void serialize(ByteBufferOutput output) {
-        output.writeInt(4);
+        output.writeInt(5);
         super.serialize(output);
         output.writeString(uuid);
         output.writeString(encryption);
+        output.writeString(vlessEncryption);
         if (this instanceof VMessBean) {
             output.writeInt(((VMessBean) this).alterId);
         }
@@ -193,6 +196,9 @@ public void deserialize(ByteBufferInput input) {
         super.deserialize(input);
         uuid = input.readString();
         encryption = input.readString();
+        if (version >= 5) {
+            vlessEncryption = input.readString();
+        }
         if (this instanceof VMessBean) {
             ((VMessBean) this).alterId = input.readInt();
         }
@@ -284,6 +290,7 @@ public void deserialize(ByteBufferInput input) {
             muxConcurrency = input.readInt();
         }
 
+        // Note: xhttp fields are read in the switch case above when version >= 4
     }
 
     @Override

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

@@ -279,6 +279,13 @@ fun StandardV2RayBean.parseDuckSoft(url: HttpUrl) {
         }
     }
 
+    // VLESS encryption (ML-KEM-768)
+    url.queryParameter("encryption")?.let {
+        if (isVLESS && it != "none") {
+            vlessEncryption = it
+        }
+    }
+
     url.queryParameter("fp")?.let {
         utlsFingerprint = it
     }
@@ -472,7 +479,13 @@ fun StandardV2RayBean.toUriVMessVLESSTrojan(isTrojan: Boolean): String {
         .addQueryParameter("type", type)
 
     if (isVLESS) {
-        builder.addQueryParameter("encryption", "none")
+        // Add encryption if configured
+        if (vlessEncryption.isNotBlank() && vlessEncryption != "none") {
+            builder.addQueryParameter("encryption", vlessEncryption)
+        } else {
+            builder.addQueryParameter("encryption", "none")
+        }
+
         if (encryption != "auto") builder.addQueryParameter("flow", encryption)
     }
 
@@ -642,11 +655,15 @@ fun buildSingBoxOutboundStreamSettings(bean: StandardV2RayBean): V2RayTransportO
             if (bean.xhttpExtra.isNotBlank()) {
                 try {
                     val gson = Gson()
+                    // Convert base config to JSON
                     val baseJson = JSONObject(gson.toJson(baseConfig))
+                    // Parse extra config
                     val extraJson = JSONObject(bean.xhttpExtra)
+                    // Merge extra fields into base config (only allow download field)
                     if (extraJson.has("download")) {
                         baseJson.put("download", extraJson.get("download"))
                     }
+                    // Convert merged JSON back to object
                     return gson.fromJson(baseJson.toString(), V2RayTransportOptions_XHTTPOptions::class.java)
                 } catch (e: Exception) {
                     // If parsing fails, return base config
@@ -726,6 +743,9 @@ fun buildSingBoxOutboundStandardV2RayBean(bean: StandardV2RayBean): Outbound {
                 if (bean.encryption.isNotBlank() && bean.encryption != "auto") {
                     flow = bean.encryption
                 }
+                if (bean.vlessEncryption.isNotBlank() && bean.vlessEncryption != "none") {
+                    encryption = bean.vlessEncryption
+                }
                 when (bean.packetEncoding) {
                     0 -> packet_encoding = ""
                     1 -> packet_encoding = "packetaddr"

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

@@ -54,6 +54,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
 
     private val xhttpMode = pbm.add(PreferenceBinding(Type.Text, "xhttpMode"))
     private val xhttpExtra = pbm.add(PreferenceBinding(Type.Text, "xhttpExtra"))
+    private val vlessEncryption = pbm.add(PreferenceBinding(Type.Text, "vlessEncryption"))
 
     override fun StandardV2RayBean.init() {
         if (this is TrojanBean) {
@@ -110,6 +111,7 @@ abstract class StandardV2RaySettingsActivity : ProfileSettingsActivity<StandardV
         packetEncoding.preference.isVisible = isVmess || isVless
         alterId.preference.isVisible = isVmess
         encryption.preference.isVisible = isVmess || isVless
+        vlessEncryption.preference.isVisible = isVless
         username.preference.isVisible = isHttp
         password.preference.isVisible = isHttp
 

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

@@ -4243,6 +4243,8 @@ public static class Outbound_VLESSOptions extends Outbound {
 
         public String flow;
 
+        public String encryption;
+
         public String network;
 
         public OutboundTLSOptions tls;

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

@@ -553,4 +553,6 @@
     <string name="xhttp_mode">XHTTP 模式</string>
     <string name="xhttp_extra">XHTTP Extra</string>
     <string name="xhttp_settings">XHTTP 设置</string>
+    <string name="vless_encryption">加密方式</string>
+    <string name="vless_encryption_hint">mlkem768x25519plus.native.0rtt.KEY1.KEY2...</string>
 </resources>

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

@@ -637,4 +637,6 @@
     <string name="xhttp_mode">XHTTP Mode</string>
     <string name="xhttp_extra">XHTTP Extra</string>
     <string name="xhttp_settings">XHTTP Settings</string>
+    <string name="vless_encryption">Encryption</string>
+    <string name="vless_encryption_hint">mlkem768x25519plus.native.0rtt.KEY1.KEY2...</string>
 </resources>

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

@@ -45,6 +45,12 @@
             app:key="encryption"
             app:title="@string/encryption"
             app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:icon="@drawable/ic_notification_enhanced_encryption"
+            app:key="vlessEncryption"
+            app:title="@string/vless_encryption"
+            app:dialogMessage="@string/vless_encryption_hint"
+            app:useSimpleSummaryProvider="true" />
         <moe.matsuri.nb4a.ui.SimpleMenuPreference
             app:entries="@array/packet_encoding_entry"
             app:entryValues="@array/int_array_3"

buildScript/lib/core/get_source_env.sh

@@ -1,2 +1,2 @@
-export COMMIT_SING_BOX="e5069355c397b9c78903a82987d8e8fd26fa3e8a"
+export COMMIT_SING_BOX="87e3315a31656bba7547df99ac14273cf31c4a47"
 export COMMIT_LIBNEKO="1c47a3af71990a7b2192e03292b4d246c308ef0b"