♻️ Remove most of the dealer deps and move to nexus

pkg/internal/services/accounts.go

@@ -312,7 +312,7 @@ func DeleteAccount(id uint) error {
 		return err
 	} else {
 		InvalidAuthCacheWithUser(id)
-		_, _ = proto.NewServiceDirectoryClient(gap.H.GetDealerGrpcConn()).BroadcastDeletion(context.Background(), &proto.DeletionRequest{
+		_, _ = proto.NewServiceDirectoryClient(gap.Nx.GetDealerGrpcConn()).BroadcastDeletion(context.Background(), &proto.DeletionRequest{
 			ResourceType: "account",
 			ResourceId:   fmt.Sprintf("%d", id),
 		})

pkg/internal/services/auth.go

@@ -16,24 +16,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func Authenticate(atk, rtk string, rty int) (ctx models.AuthContext, perms map[string]any, newAtk, newRtk string, err error) {
-	var claims PayloadClaims
-	claims, err = DecodeJwt(atk)
-	if err != nil {
-		if len(rtk) > 0 && rty < 1 {
-			// Auto refresh and retry
-			newAtk, newRtk, err = RefreshToken(rtk)
-			if err == nil {
-				return Authenticate(newAtk, newRtk, rty+1)
-			}
-		}
-		err = fiber.NewError(fiber.StatusUnauthorized, fmt.Sprintf("invalid auth key: %v", err))
-		return
-	}
-
-	newAtk = atk
-	newRtk = rtk
-
+func Authenticate(atk, rtk string, rty int) (ctx models.AuthContext, perms map[string]any, err error) {
 	if ctx, err = GetAuthContext(claims.ID); err == nil {
 		var heldPerms map[string]any
 		rawHeldPerms, _ := jsoniter.Marshal(ctx.Account.PermNodes)

pkg/internal/services/factors.go

@@ -88,7 +88,7 @@ func GetFactorCode(factor models.AuthFactor) (bool, error) {
 
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
-		_, err := proto.NewPostmanClient(gap.H.GetDealerGrpcConn()).DeliverEmail(ctx, &proto.DeliverEmailRequest{
+		_, err := proto.NewPostmanClient(gap.Nx.GetDealerGrpcConn()).DeliverEmail(ctx, &proto.DeliverEmailRequest{
 			To: user.GetPrimaryEmail().Content,
 			Email: &proto.EmailRequest{
 				Subject:  subject,

pkg/internal/services/notifications.go

@@ -3,10 +3,10 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 	"reflect"
 	"time"
 
-	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
@@ -18,6 +18,8 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
+// TODO Awaiting for the new notification pusher
+
 func AddNotifySubscriber(user models.Account, provider, id, tk, ua string) (models.NotificationSubscriber, error) {
 	var prev models.NotificationSubscriber
 	var subscriber models.NotificationSubscriber
@@ -49,7 +51,7 @@ func AddNotifySubscriber(user models.Account, provider, id, tk, ua string) (mode
 }
 
 // NewNotification will create a notification and push via the push method it
-// Please provide the notification with the account field is not empty
+// Pleases provide the notification with the account field is not empty
 func NewNotification(notification models.Notification) error {
 	if ok := CheckNotificationNotifiable(notification.Account, notification.Topic); !ok {
 		log.Info().Str("topic", notification.Topic).Uint("uid", notification.AccountID).Msg("Notification dismissed by user...")
@@ -99,9 +101,9 @@ func PushNotification(notification models.Notification, skipNotifiableCheck ...b
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	_, err := proto.NewStreamControllerClient(gap.H.GetDealerGrpcConn()).PushStream(ctx, &proto.PushStreamRequest{
+	_, err := proto.NewStreamControllerClient(gap.Nx.GetNexusGrpcConn()).PushStream(ctx, &proto.PushStreamRequest{
 		UserId: lo.ToPtr(uint64(notification.AccountID)),
-		Body: hyper.NetworkPackage{
+		Body: nex.WebSocketPackage{
 			Action:  "notifications.new",
 			Payload: notification,
 		}.Marshal(),
@@ -133,7 +135,7 @@ func PushNotification(notification models.Notification, skipNotifiableCheck ...b
 
 	ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	_, err = proto.NewPostmanClient(gap.H.GetDealerGrpcConn()).DeliverNotificationBatch(ctx, &proto.DeliverNotificationBatchRequest{
+	_, err = proto.NewPostmanClient(gap.Nx.GetNexusGrpcConn()).DeliverNotificationBatch(ctx, &proto.DeliverNotificationBatchRequest{
 		Providers:    providers,
 		DeviceTokens: tokens,
 		Notify: &proto.NotifyRequest{
@@ -186,12 +188,12 @@ func PushNotificationBatch(notifications []models.Notification, skipNotifiableCh
 	var subscribers []models.NotificationSubscriber
 	database.C.Where("account_id IN ?", accountIdx).Find(&subscribers)
 
-	stream := proto.NewStreamControllerClient(gap.H.GetDealerGrpcConn())
+	stream := proto.NewStreamControllerClient(gap.Nx.GetNexusGrpcConn())
 	for _, notification := range notifications {
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		_, _ = stream.PushStream(ctx, &proto.PushStreamRequest{
 			UserId: lo.ToPtr(uint64(notification.AccountID)),
-			Body: hyper.NetworkPackage{
+			Body: nex.WebSocketPackage{
 				Action:  "notifications.new",
 				Payload: notification,
 			}.Marshal(),
@@ -215,7 +217,7 @@ func PushNotificationBatch(notifications []models.Notification, skipNotifiableCh
 		metadata, _ := jsoniter.Marshal(notification.Metadata)
 
 		ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
-		_, _ = proto.NewPostmanClient(gap.H.GetDealerGrpcConn()).DeliverNotificationBatch(ctx, &proto.DeliverNotificationBatchRequest{
+		_, _ = proto.NewPostmanClient(gap.Nx.GetNexusGrpcConn()).DeliverNotificationBatch(ctx, &proto.DeliverNotificationBatchRequest{
 			Providers:    providers,
 			DeviceTokens: tokens,
 			Notify: &proto.NotifyRequest{

pkg/internal/services/statuses.go

@@ -60,7 +60,7 @@ func CacheUserStatus(uid uint, status models.Status) {
 }
 
 func GetUserOnline(uid uint) bool {
-	pc := proto.NewStreamControllerClient(gap.H.GetDealerGrpcConn())
+	pc := proto.NewStreamControllerClient(gap.Nx.GetDealerGrpcConn())
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	resp, err := pc.CountStreamConnection(ctx, &proto.CountConnectionRequest{

pkg/internal/services/tokens.go

@@ -145,7 +145,7 @@ func NotifyMagicToken(token models.MagicToken) error {
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	_, err := proto.NewPostmanClient(gap.H.GetDealerGrpcConn()).DeliverEmail(ctx, &proto.DeliverEmailRequest{
+	_, err := proto.NewPostmanClient(gap.Nx.GetDealerGrpcConn()).DeliverEmail(ctx, &proto.DeliverEmailRequest{
 		To: user.GetPrimaryEmail().Content,
 		Email: &proto.EmailRequest{
 			Subject:  subject,