cleanup

desc/desc.go

@@ -7,6 +7,10 @@ import (
 	"github.com/clubpay/ronykit/utils/reflector"
 )
 
+type Desc interface {
+	Desc() *Service
+}
+
 type Error struct {
 	Code    int
 	Item    string

desc/edge_option.go

@@ -0,0 +1,11 @@
+package desc
+
+import "github.com/clubpay/ronykit"
+
+func Register(descriptions ...Desc) ronykit.Option {
+	return func(s *ronykit.EdgeServer) {
+		for _, d := range descriptions {
+			s.RegisterService(d.Desc().Generate())
+		}
+	}
+}

edge_test.go

@@ -78,7 +78,7 @@ var _ = Describe("EdgeServer", func() {
 		}
 		edge = ronykit.NewServer(
 			ronykit.RegisterBundle(b),
-			ronykit.RegisterServiceDesc(
+			ronykit.RegisterService(
 				desc.NewService("testService").
 					AddContract(
 						desc.NewContract().
@@ -94,7 +94,8 @@ var _ = Describe("EdgeServer", func() {
 									return
 								},
 							),
-					),
+					).
+					Generate(),
 			),
 		)
 		edge.Start(nil)

exmples/mixed-jsonrpc-rest/server/main.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 
 	"github.com/clubpay/ronykit"
+	"github.com/clubpay/ronykit/desc"
 	"github.com/clubpay/ronykit/std/gateway/fasthttp"
 	"github.com/clubpay/ronykit/std/gateway/fastws"
 )
@@ -37,7 +38,7 @@ func main() {
 				fasthttp.Listen(":81"),
 			),
 		),
-		ronykit.RegisterServiceDesc(NewSample().Desc()),
+		desc.Register(NewSample()),
 	).
 		Start(nil).
 		PrintRoutes(os.Stdout).

exmples/simple-rest-server/main.go

@@ -9,6 +9,7 @@ import (
 	"syscall"
 
 	"github.com/clubpay/ronykit"
+	"github.com/clubpay/ronykit/desc"
 	"github.com/clubpay/ronykit/exmples/simple-rest-server/api"
 	"github.com/clubpay/ronykit/std/gateway/fasthttp"
 )
@@ -35,9 +36,7 @@ func main() {
 				fasthttp.WithReflectTag("json"),
 			),
 		),
-		ronykit.RegisterServiceDesc(
-			api.NewSample().Desc(),
-		),
+		desc.Register(api.NewSample()),
 	).
 		Start(nil).
 		PrintRoutes(os.Stdout).

options.go

@@ -27,16 +27,6 @@ func RegisterService(services ...Service) Option {
 	}
 }
 
-// RegisterServiceDesc registers a service by accepting the desc.Service as input.
-// **Note**: we are using ServiceGenerator interface instead of desc.Service to prevent cyclic dependencies.
-func RegisterServiceDesc(serviceGens ...ServiceGenerator) Option {
-	return func(s *EdgeServer) {
-		for _, svcGen := range serviceGens {
-			s.RegisterService(svcGen.Generate())
-		}
-	}
-}
-
 func WithErrorHandler(h ErrHandler) Option {
 	return func(s *EdgeServer) {
 		s.eh = h

service.go

@@ -1,10 +1,5 @@
 package ronykit
 
-// ServiceGenerator generates a service. desc.Service is the implementor of this.
-type ServiceGenerator interface {
-	Generate() Service
-}
-
 // Service defines a set of RPC handlers which usually they are related to one service.
 // Name must be unique per each Gateway.
 type Service interface {