ing
This commit is contained in:
@@ -39,11 +39,11 @@ func (h *fileHandler) GetSocketOption() *gws.SocketOptions {
|
||||
return h.co
|
||||
}
|
||||
|
||||
func (h *fileHandler) onRequest(soc gws.Socket, method string, params interface{}) (interface{}, error) {
|
||||
func (h *fileHandler) onRequest(soc gws.Socket, method string, params []string) (interface{}, error) {
|
||||
log.Printf("path: %s, m: %s, params: %v", soc.Path(), method, params)
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (h *fileHandler) onNotify(soc gws.Socket, method string, params interface{}) error {
|
||||
func (h *fileHandler) onNotify(soc gws.Socket, method string, params []string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
package web
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
"google.golang.org/grpc/metadata"
|
||||
|
||||
backGRpc "git.loafle.net/overflow/overflow_api_server/golang"
|
||||
"git.loafle.net/overflow/overflow_gateway_web/handler"
|
||||
gws "git.loafle.net/overflow/overflow_gateway_websocket"
|
||||
"git.loafle.net/overflow/overflow_gateway_websocket/protocol/jsonrpc"
|
||||
grpcPool "git.loafle.net/overflow/overflow_grpc_pool"
|
||||
)
|
||||
|
||||
type WebHandler interface {
|
||||
@@ -16,10 +22,13 @@ type webHandler struct {
|
||||
co *gws.SocketOptions
|
||||
ho *jsonrpc.Options
|
||||
handler gws.MessageHandler
|
||||
pool grpcPool.Pool
|
||||
}
|
||||
|
||||
func New() WebHandler {
|
||||
h := &webHandler{}
|
||||
func New(pool grpcPool.Pool) WebHandler {
|
||||
h := &webHandler{
|
||||
pool: pool,
|
||||
}
|
||||
|
||||
h.ho = &jsonrpc.Options{
|
||||
OnRequest: h.onRequest,
|
||||
@@ -39,12 +48,35 @@ func (h *webHandler) GetSocketOption() *gws.SocketOptions {
|
||||
return h.co
|
||||
}
|
||||
|
||||
func (h *webHandler) onRequest(soc gws.Socket, method string, params interface{}) (interface{}, error) {
|
||||
func (h *webHandler) onRequest(soc gws.Socket, method string, params []string) (interface{}, error) {
|
||||
log.Printf("path: %s, m: %s, params: %v", soc.Path(), method, params)
|
||||
return nil, nil
|
||||
|
||||
c, err := h.pool.Get()
|
||||
if err != nil {
|
||||
log.Println("cannot retrive GRPC Client")
|
||||
return nil, err
|
||||
}
|
||||
|
||||
sm := strings.Split(method, ".")
|
||||
|
||||
si := &backGRpc.ServerInput{
|
||||
Target: sm[0],
|
||||
Method: sm[1],
|
||||
Params: params,
|
||||
}
|
||||
|
||||
md := metadata.Pairs("email", "overflow@loafle.com")
|
||||
ctx := metadata.NewOutgoingContext(context.Background(), md)
|
||||
|
||||
so, err := c.(backGRpc.OverflowApiServerClient).Exec(ctx, si)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return so.Result, nil
|
||||
}
|
||||
|
||||
func (h *webHandler) onNotify(soc gws.Socket, method string, params interface{}) error {
|
||||
func (h *webHandler) onNotify(soc gws.Socket, method string, params []string) error {
|
||||
log.Printf("path: %s, m: %s, params: %v", soc.Path(), method, params)
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user