Skip to content

Commit 8931547

Browse files
author
ivahaev
committed
Optimising
1 parent f44f9d7 commit 8931547

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func (c *Conn) receiveWelcome() error {
11-
var data string
11+
var data []byte
1212
err := websocket.Message.Receive(c.connection, &data)
1313
if err != nil {
1414
return errors.Wrap(err, "Can't receive welcome message")

parser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"github.com/pkg/errors"
77
)
88

9-
func parseMessage(_msg string) (int, []interface{}, error) {
9+
func parseMessage(_msg []byte) (int, []interface{}, error) {
1010
var msg []interface{}
11-
err := json.Unmarshal([]byte(_msg), &msg)
11+
err := json.Unmarshal(_msg, &msg)
1212
if err != nil {
1313
return 0, nil, errors.Wrap(err, "when unmarshaling wamp message")
1414
}

parser_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package wango
22

33
import "testing"
44

5-
var validMessage = `["CALL","0f2ac8b4-0d18-c6a0-acf1-a338f53a7f2e","com.state"]`
6-
var invalidRPCMessage = `[2,"0f2ac8b4-0d18-c6a0-acf1-a338f53a7f2e"]`
7-
var invalidMessage = `["CALL","0f2ac8b4-0d18-c6a0-acf1-a338f53a7f2e","com.state"`
8-
var validSubMessage = `[5,"com.uri", 6]`
5+
var validMessage = []byte(`["CALL","0f2ac8b4-0d18-c6a0-acf1-a338f53a7f2e","com.state"]`)
6+
var invalidRPCMessage = []byte(`[2,"0f2ac8b4-0d18-c6a0-acf1-a338f53a7f2e"]`)
7+
var invalidMessage = []byte(`["CALL","0f2ac8b4-0d18-c6a0-acf1-a338f53a7f2e","com.state"`)
8+
var validSubMessage = []byte(`[5,"com.uri", 6]`)
99

1010
func TestParseValidMessage(t *testing.T) {
1111
callType, msg, err := parseMessage(validMessage)

wamp.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,9 @@ func (w *Wango) receive(c *Conn) {
357357
c.connection.Close()
358358
w.deleteConnection(c)
359359
}()
360-
dataChan := make(chan string)
360+
dataChan := make(chan []byte)
361361
go func() {
362-
var data string
362+
var data []byte
363363
for {
364364
err := websocket.Message.Receive(c.connection, &data)
365365
if err != nil {
@@ -646,9 +646,9 @@ func (w *Wango) handleUnSubscribe(c *Conn, msg []interface{}) {
646646
go c.send(response)
647647
}
648648

649-
func (w *Wango) handleHeartbeat(c *Conn, msg []interface{}, data string) {
649+
func (w *Wango) handleHeartbeat(c *Conn, msg []interface{}, data []byte) {
650650
if !c.clientConnection {
651-
c.send([]byte(data))
651+
c.send(data)
652652
}
653653
}
654654

0 commit comments

Comments
 (0)