acite/Aether
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] Remove token from Query param, move to cookies

Browse Source
This commit is contained in:
acite
2025-09-29 01:19:12 +08:00
parent 393419afd7
commit 422da51a74
9 changed files with 61 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/com/acitelight/aether/service/ApiClient.kt
View File

@@ -5,7 +5,11 @@ import android.content.Context
import android.util.Log
import androidx.core.net.toUri
import com.acitelight.aether.AetherApp
import com.franmontiel.persistentcookiejar.PersistentCookieJar
import com.franmontiel.persistentcookiejar.cache.SetCookieCache
import com.franmontiel.persistentcookiejar.persistence.SharedPrefsCookiePersistor
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json
@@ -15,11 +19,13 @@ import okhttp3.CookieJar
import okhttp3.EventListener
import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.JavaNetCookieJar
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import java.io.ByteArrayInputStream
import java.net.CookieManager
import java.net.InetAddress
import java.net.InetSocketAddress
import java.net.Proxy
@@ -35,7 +41,7 @@ import javax.net.ssl.X509TrustManager
@Singleton
class ApiClient @Inject constructor(
@ApplicationContext private val context: Context,
) {
fun getBase(): String{
return replaceAbyssProtocol(base)
@@ -46,11 +52,9 @@ class ApiClient @Inject constructor(
private val json = Json {
ignoreUnknownKeys = true
}
private fun replaceAbyssProtocol(uri: String): String {
return uri.replaceFirst("^abyss://".toRegex(), "https://")
}
private val dnsEventListener = object : EventListener() {
override fun dnsEnd(call: okhttp3.Call, domainName: String, inetAddressList: List<InetAddress>) {
super.dnsEnd(call, domainName, inetAddressList)
@@ -58,7 +62,6 @@ class ApiClient @Inject constructor(
Log.d("OkHttp_DNS", "Domain '$domainName' resolved to IPs: [$ipAddresses]")
}
}
private fun loadCertificateFromString(pemString: String): X509Certificate {
val certificateFactory = CertificateFactory.getInstance("X.509")
val decodedPem = pemString
@@ -72,7 +75,6 @@ class ApiClient @Inject constructor(
return certificateFactory.generateCertificate(inputStream) as X509Certificate
}
}
private fun createOkHttpClientWithDynamicCert(trustedCert: X509Certificate?): OkHttpClient {
try {
val defaultTmFactory = TrustManagerFactory.getInstance(
@@ -163,23 +165,17 @@ class ApiClient @Inject constructor(
throw RuntimeException("Failed to create OkHttpClient with dynamic certificate", e)
}
}
private fun createOkHttp(): OkHttpClient {
return if (cert == "")
if (base.startsWith("abyss://"))
OkHttpClient
.Builder()
.cookieJar(object : CookieJar {
private val cookieStore = mutableMapOf<HttpUrl, List<Cookie>>()
override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
cookieStore[url] = cookies
}
override fun loadForRequest(url: HttpUrl): List<Cookie> {
return cookieStore[url] ?: emptyList()
}
})
.cookieJar(
PersistentCookieJar(
SetCookieCache(),
SharedPrefsCookiePersistor(context)
)
)
.proxy(
Proxy(
Proxy.Type.HTTP,
@@ -192,17 +188,12 @@ class ApiClient @Inject constructor(
else
OkHttpClient
.Builder()
.cookieJar(object : CookieJar {
private val cookieStore = mutableMapOf<HttpUrl, List<Cookie>>()
override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
cookieStore[url] = cookies
}
override fun loadForRequest(url: HttpUrl): List<Cookie> {
return cookieStore[url] ?: emptyList()
}
})
.cookieJar(
PersistentCookieJar(
SetCookieCache(),
SharedPrefsCookiePersistor(context)
)
)
.connectionSpecs(listOf(ConnectionSpec.MODERN_TLS, ConnectionSpec.COMPATIBLE_TLS))
.eventListener(dnsEventListener)
.build()
@@ -210,7 +201,6 @@ class ApiClient @Inject constructor(
createOkHttpClientWithDynamicCert(loadCertificateFromString(cert))
}
private fun createRetrofit(): Retrofit {
client = createOkHttp()
val b = replaceAbyssProtocol(base)
@@ -222,7 +212,6 @@ class ApiClient @Inject constructor(
.addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
.build()
}
private var client: OkHttpClient? = null
var api: ApiInterface? = null

22
app/src/main/java/com/acitelight/aether/service/ApiInterface.kt
View File

@@ -4,49 +4,43 @@ import com.acitelight.aether.model.BookMark
import com.acitelight.aether.model.ChallengeResponse
import com.acitelight.aether.model.ComicResponse
import com.acitelight.aether.model.VideoResponse
import okhttp3.Response
import okhttp3.ResponseBody
import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.POST
import retrofit2.http.Path
import retrofit2.http.Query
import retrofit2.http.Streaming
interface ApiInterface {
@GET("api/video")
suspend fun getVideoClasses(
@Query("token") token: String
): List<String>
@GET("api/video/{klass}")
suspend fun queryVideoClasses(
@Path("klass") klass: String,
@Query("token") token: String
@Path("klass") klass: String
): List<String>
@GET("api/video/{klass}/{id}")
suspend fun queryVideo(
@Path("klass") klass: String,
@Path("id") id: String,
@Query("token") token: String
@Path("id") id: String
): VideoResponse
@POST("api/video/{klass}/bulkquery")
suspend fun queryVideoBulk(
@Path("klass") klass: String,
@Body() id: List<String>,
@Query("token") token: String
@Body() id: List<String>
): List<VideoResponse>
@GET("api/image")
suspend fun getComics(@Query("token") token: String): List<String>
suspend fun getComics(): List<String>
@GET("api/image/{id}")
suspend fun queryComicInfo(@Path("id") id: String, @Query("token") token: String): ComicResponse
suspend fun queryComicInfo(@Path("id") id: String): ComicResponse
@POST("api/image/bulkquery")
suspend fun queryComicInfoBulk(@Body() id: List<String>, @Query("token") token: String): List<ComicResponse>
suspend fun queryComicInfoBulk(@Body() id: List<String>): List<ComicResponse>
@POST("api/image/{id}/bookmark")
suspend fun postBookmark(@Path("id") id: String, @Query("token") token: String, @Body bookmark: BookMark)
suspend fun postBookmark(@Path("id") id: String, @Body bookmark: BookMark)
@GET("api/user/{user}")
suspend fun getChallenge(

29
app/src/main/java/com/acitelight/aether/service/MediaManager.kt
View File

@@ -20,13 +20,11 @@ class MediaManager @Inject constructor(
private val apiClient: ApiClient
)
{
var token: String = "null"
suspend fun listVideoKlasses(): List<String>
{
try
{
val j = apiClient.api!!.getVideoClasses(token)
val j = apiClient.api!!.getVideoClasses()
return j.toList()
}catch(_: Exception)
{
@@ -38,7 +36,7 @@ class MediaManager @Inject constructor(
{
try
{
val j = apiClient.api!!.queryVideoClasses(klass, token)
val j = apiClient.api!!.queryVideoClasses(klass)
return j.toList()
}catch(_: Exception)
{
@@ -58,8 +56,8 @@ class MediaManager @Inject constructor(
}
try {
val j = apiClient.api!!.queryVideo(klass, id, token)
return Video(klass = klass, id = id, token=token, isLocal = false, localBase = "", video = j)
val j = apiClient.api!!.queryVideo(klass, id)
return Video(klass = klass, id = id, isLocal = false, localBase = "", video = j)
}catch (_: Exception)
{
return null
@@ -84,8 +82,8 @@ class MediaManager @Inject constructor(
}
try {
val j = apiClient.api!!.queryVideo(klass, id, token)
return Video(klass = klass, id = id, token=token, isLocal = false, localBase = "", video = j)
val j = apiClient.api!!.queryVideo(klass, id)
return Video(klass = klass, id = id, isLocal = false, localBase = "", video = j)
}catch (_: Exception)
{
return null
@@ -134,12 +132,11 @@ class MediaManager @Inject constructor(
}
val remoteVideos = if (remoteIds.isNotEmpty()) {
val j = apiClient.api!!.queryVideoBulk(klass, remoteIds, token)
val j = apiClient.api!!.queryVideoBulk(klass, remoteIds)
j.zip(remoteIds).map {
Video(
klass = klass,
id = it.second,
token = token,
isLocal = false,
localBase = "",
video = it.first
@@ -158,7 +155,7 @@ class MediaManager @Inject constructor(
suspend fun listComics() : List<String>
{
try{
val j = apiClient.api!!.getComics(token)
val j = apiClient.api!!.getComics()
return j
}catch (_: Exception)
{
@@ -169,8 +166,8 @@ class MediaManager @Inject constructor(
suspend fun queryComicInfoSingle(id: String) : Comic?
{
try{
val j = apiClient.api!!.queryComicInfo(id, token)
return Comic(id = id, comic = j, token = token)
val j = apiClient.api!!.queryComicInfo(id)
return Comic(id = id, comic = j)
}catch (_: Exception)
{
return null
@@ -180,8 +177,8 @@ class MediaManager @Inject constructor(
suspend fun queryComicInfoBulk(id: List<String>) : List<Comic>?
{
try{
val j = apiClient.api!!.queryComicInfoBulk(id, token)
return j.zip(id).map { Comic(id = it.second, comic = it.first, token = token) }
val j = apiClient.api!!.queryComicInfoBulk(id)
return j.zip(id).map { Comic(id = it.second, comic = it.first) }
}catch (_: Exception)
{
return null
@@ -191,7 +188,7 @@ class MediaManager @Inject constructor(
suspend fun postBookmark(id: String, bookMark: BookMark): Boolean
{
try{
apiClient.api!!.postBookmark(id, token, bookMark)
apiClient.api!!.postBookmark(id, bookMark)
return true
}catch (_: Exception)
{