Improve & simplify DevChatResponse builder and DevChatActionHandler

Author: pplam

src/main/kotlin/ai/devchat/cli/DevChatResponse.kt

@@ -1,38 +1,21 @@
 package ai.devchat.cli
 
-/*
- * User: Daniel Hu <tao.hu@merico.dev>
- * Date: Mon Oct 16 22:40:06 2023 +0800
- *
- * Hello! How can I assist you today?
- *
- * prompt 6e2a0d9b5c15eb33008250fee40383e77e8f80c75d9644b15bda60be256c8010
- */
 class DevChatResponse(line: String) {
     var user: String? = null
     var date: String? = null
     var message: String? = null
     var promptHash: String? = null
 
     init {
-        if (line.startsWith("User: ") && user == null) {
-            user = line.substring("User: ".length)
-        } else if (line.startsWith("Date: ") && date == null) {
-            date = line.substring("Date: ".length)
-            // 71 is the length of string
-            // "prompt 6e2a0d9b5c15eb33008250fee40383e77e8f80c75d9644b15bda60be256c8010"
-        } else if (line.startsWith("prompt ") && line.length == 71) {
-            promptHash = line.substring("prompt ".length)
-            message += "\n"
-        } else if (!line.isEmpty()) {
-            if (message == null) {
-                message = line
-            } else {
-                message += """
-                    
-                    $line
-                    """.trimIndent()
+        when {
+            line.startsWith("User: ") -> user = user ?: line.substring("User: ".length)
+            line.startsWith("Date: ") -> date = date ?: line.substring("Date: ".length)
+            // 71 is the length of the prompt hash
+            line.startsWith("prompt ") && line.length == 71 -> {
+                promptHash = line.substring("prompt ".length)
+                message = message?.let { "$it\n" } ?: "\n"
             }
+            line.isNotEmpty() -> message = message?.let { "$it\n$line" } ?: line
         }
     }
 

src/main/kotlin/ai/devchat/devchat/DevChatActionHandler.kt

@@ -23,7 +23,8 @@ class DevChatActionHandler private constructor() {
     fun handle(
         action: String,
         jsCallback: String,
-        callback: (JSONObject) -> Unit,
+        success: (JSONObject, JSONObject) -> Unit,
+        fail: (JSONObject, JSONObject) -> Unit,
     ) {
         val response = JSONObject()
         response["action"] = action
@@ -34,13 +35,14 @@ class DevChatActionHandler private constructor() {
 
         try {
             Log.info("Handling $action request")
-            callback(payload)
             metadata["status"] = "success"
             metadata["error"] = ""
+            success(metadata, payload)
         } catch (e: Exception) {
             Log.error("Exception occurred while handle action $action: ${e.message}")
             metadata["status"] = "error"
             metadata["error"] = e.message
+            fail(metadata, payload)
         }
         cefBrowser!!.executeJavaScript("$jsCallback($response)", "", 0)
     }

src/main/kotlin/ai/devchat/devchat/handler/LoadConversationRequestHandler.kt

@@ -11,12 +11,12 @@ class LoadConversationRequestHandler(private val handler: DevChatActionHandler)
     private var metadata: JSONObject? = null
     private var payload: JSONObject? = null
 
-    private fun action(res: JSONObject) {
+    private fun success(resMetadata: JSONObject, resPayload: JSONObject) {
         val topicHash = metadata!!.getString("topicHash")
-        res["reset"] = true
+        resPayload["reset"] = true
         when {
             topicHash.isNullOrEmpty() -> ActiveConversation.reset()
-            topicHash == ActiveConversation.topic -> res["reset"] = false
+            topicHash == ActiveConversation.topic -> resPayload["reset"] = false
             else -> {
                 val arr = handler.devChat.logTopic(topicHash, null)
                 // remove request_tokens and response_tokens in the conversations object
@@ -35,8 +35,8 @@ class LoadConversationRequestHandler(private val handler: DevChatActionHandler)
         handler.handle(
             DevChatActions.LOAD_CONVERSATIONS_RESPONSE,
             metadata!!.getString("callback"),
-            ::action
-        )
+            ::success
+        ) { _, _ -> }
     }
 
     override fun setMetadata(metadata: JSONObject) {

src/main/kotlin/ai/devchat/devchat/handler/LoadHistoryMessagesRequestHandler.kt

@@ -6,23 +6,24 @@ import ai.devchat.devchat.DevChatActions
 import ai.devchat.idea.settings.DevChatSettingsState
 import ai.devchat.idea.storage.ActiveConversation
 import com.alibaba.fastjson.JSONObject
+import org.jvnet.staxex.StAxSOAPBody.Payload
 
 class LoadHistoryMessagesRequestHandler(private val handler: DevChatActionHandler) : ActionHandler {
     private var metadata: JSONObject? = null
     private var payload: JSONObject? = null
 
-    private fun action(res: JSONObject) {
+    private fun success(resMetadata: JSONObject, resPayload: JSONObject) {
         val pageSize = DevChatSettingsState.instance.maxLogCount
         val pageIndex = metadata!!.getInteger("pageIndex") ?: 1
-        res["messages"] = ActiveConversation.getMessages(pageIndex, pageSize)
+        resPayload["messages"] = ActiveConversation.getMessages(pageIndex, pageSize)
     }
 
     override fun executeAction() {
         handler.handle(
             DevChatActions.LOAD_HISTORY_MESSAGES_RESPONSE,
             metadata!!.getString("callback"),
-            ::action
-        )
+            ::success,
+        ) { _, _ -> }
     }
 
     override fun setMetadata(metadata: JSONObject) {