♻️ Move dealer to nexus

pkg/internal/grpc/server.go

@@ -3,7 +3,7 @@ package grpc
 import (
 	"net"
 
-	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
+	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 	health "google.golang.org/grpc/health/grpc_health_v1"
@@ -11,27 +11,31 @@ import (
 )
 
 type Server struct {
-	proto.UnimplementedStreamControllerServer
-	proto.UnimplementedServiceDirectoryServer
+	proto.UnimplementedStreamServiceServer
+	proto.UnimplementedDirectoryServiceServer
+
+	srv *grpc.Server
 }
 
-var S *grpc.Server
+func NewGrpc() *Server {
+	server := &Server{
+		srv: grpc.NewServer(),
+	}
 
-func NewGRPC() {
-	S = grpc.NewServer()
+	health.RegisterHealthServer(server.srv, server)
+	proto.RegisterStreamServiceServer(server.srv, server)
+	proto.RegisterDirectoryServiceServer(server.srv, server)
 
-	health.RegisterHealthServer(S, &Server{})
-	proto.RegisterStreamControllerServer(S, &Server{})
-	proto.RegisterServiceDirectoryServer(S, &Server{})
+	reflection.Register(server.srv)
 
-	reflection.Register(S)
+	return server
 }
 
-func ListenGRPC() error {
+func (v *Server) Listen() error {
 	listener, err := net.Listen("tcp", viper.GetString("grpc_bind"))
 	if err != nil {
 		return err
 	}
 
-	return S.Serve(listener)
+	return v.srv.Serve(listener)
 }

pkg/internal/grpc/services.go

@@ -2,28 +2,41 @@ package grpc
 
 import (
 	"context"
+	"git.solsynth.dev/hypernet/nexus/pkg/nex"
+	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"strconv"
 
-	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
 )
 
-func (v *Server) BroadcastDeletion(ctx context.Context, request *proto.DeletionRequest) (*proto.DeletionResponse, error) {
-	switch request.GetResourceType() {
-	case "account":
-		numericId, err := strconv.Atoi(request.GetResourceId())
-		if err != nil {
+func (v *Server) BroadcastEvent(ctx context.Context, in *proto.EventInfo) (*proto.EventResponse, error) {
+	switch in.GetEvent() {
+	case "deletion":
+		data := nex.DecodeMap(in.GetData())
+		resType, ok := data["type"].(string)
+		if !ok {
 			break
 		}
-		for _, model := range database.AutoMaintainRange {
-			switch model.(type) {
-			default:
-				database.C.Delete(model, "account_id = ?", numericId)
+		switch resType {
+		case "account":
+			id, ok := data["id"].(string)
+			if !ok {
+				break
 			}
+			numericId, err := strconv.Atoi(id)
+			if err != nil {
+				break
+			}
+			tx := database.C.Begin()
+			for _, model := range database.AutoMaintainRange {
+				switch model.(type) {
+				default:
+					tx.Delete(model, "account_id = ?", numericId)
+				}
+			}
+			tx.Commit()
 		}
-		database.C.Delete(&models.Account{}, "id = ?", numericId)
 	}
 
-	return &proto.DeletionResponse{}, nil
+	return &proto.EventResponse{}, nil
 }

pkg/internal/grpc/stream.go

@@ -3,43 +3,48 @@ package grpc
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 
-	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
-	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/gap"
-	"git.solsynth.dev/hydrogen/messaging/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/messaging/pkg/internal/http/exts"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/services"
+	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	jsoniter "github.com/json-iterator/go"
 )
 
-func (v *Server) EmitStreamEvent(_ context.Context, in *proto.StreamEventRequest) (*proto.StreamEventResponse, error) {
-	sc := proto.NewStreamControllerClient(gap.H.GetDealerGrpcConn())
+func (v *Server) PushStream(_ context.Context, request *proto.PushStreamRequest) (*proto.PushStreamResponse, error) {
+	sc := proto.NewStreamServiceClient(gap.Nx.GetNexusGrpcConn())
 
-	switch in.GetEvent() {
+	var in nex.WebSocketPackage
+	if err := jsoniter.Unmarshal(request.GetBody(), &in); err != nil {
+		return nil, err
+	}
+
+	switch in.Action {
 	case "status.typing":
 		var data struct {
 			ChannelID uint `json:"channel_id" validate:"required"`
 		}
 
-		err := jsoniter.Unmarshal(in.GetPayload(), &data)
+		err := jsoniter.Unmarshal(in.RawPayload(), &data)
 		if err == nil {
 			err = exts.ValidateStruct(data)
 		}
 		if err != nil {
 			_, _ = sc.PushStream(context.Background(), &proto.PushStreamRequest{
-				ClientId: &in.ClientId,
-				Body: hyper.NetworkPackage{
+				ClientId: request.ClientId,
+				Body: nex.WebSocketPackage{
 					Action:  "error",
 					Message: fmt.Sprintf("unable parse payload: %v", err),
 				}.Marshal(),
 			})
 		}
 
-		err = services.SetTypingStatus(data.ChannelID, uint(in.GetUserId()))
+		err = services.SetTypingStatus(data.ChannelID, uint(request.GetUserId()))
 		if err != nil {
 			_, _ = sc.PushStream(context.Background(), &proto.PushStreamRequest{
-				ClientId: &in.ClientId,
-				Body: hyper.NetworkPackage{
+				ClientId: request.ClientId,
+				Body: nex.WebSocketPackage{
 					Action:  "error",
 					Message: fmt.Sprintf("unable boardcast status: %v", err),
 				}.Marshal(),
@@ -47,5 +52,5 @@ func (v *Server) EmitStreamEvent(_ context.Context, in *proto.StreamEventRequest
 		}
 	}
 
-	return &proto.StreamEventResponse{}, nil
+	return &proto.PushStreamResponse{}, nil
 }