From 19ed54fbf3fc6357891cd54699bbd8ba0cbe86e4 Mon Sep 17 00:00:00 2001
From: Adrien <adrien.bouvais.pro@gmail.com>
Date: Thu, 16 May 2024 20:10:57 +0200
Subject: [PATCH] fix

---
 Request.go                | 6 +++---
 main.go                   | 5 ++---
 ssefiber/sse.go => sse.go | 7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename ssefiber/sse.go => sse.go (96%)

diff --git a/Request.go b/Request.go
index d9d92cf..e9b6f87 100644
--- a/Request.go
+++ b/Request.go
@@ -170,17 +170,17 @@ func GenerateMultipleMessagesHandler(c *fiber.Ctx) error {
 
 					outIcon := `<img src="` + selectedLLMs[idx].Model.Company.Icon + `" alt="User Image">`
 
-					sseChanel.SendEvent(
+					go sseChanel.SendEvent(
 						"swapContent-"+fmt.Sprintf("%d", message.Area.Position),
 						outContent,
 					)
 
-					sseChanel.SendEvent(
+					go sseChanel.SendEvent(
 						"swapSelectionBtn-"+selectedLLMs[idx].ID.String(),
 						outBtn,
 					)
 
-					sseChanel.SendEvent(
+					go sseChanel.SendEvent(
 						"swapIcon-"+fmt.Sprintf("%d", message.Area.Position),
 						outIcon,
 					)
diff --git a/main.go b/main.go
index 28432a9..e3a5554 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 
-	"github.com/MrBounty/JADE2.0/ssefiber"
 	"github.com/flosch/pongo2"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/logger"
@@ -13,7 +12,7 @@ import (
 var userTmpl *pongo2.Template
 var botTmpl *pongo2.Template
 var selectBtnTmpl *pongo2.Template
-var sseChanel *ssefiber.FiberSSEChannel
+var sseChanel *FiberSSEChannel
 
 func main() {
 	botTmpl = pongo2.Must(pongo2.FromFile("views/partials/message-bot.html"))
@@ -29,7 +28,7 @@ func main() {
 		AppName:           "JADE 2.0",
 		EnablePrintRoutes: true,
 	})
-	sse := ssefiber.New(app, "/sse")
+	sse := NewSSE(app, "/sse")
 	sseChanel = sse.CreateChannel("sse", "")
 
 	// Add default logger
diff --git a/ssefiber/sse.go b/sse.go
similarity index 96%
rename from ssefiber/sse.go
rename to sse.go
index d48a77a..b55947d 100644
--- a/ssefiber/sse.go
+++ b/sse.go
@@ -1,4 +1,4 @@
-package ssefiber
+package main
 
 import (
 	"bufio"
@@ -84,7 +84,7 @@ Each channel has a name, a base route, and a channel for sending events.
 	// Events Channel
 	eventsChan := testChan.Events
 */
-func New(app *fiber.App, base string) *FiberSSEApp {
+func NewSSE(app *fiber.App, base string) *FiberSSEApp {
 	// Add the base route
 	fiberRouter := app.Group(base, func(c *fiber.Ctx) error {
 		// Set the headers for SSE
@@ -178,7 +178,7 @@ func (fChan *FiberSSEChannel) ServeHTTP(c *fiber.Ctx) error {
 
 		for {
 			event, more := <-fChan.Events
-			// fmt.Fprintf(w, "event: %s\ndata: %s\n\n", string(event.Event), string(event.Data))
+			fmt.Println("event: ", string(event.Event), "\ndata: \n\n", string(event.Data))
 			// w.Flush()
 			go event.FireEventHandlers(c)
 			if err := event.Flush(w); err != nil {
@@ -216,6 +216,7 @@ func (channel *FiberSSEChannel) FireHandlers(fiberCtx *fiber.Ctx, event string)
 func (e *FiberSSEEvent) FireEventHandlers(fiberCtx *fiber.Ctx) {
 	channel := e.OnChannel
 	for _, handler := range channel.EventHandlers[e.Event] {
+		fmt.Println("Firing Event Handlers on Channel: " + channel.Name + " - Event: " + e.Event)
 		handler(fiberCtx, channel, e)
 	}
 }