pkg/sse/server.go

@@ -7,17 +7,15 @@ import (
 	"net/http"
 	"sync"
 	"sync/atomic"
-	"time"
 )
 
 var _ Server = (*event)(nil)
 
 type Server interface {
+	GinHandle(ctx *gin.Context, user any)
 	HandlerFunc() mux.HandlerFunc
-	GinHandlerFunc(auth func(c *gin.Context) (string, error)) gin.HandlerFunc
 	Push(user any, name, msg string) bool
 	Broadcast(name, msg string)
-	ClientCount() int32
 }
 
 type clientChan struct {
@@ -33,6 +31,7 @@ type msgChan struct {
 type event struct {
 	SessionList sync.Map
 	Count       atomic.Int32
+
 	Register   chan clientChan
 	Unregister chan any
 }
@@ -68,51 +67,11 @@ func (stream *event) listen() {
 	}
 }
 
-func (stream *event) HandlerFunc() mux.HandlerFunc {
+func (stream *event) GinHandle(ctx *gin.Context, user any) {
-	return func(c mux.Context) {
+	if user == nil {
-		auth := c.Auth()
+		ctx.AbortWithStatus(http.StatusUnauthorized)
-		if auth == nil {
-			c.Context().AbortWithStatus(http.StatusBadRequest)
 		return
 	}
-
-		e := make(chan msgChan)
-		client := clientChan{
-			User: auth,
-			Chan: e,
-		}
-		stream.Register <- client
-		defer func() {
-			stream.Unregister <- auth
-		}()
-
-		c.Context().Writer.Header().Set("Content-Type", "text/event-stream")
-		c.Context().Writer.Header().Set("Cache-Control", "no-cache")
-		c.Context().Writer.Header().Set("Connection", "keep-alive")
-		c.Context().Writer.Header().Set("Transfer-Encoding", "chunked")
-
-		time.AfterFunc(time.Second, func() {
-			e <- msgChan{Name: "message", Message: "success"}
-		})
-
-		c.Context().Stream(func(w io.Writer) bool {
-			if msg, ok := <-e; ok {
-				c.Context().SSEvent(msg.Name, msg.Message)
-				return true
-			}
-			return false
-		})
-	}
-}
-
-func (stream *event) GinHandlerFunc(auth func(c *gin.Context) (string, error)) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		user, err := auth(c)
-		if err != nil {
-			c.AbortWithStatus(http.StatusBadRequest)
-			return
-		}
-
 	e := make(chan msgChan)
 	client := clientChan{
 		User: user,
@@ -123,22 +82,25 @@ func (stream *event) GinHandlerFunc(auth func(c *gin.Context) (string, error)) g
 		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")
 
-		time.AfterFunc(time.Second, func() {
+	ctx.Stream(func(w io.Writer) bool {
-			e <- msgChan{Name: "message", Message: "success"}
-		})
-
-		c.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
 	})
+
+	ctx.Next()
+}
+
+func (stream *event) HandlerFunc() mux.HandlerFunc {
+	return func(c mux.Context) {
+		stream.GinHandle(c.Context(), c.Auth())
 	}
 }
 
@@ -158,7 +120,3 @@ func (stream *event) Broadcast(name, msg string) {
 		return true
 	})
 }
-
-func (stream *event) ClientCount() int32 {
-	return stream.Count.Load()
-}