distributed research fully operationnal

controllers/general.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	cx "context"
 	"net/http"
 	"oc-catalog/infrastructure"
 
@@ -9,7 +8,6 @@ import (
 	w "cloud.o-forge.io/core/oc-lib/models/workflow"
 	tools "cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
-	"github.com/beego/beego/v2/server/web/context"
 	"golang.org/x/net/websocket"
 )
 
@@ -62,13 +60,13 @@ func (o *GeneralController) GetAll() {
 	o.ServeJSON()
 }
 
-func Websocket(ctx cx.Context, user string, r *context.Response, w *http.Request) {
+func Websocket(user string, w http.ResponseWriter, r *http.Request) {
 	websocket.Handler(func(ws *websocket.Conn) {
 		defer ws.Close()
-		for {
-			if msg, ok := <-infrastructure.SearchStream[user]; !ok || websocket.Message.Send(ws, msg) != nil {
+		for msg := range infrastructure.SearchStream[user] {
+			if websocket.JSON.Send(ws, msg) != nil {
 				return
 			}
 		}
-	}).ServeHTTP(r, w)
+	}).ServeHTTP(w, r)
 }