android: more fixes, extensions + libraries offline

GarboMuffin · GarboMuffin · commit 44d81f1cea6a · 2025-11-09T20:59:55.000-06:00
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -56,6 +56,7 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.webkit)
+    implementation(libs.brotlidec)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -16,14 +16,12 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.TurboWarp">
+            android:theme="@style/Theme.TurboWarp"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
diff --git a/android/app/src/main/java/org/turbowarp/android/Assets.kt b/android/app/src/main/java/org/turbowarp/android/Assets.kt
@@ -0,0 +1,17 @@
+package org.turbowarp.android
+
+import android.content.Context
+import org.brotli.dec.BrotliInputStream
+import java.io.InputStream
+
+fun readAssetAsString(context: Context, path: String): String {
+    val stream = context.assets.open(path)
+    val reader = stream.bufferedReader()
+    return reader.readText()
+}
+
+fun readBrotliAssetAsStream(context: Context, path: String): InputStream {
+    val compressedDataStream = context.assets.open(path)
+    val decompressedDataStream = BrotliInputStream(compressedDataStream)
+    return decompressedDataStream
+}
diff --git a/android/app/src/main/java/org/turbowarp/android/L10N.kt b/android/app/src/main/java/org/turbowarp/android/L10N.kt
@@ -9,7 +9,6 @@ object L10N {
     private fun stringsWithDescriptionToMap(jsonObject: JSONObject): Map<String, String> {
         val map = mutableMapOf<String, String>()
         for (id in jsonObject.keys()) {
-            println(id)
             val infoObject = jsonObject.getJSONObject(id)
             map[id] = infoObject.getString("string")
         }
diff --git a/android/app/src/main/java/org/turbowarp/android/TurboWarpAssets.kt b/android/app/src/main/java/org/turbowarp/android/TurboWarpAssets.kt
diff --git a/android/app/src/main/java/org/turbowarp/android/TurboWarpWebView.kt b/android/app/src/main/java/org/turbowarp/android/TurboWarpWebView.kt
@@ -2,6 +2,7 @@ package org.turbowarp.android
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
 import android.view.ViewGroup
@@ -22,59 +23,147 @@ import java.net.URLConnection
 import androidx.core.net.toUri
 import org.json.JSONArray
 import org.json.JSONObject
+import java.io.InputStream
+
+private fun addIndexIfNeeded(path: String): String {
+    return if (path.endsWith("/")) {
+        "$path/index.html"
+    } else {
+        path
+    }
+}
+
+private fun makeFetchableResponse(data: InputStream, path: String): WebResourceResponse {
+    // TODO: use our own mime types instead of the system's
+    val mimeType = URLConnection.guessContentTypeFromName(path)
+
+    return WebResourceResponse(
+        mimeType,
+        null,
+        200,
+        "OK",
+        mapOf<String, String>(
+            "Access-Control-Allow-Origin" to "*"
+        ),
+        data,
+    )
+}
+
+private fun makeErrorResponse(): WebResourceResponse {
+    // TODO
+    return WebResourceResponse(null, null, null)
+}
 
 private class ServeAsset(
     private val context: Context,
     private val subfolder: String
 ) : WebViewAssetLoader.PathHandler {
     override fun handle(path: String): WebResourceResponse? {
         return try {
-            val assetPath = "$subfolder/$path"
-            val inputStream = context.assets.open(assetPath)
-            val mimeType = URLConnection.guessContentTypeFromName(assetPath)
-            WebResourceResponse(mimeType, null, inputStream)
+            // TODO: probably vulnerable to path traversal
+            val pathWithIndex = addIndexIfNeeded(path)
+            val assetPath = "$subfolder/$pathWithIndex"
+
+            val stream = context.assets.open(assetPath)
+            makeFetchableResponse(stream, pathWithIndex)
+        } catch (_: IOException) {
+            makeErrorResponse()
+        }
+    }
+}
+
+private class ServeBrotliAsset(
+    private val context: Context,
+    private val subfolder: String
+) : WebViewAssetLoader.PathHandler {
+    override fun handle(path: String): WebResourceResponse? {
+        return try {
+            // TODO: probably vulnerable to path traversal
+            val pathWithIndex = addIndexIfNeeded(path)
+            val compressedAssetPath = "$subfolder/$pathWithIndex.br"
+
+            val stream = readBrotliAssetAsStream(context, compressedAssetPath)
+            makeFetchableResponse(stream, pathWithIndex)
         } catch (_: IOException) {
-            // TODO: better error page?
-            WebResourceResponse(null, null, null)
+            // TODO: does this fall-through to remote or fallthrough?
+            null
+        }
+    }
+}
+
+private class ServeLibraryAsset(
+    private val context: Context,
+    private val subfolder: String
+) : WebViewAssetLoader.PathHandler {
+    private fun findMd5ext(path: String): String? {
+        val md5ext = Regex("[0-9a-f]{32}\\.\\w{3}", RegexOption.IGNORE_CASE).find(path)
+        return md5ext?.value
+    }
+
+    override fun handle(path: String): WebResourceResponse? {
+        return try {
+            val md5ext = findMd5ext(path)
+
+            if (md5ext == null) {
+                makeErrorResponse()
+            } else {
+                val compressedAssetPath = "$subfolder/$md5ext.br"
+                val stream = readBrotliAssetAsStream(context, compressedAssetPath)
+                makeFetchableResponse(stream, md5ext)
+            }
+        } catch (_: IOException) {
+            makeErrorResponse()
         }
     }
 }
 
 private class TurboWarpWebViewClient(
     private val context: Context,
     private val preloads: List<String>,
+    private val initialUrl: String
 ) : WebViewClient() {
     private val assetLoaders = mapOf(
         "editor.android-assets.turbowarp.org" to WebViewAssetLoader.Builder()
             .setDomain("editor.android-assets.turbowarp.org")
             .addPathHandler("/", ServeAsset(context, "dist-renderer-webpack/editor"))
             .build(),
 
-        "packager.android-assets.turbowarp.org" to WebViewAssetLoader.Builder()
-            .setDomain("packager.android-assets.turbowarp.org")
-            .addPathHandler("/", ServeAsset(context, "packager"))
+        "extensions.turbowarp.org" to WebViewAssetLoader.Builder()
+            .setDomain("extensions.turbowarp.org")
+            .addPathHandler("/", ServeBrotliAsset(context, "dist-extensions"))
             .build(),
 
-        "about.android-assets.turbowarp.org" to WebViewAssetLoader.Builder()
-            .setDomain("about.android-assets.turbowarp.org")
-            .addPathHandler("/", ServeAsset(context, "about"))
-            .build()
+        "assets.scratch.mit.edu" to WebViewAssetLoader.Builder()
+            .setDomain("assets.scratch.mit.edu")
+            .addPathHandler("/", ServeLibraryAsset(context, "dist-library-files"))
+            .build(),
+
+        "cdn.assets.scratch.mit.edu" to WebViewAssetLoader.Builder()
+            .setDomain("cdn.assets.scratch.mit.edu")
+            .addPathHandler("/", ServeLibraryAsset(context, "dist-library-files"))
+            .build(),
+
+        "packager.turbowarp.org" to WebViewAssetLoader.Builder()
+            .setDomain("packager.turbowarp.org")
+            .addPathHandler("/", ServeAsset(context, "packager"))
+            .build(),
     )
 
     override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
 
+        // Execute preloads in IIFE so that we only expose the variables we want to
         val sb = StringBuilder()
-        sb.append("(function() { 'use strict';\n");
+        sb.append("(function() { 'use strict';\n")
         for (preloadName in preloads) {
             // We assume that the preloads variable is trusted, don't need to worry about path
             // traversal or anything like that.
             val preloadScript = readAssetAsString(context, "preload/$preloadName")
             sb.append(preloadScript)
         }
-        sb.append("\n}());");
+        sb.append("\n}());")
 
-        view?.evaluateJavascript(sb.toString(), null);
+        view?.evaluateJavascript(sb.toString(), null)
     }
 
     override fun shouldInterceptRequest(
@@ -84,6 +173,18 @@ private class TurboWarpWebViewClient(
         val loader = request.url.host?.let { assetLoaders[it] }
         return loader?.shouldInterceptRequest(request.url)
     }
+
+    override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+        // Open links in browser app
+        // TODO: can we make this feel a bit less weird? like that custom tabs thing?
+        if (request?.url.toString() != initialUrl) {
+            val intent = Intent(Intent.ACTION_VIEW, request?.url)
+            view?.context?.startActivity(intent)
+            return true
+        }
+
+        return super.shouldOverrideUrlLoading(view, request)
+    }
 }
 
 interface IpcHandler {
@@ -152,9 +253,10 @@ fun TurboWarpWebView(
                 settings.allowFileAccess = false
                 settings.allowContentAccess = false
 
-                // Easier debugging
+                // To help troubleshooting
                 val version = BuildConfig.VERSION_NAME
-                settings.userAgentString += " org.turbowarp.android/$version"
+                val appId = BuildConfig.APPLICATION_ID
+                settings.userAgentString += " $appId/$version"
 
                 if (ipcHandler != null) {
                     val origin = getOrigin(url)
@@ -167,11 +269,15 @@ fun TurboWarpWebView(
                     addJavascriptInterface(IpcSync(ipcHandler), "AndroidIpcSync")
                 }
 
-                webViewClient = TurboWarpWebViewClient(context, if (ipcHandler == null) {
-                    preloads
-                } else {
-                    listOf("ipc-init.js").plus(preloads)
-                })
+                webViewClient = TurboWarpWebViewClient(
+                    context = context,
+                    initialUrl = url,
+                    preloads = if (ipcHandler == null) {
+                        preloads
+                    } else {
+                        listOf("ipc-init.js").plus(preloads)
+                    }
+                )
             }
         },
         update = { webView ->
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 agp = "8.13.0"
+brotlidec = "0.1.2"
 kotlin = "2.0.21"
 coreKtx = "1.10.1"
 junit = "4.13.2"
@@ -17,6 +18,7 @@ webkit = "1.14.0"
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
+brotlidec = { module = "org.brotli:dec", version.ref = "brotlidec" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ object L10N {`
`9`	`9`	`private fun stringsWithDescriptionToMap(jsonObject: JSONObject): Map<String, String> {`
`10`	`10`	`val map = mutableMapOf<String, String>()`
`11`	`11`	`for (id in jsonObject.keys()) {`
`12`		`- println(id)`
`13`	`12`	`val infoObject = jsonObject.getJSONObject(id)`
`14`	`13`	`map[id] = infoObject.getString("string")`
`15`	`14`	`}`