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

Commit 72b763f

Browse files
committed
feat(server): support continuation frames in proxies clients
1 parent d0a8f2d commit 72b763f

2 files changed

Lines changed: 29 additions & 5 deletions

File tree

‎server.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ func (s *Session) Start() {
8484
var (
8585
err error
8686
header ws.Header
87+
target Target
8788
frameReader = &io.LimitedReader{R: s.Socket.Reader}
8889
)
8990

@@ -101,10 +102,12 @@ func (s *Session) Start() {
101102
return
102103
}
103104

104-
target, err := s.createTarget(&header, frameReader)
105-
if err != nil {
106-
s.handleError(err)
107-
continue
105+
if header.OpCode != ws.OpContinuation {
106+
target, err = s.createTarget(&header, frameReader)
107+
if err != nil {
108+
s.handleError(err)
109+
continue
110+
}
108111
}
109112

110113
if err := target.Pull(header, &s.Socket, frameReader); err != nil {

‎server_test.go‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package wsplice
22

3-
import "strings"
3+
import (
4+
"math/rand"
5+
"strings"
6+
7+
"github.com/stretchr/testify/require"
8+
)
49

510
func (e *EndToEndSuite) TestErrorsSendingToNonexistentConnection() {
611
cnx := e.connectSocket()
@@ -22,6 +27,22 @@ func (e *EndToEndSuite) TestPingPong() {
2227
e.expectRead(cnx, 0xffff, `{"id":0,"type":"method","method":"onSocketClosed","params":{"code":1001,"reason":"","index":0}}`)
2328
}
2429

30+
func (e *EndToEndSuite) TestHandlesFragmentedMessages() {
31+
url := e.makeServer(echo)
32+
cnx := e.connectSocket()
33+
34+
// Gorilla fragments messages at 64kb, a 400kb message will be split up.
35+
// Make sure it can ping and pong!
36+
data := make([]byte, 1024*400)
37+
_, err := rand.Read(data)
38+
require.Nil(e.T(), err)
39+
40+
e.write(cnx, 0xffff, `{"type":"method","method":"connect","params":{"url":"`+url+`"}}`)
41+
e.expectRead(cnx, 0xffff, `{"id":0,"type":"reply","result":{"index":0}}`)
42+
e.write(cnx, 0, string(data))
43+
e.expectRead(cnx, 0, string(data))
44+
}
45+
2546
func (e *EndToEndSuite) TestDisallowsHostsNotOnList() {
2647
e.makeServer(echo)
2748
cnx := e.connectSocket()

0 commit comments

Comments
 (0)
⌂ 换网址