ref

Author: sshaplygin

connection_handlers.go

@@ -1,6 +1,10 @@
 package socketio
 
-import "github.com/googollee/go-socket.io/parser"
+import (
+	"log"
+
+	"github.com/googollee/go-socket.io/parser"
+)
 
 var readHandlerMapping = map[parser.Type]readHandler{
 	parser.Ack:        ackPacketHandler,
@@ -72,7 +76,12 @@ func connectPacketHandler(c *conn, header parser.Header) error {
 		conn.Join(c.ID())
 	}
 
-	handler.dispatch(conn, header)
+	_, err := handler.dispatch(conn, header)
+	if err != nil {
+		log.Println("dispatch connect packet", err)
+		c.onError(header.Namespace, err)
+		return errHandleDispatch
+	}
 
 	c.write(header)
 
@@ -101,7 +110,12 @@ func disconnectPacketHandler(c *conn, header parser.Header) error {
 		return nil
 	}
 
-	handler.dispatch(conn, header, args...)
+	_, err = handler.dispatch(conn, header, args...)
+	if err != nil {
+		log.Println("dispatch disconnect packet", err)
+		c.onError(header.Namespace, err)
+		return errHandleDispatch
+	}
 
 	return nil
 }

errors.go

@@ -12,7 +12,7 @@ var (
 	errFailedConnectNamespace = errors.New("failed connect to namespace without handler")
 )
 
-// event errors.
+// common connection dispatch errors.
 var (
 	errHandleDispatch = errors.New("handler dispatch error")
 

namespace_conn.go

@@ -61,6 +61,7 @@ func (nc *namespaceConn) Emit(eventName string, v ...interface{}) {
 	header := parser.Header{
 		Type: parser.Event,
 	}
+
 	if nc.namespace != aliasRootNamespace {
 		header.Namespace = nc.namespace
 	}

namespace_handler.go

@@ -11,8 +11,8 @@ import (
 type namespaceHandler struct {
 	broadcast Broadcast
 
-	eventsLock sync.RWMutex
 	events     map[string]*funcHandler
+	eventsLock sync.RWMutex
 
 	onConnect    func(conn Conn) error
 	onDisconnect func(conn Conn, msg string)
@@ -80,7 +80,11 @@ func (nh *namespaceHandler) dispatch(conn Conn, header parser.Header, args ...re
 
 	case parser.Error:
 		if nh.onError != nil {
-			nh.onError(conn, errors.New(getDispatchMessage(args...)))
+			msg := getDispatchMessage(args...)
+			if msg == "" {
+				msg = "parser error dispatch"
+			}
+			nh.onError(conn, errors.New(msg))
 		}
 	}
 

parser/buffer.go

@@ -15,6 +15,12 @@ type Buffer struct {
 	Data []byte
 }
 
+type BufferData struct {
+	Num         uint64
+	PlaceHolder bool `json:"_placeholder"`
+	Data        []byte
+}
+
 // MarshalJSON marshals to JSON.
 func (a Buffer) MarshalJSON() ([]byte, error) {
 	var buf bytes.Buffer
@@ -35,7 +41,7 @@ func (a *Buffer) marshalJSONBuf(buf *bytes.Buffer) error {
 }
 
 func (a *Buffer) encodeText(buf *bytes.Buffer) error {
-	buf.WriteString("{\"type\":\"Buffer\",\"data\":[")
+	buf.WriteString(`{"type":"Buffer","data":[`)
 	for i, d := range a.Data {
 		if i > 0 {
 			buf.WriteString(",")
@@ -48,7 +54,7 @@ func (a *Buffer) encodeText(buf *bytes.Buffer) error {
 }
 
 func (a *Buffer) encodeBinary(buf *bytes.Buffer) error {
-	buf.WriteString("{\"_placeholder\":true,\"num\":")
+	buf.WriteString(`{"_placeholder":true,"num":`)
 	buf.WriteString(strconv.FormatUint(a.num, 10))
 	buf.WriteString("}")
 
@@ -57,12 +63,7 @@ func (a *Buffer) encodeBinary(buf *bytes.Buffer) error {
 
 // UnmarshalJSON unmarshal data from JSON.
 func (a *Buffer) UnmarshalJSON(b []byte) error {
-	var data struct {
-		Num         uint64
-		PlaceHolder bool `json:"_placeholder"`
-		Data        []byte
-	}
-
+	var data BufferData
 	if err := json.Unmarshal(b, &data); err != nil {
 		return err
 	}