fix http request instance null for websocket requests (0xPolygonHerme…

…z#2385)
imnotsure-x · Aug 9, 2023 · b18316e · b18316e
1 parent de58703
commit b18316e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/jsonrpc/handler.go b/jsonrpc/handler.go
@@ -156,15 +156,16 @@ func (h *Handler) Handle(req handleRequest) types.Response {
 }
 
 // HandleWs handle websocket requests
-func (h *Handler) HandleWs(reqBody []byte, wsConn *websocket.Conn) ([]byte, error) {
+func (h *Handler) HandleWs(reqBody []byte, wsConn *websocket.Conn, httpReq *http.Request) ([]byte, error) {
 	var req types.Request
 	if err := json.Unmarshal(reqBody, &req); err != nil {
 		return types.NewResponse(req, nil, types.NewRPCError(types.InvalidRequestErrorCode, "Invalid json request")).Bytes()
 	}
 
 	handleReq := handleRequest{
-		Request: req,
-		wsConn:  wsConn,
+		Request:     req,
+		wsConn:      wsConn,
+		HttpRequest: httpReq,
 	}
 
 	return h.Handle(handleReq).Bytes()

diff --git a/jsonrpc/server.go b/jsonrpc/server.go
@@ -366,7 +366,7 @@ func (s *Server) handleWs(w http.ResponseWriter, req *http.Request) {
 			go func() {
 				mu.Lock()
 				defer mu.Unlock()
-				resp, err := s.handler.HandleWs(message, wsConn)
+				resp, err := s.handler.HandleWs(message, wsConn, req)
 				if err != nil {
 					log.Error(fmt.Sprintf("Unable to handle WS request, %s", err.Error()))
 					_ = wsConn.WriteMessage(msgType, []byte(fmt.Sprintf("WS Handle error: %s", err.Error())))