Wait for client ready on loading commands

devchat-ai · Sep 19, 2024 · 9948ca4 · 9948ca4
1 parent c564f7d
commit 9948ca4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/kotlin/ai/devchat/core/handlers/ListCommandsRequestHandler.kt b/src/main/kotlin/ai/devchat/core/handlers/ListCommandsRequestHandler.kt
@@ -2,8 +2,12 @@ package ai.devchat.core.handlers
 
 import ai.devchat.core.BaseActionHandler
 import ai.devchat.core.DevChatActions
+import ai.devchat.core.DevChatClient
 import com.alibaba.fastjson.JSONObject
 import com.intellij.openapi.project.Project
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeoutOrNull
 
 
 class ListCommandsRequestHandler(project: Project, requestAction: String, metadata: JSONObject?, payload: JSONObject?) : BaseActionHandler(
@@ -14,6 +18,15 @@ class ListCommandsRequestHandler(project: Project, requestAction: String, metada
 ) {
     override val actionName: String = DevChatActions.LIST_COMMANDS_RESPONSE
     override fun action() {
+        var client: DevChatClient? = null
+        runBlocking {
+            client = withTimeoutOrNull(5000) { // 5000 milliseconds = 5 seconds timeout
+                while (devChatService.client == null) {
+                    delay(100) // Wait for 100 milliseconds before checking again
+                }
+                devChatService.client
+            }
+        }
         val recommendedWorkflows = client?.getWorkflowConfig()?.recommend?.workflows.orEmpty()
         val indexedCommands = client?.getWorkflowList()?.map {
             val commandName = it.name

diff --git a/src/main/kotlin/ai/devchat/plugin/DevChatToolWindowFactory.kt b/src/main/kotlin/ai/devchat/plugin/DevChatToolWindowFactory.kt
@@ -61,7 +61,5 @@ class DevChatToolWindowFactory : ToolWindowFactory, DumbAware, Disposable {
         devChatService.activeConversation = ActiveConversation()
     }
 
-    override fun dispose() {
-//        TODO("Not yet implemented")
-    }
+    override fun dispose() {}
 }