Add local service exception handler & increase waiting time

devchat-ai · Sep 20, 2024 · 3ecbcd4 · 3ecbcd4
1 parent 80e9a31
commit 3ecbcd4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/src/main/kotlin/ai/devchat/core/DevChatClient.kt b/src/main/kotlin/ai/devchat/core/DevChatClient.kt
@@ -217,7 +217,7 @@ class DevChatClient(val project: Project, private val localServicePort: Int) {
         const val DEFAULT_LOG_MAX_COUNT = 10000
         const val LOG_RAW_DATA_SIZE_LIMIT = 4 * 1024 // 4kb
         const val RETRY_INTERVAL: Long = 500  // ms
-        const val MAX_RETRIES: Int = 10
+        const val MAX_RETRIES: Int = 50
     }
     private val client = OkHttpClient()
     private val json = Json { ignoreUnknownKeys = true }

diff --git a/src/main/kotlin/ai/devchat/installer/DevChatSetupThread.kt b/src/main/kotlin/ai/devchat/installer/DevChatSetupThread.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.project.Project
 import java.io.BufferedReader
 import java.io.File
 import java.nio.file.Paths
+import kotlin.system.measureTimeMillis
 
 class DevChatSetupThread(val project: Project) : Thread() {
     private val minimalPythonVersion: String = "3.8"
@@ -26,10 +27,16 @@ class DevChatSetupThread(val project: Project) : Thread() {
         Notifier.info("Starting $ASSISTANT_NAME_EN initialization...")
         try {
             Log.info("Start configuring the $ASSISTANT_NAME_EN CLI environment.")
-            setupPython(PythonEnvManager())
+            val executionTime = measureTimeMillis {
+                setupPython(PythonEnvManager())
+            }
+            Log.info("-----------> Time took to setup python: ${executionTime/1000} s")
             installTools()
             updateWorkflows()
-            devChatService.browser?.executeJS("onInitializationFinish")
+            devChatService.browser?.let {
+                Log.info("-----------> Executing JS callback onInitializationFinish")
+                it.executeJS("onInitializationFinish")
+            }
             DevChatState.instance.lastVersion = devChatVersion
             Notifier.info("$ASSISTANT_NAME_EN initialization has completed successfully.")
         } catch (e: Exception) {

diff --git a/src/main/kotlin/ai/devchat/plugin/DevChatToolWindowFactory.kt b/src/main/kotlin/ai/devchat/plugin/DevChatToolWindowFactory.kt
@@ -54,14 +54,22 @@ class DevChatToolWindowFactory : ToolWindowFactory, DumbAware, Disposable {
 
         DevChatSetupThread(project).start()
 
-        CoroutineScope(Dispatchers.IO).launch {
-            withTimeoutOrNull(5000) {
-                while (!devChatService.pythonReady) { delay(100) }
+        val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+            Log.error("-----------> Failed to start local service")
+            throwable.printStackTrace()
+        }
+        CoroutineScope(Dispatchers.Default + exceptionHandler).launch {
+            withTimeoutOrNull(60000) {
+                while (!devChatService.pythonReady) {
+                    Log.info("-----------> Waiting python ready...")
+                    delay(100)
+                }
                 LocalService(project).start()
             }?.let {
                 Disposer.register(content, it)
                 devChatService.localServicePort = it.port!!
                 devChatService.client = DevChatClient(project, it.port!!)
+                Log.info("-----------> DevChat client ready")
             }
         }
         IDEServer(project).start().let {

diff --git a/src/main/kotlin/ai/devchat/plugin/LocalService.kt b/src/main/kotlin/ai/devchat/plugin/LocalService.kt
@@ -27,6 +27,7 @@ class LocalService(project: Project): Disposable {
         ServerSocket(0).use {
              port = it.localPort
         }
+        Log.info("-----------> Starting local service..., port: $port")
         val commandLine = GeneralCommandLine()
             .withExePath(CONFIG["python_for_chat"] as String)
             .withParameters(PathUtils.localServicePath)