04e175b8ec
* rpc: implement websockets with github.com/gorilla/websocket
This change makes package rpc use the github.com/gorilla/websocket
package for WebSockets instead of golang.org/x/net/websocket. The new
library is more robust and supports all WebSocket features including
continuation frames.
There are new tests for two issues with the previously-used library:
- TestWebsocketClientPing checks handling of Ping frames.
- TestWebsocketLargeCall checks whether the request size limit is
applied correctly.
* rpc: raise HTTP/WebSocket request size limit to 5MB
* rpc: remove default origin for client connections
The client used to put the local hostname into the Origin header because
the server wanted an origin to accept the connection, but that's silly:
Origin is for browsers/websites. The nobody would whitelist a particular
hostname.
Now that the server doesn't need Origin anymore, don't bother setting
one for clients. Users who need an origin can use DialWebsocket to
create a client with arbitrary origin if needed.
* vendor: put golang.org/x/net/websocket back
* rpc: don't set Origin header for empty (default) origin
* rpc: add HTTP status code to handshake error
This makes it easier to debug failing connections.
* ethstats: use github.com/gorilla/websocket
* rpc: fix lint
43 lines
913 B
Go
43 lines
913 B
Go
// Copyright 2019 The Gorilla WebSocket Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package websocket
|
|
|
|
import (
|
|
"io"
|
|
"strings"
|
|
)
|
|
|
|
// JoinMessages concatenates received messages to create a single io.Reader.
|
|
// The string term is appended to each message. The returned reader does not
|
|
// support concurrent calls to the Read method.
|
|
func JoinMessages(c *Conn, term string) io.Reader {
|
|
return &joinReader{c: c, term: term}
|
|
}
|
|
|
|
type joinReader struct {
|
|
c *Conn
|
|
term string
|
|
r io.Reader
|
|
}
|
|
|
|
func (r *joinReader) Read(p []byte) (int, error) {
|
|
if r.r == nil {
|
|
var err error
|
|
_, r.r, err = r.c.NextReader()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if r.term != "" {
|
|
r.r = io.MultiReader(r.r, strings.NewReader(r.term))
|
|
}
|
|
}
|
|
n, err := r.r.Read(p)
|
|
if err == io.EOF {
|
|
err = nil
|
|
r.r = nil
|
|
}
|
|
return n, err
|
|
}
|