pkg/sse/server.go

@@ -1,7 +1,6 @@
 package sse
 
 import (
-	"gitea.bvbej.com/bvbej/base-golang/pkg/mux"
 	"github.com/gin-gonic/gin"
 	"io"
 	"net/http"
@@ -12,14 +11,13 @@ import (
 var _ Server = (*event)(nil)
 
 type Server interface {
-	GinHandle(ctx *gin.Context, user any)
+	HandlerFunc(auth func(c *gin.Context) (string, error)) gin.HandlerFunc
-	HandlerFunc() mux.HandlerFunc
 	Push(user, name, msg string) bool
 	Broadcast(name, msg string)
 }
 
 type clientChan struct {
-	User any
+	User string
 	Chan chan msgChan
 }
 
@@ -33,7 +31,7 @@ type event struct {
 	Count       atomic.Int32
 
 	Register   chan clientChan
-	Unregister chan any
+	Unregister chan string
 }
 
 func NewServer() Server {
@@ -41,7 +39,7 @@ func NewServer() Server {
 		SessionList: sync.Map{},
 		Count:       atomic.Int32{},
 		Register:    make(chan clientChan),
-		Unregister:  make(chan any),
+		Unregister:  make(chan string),
 	}
 
 	go e.listen()
@@ -67,11 +65,14 @@ func (stream *event) listen() {
 	}
 }
 
-func (stream *event) GinHandle(ctx *gin.Context, user any) {
+func (stream *event) HandlerFunc(auth func(c *gin.Context) (string, error)) gin.HandlerFunc {
-	if user == nil {
+	return func(c *gin.Context) {
-		ctx.AbortWithStatus(http.StatusUnauthorized)
+		user, err := auth(c)
+		if err != nil {
+			c.AbortWithStatus(http.StatusBadRequest)
 			return
 		}
+
 		e := make(chan msgChan)
 		client := clientChan{
 			User: user,
@@ -82,25 +83,20 @@ func (stream *event) GinHandle(ctx *gin.Context, user any) {
 			stream.Unregister <- user
 		}()
 
-	ctx.Writer.Header().Set("Content-Type", "text/event-stream")
+		c.Writer.Header().Set("Content-Type", "text/event-stream")
-	ctx.Writer.Header().Set("Cache-Control", "no-cache")
+		c.Writer.Header().Set("Cache-Control", "no-cache")
-	ctx.Writer.Header().Set("Connection", "keep-alive")
+		c.Writer.Header().Set("Connection", "keep-alive")
-	ctx.Writer.Header().Set("Transfer-Encoding", "chunked")
+		c.Writer.Header().Set("Transfer-Encoding", "chunked")
 
-	ctx.Stream(func(w io.Writer) bool {
+		c.Stream(func(w io.Writer) bool {
 			if msg, ok := <-e; ok {
-			ctx.SSEvent(msg.Name, msg.Message)
+				c.SSEvent(msg.Name, msg.Message)
 				return true
 			}
 			return false
 		})
 
-	ctx.Next()
+		c.Next()
-}
-
-func (stream *event) HandlerFunc() mux.HandlerFunc {
-	return func(c mux.Context) {
-		stream.GinHandle(c.Context(), c.Auth())
 	}
 }