don't bug out if initial files can't be downloaded (utkarshdalal#819)

* don't bug out if initial files can't be downloaded

* added implementation of okhttp dnsoverhttps to make code compile

* added fallback DNS for doh

---------

Co-authored-by: Utkarsh Dalal <utkarsh.dalal@toptal.com>

Author: utkarshdalal

CONTRIBUTING.md

@@ -0,0 +1,22 @@
+# Contributing to GameNative
+
+Thanks for your interest in contributing! We welcome pull requests, bug reports, and feedback.
+
+## Getting Started
+
+1. Join our [Discord server](https://discord.gg/2hKv4VfZfE) to discuss what you're working on
+2. Fork the repo and create a branch for your changes
+3. See the **Building** section in the [README](README.md) for setup instructions
+4. Submit a pull request with a clear description of what your change does and why
+
+## Reporting Issues
+
+Please report bugs and request support through our [Discord server](https://discord.gg/2hKv4VfZfE). GitHub issues will be automatically closed.
+
+## Contribution Licensing
+
+By submitting a contribution to GameNative, you agree that your contribution shall be licensed under the same license(s) as the project at the time of contribution.
+
+You also grant the project maintainers the right to relicense the project, including your contribution, under any future version of those license(s), or under any other license that is free and open source software (FOSS) and compatible with the current license(s).
+
+You retain full copyright ownership of your contributions. You confirm that your contributions are your original work and that you have the right to submit them under these terms.

app/build.gradle.kts

@@ -223,6 +223,7 @@ dependencies {
         }
     }
     implementation(libs.spongycastle)
+    implementation(libs.okhttp.dnsoverhttps)
 
     // Split Modules
     implementation(libs.bundles.google)

app/src/main/java/app/gamenative/service/SteamService.kt

@@ -113,6 +113,7 @@ import `in`.dragonbra.javasteam.util.log.LogListener
 import `in`.dragonbra.javasteam.util.log.LogManager
 import java.io.Closeable
 import java.io.File
+import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
 import java.lang.NullPointerException
@@ -1123,10 +1124,11 @@ class SteamService : Service(), IChallengeUrlChanged {
                 try {
                     fetchFile(fallbackUrl, dest, onProgress)
                 } catch (e2: Exception) {
-                    withContext(Dispatchers.Main) {
-                        val msg = "Download failed with ${e2.message ?: e2.toString()}. Please disable VPN or try a different network."
-                        android.widget.Toast.makeText(context.applicationContext, msg, android.widget.Toast.LENGTH_LONG).show()
-                    }
+                    dest.delete()
+                    throw IOException(
+                        "Failed to download $fileName. Please check your network connection or try a VPN.",
+                        e2,
+                    )
                 }
             }
         }

app/src/main/java/app/gamenative/ui/PluviaMain.kt

@@ -1402,65 +1402,109 @@ fun preLaunchApp(
         // Skip the check if booting to container (Open Container menu option)
         val isCustomGame = gameSource == GameSource.CUSTOM_GAME
 
-        // set up Ubuntu file system
+        // set up Ubuntu file system — download required files and install
         SplitCompat.install(context)
-        if (!SteamService.isImageFsInstallable(context, container.containerVariant)) {
-            setLoadingMessage("Downloading first-time files")
-            SteamService.downloadImageFs(
-                onDownloadProgress = { setLoadingProgress(it / 1.0f) },
-                this,
-                variant = container.containerVariant,
-                context = context,
-            ).await()
-        }
-        if (container.containerVariant.equals(Container.GLIBC) &&
-            !SteamService.isFileInstallable(context, "imagefs_patches_gamenative.tzst")
-        ) {
-            setLoadingMessage("Downloading Wine")
-            SteamService.downloadImageFsPatches(
-                onDownloadProgress = { setLoadingProgress(it / 1.0f) },
-                this,
-                context = context,
-            ).await()
-        } else {
-            if (container.wineVersion.contains("proton-9.0-arm64ec") &&
-                !SteamService.isFileInstallable(context, "proton-9.0-arm64ec.txz")
+        try {
+            if (!SteamService.isImageFsInstallable(context, container.containerVariant)) {
+                setLoadingMessage("Downloading first-time files")
+                SteamService.downloadImageFs(
+                    onDownloadProgress = { setLoadingProgress(it / 1.0f) },
+                    this,
+                    variant = container.containerVariant,
+                    context = context,
+                ).await()
+            }
+            if (container.containerVariant.equals(Container.GLIBC) &&
+                !SteamService.isFileInstallable(context, "imagefs_patches_gamenative.tzst")
             ) {
-                setLoadingMessage("Downloading arm64ec Proton")
-                SteamService.downloadFile(
+                setLoadingMessage("Downloading Wine")
+                SteamService.downloadImageFsPatches(
                     onDownloadProgress = { setLoadingProgress(it / 1.0f) },
                     this,
                     context = context,
-                    "proton-9.0-arm64ec.txz",
                 ).await()
-            } else if (container.wineVersion.contains("proton-9.0-x86_64") &&
-                !SteamService.isFileInstallable(context, "proton-9.0-x86_64.txz")
+            } else {
+                if (container.wineVersion.contains("proton-9.0-arm64ec") &&
+                    !SteamService.isFileInstallable(context, "proton-9.0-arm64ec.txz")
+                ) {
+                    setLoadingMessage("Downloading arm64ec Proton")
+                    SteamService.downloadFile(
+                        onDownloadProgress = { setLoadingProgress(it / 1.0f) },
+                        this,
+                        context = context,
+                        "proton-9.0-arm64ec.txz",
+                    ).await()
+                } else if (container.wineVersion.contains("proton-9.0-x86_64") &&
+                    !SteamService.isFileInstallable(context, "proton-9.0-x86_64.txz")
+                ) {
+                    setLoadingMessage("Downloading x86_64 Proton")
+                    SteamService.downloadFile(
+                        onDownloadProgress = { setLoadingProgress(it / 1.0f) },
+                        this,
+                        context = context,
+                        "proton-9.0-x86_64.txz",
+                    ).await()
+                }
+                if (container.wineVersion.contains("proton-9.0-x86_64") || container.wineVersion.contains("proton-9.0-arm64ec")) {
+                    val protonVersion = container.wineVersion
+                    val imageFs = ImageFs.find(context)
+                    val outFile = File(imageFs.rootDir, "/opt/$protonVersion")
+                    val binDir = File(outFile, "bin")
+                    if (!binDir.exists() || !binDir.isDirectory) {
+                        Timber.i("Extracting $protonVersion to /opt/")
+                        setLoadingMessage("Extracting $protonVersion")
+                        setLoadingProgress(-1f)
+                        val downloaded = File(imageFs.getFilesDir(), "$protonVersion.txz")
+                        TarCompressorUtils.extract(
+                            TarCompressorUtils.Type.XZ,
+                            downloaded,
+                            outFile,
+                        )
+                    }
+                }
+            }
+
+            if (!container.isUseLegacyDRM && !container.isLaunchRealSteam &&
+                !SteamService.isFileInstallable(context, "experimental-drm-20260116.tzst")
             ) {
-                setLoadingMessage("Downloading x86_64 Proton")
+                setLoadingMessage("Downloading extras")
                 SteamService.downloadFile(
                     onDownloadProgress = { setLoadingProgress(it / 1.0f) },
                     this,
                     context = context,
-                    "proton-9.0-x86_64.txz",
+                    "experimental-drm-20260116.tzst",
                 ).await()
             }
-            if (container.wineVersion.contains("proton-9.0-x86_64") || container.wineVersion.contains("proton-9.0-arm64ec")) {
-                val protonVersion = container.wineVersion
-                val imageFs = ImageFs.find(context)
-                val outFile = File(imageFs.rootDir, "/opt/$protonVersion")
-                val binDir = File(outFile, "bin")
-                if (!binDir.exists() || !binDir.isDirectory) {
-                    Timber.i("Extracting $protonVersion to /opt/")
-                    setLoadingMessage("Extracting $protonVersion")
-                    setLoadingProgress(-1f)
-                    val downloaded = File(imageFs.getFilesDir(), "$protonVersion.txz")
-                    TarCompressorUtils.extract(
-                        TarCompressorUtils.Type.XZ,
-                        downloaded,
-                        outFile,
-                    )
-                }
+            if (container.isLaunchRealSteam && !SteamService.isFileInstallable(context, "steam.tzst")) {
+                setLoadingMessage(context.getString(R.string.main_downloading_steam))
+                SteamService.downloadSteam(
+                    onDownloadProgress = { setLoadingProgress(it / 1.0f) },
+                    this,
+                    context = context,
+                ).await()
+            }
+            if (container.isLaunchRealSteam && !SteamService.isFileInstallable(context, "steam-token.tzst")) {
+                setLoadingMessage("Downloading steam-token")
+                SteamService.downloadFile(
+                    onDownloadProgress = { setLoadingProgress(it / 1.0f) },
+                    this,
+                    context = context,
+                    "steam-token.tzst",
+                ).await()
             }
+        } catch (e: Exception) {
+            Timber.tag("preLaunchApp").e(e, "File download failed")
+            setLoadingDialogVisible(false)
+            setMessageDialogState(
+                MessageDialogState(
+                    visible = true,
+                    type = DialogType.SYNC_FAIL,
+                    title = context.getString(R.string.download_failed_title),
+                    message = e.message ?: context.getString(R.string.download_failed_message),
+                    dismissBtnText = context.getString(R.string.ok),
+                ),
+            )
+            return@launch
         }
 
         if (!isOffline) {
@@ -1491,35 +1535,6 @@ fun preLaunchApp(
             Timber.tag("preLaunchApp").e("Offline mode, skipping launch dependencies")
         }
 
-        if (!container.isUseLegacyDRM && !container.isLaunchRealSteam &&
-            !SteamService.isFileInstallable(context, "experimental-drm-20260116.tzst")
-        ) {
-            setLoadingMessage("Downloading extras")
-            SteamService.downloadFile(
-                onDownloadProgress = { setLoadingProgress(it / 1.0f) },
-                this,
-                context = context,
-                "experimental-drm-20260116.tzst",
-            ).await()
-        }
-        if (container.isLaunchRealSteam && !SteamService.isFileInstallable(context, "steam.tzst")) {
-            setLoadingMessage(context.getString(R.string.main_downloading_steam))
-            SteamService.downloadSteam(
-                onDownloadProgress = { setLoadingProgress(it / 1.0f) },
-                this,
-                context = context,
-            ).await()
-        }
-        if (container.isLaunchRealSteam && !SteamService.isFileInstallable(context, "steam-token.tzst")) {
-            setLoadingMessage("Downloading steam-token")
-            SteamService.downloadFile(
-                onDownloadProgress = { setLoadingProgress(it / 1.0f) },
-                this,
-                context = context,
-                "steam-token.tzst",
-            ).await()
-        }
-
         val loadingMessage = if (container.containerVariant.equals(Container.GLIBC)) {
             context.getString(R.string.main_installing_glibc)
         } else {
@@ -1528,9 +1543,24 @@ fun preLaunchApp(
         setLoadingMessage(loadingMessage)
         val imageFsInstallSuccess =
             ImageFsInstaller.installIfNeededFuture(context, context.assets, container) { progress ->
-                // Log.d("XServerScreen", "$progress")
                 setLoadingProgress(progress / 100f)
             }.get()
+
+        if (!imageFsInstallSuccess) {
+            Timber.tag("preLaunchApp").e("ImageFS installation failed")
+            setLoadingDialogVisible(false)
+            setMessageDialogState(
+                MessageDialogState(
+                    visible = true,
+                    type = DialogType.SYNC_FAIL,
+                    title = context.getString(R.string.install_failed_title),
+                    message = context.getString(R.string.install_failed_message),
+                    dismissBtnText = context.getString(R.string.ok),
+                ),
+            )
+            return@launch
+        }
+
         setLoadingMessage(context.getString(R.string.main_loading))
         setLoadingProgress(-1f)
 

app/src/main/java/app/gamenative/utils/BestConfigService.kt

@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap
  * Service for fetching best configurations for games from GameNative API.
  */
 object BestConfigService {
-    private const val API_BASE_URL = "https://gamenative-best-config-worker.gamenative.workers.dev/api/best-config"
+    private const val API_BASE_URL = "https://api.gamenative.app/api/best-config"
     private const val TIMEOUT_SECONDS = 10L
 
     private val httpClient = OkHttpClient.Builder()

app/src/main/java/app/gamenative/utils/SteamUtils.kt

@@ -32,15 +32,43 @@ import kotlin.io.path.absolutePathString
 import kotlin.io.path.name
 import timber.log.Timber
 import okhttp3.*
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.dnsoverhttps.DnsOverHttps
 import org.json.JSONObject
+import java.net.InetAddress
 import java.net.URLEncoder
 import java.util.concurrent.TimeUnit
 
 object SteamUtils {
 
+    private val bootstrapClient = OkHttpClient.Builder()
+        .protocols(listOf(Protocol.HTTP_2, Protocol.HTTP_1_1))
+        .build()
+
+    private val doh: DnsOverHttps = DnsOverHttps.Builder()
+        .client(bootstrapClient)
+        .url("https://dns.google/dns-query".toHttpUrl())
+        .bootstrapDnsHosts(
+            InetAddress.getByName("8.8.8.8"),
+            InetAddress.getByName("8.8.4.4"),
+        )
+        .build()
+
+    private val fallbackDns = object : Dns {
+        override fun lookup(hostname: String): List<InetAddress> {
+            return try {
+                doh.lookup(hostname)
+            } catch (e: Exception) {
+                Timber.w(e, "DoH lookup failed for $hostname, falling back to system DNS")
+                Dns.SYSTEM.lookup(hostname)
+            }
+        }
+    }
+
     internal val http = OkHttpClient.Builder()
-        .readTimeout(5, TimeUnit.MINUTES)      // from 2 min → 5 min
-        .protocols(listOf(Protocol.HTTP_1_1))  // skip HTTP/2 stream stalls
+        .dns(fallbackDns)
+        .readTimeout(5, TimeUnit.MINUTES)
+        .protocols(listOf(Protocol.HTTP_1_1))
         .retryOnConnectionFailure(true)
         .build()
 

app/src/main/java/com/winlator/xenvironment/ImageFsInstaller.java

@@ -151,7 +151,10 @@ else if (downloaded.exists()){
             }
             else {
                 Log.e("ImageFsInstaller", "Failed to install system files");
-                // AppUtils.showToast(context, R.string.unable_to_install_system_files);
+                if (downloaded.exists()) {
+                    Log.w("ImageFsInstaller", "Deleting corrupt archive so next attempt re-downloads: " + downloaded.getPath());
+                    downloaded.delete();
+                }
             }
             return success;
             // dialog.closeOnUiThread();

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

@@ -1088,4 +1088,8 @@
     <string name="manifest_content_untrusted">Indholdet er ikke betroet og blev ikke installeret.</string>
     <string name="manifest_type_mismatch">Downloadet indhold matcher ikke den forventede type.</string>
     <string name="manifest_glibc_not_supported">GLIBC-builds understøttes ikke.</string>
+    <string name="download_failed_title">Download mislykkedes</string>
+    <string name="download_failed_message">En nødvendig fil kunne ikke downloades. Kontrollér din netværksforbindelse, og prøv igen.</string>
+    <string name="install_failed_title">Installation mislykkedes</string>
+    <string name="install_failed_message">Systemfiler kunne ikke installeres. Prøv igen. Hvis problemet fortsætter, prøv et andet netværk eller brug en VPN.</string>
 </resources>

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

@@ -1158,4 +1158,8 @@
     <string name="manifest_content_untrusted">Inhalt ist nicht vertrauenswürdig und wurde nicht installiert.</string>
     <string name="manifest_type_mismatch">Heruntergeladener Inhalt entspricht nicht dem erwarteten Typ.</string>
     <string name="manifest_glibc_not_supported">GLIBC-Builds werden nicht unterstützt.</string>
+    <string name="download_failed_title">Download fehlgeschlagen</string>
+    <string name="download_failed_message">Eine erforderliche Datei konnte nicht heruntergeladen werden. Bitte überprüfe deine Netzwerkverbindung und versuche es erneut.</string>
+    <string name="install_failed_title">Installation fehlgeschlagen</string>
+    <string name="install_failed_message">Systemdateien konnten nicht installiert werden. Bitte versuche es erneut. Falls das Problem weiterhin besteht, versuche ein anderes Netzwerk oder verwende ein VPN.</string>
 </resources>

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

@@ -1223,4 +1223,8 @@
     <string name="manifest_content_untrusted">El contenido no es de confianza y no se instaló.</string>
     <string name="manifest_type_mismatch">El contenido descargado no coincide con el tipo esperado.</string>
     <string name="manifest_glibc_not_supported">Las versiones GLIBC no son compatibles.</string>
+    <string name="download_failed_title">Error de descarga</string>
+    <string name="download_failed_message">No se pudo descargar un archivo necesario. Comprueba tu conexión de red e inténtalo de nuevo.</string>
+    <string name="install_failed_title">Error de instalación</string>
+    <string name="install_failed_message">No se pudieron instalar los archivos del sistema. Inténtalo de nuevo. Si el problema persiste, prueba con una red diferente o usa una VPN.</string>
 </resources>