Selaa lähdekoodia

fix: improve the implementation of sse

JustSong 2 vuotta sitten
vanhempi
commit
b74a17c963
1 muutettua tiedostoa jossa 14 lisäystä ja 13 poistoa
  1. 14 13
      controller/relay.go

+ 14 - 13
controller/relay.go

@@ -2,7 +2,6 @@ package controller
 
 
 import (
 import (
 	"bufio"
 	"bufio"
-	"bytes"
 	"fmt"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
 	"io"
 	"io"
@@ -76,23 +75,25 @@ func Relay(c *gin.Context) {
 	for k, v := range resp.Header {
 	for k, v := range resp.Header {
 		c.Writer.Header().Set(k, v[0])
 		c.Writer.Header().Set(k, v[0])
 	}
 	}
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.WriteHeaderNow()
+	//w := c.Writer
+	//flusher, _ := w.(http.Flusher)
 	c.Stream(func(w io.Writer) bool {
 	c.Stream(func(w io.Writer) bool {
 		select {
 		select {
 		case data := <-dataChan:
 		case data := <-dataChan:
-			//fmt.Println(data)
-			//c.Data(http.StatusOK, "text/event-stream", []byte(data))
-			//c.Render(-1, common.Event{Data: data})
-			//c.SSEvent("", data)
-			//w.Write([]byte(data))
-			//w.(http.Flusher).Flush()
-			//c.Writer.Write(append([]byte(data), []byte("\n\n")...))
-			outputBytes := bytes.NewBufferString(data)
-			w.Write(outputBytes.Bytes())
+			suffix := ""
 			if strings.HasPrefix(data, "data: ") {
 			if strings.HasPrefix(data, "data: ") {
-				w.Write([]byte("\n\n"))
+				suffix = "\n\n"
+			}
+			_, err := fmt.Fprintf(w, "%s%s", data, suffix)
+			if err != nil {
+				return false
 			}
 			}
-			//w.Write(append(outputBytes.Bytes(), []byte("\n\n")...))
-			w.(http.Flusher).Flush()
+			flusher, _ := w.(http.Flusher)
+			flusher.Flush()
 			//fmt.Println(data)
 			//fmt.Println(data)
 			return true
 			return true
 		case <-stopChan:
 		case <-stopChan: