From aed4e1a03802ae67303ce995afc0f048d3b6e9e7 Mon Sep 17 00:00:00 2001 From: mountain Date: Sat, 23 Dec 2023 17:27:41 +0900 Subject: [PATCH] =?UTF-8?q?peer=20handler=EC=97=90=EC=84=9C=20receiverName?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wshandler/wshandler_peer.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wshandler/wshandler_peer.go b/wshandler/wshandler_peer.go index 4d00945..a246bf0 100644 --- a/wshandler/wshandler_peer.go +++ b/wshandler/wshandler_peer.go @@ -55,14 +55,11 @@ func (hc *websocketPeerHandler[T]) call(recv T, funcname string, r io.Reader) (v return nil, fmt.Errorf("api is not found : %s", funcname) } -func makeWebsocketPeerApiHandler[T PeerInterface](receiverName string) websocketPeerApiHandler[T] { +func makeWebsocketPeerApiHandler[T PeerInterface]() websocketPeerApiHandler[T] { methods := make(map[string]peerApiFuncType[T]) var archetype T tp := reflect.TypeOf(archetype) - if len(receiverName) == 0 { - receiverName = tp.Elem().Name() - } for i := 0; i < tp.NumMethod(); i++ { method := tp.Method(i) @@ -104,7 +101,7 @@ func makeWebsocketPeerApiHandler[T PeerInterface](receiverName string) websocket } } - methods[receiverName+"."+method.Name] = func(recv T, r io.Reader) (any, error) { + methods[method.Name] = func(recv T, r io.Reader) (any, error) { decoder := json.NewDecoder(r) inargs := make([]any, len(intypes)) @@ -134,9 +131,9 @@ func makeWebsocketPeerApiHandler[T PeerInterface](receiverName string) websocket } } -func NewWebsocketPeerHandler[T PeerInterface](consumer session.Consumer, receiverName string, creator func(primitive.ObjectID) T) WebsocketPeerHandler { +func NewWebsocketPeerHandler[T PeerInterface](consumer session.Consumer, creator func(primitive.ObjectID) T) WebsocketPeerHandler { methods := make(map[string]peerApiFuncType[T]) - receiver := makeWebsocketPeerApiHandler[T](receiverName) + receiver := makeWebsocketPeerApiHandler[T]() for k, v := range receiver.methods { ab := strings.Split(k, ".")