给httpTts添加登录功能

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -16,7 +16,7 @@ val appDb by lazy {
 }
 
 @Database(
-    version = 40,
+    version = 41,
     exportSchema = true,
     entities = [Book::class, BookGroup::class, BookSource::class, BookChapter::class,
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,

app/src/main/java/io/legado/app/data/DatabaseMigrations.kt

@@ -36,7 +36,8 @@ object DatabaseMigrations {
             migration_36_37,
             migration_37_38,
             migration_38_39,
-            migration_39_40
+            migration_39_40,
+            migration_40_41
         )
     }
 
@@ -318,4 +319,14 @@ object DatabaseMigrations {
             database.execSQL("ALTER TABLE `chapters` ADD `isPay` INTEGER NOT NULL DEFAULT 0")
         }
     }
+
+    private val migration_40_41 = object : Migration(40, 41) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            database.execSQL("ALTER TABLE `httpTTS` ADD `loginUrl` TEXT")
+            database.execSQL("ALTER TABLE `httpTTS` ADD `loginUi` TEXT")
+            database.execSQL("ALTER TABLE `httpTTS` ADD `loginCheckJs` TEXT")
+            database.execSQL("ALTER TABLE `httpTTS` ADD `header` TEXT")
+            database.execSQL("ALTER TABLE `httpTTS` ADD `concurrentRate` TEXT")
+        }
+    }
 }

app/src/main/java/io/legado/app/data/entities/BaseSource.kt

@@ -24,9 +24,9 @@ interface BaseSource : JsExtensions {
     var loginUi: List<RowUi>?   // 登录UI
     var header: String?         // 请求头
 
-    fun getName(): String
+    fun getTag(): String
 
-    fun getStoreUrl(): String
+    fun getKey(): String
 
     fun getLoginJs(): String? {
         val loginJs = loginUrl
@@ -68,7 +68,7 @@ interface BaseSource : JsExtensions {
      * 获取用于登录的头部信息
      */
     fun getLoginHeader(): String? {
-        return CacheManager.get("loginHeader_${getStoreUrl()}")
+        return CacheManager.get("loginHeader_${getKey()}")
     }
 
     fun getLoginHeaderMap(): Map<String, String>? {
@@ -80,7 +80,7 @@ interface BaseSource : JsExtensions {
      * 保存登录头部信息,map格式,访问时自动添加
      */
     fun putLoginHeader(header: String) {
-        CacheManager.put("loginHeader_${getStoreUrl()}", header)
+        CacheManager.put("loginHeader_${getKey()}", header)
     }
 
     /**
@@ -90,7 +90,7 @@ interface BaseSource : JsExtensions {
     fun getLoginInfo(): String? {
         try {
             val key = AppConst.androidId.encodeToByteArray(0, 8)
-            val cache = CacheManager.get("userInfo_${getStoreUrl()}") ?: return null
+            val cache = CacheManager.get("userInfo_${getKey()}") ?: return null
             val encodeBytes = Base64.decode(cache, Base64.DEFAULT)
             val decodeBytes = EncoderUtils.decryptAES(encodeBytes, key)
                 ?: return null
@@ -113,7 +113,7 @@ interface BaseSource : JsExtensions {
             val key = (AppConst.androidId).encodeToByteArray(0, 8)
             val encodeBytes = EncoderUtils.encryptAES(info.toByteArray(), key)
             val encodeStr = Base64.encodeToString(encodeBytes, Base64.DEFAULT)
-            CacheManager.put("userInfo_${getStoreUrl()}", encodeStr)
+            CacheManager.put("userInfo_${getKey()}", encodeStr)
             true
         } catch (e: Exception) {
             e.printOnDebug()
@@ -122,19 +122,19 @@ interface BaseSource : JsExtensions {
     }
 
     fun removeLoginInfo() {
-        CacheManager.delete("userInfo_${getStoreUrl()}")
+        CacheManager.delete("userInfo_${getKey()}")
     }
 
     fun setVariable(variable: String?) {
         if (variable != null) {
-            CacheManager.put("sourceVariable_${getStoreUrl()}", variable)
+            CacheManager.put("sourceVariable_${getKey()}", variable)
         } else {
-            CacheManager.delete("sourceVariable_${getStoreUrl()}")
+            CacheManager.delete("sourceVariable_${getKey()}")
         }
     }
 
     fun getVariable(): String? {
-        return CacheManager.get("sourceVariable_${getStoreUrl()}")
+        return CacheManager.get("sourceVariable_${getKey()}")
     }
 
     /**
@@ -145,7 +145,7 @@ interface BaseSource : JsExtensions {
         val bindings = SimpleBindings()
         bindings["java"] = this
         bindings["source"] = this
-        bindings["baseUrl"] = getStoreUrl()
+        bindings["baseUrl"] = getKey()
         bindings["cookie"] = CookieStore
         bindings["cache"] = CacheManager
         return AppConst.SCRIPT_ENGINE.eval(jsStr, bindings)

app/src/main/java/io/legado/app/data/entities/BookSource.kt

@@ -44,11 +44,11 @@ data class BookSource(
     var ruleContent: ContentRule? = null            // 正文页规则
 ) : Parcelable, BaseSource {
 
-    override fun getName(): String {
+    override fun getTag(): String {
         return bookSourceName
     }
 
-    override fun getStoreUrl(): String {
+    override fun getKey(): String {
         return bookSourceUrl
     }
 

app/src/main/java/io/legado/app/data/entities/HttpTTS.kt

@@ -2,11 +2,45 @@ package io.legado.app.data.entities
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import androidx.room.TypeConverter
+import androidx.room.TypeConverters
+import io.legado.app.data.entities.rule.RowUi
+import io.legado.app.utils.GSON
+import io.legado.app.utils.fromJsonArray
 
+@TypeConverters(HttpTTS.Converters::class)
 @Entity(tableName = "httpTTS")
 data class HttpTTS(
     @PrimaryKey
     val id: Long = System.currentTimeMillis(),
     var name: String = "",
-    var url: String = ""
-)
+    var url: String = "",
+    override var concurrentRate: String? = null,
+    override var loginUrl: String? = null,
+    override var loginUi: List<RowUi>? = null,
+    override var header: String? = null,
+    var loginCheckJs: String? = null,
+) : BaseSource {
+
+    override fun getTag(): String {
+        return name
+    }
+
+    override fun getKey(): String {
+        return md5Encode(url)
+    }
+
+    override fun getSource(): BaseSource {
+        return this
+    }
+
+    class Converters {
+
+        @TypeConverter
+        fun loginUiRuleToString(loginUi: List<RowUi>?): String = GSON.toJson(loginUi)
+
+        @TypeConverter
+        fun stringToLoginRule(json: String?): List<RowUi>? = GSON.fromJsonArray(json)
+
+    }
+}

app/src/main/java/io/legado/app/data/entities/RssSource.kt

@@ -45,11 +45,11 @@ data class RssSource(
     var customOrder: Int = 0
 ) : Parcelable, BaseSource {
 
-    override fun getName(): String {
+    override fun getTag(): String {
         return sourceName
     }
 
-    override fun getStoreUrl(): String {
+    override fun getKey(): String {
         return sourceUrl
     }
 

app/src/main/java/io/legado/app/help/JsExtensions.kt

@@ -457,7 +457,7 @@ interface JsExtensions {
      */
     fun log(msg: String): String {
         getSource()?.let {
-            Debug.log(it.getStoreUrl(), msg)
+            Debug.log(it.getKey(), msg)
         } ?: Debug.log(msg)
         return msg
     }

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@@ -276,9 +276,9 @@ class AnalyzeUrl(
         if (concurrentRate.isNullOrEmpty()) {
             return
         }
-        val fetchRecord = accessTime[source.getStoreUrl()]
+        val fetchRecord = accessTime[source.getKey()]
         if (fetchRecord == null) {
-            accessTime[source.getStoreUrl()] = FetchRecord(System.currentTimeMillis(), 1)
+            accessTime[source.getKey()] = FetchRecord(System.currentTimeMillis(), 1)
             return
         }
         val waitTime = synchronized(fetchRecord) {
@@ -328,7 +328,7 @@ class AnalyzeUrl(
             return StrResponse(url, StringUtils.byteToHexString(getByteArray()))
         }
         judgmentConcurrent()
-        setCookie(source?.getStoreUrl())
+        setCookie(source?.getKey())
         if (useWebView) {
             val params = AjaxWebView.AjaxParams(url)
             params.headerMap = headerMap
@@ -336,7 +336,7 @@ class AnalyzeUrl(
             params.javaScript = webJs ?: jsStr
             params.sourceRegex = sourceRegex
             params.postData = body?.toByteArray()
-            params.tag = source?.getStoreUrl()
+            params.tag = source?.getKey()
             return getWebViewSrc(params)
         }
         return getProxyClient(proxy).newCallStrResponse(retry) {
@@ -360,7 +360,7 @@ class AnalyzeUrl(
      */
     suspend fun getByteArray(): ByteArray {
         judgmentConcurrent()
-        setCookie(source?.getStoreUrl())
+        setCookie(source?.getKey())
         @Suppress("BlockingMethodInNonBlockingContext")
         return getProxyClient(proxy).newCall(retry) {
             addHeaders(headerMap)

app/src/main/java/io/legado/app/ui/login/RuleUiLoginDialog.kt

@@ -48,7 +48,7 @@ class RuleUiLoginDialog : BaseDialogFragment() {
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         binding.toolBar.setBackgroundColor(primaryColor)
         val source = viewModel.source ?: return
-        binding.toolBar.title = getString(R.string.login_source, source.getName())
+        binding.toolBar.title = getString(R.string.login_source, source.getTag())
         val loginInfo = source.getLoginInfoMap()
         val loginUi = source.loginUi
         loginUi?.forEachIndexed { index, rowUi ->

app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt

@@ -28,7 +28,7 @@ class WebViewLoginFragment : BaseFragment(R.layout.fragment_web_view_login) {
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         viewModel.source?.let {
-            binding.titleBar.title = getString(R.string.login_source, it.getName())
+            binding.titleBar.title = getString(R.string.login_source, it.getTag())
             initWebView(it)
         }
     }
@@ -64,13 +64,13 @@ class WebViewLoginFragment : BaseFragment(R.layout.fragment_web_view_login) {
         binding.webView.webViewClient = object : WebViewClient() {
             override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
                 val cookie = cookieManager.getCookie(url)
-                CookieStore.setCookie(source.getStoreUrl(), cookie)
+                CookieStore.setCookie(source.getKey(), cookie)
                 super.onPageStarted(view, url, favicon)
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
                 val cookie = cookieManager.getCookie(url)
-                CookieStore.setCookie(source.getStoreUrl(), cookie)
+                CookieStore.setCookie(source.getKey(), cookie)
                 if (checking) {
                     activity?.finish()
                 }