feat: unify download architecture with hub_uuid-based dispatch

xz-dev · xz-dev · commit d17a6412d141 · 2026-02-24T09:44:50.000+08:00
- Add hub_uuid parameter throughout the Kotlin download pipeline
  (GetterService -&gt; RustDownloader -&gt; RustDownloaderAdapter -&gt; DownloadTasker)
  so Rust can route downloads to the correct external downloader
- Add registerDownloader/unregisterDownloader RPC methods to GetterService
  and GetterPort for external downloader registration
- Create KotlinDownloaderRpcServer: JSON-RPC server exposing Kotlin-side
  downloader implementations to Rust's ExternalRpcDownloader
- Create GooglePlayDownloaderImpl: bridges Google Play downloads through
  Rust's default HTTP downloader via the new dispatch system
- Register Google Play downloader at startup in Init.kt
- Pass CoolApk authentication headers in DownloadItem so the default HTTP
  downloader can use them for CDN requests that may require auth
diff --git a/app/src/main/java/net/xzos/upgradeall/wrapper/download/DownloadTasker.kt b/app/src/main/java/net/xzos/upgradeall/wrapper/download/DownloadTasker.kt
@@ -124,7 +124,7 @@ class DownloadTasker(
             dir,
             CoroutineScope(SupervisorJob() + Dispatchers.IO)
         ).apply {
-            downloadList.forEach { addTask(it.toRustInputData(name)) }
+            downloadList.forEach { addTask(it.toRustInputData(name, wrapper.hub.uuid)) }
         }.also { d ->
             d.observe { status ->
                 val snap = getFileTaskerSnap(status.taskStatus())
diff --git a/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/DownloaderHelper.kt b/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/DownloaderHelper.kt
@@ -25,11 +25,15 @@ object DownloaderHelper {
 /**
  * Convert DownloadItem to RustInputData
  */
-fun net.xzos.upgradeall.websdk.data.json.DownloadItem.toRustInputData(filename: String): RustInputData {
+fun net.xzos.upgradeall.websdk.data.json.DownloadItem.toRustInputData(
+    filename: String,
+    hubUuid: String? = null
+): RustInputData {
     return RustInputData(
         name = filename,
         url = this.url,
         headers = this.headers ?: emptyMap(),
-        cookies = this.cookies ?: emptyMap()
+        cookies = this.cookies ?: emptyMap(),
+        hubUuid = hubUuid
     )
 }
diff --git a/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/GetterService.kt b/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/GetterService.kt
@@ -70,6 +70,7 @@ interface GetterService {
         destPath: String,
         headers: Map<String, String>? = null,
         cookies: Map<String, String>? = null,
+        hubUuid: String? = null,
     ): TaskIdResponse
 
     suspend fun downloadGetStatus(taskId: String): TaskInfo
@@ -84,6 +85,17 @@ interface GetterService {
     suspend fun downloadPause(taskId: String): Boolean
 
     suspend fun downloadResume(taskId: String): Boolean
+
+    // ========================================================================
+    // External Downloader Registration
+    // ========================================================================
+
+    suspend fun registerDownloader(
+        hubUuid: String,
+        rpcUrl: String,
+    ): Boolean
+
+    suspend fun unregisterDownloader(hubUuid: String): Boolean
 }
 
 /**
diff --git a/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/GetterServiceImpl.kt b/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/GetterServiceImpl.kt
@@ -125,6 +125,7 @@ class GetterServiceImpl(
         destPath: String,
         headers: Map<String, String>?,
         cookies: Map<String, String>?,
+        hubUuid: String?,
     ): TaskIdResponse {
         val params =
             mutableMapOf<String, Any?>(
@@ -133,6 +134,7 @@ class GetterServiceImpl(
             )
         if (headers != null) params["headers"] = headers
         if (cookies != null) params["cookies"] = cookies
+        if (hubUuid != null) params["hub_uuid"] = hubUuid
 
         return client.invoke("download_submit", params, typeOf<TaskIdResponse>())
     }
@@ -171,6 +173,27 @@ class GetterServiceImpl(
         return client.invoke("download_resume", params, typeOf<Boolean>())
     }
 
+    // ========================================================================
+    // External Downloader Registration
+    // ========================================================================
+
+    override suspend fun registerDownloader(
+        hubUuid: String,
+        rpcUrl: String,
+    ): Boolean {
+        val params =
+            mapOf(
+                "hub_uuid" to hubUuid,
+                "rpc_url" to rpcUrl,
+            )
+        return client.invoke("register_downloader", params, typeOf<Boolean>())
+    }
+
+    override suspend fun unregisterDownloader(hubUuid: String): Boolean {
+        val params = mapOf("hub_uuid" to hubUuid)
+        return client.invoke("unregister_downloader", params, typeOf<Boolean>())
+    }
+
     /**
      * Close the underlying WebSocket connection
      */
diff --git a/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/RustDownloader.kt b/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/RustDownloader.kt
@@ -17,6 +17,7 @@ class RustDownloader(
     private val destPath: String,
     private val headers: Map<String, String>? = null,
     private val cookies: Map<String, String>? = null,
+    private val hubUuid: String? = null,
     private val scope: CoroutineScope
 ) {
     private var taskId: String? = null
@@ -41,7 +42,7 @@ class RustDownloader(
                 _status.value = RustDownloadStatus.START
 
                 // Submit download task
-                val response = getterService.downloadSubmit(url, destPath, headers, cookies)
+                val response = getterService.downloadSubmit(url, destPath, headers, cookies, hubUuid)
                 taskId = response.taskId
 
                 // Start polling for updates
@@ -238,12 +239,14 @@ class RustDownloaderBuilder(private val getterService: GetterService) {
     private var destPath: String = ""
     private var headers: Map<String, String>? = null
     private var cookies: Map<String, String>? = null
+    private var hubUuid: String? = null
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     fun url(url: String) = apply { this.url = url }
     fun destPath(path: String) = apply { this.destPath = path }
     fun headers(headers: Map<String, String>) = apply { this.headers = headers }
     fun cookies(cookies: Map<String, String>) = apply { this.cookies = cookies }
+    fun hubUuid(hubUuid: String?) = apply { this.hubUuid = hubUuid }
     fun scope(scope: CoroutineScope) = apply { this.scope = scope }
 
     fun build(): RustDownloader {
@@ -253,6 +256,6 @@ class RustDownloaderBuilder(private val getterService: GetterService) {
         // Ensure parent directory exists
         File(destPath).parentFile?.mkdirs()
 
-        return RustDownloader(getterService, url, destPath, headers, cookies, scope)
+        return RustDownloader(getterService, url, destPath, headers, cookies, hubUuid, scope)
     }
 }
diff --git a/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/RustDownloaderAdapter.kt b/core-getter/rpc/src/main/java/net/xzos/upgradeall/getter/rpc/RustDownloaderAdapter.kt
@@ -27,7 +27,8 @@ class RustDownloaderAdapter(
                 url = inputData.url,
                 destPath = destFile.absolutePath,
                 headers = inputData.headers,
-                cookies = inputData.cookies
+                cookies = inputData.cookies,
+                hubUuid = inputData.hubUuid
             )
         )
     }
@@ -87,6 +88,8 @@ class RustDownloaderAdapter(
                 taskData.headers?.let { builder.headers(it) }
                 // Add cookies if present
                 taskData.cookies?.let { builder.cookies(it) }
+                // Add hubUuid if present
+                taskData.hubUuid?.let { builder.hubUuid(it) }
 
                 val downloader = builder.build()
 
@@ -180,12 +183,14 @@ data class RustTaskData(
     val url: String,
     val destPath: String,
     val headers: Map<String, String> = emptyMap(),
-    val cookies: Map<String, String> = emptyMap()
+    val cookies: Map<String, String> = emptyMap(),
+    val hubUuid: String? = null
 )
 
 data class RustInputData(
     val name: String,
     val url: String,
     val headers: Map<String, String> = emptyMap(),
-    val cookies: Map<String, String> = emptyMap()
+    val cookies: Map<String, String> = emptyMap(),
+    val hubUuid: String? = null
 )
diff --git a/core-getter/src/main/java/net/xzos/upgradeall/getter/GetterPort.kt b/core-getter/src/main/java/net/xzos/upgradeall/getter/GetterPort.kt
@@ -158,6 +158,18 @@ class GetterPort(
         }
     }
 
+    fun registerDownloader(
+        hubUuid: String,
+        rpcUrl: String,
+    ): Boolean? {
+        if (!init()) return null
+        return runBlocking {
+            service
+                .registerDownloader(hubUuid, rpcUrl)
+                .also { Log.d("GetterPort", "registerDownloader: uuid=$hubUuid url=$rpcUrl result=$it") }
+        }
+    }
+
     fun getDownloadInfo(
         hubUuid: String,
         appData: Map<String, String>,
diff --git a/core-getter/src/main/rust/getter b/core-getter/src/main/rust/getter
@@ -1 +1 @@
-Subproject commit 680adee84a6201f01e2ff88cf1de0a28c7d6b931
+Subproject commit 72fa3bc963347af0a0d2d35963e7f668b75eaf9a
diff --git a/core-websdk/build.gradle b/core-websdk/build.gradle
@@ -69,5 +69,6 @@ dependencies {
     implementation libs.ktor.server.cio
 
     api project(':core-getter')
+    api project(':core-getter:rpc')
     api project(':core-websdk:data')
 }
diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/Init.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/Init.kt
@@ -8,6 +8,8 @@ import net.xzos.upgradeall.core.websdk.api.ServerApiProxy
 import net.xzos.upgradeall.core.websdk.api.client_proxy.hubs.CoolApk
 import net.xzos.upgradeall.core.websdk.api.client_proxy.hubs.GooglePlay
 import net.xzos.upgradeall.core.websdk.api.client_proxy.rpc.KotlinHubRpcServer
+import net.xzos.upgradeall.core.websdk.api.client_proxy.rpc.KotlinDownloaderRpcServer
+import net.xzos.upgradeall.core.websdk.api.client_proxy.rpc.GooglePlayDownloaderImpl
 import net.xzos.upgradeall.core.websdk.api.web.proxy.OkhttpProxy
 import net.xzos.upgradeall.getter.GetterPort
 import net.xzos.upgradeall.getter.RustConfig
@@ -25,6 +27,8 @@ val getterPort get() = data.getterPort!!
 lateinit var dataCacheManager: DataCacheManager
 
 private var kotlinHubRpcServer: KotlinHubRpcServer? = null
+private var kotlinDownloaderRpcServer: KotlinDownloaderRpcServer? = null
+private var googlePlayDownloaderImpl: GooglePlayDownloaderImpl? = null
 
 fun initSdkCache(config: CacheConfig) {
     dataCacheManager = DataCacheManager(config)
@@ -59,6 +63,17 @@ suspend fun runGetterService(context: Context) {
     server.getHubUuids().forEach { uuid ->
         getterPort.registerProvider(uuid, kotlinRpcUrl)
     }
+
+    // Start Google Play Downloader RPC Server and register it with Rust getter
+    val googlePlayDownloader = GooglePlayDownloaderImpl(getterPort.getService())
+    googlePlayDownloaderImpl = googlePlayDownloader
+    val downloaderServer = KotlinDownloaderRpcServer(googlePlayDownloader)
+    val downloaderRpcUrl = downloaderServer.start()
+    kotlinDownloaderRpcServer = downloaderServer
+
+    // Register Google Play downloader with the Rust getter via JSON-RPC
+    // UUID matches GooglePlay hub UUID
+    getterPort.registerDownloader("65c2f60c-7d08-48b8-b4ba-ac6ee924f6fa", downloaderRpcUrl)
 }
 
 fun renewSdkApi(host: String) {
diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/hubs/CoolApk.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/hubs/CoolApk.kt
@@ -113,7 +113,7 @@ internal class CoolApk(
                     ?: return null
             return listOf(
                 DownloadItem(
-                    newAssets.fileName, newAssets.downloadUrl ?: return null, null, null
+                    newAssets.fileName, newAssets.downloadUrl ?: return null, headerMap, null
                 )
             )
         } else {
@@ -122,7 +122,7 @@ internal class CoolApk(
                 DownloadItem(
                     assetGson.fileName,
                     request.url.toString(),
-                    null,
+                    headerMap,
                     null
                 )
             )
diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/rpc/GooglePlayDownloaderImpl.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/rpc/GooglePlayDownloaderImpl.kt
diff --git a/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/rpc/KotlinDownloaderRpcServer.kt b/core-websdk/src/main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/rpc/KotlinDownloaderRpcServer.kt

Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,6 @@ dependencies {`
`69`	`69`	`implementation libs.ktor.server.cio`
`70`	`70`
`71`	`71`	`api project(':core-getter')`
	`72`	`+ api project(':core-getter:rpc')`
`72`	`73`	`api project(':core-websdk:data')`
`73`	`74`	`}`