refactor: 重构factory注册

cossteam · Mar 11, 2024 · 1264795 · 1264795
1 parent b393fce
commit 1264795
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 378 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -4,9 +4,7 @@ import (
 	"context"
 	"flag"
 	"github.com/cossim/hipush/config"
-	"github.com/cossim/hipush/consts"
-	"github.com/cossim/hipush/internal/adapter"
-	"github.com/cossim/hipush/internal/factory"
+	"github.com/cossim/hipush/factory"
 	g "github.com/cossim/hipush/internal/server/grpc"
 	h "github.com/cossim/hipush/internal/server/http"
 	"github.com/cossim/hipush/push"
@@ -49,69 +47,34 @@ func main() {
 	logger := zapr.NewLogger(zapLogger)
 
 	pushServiceFactory := factory.NewPushServiceFactory()
-	pushServiceFactory.Register(consts.PlatformIOS.String(), func() push.PushService {
-		svc, err := push.NewAPNsService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformAndroid.String(), func() push.PushService {
-		svc, err := push.NewFCMService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformHuawei.String(), func() push.PushService {
-		svc, err := push.NewHMSService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformVivo.String(), func() push.PushService {
-		svc, err := push.NewVivoService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformOppo.String(), func() push.PushService {
-		svc, err := push.NewOppoService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformXiaomi.String(), func() push.PushService {
-		svc, err := push.NewXiaomiService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformMeizu.String(), func() push.PushService {
-		svc, err := push.NewMeizuService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
-
-	pushServiceFactory.Register(consts.PlatformHonor.String(), func() push.PushService {
-		svc, err := push.NewHonorService(cfg, logger)
-		if err != nil {
-			panic(err)
-		}
-		return adapter.NewPushServiceAdapter(svc)
-	})
+	if err := pushServiceFactory.Register(
+		func() (push.PushService, error) {
+			return push.NewAPNsService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewFCMService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewHMSService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewXiaomiService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewVivoService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewOppoService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewMeizuService(cfg, logger)
+		},
+		func() (push.PushService, error) {
+			return push.NewHonorService(cfg, logger)
+		},
+	); err != nil {
+		panic(err)
+	}
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

diff --git a/factory/factory.go b/factory/factory.go
@@ -0,0 +1,47 @@
+package factory
+
+import (
+	"errors"
+	"github.com/cossim/hipush/push"
+)
+
+type PushServiceCreator func() (push.PushService, error)
+
+type PushServiceFactory struct {
+	creators map[string]push.PushService
+}
+
+func NewPushServiceFactory() *PushServiceFactory {
+	return &PushServiceFactory{
+		creators: make(map[string]push.PushService),
+	}
+}
+
+func WithPushServiceCreator(creator func() (push.PushService, error)) PushServiceCreator {
+	return func() (push.PushService, error) {
+		ps, err := creator()
+		if err != nil {
+			return nil, err
+		}
+		return ps, nil
+	}
+}
+
+func (f *PushServiceFactory) Register(creators ...PushServiceCreator) error {
+	for _, c := range creators {
+		ps, err := c()
+		if err != nil {
+			return err
+		}
+		f.creators[ps.Name()] = ps
+	}
+	return nil
+}
+
+func (f *PushServiceFactory) GetPushService(name string) (push.PushService, error) {
+	ps, ok := f.creators[name]
+	if !ok {
+		return nil, errors.New("unsupported platform")
+	}
+	return ps, nil
+}
diff --git a/internal/adapter/adapter.go b/internal/adapter/adapter.go
diff --git a/internal/factory/factory.go b/internal/factory/factory.go
diff --git a/internal/server/grpc/grpc.go b/internal/server/grpc/grpc.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cossim/hipush/api/grpc/v1"
 	"github.com/cossim/hipush/config"
 	"github.com/cossim/hipush/consts"
-	"github.com/cossim/hipush/internal/factory"
+	"github.com/cossim/hipush/factory"
 	"github.com/cossim/hipush/notify"
 	"github.com/cossim/hipush/push"
 	"github.com/cossim/hipush/status"

diff --git a/internal/server/http/http.go b/internal/server/http/http.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cossim/hipush/api/http/v1/dto"
 	"github.com/cossim/hipush/config"
 	"github.com/cossim/hipush/consts"
-	"github.com/cossim/hipush/internal/factory"
+	"github.com/cossim/hipush/factory"
 	"github.com/cossim/hipush/status"
 	"github.com/gin-gonic/gin"
 	"github.com/go-logr/logr"

diff --git a/push/apns_push.go b/push/apns_push.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/cossim/hipush/config"
+	"github.com/cossim/hipush/consts"
 	"github.com/cossim/hipush/notify"
 	"github.com/cossim/hipush/status"
 	"github.com/go-logr/logr"
@@ -359,32 +360,6 @@ func (a *APNsService) checkNotification(req *notify.ApnsPushNotification) error
 	return nil
 }
 
-func (a *APNsService) SendMulticast(ctx context.Context, req interface{}, opt ...MulticastOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a *APNsService) Subscribe(ctx context.Context, req interface{}, opt ...SubscribeOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a *APNsService) Unsubscribe(ctx context.Context, req interface{}, opt ...UnsubscribeOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a *APNsService) SendToTopic(ctx context.Context, req interface{}, opt ...TopicOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (a *APNsService) CheckDevice(ctx context.Context, req interface{}, opt ...CheckDeviceOption) bool {
-	//TODO implement me
-	panic("implement me")
-}
-
 func (a *APNsService) Name() string {
-	//TODO implement me
-	panic("implement me")
+	return consts.PlatformIOS.String()
 }
diff --git a/push/fcm_push.go b/push/fcm_push.go
@@ -7,6 +7,7 @@ import (
 	"firebase.google.com/go/messaging"
 	"fmt"
 	"github.com/cossim/hipush/config"
+	"github.com/cossim/hipush/consts"
 	"github.com/cossim/hipush/notify"
 	"github.com/cossim/hipush/status"
 	"github.com/go-logr/logr"
@@ -269,32 +270,6 @@ func (f *FCMService) buildAndroidNotification(req *notify.FCMPushNotification) *
 	return notification
 }
 
-func (f *FCMService) SendMulticast(ctx context.Context, req interface{}, opt ...MulticastOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (f *FCMService) Subscribe(ctx context.Context, req interface{}, opt ...SubscribeOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (f *FCMService) Unsubscribe(ctx context.Context, req interface{}, opt ...UnsubscribeOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (f *FCMService) SendToTopic(ctx context.Context, req interface{}, opt ...TopicOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (f *FCMService) CheckDevice(ctx context.Context, req interface{}, opt ...CheckDeviceOption) bool {
-	//TODO implement me
-	panic("implement me")
-}
-
 func (f *FCMService) Name() string {
-	//TODO implement me
-	panic("implement me")
+	return consts.PlatformAndroid.String()
 }
diff --git a/push/honor_push.go b/push/honor_push.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	hClient "github.com/cossim/hipush/client/push"
 	"github.com/cossim/hipush/config"
+	"github.com/cossim/hipush/consts"
 	"github.com/cossim/hipush/notify"
 	"github.com/cossim/hipush/status"
 	"github.com/go-logr/logr"
@@ -213,32 +214,6 @@ func (h *HonorService) buildAndroidNotification(req *notify.HonorPushNotificatio
 	return sendMessageReq
 }
 
-func (h *HonorService) SendMulticast(ctx context.Context, req interface{}, opt ...MulticastOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (h *HonorService) Subscribe(ctx context.Context, req interface{}, opt ...SubscribeOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (h *HonorService) Unsubscribe(ctx context.Context, req interface{}, opt ...UnsubscribeOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (h *HonorService) SendToTopic(ctx context.Context, req interface{}, opt ...TopicOption) error {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (h *HonorService) CheckDevice(ctx context.Context, req interface{}, opt ...CheckDeviceOption) bool {
-	//TODO implement me
-	panic("implement me")
-}
-
 func (h *HonorService) Name() string {
-	//TODO implement me
-	panic("implement me")
+	return consts.PlatformHonor.String()
 }