✨ Database allocator

pkg/http/api/command.go

@@ -52,9 +52,6 @@ func invokeCommand(c *fiber.Ctx) error {
 	if err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	} else {
-		if !out.IsDelivered {
-			log.Debug().Str("id", command).Str("method", method).Msg("Invoking command from HTTP Gateway... failed, delivery not confirmed")
-		}
 		c.Set(fiber.HeaderContentType, out.ContentType)
 		return c.Status(int(out.Status)).Send(out.Payload)
 	}

pkg/http/api/index.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"git.solsynth.dev/hypernet/nexus/pkg/http/ws"
 	"github.com/gofiber/contrib/websocket"
 	"github.com/gofiber/fiber/v2"
 )
@@ -22,7 +23,7 @@ func MapAPIs(app *fiber.App) {
 			return err
 		}*/
 		return c.Next()
-	}).Get("/ws", websocket.New(listenWebsocket))
+	}).Get("/ws", websocket.New(ws.Listen))
 
 	app.All("/cgi/:command", invokeCommand)
 }

pkg/http/api/ws.go

@@ -1,86 +0,0 @@
-package api
-
-import (
-	"git.solsynth.dev/hypernet/nexus/pkg/internal/models"
-	"git.solsynth.dev/hypernet/nexus/pkg/internal/services"
-	"git.solsynth.dev/hypernet/nexus/pkg/nex"
-	"github.com/gofiber/contrib/websocket"
-	jsoniter "github.com/json-iterator/go"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/viper"
-)
-
-func listenWebsocket(c *websocket.Conn) {
-	user := c.Locals("user").(models.Account)
-
-	// Push connection
-	clientId := services.ClientRegister(user, c)
-	log.Debug().
-		Uint("user", user.ID).
-		Uint64("clientId", clientId).
-		Msg("New websocket connection established...")
-
-	// Event loop
-	var mt int
-	var data []byte
-	var err error
-
-	var packet nex.WebSocketPackage
-
-	for {
-		if mt, data, err = c.ReadMessage(); err != nil {
-			break
-		} else if err := jsoniter.Unmarshal(data, &packet); err != nil {
-			_ = c.WriteMessage(mt, nex.WebSocketPackage{
-				Action:  "error",
-				Message: "unable to unmarshal your command, requires json request",
-			}.Marshal())
-			continue
-		}
-
-		aliasingMap := viper.GetStringMapString("services.aliases")
-		if val, ok := aliasingMap[packet.Endpoint]; ok {
-			packet.Endpoint = val
-		}
-
-		/*
-			service := directory.GetServiceInstanceByType(packet.Endpoint)
-			if service == nil {
-				_ = c.WriteMessage(mt, nex.NetworkPackage{
-					Action:  "error",
-					Message: "service not found",
-				}.Marshal())
-				continue
-			}
-			pc, err := service.GetGrpcConn()
-			if err != nil {
-				_ = c.WriteMessage(mt, nex.NetworkPackage{
-					Action:  "error",
-					Message: fmt.Sprintf("unable to connect to service: %v", err.Error()),
-				}.Marshal())
-				continue
-			}
-
-			sc := proto.NewStreamControllerClient(pc)
-			_, err = sc.EmitStreamEvent(context.Background(), &proto.StreamEventRequest{
-				Event:    packet.Action,
-				UserId:   uint64(user.ID),
-				ClientId: uint64(clientId),
-				Payload:  packet.RawPayload(),
-			})
-			if err != nil {
-				_ = c.WriteMessage(mt, nex.NetworkPackage{
-					Action:  "error",
-					Message: fmt.Sprintf("unable send message to service: %v", err.Error()),
-				}.Marshal())
-				continue
-			}*/
-	}
-
-	// Pop connection
-	services.ClientUnregister(user, clientId)
-	log.Debug().
-		Uint("user", user.ID).
-		Uint64("clientId", clientId).
-		Msg("A websocket connection disconnected...")
-}