From 1a06033964af18b7140d29ba9b175804bb2f086f Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:06:32 -0500
Subject: [PATCH] [+] Hide allnet port

---
 config/application.properties                        | 1 +
 src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/application.properties b/config/application.properties
index 94da66f8..484f64fb 100644
--- a/config/application.properties
+++ b/config/application.properties
@@ -13,6 +13,7 @@ billing.server.port=8443
 ## Please notice most games won't work with localhost or 127.0.0.1
 #allnet.server.host=
 #allnet.server.port=
+allnet.server.hide-port=true
 ## This is for some games that use shop name for in-game functions.
 ## Specify the place name here if you need it. By default it is empty.
 allnet.server.place-name=AquaDX
diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt
index 936e9b7c..48ccf5d7 100644
--- a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNet.kt
@@ -23,6 +23,7 @@ import java.util.*
 class AllNetProps {
     var host: String = ""
     var port: Int? = null
+    var hidePort: Boolean = true
     val keychipSesExpire: Long = 172800000 // milliseconds
     var checkKeychip: Boolean = false
     var keychipPermissiveForTesting: Boolean = false
@@ -173,13 +174,13 @@ class AllNet(
     }
 
     private fun switchUri(localAddr: Str, localPort: Str, gameId: Str, ver: Str, session: Str?): Str {
-        val addr = props.host.ifBlank { localAddr }
-        val port = props.port?.toString() ?: localPort
+        val addr = props.host.ifBlank { localAddr } +
+            if (props.hidePort) "" else ":${props.port?.toString() ?: localPort}"
 
         // If keychip authentication is enabled, the game URLs will be set to /gs/{token}/{game}/...
         val base = if (session != null) "gs/$session" else "g"
 
-        return "http://$addr:$port/$base/" + when (gameId) {
+        return "http://$addr/$base/" + when (gameId) {
             "SDBT" -> "chu2/$ver/$session/"
             "SDHD" -> "chu3/$ver/"
             "SDGS" -> "chu3/$ver/" // International (c3exp)