Merge pull request #408 from tgerring/removews

Remove Websockets RPC transport

cmd/ethereum/flags.go

@@ -46,7 +46,6 @@ var (
 	StartWebSockets  bool
 	RpcListenAddress string
 	RpcPort          int
-	WsPort           int
 	OutboundPort     string
 	ShowGenesis      bool
 	AddPeer          string
@@ -98,9 +97,7 @@ func Init() {
 
 	flag.StringVar(&RpcListenAddress, "rpcaddr", "127.0.0.1", "address for json-rpc server to listen on")
 	flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on")
-	flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on")
 	flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
-	flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")

cmd/ethereum/main.go

@@ -128,10 +128,6 @@ func main() {
 		utils.StartRpc(ethereum, RpcListenAddress, RpcPort)
 	}
 
-	if StartWebSockets {
-		utils.StartWebSockets(ethereum, WsPort)
-	}
-
 	utils.StartEthereum(ethereum)
 
 	fmt.Printf("Welcome to the FRONTIER\n")

cmd/mist/flags.go

@@ -41,10 +41,8 @@ var (
 	KeyRing          string
 	KeyStore         string
 	StartRpc         bool
-	StartWebSockets  bool
 	RpcListenAddress string
 	RpcPort          int
-	WsPort           int
 	OutboundPort     string
 	ShowGenesis      bool
 	AddPeer          string
@@ -82,9 +80,7 @@ func Init() {
 	flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
 	flag.StringVar(&RpcListenAddress, "rpcaddr", "127.0.0.1", "address for json-rpc server to listen on")
 	flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on")
-	flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on")
 	flag.BoolVar(&StartRpc, "rpc", true, "start rpc server")
-	flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")

cmd/mist/main.go

@@ -76,10 +76,6 @@ func run() error {
 		utils.StartRpc(ethereum, RpcListenAddress, RpcPort)
 	}
 
-	if StartWebSockets {
-		utils.StartWebSockets(ethereum, WsPort)
-	}
-
 	gui := NewWindow(ethereum, config, KeyRing, LogLevel)
 
 	utils.RegisterInterrupt(func(os.Signal) {

cmd/utils/cmd.go

@@ -35,7 +35,6 @@ import (
 	"github.com/ethereum/go-ethereum/miner"
 	"github.com/ethereum/go-ethereum/rlp"
 	rpchttp "github.com/ethereum/go-ethereum/rpc/http"
-	rpcws "github.com/ethereum/go-ethereum/rpc/ws"
 	"github.com/ethereum/go-ethereum/state"
 	"github.com/ethereum/go-ethereum/xeth"
 )
@@ -170,18 +169,6 @@ func StartRpc(ethereum *eth.Ethereum, RpcListenAddress string, RpcPort int) {
 	}
 }
 
-func StartWebSockets(eth *eth.Ethereum, wsPort int) {
-	clilogger.Infoln("Starting WebSockets")
-
-	var err error
-	eth.WsServer, err = rpcws.NewWebSocketServer(xeth.New(eth), wsPort)
-	if err != nil {
-		clilogger.Errorf("Could not start RPC interface (port %v): %v", wsPort, err)
-	} else {
-		go eth.WsServer.Start()
-	}
-}
-
 var gminer *miner.Miner
 
 func GetMiner() *miner.Miner {

eth/backend.go

@@ -127,7 +127,6 @@ type Ethereum struct {
 	miner    *miner.Miner
 
 	RpcServer  rpc.RpcServer
-	WsServer   rpc.RpcServer
 	keyManager *crypto.KeyManager
 
 	logger ethlogger.LogSystem
@@ -285,9 +284,7 @@ func (s *Ethereum) Stop() {
 	if s.RpcServer != nil {
 		s.RpcServer.Stop()
 	}
-	if s.WsServer != nil {
+
-		s.WsServer.Stop()
-	}
 	s.txPool.Stop()
 	s.eventMux.Stop()
 	s.blockPool.Stop()

rpc/ws/server.go

@@ -1,121 +0,0 @@
-/*
-  This file is part of go-ethereum
-
-  go-ethereum is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  go-ethereum is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package rpcws
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-
-	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/xeth"
-	"golang.org/x/net/websocket"
-)
-
-var wslogger = logger.NewLogger("RPC-WS")
-var JSON rpc.JsonWrapper
-
-type WebSocketServer struct {
-	pipe     *xeth.XEth
-	port     int
-	doneCh   chan bool
-	listener net.Listener
-}
-
-func NewWebSocketServer(pipe *xeth.XEth, port int) (*WebSocketServer, error) {
-	sport := fmt.Sprintf(":%d", port)
-	l, err := net.Listen("tcp", sport)
-	if err != nil {
-		return nil, err
-	}
-
-	return &WebSocketServer{
-		pipe,
-		port,
-		make(chan bool),
-		l,
-	}, nil
-}
-
-func (self *WebSocketServer) handlerLoop() {
-	for {
-		select {
-		case <-self.doneCh:
-			wslogger.Infoln("Shutdown RPC-WS server")
-			return
-		}
-	}
-}
-
-func (self *WebSocketServer) Stop() {
-	close(self.doneCh)
-}
-
-func (self *WebSocketServer) Start() {
-	wslogger.Infof("Starting RPC-WS server on port %d", self.port)
-	go self.handlerLoop()
-
-	api := rpc.NewEthereumApi(self.pipe)
-	h := self.apiHandler(api)
-	http.Handle("/ws", h)
-
-	err := http.Serve(self.listener, nil)
-	if err != nil {
-		wslogger.Errorln("Error on RPC-WS interface:", err)
-	}
-}
-
-func (s *WebSocketServer) apiHandler(api *rpc.EthereumApi) http.Handler {
-	fn := func(w http.ResponseWriter, req *http.Request) {
-		h := sockHandler(api)
-		s := websocket.Server{Handler: h}
-		s.ServeHTTP(w, req)
-	}
-
-	return http.HandlerFunc(fn)
-}
-
-func sockHandler(api *rpc.EthereumApi) websocket.Handler {
-	var jsonrpcver string = "2.0"
-	fn := func(conn *websocket.Conn) {
-		for {
-			wslogger.Debugln("Handling connection")
-			var reqParsed rpc.RpcRequest
-
-			// reqParsed, reqerr := JSON.ParseRequestBody(conn.Request())
-			if err := websocket.JSON.Receive(conn, &reqParsed); err != nil {
-				jsonerr := &rpc.RpcErrorObject{-32700, "Error: Could not parse request"}
-				JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
-				continue
-			}
-
-			var response interface{}
-			reserr := api.GetRequestReply(&reqParsed, &response)
-			if reserr != nil {
-				wslogger.Warnln(reserr)
-				jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
-				JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
-				continue
-			}
-
-			wslogger.Debugf("Generated response: %T %s", response, response)
-			JSON.Send(conn, &rpc.RpcSuccessResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Result: response})
-		}
-	}
-	return websocket.Handler(fn)
-}