From 0cf1c81933966e91b37f78087caf529c0d2a2a3d Mon Sep 17 00:00:00 2001
From: armv9 <48624112+arm64v8a@users.noreply.github.com>
Date: Mon, 24 Feb 2025 22:02:46 +0900
Subject: [PATCH] Fix server_ports

---
 .../sagernet/fmt/hysteria/HysteriaFmt.kt          | 15 +++++++++++++--
 .../java/moe/matsuri/nb4a/SingBoxOptions.java     |  8 ++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
index a6f0e10..d3c8ef6 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/hysteria/HysteriaFmt.kt
@@ -284,7 +284,7 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap<String, Any
             if (port != null) {
                 server_port = port
             } else {
-                server_ports = bean.serverPorts
+                server_ports = hopPortsToSingboxList(bean.serverPorts)
             }
             hop_interval = "${bean.hopInterval}s"
             up_mbps = bean.uploadMbps
@@ -323,7 +323,7 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap<String, Any
             if (port != null) {
                 server_port = port
             } else {
-                server_ports = bean.serverPorts
+                server_ports = hopPortsToSingboxList(bean.serverPorts)
             }
             hop_interval = "${bean.hopInterval}s"
             up_mbps = bean.uploadMbps
@@ -358,3 +358,14 @@ fun buildSingBoxOutboundHysteriaBean(bean: HysteriaBean): MutableMap<String, Any
         else -> mutableMapOf("error_version" to bean.protocolVersion)
     }
 }
+
+fun hopPortsToSingboxList(s: String): List<String> {
+    return s.split(",").mapNotNull {
+        val pRange = it.replace("-", ":")
+        if (pRange.split(":").size == 2) {
+            pRange
+        } else {
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
index 425cf42..8e7e137 100644
--- a/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
+++ b/app/src/main/java/moe/matsuri/nb4a/SingBoxOptions.java
@@ -449,7 +449,7 @@ public class SingBoxOptions {
 
         public OutboundTLSOptions tls;
 
-        public String server_ports;
+        public List<String> server_ports;
 
         public String hop_interval;
 
@@ -575,7 +575,7 @@ public class SingBoxOptions {
 
         public OutboundTLSOptions tls;
 
-        public String server_ports;
+        public List<String> server_ports;
 
         public String hop_interval;
 
@@ -3902,7 +3902,7 @@ public class SingBoxOptions {
 
         public OutboundTLSOptions tls;
 
-        public String server_ports;
+        public List<String> server_ports;
 
         public String hop_interval;
 
@@ -4276,7 +4276,7 @@ public class SingBoxOptions {
 
         public OutboundTLSOptions tls;
 
-        public String server_ports;
+        public List<String> server_ports;
 
         public String hop_interval;