Merge pull request '[🚀] ClientCount' (#16) from dev into main

Reviewed-on: #16

pkg/sse/server.go

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