Skip to content

v2.3.1: Fix HTTP proxy reliability issues #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anonvector merged 1 commit into from
Mar 10, 2026
Merged

v2.3.1: Fix HTTP proxy reliability issues #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ plugins {
}

val minSdkVersion = 24
val appVersionName = "2.3"
val appVersionCode = 39
val appVersionName = "2.3.1"
val appVersionCode = 40
val cargoProfile = (findProperty("CARGO_PROFILE") as String?) ?: run {
val isRelease = gradle.startParameter.taskNames.any { it.contains("Release", ignoreCase = true) }
if (isRelease) "release" else "debug"
Expand Down
15 changes: 6 additions & 9 deletions app/src/main/java/app/slipnet/tunnel/HttpProxyServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ object HttpProxyServer {
private const val BIND_RETRY_DELAY_MS = 200L
private const val BUFFER_SIZE = 32768
private const val TCP_CONNECT_TIMEOUT_MS = 30000
private const val RELAY_IDLE_TIMEOUT_MS = 300000

private var socksHost: String = "127.0.0.1"
private var socksPort: Int = 1080
Expand Down Expand Up @@ -210,7 +211,7 @@ object HttpProxyServer {
clientOutput.write("HTTP/1.1 200 Connection Established\r\n\r\n".toByteArray())
clientOutput.flush()

clientSocket.soTimeout = 0
clientSocket.soTimeout = RELAY_IDLE_TIMEOUT_MS

// Bridge bidirectionally
remoteSocket.use { remote ->
Expand All @@ -222,7 +223,7 @@ object HttpProxyServer {
copyStream(clientInput, remoteOutput)
} catch (_: Exception) {
} finally {
try { remoteOutput.close() } catch (_: Exception) {}
try { remote.shutdownOutput() } catch (_: Exception) {}
}
}, "http-proxy-c2s")
t1.isDaemon = true
Expand Down Expand Up @@ -331,7 +332,7 @@ object HttpProxyServer {
remoteOutput.write("\r\n".toByteArray())
remoteOutput.flush()

clientSocket.soTimeout = 0
clientSocket.soTimeout = RELAY_IDLE_TIMEOUT_MS

// Bidirectional bridge: forwards request body (if any) and response.
// Server will close after response due to Connection: close.
Expand Down Expand Up @@ -420,17 +421,13 @@ object HttpProxyServer {
}

private fun copyStream(input: InputStream, output: OutputStream) {
val buffered = BufferedOutputStream(output, BUFFER_SIZE)
val buffer = ByteArray(BUFFER_SIZE)
while (!Thread.currentThread().isInterrupted) {
val bytesRead = input.read(buffer)
if (bytesRead == -1) break
buffered.write(buffer, 0, bytesRead)
if (bytesRead < BUFFER_SIZE || input.available() == 0) {
buffered.flush()
}
output.write(buffer, 0, bytesRead)
output.flush()
}
buffered.flush()
}

}
Loading