fix ws event pool (#42)

plugins/web/ws_event.go

@@ -1,5 +1,7 @@
 package web
 
+//go:generate easyjson
+
 import (
 	"encoding/json"
 	"sync"

plugins/web/ws_event_test.go

@@ -0,0 +1,31 @@
+package web
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestUnit_Event(t *testing.T) {
+	ev := &event{}
+	err := json.Unmarshal([]byte(`{"e":1001,"u":"1111","d":{"token":"12345","os":"debian"}}`), ev)
+	require.NoError(t, err)
+
+	b, err := json.Marshal(ev)
+	require.NoError(t, err)
+	require.Equal(t, string(b), "{\"e\":1001,\"d\":{\"token\":\"12345\",\"os\":\"debian\"},\"u\":\"1111\"}")
+
+	ev.Error(fmt.Errorf("error1"))
+
+	b, err = json.Marshal(ev)
+	require.NoError(t, err)
+	require.Equal(t, string(b), "{\"e\":1001,\"d\":null,\"err\":\"error1\",\"u\":\"1111\"}")
+
+	ev.Reset()
+
+	b, err = json.Marshal(ev)
+	require.NoError(t, err)
+	require.Equal(t, string(b), "{\"e\":0,\"d\":null}")
+}

plugins/web/ws_server.go

@@ -5,7 +5,6 @@ package web
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"sync"
 	"sync/atomic"
@@ -328,34 +327,22 @@ func (v *wssConn) dataBus() <-chan []byte {
 
 func (v *wssConn) dataHandler(b []byte) {
 	eventModel(func(ev *event) {
-		var (
-			err error
-			msg string
-		)
-		defer func() {
-			if err != nil {
-				v.errLog(v.cid, err, "[ws] "+msg)
-			}
-		}()
-		if err = json.Unmarshal(b, ev); err != nil {
-			msg = "decode message"
+		if err := json.Unmarshal(b, ev); err != nil {
+			v.errLog(v.cid, err, "[ws] decode message")
 			return
 		}
 		call, ok := v.event(ev.EventID())
 		if !ok {
 			return
 		}
-		err = call(ev, v)
-		if err != nil {
+		if err := call(ev, v); err != nil {
 			ev.Error(err)
-			bb, er := json.Marshal(ev)
-			if er != nil {
-				msg = fmt.Sprintf("[ws] call event handler: %d", ev.EventID())
-				err = errors.Wrap(err, er)
+			if bb, er := json.Marshal(ev); er != nil {
+				v.errLog(v.cid, errors.Wrap(err, er), "[ws] call event handler: %d", ev.EventID())
 				return
+			} else {
+				v.Write(bb)
 			}
-			err = nil
-			v.Write(bb)
 			return
 		}
 	})

plugins/web/ws_server_pool.go

@@ -48,6 +48,14 @@ func (v *wssPool) Create(name string) WebsocketServer {
 	}
 	p := newWsServerProvider(v.log, u)
 	v.pool[name] = p
+
+	if err := p.Up(); err != nil {
+		v.log.WithFields(log.Fields{
+			"err":  err,
+			"name": name,
+		}).Errorf("Create Websocket Server in pool")
+	}
+
 	return p
 }