[IDLE-468] 웹소켓 연결 실패시 최대 5번까지 리트라이 하도록 변경

3IDLES · Feb 9, 2025 · c05d325 · c05d325
1 parent 15110e0
commit c05d325
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 20 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
     namespace = "com.idle.care"
 
     defaultConfig {
-        versionCode = 20
-        versionName = "1.2.5"
+        versionCode = 21
+        versionName = "1.2.6"
         targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/core/network/src/main/java/com/idle/network/di/RetrofitModule.kt b/core/network/src/main/java/com/idle/network/di/RetrofitModule.kt
@@ -65,6 +65,13 @@ object RetrofitModule {
     fun provideWebSocketOkHttpClient(): OkHttpClient = OkHttpClient.Builder()
         .connectTimeout(10, TimeUnit.SECONDS)
         .readTimeout(0, TimeUnit.MILLISECONDS)
+        .apply {
+            if (BuildConfig.DEBUG) {
+                val loggingInterceptor = HttpLoggingInterceptor()
+                loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+                addInterceptor(loggingInterceptor)
+            }
+        }
         .build()
 
     @Singleton
@@ -122,4 +129,4 @@ annotation class AuthOkHttpClient
 
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
-annotation class WebSocketOkHttpClient
+annotation class WebSocketOkHttpClient
diff --git a/core/network/src/main/java/com/idle/network/source/websocket/CareWebSocketListener.kt b/core/network/src/main/java/com/idle/network/source/websocket/CareWebSocketListener.kt
@@ -36,11 +36,7 @@ class ChatMessageListener @Inject constructor(private val json: Json) : WebSocke
         _chatMessageChannel.value = chatMessageResponse
     }
 
-    override fun onOpen(webSocket: WebSocket, response: Response) {
-        super.onOpen(webSocket, response)
-    }
-
     override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
         super.onFailure(webSocket, t, response)
     }
-}
+}
diff --git a/core/network/src/main/java/com/idle/network/source/websocket/WebSocketDataSource.kt b/core/network/src/main/java/com/idle/network/source/websocket/WebSocketDataSource.kt
@@ -1,6 +1,5 @@
 package com.idle.network.source.websocket
 
-import com.idle.domain.model.error.ErrorHelper
 import com.idle.network.BuildConfig
 import com.idle.network.di.WebSocketOkHttpClient
 import com.idle.network.model.chatting.ChatMessageResponse
@@ -15,9 +14,9 @@ import javax.inject.Singleton
 class WebSocketDataSource @Inject constructor(
     @WebSocketOkHttpClient private val client: OkHttpClient,
     private val chatMessageListener: ChatMessageListener,
-    private val errorHelper: ErrorHelper,
 ) {
     private lateinit var chatMessageWebSocket: WebSocket
+    private var connectionAttempts = 0
 
     fun connectWebSocket(): Result<Unit> {
         return try {
@@ -26,9 +25,15 @@ class WebSocketDataSource @Inject constructor(
                 .build()
 
             chatMessageWebSocket = client.newWebSocket(chatMessageRequest, chatMessageListener)
+            connectionAttempts = 0
             Result.success(Unit)
         } catch (e: Exception) {
-            Result.failure(e)
+            if (connectionAttempts < MAX_RETRY_ATTEMPTS) {
+                connectionAttempts++
+                connectWebSocket()
+            } else {
+                Result.failure(e)
+            }
         }
     }
 
@@ -44,4 +49,8 @@ class WebSocketDataSource @Inject constructor(
     }
 
     fun getChatMessageFlow(): StateFlow<ChatMessageResponse?> = chatMessageListener.chatMessageFlow
-}
+
+    companion object {
+        private const val MAX_RETRY_ATTEMPTS = 5
+    }
+}
diff --git a/presentation/src/main/java/com/idle/presentation/MainViewModel.kt b/presentation/src/main/java/com/idle/presentation/MainViewModel.kt
@@ -1,5 +1,6 @@
 package com.idle.presentation
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.idle.analytics.error.ErrorLoggingHelper
@@ -16,6 +17,8 @@ import com.idle.domain.model.profile.CenterManagerAccountStatus
 import com.idle.domain.repositorry.jobposting.JobPostingRepository
 import com.idle.domain.usecase.auth.GetAccessTokenUseCase
 import com.idle.domain.usecase.auth.GetUserTypeUseCase
+import com.idle.domain.usecase.chatting.ConnectWebSocketUseCase
+import com.idle.domain.usecase.chatting.DisconnectWebSocketUseCase
 import com.idle.domain.usecase.config.GetForceUpdateInfoUseCase
 import com.idle.domain.usecase.notification.ReadNotificationUseCase
 import com.idle.domain.usecase.profile.GetCenterStatusUseCase
@@ -47,8 +50,8 @@ class MainViewModel @Inject constructor(
     private val getCenterStatusUseCase: GetCenterStatusUseCase,
     private val readNotificationUseCase: ReadNotificationUseCase,
     private val jobPostingRepository: JobPostingRepository,
-//    private val connectWebSocketUseCase: ConnectWebSocketUseCase,
-//    private val disconnectWebSocketUseCase: DisconnectWebSocketUseCase,
+    private val connectWebSocketUseCase: ConnectWebSocketUseCase,
+    private val disconnectWebSocketUseCase: DisconnectWebSocketUseCase,
     private val errorHelper: ErrorHelper,
     private val eventHelper: EventHelper,
     val errorLoggingHelper: ErrorLoggingHelper,
@@ -71,15 +74,16 @@ class MainViewModel @Inject constructor(
     }
 
     internal fun connectWebSocket() = viewModelScope.launch {
-//        Log.d("test", "웹소켓 연결")
-//        connectWebSocketUseCase().onSuccess { }
-//            .onFailure { }
+        Log.d("test", "웹소켓 연결")
+        connectWebSocketUseCase().onFailure {
+            Log.d("test", it.stackTraceToString())
+        }
     }
 
     internal fun disconnectWebSocket() = viewModelScope.launch {
-//        Log.d("test", "웹소켓 연결해제")
-//        disconnectWebSocketUseCase().onSuccess { }
-//            .onFailure { }
+        Log.d("test", "웹소켓 연결해제")
+        disconnectWebSocketUseCase().onSuccess { }
+            .onFailure { }
     }
 
     internal fun setNavigationMenuType(navigationMenuType: NavigationMenuType) {