mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
Add an optional HTTP proxy for downloads (#1474)
* Add an optional HTTP proxy for downloads Downloads only reached GitHub directly or through URL-rewrite mirrors, which does not help where a local proxy is the workable route. Setup now takes a host:port HTTP proxy that every Downloader connection uses, independently of the download source mode. * Reference the Kotlin object instance from Java Java cannot call a Kotlin object member on the class name without @JvmStatic; the surrounding code already uses INSTANCE. * Assert the proxy host literal without a reverse lookup InetSocketAddress.getHostName reverse-resolves on some JVMs (127.0.0.1 became localhost on CI); hostString is the literal. * Pass the app proxy into the guest environment The Steam client installer and the guest package tools fetch with plain curl against their own CDNs, outside Downloader. Export the usual proxy variables for them when the app proxy is set; proot shares the host network, so a localhost proxy is reachable as-is. --------- Co-authored-by: VIIII4 <VIIII4@users.noreply.github.com>
This commit is contained in:
1 parent
2be08bc67d
commit
c6bc8aef04
9 files changed
+100
-1
No files matched your search
@@ -2,6 +2,7 @@ package com.droiddeck.launcher.runtime
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Environment
|
||||
import com.droiddeck.launcher.core.DownloadSource
|
||||
import com.droiddeck.launcher.core.HostProcess
|
||||
import com.droiddeck.launcher.session.OrphanReaper
|
||||
import com.droiddeck.launcher.session.SessionFiles
|
||||
@@ -45,6 +46,15 @@ object GuestCommand {
|
||||
"DROIDDECK_BWRAP_SOCKET=${BwrapSpawner.socket(context)}",
|
||||
"XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share",
|
||||
)
|
||||
// The Steam client installer and the package tools inside the guest fetch over plain curl,
|
||||
// so the app proxy has to reach them through the environment proot starts them with.
|
||||
DownloadSource.proxyHostPort(context).takeIf { it.isNotEmpty() }?.let { hostPort ->
|
||||
cmd += listOf(
|
||||
"http_proxy=http://$hostPort", "https_proxy=http://$hostPort",
|
||||
"HTTP_PROXY=http://$hostPort", "HTTPS_PROXY=http://$hostPort",
|
||||
"no_proxy=localhost,127.0.0.1,::1", "NO_PROXY=localhost,127.0.0.1,::1",
|
||||
)
|
||||
}
|
||||
fastPathKey?.let { cmd += ProotFastPath.guestEnv(root, binds, it) }
|
||||
cmd += argv
|
||||
val builder = ProcessBuilder(cmd).directory(root).redirectErrorStream(true)
|
||||
|
||||
Reference in new issue
Block a user