Skip to content
This repository was archived by the owner on Jun 11, 2026. It is now read-only.

Commit 6bc1222

Browse files
committed
refactor(socket): remove input buffering from method calls
1 parent e42a517 commit 6bc1222

4 files changed

Lines changed: 66 additions & 38 deletions

File tree

‎rpc.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"time"
1111

1212
"io"
13-
"io/ioutil"
1413

1514
"github.com/gobwas/ws"
1615
)
@@ -26,13 +25,8 @@ type RPC struct {
2625
// ReadMethodCall reads a Method off the reader, returning an error or the
2726
// unmarshaled method call.
2827
func (r *RPC) ReadMethodCall(sr io.Reader) (Method, error) {
29-
data, err := ioutil.ReadAll(sr)
30-
if err != nil {
31-
return Method{}, err
32-
}
33-
3428
var method Method
35-
if err := json.Unmarshal(data, &method); err != nil {
29+
if err := json.NewDecoder(sr).Decode(&method); err != nil {
3630
return Method{}, BadJSON
3731
}
3832

‎server.go‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ type Session struct {
7878

7979
func (s *Session) Start() {
8080
logrus.WithFields(logrus.Fields{"id": s.id}).Infof("created new session")
81-
defer logrus.WithFields(logrus.Fields{"id": s.id}).Infof("client session ended")
82-
defer s.Close()
8381

8482
var (
8583
err error
@@ -93,13 +91,13 @@ func (s *Session) Start() {
9391

9492
if header, err = s.ReadNextFrame(); err != nil {
9593
s.closeAll(ws.StatusAbnormalClosure, "Invalid socket header")
96-
return
94+
break
9795
}
9896
frameReader.N = header.Length
9997

10098
if header.OpCode == ws.OpClose {
10199
s.dispatchClose(header, frameReader)
102-
return
100+
break
103101
}
104102

105103
if header.OpCode != ws.OpContinuation {
@@ -114,6 +112,13 @@ func (s *Session) Start() {
114112
s.handleError(err)
115113
}
116114
}
115+
116+
if target != nil {
117+
target.Close()
118+
}
119+
120+
logrus.WithFields(logrus.Fields{"id": s.id}).Infof("client session ended")
121+
s.Close()
117122
}
118123

119124
// readOpNumber reads the operation number off the upcoming websocket frame.
@@ -129,15 +134,15 @@ func (s *Session) createTarget(header *ws.Header, frame io.Reader) (Target, erro
129134
index := int(binary.BigEndian.Uint16(opBytes[:]))
130135

131136
if index == controlIndex {
132-
return &RPCTarget{s}, nil
137+
return NewRPCTarget(s.readCopyBuffer, s), nil
133138
}
134139

135140
cnx := s.GetConnection(index)
136141
if cnx == nil {
137142
return nil, UnknownConnection
138143
}
139144

140-
return &ConnectionTarget{s.readCopyBuffer, cnx}, nil
145+
return &ConnectionTarget{cnx}, nil
141146
}
142147

143148
// dispatchClose reads the upcoming signalClosed frame off the socket and broadcasts

‎server_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package wsplice
22

33
import (
4-
"math/rand"
4+
"crypto/rand"
55
"strings"
66

77
"github.com/stretchr/testify/require"
@@ -54,7 +54,7 @@ func (e *EndToEndSuite) TestDisallowsHostsNotOnList() {
5454
func (e *EndToEndSuite) TestDisallowsTooLargeFrames() {
5555
e.makeServer(echo)
5656
cnx := e.connectSocket()
57-
e.expectWriteError(cnx, 0xffff, `"`+strings.Repeat("hello", 1024*1024)+`"`, "write")
57+
e.expectWriteError(cnx, 0xffff, `{"method":"`+strings.Repeat("hello", 1024*1024)+`"}`, "write")
5858
}
5959

6060
func (e *EndToEndSuite) TestMultiplexes() {

‎target.go‎

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,83 @@ import (
1111
// it internally. PushFrame can be called many times (for fragmented messages).
1212
type Target interface {
1313
Pull(header ws.Header, socket *Socket, frame *io.LimitedReader) (err error)
14+
Close()
1415
}
1516

1617
// RPCTarget is a target for an RPC call.
1718
type RPCTarget struct {
18-
s *Session
19+
s *Session
20+
copyBuffer []byte
21+
totalRead int64
22+
writer *io.PipeWriter
1923
}
2024

21-
// Pull implements Target.Pull. It reads the full RPC call off of the socket
22-
// and dispatches it on the session.
23-
func (r *RPCTarget) Pull(header ws.Header, socket *Socket, frame *io.LimitedReader) (err error) {
24-
var reader io.Reader
25-
if !header.Fin {
26-
fc := NewFragmentCollector(header, socket)
27-
header, reader, err = fc.Collect(r.s.config.FrameSizeLimit)
25+
// NewRPCTarget creates and returns a new target for the RPC call.
26+
func NewRPCTarget(copyBuffer []byte, s *Session) *RPCTarget {
27+
reader, writer := io.Pipe()
28+
r := &RPCTarget{
29+
s: s,
30+
copyBuffer: copyBuffer,
31+
writer: writer,
32+
}
33+
34+
go func() {
35+
method, err := s.rpc.ReadMethodCall(reader)
36+
defer reader.Close()
2837
if err != nil {
29-
return err
38+
return
3039
}
31-
} else if header.Masked {
40+
data, err := r.s.rpc.Dispatch(method)
41+
if err != nil {
42+
s.handleError(err)
43+
} else {
44+
s.SendControlFrame(data)
45+
}
46+
}()
47+
48+
return r
49+
}
50+
51+
// Pull implements Target.Pull. It pipes the RPC call from the socket to the
52+
// RPC goroutine (kicked off in NewRPCTarget)
53+
func (r *RPCTarget) Pull(header ws.Header, socket *Socket, frame *io.LimitedReader) (err error) {
54+
if r.totalRead+header.Length > socket.config.FrameSizeLimit {
55+
socket.WriteFrame(ws.NewCloseFrame(ws.StatusMessageTooBig, ""))
56+
socket.Close()
57+
return io.EOF
58+
}
59+
60+
var reader io.Reader
61+
if header.Masked {
3262
reader = NewMasked(frame, 0, header.Mask)
3363
} else {
3464
reader = frame
3565
}
3666

37-
method, err := r.s.rpc.ReadMethodCall(reader)
67+
n, err := io.CopyBuffer(r.writer, reader, r.copyBuffer)
3868
if err != nil {
3969
return err
4070
}
71+
r.totalRead += n
4172

42-
go func() {
43-
data, err := r.s.rpc.Dispatch(method)
44-
if err != nil {
45-
r.s.handleError(err)
46-
} else {
47-
r.s.SendControlFrame(data)
48-
}
49-
}()
73+
if header.Fin {
74+
r.writer.Close()
75+
}
5076

5177
return nil
5278
}
5379

80+
// Close implements Target.Close.
81+
func (r *RPCTarget) Close() { r.writer.Close() }
82+
5483
// ConnectionTarget is a target to write out the data to an external connection.
55-
type ConnectionTarget struct {
56-
copyBuffer []byte
57-
c *Connection
58-
}
84+
type ConnectionTarget struct{ c *Connection }
5985

6086
// Pull implements Target.Pull. It copies the frame to the target connection.
6187
func (c *ConnectionTarget) Pull(header ws.Header, _ *Socket, frame *io.LimitedReader) (err error) {
6288
c.c.socket.CopyData(header, frame)
6389
return
6490
}
91+
92+
// Close implements Target.Close.
93+
func (c *ConnectionTarget) Close() {}

0 commit comments

Comments
 (0)
⌂ 换网址