From 5e76fa07b7738662fa09f9fb9827b8fe9752357d Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sat, 24 Aug 2024 14:29:36 +0800
Subject: [PATCH] :alien: Use hyper's NetworkPackage instead of own
 UnifiedCommand

---
 .idea/workspace.xml                    |  2 +-
 pkg/internal/models/unified.go         | 21 ---------------------
 pkg/internal/services/notifications.go |  5 +++--
 3 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 pkg/internal/models/unified.go

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17e9704..6ec24af 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":alien: Change avatar and banner id to string">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/models/unified.go" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/pkg/internal/services/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/notifications.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/pkg/internal/models/unified.go b/pkg/internal/models/unified.go
deleted file mode 100644
index bea3048..0000000
--- a/pkg/internal/models/unified.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package models
-
-import jsoniter "github.com/json-iterator/go"
-
-type UnifiedCommand struct {
-	Action  string `json:"w"`
-	Message string `json:"m"`
-	Payload any    `json:"p"`
-}
-
-func UnifiedCommandFromError(err error) UnifiedCommand {
-	return UnifiedCommand{
-		Action:  "error",
-		Message: err.Error(),
-	}
-}
-
-func (v UnifiedCommand) Marshal() []byte {
-	data, _ := jsoniter.Marshal(v)
-	return data
-}
diff --git a/pkg/internal/services/notifications.go b/pkg/internal/services/notifications.go
index c306261..0ea6279 100644
--- a/pkg/internal/services/notifications.go
+++ b/pkg/internal/services/notifications.go
@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/samber/lo"
 	"reflect"
@@ -71,7 +72,7 @@ func PushNotification(notification models.Notification) error {
 	defer cancel()
 	_, err := proto.NewStreamControllerClient(gap.H.GetDealerGrpcConn()).PushStream(ctx, &proto.PushStreamRequest{
 		UserId: lo.ToPtr(uint64(notification.AccountID)),
-		Body: models.UnifiedCommand{
+		Body: hyper.NetworkPackage{
 			Action:  "notifications.new",
 			Payload: notification,
 		}.Marshal(),
@@ -134,7 +135,7 @@ func PushNotificationBatch(notifications []models.Notification) {
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		_, _ = stream.PushStream(ctx, &proto.PushStreamRequest{
 			UserId: lo.ToPtr(uint64(notification.AccountID)),
-			Body: models.UnifiedCommand{
+			Body: hyper.NetworkPackage{
 				Action:  "notifications.new",
 				Payload: notification,
 			}.Marshal(),