[네트워크 모듈 개선 v2] 네트워크 쓰레드 제어

.gitignore

@@ -1,17 +1,61 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# User-specific configurations
+.idea/
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+.idea/caches/
 *.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+
+# OS-specific files
 .DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
-/.idea
-/.gradle
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+app/release/output.json
+
+detekt/detekt.**

.java-version

@@ -0,0 +1 @@
+17.0.8

app/build.gradle.kts

@@ -45,6 +45,8 @@ dependencies {
     implementation(project(":features:base-mvvm"))
     implementation(project(":features:async_migrate"))
     implementation(project(":features:async_migrate_bridge"))
+    implementation(project(":features:network_v2"))
+    implementation(project(":features:network_v2-bridge"))
 
     /**
      * Network

app/src/main/java/com/hmju/til/MainApplication.kt

@@ -1,8 +1,8 @@
 package com.hmju.til
 
 import android.app.Application
-import com.http.tracking.TrackingManager
 import dagger.hilt.android.HiltAndroidApp
+import hmju.http.tracking.HttpTracking
 import io.reactivex.rxjava3.exceptions.UndeliverableException
 import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import timber.log.Timber
@@ -85,9 +85,10 @@ open class MainApplication : Application() {
     }
 
     private fun initTracking() {
-        TrackingManager.getInstance()
+        HttpTracking.Builder()
             .setBuildType(true)
             .setWifiShare(true)
+            .setLogMaxSize(10_000)
             .build(this)
     }
 }

appRelease/release_note.txt

@@ -1,8 +1,10 @@
-Build Date 2023년 07월 12일 수요일 13:53:38
-Version Name: 0.0.5
-Branch: develop
+Build Date 2023년 12월 03일 일요일 10:13:10
+Version Name: 0.0.6
+Branch: feature/refactor_network
 
-Message: commit ff91368b76f29aa698d7c74f5242f2fb3748af84
-Update generate-release-note.yml
+Message: commit df562762cd1ce4b2d4bcb7664c9979f139174ee3
+chore: 네트워크 개선 v2
+- 테스트 했던 Delay 들 줄임
 
-Author: Sieun Ju
+
+Author: sieunju

buildSrc/src/main/java/Dependencies.kt

@@ -79,8 +79,8 @@ object Log {
 }
 
 object HttpTracking {
-    const val interceptor = "com.github.sieunju.httptracking:interceptor:1.2.3"
-    const val ui = "com.github.sieunju.httptracking:ui:1.2.3"
+    const val interceptor = "com.github.sieunju.httptracking:interceptor:1.3.2"
+    const val ui = "com.github.sieunju.httptracking:ui:1.3.2"
 }
 
 object UnitTest {

core/src/main/java/com/hmju/core/login_manager/LoginManager.kt

@@ -10,6 +10,7 @@ import io.reactivex.rxjava3.core.Single
 interface LoginManager {
     fun setToken(token: String)
     fun getToken(): String
-    fun isLogin() : Boolean
-    fun rxIsLogin() : Single<Boolean>
+    fun isLogin(): Boolean
+    fun rxIsLogin(): Single<Boolean>
+    fun getTokenExpiredMs(): Long
 }

core/src/main/java/com/hmju/core/login_manager/LoginManagerImpl.kt

@@ -1,11 +1,12 @@
 package com.hmju.core.login_manager
 
-import android.content.Context
-import android.content.SharedPreferences
+import android.util.Base64
+import androidx.core.content.edit
+import com.hmju.core.pref.PreferenceManager
 import com.hmju.core.rxbus.LoginEvent
 import com.hmju.core.rxbus.RxBus
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.rxjava3.core.Single
+import org.json.JSONObject
 import javax.inject.Inject
 import kotlin.random.Random
 
@@ -15,33 +16,40 @@ import kotlin.random.Random
  * Created by juhongmin on 2022/01/12
  */
 class LoginManagerImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    private val prefManager: PreferenceManager
 ) : LoginManager {
 
-    private val pref: SharedPreferences =
-        context.getSharedPreferences("til_pref", Context.MODE_PRIVATE)
+    private var expiredMs: Long = 0
+    private var userToken: String = ""
 
-    companion object {
-        const val KEY_TOKEN = "user_token"
-        const val KEY_NICK_NAME = "user_nick_name"
+    private fun getTokenExpiredMs(token: String): Long {
+        return try {
+            val startIdx = token.indexOf(".")
+            val endIdx = token.lastIndexOf(".")
+            val bytes = Base64.decode(token.substring(startIdx, endIdx), Base64.DEFAULT)
+            val json = JSONObject(String(bytes, Charsets.UTF_8))
+            json.getLong("exp") * 1000
+        } catch (ex: Exception) {
+            System.currentTimeMillis()
+        }
     }
 
-    private var userToken: String = ""
-
+    @Synchronized
     override fun setToken(token: String) {
-        with(pref.edit()) {
-            putString(KEY_TOKEN, token)
-            apply()
-            // Test
-            RxBus.publish(LoginEvent(Random.nextBoolean(), token))
+        // 토큰 전처리 가공
+        prefManager.getPref().edit {
+            expiredMs = getTokenExpiredMs(token)
+            userToken = token
+            putLong(PreferenceManager.KEY_TOKEN_EXPIRED_MS, expiredMs)
+            putString(PreferenceManager.KEY_TOKEN, userToken)
         }
 
-        userToken = token
+        RxBus.publish(LoginEvent(Random.nextBoolean(), token))
     }
 
     override fun getToken(): String {
         if (userToken.isEmpty()) {
-            userToken = pref.getString(KEY_TOKEN, "") ?: ""
+            userToken = prefManager.getString(PreferenceManager.KEY_TOKEN)
         }
         return userToken
     }
@@ -53,4 +61,8 @@ class LoginManagerImpl @Inject constructor(
     override fun rxIsLogin(): Single<Boolean> {
         return Single.just(getToken().isNotEmpty())
     }
+
+    override fun getTokenExpiredMs(): Long {
+        return expiredMs
+    }
 }

core/src/main/java/com/hmju/core/login_manager/di/LoginManagerModule.kt

@@ -2,6 +2,7 @@ package com.hmju.core.login_manager.di
 
 import com.hmju.core.login_manager.LoginManager
 import com.hmju.core.login_manager.LoginManagerImpl
+import com.hmju.core.pref.di.PreferenceManagerModule
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,9 +15,9 @@ import javax.inject.Singleton
  * Created by juhongmin on 2022/01/12
  */
 @InstallIn(SingletonComponent::class)
-@Module
+@Module(includes = [PreferenceManagerModule::class])
 internal abstract class LoginManagerModule {
     @Singleton
     @Binds
-    abstract fun bindLoginManager(loginManager: LoginManagerImpl): LoginManager
+    abstract fun bindLoginManager(impl: LoginManagerImpl): LoginManager
 }

core/src/main/java/com/hmju/core/model/base/ApiResponse.kt

@@ -1,6 +1,6 @@
 package com.hmju.core.model.base
 
-import okhttp3.ResponseBody
+import com.hmju.core.model.error.JSendException
 
 /**
  * Description : Coroutines Network Base Response
@@ -9,29 +9,14 @@ import okhttp3.ResponseBody
  */
 sealed class ApiResponse<out T> {
 
-    enum class FailType {
-        NETWORK, HTTP, UN_KNOWN
-    }
-
     /**
      * Network Success Response Data
      */
     data class Success<out T>(val data: T) : ApiResponse<T>()
 
     /**
-     * Network Fail Data Model
-     * @see FailType.HTTP HTTP Error
-     * @see FailType.NETWORK Network Config Error
-     * @see FailType.UN_KNOWN UN KNOWN
-     *
-     * @param type FailType
-     * @param msg Error Message
-     * @param errBody when [FailType.HTTP] Error Body
+     * Network Fail
+     * @param err Error
      */
-    data class Fail(
-        val type: FailType,
-        val msg: CharSequence,
-        val err: Throwable? = null,
-        val errBody: ResponseBody? = null
-    ) : ApiResponse<Nothing>()
+    data class Fail(val err: JSendException) : ApiResponse<Nothing>()
 }

core/src/main/java/com/hmju/core/model/base/BaseJSend.kt

@@ -15,4 +15,6 @@ open class BaseJSend {
 
     @SerialName("message")
     val message: String? = null
+
+    open val isValid : Boolean = false
 }

core/src/main/java/com/hmju/core/model/base/JSendList.kt

@@ -3,6 +3,19 @@ package com.hmju.core.model.base
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+
+/**
+ * Description : JSend JSON
+ * {
+ *  "status" : true or false,
+ *  "message" : String (에러인경우 사용자에게 표시하는 에러 메시지),
+ *  "data" : {
+ *      "payload" : []
+ *  }
+ * }
+ *
+ * Created by juhongmin on 09/01/22
+ */
 @Serializable
 data class JSendList<T : Any>(
     @SerialName("data")
@@ -14,8 +27,7 @@ data class JSendList<T : Any>(
         val list: List<T> = listOf()
     )
 
-    val isValid: Boolean
-        get() = depthData != null
+    override val isValid: Boolean get() = depthData != null
 
     val payload: List<T>
         get() = depthData?.list ?: listOf()

core/src/main/java/com/hmju/core/model/base/JSendListWithMeta.kt

@@ -4,7 +4,17 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 /**
- * Description : 한 데이터 모델 한에 실제 데이터를 받기 위한 데이터 모델
+ * Description : JSend JSON
+ * {
+ *  "status" : true or false,
+ *  "message" : String (에러인경우 사용자에게 표시하는 에러 메시지),
+ *  "data" : {
+ *      "payload" : [],
+ *      "meta" : {
+ *          "pageSize" : Integer
+ *      }
+ *  }
+ * }
  *
  * Created by juhongmin on 2022/05/15
  */
@@ -21,8 +31,7 @@ data class JSendListWithMeta<T : Any, M : MetaEntity>(
         val meta: M? = null
     )
 
-    val isValid: Boolean
-        get() = depthData != null
+    override val isValid: Boolean get() = depthData != null
 
     val payload: List<T>
         get() = depthData?.list ?: listOf()