Update api/common.go

api/common.go

@@ -8,6 +8,7 @@ import (
 
 	"encoding/json"
 	"fmt"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 	_ "github.com/linweiyuan/go-chatgpt-api/env"
@@ -78,13 +79,15 @@ func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, stri
 	oldpart := c.GetString("oldpart")
 	part := ""
 
-	c.Writer.Header().Set("Content-Type", "text/event-stream; charset=utf-8")
+	if len(oldpart) == 0 {
+		c.Writer.Header().Set("Content-Type", "text/event-stream; charset=utf-8")
+	}
 
 	reader := bufio.NewReader(resp.Body)
 	for {
 		if c.Request.Context().Err() != nil {
-			c.Writer.Write([]byte("data: [DONE]" + "\n\n"))
-			c.Writer.Flush()
+			// c.Writer.Write([]byte("data: [DONE]" + "\n\n"))
+			// c.Writer.Flush()
 			break
 		}
 
@@ -109,25 +112,29 @@ func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, stri
 			if Status {
 				break
 			}
-		} else if len(oldpart) > 0 {
-			var result map[string]interface{}
-			err := json.Unmarshal([]byte(line[6:]), &result)
-			if err == nil {
-				message := result["message"].(map[string]interface{})
-				content := message["content"].(map[string]interface{})
-				parts := content["parts"].([]interface{})
-				part = parts[0].(string)
-
-				parts[0] = oldpart + part
-				message["id"] = c.GetString("msg_id")
-				metadata := message["metadata"].(map[string]interface{})
-				metadata["message_type"] = "next"
-
-				resultJSON, err2 := json.Marshal(result)
-				if err2 == nil {
-					line = "data: " + string(resultJSON)
-					logger.Info(fmt.Sprintf("HandleConversationResponseAddon: %s", line))
+		} else {
+			if len(oldpart) > 0 {
+				var result map[string]interface{}
+				err := json.Unmarshal([]byte(line[6:]), &result)
+				if err == nil {
+					message := result["message"].(map[string]interface{})
+					content := message["content"].(map[string]interface{})
+					parts := content["parts"].([]interface{})
+					part = parts[0].(string)
+
+					parts[0] = strconv.QuoteToASCII(oldpart + part)
+					message["id"] = c.GetString("msg_id")
+					metadata := message["metadata"].(map[string]interface{})
+					metadata["message_type"] = "next"
+
+					resultJSON, err2 := json.Marshal(result)
+					if err2 == nil {
+						line = "data: " + string(resultJSON)
+						logger.Info(fmt.Sprintf("HandleConversationResponseAddon: %s", line))
+					}
 				}
+			} else {
+
 			}
 		}
 
@@ -166,6 +173,7 @@ func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, stri
 							msg_id := message["id"].(string)
 							c.Set("msg_id", msg_id)
 						}
+						break
 					}
 				}
 			}