unistack-org/micro-client-drpc
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix drpc method passing

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2022-03-21 12:48:06 +03:00
parent 47c8975a12
commit 6f4e54a876
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drpc.go
View File

@ -30,6 +30,9 @@ type drpcClient struct {
func (d *drpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error { func (d *drpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
var header map[string]string var header map[string]string
if strings.HasPrefix(addr, "http") {
addr = addr[strings.Index(addr, ":")+3:]
}
if md, ok := metadata.FromOutgoingContext(ctx); ok { if md, ok := metadata.FromOutgoingContext(ctx); ok {
header = make(map[string]string, len(md)) header = make(map[string]string, len(md))
@ -90,6 +93,7 @@ func (d *drpcClient) call(ctx context.Context, addr string, req client.Request,
*/ */
ch := make(chan error, 1) ch := make(chan error, 1)
_ = dialCtx _ = dialCtx
// rc, err := net.DialContext(ctx, "tcp", addr) // rc, err := net.DialContext(ctx, "tcp", addr)
rc, err := net.Dial("tcp", addr) rc, err := net.Dial("tcp", addr)
if err != nil { if err != nil {

20
request.go
View File

@ -18,24 +18,16 @@ type drpcRequest struct {
} }
// service Struct.Method /service.Struct/Method // service Struct.Method /service.Struct/Method
func methodToDRPC(service, method string) string { func methodToDRPC(_ string, method string) string {
// no method or already grpc method // no method or already drpc method
if len(method) == 0 || method[0] == '/' { if len(method) == 0 || method[0] == '/' {
return method return method
} }
// assume method is Foo.Bar idx := strings.LastIndex(method, ".")
mParts := strings.Split(method, ".") drpcService := method[:idx]
if len(mParts) != 2 { drpcMethod := method[idx+1:]
return method return fmt.Sprintf("/%s/%s", drpcService, drpcMethod)
}
if len(service) == 0 {
return fmt.Sprintf("/%s/%s", mParts[0], mParts[1])
}
// return /pkg.Foo/Bar
return fmt.Sprintf("/%s.%s/%s", strings.Title(service), mParts[0], mParts[1])
} }
func newDRPCRequest(service, method string, request interface{}, contentType string, reqOpts ...client.RequestOption) client.Request { func newDRPCRequest(service, method string, request interface{}, contentType string, reqOpts ...client.RequestOption) client.Request {