✨ DirectAccess in users

pkg/authkit/user.go

@@ -2,7 +2,10 @@ package authkit
 
 import (
 	"context"
+	"time"
+
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
+	"git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"git.solsynth.dev/hypernet/passport/pkg/authkit/models"
@@ -10,6 +13,14 @@ import (
 )
 
 func GetUser(nx *nex.Conn, userId uint) (models.Account, error) {
+	cacheConn, err := cachekit.NewConn(nx, 3*time.Second)
+	if err == nil {
+		key := cachekit.FKey(cachekit.DAAttachment, userId)
+		if user, err := cachekit.Get[models.Account](cacheConn, key); err == nil {
+			return user, nil
+		}
+	}
+
 	conn, err := nx.GetClientGrpcConn(nex.ServiceTypeAuth)
 	if err != nil {
 		return models.Account{}, err
@@ -26,6 +37,14 @@ func GetUser(nx *nex.Conn, userId uint) (models.Account, error) {
 }
 
 func GetUserByName(nx *nex.Conn, name string) (models.Account, error) {
+	cacheConn, err := cachekit.NewConn(nx, 3*time.Second)
+	if err == nil {
+		key := cachekit.FKey(cachekit.DAAttachment, name)
+		if user, err := cachekit.Get[models.Account](cacheConn, key); err == nil {
+			return user, nil
+		}
+	}
+
 	conn, err := nx.GetClientGrpcConn(nex.ServiceTypeAuth)
 	if err != nil {
 		return models.Account{}, err
@@ -41,24 +60,59 @@ func GetUserByName(nx *nex.Conn, name string) (models.Account, error) {
 	}), nil
 }
 
-func ListUser(nx *nex.Conn, userId []uint) ([]models.Account, error) {
+func ListUser(nx *nex.Conn, userIds []uint) ([]models.Account, error) {
+	var accounts []models.Account
+	var missingId []uint
+	cachedUsers := make(map[uint]models.Account)
+
+	// Try to get users from cache
+	cacheConn, err := cachekit.NewConn(nx, 3*time.Second)
+	if err == nil {
+		for _, userId := range userIds {
+			key := cachekit.FKey(cachekit.DAAttachment, userId)
+			if user, err := cachekit.Get[models.Account](cacheConn, key); err == nil {
+				cachedUsers[userId] = user
+			} else {
+				missingId = append(missingId, userId)
+			}
+		}
+	}
+
+	// If all users are found in cache, return them
+	if len(missingId) == 0 {
+		for _, account := range cachedUsers {
+			accounts = append(accounts, account)
+		}
+		return accounts, nil
+	}
+
+	// Fetch missing users from the gRPC service
 	conn, err := nx.GetClientGrpcConn(nex.ServiceTypeAuth)
 	if err != nil {
 		return nil, err
 	}
+
 	raw, _ := proto.NewUserServiceClient(conn).ListUser(context.Background(), &proto.ListUserRequest{
-		UserId: lo.Map(userId, func(item uint, index int) uint64 {
+		UserId: lo.Map(missingId, func(item uint, index int) uint64 {
 			return uint64(item)
 		}),
 	})
-	var out []models.Account
+
+	// Convert fetched users and add to the result
 	for _, item := range raw.GetData() {
-		out = append(out, GetAccountFromUserInfo(&sec.UserInfo{
+		account := GetAccountFromUserInfo(&sec.UserInfo{
 			ID:        uint(item.GetId()),
 			Name:      item.GetName(),
 			PermNodes: nex.DecodeMap(item.GetPermNodes()),
 			Metadata:  nex.DecodeMap(item.GetMetadata()),
-		}))
+		})
+		accounts = append(accounts, account)
 	}
-	return out, nil
+
+	// Merge cached and fetched results
+	for _, account := range cachedUsers {
+		accounts = append(accounts, account)
+	}
+
+	return accounts, nil
 }

pkg/internal/services/accounts.go

@@ -26,7 +26,7 @@ import (
 )
 
 func KgAccountCache(query any) string {
-	return fmt.Sprintf("account#%v", query)
+	return cachekit.FKey(cachekit.DAUser, query)
 }
 
 func CacheAccount(account models.Account) {