⬆️ Upgrade to support the latest version Hydrogen Project standard

pkg/grpc/client.go

@@ -1,42 +0,0 @@
-package grpc
-
-import (
-	pcpb "git.solsynth.dev/hydrogen/paperclip/pkg/grpc/proto"
-	idpb "git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
-)
-
-var Attachments pcpb.AttachmentsClient
-
-func ConnectPaperclip() error {
-	addr := viper.GetString("paperclip.grpc_endpoint")
-	if conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials())); err != nil {
-		return err
-	} else {
-		Attachments = pcpb.NewAttachmentsClient(conn)
-	}
-
-	return nil
-}
-
-var Realms idpb.RealmsClient
-var Friendships idpb.FriendshipsClient
-var Notify idpb.NotifyClient
-var Auth idpb.AuthClient
-
-func ConnectPassport() error {
-	addr := viper.GetString("passport.grpc_endpoint")
-	if conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials())); err != nil {
-		return err
-	} else {
-		Realms = idpb.NewRealmsClient(conn)
-		Friendships = idpb.NewFriendshipsClient(conn)
-		Notify = idpb.NewNotifyClient(conn)
-		Auth = idpb.NewAuthClient(conn)
-	}
-
-	return nil
-}

pkg/internal/database/migrator.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
 	"gorm.io/gorm"
 )
 

pkg/internal/gap/client.go

@@ -0,0 +1,12 @@
+package gap
+
+import (
+	"git.solsynth.dev/hydrogen/passport/pkg/hyper"
+	"github.com/spf13/viper"
+)
+
+var H *hyper.HyperConn
+
+func NewHyperClient() {
+	H = hyper.NewHyperConn(viper.GetString("consul.addr"))
+}

pkg/internal/gap/net.go

@@ -0,0 +1,15 @@
+package gap
+
+import "net"
+
+func GetOutboundIP() (net.IP, error) {
+	conn, err := net.Dial("udp", "1.1.1.1:80")
+	if err != nil {
+		return nil, err
+	} else {
+		defer conn.Close()
+	}
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+	return localAddr.IP, nil
+}

pkg/internal/gap/server.go

@@ -0,0 +1,40 @@
+package gap
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/hashicorp/consul/api"
+	"github.com/spf13/viper"
+)
+
+func Register() error {
+	cfg := api.DefaultConfig()
+	cfg.Address = viper.GetString("consul.addr")
+
+	client, err := api.NewClient(cfg)
+	if err != nil {
+		return err
+	}
+
+	httpBind := strings.SplitN(viper.GetString("bind"), ":", 2)
+	grpcBind := strings.SplitN(viper.GetString("grpc_bind"), ":", 2)
+
+	outboundIp, _ := GetOutboundIP()
+	port, _ := strconv.Atoi(httpBind[1])
+
+	registration := new(api.AgentServiceRegistration)
+	registration.ID = viper.GetString("id")
+	registration.Name = "Hydrogen.Interactive"
+	registration.Address = outboundIp.String()
+	registration.Port = port
+	registration.Check = &api.AgentServiceCheck{
+		GRPC:                           fmt.Sprintf("%s:%s", outboundIp, grpcBind[1]),
+		Timeout:                        "5s",
+		Interval:                       "1m",
+		DeregisterCriticalServiceAfter: "3m",
+	}
+
+	return client.Agent().ServiceRegister(registration)
+}

pkg/internal/grpc/health.go

@@ -0,0 +1,26 @@
+package grpc
+
+import (
+	"context"
+	health "google.golang.org/grpc/health/grpc_health_v1"
+	"time"
+)
+
+func (v *Server) Check(ctx context.Context, request *health.HealthCheckRequest) (*health.HealthCheckResponse, error) {
+	return &health.HealthCheckResponse{
+		Status: health.HealthCheckResponse_SERVING,
+	}, nil
+}
+
+func (v *Server) Watch(request *health.HealthCheckRequest, server health.Health_WatchServer) error {
+	for {
+		if server.Send(&health.HealthCheckResponse{
+			Status: health.HealthCheckResponse_SERVING,
+		}) != nil {
+			break
+		}
+		time.Sleep(1000 * time.Millisecond)
+	}
+
+	return nil
+}

pkg/internal/grpc/server.go

@@ -0,0 +1,31 @@
+package grpc
+
+import (
+	"github.com/spf13/viper"
+	"google.golang.org/grpc"
+	health "google.golang.org/grpc/health/grpc_health_v1"
+	"google.golang.org/grpc/reflection"
+	"net"
+)
+
+type Server struct {
+}
+
+var S *grpc.Server
+
+func NewGRPC() {
+	S = grpc.NewServer()
+
+	health.RegisterHealthServer(S, &Server{})
+
+	reflection.Register(S)
+}
+
+func ListenGRPC() error {
+	listener, err := net.Listen("tcp", viper.GetString("grpc_bind"))
+	if err != nil {
+		return err
+	}
+
+	return S.Serve(listener)
+}

pkg/internal/server/api/categories_api.go

@@ -1,8 +1,10 @@
-package server
+package api
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/interactive/pkg/services"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -16,7 +18,10 @@ func listCategories(c *fiber.Ctx) error {
 }
 
 func newCategory(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 	if user.PowerLevel <= 55 {
 		return fiber.NewError(fiber.StatusForbidden, "require power level 55 to create categories")
 	}
@@ -27,7 +32,7 @@ func newCategory(c *fiber.Ctx) error {
 		Description string `json:"description"`
 	}
 
-	if err := BindAndValidate(c, &data); err != nil {
+	if err := exts.BindAndValidate(c, &data); err != nil {
 		return err
 	}
 
@@ -40,7 +45,10 @@ func newCategory(c *fiber.Ctx) error {
 }
 
 func editCategory(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 	if user.PowerLevel <= 55 {
 		return fiber.NewError(fiber.StatusForbidden, "require power level 55 to edit categories")
 	}
@@ -57,7 +65,7 @@ func editCategory(c *fiber.Ctx) error {
 		Description string `json:"description"`
 	}
 
-	if err := BindAndValidate(c, &data); err != nil {
+	if err := exts.BindAndValidate(c, &data); err != nil {
 		return err
 	}
 
@@ -70,7 +78,10 @@ func editCategory(c *fiber.Ctx) error {
 }
 
 func deleteCategory(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 	if user.PowerLevel <= 55 {
 		return fiber.NewError(fiber.StatusForbidden, "require power level 55 to delete categories")
 	}

pkg/internal/server/api/feed_api.go

@@ -1,9 +1,9 @@
-package server
+package api
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/interactive/pkg/services"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/server/api/index.go

@@ -0,0 +1,32 @@
+package api
+
+import (
+	"github.com/gofiber/fiber/v2"
+)
+
+func MapAPIs(app *fiber.App) {
+	api := app.Group("/api").Name("API")
+	{
+		api.Get("/users/me", getUserinfo)
+		api.Get("/users/:accountId", getOthersInfo)
+
+		api.Get("/feed", listFeed)
+
+		posts := api.Group("/posts").Name("Posts API")
+		{
+			posts.Get("/", listPost)
+			posts.Get("/:post", getPost)
+			posts.Post("/", createPost)
+			posts.Post("/:post/react", reactPost)
+			posts.Put("/:postId", editPost)
+			posts.Delete("/:postId", deletePost)
+
+			posts.Get("/:post/replies", listReplies)
+		}
+
+		api.Get("/categories", listCategories)
+		api.Post("/categories", newCategory)
+		api.Put("/categories/:categoryId", editCategory)
+		api.Delete("/categories/:categoryId", deleteCategory)
+	}
+}

pkg/internal/server/api/posts_api.go

@@ -1,17 +1,17 @@
-package server
+package api
 
 import (
 	"fmt"
-	"strings"
-	"time"
-
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/server/exts"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/google/uuid"
-
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/interactive/pkg/services"
 	"github.com/samber/lo"
+	"strings"
+	"time"
 )
 
 func getPost(c *fiber.Ctx) error {
@@ -74,7 +74,10 @@ func listPost(c *fiber.Ctx) error {
 }
 
 func createPost(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureGrantedPerm(c, "CreateInteractivePost", true); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 
 	var data struct {
 		Alias       string            `json:"alias" form:"alias"`
@@ -88,7 +91,7 @@ func createPost(c *fiber.Ctx) error {
 		RepostTo    *uint             `json:"repost_to" form:"repost_to"`
 	}
 
-	if err := BindAndValidate(c, &data); err != nil {
+	if err := exts.BindAndValidate(c, &data); err != nil {
 		return err
 	} else if len(data.Alias) == 0 {
 		data.Alias = strings.ReplaceAll(uuid.NewString(), "-", "")
@@ -146,8 +149,11 @@ func createPost(c *fiber.Ctx) error {
 }
 
 func editPost(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
 	id, _ := c.ParamsInt("postId", 0)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 
 	var data struct {
 		Alias       string            `json:"alias" form:"alias" validate:"required"`
@@ -158,7 +164,7 @@ func editPost(c *fiber.Ctx) error {
 		Attachments []uint            `json:"attachments" form:"attachments"`
 	}
 
-	if err := BindAndValidate(c, &data); err != nil {
+	if err := exts.BindAndValidate(c, &data); err != nil {
 		return err
 	}
 
@@ -191,7 +197,10 @@ func editPost(c *fiber.Ctx) error {
 }
 
 func deletePost(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 	id, _ := c.ParamsInt("postId", 0)
 
 	var item models.Post
@@ -210,14 +219,17 @@ func deletePost(c *fiber.Ctx) error {
 }
 
 func reactPost(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 
 	var data struct {
 		Symbol   string                  `json:"symbol" form:"symbol" validate:"required"`
 		Attitude models.ReactionAttitude `json:"attitude" form:"attitude"`
 	}
 
-	if err := BindAndValidate(c, &data); err != nil {
+	if err := exts.BindAndValidate(c, &data); err != nil {
 		return err
 	}
 

pkg/internal/server/api/replies_api.go

@@ -1,10 +1,10 @@
-package server
+package api
 
 import (
 	"fmt"
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/interactive/pkg/services"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
 

pkg/internal/server/api/users_api.go

@@ -1,13 +1,17 @@
-package server
+package api
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
 	"github.com/gofiber/fiber/v2"
 )
 
 func getUserinfo(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
+	if err := gap.H.EnsureAuthenticated(c); err != nil {
+		return err
+	}
+	user := c.Locals("user").(models.Account)
 
 	var data models.Account
 	if err := database.C.

pkg/internal/server/exts/auth.go

@@ -0,0 +1,19 @@
+package exts
+
+import (
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
+	"git.solsynth.dev/hydrogen/passport/pkg/proto"
+	"github.com/gofiber/fiber/v2"
+)
+
+func LinkAccountMiddleware(c *fiber.Ctx) error {
+	if val, ok := c.Locals("p_user").(*proto.Userinfo); ok {
+		if account, err := services.LinkAccount(val); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+		} else {
+			c.Locals("user", account)
+		}
+	}
+
+	return c.Next()
+}

pkg/internal/server/exts/utils.go

@@ -1,4 +1,4 @@
-package server
+package exts
 
 import (
 	"github.com/go-playground/validator/v10"

pkg/internal/server/server.go

@@ -1,7 +1,10 @@
 package server
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg"
+	pkg "git.solsynth.dev/hydrogen/interactive/pkg/internal"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/server/api"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/server/exts"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/favicon"
@@ -56,32 +59,8 @@ func NewServer() {
 		Output: log.Logger,
 	}))
 
-	A.Get("/.well-known", getMetadata)
-
-	api := A.Group("/api").Name("API")
-	{
-		api.Get("/users/me", authMiddleware, getUserinfo)
-		api.Get("/users/:accountId", getOthersInfo)
-
-		api.Get("/feed", listFeed)
-
-		posts := api.Group("/posts").Name("Posts API")
-		{
-			posts.Get("/", listPost)
-			posts.Get("/:post", getPost)
-			posts.Post("/", authMiddleware, createPost)
-			posts.Post("/:post/react", authMiddleware, reactPost)
-			posts.Put("/:postId", authMiddleware, editPost)
-			posts.Delete("/:postId", authMiddleware, deletePost)
-
-			posts.Get("/:post/replies", listReplies)
-		}
-
-		api.Get("/categories", listCategories)
-		api.Post("/categories", authMiddleware, newCategory)
-		api.Put("/categories/:categoryId", authMiddleware, editCategory)
-		api.Delete("/categories/:categoryId", authMiddleware, deleteCategory)
-	}
+	A.Use(gap.H.AuthMiddleware)
+	A.Use(exts.LinkAccountMiddleware)
 
 	A.Use(favicon.New(favicon.Config{
 		FileSystem: http.FS(pkg.FS),
@@ -89,6 +68,8 @@ func NewServer() {
 		URL:        "/favicon.png",
 	}))
 
+	api.MapAPIs(A)
+
 	A.Get("/", func(c *fiber.Ctx) error {
 		return c.Render("views/open", fiber.Map{
 			"frontend": viper.GetString("frontend"),

pkg/internal/services/accounts.go

@@ -2,10 +2,10 @@ package services
 
 import (
 	"context"
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	"time"
@@ -24,7 +24,11 @@ func GetAccountFriend(userId, relatedId uint, status int) (*proto.FriendshipResp
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 
-	return grpc.Friendships.GetFriendship(ctx, &proto.FriendshipTwoSideLookupRequest{
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	if err != nil {
+		return nil, err
+	}
+	return proto.NewFriendshipsClient(pc).GetFriendship(ctx, &proto.FriendshipTwoSideLookupRequest{
 		AccountId: uint64(user.ExternalID),
 		RelatedId: uint64(related.ExternalID),
 		Status:    uint32(status),
@@ -35,7 +39,11 @@ func NotifyPosterAccount(user models.Account, subject, content string, links ...
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 
-	_, err := grpc.Notify.NotifyUser(ctx, &proto.NotifyRequest{
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	if err != nil {
+		return err
+	}
+	_, err = proto.NewNotifyClient(pc).NotifyUser(ctx, &proto.NotifyRequest{
 		ClientId:     viper.GetString("passport.client_id"),
 		ClientSecret: viper.GetString("passport.client_secret"),
 		Type:         "interactive.feedback",

pkg/internal/services/attachments.go

@@ -0,0 +1,20 @@
+package services
+
+import (
+	"context"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/proto"
+	"github.com/samber/lo"
+)
+
+func CheckAttachmentByIDExists(id uint, usage string) bool {
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Paperclip")
+	if err != nil {
+		return false
+	}
+	_, err = proto.NewAttachmentsClient(pc).CheckAttachmentExists(context.Background(), &proto.AttachmentLookupRequest{
+		Id:    lo.ToPtr(uint64(id)),
+		Usage: &usage,
+	})
+	return err == nil
+}

pkg/internal/services/auth.go

@@ -1,17 +1,13 @@
 package services
 
 import (
-	"context"
 	"errors"
 	"fmt"
-	"reflect"
-	"time"
-
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"gorm.io/gorm"
+	"reflect"
 )
 
 func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
@@ -53,24 +49,3 @@ func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
 
 	return account, err
 }
-
-func Authenticate(atk, rtk string) (models.Account, string, string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-	defer cancel()
-
-	var err error
-	var user models.Account
-	reply, err := grpc.Auth.Authenticate(ctx, &proto.AuthRequest{
-		AccessToken:  atk,
-		RefreshToken: &rtk,
-	})
-	if err != nil {
-		return user, reply.GetAccessToken(), reply.GetRefreshToken(), err
-	} else if !reply.IsValid {
-		return user, reply.GetAccessToken(), reply.GetRefreshToken(), fmt.Errorf("invalid authorization context")
-	}
-
-	user, err = LinkAccount(reply.Userinfo)
-
-	return user, reply.GetAccessToken(), reply.GetRefreshToken(), err
-}

pkg/internal/services/categories.go

@@ -3,8 +3,8 @@ package services
 import (
 	"errors"
 
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
 	"gorm.io/gorm"
 )
 

pkg/internal/services/cleaner.go

@@ -1,7 +1,7 @@
 package services
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
 	"github.com/rs/zerolog/log"
 	"time"
 )

pkg/internal/services/posts.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"github.com/spf13/viper"

pkg/internal/services/realms.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
-	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
-	"git.solsynth.dev/hydrogen/interactive/pkg/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"github.com/samber/lo"
 	"gorm.io/gorm"
 	"reflect"
@@ -15,7 +15,11 @@ import (
 
 func GetRealm(id uint) (models.Realm, error) {
 	var realm models.Realm
-	response, err := grpc.Realms.GetRealm(context.Background(), &proto.RealmLookupRequest{
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	if err != nil {
+		return realm, err
+	}
+	response, err := proto.NewRealmsClient(pc).GetRealm(context.Background(), &proto.RealmLookupRequest{
 		Id: lo.ToPtr(uint64(id)),
 	})
 	if err != nil {
@@ -26,7 +30,11 @@ func GetRealm(id uint) (models.Realm, error) {
 
 func GetRealmWithAlias(alias string) (models.Realm, error) {
 	var realm models.Realm
-	response, err := grpc.Realms.GetRealm(context.Background(), &proto.RealmLookupRequest{
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	if err != nil {
+		return realm, err
+	}
+	response, err := proto.NewRealmsClient(pc).GetRealm(context.Background(), &proto.RealmLookupRequest{
 		Alias: &alias,
 	})
 	if err != nil {
@@ -36,7 +44,11 @@ func GetRealmWithAlias(alias string) (models.Realm, error) {
 }
 
 func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberResponse, error) {
-	response, err := grpc.Realms.GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	if err != nil {
+		return nil, err
+	}
+	response, err := proto.NewRealmsClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
 		RealmId: uint64(realmId),
 		UserId:  lo.ToPtr(uint64(userId)),
 	})
@@ -48,7 +60,11 @@ func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberResponse, erro
 }
 
 func ListRealmMember(realmId uint) ([]*proto.RealmMemberResponse, error) {
-	response, err := grpc.Realms.ListRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
+	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	if err != nil {
+		return nil, err
+	}
+	response, err := proto.NewRealmsClient(pc).ListRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
 		RealmId: uint64(realmId),
 	})
 	if err != nil {

pkg/main.go

@@ -1,19 +1,19 @@
 package main
 
 import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
-	"git.solsynth.dev/hydrogen/interactive/pkg/server"
-	"git.solsynth.dev/hydrogen/interactive/pkg/services"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/database"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/grpc"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/server"
+	"git.solsynth.dev/hydrogen/interactive/pkg/internal/services"
 	"github.com/robfig/cron/v3"
-	"os"
-	"os/signal"
-	"syscall"
-
-	interactive "git.solsynth.dev/hydrogen/interactive/pkg"
-	"git.solsynth.dev/hydrogen/interactive/pkg/database"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
+	"os"
+	"os/signal"
+	"syscall"
 )
 
 func init() {
@@ -41,11 +41,10 @@ func main() {
 	}
 
 	// Connect other services
-	if err := grpc.ConnectPaperclip(); err != nil {
+	if err := gap.Register(); err != nil {
 		log.Fatal().Err(err).Msg("An error occurred when connecting to paperclip...")
-	}
-	if err := grpc.ConnectPassport(); err != nil {
-		log.Fatal().Err(err).Msg("An error occurred when connecting to passport...")
+	} else {
+		gap.NewHyperClient()
 	}
 
 	// Configure timed tasks
@@ -57,14 +56,17 @@ func main() {
 	server.NewServer()
 	go server.Listen()
 
+	grpc.NewGRPC()
+	go grpc.ListenGRPC()
+
 	// Messages
-	log.Info().Msgf("Interactive v%s is started...", interactive.AppVersion)
+	log.Info().Msgf("Interactive v%s is started...", pkg.AppVersion)
 
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 	<-quit
 
-	log.Info().Msgf("Interactive v%s is quitting...", interactive.AppVersion)
+	log.Info().Msgf("Interactive v%s is quitting...", pkg.AppVersion)
 
 	quartz.Stop()
 }

pkg/server/auth.go

@@ -1,50 +0,0 @@
-package server
-
-import (
-	"git.solsynth.dev/hydrogen/interactive/pkg/services"
-	"github.com/gofiber/fiber/v2"
-	"strings"
-)
-
-func authMiddleware(c *fiber.Ctx) error {
-	var token string
-	if cookie := c.Cookies(services.CookieAccessKey); len(cookie) > 0 {
-		token = cookie
-	}
-	if header := c.Get(fiber.HeaderAuthorization); len(header) > 0 {
-		tk := strings.Replace(header, "Bearer", "", 1)
-		token = strings.TrimSpace(tk)
-	}
-
-	c.Locals("token", token)
-
-	if err := authFunc(c); err != nil {
-		return err
-	}
-
-	return c.Next()
-}
-
-func authFunc(c *fiber.Ctx, overrides ...string) error {
-	var token string
-	if len(overrides) > 0 {
-		token = overrides[0]
-	} else {
-		if tk, ok := c.Locals("token").(string); !ok {
-			return fiber.NewError(fiber.StatusUnauthorized)
-		} else {
-			token = tk
-		}
-	}
-
-	rtk := c.Cookies(services.CookieRefreshKey)
-	if user, atk, rtk, err := services.Authenticate(token, rtk); err == nil {
-		if atk != token {
-			services.SetJwtCookieSet(c, atk, rtk)
-		}
-		c.Locals("principal", user)
-		return nil
-	} else {
-		return fiber.NewError(fiber.StatusUnauthorized, err.Error())
-	}
-}

pkg/server/well_known_api.go

@@ -1,16 +0,0 @@
-package server
-
-import (
-	"github.com/gofiber/fiber/v2"
-	"github.com/spf13/viper"
-)
-
-func getMetadata(c *fiber.Ctx) error {
-	return c.JSON(fiber.Map{
-		"name":   viper.GetString("name"),
-		"domain": viper.GetString("domain"),
-		"components": fiber.Map{
-			"passport": viper.GetString("passport.endpoint"),
-		},
-	})
-}

pkg/services/attachments.go

@@ -1,29 +0,0 @@
-package services
-
-import (
-	"context"
-	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
-	pcpb "git.solsynth.dev/hydrogen/paperclip/pkg/grpc/proto"
-	"github.com/samber/lo"
-)
-
-func GetAttachmentByID(id uint) (*pcpb.Attachment, error) {
-	return grpc.Attachments.GetAttachment(context.Background(), &pcpb.AttachmentLookupRequest{
-		Id: lo.ToPtr(uint64(id)),
-	})
-}
-
-func GetAttachmentByUUID(uuid string) (*pcpb.Attachment, error) {
-	return grpc.Attachments.GetAttachment(context.Background(), &pcpb.AttachmentLookupRequest{
-		Uuid: &uuid,
-	})
-}
-
-func CheckAttachmentByIDExists(id uint, usage string) bool {
-	_, err := grpc.Attachments.CheckAttachmentExists(context.Background(), &pcpb.AttachmentLookupRequest{
-		Id:    lo.ToPtr(uint64(id)),
-		Usage: &usage,
-	})
-
-	return err == nil
-}