fix: download

Author: TinyHai

app/src/main/java/me/iacn/biliroaming/BiliBiliPackage.kt

@@ -180,6 +180,8 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
     val fastjsonFieldAnnotation by Weak { "com.alibaba.fastjson.annotation.JSONField" from mClassLoader }
     val gsonFieldAnnotation by Weak { "com.google.gson.annotations.SerializedName" from mClassLoader }
     val pegasusParserClass by Weak { mHookInfo.pegasusParser from mClassLoader }
+    val resolveClientCompanionClass by Weak { mHookInfo.resolveClientCompanion.class_ from mClassLoader }
+    val videoDownloadEntryClass by Weak { "com.bilibili.videodownloader.model.VideoDownloadEntry" from mClassLoader }
 
     // for v8.17.0+
     val useNewMossFunc = instance.viewMossClass?.declaredMethods?.any {
@@ -359,6 +361,10 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
 
     fun getDataSPMethod() = mHookInfo.dataSP.get.orNull
 
+    fun buildCommonResolverParamsMethod() =
+        mHookInfo.resolveClientCompanion.buildCommonResolverParams.orNull
+
+    fun setExtraContentMethod() = mHookInfo.gCommonResolverParams.setExtraContent.orNull
 
     private fun readHookInfo(context: Context): Configs.HookInfo {
         try {
@@ -2336,6 +2342,46 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
                     ?: return@class_
                 name = getPegasusParser.declaringClass.name
             }
+            resolveClientCompanion = resolveClientCompanion {
+                val resolveClientClass = dexHelper.findMethodUsingString(
+                    "Invalid segment id: %s, segment list size:%s",
+                    false,
+                    -1,
+                    -1,
+                    null,
+                    -1,
+                    null,
+                    null,
+                    null,
+                    true
+                ).asSequence().firstNotNullOfOrNull {
+                    dexHelper.decodeMethodIndex(it)?.declaringClass
+                } ?: return@resolveClientCompanion
+                val resolveClientCompanionClass = "${resolveClientClass.name}\$a".from(classloader)
+                    ?: return@resolveClientCompanion
+                val paramsClass =
+                    "com.bilibili.app.gemini.base.player.GeminiCommonResolverParams".from(
+                        classloader
+                    )
+                val videoDownloadEntryClass =
+                    "com.bilibili.videodownloader.model.VideoDownloadEntry".from(classloader)
+                val buildParamsMethod = resolveClientCompanionClass.declaredMethods.firstOrNull {
+                    it.returnType == paramsClass && it.parameterCount == 1 && it.parameterTypes[0] == videoDownloadEntryClass
+                } ?: return@resolveClientCompanion
+                class_ = class_ { name = resolveClientCompanionClass.name }
+                buildCommonResolverParams = method { name = buildParamsMethod.name }
+            }
+            gCommonResolverParams = gCommonResolverParams {
+                val commonResolverParamsClass =
+                    "com.bilibili.app.gemini.base.player.GeminiCommonResolverParams".from(
+                        classloader
+                    ) ?: return@gCommonResolverParams
+                val setExtraContentMethod = commonResolverParamsClass.declaredMethods?.firstOrNull {
+                    it.returnType == Void.TYPE && it.parameterCount == 1 && it.parameterTypes[0] == Map::class.java
+                } ?: return@gCommonResolverParams
+                class_ = class_ { name = commonResolverParamsClass.name }
+                setExtraContent = method { name = setExtraContentMethod.name }
+            }
             dexHelper.close()
         }
 

app/src/main/java/me/iacn/biliroaming/hook/BangumiPlayUrlHook.kt

@@ -269,6 +269,24 @@ class BangumiPlayUrlHook(classLoader: ClassLoader) : BaseHook(classLoader) {
                 }
             }
         }
+
+        // 修复下载时提示获取剧集信息失败
+        instance.resolveClientCompanionClass?.hookAfterMethod(
+            instance.buildCommonResolverParamsMethod(),
+            instance.videoDownloadEntryClass
+        ) { param ->
+            val entry = param.args[0].callMethodAs<JSONObject?>("toJsonObject")
+            val seasonId = entry?.optString("season_id")
+            val epId = entry?.optJSONObject("ep")?.optString("episode_id")
+            val extraMap = buildMap {
+                seasonId?.let { put("season_id", it) }
+                epId?.let { put("ep_id", it) }
+            }.ifEmpty {
+                return@hookAfterMethod
+            }
+            param.result.callMethod(instance.setExtraContentMethod(), extraMap)
+        }
+
         instance.playerMossClass?.run {
             var isDownload = false
             hookBeforeMethod(
@@ -354,10 +372,11 @@ class BangumiPlayUrlHook(classLoader: ClassLoader) : BaseHook(classLoader) {
                         }
                             ?: throw CustomServerException(mapOf("未知错误" to "请检查哔哩漫游设置中解析服务器设置。"))
                     } catch (e: CustomServerException) {
-                        param.result = showPlayerErrorUnite(
-                            response, supplement,
-                            "请求解析服务器发生错误", e.message, true
-                        )
+                        // v8.48.0+ 打开缓存弹窗导致应用崩溃
+//                        param.result = showPlayerErrorUnite(
+//                            response, supplement,
+//                            "请求解析服务器发生错误", e.message, true
+//                        )
                         Log.toast("请求解析服务器发生错误: ${e.message}", alsoLog = true)
                     }
                 } else if (isDownload) {

app/src/main/proto/me/iacn/biliroaming/configs.proto

@@ -320,6 +320,16 @@ message DataSP {
   optional Method get = 2;
 }
 
+message ResolveClientCompanion {
+  optional Class class = 1;
+  optional Method buildCommonResolverParams = 2;
+}
+
+message GCommonResolverParams {
+  optional Class class = 1;
+  optional Method setExtraContent = 2;
+}
+
 message HookInfo {
   int64 last_update_time = 1;
   optional MapIds map_ids = 2;
@@ -389,4 +399,6 @@ message HookInfo {
   optional PreBuiltConfig preBuiltConfig = 99;
   optional DataSP dataSP = 100;
   optional Class pegasus_parser = 101;
+  optional ResolveClientCompanion resolveClientCompanion = 102;
+  optional GCommonResolverParams gCommonResolverParams = 103;
 }