unistack-org/micro-wrapper-recovery
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge pull request #48 from unistack-org/simplify

Browse Source 
add options
This commit is contained in:
Василий Толстов 2022-11-28 12:31:51 +03:00 committed by GitHub
commit 3c91b24896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
wrapper.go
View File

@ -4,22 +4,60 @@ import (
"context" "context"
"fmt" "fmt"
"go.unistack.org/micro/v3/errors"
"go.unistack.org/micro/v3/server" "go.unistack.org/micro/v3/server"
) )
type wrapper struct { var (
serverHandlerFunc func(context.Context, server.Request, interface{}, error) error _ server.HandlerWrapper = NewServerHandlerWrapper()
serverSubscriberFunc func(context.Context, server.Message, error) error _ server.SubscriberWrapper = NewServerSubscriberWrapper()
/* )
clientCallFunc func(context.Context, string, client.Request, interface{}, client.CallOptions, error) error
clientClient func(client.Client, error) error 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 { type Options struct {
handler := &wrapper{ ServerHandlerFn func(context.Context, server.Request, interface{}, error) error
serverHandlerFunc: fn, 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 return handler.HandlerFunc
} }
@ -31,9 +69,9 @@ func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc {
case nil: case nil:
return return
case error: case error:
err = w.serverHandlerFunc(ctx, req, rsp, verr) err = w.opts.ServerHandlerFn(ctx, req, rsp, verr)
default: 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) 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 { func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
handler := &wrapper{ handler := &wrapper{opts: NewOptions(opts...)}
serverSubscriberFunc: fn,
}
return handler.SubscriberFunc return handler.SubscriberFunc
} }
@ -56,9 +92,9 @@ func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc
case nil: case nil:
return return
case error: case error:
err = w.serverSubscriberFunc(ctx, msg, verr) err = w.opts.ServerSubscriberFn(ctx, msg, verr)
default: default:
err = w.serverSubscriberFunc(ctx, msg, fmt.Errorf("%v", r)) err = w.opts.ServerSubscriberFn(ctx, msg, fmt.Errorf("%v", r))
} }
}() }()
err = fn(ctx, msg) err = fn(ctx, msg)