Skip to content

Commit 032089c

Browse files
exelbanexelban
committed
- changed the default message type from Text to Binary. It could be changed with TextMessage = true
- added binary message support as a message
1 parent 40c9c12 commit 032089c

File tree

4 files changed

+55
-80
lines changed

4 files changed

+55
-80
lines changed

‎autobahn/go.mod‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
module websocket-autobahn
22

3-
go 1.13
3+
go 1.22.0
44

55
replace github.com/pkgz/websocket => ../
66

7-
require github.com/pkgz/websocket v0.0.0-00010101000000-000000000000
7+
require (
8+
github.com/pkgz/websocket v1.3.0
9+
github.com/gobwas/httphead v0.1.0 // indirect
10+
github.com/gobwas/pool v0.2.1 // indirect
11+
github.com/gobwas/ws v1.4.0 // indirect
12+
golang.org/x/sys v0.22.0 // indirect
13+
)

‎autobahn/go.sum‎

Lines changed: 13 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,17 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
4-
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
5-
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
6-
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
7-
github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
8-
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
9-
github.com/gobwas/ws v1.0.0 h1:1WdyfgUcImUfVBvYbsW2krIsnko+1QU2t45soaF8v1M=
10-
github.com/gobwas/ws v1.0.0/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
3+
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
4+
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
5+
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
6+
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
7+
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
8+
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
119
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1210
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
13-
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
14-
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
15-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
16-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
17-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
18-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
19-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
20-
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
21-
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
22-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
23-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
24-
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
25-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
26-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
27-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
28-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
29-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
30-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
31-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
32-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
34-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
35-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
36-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
37-
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
38-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
39-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
40-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
41-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
42-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
43-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
44-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
45-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
11+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
12+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
13+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14+
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
15+
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
17+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎conn.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var pingHeader = ws.Header{
2626
}
2727

2828
var PingInterval = time.Second * 5
29+
var TextMessage = false
2930

3031
// ID return an connection identifier (could be not unique)
3132
func (c *Conn) ID() string {
@@ -44,9 +45,13 @@ func (c *Conn) Emit(name string, data interface{}) error {
4445

4546
b, _ := json.Marshal(msg)
4647

48+
opCode := ws.OpBinary
49+
if TextMessage {
50+
opCode = ws.OpText
51+
}
4752
h := ws.Header{
4853
Fin: true,
49-
OpCode: ws.OpText,
54+
OpCode: opCode,
5055
Masked: false,
5156
Length: int64(len(b)),
5257
}
@@ -70,18 +75,23 @@ func (c *Conn) Write(h ws.Header, b []byte) error {
7075
}
7176

7277
// Send data to connection.
73-
func (c *Conn) Send(data interface{}) error {
78+
func (c *Conn) Send(data any) error {
7479
var b []byte
80+
7581
switch data.(type) {
7682
case []byte:
7783
b = data.([]byte)
7884
default:
7985
b, _ = json.Marshal(data)
8086
}
8187

88+
opCode := ws.OpBinary
89+
if TextMessage {
90+
opCode = ws.OpText
91+
}
8292
h := ws.Header{
8393
Fin: true,
84-
OpCode: ws.OpText,
94+
OpCode: opCode,
8595
Masked: false,
8696
Length: int64(len(b)),
8797
}

‎websocket.go‎

Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import (
5959
"github.com/gobwas/ws"
6060
"github.com/gobwas/ws/wsutil"
6161
"io"
62-
"io/ioutil"
6362
"log"
6463
"net/http"
6564
"net/url"
@@ -224,7 +223,7 @@ func (s *Server) Handler(w http.ResponseWriter, r *http.Request) {
224223
_, _ = io.CopyN(conn, cipherReader, header.Length)
225224
continue
226225
case ws.OpPong:
227-
_, _ = io.CopyN(ioutil.Discard, conn, header.Length)
226+
_, _ = io.CopyN(io.Discard, conn, header.Length)
228227
continue
229228
case ws.OpClose:
230229
utf8Fin = true
@@ -261,7 +260,9 @@ func (s *Server) Handler(w http.ResponseWriter, r *http.Request) {
261260
}
262261

263262
if err != nil || header.OpCode == ws.OpClose {
264-
log.Printf("drop ws connection: OpClose (%v)", err)
263+
if err != nil {
264+
log.Printf("drop ws connection: OpClose (%v)", err)
265+
}
265266
s.dropConn(connection)
266267
break
267268
}
@@ -372,47 +373,33 @@ func (s *Server) IsClosed() bool {
372373
}
373374

374375
func (s *Server) processMessage(c *Conn, h ws.Header, b []byte) error {
375-
var msg struct {
376-
Name string `json:"name"`
377-
Data interface{} `json:"data"`
378-
}
379-
380376
if len(b) == 0 {
381377
s.onMessage(c, h, b)
382378
return nil
383379
}
384380

385-
switch h.OpCode {
386-
case ws.OpBinary:
381+
if h.OpCode != ws.OpBinary && h.OpCode != ws.OpText {
387382
s.onMessage(c, h, b)
388-
case ws.OpText:
389-
switch b[0] {
390-
case 123:
391-
if err := json.Unmarshal(b, &msg); err != nil {
392-
return err
393-
}
394-
395-
if s.callbacks[msg.Name] != nil {
396-
buf, err := json.Marshal(msg.Data)
397-
if err != nil {
398-
return err
399-
}
383+
return nil
384+
}
400385

401-
s.callbacks[msg.Name](c, &Message{
402-
Name: msg.Name,
403-
Data: buf,
404-
})
405-
return nil
406-
}
386+
var msg struct {
387+
Name string `json:"name"`
388+
Data any `json:"data"`
389+
}
407390

408-
s.onMessage(c, h, b)
409-
default:
410-
s.onMessage(c, h, b)
411-
return nil
391+
if err := json.Unmarshal(b, &msg); err == nil && s.callbacks[msg.Name] != nil {
392+
buf, err := json.Marshal(msg.Data)
393+
if err != nil {
394+
return err
412395
}
413-
default:
414-
s.onMessage(c, h, b)
396+
s.callbacks[msg.Name](c, &Message{
397+
Name: msg.Name,
398+
Data: buf,
399+
})
400+
return nil
415401
}
402+
s.onMessage(c, h, b)
416403

417404
return nil
418405
}

0 commit comments

Comments
 (0)