Skip to content

Commit e79c451

Browse files
MygodMygod
authored
Merge pull request #12 from Mygod/brotli
Support brotli compression
2 parents 303e662 + c762bd1 commit e79c451

File tree

14 files changed

+134
-30
lines changed

14 files changed

+134
-30
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
build:
44
working_directory: ~/code
55
docker:
6-
- image: cimg/android:2024.08.1
6+
- image: cimg/android:2024.11.1-ndk
77
environment:
88
GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process"
99
steps:

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "brotli"]
2+
path = brotli
3+
url = https://github.com/google/brotli.git

‎app/build.gradle.kts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,17 @@ android {
5656
kotlinOptions.jvmTarget = javaVersion.toString()
5757
packaging.resources.excludes += "/META-INF/{AL2.0,LGPL2.1}"
5858
lint.informational.add("MissingTranslation")
59+
60+
sourceSets.getByName("main") {
61+
java.srcDirs("../brotli/java")
62+
java.excludes.add("**/brotli/**/*Test.java")
63+
}
64+
externalNativeBuild {
65+
cmake {
66+
path = file("src/main/cpp/CMakeLists.txt")
67+
version = "3.22.1"
68+
}
69+
}
5970
}
6071

6172
dependencies {
@@ -66,7 +77,7 @@ dependencies {
6677
implementation(libs.browser)
6778
implementation(libs.core.ktx)
6879
implementation(libs.firebase.analytics)
69-
implementation(libs.firebase.crashlytics)
80+
implementation(libs.firebase.crashlytics.ndk)
7081
implementation(libs.fragment.ktx)
7182
implementation(libs.hiddenapibypass)
7283
implementation(libs.material)

‎app/src/main/cpp/CMakeLists.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
cmake_minimum_required(VERSION 3.22.1)
2+
project("brotli")
3+
set(BROTLI_DIR "../../../../brotli")
4+
file(GLOB COMMON_SOURCES "${BROTLI_DIR}/c/common/*.c")
5+
file(GLOB ENC_SOURCES "${BROTLI_DIR}/c/enc/*.c")
6+
add_library(${CMAKE_PROJECT_NAME} SHARED
7+
${COMMON_SOURCES}
8+
${ENC_SOURCES}
9+
${BROTLI_DIR}/java/org/brotli/wrapper/enc/encoder_jni.cc
10+
)
11+
target_link_libraries(${CMAKE_PROJECT_NAME}
12+
# List libraries link to the target library
13+
#android
14+
#log
15+
)
16+
include_directories(
17+
${BROTLI_DIR}/c/include
18+
)

‎app/src/main/java/be/mygod/reactmap/ConfigDialogFragment.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,18 @@ class ConfigDialogFragment : AlertDialogFragment<ConfigDialogFragment.Arg, Empty
7474
}
7575

7676
override val ret get() = try {
77-
val uri = urlEdit.text!!.toString().toUri().let {
78-
require(BuildConfig.DEBUG || "https".equals(it.scheme, true)) { getText(R.string.error_https_only) }
79-
it.host!!
80-
it.toString()
81-
}
77+
val uri = urlEdit.text!!.toString().toUri()
78+
require(BuildConfig.DEBUG || "https".equals(uri.scheme, true)) { getText(R.string.error_https_only) }
79+
uri.host!!
80+
val uriString = uri.toString()
8281
val oldApiUrl = ReactMapHttpEngine.apiUrl
82+
val changing = oldApiUrl != ReactMapHttpEngine.apiUrl(uri)
8383
app.pref.edit {
84-
putString(App.KEY_ACTIVE_URL, uri)
85-
putStringSet(KEY_HISTORY_URL, historyUrl + uri)
84+
putString(App.KEY_ACTIVE_URL, uriString)
85+
putStringSet(KEY_HISTORY_URL, historyUrl + uriString)
86+
if (changing) remove(ReactMapHttpEngine.KEY_BROTLI)
8687
}
87-
if (oldApiUrl != ReactMapHttpEngine.apiUrl) BackgroundLocationReceiver.onApiChanged()
88+
if (changing) BackgroundLocationReceiver.onApiChanged()
8889
Empty()
8990
} catch (e: Exception) {
9091
Toast.makeText(requireContext(), e.readableMessage, Toast.LENGTH_LONG).show()

‎app/src/main/java/be/mygod/reactmap/follower/LocationSetter.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ class LocationSetter(appContext: Context, workerParams: WorkerParameters) : Coro
165165
}.build())
166166
Result.success()
167167
}
168+
302 -> {
169+
ReactMapHttpEngine.detectBrotliError(conn)?.let { notifyError(it) }
170+
Result.retry()
171+
}
168172
else -> {
169173
val error = conn.findErrorStream.bufferedReader().readText()
170174
notifyErrors(error)

‎app/src/main/java/be/mygod/reactmap/webkit/BaseReactMapFragment.kt‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.annotation.RequiresApi
2929
import androidx.core.net.toUri
3030
import androidx.core.os.bundleOf
3131
import androidx.fragment.app.Fragment
32+
import androidx.lifecycle.lifecycleScope
3233
import be.mygod.reactmap.App.Companion.app
3334
import be.mygod.reactmap.BuildConfig
3435
import be.mygod.reactmap.R
@@ -37,6 +38,7 @@ import be.mygod.reactmap.util.UnblockCentral
3738
import be.mygod.reactmap.util.findErrorStream
3839
import com.google.android.material.snackbar.Snackbar
3940
import com.google.firebase.analytics.FirebaseAnalytics
41+
import kotlinx.coroutines.launch
4042
import org.json.JSONArray
4143
import org.json.JSONException
4244
import org.json.JSONObject
@@ -123,6 +125,7 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
123125

124126
protected lateinit var web: WebView
125127
protected lateinit var glocation: Glocation
128+
private lateinit var postInterceptor: PostInterceptor
126129
protected lateinit var hostname: String
127130

128131
private var loginText: String? = null
@@ -152,6 +155,7 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
152155
javaScriptEnabled = true
153156
}
154157
glocation = Glocation(this, this@BaseReactMapFragment)
158+
postInterceptor = PostInterceptor(this)
155159
webChromeClient = object : WebChromeClient() {
156160
@Suppress("KotlinConstantConditions")
157161
override fun onConsoleMessage(consoleMessage: ConsoleMessage) = consoleMessage.run {
@@ -194,11 +198,15 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
194198

195199
override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
196200
glocation.clear()
201+
postInterceptor.clear()
197202
val uri = url.toUri()
198203
if (!BuildConfig.DEBUG && "http".equals(uri.scheme, true)) {
199204
web.loadUrl(uri.buildUpon().scheme("https").build().toString())
200205
}
201-
if (uri.host == hostname) glocation.setupGeolocation()
206+
if (uri.host == hostname) {
207+
glocation.setupGeolocation()
208+
postInterceptor.setup()
209+
}
202210
onPageStarted()
203211
}
204212

@@ -233,9 +241,7 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
233241
return handleTranslation(request)
234242
}
235243
if (vendorJsMatcher.matchEntire(path) != null) return handleVendorJs(request)
236-
if (path == "/graphql" && request.method == "POST") {
237-
request.requestHeaders.remove("_interceptedBody")?.let { return handleGraphql(request, it) }
238-
}
244+
postInterceptor.extractBody(request)?.let { return handleGraphql(request, it) }
239245
}
240246
if (ReactMapHttpEngine.isCronet && (path.substringAfterLast('.').lowercase(Locale.ENGLISH)
241247
in mediaExtensions || request.requestHeaders.any { (key, value) ->
@@ -374,7 +380,12 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
374380
setupConnection(request, conn)
375381
ReactMapHttpEngine.writeCompressed(conn, body)
376382
}
377-
createResponse(conn) { _ -> conn.findErrorStream }
383+
if (conn.responseCode == 302) {
384+
ReactMapHttpEngine.detectBrotliError(conn)?.let {
385+
lifecycleScope.launch { Snackbar.make(web, it, Snackbar.LENGTH_LONG).show() }
386+
}
387+
null
388+
} else createResponse(conn) { _ -> conn.findErrorStream }
378389
} catch (e: IOException) {
379390
Timber.d(e)
380391
null

‎app/src/main/java/be/mygod/reactmap/webkit/Glocation.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Glocation(private val web: WebView, private val fragment: BaseReactMapFrag
5353
fragment.lifecycle.addObserver(this)
5454
it.context
5555
}
56-
private val jsSetup = fragment.resources.openRawResource(R.raw.setup).bufferedReader().readText()
56+
private val jsSetup = fragment.resources.openRawResource(R.raw.setup_glocation).bufferedReader().readText()
5757
private val pendingRequests = mutableSetOf<Long>()
5858
private var pendingWatch = false
5959
private val activeListeners = mutableSetOf<Long>()

‎app/src/main/java/be/mygod/reactmap/webkit/PostInterceptor.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package be.mygod.reactmap.webkit
2+
3+
import android.util.LongSparseArray
4+
import android.webkit.JavascriptInterface
5+
import android.webkit.WebResourceRequest
6+
import android.webkit.WebView
7+
import be.mygod.reactmap.R
8+
import com.google.common.hash.Hashing
9+
import java.nio.charset.Charset
10+
11+
class PostInterceptor(private val web: WebView) {
12+
private val bodyLookup = LongSparseArray<String>().also {
13+
web.addJavascriptInterface(this, "_postInterceptor")
14+
}
15+
private val jsSetup = web.resources.openRawResource(R.raw.setup_interceptor).bufferedReader().readText()
16+
17+
fun setup() = web.evaluateJavascript(jsSetup, null)
18+
19+
@JavascriptInterface
20+
fun register(body: String): String {
21+
val key = Hashing.sipHash24().hashString(body, Charset.defaultCharset()).asLong()
22+
synchronized(bodyLookup) { bodyLookup.put(key, body) }
23+
return key.toULong().toString(36)
24+
}
25+
fun extractBody(request: WebResourceRequest) = request.requestHeaders.remove("Body-Digest")?.let { key ->
26+
synchronized(bodyLookup) {
27+
val index = bodyLookup.indexOfKey(key.toULong(36).toLong())
28+
if (index < 0) null else bodyLookup.valueAt(index).also { bodyLookup.removeAt(index) }
29+
}
30+
}
31+
fun clear() = synchronized(bodyLookup) { bodyLookup.clear() }
32+
}

‎app/src/main/java/be/mygod/reactmap/webkit/ReactMapHttpEngine.kt‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package be.mygod.reactmap.webkit
22

3+
import android.net.Uri
34
import android.net.http.ConnectionMigrationOptions
45
import android.net.http.HttpEngine
56
import android.os.Build
@@ -14,6 +15,9 @@ import kotlinx.coroutines.Dispatchers
1415
import kotlinx.coroutines.GlobalScope
1516
import kotlinx.coroutines.launch
1617
import kotlinx.coroutines.suspendCancellableCoroutine
18+
import org.brotli.wrapper.enc.BrotliOutputStream
19+
import org.brotli.wrapper.enc.Encoder
20+
import timber.log.Timber
1721
import java.io.ByteArrayOutputStream
1822
import java.io.File
1923
import java.net.HttpURLConnection
@@ -25,6 +29,7 @@ import kotlin.coroutines.resumeWithException
2529

2630
object ReactMapHttpEngine {
2731
private const val KEY_COOKIE = "cookie.graphql"
32+
const val KEY_BROTLI = "http.brotli"
2833

2934
val isCronet get() = Build.VERSION.SDK_INT >= 34 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
3035
SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 7
@@ -44,9 +49,10 @@ object ReactMapHttpEngine {
4449
}.build()
4550
}
4651

47-
val apiUrl get() = app.activeUrl.toUri().buildUpon().apply {
52+
fun apiUrl(base: Uri) = base.buildUpon().apply {
4853
path("/graphql")
4954
}.build().toString()
55+
val apiUrl get() = apiUrl(app.activeUrl.toUri())
5056

5157
private fun openConnection(url: String) = (if (isCronet) {
5258
engine.openConnection(URL(url))
@@ -92,16 +98,33 @@ object ReactMapHttpEngine {
9298
val buffer get() = buf
9399
val length get() = count
94100
}
101+
private val initBrotli by lazy { System.loadLibrary("brotli") }
95102
fun writeCompressed(conn: HttpURLConnection, body: String) {
96-
conn.setRequestProperty("Content-Encoding", "deflate")
103+
val brotli = app.pref.getBoolean(KEY_BROTLI, true)
104+
conn.setRequestProperty("Content-Encoding", if (brotli) {
105+
initBrotli
106+
"br"
107+
} else "deflate")
97108
conn.doOutput = true
109+
conn.instanceFollowRedirects = false
98110
val uncompressed = body.toByteArray()
99111
val out = ExposingBufferByteArrayOutputStream()
100-
DeflaterOutputStream(out, Deflater(Deflater.BEST_COMPRESSION)).use {
101-
it.write(uncompressed)
102-
}
103-
// Timber.tag("CompressionStat").i("${out.length}/${uncompressed.size} ~ ${out.length.toDouble() / uncompressed.size}")
112+
// val time = System.nanoTime()
113+
(if (brotli) BrotliOutputStream(out, Encoder.Parameters().apply {
114+
setMode(Encoder.Mode.TEXT)
115+
setQuality(5)
116+
}) else DeflaterOutputStream(out, Deflater(Deflater.BEST_COMPRESSION))).use { it.write(uncompressed) }
117+
// Timber.tag("CompressionStat").i("$brotli ${out.length}/${uncompressed.size} ~ ${out.length.toDouble() / uncompressed.size} ${(System.nanoTime() - time) * .000_001}ms")
104118
conn.setFixedLengthStreamingMode(out.length)
105119
conn.outputStream.use { it.write(out.buffer, 0, out.length) }
106120
}
121+
122+
fun detectBrotliError(conn: HttpURLConnection): String? {
123+
val path = conn.getHeaderField("Location")
124+
if (path.startsWith("/error/")) return Uri.decode(path.substring(7)).also {
125+
if (conn.url.host == app.activeUrl.toUri().host && it == "unsupported content encoding \"br\"") app.pref.edit { putBoolean(KEY_BROTLI, false) }
126+
}
127+
Timber.w(Exception(path))
128+
return path
129+
}
107130
}

0 commit comments

Comments
 (0)