perf: 优化PushService接口定义

api/http/v1/dto/dto.go

@@ -1,7 +1,7 @@
 package dto
 
 import (
-	"github.com/cossim/hipush/internal/notify"
+	"github.com/cossim/hipush/notify"
 	"time"
 )
 

cmd/main.go

@@ -7,9 +7,9 @@ import (
 	"github.com/cossim/hipush/internal/adapter"
 	"github.com/cossim/hipush/internal/consts"
 	"github.com/cossim/hipush/internal/factory"
-	"github.com/cossim/hipush/internal/push"
 	g "github.com/cossim/hipush/internal/server/grpc"
 	h "github.com/cossim/hipush/internal/server/http"
+	"github.com/cossim/hipush/push"
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 	"log"
@@ -57,45 +57,45 @@ func main() {
 		return adapter.NewPushServiceAdapter(svc)
 	})
 
-	//pushServiceFactory.Register(consts.PlatformHuawei.String(), func() push.PushService {
-	//	svc, err := push.NewHMSService(cfg)
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//	return adapter.NewPushServiceAdapter(svc)
-	//})
-	//
-	//pushServiceFactory.Register(consts.PlatformVivo.String(), func() push.PushService {
-	//	svc, err := push.NewVivoService(cfg)
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//	return adapter.NewPushServiceAdapter(svc)
-	//})
-	//
-	//pushServiceFactory.Register(consts.PlatformOppo.String(), func() push.PushService {
-	//	svc, err := push.NewOppoService(cfg)
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//	return adapter.NewPushServiceAdapter(svc)
-	//})
-	//
-	//pushServiceFactory.Register(consts.PlatformXiaomi.String(), func() push.PushService {
-	//	svc, err := push.NewXiaomiService(cfg)
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//	return adapter.NewPushServiceAdapter(svc)
-	//})
-	//
-	//pushServiceFactory.Register(consts.PlatformMeizu.String(), func() push.PushService {
-	//	svc, err := push.NewMeizuService(cfg)
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//	return adapter.NewPushServiceAdapter(svc)
-	//})
+	pushServiceFactory.Register(consts.PlatformHuawei.String(), func() push.PushService {
+		svc, err := push.NewHMSService(cfg)
+		if err != nil {
+			panic(err)
+		}
+		return adapter.NewPushServiceAdapter(svc)
+	})
+
+	pushServiceFactory.Register(consts.PlatformVivo.String(), func() push.PushService {
+		svc, err := push.NewVivoService(cfg)
+		if err != nil {
+			panic(err)
+		}
+		return adapter.NewPushServiceAdapter(svc)
+	})
+
+	pushServiceFactory.Register(consts.PlatformOppo.String(), func() push.PushService {
+		svc, err := push.NewOppoService(cfg)
+		if err != nil {
+			panic(err)
+		}
+		return adapter.NewPushServiceAdapter(svc)
+	})
+
+	pushServiceFactory.Register(consts.PlatformXiaomi.String(), func() push.PushService {
+		svc, err := push.NewXiaomiService(cfg)
+		if err != nil {
+			panic(err)
+		}
+		return adapter.NewPushServiceAdapter(svc)
+	})
+
+	pushServiceFactory.Register(consts.PlatformMeizu.String(), func() push.PushService {
+		svc, err := push.NewMeizuService(cfg)
+		if err != nil {
+			panic(err)
+		}
+		return adapter.NewPushServiceAdapter(svc)
+	})
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

go.mod

@@ -1,6 +1,6 @@
 module github.com/cossim/hipush
 
-go 1.22
+go 1.22.0
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
@@ -18,7 +18,6 @@ require (
 	github.com/sideshow/apns2 v0.23.0
 	github.com/yilee/xiaomi-push v0.0.0-20170213073944-562fbb07388e
 	go.uber.org/zap v1.27.0
-	golang.org/x/net v0.21.0
 	google.golang.org/api v0.168.0
 	google.golang.org/grpc v1.62.0
 	google.golang.org/protobuf v1.32.0
@@ -71,6 +70,7 @@ require (
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/oauth2 v0.17.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect

internal/adapter/adapter.go

@@ -2,45 +2,47 @@ package adapter
 
 import (
 	"context"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/push"
 )
 
-type PushServiceAdapter struct {
-	pushService push.PushService
-}
-
 func NewPushServiceAdapter(pushService push.PushService) *PushServiceAdapter {
 	return &PushServiceAdapter{pushService: pushService}
 }
 
-func (p *PushServiceAdapter) Send(ctx context.Context, req interface{}, opt push.SendOption) error {
-	return p.pushService.Send(ctx, req, opt)
+type PushServiceAdapter struct {
+	pushService push.PushService
 }
 
-func (p *PushServiceAdapter) MulticastSend(ctx context.Context, req interface{}) error {
-	return p.pushService.MulticastSend(ctx, req)
+func (p *PushServiceAdapter) Send(ctx context.Context, req interface{}, opt ...push.SendOption) error {
+	return p.pushService.Send(ctx, req, opt...)
 }
 
-func (p *PushServiceAdapter) Subscribe(ctx context.Context, req interface{}) error {
-	return p.pushService.Subscribe(ctx, req)
+func (p *PushServiceAdapter) SendMulticast(ctx context.Context, req interface{}, opt ...push.MulticastOption) error {
+	//TODO implement me
+	panic("implement me")
 }
 
-func (p *PushServiceAdapter) Unsubscribe(ctx context.Context, req interface{}) error {
-	return p.pushService.Unsubscribe(ctx, req)
+func (p *PushServiceAdapter) Subscribe(ctx context.Context, req interface{}, opt ...push.SubscribeOption) error {
+	//TODO implement me
+	panic("implement me")
 }
 
-func (p *PushServiceAdapter) SendToTopic(ctx context.Context, req interface{}) error {
-	return p.pushService.SendToTopic(ctx, req)
+func (p *PushServiceAdapter) Unsubscribe(ctx context.Context, req interface{}, opt ...push.UnsubscribeOption) error {
+	//TODO implement me
+	panic("implement me")
 }
 
-func (p *PushServiceAdapter) SendToCondition(ctx context.Context, req interface{}) error {
-	return p.pushService.SendToCondition(ctx, req)
+func (p *PushServiceAdapter) SendToTopic(ctx context.Context, req interface{}, opt ...push.TopicOption) error {
+	//TODO implement me
+	panic("implement me")
 }
 
-func (p *PushServiceAdapter) CheckDevice(ctx context.Context, req interface{}) bool {
-	return p.pushService.CheckDevice(ctx, req)
+func (p *PushServiceAdapter) CheckDevice(ctx context.Context, req interface{}, opt ...push.CheckDeviceOption) bool {
+	//TODO implement me
+	panic("implement me")
 }
 
 func (p *PushServiceAdapter) Name() string {
-	return p.pushService.Name()
+	//TODO implement me
+	panic("implement me")
 }

internal/factory/factory.go

@@ -2,7 +2,7 @@ package factory
 
 import (
 	"errors"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/push"
 )
 
 type PushServiceCreator func() push.PushService

internal/server/grpc/grpc.go

@@ -9,8 +9,8 @@ import (
 	"github.com/cossim/hipush/config"
 	"github.com/cossim/hipush/internal/consts"
 	"github.com/cossim/hipush/internal/factory"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/go-logr/logr"
 	"github.com/golang/protobuf/jsonpb"
 	"google.golang.org/grpc"
@@ -81,7 +81,7 @@ func (h *Handler) Push(ctx context.Context, req *v1.PushRequest) (*v1.PushRespon
 		return nil, err
 	}
 
-	if err := service.Send(ctx, r, push.SendOption{
+	if err := service.Send(ctx, r, &push.SendOptions{
 		DryRun: req.Option.DryRun,
 		Retry:  int(req.Option.Retry),
 	}); err != nil {
@@ -127,7 +127,7 @@ func (h *Handler) getPushRequest(req *v1.PushRequest) (push.PushRequest, error)
 		ApnsID:           req.AppID,
 		Tokens:           req.Tokens,
 		Title:            req.Title,
-		Message:          req.Message,
+		Content:          req.Message,
 		Topic:            req.Topic,
 		Category:         req.Category,
 		Sound:            req.Sound,

internal/server/http/android.go

@@ -3,8 +3,8 @@ package http
 import (
 	"encoding/json"
 	"github.com/cossim/hipush/api/http/v1/dto"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -53,7 +53,7 @@ func (h *Handler) handleAndroidPush(c *gin.Context, req *dto.PushRequest) {
 		Data:             nil,
 		Apns:             nil,
 	}
-	if err := service.Send(c, rr, push.SendOption{}); err != nil {
+	if err := service.Send(c, rr, &push.SendOptions{}); err != nil {
 		h.logger.Error(err, "Failed to send push notification")
 		c.JSON(http.StatusInternalServerError, Response{Code: http.StatusBadRequest, Msg: err.Error(), Data: nil})
 		return

internal/server/http/apns.go

@@ -3,8 +3,8 @@ package http
 import (
 	"encoding/json"
 	"github.com/cossim/hipush/api/http/v1/dto"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -37,7 +37,7 @@ func (h *Handler) handleIOSPush(c *gin.Context, req *dto.PushRequest) {
 		Tokens:           req.Token,
 		Title:            r.Title,
 		Topic:            req.AppID,
-		Message:          r.Message,
+		Content:          r.Message,
 		ApnsID:           req.AppID,
 		Sound:            r.Sound,
 		Production:       r.Production,
@@ -49,7 +49,7 @@ func (h *Handler) handleIOSPush(c *gin.Context, req *dto.PushRequest) {
 		Data:             r.Data,
 		Expiration:       nil,
 	}
-	if err := service.Send(c, rr, push.SendOption{}); err != nil {
+	if err := service.Send(c, rr, &push.SendOptions{}); err != nil {
 		h.logger.Error(err, "Failed to send push notification")
 		c.JSON(http.StatusInternalServerError, Response{Code: http.StatusBadRequest, Msg: err.Error(), Data: nil})
 		return

internal/server/http/huawei.go

@@ -5,8 +5,8 @@ import (
 	"github.com/cossim/go-hms-push/push/model"
 	"github.com/cossim/hipush/api/http/v1/dto"
 	"github.com/cossim/hipush/internal/consts"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -53,7 +53,7 @@ func (h *Handler) handleHuaweiPush(c *gin.Context, req *dto.PushRequest) {
 			},
 		},
 	}
-	if err := service.Send(c, rr, push.SendOption{}); err != nil {
+	if err := service.Send(c, rr, &push.SendOptions{}); err != nil {
 		c.JSON(http.StatusInternalServerError, Response{Code: http.StatusBadRequest, Msg: err.Error(), Data: nil})
 		return
 	}

internal/server/http/meizu.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"github.com/cossim/hipush/api/http/v1/dto"
 	"github.com/cossim/hipush/internal/consts"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -51,7 +51,7 @@ func (h *Handler) handleMeizuPush(c *gin.Context, req *dto.PushRequest) {
 		ScheduledStartTime: r.ScheduledStartTime,
 		ScheduledEndTime:   r.ScheduledEndTime,
 	}
-	if err := service.Send(c, rr, push.SendOption{
+	if err := service.Send(c, rr, &push.SendOptions{
 		DryRun: req.Option.DryRun,
 		Retry:  req.Option.Retry,
 	}); err != nil {

internal/server/http/oppo.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"github.com/cossim/hipush/api/http/v1/dto"
 	"github.com/cossim/hipush/internal/consts"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -44,7 +44,7 @@ func (h *Handler) handleOppoPush(c *gin.Context, req *dto.PushRequest) {
 			Retry:  req.Option.Retry,
 		},
 	}
-	if err := service.Send(c, rr, push.SendOption{}); err != nil {
+	if err := service.Send(c, rr, &push.SendOptions{}); err != nil {
 		c.JSON(http.StatusInternalServerError, Response{Code: http.StatusBadRequest, Msg: err.Error(), Data: nil})
 		return
 	}

internal/server/http/vivo.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"github.com/cossim/hipush/api/http/v1/dto"
 	"github.com/cossim/hipush/internal/consts"
-	"github.com/cossim/hipush/internal/notify"
-	"github.com/cossim/hipush/internal/push"
+	"github.com/cossim/hipush/notify"
+	"github.com/cossim/hipush/push"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"net/http"
@@ -49,7 +49,7 @@ func (h *Handler) handleVivoPush(c *gin.Context, req *dto.PushRequest) {
 		Foreground:  r.Foreground,
 		Development: true,
 	}
-	if err := service.Send(c, rr, push.SendOption{}); err != nil {
+	if err := service.Send(c, rr, &push.SendOptions{}); err != nil {
 		c.JSON(http.StatusInternalServerError, Response{Code: http.StatusBadRequest, Msg: err.Error(), Data: nil})
 		return
 	}