additional cleanup

Author: jrhea

rpc/http.go

@@ -284,9 +284,6 @@ func (s *Server) newHTTPServerConn(r *http.Request, w http.ResponseWriter) Serve
 		return httpWrite(ctx, w, buf, isError)
 	}
 
-	dec := json.NewDecoder(conn)
-	dec.UseNumber()
-
 	// The body holds one message, so it can be read in one go and checked once.
 	readFrame := func() ([]byte, error) {
 		hint := 0
@@ -304,7 +301,7 @@ func (s *Server) newHTTPServerConn(r *http.Request, w http.ResponseWriter) Serve
 		}
 		return frame, nil
 	}
-	return newFuncCodec(conn, encodeMsg, encodeBatch, dec.Decode, readFrame)
+	return newFuncCodec(conn, encodeMsg, encodeBatch, nil, readFrame)
 }
 
 // readAllBody reads r to the end, sizing the buffer from the hint when there is

rpc/json.go

@@ -226,6 +226,7 @@ func NewFuncCodec(conn deadlineCloser, encodeMsg encodeMsgFunc, encodeBatch enco
 }
 
 // newFuncCodec is NewFuncCodec with the frame reader the built in transports use.
+// A transport with a frame reader never calls decode, so it may be nil.
 func newFuncCodec(conn deadlineCloser, encodeMsg encodeMsgFunc, encodeBatch encodeBatchFunc, decode decodeFunc, readFrame readFrameFunc) *jsonCodec {
 	codec := &jsonCodec{
 		closeCh:     make(chan interface{}),
@@ -346,12 +347,15 @@ func (c *jsonCodec) readMessage() (json.RawMessage, error) {
 		return nil, err
 	}
 	if !json.Valid(frame) {
-		// Decode the broken message to report where it went wrong.
+		// Decode the broken message to report where it went wrong. Unmarshal
+		// checks syntax the same way Valid does, so it fails here too. The
+		// fallback only guards against the two ever disagreeing.
 		var rawmsg json.RawMessage
-		if err := json.Unmarshal(frame, &rawmsg); err != nil {
-			return nil, err
+		err := json.Unmarshal(frame, &rawmsg)
+		if err == nil {
+			err = errors.New("invalid JSON request")
 		}
-		return nil, errors.New("invalid JSON request")
+		return nil, err
 	}
 	return frame, nil
 }

rpc/websocket.go

@@ -308,7 +308,7 @@ func newWebsocketCodec(conn *websocket.Conn, host string, req http.Header, readL
 		return frame, err
 	}
 	wc := &websocketCodec{
-		jsonCodec:    newFuncCodec(conn, encodeMsg, encodeBatch, conn.ReadJSON, readFrame),
+		jsonCodec:    newFuncCodec(conn, encodeMsg, encodeBatch, nil, readFrame),
 		conn:         conn,
 		pingReset:    make(chan struct{}, 1),
 		pongReceived: make(chan struct{}),