♻️ Improved the notification subscriber API

.idea/dataSources/723637bc-6ce3-4bbe-afb3-d88730c75a1b/storage_v2/_src_/database/passport.EoyGSA.meta

@@ -0,0 +1 @@
+#n:passport

.idea/dataSources/723637bc-6ce3-4bbe-afb3-d88730c75a1b/storage_v2/_src_/database/passport.EoyGSA/schema/public.abK9xQ.meta

@@ -0,0 +1,2 @@
+#n:public
+!<md> [41831, 0, null, null, -2147483648, -2147483648]

.idea/workspace.xml

@@ -4,10 +4,11 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Dumb man make dumb mistake again">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/74bcf3ef-a2b9-435b-b9e5-f32902a33b25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/74bcf3ef-a2b9-435b-b9e5-f32902a33b25.xml" afterDir="false" />
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":zap: Use map to improve message delivery time">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/services/realms.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/services/realms.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/models/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/models/notifications.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/server/notifications_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/server/notifications_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/services/notifications.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -149,7 +150,9 @@
     <MESSAGE value=":bug: Bug fix on missing id in realm" />
     <MESSAGE value=":bug: Bug fixes on realm missing member on creation" />
     <MESSAGE value=":bug: Dumb man make dumb mistake again" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Dumb man make dumb mistake again" />
+    <MESSAGE value=":bug: Fix new realm owner missing permissions" />
+    <MESSAGE value=":zap: Use map to improve message delivery time" />
+    <option name="LAST_COMMIT_MESSAGE" value=":zap: Use map to improve message delivery time" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>

pkg/models/notifications.go

@@ -31,8 +31,9 @@ const (
 type NotificationSubscriber struct {
 	BaseModel
 
-	UserAgent string `json:"user_agent"`
-	Provider  string `json:"provider"`
-	DeviceID  string `json:"device_id" gorm:"uniqueIndex"`
-	AccountID uint   `json:"account_id"`
+	UserAgent   string `json:"user_agent"`
+	Provider    string `json:"provider"`
+	DeviceID    string `json:"device_id" gorm:"uniqueIndex"`
+	DeviceToken string `json:"device_token"`
+	AccountID   uint   `json:"account_id"`
 }

pkg/server/notifications_api.go

@@ -89,8 +89,9 @@ func addNotifySubscriber(c *fiber.Ctx) error {
 	user := c.Locals("principal").(models.Account)
 
 	var data struct {
-		Provider string `json:"provider" validate:"required"`
-		DeviceID string `json:"device_id" validate:"required"`
+		Provider    string `json:"provider" validate:"required"`
+		DeviceToken string `json:"device_token" validate:"required"`
+		DeviceID    string `json:"device_id" validate:"required"`
 	}
 
 	if err := utils.BindAndValidate(c, &data); err != nil {
@@ -99,8 +100,9 @@ func addNotifySubscriber(c *fiber.Ctx) error {
 
 	var count int64
 	if err := database.C.Where(&models.NotificationSubscriber{
-		DeviceID:  data.DeviceID,
-		AccountID: user.ID,
+		DeviceID:    data.DeviceID,
+		DeviceToken: data.DeviceToken,
+		AccountID:   user.ID,
 	}).Model(&models.NotificationSubscriber{}).Count(&count).Error; err != nil || count > 0 {
 		return c.SendStatus(fiber.StatusOK)
 	}
@@ -109,6 +111,7 @@ func addNotifySubscriber(c *fiber.Ctx) error {
 		user,
 		data.Provider,
 		data.DeviceID,
+		data.DeviceToken,
 		c.Get(fiber.HeaderUserAgent),
 	)
 	if err != nil {

pkg/server/notify_ws.go

@@ -4,14 +4,13 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/services"
 	"github.com/gofiber/contrib/websocket"
-	"github.com/samber/lo"
 )
 
 func listenNotifications(c *websocket.Conn) {
 	user := c.Locals("principal").(models.Account)
 
 	// Push connection
-	services.WsConn[user.ID] = append(services.WsConn[user.ID], c)
+	services.ClientRegister(user, c)
 
 	// Event loop
 	var err error
@@ -22,7 +21,5 @@ func listenNotifications(c *websocket.Conn) {
 	}
 
 	// Pop connection
-	services.WsConn[user.ID] = lo.Filter(services.WsConn[user.ID], func(item *websocket.Conn, idx int) bool {
-		return item != c
-	})
+	services.ClientUnregister(user, c)
 }

pkg/services/connections.go

@@ -5,13 +5,18 @@ import (
 	"github.com/gofiber/contrib/websocket"
 )
 
-type WsPushRequest struct {
-	Payload     []byte
-	RecipientID uint
+var wsConn = make(map[uint]map[*websocket.Conn]bool)
+
+func ClientRegister(user models.Account, conn *websocket.Conn) {
+	if wsConn[user.ID] == nil {
+		wsConn[user.ID] = make(map[*websocket.Conn]bool)
+	}
+	wsConn[user.ID][conn] = true
 }
 
-var WsConn = make(map[uint][]*websocket.Conn)
-
-func CheckOnline(user models.Account) bool {
-	return len(WsConn[user.ID]) > 0
+func ClientUnregister(user models.Account, conn *websocket.Conn) {
+	if wsConn[user.ID] == nil {
+		wsConn[user.ID] = make(map[*websocket.Conn]bool)
+	}
+	delete(wsConn[user.ID], conn)
 }

pkg/services/notifications.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	jsoniter "github.com/json-iterator/go"
+	"reflect"
 
 	"firebase.google.com/go/messaging"
 	"git.solsynth.dev/hydrogen/passport/pkg/database"
@@ -11,15 +12,32 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func AddNotifySubscriber(user models.Account, provider, device, ua string) (models.NotificationSubscriber, error) {
-	subscriber := models.NotificationSubscriber{
-		UserAgent: ua,
-		Provider:  provider,
-		DeviceID:  device,
+func AddNotifySubscriber(user models.Account, provider, id, tk, ua string) (models.NotificationSubscriber, error) {
+	var prev models.NotificationSubscriber
+	var subscriber models.NotificationSubscriber
+	if err := database.C.Where(&models.NotificationSubscriber{
+		DeviceID:  id,
 		AccountID: user.ID,
+	}); err != nil {
+		subscriber = models.NotificationSubscriber{
+			UserAgent:   ua,
+			Provider:    provider,
+			DeviceID:    id,
+			DeviceToken: tk,
+			AccountID:   user.ID,
+		}
+	} else {
+		prev = subscriber
 	}
 
-	err := database.C.Save(&subscriber).Error
+	subscriber.UserAgent = ua
+	subscriber.Provider = provider
+	subscriber.DeviceToken = tk
+
+	var err error
+	if !reflect.DeepEqual(subscriber, prev) {
+		err = database.C.Save(&subscriber).Error
+	}
 
 	return subscriber, err
 }
@@ -41,7 +59,7 @@ func NewNotification(notification models.Notification) error {
 
 func PushNotification(notification models.Notification) error {
 	raw, _ := jsoniter.Marshal(notification)
-	for _, conn := range WsConn[notification.RecipientID] {
+	for conn := range wsConn[notification.RecipientID] {
 		_ = conn.WriteMessage(1, raw)
 	}
 
@@ -72,7 +90,7 @@ func PushNotification(notification models.Notification) error {
 					Title: notification.Subject,
 					Body:  notification.Content,
 				},
-				Token: subscriber.DeviceID,
+				Token: subscriber.DeviceToken,
 			}
 
 			if response, err := client.Send(ctx, message); err != nil {