From cca626043492e35b4fc50d99bed52c37e9351210 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Nov 2022 00:59:38 +0000 Subject: [PATCH 1/2] Bump go.unistack.org/micro/v3 from 3.9.13 to 3.9.14 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.9.13 to 3.9.14. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.9.13...v3.9.14) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index efa0f94..c305b54 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-wrapper-recovery/v3 go 1.16 -require go.unistack.org/micro/v3 v3.9.13 +require go.unistack.org/micro/v3 v3.9.14 diff --git a/go.sum b/go.sum index aeb4d06..ca201b2 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo= go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE= -go.unistack.org/micro/v3 v3.9.13 h1:x1/H4rDgvz2JWXx6UvFiWDyRLxg2Kpp6V1kjzpLlyvo= -go.unistack.org/micro/v3 v3.9.13/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= +go.unistack.org/micro/v3 v3.9.14 h1:KTH3mrAMALFLAzH0fLJpaVmKjEa0VlHMRBJBUCKD91g= +go.unistack.org/micro/v3 v3.9.14/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -- 2.45.2 From a89f1830a47c737d10abde760748500df5dcce46 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 28 Nov 2022 12:29:53 +0300 Subject: [PATCH 2/2] add options Signed-off-by: Vasiliy Tolstov --- wrapper.go | 72 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 18 deletions(-) diff --git a/wrapper.go b/wrapper.go index 2793239..9b37155 100644 --- a/wrapper.go +++ b/wrapper.go @@ -4,22 +4,60 @@ import ( "context" "fmt" + "go.unistack.org/micro/v3/errors" "go.unistack.org/micro/v3/server" ) -type wrapper struct { - serverHandlerFunc func(context.Context, server.Request, interface{}, error) error - serverSubscriberFunc func(context.Context, server.Message, error) error - /* - clientCallFunc func(context.Context, string, client.Request, interface{}, client.CallOptions, error) error - clientClient func(client.Client, error) error - */ +var ( + _ server.HandlerWrapper = NewServerHandlerWrapper() + _ server.SubscriberWrapper = NewServerSubscriberWrapper() +) + +func NewOptions(opts ...Option) Options { + options := Options{ + ServerHandlerFn: DefaultServerHandlerFn, + ServerSubscriberFn: DefaultServerSubscriberFn, + } + for _, o := range opts { + o(&options) + } + return options } -func NewServerHandlerWrapper(fn func(context.Context, server.Request, interface{}, error) error) server.HandlerWrapper { - handler := &wrapper{ - serverHandlerFunc: fn, +type Options struct { + ServerHandlerFn func(context.Context, server.Request, interface{}, error) error + ServerSubscriberFn func(context.Context, server.Message, error) error +} + +type Option func(*Options) + +func ServerHandlerFn(fn func(context.Context, server.Request, interface{}, error) error) Option { + return func(o *Options) { + o.ServerHandlerFn = fn } +} + +func ServerSubscriberFn(fn func(context.Context, server.Message, error) error) Option { + return func(o *Options) { + o.ServerSubscriberFn = fn + } +} + +var ( + DefaultServerHandlerFn = func(ctx context.Context, req server.Request, rsp interface{}, err error) error { + return errors.BadRequest("", "%v", err) + } + DefaultServerSubscriberFn = func(ctx context.Context, req server.Message, err error) error { + return errors.BadRequest("", "%v", err) + } +) + +type wrapper struct { + opts Options +} + +func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper { + handler := &wrapper{opts: NewOptions(opts...)} return handler.HandlerFunc } @@ -31,9 +69,9 @@ func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc { case nil: return case error: - err = w.serverHandlerFunc(ctx, req, rsp, verr) + err = w.opts.ServerHandlerFn(ctx, req, rsp, verr) default: - err = w.serverHandlerFunc(ctx, req, rsp, fmt.Errorf("%v", r)) + err = w.opts.ServerHandlerFn(ctx, req, rsp, fmt.Errorf("%v", r)) } }() err = fn(ctx, req, rsp) @@ -41,10 +79,8 @@ func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc { } } -func NewServerSubscriberWrapper(fn func(context.Context, server.Message, error) error) server.SubscriberWrapper { - handler := &wrapper{ - serverSubscriberFunc: fn, - } +func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper { + handler := &wrapper{opts: NewOptions(opts...)} return handler.SubscriberFunc } @@ -56,9 +92,9 @@ func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc case nil: return case error: - err = w.serverSubscriberFunc(ctx, msg, verr) + err = w.opts.ServerSubscriberFn(ctx, msg, verr) default: - err = w.serverSubscriberFunc(ctx, msg, fmt.Errorf("%v", r)) + err = w.opts.ServerSubscriberFn(ctx, msg, fmt.Errorf("%v", r)) } }() err = fn(ctx, msg) -- 2.45.2