Merge pull request '[🚀] sse' (#10) from dev into main

Reviewed-on: #10

pkg/sse/server.go

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